qtdemux: recognize SBTL subtype for subtitles

https://bugzilla.gnome.org/show_bug.cgi?id=696244
This commit is contained in:
Matej Knopp 2013-03-21 02:52:07 +01:00 committed by Tim-Philipp Müller
parent 0f97b6f978
commit f494635126
2 changed files with 7 additions and 3 deletions

View file

@ -3590,7 +3590,8 @@ gst_qtdemux_process_buffer (GstQTDemux * qtdemux, QtDemuxStream * stream,
stream->need_process = FALSE;
}
if (G_UNLIKELY (stream->subtype != FOURCC_text)) {
if (G_UNLIKELY (stream->subtype != FOURCC_text
&& stream->subtype != FOURCC_sbtl)) {
return buf;
}
@ -5236,7 +5237,8 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux,
qtdemux->n_audio_streams++;
} else if (stream->subtype == FOURCC_strm) {
GST_DEBUG_OBJECT (qtdemux, "stream type, not creating pad");
} else if (stream->subtype == FOURCC_subp || stream->subtype == FOURCC_text) {
} else if (stream->subtype == FOURCC_subp || stream->subtype == FOURCC_text
|| stream->subtype == FOURCC_sbtl) {
gchar *name = g_strdup_printf ("subtitle_%u", qtdemux->n_sub_streams);
stream->pad =
@ -7493,7 +7495,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
goto unknown_stream;
}
stream->sampled = TRUE;
} else if (stream->subtype == FOURCC_subp || stream->subtype == FOURCC_text) {
} else if (stream->subtype == FOURCC_subp || stream->subtype == FOURCC_text
|| stream->subtype == FOURCC_sbtl) {
stream->sampled = TRUE;

View file

@ -65,6 +65,7 @@ G_BEGIN_DECLS
#define FOURCC_vide GST_MAKE_FOURCC('v','i','d','e')
#define FOURCC_soun GST_MAKE_FOURCC('s','o','u','n')
#define FOURCC_subp GST_MAKE_FOURCC('s','u','b','p')
#define FOURCC_sbtl GST_MAKE_FOURCC('s','b','t','l')
#define FOURCC_strm GST_MAKE_FOURCC('s','t','r','m')
#define FOURCC_rtsp GST_MAKE_FOURCC('r','t','s','p')
#define FOURCC_co64 GST_MAKE_FOURCC('c','o','6','4')