MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/proresenc_kostya: do not write into alpha reserved bitfields

Browse Source 
This byte represents 4 reserved bits followed by 4 alpha_channel_type bits.

alpha_channel_type currently has 3 differents defined values: 0 (no
alpha), 1 (8b alpha), and 2 (16b alpha), all the other values are
reserved. This part is correctly written (alpha_bits>>3 does the correct
thing), but the 4 initial bits are reserved.
This commit is contained in:
Clément Bœsch 2023-12-11 19:51:09 +01:00
parent aa7ccd0ce9
commit 6d35911667
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/proresenc_kostya.c
View File

@ -1008,7 +1008,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
bytestream_put_byte (&buf, pic->color_primaries);
bytestream_put_byte (&buf, pic->color_trc);
bytestream_put_byte (&buf, pic->colorspace);
bytestream_put_byte (&buf, 0x40 | (ctx->alpha_bits >> 3));
bytestream_put_byte (&buf, ctx->alpha_bits >> 3);
bytestream_put_byte (&buf, 0); // reserved
if (ctx->quant_sel != QUANT_MAT_DEFAULT) {
bytestream_put_byte (&buf, 0x03); // matrix flags - both matrices are present

2
tests/ref/vsynth/vsynth1-prores_ks
View File

@ -1,4 +1,4 @@
5b0970bacd4b03d70f7648fee2f0c85f *tests/data/fate/vsynth1-prores_ks.mov
fad50b4a0fb706fb2e282678ed962281 *tests/data/fate/vsynth1-prores_ks.mov
3858911 tests/data/fate/vsynth1-prores_ks.mov
100eb002413fe7a632d440dfbdf7e3ff *tests/data/fate/vsynth1-prores_ks.out.rawvideo
stddev: 3.17 PSNR: 38.09 MAXDIFF: 39 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth2-prores_ks
View File

@ -1,4 +1,4 @@
abde4f84a5e4060492e3d8fcb56f2467 *tests/data/fate/vsynth2-prores_ks.mov
2f909bf4f1262da79dd2fa502cb41853 *tests/data/fate/vsynth2-prores_ks.mov
3868162 tests/data/fate/vsynth2-prores_ks.mov
fe7ad707205c6100e9a3956d4e1c300e *tests/data/fate/vsynth2-prores_ks.out.rawvideo
stddev: 1.17 PSNR: 46.72 MAXDIFF: 14 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth3-prores_ks
View File

@ -1,4 +1,4 @@
f6ce1e8e2272cea0592d3f969d48c1de *tests/data/fate/vsynth3-prores_ks.mov
3703ae6dea89c9d8b5a8872d8167ca42 *tests/data/fate/vsynth3-prores_ks.mov
95053 tests/data/fate/vsynth3-prores_ks.mov
9ab6d3e3cc7749796cd9fa984c60d890 *tests/data/fate/vsynth3-prores_ks.out.rawvideo
stddev: 4.09 PSNR: 35.88 MAXDIFF: 35 bytes: 86700/ 86700

2
tests/ref/vsynth/vsynth_lena-prores_ks
View File

@ -1,4 +1,4 @@
86b9932d5f78d0b5836533e972a37a65 *tests/data/fate/vsynth_lena-prores_ks.mov
e0822c5ba6ce8825052dfb8dbf98d939 *tests/data/fate/vsynth_lena-prores_ks.mov
3884596 tests/data/fate/vsynth_lena-prores_ks.mov
6cfe987de99cf8ac9d43bdc5cd150838 *tests/data/fate/vsynth_lena-prores_ks.out.rawvideo
stddev: 0.92 PSNR: 48.78 MAXDIFF: 10 bytes: 7603200/ 7603200