History

avcodec/proresenc_anatoliy: use a compatible bitstream version

Quoting SMPTE RDD 36:2015: A decoder shall abort if it encounters a bitstream with an unsupported bitstream_version value. If 0, the value of the chroma_format syntax element shall be 2 (4:2:2 sampling) and the value of the alpha_channel_type element shall be 0 (no encoded alpha); if 1, any permissible value may be used for those syntax elements. So if we're not in 4:2:2 or if there is alpha, we are not allowed to use version 0.

Clément Bœsch committed 2 years ago

Commit 85cb1b91 parent 0405f719 files · +9 −9Browse files

Unified · Split

9 files
  1. libavcodec/proresenc_anatoliy.c +1 −1
  2. tests/ref/vsynth/vsynth1-prores_444 +1 −1
  3. tests/ref/vsynth/vsynth1-prores_444_int +1 −1
  4. tests/ref/vsynth/vsynth2-prores_444 +1 −1
  5. tests/ref/vsynth/vsynth2-prores_444_int +1 −1
  6. tests/ref/vsynth/vsynth3-prores_444 +1 −1
  7. tests/ref/vsynth/vsynth3-prores_444_int +1 −1
  8. tests/ref/vsynth/vsynth_lena-prores_444 +1 −1
  9. tests/ref/vsynth/vsynth_lena-prores_444_int +1 −1
libavcodec/proresenc_anatoliy.c+1−1
@@ -746,7 +746,7 @@ static int prores_encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 745 unmodified lines
746 bytestream_put_be32(&buf, FRAME_ID);746 bytestream_put_be32(&buf, FRAME_ID);
747 747
748 bytestream_put_be16(&buf, header_size);748 bytestream_put_be16(&buf, header_size);
749 bytestream_put_be16(&buf, 0); /* version */749 bytestream_put_be16(&buf, avctx->pix_fmt != AV_PIX_FMT_YUV422P10 || ctx->need_alpha ? 1 : 0); /* version */
750 bytestream_put_buffer(&buf, ctx->vendor, 4);750 bytestream_put_buffer(&buf, ctx->vendor, 4);
751 bytestream_put_be16(&buf, avctx->width);751 bytestream_put_be16(&buf, avctx->width);
752 bytestream_put_be16(&buf, avctx->height);752 bytestream_put_be16(&buf, avctx->height);
tests/ref/vsynth/vsynth1-prores_444+1−1
@@ -1,4 +1,4 @@
1509e0407dff118c775dcaa4f509a4aae *tests/data/fate/vsynth1-prores_444.mov117c5652215ee8213319f58bc6bbcc505 *tests/data/fate/vsynth1-prores_444.mov
27778954 tests/data/fate/vsynth1-prores_444.mov27778954 tests/data/fate/vsynth1-prores_444.mov
3e0da52b5d58171294d1b299539801ae0 *tests/data/fate/vsynth1-prores_444.out.rawvideo3e0da52b5d58171294d1b299539801ae0 *tests/data/fate/vsynth1-prores_444.out.rawvideo
4stddev: 2.80 PSNR: 39.17 MAXDIFF: 44 bytes: 7603200/ 76032004stddev: 2.80 PSNR: 39.17 MAXDIFF: 44 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth1-prores_444_int+1−1
@@ -1,4 +1,4 @@
11d5e484fa8ca08781ef2ed8428963d12 *tests/data/fate/vsynth1-prores_444_int.mov141cc25faabf5545b84983d43cc46aded *tests/data/fate/vsynth1-prores_444_int.mov
29940947 tests/data/fate/vsynth1-prores_444_int.mov29940947 tests/data/fate/vsynth1-prores_444_int.mov
3732ceeb6887524e0aee98762fe50578b *tests/data/fate/vsynth1-prores_444_int.out.rawvideo3732ceeb6887524e0aee98762fe50578b *tests/data/fate/vsynth1-prores_444_int.out.rawvideo
4stddev: 2.83 PSNR: 39.08 MAXDIFF: 45 bytes: 7603200/ 76032004stddev: 2.83 PSNR: 39.08 MAXDIFF: 45 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth2-prores_444+1−1
@@ -1,4 +1,4 @@
121f973c4c6076ea21f82d5fe486c0c98 *tests/data/fate/vsynth2-prores_444.mov19b2e73b60b1809754390f3d6bcd65218 *tests/data/fate/vsynth2-prores_444.mov
25219722 tests/data/fate/vsynth2-prores_444.mov25219722 tests/data/fate/vsynth2-prores_444.mov
3e425b6af7afa51b5e64fc529528b3691 *tests/data/fate/vsynth2-prores_444.out.rawvideo3e425b6af7afa51b5e64fc529528b3691 *tests/data/fate/vsynth2-prores_444.out.rawvideo
4stddev: 0.88 PSNR: 49.18 MAXDIFF: 14 bytes: 7603200/ 76032004stddev: 0.88 PSNR: 49.18 MAXDIFF: 14 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth2-prores_444_int+1−1
@@ -1,4 +1,4 @@
1500a8249bc63ec6bb79f816bce5b6db1 *tests/data/fate/vsynth2-prores_444_int.mov1dbb3038d8fc88d7261a7aad315196600 *tests/data/fate/vsynth2-prores_444_int.mov
26420787 tests/data/fate/vsynth2-prores_444_int.mov26420787 tests/data/fate/vsynth2-prores_444_int.mov
333a5db4f0423168d4ae4f1db3610928e *tests/data/fate/vsynth2-prores_444_int.out.rawvideo333a5db4f0423168d4ae4f1db3610928e *tests/data/fate/vsynth2-prores_444_int.out.rawvideo
4stddev: 0.93 PSNR: 48.73 MAXDIFF: 14 bytes: 7603200/ 76032004stddev: 0.93 PSNR: 48.73 MAXDIFF: 14 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth3-prores_444+1−1
@@ -1,4 +1,4 @@
13070da65c30c1a9905ee31c7ede1cf57 *tests/data/fate/vsynth3-prores_444.mov107d2ba443bd0a2ae090dd85cc8d9423e *tests/data/fate/vsynth3-prores_444.mov
2159127 tests/data/fate/vsynth3-prores_444.mov2159127 tests/data/fate/vsynth3-prores_444.mov
3025b48feb3d9a9652983ef71e6cb7e7c *tests/data/fate/vsynth3-prores_444.out.rawvideo3025b48feb3d9a9652983ef71e6cb7e7c *tests/data/fate/vsynth3-prores_444.out.rawvideo
4stddev: 3.21 PSNR: 37.98 MAXDIFF: 41 bytes: 86700/ 867004stddev: 3.21 PSNR: 37.98 MAXDIFF: 41 bytes: 86700/ 86700
tests/ref/vsynth/vsynth3-prores_444_int+1−1
@@ -1,4 +1,4 @@
1c6279e0584575ffa1e2e13047cc7ecec *tests/data/fate/vsynth3-prores_444_int.mov1a97bdacf54af3f81610861f2ba613bc7 *tests/data/fate/vsynth3-prores_444_int.mov
2184397 tests/data/fate/vsynth3-prores_444_int.mov2184397 tests/data/fate/vsynth3-prores_444_int.mov
3a8852aa2841c2ce5f2aa86176ceda4ef *tests/data/fate/vsynth3-prores_444_int.out.rawvideo3a8852aa2841c2ce5f2aa86176ceda4ef *tests/data/fate/vsynth3-prores_444_int.out.rawvideo
4stddev: 3.24 PSNR: 37.91 MAXDIFF: 41 bytes: 86700/ 867004stddev: 3.24 PSNR: 37.91 MAXDIFF: 41 bytes: 86700/ 86700
tests/ref/vsynth/vsynth_lena-prores_444+1−1
@@ -1,4 +1,4 @@
1b8677f9e1da7be861e8b7207028b3a9e *tests/data/fate/vsynth_lena-prores_444.mov1e14c1dbd26cebe70feda70acb18962c0 *tests/data/fate/vsynth_lena-prores_444.mov
24734395 tests/data/fate/vsynth_lena-prores_444.mov24734395 tests/data/fate/vsynth_lena-prores_444.mov
3a704e05e3e0a451edef7515b25a76bb8 *tests/data/fate/vsynth_lena-prores_444.out.rawvideo3a704e05e3e0a451edef7515b25a76bb8 *tests/data/fate/vsynth_lena-prores_444.out.rawvideo
4stddev: 0.81 PSNR: 49.88 MAXDIFF: 8 bytes: 7603200/ 76032004stddev: 0.81 PSNR: 49.88 MAXDIFF: 8 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth_lena-prores_444_int+1−1
@@ -1,4 +1,4 @@
138195b0437f6ae1c910ba108e7a799d1 *tests/data/fate/vsynth_lena-prores_444_int.mov17a1aa9e220dffde91c3a9a0595261461 *tests/data/fate/vsynth_lena-prores_444_int.mov
25696258 tests/data/fate/vsynth_lena-prores_444_int.mov25696258 tests/data/fate/vsynth_lena-prores_444_int.mov
3466380156e4d2b811f4ffb9c5a8bca72 *tests/data/fate/vsynth_lena-prores_444_int.out.rawvideo3466380156e4d2b811f4ffb9c5a8bca72 *tests/data/fate/vsynth_lena-prores_444_int.out.rawvideo
4stddev: 0.88 PSNR: 49.23 MAXDIFF: 9 bytes: 7603200/ 76032004stddev: 0.88 PSNR: 49.23 MAXDIFF: 9 bytes: 7603200/ 7603200

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t