mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-07 19:22:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: small cleanup

Browse source
This commit is contained in:
Wim Taymans 2009-09-24 20:38:54 +02:00 committed by Wim Taymans
parent 01e00ba1cd
commit 4e114a2b24
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/qtdemux/qtdemux.c
View file

@ -2486,6 +2486,7 @@ next_entry_size (GstQTDemux * demux)
int i; int i;
int smallidx = -1; int smallidx = -1;
guint64 smalloffs = (guint64) - 1; guint64 smalloffs = (guint64) - 1;
QtDemuxSample *sample;
GST_LOG_OBJECT (demux, "Finding entry at offset %lld", demux->offset); GST_LOG_OBJECT (demux, "Finding entry at offset %lld", demux->offset);
@ -2500,16 +2501,16 @@ next_entry_size (GstQTDemux * demux)
continue; continue;
} }
sample = &stream->samples[stream->sample_index];
GST_LOG_OBJECT (demux, GST_LOG_OBJECT (demux,
"Checking Stream %d (sample_index:%d / offset:%lld / size:%d)", "Checking Stream %d (sample_index:%d / offset:%lld / size:%d)",
i, stream->sample_index, stream->samples[stream->sample_index].offset, i, stream->sample_index, sample->offset, sample->size);
stream->samples[stream->sample_index].size);
if (((smalloffs == -1) if (((smalloffs == -1)
|| (stream->samples[stream->sample_index].offset < smalloffs)) || (sample->offset < smalloffs)) && (sample->size)) {
&& (stream->samples[stream->sample_index].size)) {
smallidx = i; smallidx = i;
smalloffs = stream->samples[stream->sample_index].offset; smalloffs = sample->offset;
} }
} }
@ -2518,12 +2519,13 @@ next_entry_size (GstQTDemux * demux)
if (smallidx == -1) if (smallidx == -1)
return -1; return -1;
stream = demux->streams[smallidx];
if (stream->samples[stream->sample_index].offset >= demux->offset) { stream = demux->streams[smallidx];
demux->todrop = sample = &stream->samples[stream->sample_index];
stream->samples[stream->sample_index].offset - demux->offset;
return stream->samples[stream->sample_index].size + demux->todrop; if (sample->offset >= demux->offset) {
demux->todrop = sample->offset - demux->offset;
return sample->size + demux->todrop;
} }
GST_DEBUG_OBJECT (demux, "There wasn't any entry at offset %lld", GST_DEBUG_OBJECT (demux, "There wasn't any entry at offset %lld",