diff options
| author | Marco <marpan@google.com> | 2016-04-21 14:00:26 -0700 |
|---|---|---|
| committer | Marco <marpan@google.com> | 2016-04-22 08:09:39 -0700 |
| commit | adf8533cee11093dfe200ba7e9b60b09237aa272 (patch) | |
| tree | 9cba913a5e89b062ce72693f031cf3cfadd0b822 /vp9/encoder/vp9_svc_layercontext.c | |
| parent | d179b784f93e7a1a4f4e89248edaf0a6dee81952 (diff) | |
| download | libvpx-adf8533cee11093dfe200ba7e9b60b09237aa272.tar libvpx-adf8533cee11093dfe200ba7e9b60b09237aa272.tar.gz libvpx-adf8533cee11093dfe200ba7e9b60b09237aa272.tar.bz2 libvpx-adf8533cee11093dfe200ba7e9b60b09237aa272.zip | |
vp9: Move consec_zero_mv from cyclic refresh to cpi struct.
So it can be used even with aq-mode=3 not enabled.
Also cleans up some code in the places where its used.
No change in behavior.
Change-Id: Ib6b265308dbd483f691200da9a0be4da4b380dbc
Diffstat (limited to 'vp9/encoder/vp9_svc_layercontext.c')
| -rw-r--r-- | vp9/encoder/vp9_svc_layercontext.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index 73048f842..1814a32c9 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -327,12 +327,12 @@ void vp9_restore_layer_context(VP9_COMP *const cpi) { CYCLIC_REFRESH *const cr = cpi->cyclic_refresh; signed char *temp = cr->map; uint8_t *temp2 = cr->last_coded_q_map; - uint8_t *temp3 = cr->consec_zero_mv; + uint8_t *temp3 = cpi->consec_zero_mv; cr->map = lc->map; lc->map = temp; cr->last_coded_q_map = lc->last_coded_q_map; lc->last_coded_q_map = temp2; - cr->consec_zero_mv = lc->consec_zero_mv; + cpi->consec_zero_mv = lc->consec_zero_mv; lc->consec_zero_mv = temp3; cr->sb_index = lc->sb_index; } @@ -360,8 +360,8 @@ void vp9_save_layer_context(VP9_COMP *const cpi) { cr->map = temp; lc->last_coded_q_map = cr->last_coded_q_map; cr->last_coded_q_map = temp2; - lc->consec_zero_mv = cr->consec_zero_mv; - cr->consec_zero_mv = temp3; + lc->consec_zero_mv = cpi->consec_zero_mv; + cpi->consec_zero_mv = temp3; lc->sb_index = cr->sb_index; } } |