mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-10 03:19:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapivideomemory: minor code clean-ups.

Browse source 
Fix error messages introduced in the previous commit for the _map()
imaplementation. Also use the new get_image_data() helper function
to determine the base pixels data buffer from a GstVaapiImage when
updating the video info structure from it.
This commit is contained in:
Gwenole Beauchesne 2014-07-23 23:49:53 +02:00
parent 9cad85a936
commit f2ce28e4b7
1 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/vaapi/gstvaapivideomemory.c
View file

@ -318,9 +318,9 @@ gst_vaapi_video_memory_map(GstVaapiVideoMemory *mem, gsize maxsize, guint flags)
case GST_MAP_READ: case GST_MAP_READ:
// Only read flag set: return raw pixels // Only read flag set: return raw pixels
if (!ensure_surface(mem)) if (!ensure_surface(mem))
return NULL; goto error_no_surface;
if (!ensure_image(mem)) if (!ensure_image(mem))
goto error_ensure_image; goto error_no_image;
if (!mem->use_direct_rendering) if (!mem->use_direct_rendering)
gst_vaapi_surface_get_image(mem->surface, mem->image); gst_vaapi_surface_get_image(mem->surface, mem->image);
if (!gst_vaapi_image_map(mem->image)) if (!gst_vaapi_image_map(mem->image))
@ -359,23 +359,15 @@ error_unsupported_map_type:
error_no_surface_proxy: error_no_surface_proxy:
GST_ERROR("failed to extract GstVaapiSurfaceProxy from video meta"); GST_ERROR("failed to extract GstVaapiSurfaceProxy from video meta");
return NULL; return NULL;
error_no_image: error_no_surface:
GST_ERROR("failed to extract raw pixels from mapped VA image"); GST_ERROR("failed to extract VA surface from video buffer");
return NULL;
error_no_image:
GST_ERROR("failed to extract VA image from video buffer");
return NULL; return NULL;
error_ensure_image:
{
const GstVideoInfo * const vip = mem->image_info;
GST_ERROR("failed to create %s image of size %ux%u",
GST_VIDEO_INFO_FORMAT_STRING(vip),
GST_VIDEO_INFO_WIDTH(vip), GST_VIDEO_INFO_HEIGHT(vip));
return FALSE;
}
error_map_image: error_map_image:
{ GST_ERROR("failed to map VA image");
GST_ERROR("failed to map image %" GST_VAAPI_ID_FORMAT, return NULL;
GST_VAAPI_ID_ARGS(gst_vaapi_image_get_id(mem->image)));
return FALSE;
}
} }
static void static void
@ -534,12 +526,8 @@ gst_video_info_update_from_image(GstVideoInfo *vip, GstVaapiImage *image)
g_return_val_if_fail(num_planes == GST_VIDEO_INFO_N_PLANES(vip), FALSE); g_return_val_if_fail(num_planes == GST_VIDEO_INFO_N_PLANES(vip), FALSE);
/* Determine the base data pointer */ /* Determine the base data pointer */
data = gst_vaapi_image_get_plane(image, 0); data = get_image_data(image);
for (i = 1; i < num_planes; i++) { g_return_val_if_fail(data != NULL, FALSE);
const guchar * const plane = gst_vaapi_image_get_plane(image, i);
if (data > plane)
data = plane;
}
data_size = gst_vaapi_image_get_data_size(image); data_size = gst_vaapi_image_get_data_size(image);
/* Check that we don't have disjoint planes */ /* Check that we don't have disjoint planes */