diff options
| author | Jingning Han <jingning@google.com> | 2015-08-12 04:15:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-12 04:15:41 +0000 |
| commit | b522d1cdffdc060b6bef9fceef9b316316b05d9c (patch) | |
| tree | aa1c82ea76f19792e5100ef7091d10d79654bf0d | |
| parent | 3fc0f5ed12236847fed94937c4d55ececa5d26c0 (diff) | |
| parent | 8af092dbd774a64984d0e19dbf65954aa72b894d (diff) | |
| download | libvpx-b522d1cdffdc060b6bef9fceef9b316316b05d9c.tar libvpx-b522d1cdffdc060b6bef9fceef9b316316b05d9c.tar.gz libvpx-b522d1cdffdc060b6bef9fceef9b316316b05d9c.tar.bz2 libvpx-b522d1cdffdc060b6bef9fceef9b316316b05d9c.zip | |
Merge "Fix high bit depth in vp10 codebase"
| -rw-r--r-- | vpxenc.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1196,7 +1196,8 @@ static int parse_stream_params(struct VpxEncoderConfig *global, config->cfg.kf_mode = VPX_KF_DISABLED; #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH } else if (arg_match(&arg, &test16bitinternalarg, argi)) { - if (strcmp(global->codec->name, "vp9") == 0) { + if (strcmp(global->codec->name, "vp9") == 0 || + strcmp(global->codec->name, "vp10") == 0) { test_16bit_internal = 1; } #endif @@ -1230,7 +1231,8 @@ static int parse_stream_params(struct VpxEncoderConfig *global, } } #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH - if (strcmp(global->codec->name, "vp9") == 0) { + if (strcmp(global->codec->name, "vp9") == 0 || + strcmp(global->codec->name, "vp10") == 0) { config->use_16bit_internal = test_16bit_internal | (config->cfg.g_profile > 1); } @@ -2071,7 +2073,8 @@ int main(int argc, const char **argv_) { FOREACH_STREAM(initialize_encoder(stream, &global)); #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH - if (strcmp(global.codec->name, "vp9") == 0) { + if (strcmp(global.codec->name, "vp9") == 0 || + strcmp(global.codec->name, "vp10") == 0) { // Check to see if at least one stream uses 16 bit internal. // Currently assume that the bit_depths for all streams using // highbitdepth are the same. |