2016-05-03 19:06 GMT+02:00 Christophe Gisquet <christophe.gisq...@gmail.com>:
> + memset(pb->buf_ptr, 0, pad_c);
Commit squashing fail, attached patch should fix that. This
unfortunately requires updating the fate tests as I generated them
from this squashing.
--
Christophe
From 3008fd916cca5b9ab22e96536e778d63ba25ed20 Mon Sep 17 00:00:00 2001
From: Christophe Gisquet <christophe.gisq...@gmail.com>
Date: Tue, 3 May 2016 11:47:25 +0200
Subject: [PATCH 1/2] vc2enc: prevent random data
The slice prefix is 0 in the reference encoder and the decoder ignores it.
Writing 0 there seems like the best temporary solution.
The padding could have contained uninitialized data, but its standardized value
is 0xFF, hence the memset value.
Overall this allows producing bistreams with no random data for use by fate.
---
libavcodec/vc2enc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c
index 943198b..6fbdaa5 100644
--- a/libavcodec/vc2enc.c
+++ b/libavcodec/vc2enc.c
@@ -777,7 +777,10 @@ static int encode_hq_slice(AVCodecContext *avctx, void *arg)
uint8_t quants[MAX_DWT_LEVELS][4];
int p, level, orientation;
+ // The reference decoder ignores it, and its typical length is 0
+ memset(put_bits_ptr(pb), 0, s->prefix_bytes);
skip_put_bytes(pb, s->prefix_bytes);
+
put_bits(pb, 8, quant_idx);
/* Slice quantization (slice_quantizers() in the specs) */
@@ -809,6 +812,7 @@ static int encode_hq_slice(AVCodecContext *avctx, void *arg)
}
pb->buf[bytes_start] = pad_s;
flush_put_bits(pb);
+ memset(put_bits_ptr(pb), 0xFF, pad_c);
skip_put_bytes(pb, pad_c);
}
--
2.8.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
