am7xxx-play: use am7xxx_send_image_async()

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

diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index 668c18c..4506358 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;
+       uint8_t *out_picture;
        struct SwsContext *sw_scale_ctx;
-       AVPacket packet;
+       AVPacket in_packet;
+       AVPacket out_packet;
        int got_picture;
+       int got_packet;
        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 */
-               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;
@@ -363,7 +366,7 @@ static int am7xxx_play(const char *input_format_string,
                        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;
@@ -371,7 +374,7 @@ static int am7xxx_play(const char *input_format_string,
 
                /* 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;
@@ -390,20 +393,26 @@ static int am7xxx_play(const char *input_format_string,
                                  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;
-                               /* 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");
-                                       ret = out_picture_size;
                                        run = 0;
                                        goto end_while;
                                }
+
+                               out_picture = out_packet.data;
+                               out_picture_size = out_packet.size;
                        }
 
 #ifdef DEBUG
@@ -414,15 +423,15 @@ static int am7xxx_play(const char *input_format_string,
                        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
 
-                       ret = am7xxx_send_image(dev,
+                       ret = am7xxx_send_image_async(dev,
                                                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");
@@ -431,7 +440,9 @@ static int am7xxx_play(const char *input_format_string,
                        }
                }
 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);
@@ -751,14 +762,14 @@ int main(int argc, char *argv[])
                        default:
                                fprintf(stderr, "Invalid zoom mode value, must be between %d and %d\n",
                                        AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
-                               exit(EXIT_FAILURE);
+                               ret = -EINVAL;
+                               goto out;
                        }
                        break;
                case 'h':
                        usage(argv[0]);
                        ret = 0;
                        goto out;
-                       break;
                default: /* '?' */
                        usage(argv[0]);
                        ret = -EINVAL;
@@ -767,7 +778,8 @@ int main(int argc, char *argv[])
        }
 
        if (input_path == NULL) {
-               fprintf(stderr, "The -i option must always be passed\n");
+               fprintf(stderr, "The -i option must always be passed\n\n");
+               usage(argv[0]);
                ret = -EINVAL;
                goto out;
        }