commit 4d8f7770425633bc343b9f9b42b51a5df54147c2
author Imdad Sardharwalla <imdad.sardharwalla@argondesign.com> Thu Mar 15 12:14:48 2018 +0000
committer Debargha Mukherjee <debargha@google.com> Thu Mar 15 16:04:11 2018 +0000
tree 3d55710af34f340a2b3d031a09416cf4184ba5b8
parent 8fe8d51dbf141a354f2098b4a445e3b3485060b6

[NORMATIVE] Enable OrderHint features when err res

As explicit OrderHint values are now signalled in the bitstream in
error_resilient_mode, we re-enable features (disabled in commits
1609b94 and fc66c6b) that make use of these values.

The specific features/tools that have been re-enabled are:

* frame_sign_bias
* skip_mode
* jnt_comp

Change-Id: Iffdf235fd781f3fd6e34c28b0ff65bac0767dd51

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index b5f40df..1cc0d06 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1167,7 +1167,7 @@
         if (mbmi->compound_idx)
           assert(mbmi->interinter_compound_type == COMPOUND_AVERAGE);
 
-        if (cm->seq_params.enable_jnt_comp && !cm->error_resilient_mode) {
+        if (cm->seq_params.enable_jnt_comp) {
           const int comp_index_ctx = get_comp_index_context(cm, xd);
           aom_write_symbol(w, mbmi->compound_idx,
                            ec_ctx->compound_index_cdf[comp_index_ctx], 2);
@@ -3331,7 +3331,6 @@
     aom_wb_write_bit(wb, use_hybrid_pred);
   }
 
-  assert(cm->error_resilient_mode ? !cm->is_skip_mode_allowed : 1);
   if (cm->is_skip_mode_allowed) aom_wb_write_bit(wb, cm->skip_mode_flag);
 
   write_compound_tools(cm, wb);