[vlc-commits] mkv: uncompressed video support

Tim Allen git at videolan.org
Sun Jun 26 17:26:32 CEST 2016


vlc | branch: master | Tim Allen <vlc at timallen.ltd.uk> | Sun Jun 26 12:45:49 2016 +0100| [3e160ae3cfb2aa9ff23a255cf2cf3ceac0bdf6a6] | committer: Tristan Matthews

mkv: uncompressed video support

Signed-off-by: Tristan Matthews <tmatth at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e160ae3cfb2aa9ff23a255cf2cf3ceac0bdf6a6
---

 modules/demux/mkv/matroska_segment_parse.cpp |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index 413bd16..6a2a7f1 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -588,6 +588,19 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
             vars.tk->f_fps = __MAX( static_cast<float>( vfps ), 1 );
             debug( vars, "fps=%f", vars.tk->f_fps );
         }
+        E_CASE( KaxVideoColourSpace, colourspace )
+        {
+            if ( colourspace.ValidateSize() )
+            {
+                char clrspc[5];
+
+                vars.tk->fmt.i_codec = GetFOURCC( colourspace.GetBuffer() );
+
+                vlc_fourcc_to_char( vars.tk->fmt.i_codec, clrspc );
+                clrspc[4]  = '\0';
+                debug( vars, "Colour Space=%s", clrspc );
+            }
+        }
         E_CASE( KaxTrackAudio, tka ) {
             vars.tk->fmt.audio.i_channels = 1;
             vars.tk->fmt.audio.i_rate = 8000;
@@ -1372,6 +1385,9 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk )
         S_CASE("V_MJPEG") {
             vars.p_fmt->i_codec = VLC_CODEC_MJPG;
         }
+        S_CASE("V_UNCOMPRESSED") {
+            msg_Dbg( vars.p_demuxer, "uncompressed format detected");
+        }
         S_CASE("A_MS/ACM") {
             mkv_track_t * p_tk = vars.p_tk;
             es_format_t * p_fmt = &vars.p_tk->fmt;



More information about the vlc-commits mailing list