mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 17:52:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: display: code clean up

Browse source
This commit is contained in:
Víctor Manuel Jáquez Leal 2019-12-20 08:37:11 +01:00
parent b2cabe2f5b
commit 4da8dc2550
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gst-libs/gst/vaapi/gstvaapidisplay.c
View file

@ -76,6 +76,8 @@ struct _GstVaapiFormatInfo
#define DEFAULT_RENDER_MODE GST_VAAPI_RENDER_MODE_TEXTURE #define DEFAULT_RENDER_MODE GST_VAAPI_RENDER_MODE_TEXTURE
#define DEFAULT_ROTATION GST_VAAPI_ROTATION_0 #define DEFAULT_ROTATION GST_VAAPI_ROTATION_0
#define ENTRY_POINT_FLAG(entry) (1U << G_PASTE(GST_VAAPI_ENTRYPOINT_, entry))
enum enum
{ {
PROP_RENDER_MODE = 1, PROP_RENDER_MODE = 1,
@ -260,8 +262,8 @@ compare_rgb_formats (gconstpointer a, gconstpointer b)
/* Check if configs array contains profile at entrypoint */ /* Check if configs array contains profile at entrypoint */
static inline gboolean static inline gboolean
find_config (GPtrArray * configs, find_config (GPtrArray * configs, GstVaapiProfile profile,
GstVaapiProfile profile, GstVaapiEntrypoint entrypoint) GstVaapiEntrypoint entrypoint)
{ {
GstVaapiProfileConfig *config; GstVaapiProfileConfig *config;
guint i; guint i;
@ -271,7 +273,8 @@ find_config (GPtrArray * configs,
for (i = 0; i < configs->len; i++) { for (i = 0; i < configs->len; i++) {
config = g_ptr_array_index (configs, i); config = g_ptr_array_index (configs, i);
if (config->profile == profile && (config->entrypoints & (1 << entrypoint))) if (config->profile == profile
&& (config->entrypoints & (1U << entrypoint)))
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -303,6 +306,7 @@ append_h263_config (GArray * configs, GPtrArray * decoders)
if (mpeg4_simple_config && !h263_baseline_config) { if (mpeg4_simple_config && !h263_baseline_config) {
tmp_config = *mpeg4_simple_config; tmp_config = *mpeg4_simple_config;
tmp_config.profile = GST_VAAPI_PROFILE_H263_BASELINE; tmp_config.profile = GST_VAAPI_PROFILE_H263_BASELINE;
tmp_config.entrypoints = ENTRY_POINT_FLAG (VLD);
g_array_append_val (configs, tmp_config); g_array_append_val (configs, tmp_config);
g_ptr_array_add (decoders, &g_array_index (configs, g_ptr_array_add (decoders, &g_array_index (configs,
GstVaapiProfileConfig, configs->len - 1)); GstVaapiProfileConfig, configs->len - 1));
@ -506,8 +510,7 @@ ensure_profiles (GstVaapiDisplay * display)
} }
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
GstVaapiProfileConfig config; GstVaapiProfileConfig config = { 0, };
memset (&config, 0, sizeof (GstVaapiProfileConfig));
config.profile = gst_vaapi_profile (profiles[i]); config.profile = gst_vaapi_profile (profiles[i]);
if (!config.profile) if (!config.profile)
@ -519,23 +522,25 @@ ensure_profiles (GstVaapiDisplay * display)
continue; continue;
for (j = 0; j < num_entrypoints; j++) for (j = 0; j < num_entrypoints; j++)
config.entrypoints |= (1 << gst_vaapi_entrypoint (entrypoints[j])); config.entrypoints |= (1U << gst_vaapi_entrypoint (entrypoints[j]));
g_array_append_val (priv->codecs, config); priv->codecs = g_array_append_val (priv->codecs, config);
} }
for (i = 0; i < priv->codecs->len; i++) { for (i = 0; i < priv->codecs->len; i++) {
GstVaapiProfileConfig *codec = GstVaapiProfileConfig *cfg;
&g_array_index (priv->codecs, GstVaapiProfileConfig, i);
if ((codec->entrypoints & 1 << GST_VAAPI_ENTRYPOINT_VLD) cfg = &g_array_index (priv->codecs, GstVaapiProfileConfig, i);
|| (codec->entrypoints & 1 << GST_VAAPI_ENTRYPOINT_IDCT)
|| (codec->entrypoints & 1 << GST_VAAPI_ENTRYPOINT_MOCO)) if ((cfg->entrypoints & ENTRY_POINT_FLAG (VLD))
g_ptr_array_add (priv->decoders, codec); || (cfg->entrypoints & ENTRY_POINT_FLAG (IDCT))
if ((codec->entrypoints & 1 << GST_VAAPI_ENTRYPOINT_SLICE_ENCODE) || (cfg->entrypoints & ENTRY_POINT_FLAG (MOCO)))
|| (codec->entrypoints & 1 << GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE) g_ptr_array_add (priv->decoders, cfg);
|| (codec->entrypoints & 1 << GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_LP) if ((cfg->entrypoints & ENTRY_POINT_FLAG (SLICE_ENCODE))
|| (codec->entrypoints & 1 << GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_FEI)) || (cfg->entrypoints & ENTRY_POINT_FLAG (PICTURE_ENCODE))
g_ptr_array_add (priv->encoders, codec); || (cfg->entrypoints & ENTRY_POINT_FLAG (SLICE_ENCODE_LP))
|| (cfg->entrypoints & ENTRY_POINT_FLAG (SLICE_ENCODE_FEI)))
g_ptr_array_add (priv->encoders, cfg);
} }
append_h263_config (priv->codecs, priv->decoders); append_h263_config (priv->codecs, priv->decoders);

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

@ -206,8 +206,7 @@ typedef enum {
GST_VAAPI_ENTRYPOINT_SLICE_ENCODE, GST_VAAPI_ENTRYPOINT_SLICE_ENCODE,
GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE, GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE,
GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_LP, GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_LP,
GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_FEI, GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_FEI
GST_VAAPI_MAX_ENTRYPOINTS
} GstVaapiEntrypoint; } GstVaapiEntrypoint;
const gchar * const gchar *