mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroskamux: set correct buffer offsets after seeks

Browse source 
Re-use the existing 'pos' field maintained by ebml writer to set
buffer offsets. This also makes sure that we set the right offsets
on buffers after a seek (e.g. when writing an index at the end).
This commit is contained in:
Tim-Philipp Müller 2010-10-13 23:46:02 +01:00
parent 6ff3dfe946
commit 84e47e579b
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/matroska/ebml-write.c
View file

@ -65,7 +65,6 @@ gst_ebml_write_init (GstEbmlWrite * ebml, GstEbmlWriteClass * klass)
ebml->streamheader = NULL; ebml->streamheader = NULL;
ebml->streamheader_pos = 0; ebml->streamheader_pos = 0;
ebml->writing_streamheader = FALSE; ebml->writing_streamheader = FALSE;
ebml->current_offset = 0;
ebml->caps = NULL; ebml->caps = NULL;
} }
@ -135,7 +134,6 @@ gst_ebml_write_reset (GstEbmlWrite * ebml)
ebml->last_write_result = GST_FLOW_OK; ebml->last_write_result = GST_FLOW_OK;
ebml->timestamp = GST_CLOCK_TIME_NONE; ebml->timestamp = GST_CLOCK_TIME_NONE;
ebml->need_newsegment = TRUE; ebml->need_newsegment = TRUE;
ebml->current_offset = 0;
} }
@ -224,9 +222,8 @@ gst_ebml_write_flush_cache (GstEbmlWrite * ebml, gboolean is_keyframe)
ebml->cache = NULL; ebml->cache = NULL;
GST_DEBUG ("Flushing cache of size %d", GST_BUFFER_SIZE (buffer)); GST_DEBUG ("Flushing cache of size %d", GST_BUFFER_SIZE (buffer));
gst_buffer_set_caps (buffer, ebml->caps); gst_buffer_set_caps (buffer, ebml->caps);
GST_BUFFER_OFFSET (buffer) = ebml->current_offset; GST_BUFFER_OFFSET (buffer) = ebml->pos - GST_BUFFER_SIZE (buffer);
ebml->current_offset += GST_BUFFER_SIZE (buffer); GST_BUFFER_OFFSET_END (buffer) = ebml->pos;
GST_BUFFER_OFFSET_END (buffer) = ebml->current_offset;
if (ebml->last_write_result == GST_FLOW_OK) { if (ebml->last_write_result == GST_FLOW_OK) {
if (ebml->need_newsegment) { if (ebml->need_newsegment) {
GstEvent *ev; GstEvent *ev;
@ -406,9 +403,8 @@ gst_ebml_write_element_push (GstEbmlWrite * ebml, GstBuffer * buf)
} }
buf = gst_buffer_make_metadata_writable (buf); buf = gst_buffer_make_metadata_writable (buf);
gst_buffer_set_caps (buf, ebml->caps); gst_buffer_set_caps (buf, ebml->caps);
GST_BUFFER_OFFSET (buf) = ebml->current_offset; GST_BUFFER_OFFSET (buf) = ebml->pos - GST_BUFFER_SIZE (buf);
ebml->current_offset += GST_BUFFER_SIZE (buf); GST_BUFFER_OFFSET_END (buf) = ebml->pos;
GST_BUFFER_OFFSET_END (buf) = ebml->current_offset;
if (ebml->writing_streamheader) { if (ebml->writing_streamheader) {
GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_IN_CAPS); GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_IN_CAPS);
} }

1
gst/matroska/ebml-write.h
View file

@ -59,7 +59,6 @@ typedef struct _GstEbmlWrite {
gboolean writing_streamheader; gboolean writing_streamheader;
GstByteWriter *streamheader; GstByteWriter *streamheader;
guint64 streamheader_pos; guint64 streamheader_pos;
guint64 current_offset;
GstCaps *caps; GstCaps *caps;
} GstEbmlWrite; } GstEbmlWrite;