mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/avi/gstavidemux.c: Just hardcode for raw audio then. AVI audio sucks.

Browse source 
Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query),
(gst_avi_demux_stream_data):
Just hardcode for raw audio then. AVI audio sucks.
This commit is contained in:
Ronald S. Bultje 2004-09-15 20:06:15 +00:00
parent 529aac8034
commit a15e93fc3d
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-09-15 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query),
(gst_avi_demux_stream_data):
Just hardcode for raw audio then. AVI audio sucks.
2004-09-15 Arwed v. Merkatz <v.merkatz@gmx.net> 2004-09-15 Arwed v. Merkatz <v.merkatz@gmx.net>
* gst/matroska/matroska-demux.c: (gst_matroska_demux_audio_caps): * gst/matroska/matroska-demux.c: (gst_matroska_demux_audio_caps):

8
gst/avi/gstavidemux.c
View file

@ -441,7 +441,7 @@ gst_avi_demux_handle_src_query (GstPad * pad,
switch (*format) { switch (*format) {
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
if (stream->strh->type == GST_RIFF_FCC_auds) { if (stream->strh->type == GST_RIFF_FCC_auds) {
if (stream->strh->samplesize != 0 && stream->blockalign != 0) { if (stream->strh->samplesize == 1 && stream->blockalign != 0) {
*value = stream->current_byte * GST_SECOND / *value = stream->current_byte * GST_SECOND /
(stream->blockalign * stream->strh->rate); (stream->blockalign * stream->strh->rate);
} else if (stream->strh->rate != 0) { } else if (stream->strh->rate != 0) {
@ -453,8 +453,6 @@ gst_avi_demux_handle_src_query (GstPad * pad,
} else { } else {
*value = 0; *value = 0;
} }
//g_print ("Time: %" GST_TIME_FORMAT " (%d/%d/%d)\n", GST_TIME_ARGS (*value),
// stream->strh->rate, stream->bitrate, stream->strh->scale);
} else { } else {
if (stream->strh->rate != 0) { if (stream->strh->rate != 0) {
*value = ((gfloat) stream->current_frame * stream->strh->scale * *value = ((gfloat) stream->current_frame * stream->strh->scale *
@ -1502,8 +1500,8 @@ 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;
//g_print ("TIME: %" GST_TIME_FORMAT " on pad %s\n", GST_DEBUG ("Pushing buffer with time=%" GST_TIME_FORMAT " over pad %s",
// GST_TIME_ARGS (next_ts), gst_pad_get_name (stream->pad)); GST_TIME_ARGS (next_ts), gst_pad_get_name (stream->pad));
gst_pad_push (stream->pad, GST_DATA (buf)); gst_pad_push (stream->pad, GST_DATA (buf));
} }
} }