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

Move GstVaapiSurfaceRenderFlags conversion to get_PutSurface_flags_from_GstVaapiSurfaceRenderFlags().

Browse source
This commit is contained in:
gb 2010-03-21 08:38:17 +00:00
parent 6179b6495e
commit edea5998f5
3 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst-libs/gst/vaapi/gstvaapiutils.c
View file

@ -18,7 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include "gstvaapiutils.h" #include "gstvaapiutils.h"
#include "gstvaapisurface.h"
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
@ -96,3 +98,31 @@ const char *string_of_VAEntrypoint(VAEntrypoint entrypoint)
} }
return "<unknown>"; return "<unknown>";
} }
/**
* get_PutSurface_flags_from_GstVaapiSurfaceRenderFlags:
*
* Converts #GstVaapiSurfaceRenderFlags to flags suitable for
* vaPutSurface().
*/
guint get_PutSurface_flags_from_GstVaapiSurfaceRenderFlags(guint flags)
{
const guint va_top_bottom_fields = (VA_TOP_FIELD|VA_BOTTOM_FIELD);
guint va_flags = 0;
if (flags & GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD)
va_flags |= VA_TOP_FIELD;
if (flags & GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD)
va_flags |= VA_BOTTOM_FIELD;
if ((va_flags & va_top_bottom_fields) == va_top_bottom_fields) {
va_flags &= ~va_top_bottom_fields;
va_flags |= VA_FRAME_PICTURE;
}
if (flags & GST_VAAPI_COLOR_STANDARD_ITUR_BT_709)
va_flags |= VA_SRC_BT709;
else if (flags & GST_VAAPI_COLOR_STANDARD_ITUR_BT_601)
va_flags |= VA_SRC_BT601;
return va_flags;
}

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

@ -45,4 +45,7 @@ const char *string_of_VAProfile(VAProfile profile)
const char *string_of_VAEntrypoint(VAEntrypoint entrypoint) const char *string_of_VAEntrypoint(VAEntrypoint entrypoint)
attribute_hidden; attribute_hidden;
guint get_PutSurface_flags_from_GstVaapiSurfaceRenderFlags(guint flags)
attribute_hidden;
#endif /* GST_VAAPI_UTILS_H */ #endif /* GST_VAAPI_UTILS_H */

15
gst-libs/gst/vaapi/gstvaapiwindow_x11.c
View file

@ -177,7 +177,6 @@ gst_vaapi_window_x11_render(
GstVaapiDisplay *display; GstVaapiDisplay *display;
VASurfaceID surface_id; VASurfaceID surface_id;
VAStatus status; VAStatus status;
guint va_flags = 0;
display = gst_vaapi_surface_get_display(surface); display = gst_vaapi_surface_get_display(surface);
if (!display) if (!display)
@ -187,18 +186,6 @@ gst_vaapi_window_x11_render(
if (surface_id == VA_INVALID_ID) if (surface_id == VA_INVALID_ID)
return FALSE; return FALSE;
if (flags & GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD)
va_flags |= VA_TOP_FIELD;
if (flags & GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD)
va_flags |= VA_BOTTOM_FIELD;
if ((va_flags ^ (VA_TOP_FIELD|VA_BOTTOM_FIELD)) == 0)
va_flags = VA_FRAME_PICTURE;
if (flags & GST_VAAPI_COLOR_STANDARD_ITUR_BT_709)
va_flags |= VA_SRC_BT709;
else if (flags & GST_VAAPI_COLOR_STANDARD_ITUR_BT_601)
va_flags |= VA_SRC_BT601;
GST_VAAPI_DISPLAY_LOCK(display); GST_VAAPI_DISPLAY_LOCK(display);
status = vaPutSurface( status = vaPutSurface(
GST_VAAPI_DISPLAY_VADISPLAY(display), GST_VAAPI_DISPLAY_VADISPLAY(display),
@ -213,7 +200,7 @@ gst_vaapi_window_x11_render(
dst_rect->w, dst_rect->w,
dst_rect->h, dst_rect->h,
NULL, 0, NULL, 0,
va_flags get_PutSurface_flags_from_GstVaapiSurfaceRenderFlags(flags)
); );
GST_VAAPI_DISPLAY_UNLOCK(display); GST_VAAPI_DISPLAY_UNLOCK(display);
if (!vaapi_check_status(status, "vaPutSurface()")) if (!vaapi_check_status(status, "vaPutSurface()"))