mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 20:59:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/flac/gstflacdec.c: Always post the audio-codec tag, not only if other tags are present.

Browse source 
Original commit message from CVS:
* ext/flac/gstflacdec.c: (gst_flac_dec_setup_seekable_decoder),
(gst_flac_dec_setup_stream_decoder),
(gst_flac_dec_update_metadata):
Always post the audio-codec tag, not only if other tags are present.
This commit is contained in:
Sebastian Dröge 2008-08-02 17:18:47 +00:00
parent f96e226aa8
commit a53866ddc1
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-08-02 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* ext/flac/gstflacdec.c: (gst_flac_dec_setup_seekable_decoder),
(gst_flac_dec_setup_stream_decoder),
(gst_flac_dec_update_metadata):
Always post the audio-codec tag, not only if other tags are present.
2008-08-02 Jan Schmidt <jan.schmidt@sun.com> 2008-08-02 Jan Schmidt <jan.schmidt@sun.com>
* configure.ac: * configure.ac:

21
ext/flac/gstflacdec.c
View file

@ -338,6 +338,10 @@ gst_flac_dec_setup_seekable_decoder (GstFlacDec * dec)
{ {
gst_flac_dec_reset_decoders (dec); gst_flac_dec_reset_decoders (dec);
dec->tags = gst_tag_list_new ();
gst_tag_list_add (dec->tags, GST_TAG_MERGE_REPLACE,
GST_TAG_AUDIO_CODEC, "FLAC", NULL);
#ifdef LEGACY_FLAC #ifdef LEGACY_FLAC
dec->seekable_decoder = FLAC__seekable_stream_decoder_new (); dec->seekable_decoder = FLAC__seekable_stream_decoder_new ();
@ -375,6 +379,10 @@ gst_flac_dec_setup_stream_decoder (GstFlacDec * dec)
{ {
gst_flac_dec_reset_decoders (dec); gst_flac_dec_reset_decoders (dec);
dec->tags = gst_tag_list_new ();
gst_tag_list_add (dec->tags, GST_TAG_MERGE_REPLACE,
GST_TAG_AUDIO_CODEC, "FLAC", NULL);
dec->adapter = gst_adapter_new (); dec->adapter = gst_adapter_new ();
dec->stream_decoder = FLAC__stream_decoder_new (); dec->stream_decoder = FLAC__stream_decoder_new ();
@ -421,7 +429,10 @@ gst_flac_dec_update_metadata (GstFlacDec * flacdec,
guint num, i; guint num, i;
list = gst_tag_list_new (); if (flacdec->tags)
list = flacdec->tags;
else
flacdec->tags = list = gst_tag_list_new ();
num = metadata->data.vorbis_comment.num_comments; num = metadata->data.vorbis_comment.num_comments;
GST_DEBUG ("%u tag(s) found", num); GST_DEBUG ("%u tag(s) found", num);
@ -442,14 +453,6 @@ gst_flac_dec_update_metadata (GstFlacDec * flacdec,
g_free (vc); g_free (vc);
} }
gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
GST_TAG_AUDIO_CODEC, "FLAC", NULL);
if (flacdec->tags)
gst_tag_list_free (flacdec->tags);
flacdec->tags = list;
return TRUE; return TRUE;
} }