X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/508c78d70876a8075e6d65099a754f9fd4352cb1..c6f209c200de5b6e3611cdfe7003ad2e6f5f19e1:/examples/am7xxx-play.c

diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index 1b28406..6b0d206 100644
--- a/examples/am7xxx-play.c
+++ b/examples/am7xxx-play.c
@@ -1,7 +1,7 @@
 /*
  * am7xxx-play - play stuff on an am7xxx device (e.g. Acer C110, PicoPix 1020)
  *
- * Copyright (C) 2012  Antonio Ospite <ospite@studenti.unina.it>
+ * Copyright (C) 2012-2014  Antonio Ospite <ao2@ao2.it>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -216,15 +216,15 @@ 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;
 		goto out;
 	}
 
-	output_codec_ctx->pix_fmt    = PIX_FMT_YUVJ420P;
-	output_codec_ctx->codec_id   = CODEC_ID_MJPEG;
+	output_codec_ctx->pix_fmt    = AV_PIX_FMT_YUVJ420P;
+	output_codec_ctx->codec_id   = AV_CODEC_ID_MJPEG;
 	output_codec_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
 
 	/* Set quality and other VBR settings */
@@ -235,8 +235,8 @@ 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->mb_lmin    = output_codec_ctx->qmin * FF_QP2LAMBDA;
+	output_codec_ctx->mb_lmax    = output_codec_ctx->qmax * FF_QP2LAMBDA;
 	output_codec_ctx->flags      |= CODEC_FLAG_QSCALE;
 	output_codec_ctx->global_quality = output_codec_ctx->qmin * FF_QP2LAMBDA;
 
@@ -276,7 +276,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;
@@ -306,7 +307,7 @@ static int am7xxx_play(const char *input_format_string,
 	}
 
 	/* allocate an input frame */
-	picture_raw = avcodec_alloc_frame();
+	picture_raw = av_frame_alloc();
 	if (picture_raw == NULL) {
 		fprintf(stderr, "cannot allocate the raw picture frame!\n");
 		ret = -ENOMEM;
@@ -314,12 +315,15 @@ static int am7xxx_play(const char *input_format_string,
 	}
 
 	/* allocate output frame */
-	picture_scaled = avcodec_alloc_frame();
+	picture_scaled = av_frame_alloc();
 	if (picture_scaled == NULL) {
 		fprintf(stderr, "cannot allocate the scaled picture!\n");
 		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,
@@ -354,6 +358,7 @@ static int am7xxx_play(const char *input_format_string,
 		goto cleanup_out_buf;
 	}
 
+	got_packet = 0;
 	while (run) {
 		/* read packet */
 		ret = av_read_frame(input_ctx.format_ctx, &in_packet);
@@ -381,11 +386,11 @@ static int am7xxx_play(const char *input_format_string,
 			goto end_while;
 		}
 
-		/* if we get the complete frame */
+		/* if we got the complete frame */
 		if (got_picture) {
 			/* convert it to YUV */
 			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,
@@ -416,15 +421,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,
@@ -434,7 +443,7 @@ 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;
 			}
@@ -449,9 +458,9 @@ end_while:
 cleanup_out_buf:
 	av_free(out_buf);
 cleanup_picture_scaled:
-	av_free(picture_scaled);
+	av_frame_free(&picture_scaled);
 cleanup_picture_raw:
-	av_free(picture_raw);
+	av_frame_free(&picture_raw);
 
 cleanup_output:
 	/* av_free is needed as well,
@@ -593,6 +602,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");
@@ -610,8 +622,8 @@ static void usage(char *name)
 	       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-z <zoom mode>\t\tthe display zoom mode, between %d (original) and %d (tele)\n",
+	       AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TELE);
 	printf("\t-h \t\t\tthis help message\n");
 	printf("\n\nEXAMPLES OF USE:\n");
 	printf("\t%s -f x11grab -i :0.0 -o video_size=800x480\n", name);
@@ -640,8 +652,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);
@@ -651,6 +664,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;
@@ -757,11 +776,12 @@ int main(int argc, char *argv[])
 			case AM7XXX_ZOOM_H:
 			case AM7XXX_ZOOM_H_V:
 			case AM7XXX_ZOOM_TEST:
+			case AM7XXX_ZOOM_TELE:
 				fprintf(stdout, "Zoom: %d\n", zoom);
 				break;
 			default:
 				fprintf(stderr, "Invalid zoom mode value, must be between %d and %d\n",
-					AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
+					AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TELE);
 				ret = -EINVAL;
 				goto out;
 			}
@@ -848,7 +868,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;