summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2018-08-21 23:43:37 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-08-21 23:43:37 +0000
commit503cbe35ed4ecae404410432dc21c4fef1392790 (patch)
tree5c7a228bf450f4bf8762a4a2876651ef604baa21 /vp9/encoder
parent0b5acf0f66045c6f0ad1519e6a80d792b46cc06e (diff)
parent3b0d06b5992b0a2be6aae195ad45064332759ff2 (diff)
downloadlibvpx-503cbe35ed4ecae404410432dc21c4fef1392790.tar
libvpx-503cbe35ed4ecae404410432dc21c4fef1392790.tar.gz
libvpx-503cbe35ed4ecae404410432dc21c4fef1392790.tar.bz2
libvpx-503cbe35ed4ecae404410432dc21c4fef1392790.zip
Merge "Skip frame encoding when show_existing_frame is on"
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_encoder.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 98da31956..4862ffdbc 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3816,6 +3816,8 @@ static int encode_without_recode_loop(VP9_COMP *cpi, size_t *size,
? cpi->svc.downsample_filter_phase[cpi->svc.spatial_layer_id]
: 0;
+ if (cm->show_existing_frame) return 1;
+
// Flag to check if its valid to compute the source sad (used for
// scene detection and for superblock content state in CBR mode).
// The flag may get reset below based on SVC or resizing state.
@@ -4093,6 +4095,8 @@ static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size,
int qrange_adj = 1;
#endif
+ if (cm->show_existing_frame) return;
+
set_size_independent_vars(cpi);
enable_acl = cpi->sf.allow_acl