From 2e9c1dc10cb5a42414e89e9ddd70312054a4f857 Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Fri, 3 Oct 2014 15:41:50 -0700 Subject: [PATCH] Remove experimental-bitstream flag for profiles>0 Profiles 1-3 are stable enough that we can remove the experimental bitstream commandline option. Change-Id: Id2a64a08192d7eac6c45384ee34196330351c6d8 --- vpxenc.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/vpxenc.c b/vpxenc.c index 53a291152..b323e3c44 100644 --- a/vpxenc.c +++ b/vpxenc.c @@ -198,9 +198,6 @@ static const arg_def_t disable_warnings = 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 experimental_bitstream = - ARG_DEF(NULL, "experimental-bitstream", 0, - "Allow experimental bitstream features."); #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH static const arg_def_t test16bitinternalarg = ARG_DEF( @@ -861,8 +858,6 @@ static void parse_global_config(struct VpxEncoderConfig *global, char **argv) { global->disable_warnings = 1; else if (arg_match(&arg, &disable_warning_prompt, argi)) global->disable_warning_prompt = 1; - else if (arg_match(&arg, &experimental_bitstream, argi)) - global->experimental_bitstream = 1; else argj++; } @@ -1200,12 +1195,6 @@ static void validate_stream_config(const struct stream_state *stream, fatal("Stream %d: Specify stream dimensions with --width (-w) " " and --height (-h)", stream->index); - if (stream->config.cfg.g_profile != 0 && !global->experimental_bitstream) { - fatal("Stream %d: profile %d is experimental and requires the --%s flag", - stream->index, stream->config.cfg.g_profile, - experimental_bitstream.long_name); - } - // Check that the codec bit depth is greater than the input bit depth. if (stream->config.cfg.g_input_bit_depth > (unsigned int)stream->config.cfg.g_bit_depth) { -- 2.40.0