From 9ff83d13e5fe9aeed0ab6192a0e5dc6f01046700 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Wed, 14 Mar 2018 15:55:00 -0400 Subject: [PATCH] st/va: add handles for VP9 buffers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Leo Liu Acked-by: Christian König --- .../state_trackers/va/Makefile.sources | 1 + src/gallium/state_trackers/va/meson.build | 4 +- src/gallium/state_trackers/va/picture.c | 11 ++++++ src/gallium/state_trackers/va/picture_vp9.c | 38 +++++++++++++++++++ src/gallium/state_trackers/va/va_private.h | 2 + 5 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 src/gallium/state_trackers/va/picture_vp9.c diff --git a/src/gallium/state_trackers/va/Makefile.sources b/src/gallium/state_trackers/va/Makefile.sources index f3a13f20817..bd43100a870 100644 --- a/src/gallium/state_trackers/va/Makefile.sources +++ b/src/gallium/state_trackers/va/Makefile.sources @@ -13,6 +13,7 @@ C_SOURCES := \ picture_hevc_enc.c \ picture_vc1.c \ picture_mjpeg.c \ + picture_vp9.c \ postproc.c \ subpicture.c \ surface.c \ diff --git a/src/gallium/state_trackers/va/meson.build b/src/gallium/state_trackers/va/meson.build index deb1127483e..eb1491ce451 100644 --- a/src/gallium/state_trackers/va/meson.build +++ b/src/gallium/state_trackers/va/meson.build @@ -25,8 +25,8 @@ libva_st = static_library( files( 'buffer.c', 'config.c', 'context.c', 'display.c', 'image.c', 'picture.c', 'picture_mpeg12.c', 'picture_mpeg4.c', 'picture_h264.c', 'picture_hevc.c', - 'picture_vc1.c', 'picture_mjpeg.c', 'postproc.c', 'subpicture.c', - 'surface.c', 'picture_h264_enc.c', 'picture_hevc_enc.c', + 'picture_vc1.c', 'picture_mjpeg.c', 'picture_vp9.c','postproc.c', + 'subpicture.c', 'surface.c', 'picture_h264_enc.c', 'picture_hevc_enc.c', ), c_args : [ c_vis_args, diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c index f2e9ba8ef6a..e483ea3e217 100644 --- a/src/gallium/state_trackers/va/picture.c +++ b/src/gallium/state_trackers/va/picture.c @@ -134,6 +134,10 @@ handlePictureParameterBuffer(vlVaDriver *drv, vlVaContext *context, vlVaBuffer * vlVaHandlePictureParameterBufferMJPEG(drv, context, buf); break; + case PIPE_VIDEO_FORMAT_VP9: + vlVaHandlePictureParameterBufferVP9(drv, context, buf); + break; + default: break; } @@ -223,6 +227,10 @@ handleSliceParameterBuffer(vlVaContext *context, vlVaBuffer *buf) vlVaHandleSliceParameterBufferMJPEG(context, buf); break; + case PIPE_VIDEO_FORMAT_VP9: + vlVaHandleSliceParameterBufferVP9(context, buf); + break; + default: break; } @@ -294,6 +302,9 @@ handleVASliceDataBufferType(vlVaContext *context, vlVaBuffer *buf) break; case PIPE_VIDEO_FORMAT_JPEG: break; + case PIPE_VIDEO_FORMAT_VP9: + /* TODO */ + break; default: break; } diff --git a/src/gallium/state_trackers/va/picture_vp9.c b/src/gallium/state_trackers/va/picture_vp9.c new file mode 100644 index 00000000000..62350692c58 --- /dev/null +++ b/src/gallium/state_trackers/va/picture_vp9.c @@ -0,0 +1,38 @@ +/************************************************************************** + * + * Copyright 2018 Advanced Micro Devices, Inc. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + **************************************************************************/ + +#include "va_private.h" + +void vlVaHandlePictureParameterBufferVP9(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf) +{ + /* TODO */ +} + +void vlVaHandleSliceParameterBufferVP9(vlVaContext *context, vlVaBuffer *buf) +{ + /* TODO */ +} diff --git a/src/gallium/state_trackers/va/va_private.h b/src/gallium/state_trackers/va/va_private.h index 7c387478602..ef9142876c6 100644 --- a/src/gallium/state_trackers/va/va_private.h +++ b/src/gallium/state_trackers/va/va_private.h @@ -429,6 +429,8 @@ void vlVaHandlePictureParameterBufferMJPEG(vlVaDriver *drv, vlVaContext *context void vlVaHandleIQMatrixBufferMJPEG(vlVaContext *context, vlVaBuffer *buf); void vlVaHandleHuffmanTableBufferType(vlVaContext *context, vlVaBuffer *buf); void vlVaHandleSliceParameterBufferMJPEG(vlVaContext *context, vlVaBuffer *buf); +void vlVaHandlePictureParameterBufferVP9(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf); +void vlVaHandleSliceParameterBufferVP9(vlVaContext *context, vlVaBuffer *buf); void getEncParamPresetH264(vlVaContext *context); void getEncParamPresetH265(vlVaContext *context); VAStatus vlVaHandleVAEncPictureParameterBufferTypeH264(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf); -- 2.30.2