mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

wavparse: Store size of data tag in a 64 bit integer locally too

Browse source 
Otherwise we will clip the DS64 value of RF64 files to 32 bits again.
This commit is contained in:
Sebastian Dröge 2014-08-29 11:55:26 +03:00
parent d924f8a955
commit f5df8af59e
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst/wavparse/gstwavparse.c
View file

@ -1260,10 +1260,13 @@ gst_wavparse_stream_headers (GstWavParse * wav)
*/ */
switch (tag) { switch (tag) {
case GST_RIFF_TAG_data:{ case GST_RIFF_TAG_data:{
guint64 size64;
GST_DEBUG_OBJECT (wav, "Got 'data' TAG, size : %u", size); GST_DEBUG_OBJECT (wav, "Got 'data' TAG, size : %u", size);
size64 = size;
if (wav->ignore_length) { if (wav->ignore_length) {
GST_DEBUG_OBJECT (wav, "Ignoring length"); GST_DEBUG_OBJECT (wav, "Ignoring length");
size = 0; size64 = 0;
} }
if (wav->streaming) { if (wav->streaming) {
gst_adapter_flush (wav->adapter, 8); gst_adapter_flush (wav->adapter, 8);
@ -1274,27 +1277,27 @@ gst_wavparse_stream_headers (GstWavParse * wav)
wav->offset += 8; wav->offset += 8;
wav->datastart = wav->offset; wav->datastart = wav->offset;
/* use size from ds64 chunk if available */ /* use size from ds64 chunk if available */
if (size == -1 && wav->datasize > 0) { if (size64 == -1 && wav->datasize > 0) {
GST_DEBUG_OBJECT (wav, "Using ds64 datasize"); GST_DEBUG_OBJECT (wav, "Using ds64 datasize");
size = wav->datasize; size64 = wav->datasize;
} }
/* If size is zero, then the data chunk probably actually extends to /* If size is zero, then the data chunk probably actually extends to
the end of the file */ the end of the file */
if (size == 0 && upstream_size) { if (size64 == 0 && upstream_size) {
size = upstream_size - wav->datastart; size64 = upstream_size - wav->datastart;
} }
/* Or the file might be truncated */ /* Or the file might be truncated */
else if (upstream_size) { else if (upstream_size) {
size = MIN (size, (upstream_size - wav->datastart)); size64 = MIN (size64, (upstream_size - wav->datastart));
} }
wav->datasize = (guint64) size; wav->datasize = size64;
wav->dataleft = (guint64) size; wav->dataleft = size64;
wav->end_offset = size + wav->datastart; wav->end_offset = size64 + wav->datastart;
if (!wav->streaming) { if (!wav->streaming) {
/* We will continue parsing tags 'till end */ /* We will continue parsing tags 'till end */
wav->offset += size; wav->offset += size64;
} }
GST_DEBUG_OBJECT (wav, "datasize = %u", size); GST_DEBUG_OBJECT (wav, "datasize = %" G_GUINT64_FORMAT, size64);
break; break;
} }
case GST_RIFF_TAG_fact:{ case GST_RIFF_TAG_fact:{