mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity
gstreamer/gst-libs/gst/vaapi/gstvaapidecoder_objects.c

443 lines
13 KiB
C
Raw Normal View History

decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
/*
* gstvaapidecoder_objects.c - VA decoder objects helpers
*
* Copyright (C) 2010-2011 Splitted-Desktop Systems
* Copyright (C) 2011-2012 Intel Corporation
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
Add header for system-dependent definitions.
2012-01-30 17:12:59 +00:00
#include "sysdeps.h"
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
#include <string.h>
#include <gst/vaapi/gstvaapicontext.h>
#include "gstvaapidecoder_objects.h"
#include "gstvaapidecoder_priv.h"
#include "gstvaapicompat.h"
#include "gstvaapiutils.h"
#define DEBUG 1
#include "gstvaapidebug.h"
#define GET_DECODER(obj) GST_VAAPI_DECODER_CAST((obj)->parent_instance.codec)
#define GET_CONTEXT(obj) GET_DECODER(obj)->priv->context
#define GET_VA_DISPLAY(obj) GET_DECODER(obj)->priv->va_display
#define GET_VA_CONTEXT(obj) GET_DECODER(obj)->priv->va_context
/* ------------------------------------------------------------------------- */
/* --- Pictures --- */
/* ------------------------------------------------------------------------- */
GST_VAAPI_CODEC_DEFINE_TYPE(GstVaapiPicture,
gst_vaapi_picture,
GST_VAAPI_TYPE_CODEC_OBJECT)
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
enum {
GST_VAAPI_CREATE_PICTURE_FLAG_CLONE = 1 << 0,
GST_VAAPI_CREATE_PICTURE_FLAG_FIELD = 1 << 1,
};
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
static void
destroy_slice_cb(gpointer data, gpointer user_data)
{
GstMiniObject * const object = data;
gst_mini_object_unref(object);
}
static void
gst_vaapi_picture_destroy(GstVaapiPicture *picture)
{
if (picture->slices) {
g_ptr_array_foreach(picture->slices, destroy_slice_cb, NULL);
g_ptr_array_free(picture->slices, TRUE);
picture->slices = NULL;
}
if (picture->iq_matrix) {
gst_mini_object_unref(GST_MINI_OBJECT(picture->iq_matrix));
picture->iq_matrix = NULL;
}
Add initial JPEG decoder. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2012-02-09 16:21:04 +00:00
if (picture->huf_table) {
gst_mini_object_unref(GST_MINI_OBJECT(picture->huf_table));
picture->huf_table = NULL;
}
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
if (picture->bitplane) {
gst_mini_object_unref(GST_MINI_OBJECT(picture->bitplane));
picture->bitplane = NULL;
}
decoder: retain proxy surface until the GstVaapiPicture is destroyed. Keep a valid reference to the proxy in GstVaapiPicture so that frames marked as "used for reference" could be kept during the lifetime of the picture. i.e. don't release them too soon as they could be re-used right away.
2012-01-26 14:28:42 +00:00
if (picture->proxy) {
g_object_unref(picture->proxy);
picture->proxy = NULL;
}
decoder: fix memory leak of VA objects on exit. On sequence end, if the last decoded picture is not output for rendering, then the proxy surface is not created. In this case, the original surface must be released explicitly to the context.
2012-01-31 10:26:37 +00:00
else if (picture->surface) {
/* Explicitly release any surface that was not bound to a proxy */
gst_vaapi_context_put_surface(GET_CONTEXT(picture), picture->surface);
}
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
picture->surface_id = VA_INVALID_ID;
picture->surface = NULL;
vaapi_destroy_buffer(GET_VA_DISPLAY(picture), &picture->param_id);
picture->param = NULL;
}
static gboolean
gst_vaapi_picture_create(
GstVaapiPicture *picture,
const GstVaapiCodecObjectConstructorArgs *args
)
{
decoder: optimize slice data buffers initialization. VA drivers may have a faster means to transfer user buffers to GPU buffers than using memcpy(). In particular, on Intel Gen graphics, we can use pwrite(). This provides for faster upload of bitstream and can help higher bitrates. vaapi_create_buffer() helper function was also updated to allow for un-mapped buffers and pre-initialized data for buffers.
2012-01-30 09:15:32 +00:00
gboolean success;
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
if (args->flags & GST_VAAPI_CREATE_PICTURE_FLAG_CLONE) {
GstVaapiPicture * const parent_picture = GST_VAAPI_PICTURE(args->data);
picture->proxy = g_object_ref(parent_picture->proxy);
picture->surface = gst_vaapi_surface_proxy_get_surface(picture->proxy);
picture->type = parent_picture->type;
picture->pts = parent_picture->pts;
decoder: use POC to maintain the DPB. Introduce a POC field in GstVaapiPicture so that to store simpler sequential numbers. A signed 32-bit integer should be enough for 1 year of continuous video streaming at 60 Hz. Use this new POC value to maintain the DPB, instead of 64-bit timestamps. This also aligns with H.264 that will be migrated to GstVaapiDpb infrastructure.
2012-03-30 15:03:28 +00:00
picture->poc = parent_picture->poc;
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
// Copy all picture flags but "output"
GST_VAAPI_PICTURE_FLAG_SET(
picture,
GST_VAAPI_PICTURE_FLAGS(parent_picture) &
(GST_VAAPI_PICTURE_FLAG_SKIPPED |
GST_VAAPI_PICTURE_FLAG_REFERENCE |
GST_VAAPI_PICTURE_FLAG_INTERLACED |
decoder: add first-field flag to picture. Add first-field (FF) flag to GstVaapiPicture, thus not requiring is_first_field member in each decoder. Rather, when a GstVaapiPicture is created, it is considered as the first field. Any subsequent allocated field will become the second field.
2012-03-28 15:50:28 +00:00
GST_VAAPI_PICTURE_FLAG_FF |
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
GST_VAAPI_PICTURE_FLAG_TFF)
);
picture->structure = parent_picture->structure;
if ((args->flags & GST_VAAPI_CREATE_PICTURE_FLAG_FIELD) &&
GST_VAAPI_PICTURE_IS_INTERLACED(picture)) {
switch (picture->structure) {
case GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD:
picture->structure = GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD;
break;
case GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD:
picture->structure = GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD;
break;
}
decoder: add first-field flag to picture. Add first-field (FF) flag to GstVaapiPicture, thus not requiring is_first_field member in each decoder. Rather, when a GstVaapiPicture is created, it is considered as the first field. Any subsequent allocated field will become the second field.
2012-03-28 15:50:28 +00:00
GST_VAAPI_PICTURE_FLAG_UNSET(picture, GST_VAAPI_PICTURE_FLAG_FF);
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
}
}
else {
picture->surface = gst_vaapi_context_get_surface(GET_CONTEXT(picture));
if (!picture->surface)
return FALSE;
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
picture->proxy =
gst_vaapi_surface_proxy_new(GET_CONTEXT(picture), picture->surface);
if (!picture->proxy)
return FALSE;
picture->structure = GST_VAAPI_PICTURE_STRUCTURE_FRAME;
decoder: add first-field flag to picture. Add first-field (FF) flag to GstVaapiPicture, thus not requiring is_first_field member in each decoder. Rather, when a GstVaapiPicture is created, it is considered as the first field. Any subsequent allocated field will become the second field.
2012-03-28 15:50:28 +00:00
GST_VAAPI_PICTURE_FLAG_SET(picture, GST_VAAPI_PICTURE_FLAG_FF);
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
}
picture->surface_id = gst_vaapi_surface_get_id(picture->surface);
decoder: allocate proxy surface earlier. This simplifies gst_vaapi_picture_output() to only update the presentation timestamp and submit the proxy to the decoder for output.
2012-01-31 10:34:17 +00:00
decoder: optimize slice data buffers initialization. VA drivers may have a faster means to transfer user buffers to GPU buffers than using memcpy(). In particular, on Intel Gen graphics, we can use pwrite(). This provides for faster upload of bitstream and can help higher bitrates. vaapi_create_buffer() helper function was also updated to allow for un-mapped buffers and pre-initialized data for buffers.
2012-01-30 09:15:32 +00:00
success = vaapi_create_buffer(
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
GET_VA_DISPLAY(picture),
GET_VA_CONTEXT(picture),
VAPictureParameterBufferType,
args->param_size,
decoder: optimize slice data buffers initialization. VA drivers may have a faster means to transfer user buffers to GPU buffers than using memcpy(). In particular, on Intel Gen graphics, we can use pwrite(). This provides for faster upload of bitstream and can help higher bitrates. vaapi_create_buffer() helper function was also updated to allow for un-mapped buffers and pre-initialized data for buffers.
2012-01-30 09:15:32 +00:00
args->param,
&picture->param_id,
&picture->param
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
);
decoder: optimize slice data buffers initialization. VA drivers may have a faster means to transfer user buffers to GPU buffers than using memcpy(). In particular, on Intel Gen graphics, we can use pwrite(). This provides for faster upload of bitstream and can help higher bitrates. vaapi_create_buffer() helper function was also updated to allow for un-mapped buffers and pre-initialized data for buffers.
2012-01-30 09:15:32 +00:00
if (!success)
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
return FALSE;
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
picture->param_size = args->param_size;
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
picture->slices = g_ptr_array_new();
if (!picture->slices)
return FALSE;
return TRUE;
}
static void
gst_vaapi_picture_init(GstVaapiPicture *picture)
{
picture->type = GST_VAAPI_PICTURE_TYPE_NONE;
picture->surface = NULL;
decoder: retain proxy surface until the GstVaapiPicture is destroyed. Keep a valid reference to the proxy in GstVaapiPicture so that frames marked as "used for reference" could be kept during the lifetime of the picture. i.e. don't release them too soon as they could be re-used right away.
2012-01-26 14:28:42 +00:00
picture->proxy = NULL;
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
picture->surface_id = VA_INVALID_ID;
picture->param = NULL;
picture->param_id = VA_INVALID_ID;
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
picture->param_size = 0;
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
picture->slices = NULL;
picture->iq_matrix = NULL;
Add initial JPEG decoder. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2012-02-09 16:21:04 +00:00
picture->huf_table = NULL;
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
picture->bitplane = NULL;
picture->pts = GST_CLOCK_TIME_NONE;
decoder: use POC to maintain the DPB. Introduce a POC field in GstVaapiPicture so that to store simpler sequential numbers. A signed 32-bit integer should be enough for 1 year of continuous video streaming at 60 Hz. Use this new POC value to maintain the DPB, instead of 64-bit timestamps. This also aligns with H.264 that will be migrated to GstVaapiDpb infrastructure.
2012-03-30 15:03:28 +00:00
picture->poc = 0;
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
}
GstVaapiPicture *
gst_vaapi_picture_new(
GstVaapiDecoder *decoder,
gconstpointer param,
guint param_size
)
{
GstVaapiCodecObject *object;
g_return_val_if_fail(GST_VAAPI_IS_DECODER(decoder), NULL);
object = gst_vaapi_codec_object_new(
GST_VAAPI_TYPE_PICTURE,
GST_VAAPI_CODEC_BASE(decoder),
param, param_size,
NULL, 0
);
if (!object)
return NULL;
return GST_VAAPI_PICTURE_CAST(object);
}
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
GstVaapiPicture *
gst_vaapi_picture_new_field(GstVaapiPicture *picture)
{
decoder: fix gst_vaapi_picture_new_field() object type. Fix gst_vaapi_picture_new_field() to preserve the original picture type. e.g. gst_vaapi_picture_new_field() with a GstVaapiPictureH264 argument shall generate a GstVaapiPictureH264 object.
2012-10-23 12:04:22 +00:00
GType type;
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
GstMiniObject *obj;
GstVaapiCodecObject *va_obj;
GstVaapiCodecObjectConstructorArgs args;
g_return_val_if_fail(GST_VAAPI_IS_PICTURE(picture), NULL);
decoder: fix gst_vaapi_picture_new_field() object type. Fix gst_vaapi_picture_new_field() to preserve the original picture type. e.g. gst_vaapi_picture_new_field() with a GstVaapiPictureH264 argument shall generate a GstVaapiPictureH264 object.
2012-10-23 12:04:22 +00:00
type = G_TYPE_FROM_CLASS(GST_VAAPI_PICTURE_GET_CLASS(picture));
obj = gst_mini_object_new(type);
decoder: allow pictures to be cloned for field decoding. Add gst_vaapi_picture_new_field() function that clones a picture, while preserving the parent picture surface. i.e. the surface proxy reference count is increased and other fields copied as is. Besides, the picture is reset into a "non-output" mode.
2012-03-28 14:05:58 +00:00
if (!obj)
return NULL;
va_obj = GST_VAAPI_CODEC_OBJECT(obj);
args.codec = GST_VAAPI_CODEC_BASE(GET_DECODER(picture));
args.param = NULL;
args.param_size = picture->param_size;
args.data = picture;
args.data_size = 0;
args.flags = (GST_VAAPI_CREATE_PICTURE_FLAG_CLONE|
GST_VAAPI_CREATE_PICTURE_FLAG_FIELD);
if (gst_vaapi_codec_object_construct(va_obj, &args))
return GST_VAAPI_PICTURE_CAST(va_obj);
gst_mini_object_unref(obj);
return NULL;
}
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
void
gst_vaapi_picture_add_slice(GstVaapiPicture *picture, GstVaapiSlice *slice)
{
g_return_if_fail(GST_VAAPI_IS_PICTURE(picture));
g_return_if_fail(GST_VAAPI_IS_SLICE(slice));
g_ptr_array_add(picture->slices, slice);
}
decoder: fix double buffer free with some VA drivers. vaRenderPicture() implicitly disposes VA buffers. Some VA drivers would push the VA buffer object into a list of free buffers to be re-used. However, reference pictures (and data) that was kept would explicitly release the VA buffer object later on, thus possibly destroying a valid (re-used) object. Besides, some other VA drivers don't support correctly the vaRenderPicture() semantics for VA buffers disposal and would leak memory if there is no explicit vaDestroyBuffer(). The temporary workaround is to explcitily destroy VA buffers right after vaRenderPicture(). All VA drivers need to be aligned.
2012-02-13 09:10:35 +00:00
static gboolean
do_decode(VADisplay dpy, VAContextID ctx, VABufferID *buf_id, void **buf_ptr)
{
VAStatus status;
vaapi_unmap_buffer(dpy, *buf_id, buf_ptr);
status = vaRenderPicture(dpy, ctx, buf_id, 1);
if (!vaapi_check_status(status, "vaRenderPicture()"))
return FALSE;
/* XXX: vaRenderPicture() is meant to destroy the VA buffer implicitly */
vaapi_destroy_buffer(dpy, buf_id);
return TRUE;
}
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
gboolean
gst_vaapi_picture_decode(GstVaapiPicture *picture)
{
GstVaapiIqMatrix *iq_matrix;
GstVaapiBitPlane *bitplane;
Add initial JPEG decoder. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2012-02-09 16:21:04 +00:00
GstVaapiHuffmanTable *huf_table;
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
VADisplay va_display;
VAContextID va_context;
VAStatus status;
decoder: fix double buffer free with some VA drivers. vaRenderPicture() implicitly disposes VA buffers. Some VA drivers would push the VA buffer object into a list of free buffers to be re-used. However, reference pictures (and data) that was kept would explicitly release the VA buffer object later on, thus possibly destroying a valid (re-used) object. Besides, some other VA drivers don't support correctly the vaRenderPicture() semantics for VA buffers disposal and would leak memory if there is no explicit vaDestroyBuffer(). The temporary workaround is to explcitily destroy VA buffers right after vaRenderPicture(). All VA drivers need to be aligned.
2012-02-13 09:10:35 +00:00
guint i;
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
g_return_val_if_fail(GST_VAAPI_IS_PICTURE(picture), FALSE);
va_display = GET_VA_DISPLAY(picture);
va_context = GET_VA_CONTEXT(picture);
GST_DEBUG("decode picture 0x%08x", picture->surface_id);
status = vaBeginPicture(va_display, va_context, picture->surface_id);
if (!vaapi_check_status(status, "vaBeginPicture()"))
return FALSE;
decoder: fix double buffer free with some VA drivers. vaRenderPicture() implicitly disposes VA buffers. Some VA drivers would push the VA buffer object into a list of free buffers to be re-used. However, reference pictures (and data) that was kept would explicitly release the VA buffer object later on, thus possibly destroying a valid (re-used) object. Besides, some other VA drivers don't support correctly the vaRenderPicture() semantics for VA buffers disposal and would leak memory if there is no explicit vaDestroyBuffer(). The temporary workaround is to explcitily destroy VA buffers right after vaRenderPicture(). All VA drivers need to be aligned.
2012-02-13 09:10:35 +00:00
if (!do_decode(va_display, va_context, &picture->param_id, &picture->param))
return FALSE;
iq_matrix = picture->iq_matrix;
if (iq_matrix && !do_decode(va_display, va_context,
&iq_matrix->param_id, &iq_matrix->param))
return FALSE;
bitplane = picture->bitplane;
if (bitplane && !do_decode(va_display, va_context,
&bitplane->data_id, (void **)&bitplane->data))
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
return FALSE;
Add initial JPEG decoder. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2012-02-09 16:21:04 +00:00
huf_table = picture->huf_table;
if (huf_table && !do_decode(va_display, va_context,
&huf_table->param_id,
(void **)&huf_table->param))
return FALSE;
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
for (i = 0; i < picture->slices->len; i++) {
GstVaapiSlice * const slice = g_ptr_array_index(picture->slices, i);
decoder: fix double buffer free with some VA drivers. vaRenderPicture() implicitly disposes VA buffers. Some VA drivers would push the VA buffer object into a list of free buffers to be re-used. However, reference pictures (and data) that was kept would explicitly release the VA buffer object later on, thus possibly destroying a valid (re-used) object. Besides, some other VA drivers don't support correctly the vaRenderPicture() semantics for VA buffers disposal and would leak memory if there is no explicit vaDestroyBuffer(). The temporary workaround is to explcitily destroy VA buffers right after vaRenderPicture(). All VA drivers need to be aligned.
2012-02-13 09:10:35 +00:00
VABufferID va_buffers[2];
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
vaapi_unmap_buffer(va_display, slice->param_id, NULL);
va_buffers[0] = slice->param_id;
va_buffers[1] = slice->data_id;
decoder: fix double buffer free with some VA drivers. vaRenderPicture() implicitly disposes VA buffers. Some VA drivers would push the VA buffer object into a list of free buffers to be re-used. However, reference pictures (and data) that was kept would explicitly release the VA buffer object later on, thus possibly destroying a valid (re-used) object. Besides, some other VA drivers don't support correctly the vaRenderPicture() semantics for VA buffers disposal and would leak memory if there is no explicit vaDestroyBuffer(). The temporary workaround is to explcitily destroy VA buffers right after vaRenderPicture(). All VA drivers need to be aligned.
2012-02-13 09:10:35 +00:00
status = vaRenderPicture(va_display, va_context, va_buffers, 2);
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
if (!vaapi_check_status(status, "vaRenderPicture()"))
return FALSE;
decoder: fix double buffer free with some VA drivers. vaRenderPicture() implicitly disposes VA buffers. Some VA drivers would push the VA buffer object into a list of free buffers to be re-used. However, reference pictures (and data) that was kept would explicitly release the VA buffer object later on, thus possibly destroying a valid (re-used) object. Besides, some other VA drivers don't support correctly the vaRenderPicture() semantics for VA buffers disposal and would leak memory if there is no explicit vaDestroyBuffer(). The temporary workaround is to explcitily destroy VA buffers right after vaRenderPicture(). All VA drivers need to be aligned.
2012-02-13 09:10:35 +00:00
vaapi_destroy_buffer(va_display, &slice->param_id);
vaapi_destroy_buffer(va_display, &slice->data_id);
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
}
status = vaEndPicture(va_display, va_context);
if (!vaapi_check_status(status, "vaEndPicture()"))
return FALSE;
return TRUE;
}
gboolean
gst_vaapi_picture_output(GstVaapiPicture *picture)
{
GstVaapiSurfaceProxy *proxy;
g_return_val_if_fail(GST_VAAPI_IS_PICTURE(picture), FALSE);
decoder: allocate proxy surface earlier. This simplifies gst_vaapi_picture_output() to only update the presentation timestamp and submit the proxy to the decoder for output.
2012-01-31 10:34:17 +00:00
if (!picture->proxy)
return FALSE;
decoder: simplify output of decoded frames. Drop obsolete gst_vaapi_decoder_push_surface() that was no longer used. Change gst_vaapi_decoder_push_surface_proxy() semantics to assume PTS is already set correctly and reference count increased, if necessary.
2012-01-26 13:54:31 +00:00
decoder: fix semantics of SKIPPED pictures. If GstVaapiPicture has flag SKIPPED set, this means gst_vaapi_picture_output() will not push the underlying surface for rendering. Besides, VC-1 skipped P-frame has nothing to do with rendering. This only means that the currently decoded picture is just a copy of its reference picture.
2012-03-28 12:24:40 +00:00
if (!GST_VAAPI_PICTURE_IS_SKIPPED(picture)) {
proxy = g_object_ref(picture->proxy);
gst_vaapi_surface_proxy_set_timestamp(proxy, picture->pts);
decoder: rework picture field flags. Add top-field-first (TFF) and interlaced flags to GstVaapiPicture so they could be propagated to the surface proxy when it is pushed for rendering. Besides, top and bottom fields are now expressed with picture structure flags from GstVaapiSurfaceRenderFlags.
2012-03-28 14:07:44 +00:00
if (GST_VAAPI_PICTURE_IS_INTERLACED(picture))
gst_vaapi_surface_proxy_set_interlaced(proxy, TRUE);
if (GST_VAAPI_PICTURE_IS_TFF(picture))
gst_vaapi_surface_proxy_set_tff(proxy, TRUE);
decoder: fix semantics of SKIPPED pictures. If GstVaapiPicture has flag SKIPPED set, this means gst_vaapi_picture_output() will not push the underlying surface for rendering. Besides, VC-1 skipped P-frame has nothing to do with rendering. This only means that the currently decoded picture is just a copy of its reference picture.
2012-03-28 12:24:40 +00:00
gst_vaapi_decoder_push_surface_proxy(GET_DECODER(picture), proxy);
}
decoder: add OUTPUT flag to pictures. Allow pictures to be marked as output gst_vaapi_picture_output().
2012-03-28 12:28:26 +00:00
GST_VAAPI_PICTURE_FLAG_SET(picture, GST_VAAPI_PICTURE_FLAG_OUTPUT);
decoder: simplify output of decoded frames. Drop obsolete gst_vaapi_decoder_push_surface() that was no longer used. Change gst_vaapi_decoder_push_surface_proxy() semantics to assume PTS is already set correctly and reference count increased, if necessary.
2012-01-26 13:54:31 +00:00
return TRUE;
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
}
/* ------------------------------------------------------------------------- */
/* --- Slices --- */
/* ------------------------------------------------------------------------- */
GST_VAAPI_CODEC_DEFINE_TYPE(GstVaapiSlice,
gst_vaapi_slice,
GST_VAAPI_TYPE_CODEC_OBJECT)
static void
gst_vaapi_slice_destroy(GstVaapiSlice *slice)
{
VADisplay const va_display = GET_VA_DISPLAY(slice);
vaapi_destroy_buffer(va_display, &slice->data_id);
vaapi_destroy_buffer(va_display, &slice->param_id);
slice->param = NULL;
}
static gboolean
gst_vaapi_slice_create(
GstVaapiSlice *slice,
const GstVaapiCodecObjectConstructorArgs *args
)
{
VASliceParameterBufferBase *slice_param;
decoder: optimize slice data buffers initialization. VA drivers may have a faster means to transfer user buffers to GPU buffers than using memcpy(). In particular, on Intel Gen graphics, we can use pwrite(). This provides for faster upload of bitstream and can help higher bitrates. vaapi_create_buffer() helper function was also updated to allow for un-mapped buffers and pre-initialized data for buffers.
2012-01-30 09:15:32 +00:00
gboolean success;
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
decoder: optimize slice data buffers initialization. VA drivers may have a faster means to transfer user buffers to GPU buffers than using memcpy(). In particular, on Intel Gen graphics, we can use pwrite(). This provides for faster upload of bitstream and can help higher bitrates. vaapi_create_buffer() helper function was also updated to allow for un-mapped buffers and pre-initialized data for buffers.
2012-01-30 09:15:32 +00:00
success = vaapi_create_buffer(
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
GET_VA_DISPLAY(slice),
GET_VA_CONTEXT(slice),
VASliceDataBufferType,
args->data_size,
decoder: optimize slice data buffers initialization. VA drivers may have a faster means to transfer user buffers to GPU buffers than using memcpy(). In particular, on Intel Gen graphics, we can use pwrite(). This provides for faster upload of bitstream and can help higher bitrates. vaapi_create_buffer() helper function was also updated to allow for un-mapped buffers and pre-initialized data for buffers.
2012-01-30 09:15:32 +00:00
args->data,
&slice->data_id,
NULL
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
);
decoder: optimize slice data buffers initialization. VA drivers may have a faster means to transfer user buffers to GPU buffers than using memcpy(). In particular, on Intel Gen graphics, we can use pwrite(). This provides for faster upload of bitstream and can help higher bitrates. vaapi_create_buffer() helper function was also updated to allow for un-mapped buffers and pre-initialized data for buffers.
2012-01-30 09:15:32 +00:00
if (!success)
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
return FALSE;
decoder: optimize slice data buffers initialization. VA drivers may have a faster means to transfer user buffers to GPU buffers than using memcpy(). In particular, on Intel Gen graphics, we can use pwrite(). This provides for faster upload of bitstream and can help higher bitrates. vaapi_create_buffer() helper function was also updated to allow for un-mapped buffers and pre-initialized data for buffers.
2012-01-30 09:15:32 +00:00
success = vaapi_create_buffer(
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
GET_VA_DISPLAY(slice),
GET_VA_CONTEXT(slice),
VASliceParameterBufferType,
args->param_size,
decoder: optimize slice data buffers initialization. VA drivers may have a faster means to transfer user buffers to GPU buffers than using memcpy(). In particular, on Intel Gen graphics, we can use pwrite(). This provides for faster upload of bitstream and can help higher bitrates. vaapi_create_buffer() helper function was also updated to allow for un-mapped buffers and pre-initialized data for buffers.
2012-01-30 09:15:32 +00:00
args->param,
&slice->param_id,
&slice->param
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
);
decoder: optimize slice data buffers initialization. VA drivers may have a faster means to transfer user buffers to GPU buffers than using memcpy(). In particular, on Intel Gen graphics, we can use pwrite(). This provides for faster upload of bitstream and can help higher bitrates. vaapi_create_buffer() helper function was also updated to allow for un-mapped buffers and pre-initialized data for buffers.
2012-01-30 09:15:32 +00:00
if (!success)
decoder: rework the internal VA objects API. The new API simplifies a lot reference counting and makes it more flexible for future additions/changes. The GstVaapiCodecInfo is also gone. Rather, new helper macros are provided to allocate picture, slice and quantization matrix parameter buffers.
2012-01-26 08:48:11 +00:00
return FALSE;
slice_param = slice->param;
slice_param->slice_data_size = args->data_size;
slice_param->slice_data_offset = 0;
slice_param->slice_data_flag = VA_SLICE_DATA_FLAG_ALL;
return TRUE;
}
static void
gst_vaapi_slice_init(GstVaapiSlice *slice)
{
slice->param = NULL;
slice->param_id = VA_INVALID_ID;
slice->data_id = VA_INVALID_ID;
}
GstVaapiSlice *
gst_vaapi_slice_new(
GstVaapiDecoder *decoder,
gconstpointer param,
guint param_size,
const guchar *data,
guint data_size
)
{
GstVaapiCodecObject *object;
g_return_val_if_fail(GST_VAAPI_IS_DECODER(decoder), NULL);
object = gst_vaapi_codec_object_new(
GST_VAAPI_TYPE_SLICE,
GST_VAAPI_CODEC_BASE(decoder),
param, param_size,
data, data_size
);
return GST_VAAPI_SLICE_CAST(object);
}
Reference in a new issue Copy permalink