summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorTom Finegan <tomfinegan@google.com>2016-06-15 13:42:59 -0700
committerTom Finegan <tomfinegan@google.com>2016-06-17 11:25:55 -0700
commit5a9f21db548f1a3d9b31dfc4f758a0af83bab725 (patch)
treebc7cf8108c761707f83feeb66524dca8e9e75493 /vp9
parenta724477d6926c7fe0f20809cf26563c4047372b3 (diff)
downloadlibvpx-5a9f21db548f1a3d9b31dfc4f758a0af83bab725.tar
libvpx-5a9f21db548f1a3d9b31dfc4f758a0af83bab725.tar.gz
libvpx-5a9f21db548f1a3d9b31dfc4f758a0af83bab725.tar.bz2
libvpx-5a9f21db548f1a3d9b31dfc4f758a0af83bab725.zip
Output frames in first pass for VPX_DL_REALTIME.
Since combining VPX_DL_REALTIME with VPX_RC_FIRST_PASS is basically nonsense, ignore the user's pass setting when this happens and behave as if the requested encode is a single pass encode. BUG=webm:1233 Change-Id: I5ee4c4e5838c4ca6d24988890aae490b10826db2
Diffstat (limited to 'vp9')
-rw-r--r--vp9/vp9_cx_iface.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c
index 73a089bcf..9ad86cbf8 100644
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -905,6 +905,11 @@ static void pick_quickcompress_mode(vpx_codec_alg_priv_t *ctx,
break;
}
+ if (deadline == VPX_DL_REALTIME) {
+ ctx->oxcf.pass = 0;
+ new_mode = REALTIME;
+ }
+
if (ctx->oxcf.mode != new_mode) {
ctx->oxcf.mode = new_mode;
vp9_change_config(ctx->cpi, &ctx->oxcf);