debian/changelog: release package version 0.1.6-2

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

diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index 5aa53ae..6b0d206 100644 (file)
--- 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)
  *
 /*
  * 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
  *
  * 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


@@ -17,6 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * 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>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>


@@ -29,6 +35,13 @@
 
 #include <am7xxx.h>
 
 
 #include <am7xxx.h>
 

+/* On some systems ENOTSUP is not defined, fallback to its value on
+ * linux which is equal to EOPNOTSUPP which is 95
+ */
+#ifndef ENOTSUP
+#define ENOTSUP 95
+#endif
+

 static unsigned int run = 1;
 
 struct video_input_ctx {
 static unsigned int run = 1;
 
 struct video_input_ctx {


@@ -84,7 +97,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) {
        /* 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;
        }
 
                goto cleanup;
        }
 


@@ -115,7 +128,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) {
        /* 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;
        }
                ret = -ENOTSUP;
                goto cleanup;
        }


@@ -163,7 +176,7 @@ static int video_output_init(struct video_output_ctx *output_ctx,
        int ret;
 
        if (input_ctx == NULL) {
        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;
        }
                ret = -EINVAL;
                goto out;
        }


@@ -171,7 +184,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) {
        /* 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;
        }
                ret = -ENOMEM;
                goto out;
        }


@@ -193,23 +206,25 @@ static int video_output_init(struct video_output_ctx *output_ctx,
        output_codec_ctx->bit_rate   = (input_ctx->codec_ctx)->bit_rate;
        output_codec_ctx->width      = new_output_width;
        output_codec_ctx->height     = new_output_height;
        output_codec_ctx->bit_rate   = (input_ctx->codec_ctx)->bit_rate;
        output_codec_ctx->width      = new_output_width;
        output_codec_ctx->height     = new_output_height;

-       output_codec_ctx->time_base.num  = (input_ctx->codec_ctx)->time_base.num;
-       output_codec_ctx->time_base.den  = (input_ctx->codec_ctx)->time_base.den;
+       output_codec_ctx->time_base.num  =
+               (input_ctx->format_ctx)->streams[input_ctx->video_stream_index]->time_base.num;
+       output_codec_ctx->time_base.den  =
+               (input_ctx->format_ctx)->streams[input_ctx->video_stream_index]->time_base.den;

 
        /* When the raw format is requested we don't actually need to setup
         * and open a decoder
         */
        if (image_format == AM7XXX_IMAGE_FORMAT_NV12) {
                fprintf(stdout, "using raw output format\n");
 
        /* When the raw format is requested we don't actually need to setup
         * and open a decoder
         */
        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_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 */
        output_codec_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
 
        /* Set quality and other VBR settings */


@@ -220,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;
         * 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;
 
        output_codec_ctx->flags      |= CODEC_FLAG_QSCALE;
        output_codec_ctx->global_quality = output_codec_ctx->qmin * FF_QP2LAMBDA;
 


@@ -261,7 +276,8 @@ static int am7xxx_play(const char *input_format_string,
                       unsigned int upscale,
                       unsigned int quality,
                       am7xxx_image_format image_format,
                       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;
 {
        struct video_input_ctx input_ctx;
        struct video_output_ctx output_ctx;


@@ -270,10 +286,13 @@ static int am7xxx_play(const char *input_format_string,
        int out_buf_size;
        uint8_t *out_buf;
        int out_picture_size;
        int out_buf_size;
        uint8_t *out_buf;
        int out_picture_size;

+       uint8_t *out_picture;

        struct SwsContext *sw_scale_ctx;
        struct SwsContext *sw_scale_ctx;

-       AVPacket packet;
+       AVPacket in_packet;
+       AVPacket out_packet;

        int got_picture;
        int got_picture;

-       int ret = 0;
+       int got_packet;
+       int ret;

 
        ret = video_input_init(&input_ctx, input_format_string, input_path, input_options);
        if (ret < 0) {
 
        ret = video_input_init(&input_ctx, input_format_string, input_path, input_options);
        if (ret < 0) {


@@ -288,20 +307,23 @@ static int am7xxx_play(const char *input_format_string,
        }
 
        /* allocate an input frame */
        }
 
        /* allocate an input frame */

-       picture_raw = avcodec_alloc_frame();
+       picture_raw = av_frame_alloc();

        if (picture_raw == NULL) {
        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;
        }
 
        /* allocate output frame */
                ret = -ENOMEM;
                goto cleanup_output;
        }
 
        /* 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;
        }
        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,
 
        /* 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,


@@ -336,9 +358,10 @@ static int am7xxx_play(const char *input_format_string,
                goto cleanup_out_buf;
        }
 
                goto cleanup_out_buf;
        }
 

+       got_packet = 0;

        while (run) {
                /* read packet */
        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;
                if (ret < 0) {
                        if (ret == (int)AVERROR_EOF || input_ctx.format_ctx->pb->eof_reached)
                                ret = 0;


@@ -348,7 +371,7 @@ static int am7xxx_play(const char *input_format_string,
                        goto end_while;
                }
 
                        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;
                        /* that is more or less a "continue", but there is
                         * still the packet to free */
                        goto end_while;


@@ -356,18 +379,18 @@ static int am7xxx_play(const char *input_format_string,
 
                /* decode */
                got_picture = 0;
 
                /* 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;
                        goto end_while;
                }
 
                if (ret < 0) {
                        fprintf(stderr, "cannot decode video\n");
                        run = 0;
                        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,
                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,
                                  picture_raw->linesize,
                                  0,
                                  (input_ctx.codec_ctx)->height,


@@ -375,57 +398,69 @@ static int am7xxx_play(const char *input_format_string,
                                  picture_scaled->linesize);
 
                        if (output_ctx.raw_output) {
                                  picture_scaled->linesize);
 
                        if (output_ctx.raw_output) {

+                               out_picture = out_buf;

                                out_picture_size = out_buf_size;
                        } else {
                                picture_scaled->quality = (output_ctx.codec_ctx)->global_quality;
                                out_picture_size = out_buf_size;
                        } else {
                                picture_scaled->quality = (output_ctx.codec_ctx)->global_quality;

-                               /* TODO: switch to avcodec_encode_video2() eventually */
-                               out_picture_size = avcodec_encode_video(output_ctx.codec_ctx,
-                                                                       out_buf,
-                                                                       out_buf_size,
-                                                                       picture_scaled);
-                               if (out_picture_size < 0) {
+                               av_init_packet(&out_packet);
+                               out_packet.data = NULL;
+                               out_packet.size = 0;
+                               got_packet = 0;
+                               ret = avcodec_encode_video2(output_ctx.codec_ctx,
+                                                           &out_packet,
+                                                           picture_scaled,
+                                                           &got_packet);
+                               if (ret < 0 || !got_packet) {

                                        fprintf(stderr, "cannot encode video\n");
                                        fprintf(stderr, "cannot encode video\n");

-                                       ret = out_picture_size;

                                        run = 0;
                                        goto end_while;
                                }
                                        run = 0;
                                        goto end_while;
                                }

+
+                               out_picture = out_packet.data;
+                               out_picture_size = out_packet.size;

                        }
 
 #ifdef DEBUG
                        }
 
 #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_buf, 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
 
 #endif
 

-                       ret = am7xxx_send_image(dev,
-                                               image_format,
-                                               (output_ctx.codec_ctx)->width,
-                                               (output_ctx.codec_ctx)->height,
-                                               out_buf,
-                                               out_picture_size);
+                       ret = am7xxx_send_image_async(dev,
+                                                     image_format,
+                                                     (output_ctx.codec_ctx)->width,
+                                                     (output_ctx.codec_ctx)->height,
+                                                     out_picture,
+                                                     out_picture_size);

                        if (ret < 0) {
                        if (ret < 0) {

-                               perror("am7xxx_send_image");
+                               perror("am7xxx_send_image_async");

                                run = 0;
                                goto end_while;
                        }
                }
 end_while:
                                run = 0;
                                goto end_while;
                        }
                }
 end_while:

-               av_free_packet(&packet);
+               if (!output_ctx.raw_output && got_packet)
+                       av_free_packet(&out_packet);
+               av_free_packet(&in_packet);

        }
 
        sws_freeContext(sw_scale_ctx);
 cleanup_out_buf:
        av_free(out_buf);
 cleanup_picture_scaled:
        }
 
        sws_freeContext(sw_scale_ctx);
 cleanup_out_buf:
        av_free(out_buf);
 cleanup_picture_scaled:

-       av_free(picture_scaled);
+       av_frame_free(&picture_scaled);

 cleanup_picture_raw:
 cleanup_picture_raw:

-       av_free(picture_raw);
+       av_frame_free(&picture_raw);

 
 cleanup_output:
        /* av_free is needed as well,
 
 cleanup_output:
        /* av_free is needed as well,


@@ -524,11 +559,12 @@ static void unset_run(int signo)
        run = 0;
 }
 
        run = 0;
 }
 

+#ifdef HAVE_SIGACTION

 static int set_signal_handler(void (*signal_handler)(int))
 {
        struct sigaction new_action;
        struct sigaction old_action;
 static int set_signal_handler(void (*signal_handler)(int))
 {
        struct sigaction new_action;
        struct sigaction old_action;

-       int ret = 0;
+       int ret;

 
        new_action.sa_handler = signal_handler;
        sigemptyset(&new_action.sa_mask);
 
        new_action.sa_handler = signal_handler;
        sigemptyset(&new_action.sa_mask);


@@ -551,11 +587,24 @@ static int set_signal_handler(void (*signal_handler)(int))
 out:
        return ret;
 }
 out:
        return ret;
 }

+#else
+static int set_signal_handler(void (*signal_handler)(int))
+{
+       (void)signal_handler;
+       fprintf(stderr, "set_signal_handler() not implemented, sigaction not available\n");
+       return 0;
+}
+#endif
+

 
 static void usage(char *name)
 {
        printf("usage: %s [OPTIONS]\n\n", name);
        printf("OPTIONS:\n");
 
 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");
        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");


@@ -569,8 +618,12 @@ static void usage(char *name)
        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\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-p <power mode>\t\tthe power mode of device, between %d (off) and %d (turbo)\n",
+              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 (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);
        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);


@@ -593,13 +646,30 @@ int main(int argc, char *argv[])
        unsigned int upscale = 0;
        unsigned int quality = 95;
        int log_level = AM7XXX_LOG_INFO;
        unsigned int upscale = 0;
        unsigned int quality = 95;
        int log_level = AM7XXX_LOG_INFO;

-       am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
+       int device_index = 0;
+       int power_mode = AM7XXX_POWER_LOW;
+       int zoom = AM7XXX_ZOOM_ORIGINAL;

        int format = AM7XXX_IMAGE_FORMAT_JPEG;
        am7xxx_context *ctx;
        am7xxx_device *dev;
        int format = AM7XXX_IMAGE_FORMAT_JPEG;
        am7xxx_context *ctx;
        am7xxx_device *dev;

+       int dump_frame = 0;

 
 

-       while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:hp:")) != -1) {
+       while ((opt = getopt(argc, argv, "d:Df:i:o:s:uF:q:l:p:z:h")) != -1) {

                switch (opt) {
                switch (opt) {

+               case 'd':
+                       device_index = atoi(optarg);
+                       if (device_index < 0) {
+                               fprintf(stderr, "Unsupported device index\n");
+                               ret = -EINVAL;
+                               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;
                case 'f':
                        input_format_string = strdup(optarg);
                        break;


@@ -607,13 +677,14 @@ int main(int argc, char *argv[])
                        input_path = strdup(optarg);
                        break;
                case 'o':
                        input_path = strdup(optarg);
                        break;
                case 'o':

+#ifdef HAVE_STRTOK_R

                        /*
                         * parse suboptions, the expected format is something
                         * like:
                         *   draw_mouse=1,framerate=100,video_size=800x480
                         */
                        subopts = subopts_saved = strdup(optarg);
                        /*
                         * parse suboptions, the expected format is something
                         * like:
                         *   draw_mouse=1,framerate=100,video_size=800x480
                         */
                        subopts = subopts_saved = strdup(optarg);

-                       while((subopt = strtok_r(subopts, ",", &subopts))) {
+                       while ((subopt = strtok_r(subopts, ",", &subopts))) {

                                char *subopt_name = strtok_r(subopt, "=", &subopt);
                                char *subopt_value = strtok_r(NULL, "", &subopt);
                                if (subopt_value == NULL) {
                                char *subopt_name = strtok_r(subopt, "=", &subopt);
                                char *subopt_value = strtok_r(NULL, "", &subopt);
                                if (subopt_value == NULL) {


@@ -623,6 +694,9 @@ int main(int argc, char *argv[])
                                av_dict_set(&options, subopt_name, subopt_value, 0);
                        }
                        free(subopts_saved);
                                av_dict_set(&options, subopt_name, subopt_value, 0);
                        }
                        free(subopts_saved);

+#else
+                       fprintf(stderr, "Option '-o' not implemented\n");
+#endif

                        break;
                case 's':
                        rescale_method = atoi(optarg);
                        break;
                case 's':
                        rescale_method = atoi(optarg);


@@ -678,11 +752,6 @@ int main(int argc, char *argv[])
                                log_level = AM7XXX_LOG_ERROR;
                        }
                        break;
                                log_level = AM7XXX_LOG_ERROR;
                        }
                        break;

-               case 'h':
-                       usage(argv[0]);
-                       ret = 0;
-                       goto out;
-                       break;

                case 'p':
                        power_mode = atoi(optarg);
                        switch(power_mode) {
                case 'p':
                        power_mode = atoi(optarg);
                        switch(power_mode) {


@@ -691,14 +760,36 @@ int main(int argc, char *argv[])
                        case AM7XXX_POWER_MIDDLE:
                        case AM7XXX_POWER_HIGH:
                        case AM7XXX_POWER_TURBO:
                        case AM7XXX_POWER_MIDDLE:
                        case AM7XXX_POWER_HIGH:
                        case AM7XXX_POWER_TURBO:

-                               fprintf(stdout, "Power mode: %x\n", power_mode);
+                               fprintf(stdout, "Power mode: %d\n", power_mode);
+                               break;
+                       default:
+                               fprintf(stderr, "Invalid power mode value, must be between %d and %d\n",
+                                       AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+                               ret = -EINVAL;
+                               goto out;
+                       }
+                       break;
+               case 'z':
+                       zoom = atoi(optarg);
+                       switch(zoom) {
+                       case AM7XXX_ZOOM_ORIGINAL:
+                       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:
                                break;
                        default:

-                               fprintf(stderr, "Invalid power mode value, must be between %x and %x\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+                               fprintf(stderr, "Invalid zoom mode value, must be between %d and %d\n",
+                                       AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TELE);

                                ret = -EINVAL;
                                goto out;
                        }
                        break;
                                ret = -EINVAL;
                                goto out;
                        }
                        break;

+               case 'h':
+                       usage(argv[0]);
+                       ret = 0;
+                       goto out;

                default: /* '?' */
                        usage(argv[0]);
                        ret = -EINVAL;
                default: /* '?' */
                        usage(argv[0]);
                        ret = -EINVAL;


@@ -707,7 +798,8 @@ int main(int argc, char *argv[])
        }
 
        if (input_path == NULL) {
        }
 
        if (input_path == NULL) {

-               fprintf(stderr, "The -i option must always be passed\n");
+               fprintf(stderr, "The -i option must always be passed\n\n");
+               usage(argv[0]);

                ret = -EINVAL;
                goto out;
        }
                ret = -EINVAL;
                goto out;
        }


@@ -747,18 +839,28 @@ int main(int argc, char *argv[])
 
        am7xxx_set_log_level(ctx, log_level);
 
 
        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;
        }
 
        if (ret < 0) {
                perror("am7xxx_open_device");
                goto cleanup;
        }
 

