Merge "Always send frame size explicitly" into nextgenv2

av1/decoder/decodeframe.c

@@ -3370,7 +3370,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);

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);
 

configure

@@ -284,6 +284,7 @@ EXPERIMENT_LIST="
     palette
     daala_ec
     cb4x4
+    frame_size
 "
 CONFIG_LIST="
     dependency_tracking