summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Paniconi <marpan@google.com>2018-04-18 17:46:16 -0700
committerMarco Paniconi <marpan@google.com>2018-04-18 17:48:54 -0700
commit581b6b826e1b157fc38606e4755d5fb56a51bbdb (patch)
tree1e64a563a8dc62f4c52c05049ff765992144c63f
parentd30966609b90feae14baceaf068df2f143fb85c8 (diff)
downloadlibvpx-581b6b826e1b157fc38606e4755d5fb56a51bbdb.tar
libvpx-581b6b826e1b157fc38606e4755d5fb56a51bbdb.tar.gz
libvpx-581b6b826e1b157fc38606e4755d5fb56a51bbdb.tar.bz2
libvpx-581b6b826e1b157fc38606e4755d5fb56a51bbdb.zip
vp9: Add condition of real-time mode to scene detection.
This was removed by error from the change: ce11afb, and made some datarate tests fail. Change-Id: I0c29e1f5aede8f56ce835b25fed0528722350241
-rw-r--r--vp9/encoder/vp9_encoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 9ec539733..2f92456f2 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3683,7 +3683,7 @@ static void encode_without_recode_loop(VP9_COMP *cpi, size_t *size,
// For other cases (e.g., CBR mode) use it for 5 <= speed < 8 for now
// (need to check encoding time cost for doing this for speed 8).
cpi->rc.high_source_sad = 0;
- if (cm->show_frame &&
+ if (cm->show_frame && cpi->oxcf.mode == REALTIME &&
(cpi->oxcf.rc_mode == VPX_VBR ||
cpi->oxcf.content == VP9E_CONTENT_SCREEN ||
(cpi->oxcf.speed >= 5 && cpi->oxcf.speed < 8 && !cpi->use_svc)))