From: Antonio Ospite <ospite@studenti.unina.it>
Date: Wed, 21 Mar 2012 10:45:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/rettichschnidi' into unstable
X-Git-Tag: v0.1.0~1^2~9
X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/f02525e0c94885e18a7cff407d87184db6b9c0ff?hp=f4ddb64dbbc9703a77cfab149a13d0276f1a11e2

Merge remote-tracking branch 'origin/rettichschnidi' into unstable

Conflicts:
	examples/am7xxx-play.c
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aba2d43..9950111 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ if (CMAKE_COMPILER_IS_GNUCC)
 
   # let CFLAGS env override this
   if(CMAKE_C_FLAGS STREQUAL "")
-    set(CMAKE_C_FLAGS "-std=c99 -pedantic -Wall -Wextra -O2")
+    set(CMAKE_C_FLAGS "-std=c99 -pedantic -Wall -Wextra")
   endif()
 
   # Don't make pedantic checks errors,
@@ -74,7 +74,7 @@ if (CMAKE_COMPILER_IS_GNUCC)
     --param=ssp-buffer-size=4)
 endif()
 
-set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG=1 -Werror")
+set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb -DDEBUG=1 -Werror")
 set(CMAKE_C_FLAGS_RELEASE "-O2")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
 
diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index 9961a8e..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;
 	}
 
@@ -564,6 +568,7 @@ static void usage(char *name)
 	printf("\t\t\t\t\t1 - JPEG\n");
 	printf("\t\t\t\t\t2 - NV12\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");
@@ -587,12 +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:hp:")) != -1) {
+	while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:hp:")) != -1) {
 		switch (opt) {
 		case 'f':
 			input_format_string = strdup(optarg);
@@ -665,6 +671,13 @@ int main(int argc, char *argv[])
 				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':
 			usage(argv[0]);
 			ret = 0;
@@ -732,6 +745,8 @@ 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");