ref: b522d1cdffdc060b6bef9fceef9b316316b05d9c
parent: 3fc0f5ed12236847fed94937c4d55ececa5d26c0
parent: 8af092dbd774a64984d0e19dbf65954aa72b894d
author: Jingning Han <[email protected]>
date: Wed Aug 12 00:15:41 EDT 2015
Merge "Fix high bit depth in vp10 codebase"
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -1196,7 +1196,8 @@
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 @@
}
}
#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 @@
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.