videoencoder/decoder: Call reset() before start() too

This commit is contained in:
Sebastian Dröge 2013-07-25 14:25:08 +02:00
parent ef5c6d351f
commit 9259ee6729
2 changed files with 10 additions and 1 deletions

View file

@ -2033,6 +2033,10 @@ gst_video_decoder_change_state (GstElement * element, GstStateChange transition)
goto open_failed; goto open_failed;
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_VIDEO_DECODER_STREAM_LOCK (decoder);
gst_video_decoder_reset (decoder, TRUE);
GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
/* Initialize device/library if needed */ /* Initialize device/library if needed */
if (decoder_class->start && !decoder_class->start (decoder)) if (decoder_class->start && !decoder_class->start (decoder))
goto start_failed; goto start_failed;

View file

@ -1365,6 +1365,9 @@ gst_video_encoder_change_state (GstElement * element, GstStateChange transition)
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
/* Initialize device/library if needed */ /* Initialize device/library if needed */
GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
gst_video_encoder_reset (encoder, TRUE);
GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
if (encoder_class->start && !encoder_class->start (encoder)) if (encoder_class->start && !encoder_class->start (encoder))
goto start_failed; goto start_failed;
break; break;
@ -1376,9 +1379,11 @@ gst_video_encoder_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_video_encoder_reset (encoder, TRUE);
if (encoder_class->stop && !encoder_class->stop (encoder)) if (encoder_class->stop && !encoder_class->stop (encoder))
goto stop_failed; goto stop_failed;
GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
gst_video_encoder_reset (encoder, TRUE);
GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
/* close device/library if needed */ /* close device/library if needed */