am7xxx: fix setting the USB configuration

[libam7xxx.git] / examples / am7xxx-play.c

diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index a29212c..2fc8763 100644 (file)
--- a/examples/am7xxx-play.c
+++ b/examples/am7xxx-play.c
@@ -17,6 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * @example examples/am7xxx-play.c
+ * am7xxx-play uses libavdevice, libavformat, libavcodec and libswscale to
+ * decode the input, encode it to jpeg and display it with libam7xxx.
+ */
+
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -84,7 +90,7 @@ static int video_input_init(struct video_input_ctx *input_ctx,
        /* get information on the input stream (e.g. format, bitrate, framerate) */
        ret = avformat_find_stream_info(input_format_ctx, NULL);
        if (ret < 0) {
-               fprintf(stderr, "cannot get information on the stream");
+               fprintf(stderr, "cannot get information on the stream\n");
                goto cleanup;
        }
 
@@ -115,7 +121,7 @@ static int video_input_init(struct video_input_ctx *input_ctx,
        /* find the decoder for the video stream */
        input_codec = avcodec_find_decoder(input_codec_ctx->codec_id);
        if (input_codec == NULL) {
-               fprintf(stderr, "input_codec is NULL!");
+               fprintf(stderr, "input_codec is NULL!\n");
                ret = -ENOTSUP;
                goto cleanup;
        }
@@ -163,7 +169,7 @@ static int video_output_init(struct video_output_ctx *output_ctx,
        int ret;
 
        if (input_ctx == NULL) {
-               fprintf(stderr, "input_ctx must not be NULL!");
+               fprintf(stderr, "input_ctx must not be NULL!\n");
                ret = -EINVAL;
                goto out;
        }
@@ -171,7 +177,7 @@ static int video_output_init(struct video_output_ctx *output_ctx,
        /* create the encoder context */
        output_codec_ctx = avcodec_alloc_context3(NULL);
        if (output_codec_ctx == NULL) {
-               fprintf(stderr, "cannot allocate output codec context!");
+               fprintf(stderr, "cannot allocate output codec context!\n");
                ret = -ENOMEM;
                goto out;
        }
@@ -290,7 +296,8 @@ static int am7xxx_play(const char *input_format_string,
        /* allocate an input frame */
        picture_raw = avcodec_alloc_frame();
        if (picture_raw == NULL) {
-               fprintf(stderr, "cannot allocate the raw picture frame!");
+               fprintf(stderr, "cannot allocate the raw picture frame!\n");
+               ret = -ENOMEM;
                goto cleanup_output;
        }
 
@@ -298,6 +305,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 +316,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 +338,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 +574,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 +598,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:p:h")) != -1) {
                switch (opt) {
                case 'f':
                        input_format_string = strdup(optarg);
@@ -620,7 +632,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:
@@ -636,7 +648,7 @@ int main(int argc, char *argv[])
                        default:
                                fprintf(stderr, "Unsupported rescale method\n");
                                ret = -EINVAL;
-                               goto out;;
+                               goto out;
                        }
                        break;
                case 'u':
@@ -654,7 +666,7 @@ int main(int argc, char *argv[])
                        default:
                                fprintf(stderr, "Unsupported format\n");
                                ret = -EINVAL;
-                               goto out;;
+                               goto out;
                        }
                        break;
                case 'q':
@@ -662,13 +674,15 @@ 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 'h':
-                       usage(argv[0]);
-                       ret = 0;
-                       goto out;
+               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 'p':
                        power_mode = atoi(optarg);
@@ -686,6 +700,11 @@ int main(int argc, char *argv[])
                                goto out;
                        }
                        break;
+               case 'h':
+                       usage(argv[0]);
+                       ret = 0;
+                       goto out;
+                       break;
                default: /* '?' */
                        usage(argv[0]);
                        ret = -EINVAL;
@@ -732,6 +751,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");