X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/abc5e4d69e40d0edb62d4a084a33dc27f1aa712d..c63bf2a7f6fcdd45b053139127f5e34710ef9c6f:/examples/am7xxx-play.c

diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index 6d5d3c7..0b1fa65 100644
--- a/examples/am7xxx-play.c
+++ b/examples/am7xxx-play.c
@@ -286,7 +286,7 @@ static int am7xxx_play(const char *input_format_string,
 	uint8_t *out_buf;
 	int out_picture_size;
 	struct SwsContext *sw_scale_ctx;
-	AVPacket packet;
+	AVPacket in_packet;
 	int got_picture;
 	int ret = 0;
 
@@ -353,7 +353,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 +363,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 +371,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;
@@ -431,7 +431,7 @@ static int am7xxx_play(const char *input_format_string,
 			}
 		}
 end_while:
-		av_free_packet(&packet);
+		av_free_packet(&in_packet);
 	}
 
 	sws_freeContext(sw_scale_ctx);
@@ -581,6 +581,7 @@ 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");
 	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");
@@ -622,14 +623,23 @@ int main(int argc, char *argv[])
 	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;
 
-	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;
@@ -748,7 +758,6 @@ int main(int argc, char *argv[])
 			usage(argv[0]);
 			ret = 0;
 			goto out;
-			break;
 		default: /* '?' */
 			usage(argv[0]);
 			ret = -EINVAL;
@@ -797,7 +806,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;