mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "libs: encoder: add api gst_vaapi_encoder_add/del_roi"

Browse source 
This reverts commit 7a6f690340.

https://bugzilla.gnome.org/show_bug.cgi?id=768248
This commit is contained in:
Víctor Manuel Jáquez Leal 2018-02-22 08:22:35 -06:00 committed by Nicolas Dufresne
parent 35226dba88
commit d3110713b8
3 changed files with 0 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
gst-libs/gst/vaapi/gstvaapiencoder.c
View file

@ -1323,9 +1323,6 @@ gst_vaapi_encoder_finalize (GstVaapiEncoder * encoder)
klass->finalize (encoder);
if (encoder->roi_regions)
g_list_free_full (encoder->roi_regions, g_free);
gst_vaapi_object_replace (&encoder->context, NULL);
gst_vaapi_display_replace (&encoder->display, NULL);
encoder->va_display = NULL;
@ -1566,111 +1563,6 @@ gst_vaapi_encoder_ensure_max_num_ref_frames (GstVaapiEncoder * encoder,
return TRUE;
}
/**
* gst_vaapi_encoder_add_roi:
* @encoder: a #GstVaapiEncoder
* @roi: (transfer none): a #GstVaapiROI
*
* Adds a roi region provided by user.
*
* This can be called on running a pipeline,
* Since vaapi encoder set roi regions at every frame encoding.
* Note that if it exceeds number of supported roi in driver,
* this will return FALSE.
*
* Return value: a #gboolean
*/
gboolean
gst_vaapi_encoder_add_roi (GstVaapiEncoder * encoder, GstVaapiROI * roi)
{
GstVaapiContextInfo *const cip = &encoder->context_info;
const GstVaapiConfigInfoEncoder *const config = &cip->config.encoder;
GstVaapiROI *region = NULL;
GList *walk;
g_return_val_if_fail (roi != NULL, FALSE);
if (!config->roi_capability)
return FALSE;
if (encoder->roi_regions &&
g_list_length (encoder->roi_regions) > config->roi_num_supported)
return FALSE;
walk = encoder->roi_regions;
while (walk) {
GstVaapiROI *region_ptr = (GstVaapiROI *) walk->data;
if (region_ptr->rect.x == roi->rect.x &&
region_ptr->rect.y == roi->rect.y &&
region_ptr->rect.width == roi->rect.width &&
region_ptr->rect.height == roi->rect.height) {
/* Duplicated region */
goto end;
}
walk = walk->next;
}
region = g_malloc0 (sizeof (GstVaapiROI));
if (G_UNLIKELY (!region))
return FALSE;
region->rect.x = roi->rect.x;
region->rect.y = roi->rect.y;
region->rect.width = roi->rect.width;
region->rect.height = roi->rect.height;
encoder->roi_regions = g_list_append (encoder->roi_regions, region);
end:
return TRUE;
}
/**
* gst_vaapi_encoder_del_roi:
* @encoder: a #GstVaapiEncoder
* @roi: (transfer none): a #GstVaapiROI
*
* Deletes a roi region provided by user.
*
* This can be called on running a pipeline,
* Since vaapi encoder set roi regions at every frame encoding.
*
* Return value: a #gboolean
*/
gboolean
gst_vaapi_encoder_del_roi (GstVaapiEncoder * encoder, GstVaapiROI * roi)
{
GstVaapiContextInfo *const cip = &encoder->context_info;
const GstVaapiConfigInfoEncoder *const config = &cip->config.encoder;
GList *walk;
gboolean ret = FALSE;
g_return_val_if_fail (roi != NULL, FALSE);
if (!config->roi_capability)
return FALSE;
if (encoder->roi_regions && g_list_length (encoder->roi_regions) == 0)
return FALSE;
walk = encoder->roi_regions;
while (walk) {
GstVaapiROI *region = (GstVaapiROI *) walk->data;
if (region->rect.x == roi->rect.x &&
region->rect.y == roi->rect.y &&
region->rect.width == roi->rect.width &&
region->rect.height == roi->rect.height) {
encoder->roi_regions = g_list_remove (encoder->roi_regions, region);
g_free (region);
ret = TRUE;
break;
}
walk = walk->next;
}
return ret;
}
/** Returns a GType for the #GstVaapiEncoderTune set */
GType
gst_vaapi_encoder_tune_get_type (void)

12
gst-libs/gst/vaapi/gstvaapiencoder.h
View file

@ -140,11 +140,6 @@ typedef struct {
GParamSpec *const pspec;
} GstVaapiEncoderPropInfo;
typedef struct _GstVaapiROI {
gint roi_value;
GstVaapiRectangle rect;
} GstVaapiROI;
GType
gst_vaapi_encoder_tune_get_type (void) G_GNUC_CONST;
@ -206,13 +201,6 @@ gst_vaapi_encoder_flush (GstVaapiEncoder * encoder);
GArray *
gst_vaapi_encoder_get_surface_formats (GstVaapiEncoder * encoder,
GstVaapiProfile profile);
gboolean
gst_vaapi_encoder_add_roi (GstVaapiEncoder * encoder, GstVaapiROI * roi);
gboolean
gst_vaapi_encoder_del_roi (GstVaapiEncoder * encoder, GstVaapiROI * roi);
G_END_DECLS
#endif /* GST_VAAPI_ENCODER_H */

3
gst-libs/gst/vaapi/gstvaapiencoder_priv.h
View file

@ -283,9 +283,6 @@ struct _GstVaapiEncoder
guint got_packed_headers:1;
guint got_rate_control_mask:1;
/* Region of Interest */
GList *roi_regions;
/* miscellaneous buffer parameters */
VAEncMiscParameterRateControl va_ratecontrol;
VAEncMiscParameterFrameRate va_framerate;