mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-28 01:05:07 +00:00
gst/avi/gstavidemux.c: Stupid signedness issue...
Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_stream_scan): Stupid signedness issue...
This commit is contained in:
parent
0deb191d3e
commit
3ffe64515e
|
@ -1,3 +1,8 @@
|
||||||
|
2005-12-19 Edward Hervey <edward@fluendo.com>
|
||||||
|
|
||||||
|
* gst/avi/gstavidemux.c: (gst_avi_demux_stream_scan):
|
||||||
|
Stupid signedness issue...
|
||||||
|
|
||||||
2005-12-19 Edward Hervey <edward@fluendo.com>
|
2005-12-19 Edward Hervey <edward@fluendo.com>
|
||||||
|
|
||||||
* gst/avi/gstavidemux.c: (gst_avi_demux_reset),
|
* gst/avi/gstavidemux.c: (gst_avi_demux_reset),
|
||||||
|
|
|
@ -1571,6 +1571,7 @@ gst_avi_demux_stream_scan (GstAviDemux * avi,
|
||||||
GstFormat format = GST_FORMAT_BYTES;
|
GstFormat format = GST_FORMAT_BYTES;
|
||||||
guint64 pos = avi->offset;
|
guint64 pos = avi->offset;
|
||||||
guint64 length;
|
guint64 length;
|
||||||
|
gint64 tmplength;
|
||||||
guint32 tag;
|
guint32 tag;
|
||||||
GstPad *peer;
|
GstPad *peer;
|
||||||
GList *list = NULL;
|
GList *list = NULL;
|
||||||
|
@ -1585,8 +1586,9 @@ gst_avi_demux_stream_scan (GstAviDemux * avi,
|
||||||
|
|
||||||
if (!(peer = gst_pad_get_peer (avi->sinkpad)))
|
if (!(peer = gst_pad_get_peer (avi->sinkpad)))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
if (!(gst_pad_query_duration (peer, &format, &length)))
|
if (!(gst_pad_query_duration (peer, &format, &tmplength)))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
length = tmplength;
|
||||||
gst_object_unref (peer);
|
gst_object_unref (peer);
|
||||||
|
|
||||||
if (*index) {
|
if (*index) {
|
||||||
|
@ -1608,6 +1610,7 @@ gst_avi_demux_stream_scan (GstAviDemux * avi,
|
||||||
while (1) {
|
while (1) {
|
||||||
gint stream_nr;
|
gint stream_nr;
|
||||||
guint size;
|
guint size;
|
||||||
|
gint64 tmpts, tmpdur;
|
||||||
|
|
||||||
if ((res =
|
if ((res =
|
||||||
gst_avi_demux_next_data_buffer (avi, &pos, &tag,
|
gst_avi_demux_next_data_buffer (avi, &pos, &tag,
|
||||||
|
@ -1636,16 +1639,20 @@ gst_avi_demux_stream_scan (GstAviDemux * avi,
|
||||||
format = GST_FORMAT_TIME;
|
format = GST_FORMAT_TIME;
|
||||||
/* constant rate stream */
|
/* constant rate stream */
|
||||||
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES,
|
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES,
|
||||||
stream->total_bytes, &format, &entry->ts);
|
stream->total_bytes, &format, &tmpts);
|
||||||
|
entry->ts = tmpts;
|
||||||
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES,
|
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES,
|
||||||
stream->total_bytes + entry->size, &format, &entry->dur);
|
stream->total_bytes + entry->size, &format, &tmpdur);
|
||||||
|
entry->dur = tmpdur;
|
||||||
} else {
|
} else {
|
||||||
format = GST_FORMAT_TIME;
|
format = GST_FORMAT_TIME;
|
||||||
/* VBR stream */
|
/* VBR stream */
|
||||||
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
|
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
|
||||||
stream->total_frames, &format, &entry->ts);
|
stream->total_frames, &format, &tmpts);
|
||||||
|
entry->ts = tmpts;
|
||||||
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
|
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
|
||||||
stream->total_frames + 1, &format, &entry->dur);
|
stream->total_frames + 1, &format, &tmpdur);
|
||||||
|
entry->dur = tmpdur;
|
||||||
}
|
}
|
||||||
entry->dur -= entry->ts;
|
entry->dur -= entry->ts;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue