X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/24924e4869890878be88a1c6c324d2fe9ee8f087..f02525e0c94885e18a7cff407d87184db6b9c0ff:/examples/am7xxx-play.c

diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index f7e069a..5aa53ae 100644
--- a/examples/am7xxx-play.c
+++ b/examples/am7xxx-play.c
@@ -291,6 +291,7 @@ static int am7xxx_play(const char *input_format_string,
 	picture_raw = avcodec_alloc_frame();
 	if (picture_raw == NULL) {
 		fprintf(stderr, "cannot allocate the raw picture frame!");
+		ret = -ENOMEM;
 		goto cleanup_output;
 	}
 
@@ -298,6 +299,7 @@ static int am7xxx_play(const char *input_format_string,
 	picture_scaled = avcodec_alloc_frame();
 	if (picture_scaled == NULL) {
 		fprintf(stderr, "cannot allocate the scaled picture!\n");
+		ret = -ENOMEM;
 		goto cleanup_picture_raw;
 	}
 
@@ -308,6 +310,7 @@ static int am7xxx_play(const char *input_format_string,
 	out_buf = av_malloc(out_buf_size * sizeof(uint8_t));
 	if (out_buf == NULL) {
 		fprintf(stderr, "cannot allocate output data buffer!\n");
+		ret = -ENOMEM;
 		goto cleanup_picture_scaled;
 	}
 
@@ -329,6 +332,7 @@ static int am7xxx_play(const char *input_format_string,
 					    NULL, NULL, NULL);
 	if (sw_scale_ctx == NULL) {
 		fprintf(stderr, "cannot set up the rescaling context!\n");
+		ret = -EINVAL;
 		goto cleanup_out_buf;
 	}
 
@@ -557,13 +561,16 @@ static void usage(char *name)
 	printf("\t-o <options>\t\ta comma separated list of input format options\n");
 	printf("\t\t\t\tEXAMPLE:\n");
 	printf("\t\t\t\t\t-o draw_mouse=1,framerate=100,video_size=800x480\n");
-	printf("\t-s <input path>\t\tthe rescaling method (see swscale.h)\n");
+	printf("\t-s <scaling method>\tthe rescaling method (see swscale.h)\n");
 	printf("\t-u \t\t\tupscale the image if smaller than the display dimensions\n");
 	printf("\t-F <format>\t\tthe image format to use (default is JPEG)\n");
 	printf("\t\t\t\tSUPPORTED FORMATS:\n");
 	printf("\t\t\t\t\t1 - JPEG\n");
 	printf("\t\t\t\t\t2 - NV12\n");
-	printf("\t-q \t\t\tquality of jpeg sent to the device, between 1 and 100\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-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);
@@ -585,11 +592,13 @@ int main(int argc, char *argv[])
 	unsigned int rescale_method = SWS_BICUBIC;
 	unsigned int upscale = 0;
 	unsigned int quality = 95;
+	int log_level = AM7XXX_LOG_INFO;
+	am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
 	int format = AM7XXX_IMAGE_FORMAT_JPEG;
 	am7xxx_context *ctx;
 	am7xxx_device *dev;
 
-	while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:h")) != -1) {
+	while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:hp:")) != -1) {
 		switch (opt) {
 		case 'f':
 			input_format_string = strdup(optarg);
@@ -617,7 +626,7 @@ int main(int argc, char *argv[])
 			break;
 		case 's':
 			rescale_method = atoi(optarg);
-			switch(format) {
+			switch(rescale_method) {
 			case SWS_FAST_BILINEAR:
 			case SWS_BILINEAR:
 			case SWS_BICUBIC:
@@ -633,7 +642,7 @@ int main(int argc, char *argv[])
 			default:
 				fprintf(stderr, "Unsupported rescale method\n");
 				ret = -EINVAL;
-				goto out;;
+				goto out;
 			}
 			break;
 		case 'u':
@@ -651,7 +660,7 @@ int main(int argc, char *argv[])
 			default:
 				fprintf(stderr, "Unsupported format\n");
 				ret = -EINVAL;
-				goto out;;
+				goto out;
 			}
 			break;
 		case 'q':
@@ -659,7 +668,14 @@ int main(int argc, char *argv[])
 			if (quality < 1 || quality > 100) {
 				fprintf(stderr, "Invalid quality value, must be between 1 and 100\n");
 				ret = -EINVAL;
-				goto out;;
+				goto out;
+			}
+			break;
+		case 'l':
+			log_level = atoi(optarg);
+			if (log_level < AM7XXX_LOG_FATAL || log_level > AM7XXX_LOG_TRACE) {
+				fprintf(stderr, "Unsupported log level, falling back to AM7XXX_LOG_ERROR\n");
+				log_level = AM7XXX_LOG_ERROR;
 			}
 			break;
 		case 'h':
@@ -667,6 +683,22 @@ int main(int argc, char *argv[])
 			ret = 0;
 			goto out;
 			break;
+		case 'p':
+			power_mode = atoi(optarg);
+			switch(power_mode) {
+			case AM7XXX_POWER_OFF:
+			case AM7XXX_POWER_LOW:
+			case AM7XXX_POWER_MIDDLE:
+			case AM7XXX_POWER_HIGH:
+			case AM7XXX_POWER_TURBO:
+				fprintf(stdout, "Power mode: %x\n", power_mode);
+				break;
+			default:
+				fprintf(stderr, "Invalid power mode value, must be between %x and %x\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+				ret = -EINVAL;
+				goto out;
+			}
+			break;
 		default: /* '?' */
 			usage(argv[0]);
 			ret = -EINVAL;
@@ -713,13 +745,15 @@ int main(int argc, char *argv[])
 		goto out;
 	}
 
+	am7xxx_set_log_level(ctx, log_level);
+
 	ret = am7xxx_open_device(ctx, &dev, 0);
 	if (ret < 0) {
 		perror("am7xxx_open_device");
 		goto cleanup;
 	}
 
-	ret = am7xxx_set_power_mode(dev, AM7XXX_POWER_LOW);
+	ret = am7xxx_set_power_mode(dev, power_mode);
 	if (ret < 0) {
 		perror("am7xxx_set_power_mode");
 		goto cleanup;