Merge tag 'v0.1.3' into debian

[libam7xxx.git] / examples / am7xxx-play.c

diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index af15949..38812a4 100644 (file)
--- a/examples/am7xxx-play.c
+++ b/examples/am7xxx-play.c
@@ -285,9 +285,12 @@ static int am7xxx_play(const char *input_format_string,
        int out_buf_size;
        uint8_t *out_buf;
        int out_picture_size;
        int out_buf_size;
        uint8_t *out_buf;
        int out_picture_size;

+       uint8_t *out_picture;

        struct SwsContext *sw_scale_ctx;
        struct SwsContext *sw_scale_ctx;

-       AVPacket packet;
+       AVPacket in_packet;
+       AVPacket out_packet;

        int got_picture;
        int got_picture;

+       int got_packet;

        int ret = 0;
 
        ret = video_input_init(&input_ctx, input_format_string, input_path, input_options);
        int ret = 0;
 
        ret = video_input_init(&input_ctx, input_format_string, input_path, input_options);


@@ -353,7 +356,7 @@ static int am7xxx_play(const char *input_format_string,
 
        while (run) {
                /* read packet */
 
        while (run) {
                /* read packet */

-               ret = av_read_frame(input_ctx.format_ctx, &packet);
+               ret = av_read_frame(input_ctx.format_ctx, &in_packet);

                if (ret < 0) {
                        if (ret == (int)AVERROR_EOF || input_ctx.format_ctx->pb->eof_reached)
                                ret = 0;
                if (ret < 0) {
                        if (ret == (int)AVERROR_EOF || input_ctx.format_ctx->pb->eof_reached)
                                ret = 0;


@@ -363,7 +366,7 @@ static int am7xxx_play(const char *input_format_string,
                        goto end_while;
                }
 
                        goto end_while;
                }
 

-               if (packet.stream_index != input_ctx.video_stream_index) {
+               if (in_packet.stream_index != input_ctx.video_stream_index) {

                        /* that is more or less a "continue", but there is
                         * still the packet to free */
                        goto end_while;
                        /* that is more or less a "continue", but there is
                         * still the packet to free */
                        goto end_while;


@@ -371,7 +374,7 @@ static int am7xxx_play(const char *input_format_string,
 
                /* decode */
                got_picture = 0;
 
                /* decode */
                got_picture = 0;

-               ret = avcodec_decode_video2(input_ctx.codec_ctx, picture_raw, &got_picture, &packet);
+               ret = avcodec_decode_video2(input_ctx.codec_ctx, picture_raw, &got_picture, &in_packet);

                if (ret < 0) {
                        fprintf(stderr, "cannot decode video\n");
                        run = 0;
                if (ret < 0) {
                        fprintf(stderr, "cannot decode video\n");
                        run = 0;


@@ -390,20 +393,26 @@ static int am7xxx_play(const char *input_format_string,
                                  picture_scaled->linesize);
 
                        if (output_ctx.raw_output) {
                                  picture_scaled->linesize);
 
                        if (output_ctx.raw_output) {

+                               out_picture = out_buf;

                                out_picture_size = out_buf_size;
                        } else {
                                picture_scaled->quality = (output_ctx.codec_ctx)->global_quality;
                                out_picture_size = out_buf_size;
                        } else {
                                picture_scaled->quality = (output_ctx.codec_ctx)->global_quality;

-                               /* TODO: switch to avcodec_encode_video2() eventually */
-                               out_picture_size = avcodec_encode_video(output_ctx.codec_ctx,
-                                                                       out_buf,
-                                                                       out_buf_size,
-                                                                       picture_scaled);
-                               if (out_picture_size < 0) {
+                               av_init_packet(&out_packet);
+                               out_packet.data = NULL;
+                               out_packet.size = 0;
+                               got_packet = 0;
+                               ret = avcodec_encode_video2(output_ctx.codec_ctx,
+                                                           &out_packet,
+                                                           picture_scaled,
+                                                           &got_packet);
+                               if (ret < 0 || !got_packet) {

                                        fprintf(stderr, "cannot encode video\n");
                                        fprintf(stderr, "cannot encode video\n");

-                                       ret = out_picture_size;

                                        run = 0;
                                        goto end_while;
                                }
                                        run = 0;
                                        goto end_while;
                                }

+
+                               out_picture = out_packet.data;
+                               out_picture_size = out_packet.size;

                        }
 
 #ifdef DEBUG
                        }
 
 #ifdef DEBUG


@@ -414,7 +423,7 @@ static int am7xxx_play(const char *input_format_string,
                        else
                                snprintf(filename, NAME_MAX, "out.raw");
                        file = fopen(filename, "wb");
                        else
                                snprintf(filename, NAME_MAX, "out.raw");
                        file = fopen(filename, "wb");

-                       fwrite(out_buf, 1, out_picture_size, file);
+                       fwrite(out_picture, 1, out_picture_size, file);

                        fclose(file);
 #endif
 
                        fclose(file);
 #endif
 


@@ -422,7 +431,7 @@ static int am7xxx_play(const char *input_format_string,
                                                image_format,
                                                (output_ctx.codec_ctx)->width,
                                                (output_ctx.codec_ctx)->height,
                                                image_format,
                                                (output_ctx.codec_ctx)->width,
                                                (output_ctx.codec_ctx)->height,

-                                               out_buf,
+                                               out_picture,

                                                out_picture_size);
                        if (ret < 0) {
                                perror("am7xxx_send_image");
                                                out_picture_size);
                        if (ret < 0) {
                                perror("am7xxx_send_image");


@@ -431,7 +440,9 @@ static int am7xxx_play(const char *input_format_string,
                        }
                }
 end_while:
                        }
                }
 end_while:

-               av_free_packet(&packet);
+               if (!output_ctx.raw_output)
+                       av_free_packet(&out_packet);
+               av_free_packet(&in_packet);

        }
 
        sws_freeContext(sw_scale_ctx);
        }
 
        sws_freeContext(sw_scale_ctx);


@@ -581,6 +592,7 @@ static void usage(char *name)
 {
        printf("usage: %s [OPTIONS]\n\n", name);
        printf("OPTIONS:\n");
 {
        printf("usage: %s [OPTIONS]\n\n", name);
        printf("OPTIONS:\n");

+       printf("\t-d <index>\t\tthe device index (default is 0)\n");

        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");
        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");


@@ -594,8 +606,10 @@ static void usage(char *name)
        printf("\t\t\t\t\t2 - NV12\n");
        printf("\t-q <quality>\t\tquality of jpeg sent to the device, between 1 and 100\n");
        printf("\t-l <log level>\t\tthe verbosity level of libam7xxx output (0-5)\n");
        printf("\t\t\t\t\t2 - NV12\n");
        printf("\t-q <quality>\t\tquality of jpeg sent to the device, between 1 and 100\n");
        printf("\t-l <log level>\t\tthe verbosity level of libam7xxx output (0-5)\n");

-       printf("\t-p <power level>\tpower level of device, between %x (off) and %x (maximum)\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
-       printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n\t\t\t\t\t the slave connector to be plugged in.\n");
+       printf("\t-p <power mode>\t\tthe power mode of device, between %d (off) and %d (turbo)\n",
+              AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+       printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n");
+       printf("\t\t\t\t         the slave connector to be plugged in.\n");

        printf("\t-z <zoom mode>\t\tthe display zoom mode, between %d (original) and %d (test)\n",
               AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
        printf("\t-h \t\t\tthis help message\n");
        printf("\t-z <zoom mode>\t\tthe display zoom mode, between %d (original) and %d (test)\n",
               AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
        printf("\t-h \t\t\tthis help message\n");


@@ -620,14 +634,23 @@ int main(int argc, char *argv[])
        unsigned int upscale = 0;
        unsigned int quality = 95;
        int log_level = AM7XXX_LOG_INFO;
        unsigned int upscale = 0;
        unsigned int quality = 95;
        int log_level = AM7XXX_LOG_INFO;

+       int device_index = 0;

        am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
        am7xxx_zoom_mode zoom = AM7XXX_ZOOM_ORIGINAL;
        int format = AM7XXX_IMAGE_FORMAT_JPEG;
        am7xxx_context *ctx;
        am7xxx_device *dev;
 
        am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
        am7xxx_zoom_mode zoom = AM7XXX_ZOOM_ORIGINAL;
        int format = AM7XXX_IMAGE_FORMAT_JPEG;
        am7xxx_context *ctx;
        am7xxx_device *dev;
 

-       while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:p:z:h")) != -1) {
+       while ((opt = getopt(argc, argv, "d:f:i:o:s:uF:q:l:p:z:h")) != -1) {

                switch (opt) {
                switch (opt) {

+               case 'd':
+                       device_index = atoi(optarg);
+                       if (device_index < 0) {
+                               fprintf(stderr, "Unsupported device index\n");
+                               ret = -EINVAL;
+                               goto out;
+                       }
+                       break;

                case 'f':
                        input_format_string = strdup(optarg);
                        break;
                case 'f':
                        input_format_string = strdup(optarg);
                        break;


@@ -718,10 +741,11 @@ int main(int argc, char *argv[])
                        case AM7XXX_POWER_MIDDLE:
                        case AM7XXX_POWER_HIGH:
                        case AM7XXX_POWER_TURBO:
                        case AM7XXX_POWER_MIDDLE:
                        case AM7XXX_POWER_HIGH:
                        case AM7XXX_POWER_TURBO:

-                               fprintf(stdout, "Power mode: %x\n", power_mode);
+                               fprintf(stdout, "Power mode: %d\n", power_mode);

                                break;
                        default:
                                break;
                        default:

-                               fprintf(stderr, "Invalid power mode value, must be between %x and %x\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+                               fprintf(stderr, "Invalid power mode value, must be between %d and %d\n",
+                                       AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);

                                ret = -EINVAL;
                                goto out;
                        }
                                ret = -EINVAL;
                                goto out;
                        }


@@ -745,7 +769,6 @@ int main(int argc, char *argv[])
                        usage(argv[0]);
                        ret = 0;
                        goto out;
                        usage(argv[0]);
                        ret = 0;
                        goto out;

-                       break;

                default: /* '?' */
                        usage(argv[0]);
                        ret = -EINVAL;
                default: /* '?' */
                        usage(argv[0]);
                        ret = -EINVAL;


@@ -794,7 +817,7 @@ int main(int argc, char *argv[])
 
        am7xxx_set_log_level(ctx, log_level);
 
 
        am7xxx_set_log_level(ctx, log_level);
 

-       ret = am7xxx_open_device(ctx, &dev, 0);
+       ret = am7xxx_open_device(ctx, &dev, device_index);

        if (ret < 0) {
                perror("am7xxx_open_device");
                goto cleanup;
        if (ret < 0) {
                perror("am7xxx_open_device");
                goto cleanup;