summaryrefslogtreecommitdiff
path: root/vp10/encoder/bitstream.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-09-30 21:57:26 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2015-10-02 13:39:38 -0400
commitce3780251cd9cab3b9495fb78b7f8d2773f45acf (patch)
tree8239375ccb456920f0c143ea3bd5aef9582711a4 /vp10/encoder/bitstream.c
parent3fedf4a59bbe8e879e611012fdd0dd3de7cad1af (diff)
downloadlibvpx-ce3780251cd9cab3b9495fb78b7f8d2773f45acf.tar
libvpx-ce3780251cd9cab3b9495fb78b7f8d2773f45acf.tar.gz
libvpx-ce3780251cd9cab3b9495fb78b7f8d2773f45acf.tar.bz2
libvpx-ce3780251cd9cab3b9495fb78b7f8d2773f45acf.zip
vp10: make render_width/height referenceable through ref frames.
See issue 1079. Change-Id: I754a61ec011c3508bbb26826cf8e11dbdfdd8379
Diffstat (limited to 'vp10/encoder/bitstream.c')
-rw-r--r--vp10/encoder/bitstream.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index 348c7cb83..9072e160c 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -1013,6 +1013,10 @@ static void write_frame_size_with_refs(VP10_COMP *cpi,
if (cfg != NULL) {
found = cm->width == cfg->y_crop_width &&
cm->height == cfg->y_crop_height;
+#if CONFIG_MISC_FIXES
+ found &= cm->render_width == cfg->render_width &&
+ cm->render_height == cfg->render_height;
+#endif
}
vpx_wb_write_bit(wb, found);
if (found) {
@@ -1023,9 +1027,15 @@ static void write_frame_size_with_refs(VP10_COMP *cpi,
if (!found) {
vpx_wb_write_literal(wb, cm->width - 1, 16);
vpx_wb_write_literal(wb, cm->height - 1, 16);
+
+#if CONFIG_MISC_FIXES
+ write_render_size(cm, wb);
+#endif
}
+#if !CONFIG_MISC_FIXES
write_render_size(cm, wb);
+#endif
}
static void write_sync_code(struct vpx_write_bit_buffer *wb) {