mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: encoder: h264, h265, mpeg2: remove assert

Browse source 
Remove spurious asserts for misc parameters. If they cannot be
allocated, FALSE is already returned.
This commit is contained in:
Víctor Manuel Jáquez Leal 2017-06-02 16:28:30 +02:00
parent 37b81a7b69
commit 5c05a8b436
3 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/vaapi/gstvaapiencoder_h264.c
View file

@ -2164,7 +2164,6 @@ ensure_misc_params (GstVaapiEncoderH264 * encoder, GstVaapiEncPicture * picture)
/* HRD params */ /* HRD params */
misc = GST_VAAPI_ENC_MISC_PARAM_NEW (HRD, encoder); misc = GST_VAAPI_ENC_MISC_PARAM_NEW (HRD, encoder);
g_assert (misc);
if (!misc) if (!misc)
return FALSE; return FALSE;
fill_hrd_params (encoder, misc->data); fill_hrd_params (encoder, misc->data);
@ -2175,7 +2174,6 @@ ensure_misc_params (GstVaapiEncoderH264 * encoder, GstVaapiEncPicture * picture)
if (GST_VAAPI_ENCODER_RATE_CONTROL (encoder) == GST_VAAPI_RATECONTROL_CBR || if (GST_VAAPI_ENCODER_RATE_CONTROL (encoder) == GST_VAAPI_RATECONTROL_CBR ||
GST_VAAPI_ENCODER_RATE_CONTROL (encoder) == GST_VAAPI_RATECONTROL_VBR) { GST_VAAPI_ENCODER_RATE_CONTROL (encoder) == GST_VAAPI_RATECONTROL_VBR) {
misc = GST_VAAPI_ENC_MISC_PARAM_NEW (RateControl, encoder); misc = GST_VAAPI_ENC_MISC_PARAM_NEW (RateControl, encoder);
g_assert (misc);
if (!misc) if (!misc)
return FALSE; return FALSE;
rate_control = misc->data; rate_control = misc->data;

1
gst-libs/gst/vaapi/gstvaapiencoder_h265.c
View file

@ -1774,7 +1774,6 @@ ensure_misc_params (GstVaapiEncoderH265 * encoder, GstVaapiEncPicture * picture)
/* HRD params for rate control */ /* HRD params for rate control */
if (GST_VAAPI_ENCODER_RATE_CONTROL (encoder) == GST_VAAPI_RATECONTROL_CBR) { if (GST_VAAPI_ENCODER_RATE_CONTROL (encoder) == GST_VAAPI_RATECONTROL_CBR) {
misc = GST_VAAPI_ENC_MISC_PARAM_NEW (HRD, encoder); misc = GST_VAAPI_ENC_MISC_PARAM_NEW (HRD, encoder);
g_assert (misc);
if (!misc) if (!misc)
return FALSE; return FALSE;
fill_hrd_params (encoder, misc->data); fill_hrd_params (encoder, misc->data);

2
gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.c
View file

@ -462,7 +462,6 @@ set_misc_parameters (GstVaapiEncoderMpeg2 * encoder,
/* add hrd */ /* add hrd */
misc = GST_VAAPI_ENC_MISC_PARAM_NEW (HRD, encoder); misc = GST_VAAPI_ENC_MISC_PARAM_NEW (HRD, encoder);
g_assert (misc);
if (!misc) if (!misc)
return FALSE; return FALSE;
gst_vaapi_enc_picture_add_misc_param (picture, misc); gst_vaapi_enc_picture_add_misc_param (picture, misc);
@ -479,7 +478,6 @@ set_misc_parameters (GstVaapiEncoderMpeg2 * encoder,
/* add ratecontrol */ /* add ratecontrol */
if (GST_VAAPI_ENCODER_RATE_CONTROL (encoder) == GST_VAAPI_RATECONTROL_CBR) { if (GST_VAAPI_ENCODER_RATE_CONTROL (encoder) == GST_VAAPI_RATECONTROL_CBR) {
misc = GST_VAAPI_ENC_MISC_PARAM_NEW (RateControl, encoder); misc = GST_VAAPI_ENC_MISC_PARAM_NEW (RateControl, encoder);
g_assert (misc);
if (!misc) if (!misc)
return FALSE; return FALSE;
gst_vaapi_enc_picture_add_misc_param (picture, misc); gst_vaapi_enc_picture_add_misc_param (picture, misc);