From 41f17eb5f002bbe5fb7a6a851bf10b24819bb773 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Tue, 15 Aug 2017 12:43:35 -0400 Subject: [PATCH] st/va: add handles for MJPEG Buffers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Leo Liu Reviewed-by: Christian König --- .../state_trackers/va/Makefile.sources | 1 + src/gallium/state_trackers/va/picture.c | 19 ++++++++ src/gallium/state_trackers/va/picture_mjpeg.c | 48 +++++++++++++++++++ src/gallium/state_trackers/va/va_private.h | 4 ++ 4 files changed, 72 insertions(+) create mode 100644 src/gallium/state_trackers/va/picture_mjpeg.c diff --git a/src/gallium/state_trackers/va/Makefile.sources b/src/gallium/state_trackers/va/Makefile.sources index daebf0120f8..2d6546b4b66 100644 --- a/src/gallium/state_trackers/va/Makefile.sources +++ b/src/gallium/state_trackers/va/Makefile.sources @@ -10,6 +10,7 @@ C_SOURCES := \ picture_h264.c \ picture_hevc.c \ picture_vc1.c \ + picture_mjpeg.c \ postproc.c \ subpicture.c \ surface.c \ diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c index 30617e8cfe7..62a30782aa3 100644 --- a/src/gallium/state_trackers/va/picture.c +++ b/src/gallium/state_trackers/va/picture.c @@ -164,6 +164,10 @@ handlePictureParameterBuffer(vlVaDriver *drv, vlVaContext *context, vlVaBuffer * vlVaHandlePictureParameterBufferHEVC(drv, context, buf); break; + case PIPE_VIDEO_FORMAT_JPEG: + vlVaHandlePictureParameterBufferMJPEG(drv, context, buf); + break; + default: break; } @@ -216,6 +220,10 @@ handleIQMatrixBuffer(vlVaContext *context, vlVaBuffer *buf) vlVaHandleIQMatrixBufferHEVC(context, buf); break; + case PIPE_VIDEO_FORMAT_JPEG: + vlVaHandleIQMatrixBufferMJPEG(context, buf); + break; + default: break; } @@ -245,6 +253,10 @@ handleSliceParameterBuffer(vlVaContext *context, vlVaBuffer *buf) vlVaHandleSliceParameterBufferHEVC(context, buf); break; + case PIPE_VIDEO_FORMAT_JPEG: + vlVaHandleSliceParameterBufferMJPEG(context, buf); + break; + default: break; } @@ -313,6 +325,9 @@ handleVASliceDataBufferType(vlVaContext *context, vlVaBuffer *buf) vlVaDecoderFixMPEG4Startcode(context); buffers[num_buffers] = (void *)context->mpeg4.start_code; sizes[num_buffers++] = context->mpeg4.start_code_size; + case PIPE_VIDEO_FORMAT_JPEG: + /* TODO */ + break; default: break; } @@ -553,6 +568,10 @@ vlVaRenderPicture(VADriverContextP ctx, VAContextID context_id, VABufferID *buff vaStatus = handleVAEncSliceParameterBufferType(drv, context, buf); break; + case VAHuffmanTableBufferType: + vlVaHandleHuffmanTableBufferType(context, buf); + break; + default: break; } diff --git a/src/gallium/state_trackers/va/picture_mjpeg.c b/src/gallium/state_trackers/va/picture_mjpeg.c new file mode 100644 index 00000000000..b0276e80dc5 --- /dev/null +++ b/src/gallium/state_trackers/va/picture_mjpeg.c @@ -0,0 +1,48 @@ +/************************************************************************** + * + * Copyright 2017 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 vlVaHandlePictureParameterBufferMJPEG(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf) +{ + /* TODO */ +} + +void vlVaHandleIQMatrixBufferMJPEG(vlVaContext *context, vlVaBuffer *buf) +{ + /* TODO */ +} + +void vlVaHandleHuffmanTableBufferType(vlVaContext *context, vlVaBuffer *buf) +{ + /* TODO */ +} + +void vlVaHandleSliceParameterBufferMJPEG(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 2c01bd3b2e9..24b74509c85 100644 --- a/src/gallium/state_trackers/va/va_private.h +++ b/src/gallium/state_trackers/va/va_private.h @@ -412,5 +412,9 @@ void vlVaDecoderFixMPEG4Startcode(vlVaContext *context); void vlVaHandlePictureParameterBufferHEVC(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf); void vlVaHandleIQMatrixBufferHEVC(vlVaContext *context, vlVaBuffer *buf); void vlVaHandleSliceParameterBufferHEVC(vlVaContext *context, vlVaBuffer *buf); +void vlVaHandlePictureParameterBufferMJPEG(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf); +void vlVaHandleIQMatrixBufferMJPEG(vlVaContext *context, vlVaBuffer *buf); +void vlVaHandleHuffmanTableBufferType(vlVaContext *context, vlVaBuffer *buf); +void vlVaHandleSliceParameterBufferMJPEG(vlVaContext *context, vlVaBuffer *buf); #endif //VA_PRIVATE_H -- 2.30.2