Commit 2e9c1dc1 authored by Deb Mukherjee's avatar Deb Mukherjee

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
parent 8a01074d
...@@ -198,9 +198,6 @@ static const arg_def_t disable_warnings = ...@@ -198,9 +198,6 @@ static const arg_def_t disable_warnings =
static const arg_def_t disable_warning_prompt = static const arg_def_t disable_warning_prompt =
ARG_DEF("y", "disable-warning-prompt", 0, ARG_DEF("y", "disable-warning-prompt", 0,
"Display warnings, but do not prompt user to continue."); "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 #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
static const arg_def_t test16bitinternalarg = ARG_DEF( static const arg_def_t test16bitinternalarg = ARG_DEF(
...@@ -861,8 +858,6 @@ static void parse_global_config(struct VpxEncoderConfig *global, char **argv) { ...@@ -861,8 +858,6 @@ static void parse_global_config(struct VpxEncoderConfig *global, char **argv) {
global->disable_warnings = 1; global->disable_warnings = 1;
else if (arg_match(&arg, &disable_warning_prompt, argi)) else if (arg_match(&arg, &disable_warning_prompt, argi))
global->disable_warning_prompt = 1; global->disable_warning_prompt = 1;
else if (arg_match(&arg, &experimental_bitstream, argi))
global->experimental_bitstream = 1;
else else
argj++; argj++;
} }
...@@ -1200,12 +1195,6 @@ static void validate_stream_config(const struct stream_state *stream, ...@@ -1200,12 +1195,6 @@ static void validate_stream_config(const struct stream_state *stream,
fatal("Stream %d: Specify stream dimensions with --width (-w) " fatal("Stream %d: Specify stream dimensions with --width (-w) "
" and --height (-h)", stream->index); " 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. // Check that the codec bit depth is greater than the input bit depth.
if (stream->config.cfg.g_input_bit_depth > if (stream->config.cfg.g_input_bit_depth >
(unsigned int)stream->config.cfg.g_bit_depth) { (unsigned int)stream->config.cfg.g_bit_depth) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment