Always send frame size explicitly

This commit changes to send frame size explicitly when
error_resilient_mode=1. Purpose is to allow parsing of bitstream
after a packet loss.

Change-Id: I7d1c010a465aa18914762cc1a3e61db377304c08

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 67445720a6e3261059e1441b9a958432cc923f04..2a5118347b3ab52e943c0e3f8234227b70323b72 100644 (file)
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3371,7 +3371,15 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
         cm->ref_frame_sign_bias[LAST_FRAME + i] = aom_rb_read_bit(rb);
       }
 
+#if CONFIG_FRAME_SIZE
+      if (cm->error_resilient_mode == 0) {
+        setup_frame_size_with_refs(cm, rb);
+      } else {
+        setup_frame_size(cm, rb);
+      }
+#else
       setup_frame_size_with_refs(cm, rb);
+#endif
 
       cm->allow_high_precision_mv = aom_rb_read_bit(rb);
       cm->interp_filter = read_interp_filter(rb);

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 948c4f52617bb3b42ccf58455e080fec9a6bac2d..b7cbc0084f4dc19512d4674d21dd2bd103060374 100644 (file)
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3292,7 +3292,15 @@ static void write_uncompressed_header(AV1_COMP *cpi,
         aom_wb_write_bit(wb, cm->ref_frame_sign_bias[ref_frame]);
       }
 
+#if CONFIG_FRAME_SIZE
+      if (cm->error_resilient_mode == 0) {
+        write_frame_size_with_refs(cpi, wb);
+      } else {
+        write_frame_size(cm, wb);
+      }
+#else
       write_frame_size_with_refs(cpi, wb);
+#endif
 
       aom_wb_write_bit(wb, cm->allow_high_precision_mv);
 

diff --git a/configure b/configure
index 611756f2d867865bf7839fc69a4cdd5739ff3744..b5f0b2d2c38654ce5b26314eb081b3d184230c7f 100755 (executable)
--- a/configure
+++ b/configure
@@ -285,6 +285,7 @@ EXPERIMENT_LIST="
     palette
     daala_ec
     cb4x4
+    frame_size
 "
 CONFIG_LIST="
     dependency_tracking