mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 12:15:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

mfvideoenc: Don't ignore previous flow return value

Browse source 
In case of ASYNC MFT (hardware encoder), we were ignoring previous
finish_frame or pad_push return value. so, error wasn't propagated.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2370>
This commit is contained in:
Seungha Yang 2021-06-30 18:11:46 +09:00
parent ee543bdacf
commit d9c486352c
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/mediafoundation/gstmfvideoenc.cpp
View file

@ -1192,6 +1192,12 @@ gst_mf_video_enc_handle_frame (GstVideoEncoder * enc,
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
ComPtr<IMFSample> sample; ComPtr<IMFSample> sample;
if (self->last_ret != GST_FLOW_OK) {
GST_DEBUG_OBJECT (self, "Last return was %s", gst_flow_get_name (ret));
ret = self->last_ret;
goto done;
}
#if GST_MF_HAVE_D3D11 #if GST_MF_HAVE_D3D11
if (self->mf_allocator && if (self->mf_allocator &&
!gst_mf_video_enc_create_input_sample_d3d11 (self, frame, &sample)) { !gst_mf_video_enc_create_input_sample_d3d11 (self, frame, &sample)) {
@ -1202,7 +1208,8 @@ gst_mf_video_enc_handle_frame (GstVideoEncoder * enc,
if (!sample && !gst_mf_video_enc_create_input_sample (self, frame, &sample)) { if (!sample && !gst_mf_video_enc_create_input_sample (self, frame, &sample)) {
GST_ERROR_OBJECT (self, "Failed to create IMFSample"); GST_ERROR_OBJECT (self, "Failed to create IMFSample");
return GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
goto done;
} }
if (!gst_mf_video_enc_process_input (self, frame, sample.Get ())) { if (!gst_mf_video_enc_process_input (self, frame, sample.Get ())) {
@ -1266,7 +1273,7 @@ gst_mf_video_enc_flush (GstVideoEncoder * enc)
GstMFVideoEnc *self = GST_MF_VIDEO_ENC (enc); GstMFVideoEnc *self = GST_MF_VIDEO_ENC (enc);
if (!self->transform) if (!self->transform)
return TRUE; goto out;
/* Unlock while flushing, while flushing, new sample callback might happen */ /* Unlock while flushing, while flushing, new sample callback might happen */
if (self->async_mft) if (self->async_mft)
@ -1277,6 +1284,9 @@ gst_mf_video_enc_flush (GstVideoEncoder * enc)
if (self->async_mft) if (self->async_mft)
GST_VIDEO_ENCODER_STREAM_LOCK (enc); GST_VIDEO_ENCODER_STREAM_LOCK (enc);
out:
self->last_ret = GST_FLOW_OK;
return TRUE; return TRUE;
} }