Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/proresenc_anatoliy: do not write into chroma reserved bitfields

Browse Source 
The layout for the frame flags is as follow:

   chroma_format  u(2)
   reserved       u(2)
   interlace_mode u(2)
   reserved       u(2)

chroma_format has 2 allowed values:
   0: reserved
   1: reserved
   2: 4:2:2
   3: 4:4:4

interlace_mode has 3 allowed values:
   0: progressive
   1: tff
   2: bff
   3: reserved

0x80 is what we expect for "422 not interlaced", and the extra 0x2 from
0x82 is actually writing into the reserved bits.
release/7.0
Clément Bœsch 1 year ago
parent 21f7a814ea
commit af509f9957
17 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/proresenc_anatoliy.c
  2. 2
      tests/ref/vsynth/vsynth1-prores
  3. 2
      tests/ref/vsynth/vsynth1-prores_444
  4. 2
      tests/ref/vsynth/vsynth1-prores_444_int
  5. 2
      tests/ref/vsynth/vsynth1-prores_int
  6. 2
      tests/ref/vsynth/vsynth2-prores
  7. 2
      tests/ref/vsynth/vsynth2-prores_444
  8. 2
      tests/ref/vsynth/vsynth2-prores_444_int
  9. 2
      tests/ref/vsynth/vsynth2-prores_int
  10. 2
      tests/ref/vsynth/vsynth3-prores
  11. 2
      tests/ref/vsynth/vsynth3-prores_444
  12. 2
      tests/ref/vsynth/vsynth3-prores_444_int
  13. 2
      tests/ref/vsynth/vsynth3-prores_int
  14. 2
      tests/ref/vsynth/vsynth_lena-prores
  15. 2
      tests/ref/vsynth/vsynth_lena-prores_444
  16. 2
      tests/ref/vsynth/vsynth_lena-prores_444_int
  17. 2
      tests/ref/vsynth/vsynth_lena-prores_int

2
libavcodec/proresenc_anatoliy.c
Unescape View File

