Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 04:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Matroska reader: don't write "white colour coordinate x" to "…coordinate y"

Browse Source
This commit is contained in:
Moritz Bunkus 2017-09-16 11:45:27 +02:00
parent 6a0a966a29
commit 12720e2eec
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS.md
View File

@ -20,6 +20,9 @@
`SimpleBlock` elements. Other half of the fix for #2047.
* configure: the checks for libEBML and libMatroska have been fixed to require
libEBML 1.3.5 and libMatroska 1.4.7 as intended.
* mkvmerge: Matroska reader: if present in the file, the "white colour
coordinate x" track header attribute was written to both "white colour
coordinate x" and "white colour coordinate y" in the output file.
## Build system changes

2
src/input/r_matroska.cpp
View File

@ -1172,7 +1172,7 @@ kax_reader_c::read_headers_track_video(kax_track_t *track,
track->v_chroma_coordinates.blue_x = FindChildValue<KaxVideoBChromaX>(colour_meta, -1.0);
track->v_chroma_coordinates.blue_y = FindChildValue<KaxVideoBChromaY>(colour_meta, -1.0);
track->v_white_colour_coordinates.x = FindChildValue<KaxVideoWhitePointChromaX>(colour_meta, -1.0);
track->v_white_colour_coordinates.y = FindChildValue<KaxVideoWhitePointChromaX>(colour_meta, -1.0);
track->v_white_colour_coordinates.y = FindChildValue<KaxVideoWhitePointChromaY>(colour_meta, -1.0);
track->v_max_luminance = FindChildValue<KaxVideoLuminanceMax>(colour_meta, -1.0);
track->v_min_luminance = FindChildValue<KaxVideoLuminanceMin>(colour_meta, -1.0);
}

1
tests/results.txt
View File

@ -459,3 +459,4 @@ T_610video_projection:f474e42eaccf4ee9564c4014ae220452-f474e42eaccf4ee9564c4014a
T_611info_null_pointer_dereference_for_ebmlbinary:eaaec943902f1aea38ba3c85c587947e:passed:20170813-104016:0.012946476
T_612dts_provided_timestamp_used_too_early:ae879a711c571394195ec4dcd2a6a6a3:passed:20170813-175153:0.010423057
T_613vorbis_in_mp4:bcf052d24ed82ff0de57425259d075db:passed:20170910-175618:0.014743465
T_614white_colour_coordinates_from_mkv:916ae39f45a435c0b526d875c378e199-916ae39f45a435c0b526d875c378e199:passed:20170916-112249:0.094985684

7
tests/test-614white_colour_coordinates_from_mkv.rb Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/ruby -w
# T_614white_colour_coordinates_from_mkv
describe "mkvmerge / copy white colour coordinates header attributes from Matroska files"
test_merge "data/avi/v.avi", :args => "--no-audio --white-colour-coordinates 0:1,2", :keep_tmp => true
test_merge tmp, :output => "#{tmp}-2"