am7xxx-play: remove an unreachable break

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

diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index 352ba2f..0b1fa65 100644 (file)
--- a/examples/am7xxx-play.c
+++ b/examples/am7xxx-play.c
@@ -286,7 +286,7 @@ static int am7xxx_play(const char *input_format_string,
        uint8_t *out_buf;
        int out_picture_size;
        struct SwsContext *sw_scale_ctx;
        uint8_t *out_buf;
        int out_picture_size;
        struct SwsContext *sw_scale_ctx;

-       AVPacket packet;
+       AVPacket in_packet;

        int got_picture;
        int ret = 0;
 
        int got_picture;
        int ret = 0;
 


@@ -353,7 +353,7 @@ static int am7xxx_play(const char *input_format_string,
 
        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;


@@ -363,7 +363,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;


@@ -371,7 +371,7 @@ 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;
                if (ret < 0) {
                        fprintf(stderr, "cannot decode video\n");
                        run = 0;


@@ -431,7 +431,7 @@ static int am7xxx_play(const char *input_format_string,
                        }
                }
 end_while:
                        }
                }
 end_while:

-               av_free_packet(&packet);
+               av_free_packet(&in_packet);

        }
 
        sws_freeContext(sw_scale_ctx);
        }
 
        sws_freeContext(sw_scale_ctx);


@@ -581,6 +581,7 @@ static void usage(char *name)
 {
        printf("usage: %s [OPTIONS]\n\n", name);
        printf("OPTIONS:\n");
 {
        printf("usage: %s [OPTIONS]\n\n", name);
        printf("OPTIONS:\n");

+       printf("\t-d <index>\t\tthe device index (default is 0)\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");
        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");


@@ -594,8 +595,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 (test)\n",
+              AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);

        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);


@@ -618,13 +623,23 @@ 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;

+       int device_index = 0;

        am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
        am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;

+       am7xxx_zoom_mode 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;
 

-       while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:p:h")) != -1) {
+       while ((opt = getopt(argc, argv, "d:f: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 'f':
                        input_format_string = strdup(optarg);
                        break;
                case 'f':
                        input_format_string = strdup(optarg);
                        break;


@@ -632,6 +647,7 @@ 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:
                        /*
                         * parse suboptions, the expected format is something
                         * like:


@@ -648,6 +664,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);


@@ -711,19 +730,34 @@ 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:
                                break;
                        default:

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

                                ret = -EINVAL;
                                goto out;
                        }
                        break;
                                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:
+                               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);
+                               exit(EXIT_FAILURE);
+                       }
+                       break;

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

-                       break;

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


@@ -772,18 +806,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,