@ -750,7 +750,7 @@ static int prores_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
bytestream_put_buffer(&buf, ctx->vendor, 4);
bytestream_put_be16(&buf, avctx->width);
bytestream_put_be16(&buf, avctx->height);
frame_flags = 0x82; /* 422 not interlaced */
frame_flags = 0x80; /* 422 not interlaced */
if (avctx->profile >= AV_PROFILE_PRORES_4444) /* 4444 or 4444 Xq */
frame_flags |= 0x40; /* 444 chroma */
if (ctx->is_interlaced) {

2
tests/ref/vsynth/vsynth1-prores
Unescape View File

@ -1,4 +1,4 @@
816d6e42260509681c49398cd4aa38a4 *tests/data/fate/vsynth1-prores.mov
e7c8db829626fdcf30eb9d78cd26b188 *tests/data/fate/vsynth1-prores.mov
5022821 tests/data/fate/vsynth1-prores.mov
fb4a9e025d12afc0dbbca8d82831858f *tests/data/fate/vsynth1-prores.out.rawvideo
stddev: 2.47 PSNR: 40.27 MAXDIFF: 31 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth1-prores_444
Unescape View File

@ -1,4 +1,4 @@
722dde50fce82923b81748ad8c64ca8d *tests/data/fate/vsynth1-prores_444.mov
61238212a797d14763431c346e896277 *tests/data/fate/vsynth1-prores_444.mov
7778954 tests/data/fate/vsynth1-prores_444.mov
e0da52b5d58171294d1b299539801ae0 *tests/data/fate/vsynth1-prores_444.out.rawvideo
stddev: 2.80 PSNR: 39.17 MAXDIFF: 44 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth1-prores_444_int
Unescape View File

@ -1,4 +1,4 @@
c7e7c65147f68893d735b650efec9ed3 *tests/data/fate/vsynth1-prores_444_int.mov
fd2a2f49c61817c2338f39d5736d5fd2 *tests/data/fate/vsynth1-prores_444_int.mov
9940947 tests/data/fate/vsynth1-prores_444_int.mov
732ceeb6887524e0aee98762fe50578b *tests/data/fate/vsynth1-prores_444_int.out.rawvideo
stddev: 2.83 PSNR: 39.08 MAXDIFF: 45 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth1-prores_int
Unescape View File

@ -1,4 +1,4 @@
3ffa73e7ecd5c2f9a2bd2098499e22a5 *tests/data/fate/vsynth1-prores_int.mov
1f1b246dfabe028f04c78887e5da51ed *tests/data/fate/vsynth1-prores_int.mov
6308688 tests/data/fate/vsynth1-prores_int.mov
164a4ca890695cf594293d1acec9463c *tests/data/fate/vsynth1-prores_int.out.rawvideo
stddev: 2.66 PSNR: 39.62 MAXDIFF: 34 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth2-prores
Unescape View File

@ -1,4 +1,4 @@
a3815327670b2c893045d0bf1b1da9b5 *tests/data/fate/vsynth2-prores.mov
eb1e43e2f323ef3577f43d415a7ede28 *tests/data/fate/vsynth2-prores.mov
3260123 tests/data/fate/vsynth2-prores.mov
416fa8773615889c70491452428d6710 *tests/data/fate/vsynth2-prores.out.rawvideo
stddev: 1.38 PSNR: 45.29 MAXDIFF: 12 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth2-prores_444
Unescape View File

@ -1,4 +1,4 @@
ab3646c0599b116b533c5b7f78741cac *tests/data/fate/vsynth2-prores_444.mov
96d4558376927a3dd4eb43e347858fd4 *tests/data/fate/vsynth2-prores_444.mov
5219722 tests/data/fate/vsynth2-prores_444.mov
e425b6af7afa51b5e64fc529528b3691 *tests/data/fate/vsynth2-prores_444.out.rawvideo
stddev: 0.88 PSNR: 49.18 MAXDIFF: 14 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth2-prores_444_int
Unescape View File

@ -1,4 +1,4 @@
e8dc9c3d56af3f382ae2d9de4dad095f *tests/data/fate/vsynth2-prores_444_int.mov
5ac517fc2380a6cf11b7d86d2fafee0a *tests/data/fate/vsynth2-prores_444_int.mov
6420787 tests/data/fate/vsynth2-prores_444_int.mov
33a5db4f0423168d4ae4f1db3610928e *tests/data/fate/vsynth2-prores_444_int.out.rawvideo
stddev: 0.93 PSNR: 48.73 MAXDIFF: 14 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth2-prores_int
Unescape View File

@ -1,4 +1,4 @@
2470bebd9dd05dabe02ff4555ed747f8 *tests/data/fate/vsynth2-prores_int.mov
4062c74196d95a64e642bd917377ed93 *tests/data/fate/vsynth2-prores_int.mov
4070996 tests/data/fate/vsynth2-prores_int.mov
bef9e38387a1fbb1ce2e4401b6d41674 *tests/data/fate/vsynth2-prores_int.out.rawvideo
stddev: 1.54 PSNR: 44.37 MAXDIFF: 13 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth3-prores
Unescape View File

@ -1,4 +1,4 @@
a7c499437e66fbfb1fe96f5eba326610 *tests/data/fate/vsynth3-prores.mov
23c5b31aa0dd945da6d1b747024c5392 *tests/data/fate/vsynth3-prores.mov
105367 tests/data/fate/vsynth3-prores.mov
fff5e7ad21d78501c8fa4749bf4bf289 *tests/data/fate/vsynth3-prores.out.rawvideo
stddev: 2.80 PSNR: 39.17 MAXDIFF: 27 bytes: 86700/ 86700

2
tests/ref/vsynth/vsynth3-prores_444
Unescape View File

@ -1,4 +1,4 @@
23f4ad11002ece9b864cfeeb4bff51a7 *tests/data/fate/vsynth3-prores_444.mov
d0a5643716e37ce727b2655bc0c1a497 *tests/data/fate/vsynth3-prores_444.mov
159127 tests/data/fate/vsynth3-prores_444.mov
025b48feb3d9a9652983ef71e6cb7e7c *tests/data/fate/vsynth3-prores_444.out.rawvideo
stddev: 3.21 PSNR: 37.98 MAXDIFF: 41 bytes: 86700/ 86700

2
tests/ref/vsynth/vsynth3-prores_444_int
Unescape View File

@ -1,4 +1,4 @@
fb4f7ddf139f2da095335026e4be9585 *tests/data/fate/vsynth3-prores_444_int.mov
50db4bbc4674de3dfdd41f306af1cb17 *tests/data/fate/vsynth3-prores_444_int.mov
184397 tests/data/fate/vsynth3-prores_444_int.mov
a8852aa2841c2ce5f2aa86176ceda4ef *tests/data/fate/vsynth3-prores_444_int.out.rawvideo
stddev: 3.24 PSNR: 37.91 MAXDIFF: 41 bytes: 86700/ 86700

2
tests/ref/vsynth/vsynth3-prores_int
Unescape View File

@ -1,4 +1,4 @@
db1ca2743b60dc1c3c49fab0dfca6145 *tests/data/fate/vsynth3-prores_int.mov
24b765064b4aec754fdd0cc3658bba19 *tests/data/fate/vsynth3-prores_int.mov
120484 tests/data/fate/vsynth3-prores_int.mov
e5859ba47a99f9e53c1ddcaa68a8f8f8 *tests/data/fate/vsynth3-prores_int.out.rawvideo
stddev: 2.92 PSNR: 38.81 MAXDIFF: 29 bytes: 86700/ 86700

2
tests/ref/vsynth/vsynth_lena-prores
Unescape View File

@ -1,4 +1,4 @@
d9cba10c23c0935ae2774bccee273664 *tests/data/fate/vsynth_lena-prores.mov
4a4c62c6c425e31c83b3f90875a28d57 *tests/data/fate/vsynth_lena-prores.mov
2844076 tests/data/fate/vsynth_lena-prores.mov
03fd29e3963716a09d232b6f817ecb57 *tests/data/fate/vsynth_lena-prores.out.rawvideo
stddev: 1.31 PSNR: 45.77 MAXDIFF: 11 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth_lena-prores_444
Unescape View File

@ -1,4 +1,4 @@
0818f09f8250dc8030ae6ef1dcdba90d *tests/data/fate/vsynth_lena-prores_444.mov
0b306033702448a7b77513f3e31c522a *tests/data/fate/vsynth_lena-prores_444.mov
4734395 tests/data/fate/vsynth_lena-prores_444.mov
a704e05e3e0a451edef7515b25a76bb8 *tests/data/fate/vsynth_lena-prores_444.out.rawvideo
stddev: 0.81 PSNR: 49.88 MAXDIFF: 8 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth_lena-prores_444_int
Unescape View File

@ -1,4 +1,4 @@
b8545710824cd87b51ebe223513cc9af *tests/data/fate/vsynth_lena-prores_444_int.mov
09b5dffd1a484e2152a3b5a0bcceed32 *tests/data/fate/vsynth_lena-prores_444_int.mov
5696258 tests/data/fate/vsynth_lena-prores_444_int.mov
466380156e4d2b811f4ffb9c5a8bca72 *tests/data/fate/vsynth_lena-prores_444_int.out.rawvideo
stddev: 0.88 PSNR: 49.23 MAXDIFF: 9 bytes: 7603200/ 7603200

2
tests/ref/vsynth/vsynth_lena-prores_int
Unescape View File

@ -1,4 +1,4 @@
3d5956899538737305edb383443b8a9a *tests/data/fate/vsynth_lena-prores_int.mov
c7e9a61054f44fe372a3bce619b68ce9 *tests/data/fate/vsynth_lena-prores_int.mov
3532698 tests/data/fate/vsynth_lena-prores_int.mov
eb5caa9824ca294f403cd13f33c40f23 *tests/data/fate/vsynth_lena-prores_int.out.rawvideo
stddev: 1.47 PSNR: 44.78 MAXDIFF: 12 bytes: 7603200/ 7603200

Write Preview
Loading…
Cancel
Save