diff options
| author | Adrian Grange <agrange@google.com> | 2013-05-30 10:56:25 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-30 10:56:25 -0700 |
| commit | 6f361f58410941e09dfebf9063ba222dfcb98e75 (patch) | |
| tree | 77b6878ff9aaf9b8d40e7fef3987ff5b3b11e3b3 /vp9/encoder/vp9_onyx_if.c | |
| parent | 4c021c1d542ac5af2f63fcee5637d0e468cdc058 (diff) | |
| parent | 9e5bb9598c57eccd9115080e1a6b1375b82a77e3 (diff) | |
| download | libvpx-6f361f58410941e09dfebf9063ba222dfcb98e75.tar libvpx-6f361f58410941e09dfebf9063ba222dfcb98e75.tar.gz libvpx-6f361f58410941e09dfebf9063ba222dfcb98e75.tar.bz2 libvpx-6f361f58410941e09dfebf9063ba222dfcb98e75.zip | |
Merge "Add intra_only and reset_frame_context flags" into experimental
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index d9c34fe9b..3b784cb41 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -1190,6 +1190,7 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { cpi->refresh_golden_frame = 0; cpi->refresh_last_frame = 1; cm->refresh_frame_context = 1; + cm->reset_frame_context = 0; setup_features(cpi); cpi->mb.e_mbd.allow_high_precision_mv = 0; // Default mv precision adaptation @@ -2617,6 +2618,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, (cpi->oxcf.frame_parallel_decoding_mode != 0); if (cm->error_resilient_mode) { cm->frame_parallel_decoding_mode = 1; + cm->reset_frame_context = 0; cm->refresh_frame_context = 0; } } @@ -3671,6 +3673,7 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, } cm->show_frame = 0; + cm->intra_only = 0; cpi->refresh_alt_ref_frame = 1; cpi->refresh_golden_frame = 0; cpi->refresh_last_frame = 0; @@ -3875,6 +3878,7 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, cpi->droppable = !frame_is_reference(cpi); // return to normal state + cm->reset_frame_context = 0; cm->refresh_frame_context = 1; cpi->refresh_alt_ref_frame = 0; cpi->refresh_golden_frame = 0; |