mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-03 15:06:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: refactor common parts in track parsing

Browse source
This commit is contained in:
Mark Nauwelaerts 2009-10-09 16:30:57 +02:00
parent 5ed2c3e562
commit 1210a92ff6
1 changed files with 26 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
gst/qtdemux/qtdemux.c
View file

@ -4241,6 +4241,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
guint32 version; guint32 version;
guint32 tkhd_flags; guint32 tkhd_flags;
guint8 tkhd_version; guint8 tkhd_version;
guint32 fourcc;
guint len;
stream = g_new0 (QtDemuxStream, 1); stream = g_new0 (QtDemuxStream, 1);
/* new streams always need a discont */ /* new streams always need a discont */
@ -4333,8 +4335,27 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
goto corrupt_file; goto corrupt_file;
stsd_data = (const guint8 *) stsd->data; stsd_data = (const guint8 *) stsd->data;
/* stsd should at least have one entry */
len = QT_UINT32 (stsd_data);
if (len < 24)
goto corrupt_file;
/* and that entry should fit within stsd */
len = QT_UINT32 (stsd_data + 16);
if (len > QT_UINT32 (stsd_data) + 16)
goto corrupt_file;
GST_LOG_OBJECT (qtdemux, "stsd len: %d", len);
stream->fourcc = fourcc = QT_FOURCC (stsd_data + 16 + 4);
GST_LOG_OBJECT (qtdemux, "stsd type: %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (stream->fourcc));
if ((fourcc == FOURCC_drms) || (fourcc == FOURCC_drmi) ||
((fourcc & 0xFFFFFF00) == GST_MAKE_FOURCC ('e', 'n', 'c', 0)))
goto error_encrypted;
if (stream->subtype == FOURCC_vide) { if (stream->subtype == FOURCC_vide) {
guint32 w, h, fourcc; guint32 w, h;
stream->sampled = TRUE; stream->sampled = TRUE;
@ -4348,9 +4369,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
stream->display_height = h >> 16; stream->display_height = h >> 16;
offset = 16; offset = 16;
stream->fourcc = fourcc = QT_FOURCC (stsd_data + offset + 4); if (len < 86)
GST_LOG_OBJECT (qtdemux, "st type: %" GST_FOURCC_FORMAT, goto corrupt_file;
GST_FOURCC_ARGS (fourcc));
stream->width = QT_UINT16 (stsd_data + offset + 32); stream->width = QT_UINT16 (stsd_data + offset + 32);
stream->height = QT_UINT16 (stsd_data + offset + 34); stream->height = QT_UINT16 (stsd_data + offset + 34);
@ -4362,10 +4382,6 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
GST_LOG_OBJECT (qtdemux, "frame count: %u", GST_LOG_OBJECT (qtdemux, "frame count: %u",
QT_UINT16 (stsd_data + offset + 48)); QT_UINT16 (stsd_data + offset + 48));
if ((fourcc == FOURCC_drms) || (fourcc == FOURCC_drmi) ||
((fourcc & 0xFFFFFF00) == GST_MAKE_FOURCC ('e', 'n', 'c', 0)))
goto error_encrypted;
stream->caps = stream->caps =
qtdemux_video_caps (qtdemux, stream, fourcc, stsd_data, &codec); qtdemux_video_caps (qtdemux, stream, fourcc, stsd_data, &codec);
if (codec) { if (codec) {
@ -4555,18 +4571,11 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
} else if (stream->subtype == FOURCC_soun) { } else if (stream->subtype == FOURCC_soun) {
int version, samplesize; int version, samplesize;
guint32 fourcc;
int len;
guint16 compression_id; guint16 compression_id;
len = QT_UINT32 (stsd_data + 16);
GST_LOG_OBJECT (qtdemux, "stsd len: %d", len);
stream->fourcc = fourcc = QT_FOURCC (stsd_data + 16 + 4);
GST_LOG_OBJECT (qtdemux, "stsd type: %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (stream->fourcc));
offset = 32; offset = 32;
if (len < 36)
goto corrupt_file;
version = QT_UINT32 (stsd_data + offset); version = QT_UINT32 (stsd_data + offset);
stream->n_channels = QT_UINT16 (stsd_data + offset + 8); stream->n_channels = QT_UINT16 (stsd_data + offset + 8);
@ -4700,10 +4709,6 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
GST_WARNING_OBJECT (qtdemux, "unknown version %08x", version); GST_WARNING_OBJECT (qtdemux, "unknown version %08x", version);
} }
if ((fourcc == FOURCC_drms) || (fourcc == FOURCC_drmi) ||
((fourcc & 0xFFFFFF00) == GST_MAKE_FOURCC ('e', 'n', 'c', 0)))
goto error_encrypted;
stream->caps = qtdemux_audio_caps (qtdemux, stream, fourcc, NULL, 0, stream->caps = qtdemux_audio_caps (qtdemux, stream, fourcc, NULL, 0,
&codec); &codec);
@ -4820,12 +4825,6 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
GST_FOURCC_ARGS (fourcc), stream->caps); GST_FOURCC_ARGS (fourcc), stream->caps);
} else if (stream->subtype == FOURCC_strm) { } else if (stream->subtype == FOURCC_strm) {
guint32 fourcc;
stream->fourcc = fourcc = QT_FOURCC (stsd_data + 16 + 4);
GST_LOG_OBJECT (qtdemux, "stsd type: %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (fourcc));
if (fourcc != FOURCC_rtsp) { if (fourcc != FOURCC_rtsp) {
GST_INFO_OBJECT (qtdemux, "unhandled stream type %" GST_FOURCC_FORMAT, GST_INFO_OBJECT (qtdemux, "unhandled stream type %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (fourcc)); GST_FOURCC_ARGS (fourcc));
@ -4833,14 +4832,10 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
} }
stream->sampled = TRUE; stream->sampled = TRUE;
} else if (stream->subtype == FOURCC_subp || stream->subtype == FOURCC_text) { } else if (stream->subtype == FOURCC_subp || stream->subtype == FOURCC_text) {
guint32 fourcc;
stream->sampled = TRUE; stream->sampled = TRUE;
offset = 16; offset = 16;
stream->fourcc = fourcc = QT_FOURCC (stsd_data + offset + 4);
GST_LOG_OBJECT (qtdemux, "st type: %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (fourcc));
stream->caps = stream->caps =
qtdemux_sub_caps (qtdemux, stream, fourcc, stsd_data, &codec); qtdemux_sub_caps (qtdemux, stream, fourcc, stsd_data, &codec);