mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapidecode: Derive and save the decoded surface format

Browse source 
After the decoding of first frame, try to extract the exact
decoded surface format using vaDeriveImage and keep this
as the format in decoded_info.

https://bugzilla.gnome.org/show_bug.cgi?id=753914
This commit is contained in:
Sreerenj Balachandran 2016-03-24 15:09:15 +02:00
parent 859a2b2f4f
commit 6b17ed9060
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/vaapi/gstvaapidecode.c
View file

@ -309,11 +309,9 @@ static gboolean
is_surface_resolution_changed (GstVaapiDecode * decode, is_surface_resolution_changed (GstVaapiDecode * decode,
GstVaapiSurface * surface) GstVaapiSurface * surface)
{ {
GstVideoDecoder *const vdec = GST_VIDEO_DECODER (decode);
GstVideoInfo *vinfo = &decode->decoded_info; GstVideoInfo *vinfo = &decode->decoded_info;
GstVideoFormat format = GST_VIDEO_FORMAT_ENCODED; GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
guint surface_width, surface_height; guint surface_width, surface_height;
GstVideoCodecState *state;
g_return_val_if_fail (surface != NULL, FALSE); g_return_val_if_fail (surface != NULL, FALSE);
@ -323,12 +321,13 @@ is_surface_resolution_changed (GstVaapiDecode * decode,
&& GST_VIDEO_INFO_HEIGHT (vinfo) == surface_height) && GST_VIDEO_INFO_HEIGHT (vinfo) == surface_height)
return FALSE; return FALSE;
state = gst_video_decoder_get_output_state (vdec); /* doing gst_vaapi_surface_get_format() only if necessary since it execute
if (state) { * vaDeriveImage in the backgrorund . This will usually get executed only once */
/* Fixme: Get exact surface format usings gst_vaapi_surface_get_format () */ format =
format = GST_VIDEO_INFO_FORMAT (&state->info); (GST_VIDEO_INFO_FORMAT (vinfo) ==
gst_video_codec_state_unref (state); GST_VIDEO_FORMAT_UNKNOWN) ? gst_vaapi_surface_get_format (surface) :
} GST_VIDEO_INFO_FORMAT (vinfo);
gst_video_info_set_format (vinfo, format, surface_width, surface_height); gst_video_info_set_format (vinfo, format, surface_width, surface_height);
return TRUE; return TRUE;
@ -340,9 +339,9 @@ is_display_resolution_changed (GstVaapiDecode * decode,
const GstVaapiRectangle * crop_rect) const GstVaapiRectangle * crop_rect)
{ {
GstVideoDecoder *const vdec = GST_VIDEO_DECODER (decode); GstVideoDecoder *const vdec = GST_VIDEO_DECODER (decode);
GstVideoFormat format = GST_VIDEO_FORMAT_ENCODED;
GstVideoCodecState *state; GstVideoCodecState *state;
GstVideoInfo *vinfo; GstVideoInfo *vinfo;
GstVideoFormat format = GST_VIDEO_INFO_FORMAT (&decode->decoded_info);
guint display_width = GST_VIDEO_INFO_WIDTH (&decode->decoded_info); guint display_width = GST_VIDEO_INFO_WIDTH (&decode->decoded_info);
guint display_height = GST_VIDEO_INFO_HEIGHT (&decode->decoded_info); guint display_height = GST_VIDEO_INFO_HEIGHT (&decode->decoded_info);
@ -360,9 +359,6 @@ is_display_resolution_changed (GstVaapiDecode * decode,
decode->display_info = *vinfo; decode->display_info = *vinfo;
if (!crop_rect) { if (!crop_rect) {
display_width = GST_VIDEO_INFO_WIDTH (&decode->decoded_info);
display_height = GST_VIDEO_INFO_HEIGHT (&decode->decoded_info);
if (G_UNLIKELY (display_width != if (G_UNLIKELY (display_width !=
GST_VIDEO_INFO_WIDTH (&decode->display_info) GST_VIDEO_INFO_WIDTH (&decode->display_info)
|| display_height != GST_VIDEO_INFO_HEIGHT (&decode->display_info))) || display_height != GST_VIDEO_INFO_HEIGHT (&decode->display_info)))