+       ret = am7xxx_set_zoom_mode(dev, zoom);
+       if (ret < 0) {
+               perror("am7xxx_set_zoom_mode");
+               goto cleanup;
+       }
+

        ret = am7xxx_set_power_mode(dev, power_mode);
        if (ret < 0) {
                perror("am7xxx_set_power_mode");
                goto cleanup;
        }
 
        ret = am7xxx_set_power_mode(dev, power_mode);
        if (ret < 0) {
                perror("am7xxx_set_power_mode");
                goto cleanup;
        }
 

+       /* When setting AM7XXX_ZOOM_TEST don't display the actual image */
+       if (zoom == AM7XXX_ZOOM_TEST)
+               goto cleanup;
+

        ret = am7xxx_play(input_format_string,
                          &options,
                          input_path,
        ret = am7xxx_play(input_format_string,
                          &options,
                          input_path,


@@ -766,7 +868,8 @@ int main(int argc, char *argv[])
                          upscale,
                          quality,
                          format,
                          upscale,
                          quality,
                          format,

-                         dev);
+                         dev,
+                         dump_frame);

        if (ret < 0) {
                fprintf(stderr, "am7xxx_play failed\n");
                goto cleanup;
        if (ret < 0) {
                fprintf(stderr, "am7xxx_play failed\n");
                goto cleanup;