diff options
| -rw-r--r-- | examples/vp8cx_set_ref.c | 2 | ||||
| -rw-r--r-- | examples/vp9_spatial_svc_encoder.c | 6 | ||||
| -rw-r--r-- | test/test-data.mk | 6 | ||||
| -rw-r--r-- | test/test-data.sha1 | 2 | ||||
| -rw-r--r-- | test/test_vectors.cc | 3 | ||||
| -rw-r--r-- | vp8/encoder/pickinter.c | 5 | ||||
| -rw-r--r-- | vp8/vp8_dx_iface.c | 38 | ||||
| -rw-r--r-- | vp9/common/vp9_blockd.c | 2 | ||||
| -rw-r--r-- | vpxdec.c | 85 | ||||
| -rw-r--r-- | vpxenc.c | 330 |
10 files changed, 237 insertions, 242 deletions
diff --git a/examples/vp8cx_set_ref.c b/examples/vp8cx_set_ref.c index b0961a2b3..5e29d8083 100644 --- a/examples/vp8cx_set_ref.c +++ b/examples/vp8cx_set_ref.c @@ -178,7 +178,7 @@ int main(int argc, char **argv) { } // Flush encoder. - while (encode_frame(&codec, NULL, -1, writer)) {}; + while (encode_frame(&codec, NULL, -1, writer)) {} printf("\n"); fclose(infile); diff --git a/examples/vp9_spatial_svc_encoder.c b/examples/vp9_spatial_svc_encoder.c index 10d538861..53ede94d8 100644 --- a/examples/vp9_spatial_svc_encoder.c +++ b/examples/vp9_spatial_svc_encoder.c @@ -183,7 +183,7 @@ static void parse_command_line(int argc, const char **argv_, enc_cfg->kf_min_dist = arg_parse_uint(&arg); enc_cfg->kf_max_dist = enc_cfg->kf_min_dist; } else if (arg_match(&arg, &scale_factors_arg, argi)) { - snprintf(string_options, 1024, "%s scale-factors=%s", + snprintf(string_options, sizeof(string_options), "%s scale-factors=%s", string_options, arg.val); } else if (arg_match(&arg, &passes_arg, argi)) { passes = arg_parse_uint(&arg); @@ -198,10 +198,10 @@ static void parse_command_line(int argc, const char **argv_, } else if (arg_match(&arg, &fpf_name_arg, argi)) { fpf_file_name = arg.val; } else if (arg_match(&arg, &min_q_arg, argi)) { - snprintf(string_options, 1024, "%s min-quantizers=%s", + snprintf(string_options, sizeof(string_options), "%s min-quantizers=%s", string_options, arg.val); } else if (arg_match(&arg, &max_q_arg, argi)) { - snprintf(string_options, 1024, "%s max-quantizers=%s", + snprintf(string_options, sizeof(string_options), "%s max-quantizers=%s", string_options, arg.val); } else if (arg_match(&arg, &min_bitrate_arg, argi)) { min_bitrate = arg_parse_uint(&arg); diff --git a/test/test-data.mk b/test/test-data.mk index 404c166f4..c50b1c746 100644 --- a/test/test-data.mk +++ b/test/test-data.mk @@ -644,10 +644,12 @@ LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-17-show-existing-frame.webm LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-17-show-existing-frame.webm.md5 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-18-resize.ivf LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-18-resize.ivf.md5 -LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip-01.webm -LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip-01.webm.md5 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip.webm LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip.webm.md5 +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip-01.webm +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip-01.webm.md5 +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip-02.webm +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-19-skip-02.webm.md5 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yuv444.webm LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yuv444.webm.md5 diff --git a/test/test-data.sha1 b/test/test-data.sha1 index e6114ab24..2dc64d334 100644 --- a/test/test-data.sha1 +++ b/test/test-data.sha1 @@ -691,6 +691,8 @@ bcdedaf168ac225575468fda77502d2dc9fd5baa invalid-vp90-2-09-subpixel-00.ivf.s195 368dccdde5288c13c25695d2eacdc7402cadf613 vp90-2-19-skip.webm.md5 ffe460282df2b0e7d4603c2158653ad96f574b02 vp90-2-19-skip-01.webm bd21bc9eda4a4a36b221d71ede3a139fc3c7bd85 vp90-2-19-skip-01.webm.md5 +178f5bd239e38cc1cc2657a7a5e1a9f52ad2d3fe vp90-2-19-skip-02.webm +9020d5e260bd7df08e2b3d4b86f8623cee3daea2 vp90-2-19-skip-02.webm.md5 b03c408cf23158638da18dbc3323b99a1635c68a invalid-vp90-2-12-droppable_1.ivf.s3676_r01-05_b6-.ivf 0a3884edb3fd8f9d9b500223e650f7de257b67d8 invalid-vp90-2-12-droppable_1.ivf.s3676_r01-05_b6-.ivf.res 5e67e24e7f53fd189e565513cef8519b1bd6c712 invalid-vp90-2-05-resize.ivf.s59293_r01-05_b6-.ivf diff --git a/test/test_vectors.cc b/test/test_vectors.cc index cccebf8f1..7efa8c05c 100644 --- a/test/test_vectors.cc +++ b/test/test_vectors.cc @@ -182,7 +182,8 @@ const char *const kVP9TestVectors[] = { "vp90-2-15-segkey.webm", "vp90-2-15-segkey_adpq.webm", "vp90-2-16-intra-only.webm", "vp90-2-17-show-existing-frame.webm", "vp90-2-18-resize.ivf", "vp90-2-19-skip.webm", - "vp90-2-19-skip-01.webm", "vp91-2-04-yuv444.webm", + "vp90-2-19-skip-01.webm", "vp90-2-19-skip-02.webm", + "vp91-2-04-yuv444.webm", }; const int kNumVP9TestVectors = NELEMENTS(kVP9TestVectors); #endif // CONFIG_VP9_DECODER diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index ea3b46eda..9d5556dcd 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -516,9 +516,8 @@ static int evaluate_inter_mode(unsigned int* sse, int rate2, int* distortion2, // Adjust rd for ZEROMV and LAST, if LAST is the closest reference frame. if (this_mode == ZEROMV && x->e_mbd.mode_info_context->mbmi.ref_frame == LAST_FRAME && - (denoise_aggressive || cpi->closest_reference_frame == LAST_FRAME)) - { - this_rd = ((int64_t)this_rd) * rd_adj / 100; + (denoise_aggressive || cpi->closest_reference_frame == LAST_FRAME)) { + this_rd = ((int64_t)this_rd) * rd_adj / 100; } check_for_encode_breakout(*sse, x); diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c index 3ab8ed0ad..5aa274dbb 100644 --- a/vp8/vp8_dx_iface.c +++ b/vp8/vp8_dx_iface.c @@ -112,22 +112,19 @@ static vpx_codec_err_t vp8_init(vpx_codec_ctx_t *ctx, * structure. More memory may be required at the time the stream * information becomes known. */ - if (!ctx->priv) - { - vp8_init_ctx(ctx); - priv = (vpx_codec_alg_priv_t *)ctx->priv; - - /* initialize number of fragments to zero */ - priv->fragments.count = 0; - /* is input fragments enabled? */ - priv->fragments.enabled = - (priv->base.init_flags & VPX_CODEC_USE_INPUT_FRAGMENTS); - - /*post processing level initialized to do nothing */ - } - else - { - priv = (vpx_codec_alg_priv_t *)ctx->priv; + if (!ctx->priv) { + vp8_init_ctx(ctx); + priv = (vpx_codec_alg_priv_t *)ctx->priv; + + /* initialize number of fragments to zero */ + priv->fragments.count = 0; + /* is input fragments enabled? */ + priv->fragments.enabled = + (priv->base.init_flags & VPX_CODEC_USE_INPUT_FRAGMENTS); + + /*post processing level initialized to do nothing */ + } else { + priv = (vpx_codec_alg_priv_t *)ctx->priv; } priv->yv12_frame_buffers.use_frame_threads = @@ -138,11 +135,10 @@ static vpx_codec_err_t vp8_init(vpx_codec_ctx_t *ctx, if (priv->yv12_frame_buffers.use_frame_threads && ((ctx->priv->init_flags & VPX_CODEC_USE_ERROR_CONCEALMENT) || - (ctx->priv->init_flags & VPX_CODEC_USE_INPUT_FRAGMENTS))) - { - /* row-based threading, error concealment, and input fragments will - * not be supported when using frame-based threading */ - res = VPX_CODEC_INVALID_PARAM; + (ctx->priv->init_flags & VPX_CODEC_USE_INPUT_FRAGMENTS))) { + /* row-based threading, error concealment, and input fragments will + * not be supported when using frame-based threading */ + res = VPX_CODEC_INVALID_PARAM; } return res; diff --git a/vp9/common/vp9_blockd.c b/vp9/common/vp9_blockd.c index e13445fd1..7094a0118 100644 --- a/vp9/common/vp9_blockd.c +++ b/vp9/common/vp9_blockd.c @@ -92,7 +92,7 @@ void vp9_foreach_transformed_block(const MACROBLOCKD* const xd, void *arg) { int plane; - for (plane = 0; plane < MAX_MB_PLANE; plane++) + for (plane = 0; plane < MAX_MB_PLANE; ++plane) vp9_foreach_transformed_block_in_plane(xd, bsize, plane, visit, arg); } @@ -47,52 +47,49 @@ struct VpxDecInputContext { struct WebmInputContext *webm_ctx; }; -static const arg_def_t looparg = ARG_DEF(NULL, "loops", 1, - "Number of times to decode the file"); -static const arg_def_t codecarg = ARG_DEF(NULL, "codec", 1, - "Codec to use"); -static const arg_def_t use_yv12 = ARG_DEF(NULL, "yv12", 0, - "Output raw YV12 frames"); -static const arg_def_t use_i420 = ARG_DEF(NULL, "i420", 0, - "Output raw I420 frames"); -static const arg_def_t flipuvarg = ARG_DEF(NULL, "flipuv", 0, - "Flip the chroma planes in the output"); -static const arg_def_t rawvideo = ARG_DEF(NULL, "rawvideo", 0, - "Output raw YUV frames"); -static const arg_def_t noblitarg = ARG_DEF(NULL, "noblit", 0, - "Don't process the decoded frames"); -static const arg_def_t progressarg = ARG_DEF(NULL, "progress", 0, - "Show progress after each frame decodes"); -static const arg_def_t limitarg = ARG_DEF(NULL, "limit", 1, - "Stop decoding after n frames"); -static const arg_def_t skiparg = ARG_DEF(NULL, "skip", 1, - "Skip the first n input frames"); -static const arg_def_t postprocarg = ARG_DEF(NULL, "postproc", 0, - "Postprocess decoded frames"); -static const arg_def_t summaryarg = ARG_DEF(NULL, "summary", 0, - "Show timing summary"); -static const arg_def_t outputfile = ARG_DEF("o", "output", 1, - "Output file name pattern (see below)"); -static const arg_def_t threadsarg = ARG_DEF("t", "threads", 1, - "Max threads to use"); -static const arg_def_t verbosearg = ARG_DEF("v", "verbose", 0, - "Show version string"); -static const arg_def_t error_concealment = ARG_DEF(NULL, "error-concealment", 0, - "Enable decoder error-concealment"); -static const arg_def_t scalearg = ARG_DEF("S", "scale", 0, - "Scale output frames uniformly"); -static const arg_def_t continuearg = - ARG_DEF("k", "keep-going", 0, "(debug) Continue decoding after error"); - -static const arg_def_t fb_arg = - ARG_DEF(NULL, "frame-buffers", 1, "Number of frame buffers to use"); - -static const arg_def_t md5arg = ARG_DEF(NULL, "md5", 0, - "Compute the MD5 sum of the decoded frame"); +static const arg_def_t looparg = ARG_DEF( + NULL, "loops", 1, "Number of times to decode the file"); +static const arg_def_t codecarg = ARG_DEF( + NULL, "codec", 1, "Codec to use"); +static const arg_def_t use_yv12 = ARG_DEF( + NULL, "yv12", 0, "Output raw YV12 frames"); +static const arg_def_t use_i420 = ARG_DEF( + NULL, "i420", 0, "Output raw I420 frames"); +static const arg_def_t flipuvarg = ARG_DEF( + NULL, "flipuv", 0, "Flip the chroma planes in the output"); +static const arg_def_t rawvideo = ARG_DEF( + NULL, "rawvideo", 0, "Output raw YUV frames"); +static const arg_def_t noblitarg = ARG_DEF( + NULL, "noblit", 0, "Don't process the decoded frames"); +static const arg_def_t progressarg = ARG_DEF( + NULL, "progress", 0, "Show progress after each frame decodes"); +static const arg_def_t limitarg = ARG_DEF( + NULL, "limit", 1, "Stop decoding after n frames"); +static const arg_def_t skiparg = ARG_DEF( + NULL, "skip", 1, "Skip the first n input frames"); +static const arg_def_t postprocarg = ARG_DEF( + NULL, "postproc", 0, "Postprocess decoded frames"); +static const arg_def_t summaryarg = ARG_DEF( + NULL, "summary", 0, "Show timing summary"); +static const arg_def_t outputfile = ARG_DEF( + "o", "output", 1, "Output file name pattern (see below)"); +static const arg_def_t threadsarg = ARG_DEF( + "t", "threads", 1, "Max threads to use"); +static const arg_def_t verbosearg = ARG_DEF( + "v", "verbose", 0, "Show version string"); +static const arg_def_t error_concealment = ARG_DEF( + NULL, "error-concealment", 0, "Enable decoder error-concealment"); +static const arg_def_t scalearg = ARG_DEF( + "S", "scale", 0, "Scale output frames uniformly"); +static const arg_def_t continuearg = ARG_DEF( + "k", "keep-going", 0, "(debug) Continue decoding after error"); +static const arg_def_t fb_arg = ARG_DEF( + NULL, "frame-buffers", 1, "Number of frame buffers to use"); +static const arg_def_t md5arg = ARG_DEF( + NULL, "md5", 0, "Compute the MD5 sum of the decoded frame"); #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH static const arg_def_t outbitdeptharg = ARG_DEF( - NULL, "output-bit-depth", 1, - "Output bit-depth for decoded frames"); + NULL, "output-bit-depth", 1, "Output bit-depth for decoded frames"); #endif static const arg_def_t *all_args[] = { @@ -128,50 +128,50 @@ int fourcc_is_ivf(const char detect[4]) { return 0; } -static const arg_def_t debugmode = ARG_DEF("D", "debug", 0, - "Debug mode (makes output deterministic)"); -static const arg_def_t outputfile = ARG_DEF("o", "output", 1, - "Output filename"); -static const arg_def_t use_yv12 = ARG_DEF(NULL, "yv12", 0, - "Input file is YV12 "); -static const arg_def_t use_i420 = ARG_DEF(NULL, "i420", 0, - "Input file is I420 (default)"); -static const arg_def_t use_i422 = ARG_DEF(NULL, "i422", 0, - "Input file is I422"); -static const arg_def_t use_i444 = ARG_DEF(NULL, "i444", 0, - "Input file is I444"); -static const arg_def_t use_i440 = ARG_DEF(NULL, "i440", 0, - "Input file is I440"); -static const arg_def_t codecarg = ARG_DEF(NULL, "codec", 1, - "Codec to use"); -static const arg_def_t passes = ARG_DEF("p", "passes", 1, - "Number of passes (1/2)"); -static const arg_def_t pass_arg = ARG_DEF(NULL, "pass", 1, - "Pass to execute (1/2)"); -static const arg_def_t fpf_name = ARG_DEF(NULL, "fpf", 1, - "First pass statistics file name"); +static const arg_def_t debugmode = ARG_DEF( + "D", "debug", 0, "Debug mode (makes output deterministic)"); +static const arg_def_t outputfile = ARG_DEF( + "o", "output", 1, "Output filename"); +static const arg_def_t use_yv12 = ARG_DEF( + NULL, "yv12", 0, "Input file is YV12 "); +static const arg_def_t use_i420 = ARG_DEF( + NULL, "i420", 0, "Input file is I420 (default)"); +static const arg_def_t use_i422 = ARG_DEF( + NULL, "i422", 0, "Input file is I422"); +static const arg_def_t use_i444 = ARG_DEF( + NULL, "i444", 0, "Input file is I444"); +static const arg_def_t use_i440 = ARG_DEF( + NULL, "i440", 0, "Input file is I440"); +static const arg_def_t codecarg = ARG_DEF( + NULL, "codec", 1, "Codec to use"); +static const arg_def_t passes = ARG_DEF( + "p", "passes", 1, "Number of passes (1/2)"); +static const arg_def_t pass_arg = ARG_DEF( + NULL, "pass", 1, "Pass to execute (1/2)"); +static const arg_def_t fpf_name = ARG_DEF( + NULL, "fpf", 1, "First pass statistics file name"); #if CONFIG_FP_MB_STATS -static const arg_def_t fpmbf_name = ARG_DEF(NULL, "fpmbf", 1, - "First pass block statistics file name"); +static const arg_def_t fpmbf_name = ARG_DEF( + NULL, "fpmbf", 1, "First pass block statistics file name"); #endif -static const arg_def_t limit = ARG_DEF(NULL, "limit", 1, - "Stop encoding after n input frames"); -static const arg_def_t skip = ARG_DEF(NULL, "skip", 1, - "Skip the first n input frames"); -static const arg_def_t deadline = ARG_DEF("d", "deadline", 1, - "Deadline per frame (usec)"); -static const arg_def_t best_dl = ARG_DEF(NULL, "best", 0, - "Use Best Quality Deadline"); -static const arg_def_t good_dl = ARG_DEF(NULL, "good", 0, - "Use Good Quality Deadline"); -static const arg_def_t rt_dl = ARG_DEF(NULL, "rt", 0, - "Use Realtime Quality Deadline"); -static const arg_def_t quietarg = ARG_DEF("q", "quiet", 0, - "Do not print encode progress"); -static const arg_def_t verbosearg = ARG_DEF("v", "verbose", 0, - "Show encoder parameters"); -static const arg_def_t psnrarg = ARG_DEF(NULL, "psnr", 0, - "Show PSNR in status line"); +static const arg_def_t limit = ARG_DEF( + NULL, "limit", 1, "Stop encoding after n input frames"); +static const arg_def_t skip = ARG_DEF( + NULL, "skip", 1, "Skip the first n input frames"); +static const arg_def_t deadline = ARG_DEF( + "d", "deadline", 1, "Deadline per frame (usec)"); +static const arg_def_t best_dl = ARG_DEF( + NULL, "best", 0, "Use Best Quality Deadline"); +static const arg_def_t good_dl = ARG_DEF( + NULL, "good", 0, "Use Good Quality Deadline"); +static const arg_def_t rt_dl = ARG_DEF( + NULL, "rt", 0, "Use Realtime Quality Deadline"); +static const arg_def_t quietarg = ARG_DEF( + "q", "quiet", 0, "Do not print encode progress"); +static const arg_def_t verbosearg = ARG_DEF( + "v", "verbose", 0, "Show encoder parameters"); +static const arg_def_t psnrarg = ARG_DEF( + NULL, "psnr", 0, "Show PSNR in status line"); static const struct arg_enum_list test_decode_enum[] = { {"off", TEST_DECODE_OFF}, @@ -179,25 +179,25 @@ static const struct arg_enum_list test_decode_enum[] = { {"warn", TEST_DECODE_WARN}, {NULL, 0} }; -static const arg_def_t recontest = ARG_DEF_ENUM(NULL, "test-decode", 1, - "Test encode/decode mismatch", - test_decode_enum); -static const arg_def_t framerate = ARG_DEF(NULL, "fps", 1, - "Stream frame rate (rate/scale)"); -static const arg_def_t use_ivf = ARG_DEF(NULL, "ivf", 0, - "Output IVF (default is WebM if WebM IO is enabled)"); -static const arg_def_t out_part = ARG_DEF("P", "output-partitions", 0, - "Makes encoder output partitions. Requires IVF output!"); -static const arg_def_t q_hist_n = ARG_DEF(NULL, "q-hist", 1, - "Show quantizer histogram (n-buckets)"); -static const arg_def_t rate_hist_n = ARG_DEF(NULL, "rate-hist", 1, - "Show rate histogram (n-buckets)"); -static const arg_def_t disable_warnings = - ARG_DEF(NULL, "disable-warnings", 0, - "Disable warnings about potentially incorrect encode settings."); -static const arg_def_t disable_warning_prompt = - ARG_DEF("y", "disable-warning-prompt", 0, - "Display warnings, but do not prompt user to continue."); +static const arg_def_t recontest = ARG_DEF_ENUM( + NULL, "test-decode", 1, "Test encode/decode mismatch", test_decode_enum); +static const arg_def_t framerate = ARG_DEF( + NULL, "fps", 1, "Stream frame rate (rate/scale)"); +static const arg_def_t use_ivf = ARG_DEF( + NULL, "ivf", 0, "Output IVF (default is WebM if WebM IO is enabled)"); +static const arg_def_t out_part = ARG_DEF( + "P", "output-partitions", 0, + "Makes encoder output partitions. Requires IVF output!"); +static const arg_def_t q_hist_n = ARG_DEF( + NULL, "q-hist", 1, "Show quantizer histogram (n-buckets)"); +static const arg_def_t rate_hist_n = ARG_DEF( + NULL, "rate-hist", 1, "Show rate histogram (n-buckets)"); +static const arg_def_t disable_warnings = ARG_DEF( + NULL, "disable-warnings", 0, + "Disable warnings about potentially incorrect encode settings."); +static const arg_def_t disable_warning_prompt = ARG_DEF( + "y", "disable-warning-prompt", 0, + "Display warnings, but do not prompt user to continue."); #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH static const arg_def_t test16bitinternalarg = ARG_DEF( @@ -213,16 +213,14 @@ static const arg_def_t *main_args[] = { NULL }; -static const arg_def_t usage = ARG_DEF("u", "usage", 1, - "Usage profile number to use"); -static const arg_def_t threads = ARG_DEF("t", "threads", 1, - "Max number of threads to use"); -static const arg_def_t profile = ARG_DEF(NULL, "profile", 1, - "Bitstream profile number to use"); -static const arg_def_t width = ARG_DEF("w", "width", 1, - "Frame width"); -static const arg_def_t height = ARG_DEF("h", "height", 1, - "Frame height"); +static const arg_def_t usage = ARG_DEF( + "u", "usage", 1, "Usage profile number to use"); +static const arg_def_t threads = ARG_DEF( + "t", "threads", 1, "Max number of threads to use"); +static const arg_def_t profile = ARG_DEF( + NULL, "profile", 1, "Bitstream profile number to use"); +static const arg_def_t width = ARG_DEF("w", "width", 1, "Frame width"); +static const arg_def_t height = ARG_DEF("h", "height", 1, "Frame height"); #if CONFIG_WEBM_IO static const struct arg_enum_list stereo_mode_enum[] = { {"mono", STEREO_FORMAT_MONO}, @@ -232,15 +230,15 @@ static const struct arg_enum_list stereo_mode_enum[] = { {"right-left", STEREO_FORMAT_RIGHT_LEFT}, {NULL, 0} }; -static const arg_def_t stereo_mode = ARG_DEF_ENUM(NULL, "stereo-mode", 1, - "Stereo 3D video format", stereo_mode_enum); +static const arg_def_t stereo_mode = ARG_DEF_ENUM( + NULL, "stereo-mode", 1, "Stereo 3D video format", stereo_mode_enum); #endif -static const arg_def_t timebase = ARG_DEF(NULL, "timebase", 1, - "Output timestamp precision (fractional seconds)"); -static const arg_def_t error_resilient = ARG_DEF(NULL, "error-resilient", 1, - "Enable error resiliency features"); -static const arg_def_t lag_in_frames = ARG_DEF(NULL, "lag-in-frames", 1, - "Max number of frames to lag"); +static const arg_def_t timebase = ARG_DEF( + NULL, "timebase", 1, "Output timestamp precision (fractional seconds)"); +static const arg_def_t error_resilient = ARG_DEF( + NULL, "error-resilient", 1, "Enable error resiliency features"); +static const arg_def_t lag_in_frames = ARG_DEF( + NULL, "lag-in-frames", 1, "Max number of frames to lag"); static const arg_def_t *global_args[] = { &use_yv12, &use_i420, &use_i422, &use_i444, &use_i440, @@ -257,18 +255,18 @@ static const arg_def_t *global_args[] = { &lag_in_frames, NULL }; -static const arg_def_t dropframe_thresh = ARG_DEF(NULL, "drop-frame", 1, - "Temporal resampling threshold (buf %)"); -static const arg_def_t resize_allowed = ARG_DEF(NULL, "resize-allowed", 1, - "Spatial resampling enabled (bool)"); -static const arg_def_t resize_width = ARG_DEF(NULL, "resize-width", 1, - "Width of encoded frame"); -static const arg_def_t resize_height = ARG_DEF(NULL, "resize-height", 1, - "Height of encoded frame"); -static const arg_def_t resize_up_thresh = ARG_DEF(NULL, "resize-up", 1, - "Upscale threshold (buf %)"); -static const arg_def_t resize_down_thresh = ARG_DEF(NULL, "resize-down", 1, - "Downscale threshold (buf %)"); +static const arg_def_t dropframe_thresh = ARG_DEF( + NULL, "drop-frame", 1, "Temporal resampling threshold (buf %)"); +static const arg_def_t resize_allowed = ARG_DEF( + NULL, "resize-allowed", 1, "Spatial resampling enabled (bool)"); +static const arg_def_t resize_width = ARG_DEF( + NULL, "resize-width", 1, "Width of encoded frame"); +static const arg_def_t resize_height = ARG_DEF( + NULL, "resize-height", 1, "Height of encoded frame"); +static const arg_def_t resize_up_thresh = ARG_DEF( + NULL, "resize-up", 1, "Upscale threshold (buf %)"); +static const arg_def_t resize_down_thresh = ARG_DEF( + NULL, "resize-down", 1, "Downscale threshold (buf %)"); static const struct arg_enum_list end_usage_enum[] = { {"vbr", VPX_VBR}, {"cbr", VPX_CBR}, @@ -276,24 +274,24 @@ static const struct arg_enum_list end_usage_enum[] = { {"q", VPX_Q}, {NULL, 0} }; -static const arg_def_t end_usage = ARG_DEF_ENUM(NULL, "end-usage", 1, - "Rate control mode", end_usage_enum); -static const arg_def_t target_bitrate = ARG_DEF(NULL, "target-bitrate", 1, - "Bitrate (kbps)"); -static const arg_def_t min_quantizer = ARG_DEF(NULL, "min-q", 1, - "Minimum (best) quantizer"); -static const arg_def_t max_quantizer = ARG_DEF(NULL, "max-q", 1, - "Maximum (worst) quantizer"); -static const arg_def_t undershoot_pct = ARG_DEF(NULL, "undershoot-pct", 1, - "Datarate undershoot (min) target (%)"); -static const arg_def_t overshoot_pct = ARG_DEF(NULL, "overshoot-pct", 1, - "Datarate overshoot (max) target (%)"); -static const arg_def_t buf_sz = ARG_DEF(NULL, "buf-sz", 1, - "Client buffer size (ms)"); -static const arg_def_t buf_initial_sz = ARG_DEF(NULL, "buf-initial-sz", 1, - "Client initial buffer size (ms)"); -static const arg_def_t buf_optimal_sz = ARG_DEF(NULL, "buf-optimal-sz", 1, - "Client optimal buffer size (ms)"); +static const arg_def_t end_usage = ARG_DEF_ENUM( + NULL, "end-usage", 1, "Rate control mode", end_usage_enum); +static const arg_def_t target_bitrate = ARG_DEF( + NULL, "target-bitrate", 1, "Bitrate (kbps)"); +static const arg_def_t min_quantizer = ARG_DEF( + NULL, "min-q", 1, "Minimum (best) quantizer"); +static const arg_def_t max_quantizer = ARG_DEF( + NULL, "max-q", 1, "Maximum (worst) quantizer"); +static const arg_def_t undershoot_pct = ARG_DEF( + NULL, "undershoot-pct", 1, "Datarate undershoot (min) target (%)"); +static const arg_def_t overshoot_pct = ARG_DEF( + NULL, "overshoot-pct", 1, "Datarate overshoot (max) target (%)"); +static const arg_def_t buf_sz = ARG_DEF( + NULL, "buf-sz", 1, "Client buffer size (ms)"); +static const arg_def_t buf_initial_sz = ARG_DEF( + NULL, "buf-initial-sz", 1, "Client initial buffer size (ms)"); +static const arg_def_t buf_optimal_sz = ARG_DEF( + NULL, "buf-optimal-sz", 1, "Client optimal buffer size (ms)"); static const arg_def_t *rc_args[] = { &dropframe_thresh, &resize_allowed, &resize_width, &resize_height, &resize_up_thresh, &resize_down_thresh, &end_usage, &target_bitrate, @@ -302,59 +300,59 @@ static const arg_def_t *rc_args[] = { }; -static const arg_def_t bias_pct = ARG_DEF(NULL, "bias-pct", 1, - "CBR/VBR bias (0=CBR, 100=VBR)"); -static const arg_def_t minsection_pct = ARG_DEF(NULL, "minsection-pct", 1, - "GOP min bitrate (% of target)"); -static const arg_def_t maxsection_pct = ARG_DEF(NULL, "maxsection-pct", 1, - "GOP max bitrate (% of target)"); +static const arg_def_t bias_pct = ARG_DEF( + NULL, "bias-pct", 1, "CBR/VBR bias (0=CBR, 100=VBR)"); +static const arg_def_t minsection_pct = ARG_DEF( + NULL, "minsection-pct", 1, "GOP min bitrate (% of target)"); +static const arg_def_t maxsection_pct = ARG_DEF( + NULL, "maxsection-pct", 1, "GOP max bitrate (% of target)"); static const arg_def_t *rc_twopass_args[] = { &bias_pct, &minsection_pct, &maxsection_pct, NULL }; -static const arg_def_t kf_min_dist = ARG_DEF(NULL, "kf-min-dist", 1, - "Minimum keyframe interval (frames)"); -static const arg_def_t kf_max_dist = ARG_DEF(NULL, "kf-max-dist", 1, - "Maximum keyframe interval (frames)"); -static const arg_def_t kf_disabled = ARG_DEF(NULL, "disable-kf", 0, - "Disable keyframe placement"); +static const arg_def_t kf_min_dist = ARG_DEF( + NULL, "kf-min-dist", 1, "Minimum keyframe interval (frames)"); +static const arg_def_t kf_max_dist = ARG_DEF( + NULL, "kf-max-dist", 1, "Maximum keyframe interval (frames)"); +static const arg_def_t kf_disabled = ARG_DEF( + NULL, "disable-kf", 0, "Disable keyframe placement"); static const arg_def_t *kf_args[] = { &kf_min_dist, &kf_max_dist, &kf_disabled, NULL }; -static const arg_def_t noise_sens = ARG_DEF(NULL, "noise-sensitivity", 1, - "Noise sensitivity (frames to blur)"); -static const arg_def_t sharpness = ARG_DEF(NULL, "sharpness", 1, - "Loop filter sharpness (0..7)"); -static const arg_def_t static_thresh = ARG_DEF(NULL, "static-thresh", 1, - "Motion detection threshold"); -static const arg_def_t cpu_used = ARG_DEF(NULL, "cpu-used", 1, - "CPU Used (-16..16)"); -static const arg_def_t auto_altref = ARG_DEF(NULL, "auto-alt-ref", 1, - "Enable automatic alt reference frames"); -static const arg_def_t arnr_maxframes = ARG_DEF(NULL, "arnr-maxframes", 1, - "AltRef max frames (0..15)"); -static const arg_def_t arnr_strength = ARG_DEF(NULL, "arnr-strength", 1, - "AltRef filter strength (0..6)"); -static const arg_def_t arnr_type = ARG_DEF(NULL, "arnr-type", 1, - "AltRef type"); +static const arg_def_t noise_sens = ARG_DEF( + NULL, "noise-sensitivity", 1, "Noise sensitivity (frames to blur)"); +static const arg_def_t sharpness = ARG_DEF( + NULL, "sharpness", 1, "Loop filter sharpness (0..7)"); +static const arg_def_t static_thresh = ARG_DEF( + NULL, "static-thresh", 1, "Motion detection threshold"); +static const arg_def_t cpu_used = ARG_DEF( + NULL, "cpu-used", 1, "CPU Used (-16..16)"); +static const arg_def_t auto_altref = ARG_DEF( + NULL, "auto-alt-ref", 1, "Enable automatic alt reference frames"); +static const arg_def_t arnr_maxframes = ARG_DEF( + NULL, "arnr-maxframes", 1, "AltRef max frames (0..15)"); +static const arg_def_t arnr_strength = ARG_DEF( + NULL, "arnr-strength", 1, "AltRef filter strength (0..6)"); +static const arg_def_t arnr_type = ARG_DEF( + NULL, "arnr-type", 1, "AltRef type"); static const struct arg_enum_list tuning_enum[] = { {"psnr", VP8_TUNE_PSNR}, {"ssim", VP8_TUNE_SSIM}, {NULL, 0} }; -static const arg_def_t tune_ssim = ARG_DEF_ENUM(NULL, "tune", 1, - "Material to favor", tuning_enum); -static const arg_def_t cq_level = ARG_DEF(NULL, "cq-level", 1, - "Constant/Constrained Quality level"); -static const arg_def_t max_intra_rate_pct = ARG_DEF(NULL, "max-intra-rate", 1, - "Max I-frame bitrate (pct)"); +static const arg_def_t tune_ssim = ARG_DEF_ENUM( + NULL, "tune", 1, "Material to favor", tuning_enum); +static const arg_def_t cq_level = ARG_DEF( + NULL, "cq-level", 1, "Constant/Constrained Quality level"); +static const arg_def_t max_intra_rate_pct = ARG_DEF( + NULL, "max-intra-rate", 1, "Max I-frame bitrate (pct)"); #if CONFIG_VP8_ENCODER -static const arg_def_t token_parts = - ARG_DEF(NULL, "token-parts", 1, "Number of token partitions to use, log2"); +static const arg_def_t token_parts = ARG_DEF( + NULL, "token-parts", 1, "Number of token partitions to use, log2"); static const arg_def_t *vp8_args[] = { &cpu_used, &auto_altref, &noise_sens, &sharpness, &static_thresh, &token_parts, &arnr_maxframes, &arnr_strength, &arnr_type, @@ -372,11 +370,12 @@ static const int vp8_arg_ctrl_map[] = { #endif #if CONFIG_VP9_ENCODER -static const arg_def_t tile_cols = - ARG_DEF(NULL, "tile-columns", 1, "Number of tile columns to use, log2"); -static const arg_def_t tile_rows = - ARG_DEF(NULL, "tile-rows", 1, "Number of tile rows to use, log2"); -static const arg_def_t lossless = ARG_DEF(NULL, "lossless", 1, "Lossless mode"); +static const arg_def_t tile_cols = ARG_DEF( + NULL, "tile-columns", 1, "Number of tile columns to use, log2"); +static const arg_def_t tile_rows = ARG_DEF( + NULL, "tile-rows", 1, "Number of tile rows to use, log2"); +static const arg_def_t lossless = ARG_DEF( + NULL, "lossless", 1, "Lossless mode"); static const arg_def_t frame_parallel_decoding = ARG_DEF( NULL, "frame-parallel", 1, "Enable frame parallel decodability features"); static const arg_def_t aq_mode = ARG_DEF( @@ -395,13 +394,12 @@ static const struct arg_enum_list bitdepth_enum[] = { {NULL, 0} }; -static const arg_def_t bitdeptharg = ARG_DEF_ENUM("b", "bit-depth", 1, - "Bit depth for codec " - "(8 for version <=1, " - "10 or 12 for version 2)", - bitdepth_enum); -static const arg_def_t inbitdeptharg = ARG_DEF(NULL, "input-bit-depth", 1, - "Bit depth of input"); +static const arg_def_t bitdeptharg = ARG_DEF_ENUM( + "b", "bit-depth", 1, + "Bit depth for codec (8 for version <=1, 10 or 12 for version 2)", + bitdepth_enum); +static const arg_def_t inbitdeptharg = ARG_DEF( + NULL, "input-bit-depth", 1, "Bit depth of input"); #endif static const struct arg_enum_list tune_content_enum[] = { @@ -1161,7 +1159,6 @@ static int parse_stream_params(struct VpxEncoderConfig *global, if (j == config->arg_ctrl_cnt) config->arg_ctrl_cnt++; } - } } if (!match) @@ -1917,14 +1914,15 @@ int main(int argc, const char **argv_) { /* If the input file doesn't specify its w/h (raw files), try to get * the data from the first stream's configuration. */ - if (!input.width || !input.height) - FOREACH_STREAM( { - if (stream->config.cfg.g_w && stream->config.cfg.g_h) { - input.width = stream->config.cfg.g_w; - input.height = stream->config.cfg.g_h; - break; - } - }); + if (!input.width || !input.height) { + FOREACH_STREAM({ + if (stream->config.cfg.g_w && stream->config.cfg.g_h) { + input.width = stream->config.cfg.g_w; + input.height = stream->config.cfg.g_h; + break; + } + }); + } /* Update stream configurations from the input file's parameters */ if (!input.width || !input.height) |