avi->avih->streams, avi->num_streams);
}
- GST_DEBUG_OBJECT (avi, "skipping junk between header and data ...");
+ GST_DEBUG_OBJECT (avi, "skipping junk between header and data, offset=%"
+ G_GUINT64_FORMAT, avi->offset);
/* Now, find the data (i.e. skip all junk between header and data) */
do {
ltag = GST_READ_UINT32_LE (GST_BUFFER_DATA (buf) + 8);
gst_buffer_unref (buf);
+ GST_DEBUG ("tag %" GST_FOURCC_FORMAT ", size %u",
+ GST_FOURCC_ARGS (tag), size);
+
if (tag == GST_RIFF_TAG_LIST) {
switch (ltag) {
case GST_RIFF_LIST_movi:
GST_DEBUG_OBJECT (avi, "couldn't read INFO chunk");
goto pull_range_failed;
}
+ GST_DEBUG ("got size %u", GST_BUFFER_SIZE (buf));
sub = gst_buffer_create_sub (buf, 4, GST_BUFFER_SIZE (buf) - 4);
gst_riff_parse_info (element, sub, &avi->globaltags);
gchar *tag;
} rifftags[] = {
{
+ GST_RIFF_INFO_IARL, GST_TAG_LOCATION}, {
+ GST_RIFF_INFO_IART, GST_TAG_ARTIST}, {
GST_RIFF_INFO_ICMT, GST_TAG_COMMENT}, {
+ GST_RIFF_INFO_ICOP, GST_TAG_COPYRIGHT}, {
+ GST_RIFF_INFO_ICRD, GST_TAG_DATE}, {
+ GST_RIFF_INFO_IGNR, GST_TAG_GENRE}, {
+ GST_RIFF_INFO_IKEY, GST_TAG_KEYWORDS}, {
GST_RIFF_INFO_INAM, GST_TAG_TITLE}, {
GST_RIFF_INFO_ISFT, GST_TAG_ENCODER}, {
- GST_RIFF_INFO_IGNR, GST_TAG_GENRE}, {
- GST_RIFF_INFO_ICOP, GST_TAG_COPYRIGHT}, {
- GST_RIFF_INFO_IART, GST_TAG_ARTIST}, {
- GST_RIFF_INFO_IARL, GST_TAG_LOCATION}, {
+ GST_RIFF_INFO_ISRC, GST_TAG_ISRC}, {
0, NULL}
};
gint n, len, plen;
tags = avimux->tags_snap;
}
avimux->tags_snap = tags;
- /* FIXME: that should be the strlen of all tags + header sizes */
- if (avimux->tags_snap)
- size += 1024;
+ if (avimux->tags_snap) {
+ /* that should be the strlen of all tags + header sizes
+ * not all of tags end up in a avi, still this is a good estimate
+ */
+ gchar *str = gst_structure_to_string (avimux->tags_snap);
+ size += strlen (str) + 8 * gst_structure_n_fields (avimux->tags_snap);
+ g_free (str);
+ }
/* allocate the buffer, starting with some wild/safe upper bound */
size += avimux->codec_data_size + 100 + sizeof (gst_riff_avih)
} else {
if (audpad->auds_codec_data)
codec_size = GST_BUFFER_SIZE (audpad->auds_codec_data);
+ /* +2 is codec_size field, not part of gst_riff_strf_auds */
strl_size = sizeof (gst_riff_strh_full) + sizeof (gst_riff_strf_auds) + 2
+ GST_ROUND_UP_2 (codec_size) + 4 * 5 + ODML_SUPERINDEX_SIZE;
}
gst_avi_mux_handle_event (GstPad * pad, GstEvent * event)
{
GstAviMux *avimux;
- GstTagList *list;
gboolean ret;
avimux = GST_AVI_MUX (gst_pad_get_parent (pad));
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_TAG:
- gst_event_parse_tag (event, &list);
- if (avimux->tags) {
- gst_tag_list_insert (avimux->tags, list, GST_TAG_MERGE_PREPEND);
+ if (gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (avimux)) !=
+ GST_TAG_MERGE_REPLACE_ALL) {
+ GstTagList *list;
+ gst_event_parse_tag (event, &list);
+ if (avimux->tags) {
+ gst_tag_list_insert (avimux->tags, list, GST_TAG_MERGE_PREPEND);
+ } else {
+ avimux->tags = gst_tag_list_copy (list);
+ }
} else {
- avimux->tags = gst_tag_list_copy (list);
+ GST_DEBUG ("skipping tag-event");
}
break;
default: