Browse code
libavformat: DNxHD in .mov, switch unspecified color_range to mpeg
Avid prefers mpeg range [16-235] by default this change brings
ffmpeg into line with that. To obtain the old behaviour use
'-color_range jpeg' on the command line prior to the ouput
filename.
Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kevin Wheatley authored on 2015/02/10 20:37:00Showing 9 changed files
- Changelog
- libavformat/movenc.c
- tests/ref/vsynth/vsynth1-dnxhd-1080i
- tests/ref/vsynth/vsynth1-dnxhd-1080i-colr
- tests/ref/vsynth/vsynth2-dnxhd-1080i
- tests/ref/vsynth/vsynth2-dnxhd-1080i-colr
- tests/ref/vsynth/vsynth3-dnxhd-1080i-colr
- tests/ref/vsynth/vsynth_lena-dnxhd-1080i
- tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr
| ... | ... |
@@ -1037,7 +1037,8 @@ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track) |
| 1037 | 1037 |
ffio_wfourcc(pb, "ACLR"); |
| 1038 | 1038 |
ffio_wfourcc(pb, "ACLR"); |
| 1039 | 1039 |
ffio_wfourcc(pb, "0001"); |
| 1040 |
- if (track->enc->color_range == AVCOL_RANGE_MPEG) { /* Legal range (16-235) */
|
|
| 1040 |
+ if (track->enc->color_range == AVCOL_RANGE_MPEG || /* Legal range (16-235) */ |
|
| 1041 |
+ track->enc->color_range == AVCOL_RANGE_UNSPECIFIED) {
|
|
| 1041 | 1042 |
avio_wb32(pb, 1); /* Corresponds to 709 in official encoder */ |
| 1042 | 1043 |
} else { /* Full range (0-255) */
|
| 1043 | 1044 |
avio_wb32(pb, 2); /* Corresponds to RGB in official encoder */ |
| ... | ... |
@@ -1,4 +1,4 @@ |
| 1 |
-14f1ea20bbd3024ccbfd84c681888d07 *tests/data/fate/vsynth1-dnxhd-1080i.mov |
|
| 1 |
+a0234e0a8516d958f423b119aa9e35c4 *tests/data/fate/vsynth1-dnxhd-1080i.mov |
|
| 2 | 2 |
3031911 tests/data/fate/vsynth1-dnxhd-1080i.mov |
| 3 | 3 |
a09132c6db44f415e831dcaa630a351b *tests/data/fate/vsynth1-dnxhd-1080i.out.rawvideo |
| 4 | 4 |
stddev: 6.29 PSNR: 32.15 MAXDIFF: 64 bytes: 7603200/ 760320 |
| ... | ... |
@@ -1,4 +1,4 @@ |
| 1 |
-b6fbfdfe7027fde6853930abad87eaab *tests/data/fate/vsynth1-dnxhd-1080i-colr.mov |
|
| 1 |
+200a881696cc70c36c33fb415ed9488b *tests/data/fate/vsynth1-dnxhd-1080i-colr.mov |
|
| 2 | 2 |
3031929 tests/data/fate/vsynth1-dnxhd-1080i-colr.mov |
| 3 | 3 |
5835dff88cb84e83bbe70b5ed5edd5ab *tests/data/fate/vsynth1-dnxhd-1080i-colr.out.rawvideo |
| 4 | 4 |
stddev: 5.79 PSNR: 32.87 MAXDIFF: 56 bytes: 7603200/ 760320 |
| ... | ... |
@@ -1,4 +1,4 @@ |
| 1 |
-d59d5d40ffb33ebb9e9e0d5025aefb88 *tests/data/fate/vsynth2-dnxhd-1080i.mov |
|
| 1 |
+2b75889122f8d918e1b068d128b618ca *tests/data/fate/vsynth2-dnxhd-1080i.mov |
|
| 2 | 2 |
3031911 tests/data/fate/vsynth2-dnxhd-1080i.mov |
| 3 | 3 |
099001db73036eeb9545c463cf90f0ba *tests/data/fate/vsynth2-dnxhd-1080i.out.rawvideo |
| 4 | 4 |
stddev: 1.53 PSNR: 44.43 MAXDIFF: 31 bytes: 7603200/ 760320 |
| ... | ... |
@@ -1,4 +1,4 @@ |
| 1 |
-d510bc0d58c7cae875e3e67023771d6f *tests/data/fate/vsynth2-dnxhd-1080i-colr.mov |
|
| 1 |
+53dfdc17882f2240a10c799287bf4b68 *tests/data/fate/vsynth2-dnxhd-1080i-colr.mov |
|
| 2 | 2 |
3031929 tests/data/fate/vsynth2-dnxhd-1080i-colr.mov |
| 3 | 3 |
e4cf5528c993b5e7d57a9d0a4d2cd0c6 *tests/data/fate/vsynth2-dnxhd-1080i-colr.out.rawvideo |
| 4 | 4 |
stddev: 1.58 PSNR: 44.15 MAXDIFF: 33 bytes: 7603200/ 760320 |
| ... | ... |
@@ -1,4 +1,4 @@ |
| 1 |
-3b06d8675f9623db77b6a42916663608 *tests/data/fate/vsynth3-dnxhd-1080i-colr.mov |
|
| 1 |
+da84414ce38ed0479c61a493398c912a *tests/data/fate/vsynth3-dnxhd-1080i-colr.mov |
|
| 2 | 2 |
3031929 tests/data/fate/vsynth3-dnxhd-1080i-colr.mov |
| 3 | 3 |
7dd6b261e439cda21df4f01b45336b41 *tests/data/fate/vsynth3-dnxhd-1080i-colr.out.rawvideo |
| 4 | 4 |
stddev: 6.92 PSNR: 31.32 MAXDIFF: 50 bytes: 86700/ 8670 |
| ... | ... |
@@ -1,4 +1,4 @@ |
| 1 |
-d680a5eed77c5b8dc6b5ef3bcf6e87e8 *tests/data/fate/vsynth_lena-dnxhd-1080i.mov |
|
| 1 |
+f7412afbcb4454692f7492f6710189e3 *tests/data/fate/vsynth_lena-dnxhd-1080i.mov |
|
| 2 | 2 |
3031911 tests/data/fate/vsynth_lena-dnxhd-1080i.mov |
| 3 | 3 |
744ba46da5d4c19a28562ea31061d170 *tests/data/fate/vsynth_lena-dnxhd-1080i.out.rawvideo |
| 4 | 4 |
stddev: 1.31 PSNR: 45.77 MAXDIFF: 23 bytes: 7603200/ 760320 |
| ... | ... |
@@ -1,4 +1,4 @@ |
| 1 |
-4deae1b3d9a5c8fbd28075e8dca0034e *tests/data/fate/vsynth_lena-dnxhd-1080i-colr.mov |
|
| 1 |
+241d5c03c5f6d7560b9e164ce0617f04 *tests/data/fate/vsynth_lena-dnxhd-1080i-colr.mov |
|
| 2 | 2 |
3031929 tests/data/fate/vsynth_lena-dnxhd-1080i-colr.mov |
| 3 | 3 |
864c3d5f49d9edf66ce8f82a2a6725f6 *tests/data/fate/vsynth_lena-dnxhd-1080i-colr.out.rawvideo |
| 4 | 4 |
stddev: 1.36 PSNR: 45.45 MAXDIFF: 22 bytes: 7603200/ 760320 |