From 6f3c898f5dd60d0560f5f298320a7ef5a1245554 Mon Sep 17 00:00:00 2001 From: Debargha Mukherjee Date: Fri, 22 Sep 2017 21:14:01 -0700 Subject: [PATCH] Setup ref mode after reading uncompressed header Removes setup in compressed header so that the compressed header can be skipped. Change-Id: I8d7ed63944a4f75704222f4ad7d0159db1cec0d1 --- av1/decoder/decodeframe.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index 10c358226..8b74350b5 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c @@ -5057,6 +5057,7 @@ static size_t read_uncompressed_header(AV1Decoder *pbi, #endif // CONFIG_LOOP_RESTORATION cm->tx_mode = read_tx_mode(cm, rb); cm->reference_mode = read_frame_reference_mode(cm, rb); + if (cm->reference_mode != SINGLE_REFERENCE) setup_compound_reference_mode(cm); #if CONFIG_EXT_INTER read_compound_tools(cm, rb); #endif // CONFIG_EXT_INTER @@ -5167,8 +5168,6 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data, av1_diff_update_prob(&r, &fc->intra_inter_prob[i], ACCT_STR); #endif - if (cm->reference_mode != SINGLE_REFERENCE) - setup_compound_reference_mode(cm); #if !CONFIG_NEW_MULTISYMBOL read_frame_reference_mode_probs(cm, &r); #endif -- GitLab