mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-06 14:32:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/avi/gstavidemux.*: Fix for compressed audio (mp3) timestamp generation. How did this ever work?

Browse source 
Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query),
(gst_avi_demux_add_stream), (gst_avi_demux_stream_data):
* gst/avi/gstavidemux.h:
Fix for compressed audio (mp3) timestamp generation. How did this
ever work?
This commit is contained in:
Ronald S. Bultje 2004-09-15 17:14:34 +00:00
parent 00375a43f6
commit 3bae21ef61
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2004-09-15 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query),
(gst_avi_demux_add_stream), (gst_avi_demux_stream_data):
* gst/avi/gstavidemux.h:
Fix for compressed audio (mp3) timestamp generation. How did this
ever work?
2004-09-15 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-09-15 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/playback/gstplaybin.c: (gst_play_bin_get_property): * gst/playback/gstplaybin.c: (gst_play_bin_get_property):

15
gst/avi/gstavidemux.c
View file

@ -440,8 +440,13 @@ gst_avi_demux_handle_src_query (GstPad * pad,
switch (*format) { switch (*format) {
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
if (stream->strh->rate && stream->strh->type == GST_RIFF_FCC_auds) { if (stream->strh->rate && stream->strh->type == GST_RIFF_FCC_auds) {
*value = ((gfloat) stream->current_byte) * GST_SECOND / if (stream->strh->rate != 0) {
stream->strh->rate; *value = ((gfloat) stream->current_byte) * GST_SECOND /
stream->bitrate;
} else {
*value = (((gfloat) stream->current_frame) * stream->strh->scale /
(stream->strh->rate * stream->blockalign)) * GST_SECOND;
}
} else { } else {
*value = (((gfloat) stream->current_frame) * stream->strh->scale / *value = (((gfloat) stream->current_frame) * stream->strh->scale /
stream->strh->rate) * GST_SECOND; stream->strh->rate) * GST_SECOND;
@ -747,6 +752,7 @@ gst_avi_demux_add_stream (GstAviDemux * avi)
GstPadTemplate *templ = NULL; GstPadTemplate *templ = NULL;
GstPad *pad; GstPad *pad;
avi_stream_context *stream; avi_stream_context *stream;
gint blockalign = 0, bitrate = 0;
union union
{ {
gst_riff_strf_vids *vids; gst_riff_strf_vids *vids;
@ -870,6 +876,8 @@ gst_avi_demux_add_stream (GstAviDemux * avi)
gst_tag_list_free (list); gst_tag_list_free (list);
if (codec_name) if (codec_name)
g_free (codec_name); g_free (codec_name);
blockalign = strf.auds->blockalign;
bitrate = strf.auds->av_bps;
g_free (strf.auds); g_free (strf.auds);
avi->num_a_streams++; avi->num_a_streams++;
break; break;
@ -921,6 +929,8 @@ gst_avi_demux_add_stream (GstAviDemux * avi)
stream->current_byte = 0; stream->current_byte = 0;
stream->current_entry = -1; stream->current_entry = -1;
stream->skip = 0; stream->skip = 0;
stream->blockalign = blockalign;
stream->bitrate = bitrate;
gst_pad_set_element_private (pad, stream); gst_pad_set_element_private (pad, stream);
avi->num_streams++; avi->num_streams++;
@ -1479,7 +1489,6 @@ gst_avi_demux_stream_data (GstAviDemux * avi)
GST_BUFFER_TIMESTAMP (buf) = next_ts; GST_BUFFER_TIMESTAMP (buf) = next_ts;
gst_pad_query (stream->pad, GST_QUERY_POSITION, &format, &dur_ts); gst_pad_query (stream->pad, GST_QUERY_POSITION, &format, &dur_ts);
GST_BUFFER_DURATION (buf) = dur_ts - next_ts; GST_BUFFER_DURATION (buf) = dur_ts - next_ts;
gst_pad_push (stream->pad, GST_DATA (buf)); gst_pad_push (stream->pad, GST_DATA (buf));
} }
} }

1
gst/avi/gstavidemux.h
View file

@ -63,6 +63,7 @@ typedef struct {
GstPad *pad; GstPad *pad;
GstCaps *caps; GstCaps *caps;
gst_riff_strh *strh; gst_riff_strh *strh;
gint blockalign, bitrate;
/* current position (byte, frame, time) */ /* current position (byte, frame, time) */
guint current_frame; guint current_frame;