diff options
| author | Martin Vignali <martin.vignali@gmail.com> | 2018-10-08 15:49:56 +0200 |
|---|---|---|
| committer | Martin Vignali <martin.vignali@gmail.com> | 2018-10-18 21:38:44 +0200 |
| commit | 1a45b12cdc414794795c11db378d0be6113a22d3 (patch) | |
| tree | f57b198b14f081d9d84fc9bcd7dca5a6eacfa182 | |
| parent | d7731ea9d43cf8e7df19d54ab657adbda90d5fd3 (diff) | |
| download | ffmpeg-1a45b12cdc414794795c11db378d0be6113a22d3.tar.gz | |
avcodec/proresenc_aw : use AVframe primaries, transfert, colorspace for frame header instead of default (unknown, unknown, Rec601)
avoid color shift, on some decoding software
| -rw-r--r-- | libavcodec/proresenc_anatoliy.c | 6 | ||||
| -rw-r--r-- | tests/ref/vsynth/vsynth1-prores | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth/vsynth2-prores | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth/vsynth3-prores | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth/vsynth_lena-prores | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index dd6b1dcfb1..91b9a17947 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -501,9 +501,9 @@ static int prores_encode_frame(AVCodecContext *avctx, AVPacket *pkt, bytestream_put_be16(&buf, avctx->height); *buf++ = 0x83; // {10}(422){00}{00}(frame){11} *buf++ = 0; - *buf++ = 2; - *buf++ = 2; - *buf++ = 6; + *buf++ = pict->color_primaries; + *buf++ = pict->color_trc; + *buf++ = pict->colorspace; *buf++ = 32; *buf++ = 0; *buf++ = 3; diff --git a/tests/ref/vsynth/vsynth1-prores b/tests/ref/vsynth/vsynth1-prores index 14de8b9cf3..ee9d1712f1 100644 --- a/tests/ref/vsynth/vsynth1-prores +++ b/tests/ref/vsynth/vsynth1-prores @@ -1,4 +1,4 @@ -7ca7d2f9f5d8ac2ead691b1b6a70d409 *tests/data/fate/vsynth1-prores.mov +27a1293adf92cc0330652e4e81a9328d *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 diff --git a/tests/ref/vsynth/vsynth2-prores b/tests/ref/vsynth/vsynth2-prores index a1b4bb748f..86b773dda4 100644 --- a/tests/ref/vsynth/vsynth2-prores +++ b/tests/ref/vsynth/vsynth2-prores @@ -1,4 +1,4 @@ -aa57fd1221b7eefaf1f34f9d57d6a7cb *tests/data/fate/vsynth2-prores.mov +dc972bd57cec42786abddb79552b2654 *tests/data/fate/vsynth2-prores.mov 3265056 tests/data/fate/vsynth2-prores.mov 537b0ff66d7c8c3c12faa89d042e6a49 *tests/data/fate/vsynth2-prores.out.rawvideo stddev: 1.38 PSNR: 45.29 MAXDIFF: 12 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-prores b/tests/ref/vsynth/vsynth3-prores index f63a7a736f..47afc4f9df 100644 --- a/tests/ref/vsynth/vsynth3-prores +++ b/tests/ref/vsynth/vsynth3-prores @@ -1,4 +1,4 @@ -b060c59be88b4b089ece5ee8dc4f1c58 *tests/data/fate/vsynth3-prores.mov +f41aa3ce23eea73be3e207d5d0f18219 *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 diff --git a/tests/ref/vsynth/vsynth_lena-prores b/tests/ref/vsynth/vsynth_lena-prores index 5b8c3fe1b4..fb4035cd16 100644 --- a/tests/ref/vsynth/vsynth_lena-prores +++ b/tests/ref/vsynth/vsynth_lena-prores @@ -1,4 +1,4 @@ -637f34b5fd81f072f76a967595fa6af7 *tests/data/fate/vsynth_lena-prores.mov +09ef7f879fa65d6626dde9a88f1674c9 *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 |