diff options
| author | Alessandro Decina <alessandro.d@gmail.com> | 2016-06-07 17:22:01 +1000 |
|---|---|---|
| committer | Alessandro Decina <alessandro.d@gmail.com> | 2016-06-07 17:23:27 +1000 |
| commit | 37e41c9c3a289d0df1bd24617888e2158f3cc96c (patch) | |
| tree | c4015412bd465c474566b1e856a25145b4fcc889 | |
| parent | 4514d42be08b4e426200b4a30f0ff5905842b2bc (diff) | |
| download | gstreamer-plugins-bad-37e41c9c3a289d0df1bd24617888e2158f3cc96c.tar.gz | |
vtdec: always drain in ::negotiate
Move calling gst_vtdec_push_frames_if_needed from ::set_format to ::negotiate so
that we always drain even when renegotiation is triggered by downstream.
| -rw-r--r-- | sys/applemedia/vtdec.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/applemedia/vtdec.c b/sys/applemedia/vtdec.c index 769be32ae..ae8a8e12b 100644 --- a/sys/applemedia/vtdec.c +++ b/sys/applemedia/vtdec.c @@ -230,6 +230,8 @@ gst_vtdec_negotiate (GstVideoDecoder * decoder) gboolean output_textures; vtdec = GST_VTDEC (decoder); + if (vtdec->session) + gst_vtdec_push_frames_if_needed (vtdec, TRUE, FALSE); templcaps = gst_pad_get_pad_template_caps (GST_VIDEO_DECODER_SRC_PAD (decoder)); peercaps = gst_pad_peer_query_caps (GST_VIDEO_DECODER_SRC_PAD (vtdec), NULL); @@ -279,10 +281,8 @@ gst_vtdec_negotiate (GstVideoDecoder * decoder) "negotiated output format %" GST_PTR_FORMAT " previous %" GST_PTR_FORMAT, output_state->caps, prevcaps); - if (vtdec->session) { - gst_vtdec_push_frames_if_needed (vtdec, TRUE, FALSE); + if (vtdec->session) gst_vtdec_invalidate_session (vtdec); - } err = gst_vtdec_create_session (vtdec, format, TRUE); if (err == noErr) { @@ -357,9 +357,6 @@ gst_vtdec_set_format (GstVideoDecoder * decoder, GstVideoCodecState * state) return TRUE; } - if (vtdec->session) - gst_vtdec_push_frames_if_needed (vtdec, TRUE, FALSE); - gst_video_info_from_caps (&vtdec->video_info, state->caps); if (!gst_vtdec_compute_reorder_queue_length (vtdec, cm_format, |