mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/avi/gstavidemux.*: For timestamping audio packets we need to take into account the amount of blocks in one entry ...

Browse source 
Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_parse_subindex),
(gst_avi_demux_parse_stream), (gst_avi_demux_parse_index):
* gst/avi/gstavidemux.h:
For timestamping audio packets we need to take into account the
amount of blocks in one entry using the blockalign. Fixes some sync
issues with zero-padded audio blocks in the beginning of avi files.
This commit is contained in:
Wim Taymans 2008-10-08 13:31:44 +00:00
parent 0e9db391c7
commit b9a1894e5c
3 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-10-08 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/avi/gstavidemux.c: (gst_avi_demux_parse_subindex),
(gst_avi_demux_parse_stream), (gst_avi_demux_parse_index):
* gst/avi/gstavidemux.h:
For timestamping audio packets we need to take into account the
amount of blocks in one entry using the blockalign. Fixes some sync
issues with zero-padded audio blocks in the beginning of avi files.
2008-10-08 Wim Taymans <wim.taymans@collabora.co.uk> 2008-10-08 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/multifile/gstmultifilesrc.c: (gst_multi_file_src_class_init), * gst/multifile/gstmultifilesrc.c: (gst_multi_file_src_class_init),

37
gst/avi/gstavidemux.c
View file

@ -1035,9 +1035,14 @@ gst_avi_demux_parse_subindex (GstAviDemux * avi,
/* timestamps */ /* timestamps */
entry->ts = stream->idx_duration; entry->ts = stream->idx_duration;
if (stream->is_vbr) { if (stream->is_vbr) {
/* VBR get next timestamp */ /* VBR stream next timestamp */
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT, if (stream->strh->type == GST_RIFF_FCC_auds) {
stream->total_frames + 1, &format, &next_ts); gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
stream->total_blocks + 1, &format, &next_ts);
} else {
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
stream->total_frames + 1, &format, &next_ts);
}
} else { } else {
/* CBR get next timestamp */ /* CBR get next timestamp */
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES, gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES,
@ -1052,6 +1057,14 @@ gst_avi_demux_parse_subindex (GstAviDemux * avi,
stream->total_bytes += entry->size; stream->total_bytes += entry->size;
stream->total_frames++; stream->total_frames++;
if (stream->strh->type == GST_RIFF_FCC_auds) {
if (stream->strf.auds->blockalign > 0)
stream->total_blocks +=
(entry->size + stream->strf.auds->blockalign -
1) / stream->strf.auds->blockalign;
else
stream->total_blocks++;
}
stream->idx_duration = next_ts; stream->idx_duration = next_ts;
entries_list = g_list_prepend (entries_list, entry); entries_list = g_list_prepend (entries_list, entry);
@ -1615,6 +1628,7 @@ gst_avi_demux_parse_stream (GstAviDemux * avi, GstBuffer * buf)
stream->num = avi->num_streams; stream->num = avi->num_streams;
stream->total_bytes = 0; stream->total_bytes = 0;
stream->total_frames = 0; stream->total_frames = 0;
stream->total_blocks = 0;
stream->current_frame = 0; stream->current_frame = 0;
stream->current_byte = 0; stream->current_byte = 0;
gst_pad_set_element_private (pad, stream); gst_pad_set_element_private (pad, stream);
@ -1847,8 +1861,13 @@ gst_avi_demux_parse_index (GstAviDemux * avi,
target->ts = stream->idx_duration; target->ts = stream->idx_duration;
if (stream->is_vbr) { if (stream->is_vbr) {
/* VBR stream next timestamp */ /* VBR stream next timestamp */
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT, if (stream->strh->type == GST_RIFF_FCC_auds) {
stream->total_frames + 1, &format, &next_ts); gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
stream->total_blocks + 1, &format, &next_ts);
} else {
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
stream->total_frames + 1, &format, &next_ts);
}
} else { } else {
/* 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,
@ -1863,6 +1882,14 @@ gst_avi_demux_parse_index (GstAviDemux * avi,
stream->total_bytes += target->size; stream->total_bytes += target->size;
stream->total_frames++; stream->total_frames++;
if (stream->strh->type == GST_RIFF_FCC_auds) {
if (stream->strf.auds->blockalign > 0)
stream->total_blocks +=
(target->size + stream->strf.auds->blockalign -
1) / stream->strf.auds->blockalign;
else
stream->total_blocks++;
}
stream->idx_duration = next_ts; stream->idx_duration = next_ts;
GST_LOG_OBJECT (avi, GST_LOG_OBJECT (avi,

1
gst/avi/gstavidemux.h
View file

@ -89,6 +89,7 @@ typedef struct {
/* stream length */ /* stream length */
guint64 total_bytes; guint64 total_bytes;
guint32 total_frames; guint32 total_frames;
guint32 total_blocks;
/* stream length according to index */ /* stream length according to index */
GstClockTime idx_duration; GstClockTime idx_duration;
/* stream length according to header */ /* stream length according to header */