mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/qtdemux/qtdemux.c: Don't parse extra sample params for raw pcm. Fixes #374914.

Browse source 
Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (gst_qtdemux_get_duration),
(gst_qtdemux_handle_src_query), (qtdemux_parse_trak):
Don't parse extra sample params for raw pcm. Fixes #374914.
This commit is contained in:
Wim Taymans 2006-11-14 11:43:40 +00:00
parent aeea3693ae
commit e9d741454d
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-11-14 Wim Taymans <wim@fluendo.com>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_get_duration),
(gst_qtdemux_handle_src_query), (qtdemux_parse_trak):
Don't parse extra sample params for raw pcm. Fixes #374914.
2006-11-14 Wim Taymans <wim@fluendo.com> 2006-11-14 Wim Taymans <wim@fluendo.com>
* tests/check/elements/.cvsignore: * tests/check/elements/.cvsignore:

35
gst/qtdemux/qtdemux.c
View file

@ -3431,14 +3431,15 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
if (compression_id == 0xfffe) if (compression_id == 0xfffe)
stream->sampled = TRUE; stream->sampled = TRUE;
/* first assume uncompressed audio */
stream->bytes_per_sample = samplesize / 8;
stream->samples_per_frame = stream->n_channels;
stream->bytes_per_frame = stream->n_channels * stream->bytes_per_sample;
stream->samples_per_packet = stream->samples_per_frame;
stream->bytes_per_packet = stream->bytes_per_sample;
offset = 52; offset = 52;
if (version == 0x00000000) { if (version == 0x00000000) {
stream->bytes_per_sample = samplesize / 8;
stream->samples_per_frame = stream->n_channels;
stream->bytes_per_frame = stream->n_channels * stream->bytes_per_sample;
stream->samples_per_packet = stream->samples_per_frame;
stream->bytes_per_packet = stream->bytes_per_sample;
/* Yes, these have to be hard-coded */ /* Yes, these have to be hard-coded */
if (fourcc == GST_MAKE_FOURCC ('M', 'A', 'C', '6')) { if (fourcc == GST_MAKE_FOURCC ('M', 'A', 'C', '6')) {
stream->samples_per_packet = 6; stream->samples_per_packet = 6;
@ -3470,19 +3471,21 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
stream->samples_per_frame = 1 * stream->n_channels; stream->samples_per_frame = 1 * stream->n_channels;
} }
} else if (version == 0x00010000) { } else if (version == 0x00010000) {
stream->samples_per_packet = QTDEMUX_GUINT32_GET (stsd_data + offset);
stream->bytes_per_packet = QTDEMUX_GUINT32_GET (stsd_data + offset + 4);
stream->bytes_per_frame = QTDEMUX_GUINT32_GET (stsd_data + offset + 8);
stream->bytes_per_sample = QTDEMUX_GUINT32_GET (stsd_data + offset + 12);
GST_LOG ("samples/packet: %d", stream->samples_per_packet);
GST_LOG ("bytes/packet: %d", stream->bytes_per_packet);
GST_LOG ("bytes/frame: %d", stream->bytes_per_frame);
GST_LOG ("bytes/sample: %d", stream->bytes_per_sample);
if (fourcc != GST_MAKE_FOURCC ('t', 'w', 'o', 's') && if (fourcc != GST_MAKE_FOURCC ('t', 'w', 'o', 's') &&
fourcc != GST_MAKE_FOURCC ('s', 'o', 'w', 't') && fourcc != GST_MAKE_FOURCC ('s', 'o', 'w', 't') &&
fourcc != GST_MAKE_FOURCC ('r', 'a', 'w', ' ')) { fourcc != GST_MAKE_FOURCC ('r', 'a', 'w', ' ')) {
/* only parse extra decoding config for non-pcm audio */
stream->samples_per_packet = QTDEMUX_GUINT32_GET (stsd_data + offset);
stream->bytes_per_packet = QTDEMUX_GUINT32_GET (stsd_data + offset + 4);
stream->bytes_per_frame = QTDEMUX_GUINT32_GET (stsd_data + offset + 8);
stream->bytes_per_sample =
QTDEMUX_GUINT32_GET (stsd_data + offset + 12);
GST_LOG ("samples/packet: %d", stream->samples_per_packet);
GST_LOG ("bytes/packet: %d", stream->bytes_per_packet);
GST_LOG ("bytes/frame: %d", stream->bytes_per_frame);
GST_LOG ("bytes/sample: %d", stream->bytes_per_sample);
if (!stream->sampled) { if (!stream->sampled) {
stream->samples_per_frame = (stream->bytes_per_frame / stream->samples_per_frame = (stream->bytes_per_frame /
stream->bytes_per_packet) * stream->samples_per_packet; stream->bytes_per_packet) * stream->samples_per_packet;