Commit 5989d75e authored by Sebastian Dröge's avatar Sebastian Dröge

theoradec: Use new video decoder tag API

parent 591cbf0f
...@@ -244,10 +244,6 @@ theora_dec_stop (GstVideoDecoder * decoder) ...@@ -244,10 +244,6 @@ theora_dec_stop (GstVideoDecoder * decoder)
th_decode_free (dec->decoder); th_decode_free (dec->decoder);
dec->decoder = NULL; dec->decoder = NULL;
gst_theora_dec_reset (dec); gst_theora_dec_reset (dec);
if (dec->tags) {
gst_tag_list_free (dec->tags);
dec->tags = NULL;
}
if (dec->input_state) if (dec->input_state)
gst_video_codec_state_unref (dec->input_state); gst_video_codec_state_unref (dec->input_state);
if (dec->output_state) if (dec->output_state)
...@@ -380,9 +376,10 @@ theora_handle_comment_packet (GstTheoraDec * dec, ogg_packet * packet) ...@@ -380,9 +376,10 @@ theora_handle_comment_packet (GstTheoraDec * dec, ogg_packet * packet)
GST_TAG_NOMINAL_BITRATE, dec->info.target_bitrate, NULL); GST_TAG_NOMINAL_BITRATE, dec->info.target_bitrate, NULL);
} }
if (dec->tags) gst_video_decoder_merge_tags (GST_VIDEO_DECODER (dec),
gst_tag_list_free (dec->tags); list, GST_TAG_MERGE_REPLACE);
dec->tags = list;
gst_tag_list_unref (list);
return GST_FLOW_OK; return GST_FLOW_OK;
} }
...@@ -508,14 +505,6 @@ theora_handle_type_packet (GstTheoraDec * dec) ...@@ -508,14 +505,6 @@ theora_handle_type_packet (GstTheoraDec * dec)
dec->have_header = TRUE; dec->have_header = TRUE;
/* FIXME : Put this on the next outgoing frame */
/* FIXME : */
if (dec->tags) {
gst_pad_push_event (GST_VIDEO_DECODER (dec)->srcpad,
gst_event_new_tag (dec->tags));
dec->tags = NULL;
}
return ret; return ret;
/* ERRORS */ /* ERRORS */
......
...@@ -76,8 +76,6 @@ struct _GstTheoraDec ...@@ -76,8 +76,6 @@ struct _GstTheoraDec
gint telemetry_qi; gint telemetry_qi;
gint telemetry_bits; gint telemetry_bits;
GstTagList *tags;
gboolean can_crop; gboolean can_crop;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment