Skip to content

Commit

Permalink
mkv: uncompressed video support
Browse files Browse the repository at this point in the history
Signed-off-by: Tristan Matthews <tmatth@videolan.org>
  • Loading branch information
Tim Allen authored and tmatth committed Jun 26, 2016
1 parent 5d3ad7d commit 3e160ae
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions modules/demux/mkv/matroska_segment_parse.cpp
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 3e160ae

Please sign in to comment.