X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/abc5e4d69e40d0edb62d4a084a33dc27f1aa712d..8799de17e84b701462fc2299a78f41958fe82b43:/examples/am7xxx-play.c?ds=inline diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c index 6d5d3c7..1b28406 100644 --- a/examples/am7xxx-play.c +++ b/examples/am7xxx-play.c @@ -285,10 +285,13 @@ 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 ret = 0; + int got_packet; + int ret; ret = video_input_init(&input_ctx, input_format_string, input_path, input_options); if (ret < 0) { @@ -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,16 +423,16 @@ 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, - image_format, - (output_ctx.codec_ctx)->width, - (output_ctx.codec_ctx)->height, - out_buf, - out_picture_size); + ret = am7xxx_send_image_async(dev, + image_format, + (output_ctx.codec_ctx)->width, + (output_ctx.codec_ctx)->height, + out_picture, + out_picture_size); if (ret < 0) { perror("am7xxx_send_image"); run = 0; @@ -431,7 +440,9 @@ static int am7xxx_play(const char *input_format_string, } } end_while: - av_free_packet(&packet); + if (!output_ctx.raw_output && got_packet) + av_free_packet(&out_packet); + av_free_packet(&in_packet); } sws_freeContext(sw_scale_ctx); @@ -544,7 +555,7 @@ static int set_signal_handler(void (*signal_handler)(int)) { struct sigaction new_action; struct sigaction old_action; - int ret = 0; + int ret; new_action.sa_handler = signal_handler; sigemptyset(&new_action.sa_mask); @@ -581,6 +592,7 @@ static void usage(char *name) { printf("usage: %s [OPTIONS]\n\n", name); printf("OPTIONS:\n"); + printf("\t-d \t\tthe device index (default is 0)\n"); printf("\t-f \tthe input device format\n"); printf("\t-i \t\tthe input path\n"); printf("\t-o \t\ta comma separated list of input format options\n"); @@ -622,14 +634,23 @@ int main(int argc, char *argv[]) unsigned int upscale = 0; unsigned int quality = 95; int log_level = AM7XXX_LOG_INFO; - am7xxx_power_mode power_mode = AM7XXX_POWER_LOW; - am7xxx_zoom_mode zoom = AM7XXX_ZOOM_ORIGINAL; + int device_index = 0; + int power_mode = AM7XXX_POWER_LOW; + int 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) { + 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; @@ -644,7 +665,7 @@ int main(int argc, char *argv[]) * draw_mouse=1,framerate=100,video_size=800x480 */ subopts = subopts_saved = strdup(optarg); - while((subopt = strtok_r(subopts, ",", &subopts))) { + while ((subopt = strtok_r(subopts, ",", &subopts))) { char *subopt_name = strtok_r(subopt, "=", &subopt); char *subopt_value = strtok_r(NULL, "", &subopt); if (subopt_value == NULL) { @@ -741,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; @@ -757,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; } @@ -797,7 +819,7 @@ int main(int argc, char *argv[]) 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;