diff options
| author | James Zern <jzern@google.com> | 2014-12-05 17:44:46 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2014-12-05 17:44:46 -0800 |
| commit | 6db81fd629119b1afb72345b028f6c5616ca1c5a (patch) | |
| tree | 5bdcef5db8577a4b6f0ca7c6c286ef6cad469104 /vp9/encoder/vp9_encoder.c | |
| parent | eaa6deee5b89d19bae23cd30688355f00dfb768e (diff) | |
| download | libvpx-6db81fd629119b1afb72345b028f6c5616ca1c5a.tar libvpx-6db81fd629119b1afb72345b028f6c5616ca1c5a.tar.gz libvpx-6db81fd629119b1afb72345b028f6c5616ca1c5a.tar.bz2 libvpx-6db81fd629119b1afb72345b028f6c5616ca1c5a.zip | |
vp9: fix frame-parallel encoding
the flag in the header wasn't being set based on the encoder
configuration in non-intra only mode
broken since:
fbc2fbf Adding oxcf temp variable.
Change-Id: Ib4cff9901889824bc4e68d7f0f6deb1e41df2f53
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index aee362ae4..645cb4f98 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -3179,6 +3179,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, cpi->rc.source_alt_ref_active = 0; cm->error_resilient_mode = oxcf->error_resilient_mode; + cm->frame_parallel_decoding_mode = oxcf->frame_parallel_decoding_mode; // By default, encoder assumes decoder can use prev_mi. if (cm->error_resilient_mode) { @@ -3186,7 +3187,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, cm->reset_frame_context = 0; cm->refresh_frame_context = 0; } else if (cm->intra_only) { - cm->frame_parallel_decoding_mode = oxcf->frame_parallel_decoding_mode; // Only reset the current context. cm->reset_frame_context = 2; } |