am7xxx-play: remove any usage of ENOTSUP
[libam7xxx.git] / examples / am7xxx-play.c
index 6d6ef1c..82954fc 100644 (file)
 
 #include <libavdevice/avdevice.h>
 #include <libavformat/avformat.h>
+#include <libavutil/imgutils.h>
 #include <libswscale/swscale.h>
 
 #include <am7xxx.h>
 
-/* On some systems ENOTSUP is not defined, fallback to its value on
- * linux which is equal to EOPNOTSUPP which is 95
- */
-#ifndef ENOTSUP
-#define ENOTSUP 95
-#endif
-
 static unsigned int run = 1;
 
 struct video_input_ctx {
@@ -113,7 +107,7 @@ static int video_input_init(struct video_input_ctx *input_ctx,
                }
        if (video_index == -1) {
                fprintf(stderr, "cannot find any video streams\n");
-               ret = -ENOTSUP;
+               ret = -EINVAL;
                goto cleanup;
        }
 
@@ -121,7 +115,7 @@ static int video_input_init(struct video_input_ctx *input_ctx,
        input_codec_ctx = input_format_ctx->streams[video_index]->codec;
        if (input_codec_ctx == NULL) {
                fprintf(stderr, "input codec context is not valid\n");
-               ret = -ENOTSUP;
+               ret = -EINVAL;
                goto cleanup;
        }
 
@@ -129,7 +123,7 @@ static int video_input_init(struct video_input_ctx *input_ctx,
        input_codec = avcodec_find_decoder(input_codec_ctx->codec_id);
        if (input_codec == NULL) {
                fprintf(stderr, "input_codec is NULL!\n");
-               ret = -ENOTSUP;
+               ret = -EINVAL;
                goto cleanup;
        }
 
@@ -137,7 +131,7 @@ static int video_input_init(struct video_input_ctx *input_ctx,
        ret = avcodec_open2(input_codec_ctx, input_codec, NULL);
        if (ret < 0) {
                fprintf(stderr, "cannot open input codec\n");
-               ret = -ENOTSUP;
+               ret = -EINVAL;
                goto cleanup;
        }
 
@@ -216,7 +210,7 @@ static int video_output_init(struct video_output_ctx *output_ctx,
         */
        if (image_format == AM7XXX_IMAGE_FORMAT_NV12) {
                fprintf(stdout, "using raw output format\n");
-               output_codec_ctx->pix_fmt    = PIX_FMT_NV12;
+               output_codec_ctx->pix_fmt    = AV_PIX_FMT_NV12;
                output_ctx->codec_ctx = output_codec_ctx;
                output_ctx->raw_output = 1;
                ret = 0;
@@ -235,16 +229,16 @@ static int video_output_init(struct video_output_ctx *output_ctx,
         * in particular they won't be 0, this is needed because they are used
         * as divisor somewhere in the encoding process */
        output_codec_ctx->qmin       = output_codec_ctx->qmax = ((100 - (quality - 1)) * FF_QUALITY_SCALE) / 100;
-       output_codec_ctx->mb_lmin    = output_codec_ctx->lmin = output_codec_ctx->qmin * FF_QP2LAMBDA;
-       output_codec_ctx->mb_lmax    = output_codec_ctx->lmax = output_codec_ctx->qmax * FF_QP2LAMBDA;
-       output_codec_ctx->flags      |= CODEC_FLAG_QSCALE;
+       output_codec_ctx->mb_lmin    = output_codec_ctx->qmin * FF_QP2LAMBDA;
+       output_codec_ctx->mb_lmax    = output_codec_ctx->qmax * FF_QP2LAMBDA;
+       output_codec_ctx->flags      |= AV_CODEC_FLAG_QSCALE;
        output_codec_ctx->global_quality = output_codec_ctx->qmin * FF_QP2LAMBDA;
 
        /* find the encoder */
        output_codec = avcodec_find_encoder(output_codec_ctx->codec_id);
        if (output_codec == NULL) {
                fprintf(stderr, "cannot find output codec!\n");
-               ret = -ENOTSUP;
+               ret = -EINVAL;
                goto cleanup;
        }
 
@@ -276,7 +270,8 @@ static int am7xxx_play(const char *input_format_string,
                       unsigned int upscale,
                       unsigned int quality,
                       am7xxx_image_format image_format,
-                      am7xxx_device *dev)
+                      am7xxx_device *dev,
+                      int dump_frame)
 {
        struct video_input_ctx input_ctx;
        struct video_output_ctx output_ctx;
@@ -320,11 +315,15 @@ static int am7xxx_play(const char *input_format_string,
                ret = -ENOMEM;
                goto cleanup_picture_raw;
        }
+       picture_scaled->format = (output_ctx.codec_ctx)->pix_fmt;
+       picture_scaled->width = (output_ctx.codec_ctx)->width;
+       picture_scaled->height = (output_ctx.codec_ctx)->height;
 
        /* calculate the bytes needed for the output image and create buffer for the output image */
-       out_buf_size = avpicture_get_size((output_ctx.codec_ctx)->pix_fmt,
-                                         (output_ctx.codec_ctx)->width,
-                                         (output_ctx.codec_ctx)->height);
+       out_buf_size = av_image_get_buffer_size((output_ctx.codec_ctx)->pix_fmt,
+                                               (output_ctx.codec_ctx)->width,
+                                               (output_ctx.codec_ctx)->height,
+                                               1);
        out_buf = av_malloc(out_buf_size * sizeof(uint8_t));
        if (out_buf == NULL) {
                fprintf(stderr, "cannot allocate output data buffer!\n");
@@ -333,11 +332,13 @@ static int am7xxx_play(const char *input_format_string,
        }
 
        /* assign appropriate parts of buffer to image planes in picture_scaled */
-       avpicture_fill((AVPicture *)picture_scaled,
-                      out_buf,
-                      (output_ctx.codec_ctx)->pix_fmt,
-                      (output_ctx.codec_ctx)->width,
-                      (output_ctx.codec_ctx)->height);
+       av_image_fill_arrays(picture_scaled->data,
+                            picture_scaled->linesize,
+                            out_buf,
+                            (output_ctx.codec_ctx)->pix_fmt,
+                            (output_ctx.codec_ctx)->width,
+                            (output_ctx.codec_ctx)->height,
+                            1);
 
        sw_scale_ctx = sws_getCachedContext(NULL,
                                            (input_ctx.codec_ctx)->width,
@@ -384,9 +385,13 @@ static int am7xxx_play(const char *input_format_string,
 
                /* if we got the complete frame */
                if (got_picture) {
-                       /* convert it to YUV */
+                       /* 
+                        * Rescaling the picture also changes its pixel format
+                        * to the raw format supported by the projector if
+                        * this was set in video_output_init()
+                        */
                        sws_scale(sw_scale_ctx,
-                                 (const uint8_t * const*)picture_raw->data,
+                                 (const uint8_t * const *)picture_raw->data,
                                  picture_raw->linesize,
                                  0,
                                  (input_ctx.codec_ctx)->height,
@@ -417,15 +422,19 @@ static int am7xxx_play(const char *input_format_string,
                        }
 
 #ifdef DEBUG
-                       char filename[NAME_MAX];
-                       FILE *file;
-                       if (!output_ctx.raw_output)
-                               snprintf(filename, NAME_MAX, "out_q%03d.jpg", quality);
-                       else
-                               snprintf(filename, NAME_MAX, "out.raw");
-                       file = fopen(filename, "wb");
-                       fwrite(out_picture, 1, out_picture_size, file);
-                       fclose(file);
+                       if (dump_frame) {
+                               char filename[NAME_MAX];
+                               FILE *file;
+                               if (!output_ctx.raw_output)
+                                       snprintf(filename, NAME_MAX, "out_q%03d.jpg", quality);
+                               else
+                                       snprintf(filename, NAME_MAX, "out.raw");
+                               file = fopen(filename, "wb");
+                               fwrite(out_picture, 1, out_picture_size, file);
+                               fclose(file);
+                       }
+#else
+                       (void) dump_frame;
 #endif
 
                        ret = am7xxx_send_image_async(dev,
@@ -435,15 +444,15 @@ static int am7xxx_play(const char *input_format_string,
                                                      out_picture,
                                                      out_picture_size);
                        if (ret < 0) {
-                               perror("am7xxx_send_image");
+                               perror("am7xxx_send_image_async");
                                run = 0;
                                goto end_while;
                        }
                }
 end_while:
                if (!output_ctx.raw_output && got_packet)
-                       av_free_packet(&out_packet);
-               av_free_packet(&in_packet);
+                       av_packet_unref(&out_packet);
+               av_packet_unref(&in_packet);
        }
 
        sws_freeContext(sw_scale_ctx);
@@ -540,7 +549,7 @@ static char *get_x_screen_size(const char *input_path)
 static char *get_x_screen_size(const char *input_path)
 {
        (void) input_path;
-       fprintf(stderr, "%s: fallback implementation\n", __func__);
+       fprintf(stderr, "%s: fallback implementation, assuming a vga screen\n", __func__);
        return strdup("vga");
 }
 #endif
@@ -594,6 +603,9 @@ static void usage(char *name)
        printf("usage: %s [OPTIONS]\n\n", name);
        printf("OPTIONS:\n");
        printf("\t-d <index>\t\tthe device index (default is 0)\n");
+#ifdef DEBUG
+       printf("\t-D \t\t\tdump the last frame to a file (only active in DEBUG mode)\n");
+#endif
        printf("\t-f <input format>\tthe input device format\n");
        printf("\t-i <input path>\t\tthe input path\n");
        printf("\t-o <options>\t\ta comma separated list of input format options\n");
@@ -641,8 +653,9 @@ int main(int argc, char *argv[])
        int format = AM7XXX_IMAGE_FORMAT_JPEG;
        am7xxx_context *ctx;
        am7xxx_device *dev;
+       int dump_frame = 0;
 
-       while ((opt = getopt(argc, argv, "d:f:i:o:s:uF:q:l:p:z:h")) != -1) {
+       while ((opt = getopt(argc, argv, "d:Df:i:o:s:uF:q:l:p:z:h")) != -1) {
                switch (opt) {
                case 'd':
                        device_index = atoi(optarg);
@@ -652,6 +665,12 @@ int main(int argc, char *argv[])
                                goto out;
                        }
                        break;
+               case 'D':
+                       dump_frame = 1;
+#ifndef DEBUG
+                       fprintf(stderr, "Warning: the -D option is only active in DEBUG mode.\n");
+#endif
+                       break;
                case 'f':
                        input_format_string = strdup(optarg);
                        break;
@@ -850,7 +869,8 @@ int main(int argc, char *argv[])
                          upscale,
                          quality,
                          format,
-                         dev);
+                         dev,
+                         dump_frame);
        if (ret < 0) {
                fprintf(stderr, "am7xxx_play failed\n");
                goto cleanup;