From: Boyuan Zhang <boyuan.zh...@amd.com>
Add a separate file for HEVC encode functions.
Signed-off-by: Boyuan Zhang <boyuan.zh...@amd.com>
Acked-by: Christian König <christian.koe...@amd.com>
---
src/gallium/state_trackers/va/Makefile.sources | 1 +
src/gallium/state_trackers/va/meson.build | 2 +-
src/gallium/state_trackers/va/picture.c | 31 +++++++++-
src/gallium/state_trackers/va/picture_hevc_enc.c | 75 ++++++++++++++++++++++++
src/gallium/state_trackers/va/va_private.h | 6 ++
5 files changed, 111 insertions(+), 4 deletions(-)
create mode 100644 src/gallium/state_trackers/va/picture_hevc_enc.c
diff --git a/src/gallium/state_trackers/va/Makefile.sources
b/src/gallium/state_trackers/va/Makefile.sources
index 8a69828..f3a13f2 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_h264_enc.c \
picture_hevc.c \
+ picture_hevc_enc.c \
picture_vc1.c \
picture_mjpeg.c \
postproc.c \
diff --git a/src/gallium/state_trackers/va/meson.build
b/src/gallium/state_trackers/va/meson.build
index 0dec48c..bddd5ef 100644
--- a/src/gallium/state_trackers/va/meson.build
+++ b/src/gallium/state_trackers/va/meson.build
@@ -26,7 +26,7 @@ libva_st = static_library(
'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',
+ '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 57f53ac..240f25a 100644
--- a/src/gallium/state_trackers/va/picture.c
+++ b/src/gallium/state_trackers/va/picture.c
@@ -316,6 +316,10 @@ handleVAEncMiscParameterTypeRateControl(vlVaContext
*context, VAEncMiscParameter
status = vlVaHandleVAEncMiscParameterTypeRateControlH264(context, misc);
break;
+ case PIPE_VIDEO_FORMAT_HEVC:
+ status = vlVaHandleVAEncMiscParameterTypeRateControlHEVC(context, misc);
+ break;
+
default:
break;
}
@@ -333,6 +337,10 @@ handleVAEncMiscParameterTypeFrameRate(vlVaContext
*context, VAEncMiscParameterBu
status = vlVaHandleVAEncMiscParameterTypeFrameRateH264(context, misc);
break;
+ case PIPE_VIDEO_FORMAT_HEVC:
+ status = vlVaHandleVAEncMiscParameterTypeFrameRateHEVC(context, misc);
+ break;
+
default:
break;
}
@@ -350,6 +358,10 @@ handleVAEncSequenceParameterBufferType(vlVaDriver *drv,
vlVaContext *context, vl
status = vlVaHandleVAEncSequenceParameterBufferTypeH264(drv, context,
buf);
break;
+ case PIPE_VIDEO_FORMAT_HEVC:
+ status = vlVaHandleVAEncSequenceParameterBufferTypeHEVC(drv, context,
buf);
+ break;
+
default:
break;
}
@@ -390,6 +402,10 @@ handleVAEncPictureParameterBufferType(vlVaDriver *drv,
vlVaContext *context, vlV
status = vlVaHandleVAEncPictureParameterBufferTypeH264(drv, context,
buf);
break;
+ case PIPE_VIDEO_FORMAT_HEVC:
+ status = vlVaHandleVAEncPictureParameterBufferTypeHEVC(drv, context,
buf);
+ break;
+
default:
break;
}
@@ -407,6 +423,10 @@ handleVAEncSliceParameterBufferType(vlVaDriver *drv,
vlVaContext *context, vlVaB
status = vlVaHandleVAEncSliceParameterBufferTypeH264(drv, context, buf);
break;
+ case PIPE_VIDEO_FORMAT_HEVC:
+ status = vlVaHandleVAEncSliceParameterBufferTypeHEVC(drv, context, buf);
+ break;
+
default:
break;
}
@@ -600,8 +620,11 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID
context_id)
if (context->decoder->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) {
coded_buf = context->coded_buf;
- getEncParamPresetH264(context);
- context->desc.h264enc.frame_num_cnt++;
+ if (u_reduce_video_profile(context->templat.profile) ==
PIPE_VIDEO_FORMAT_MPEG4_AVC) {
+ getEncParamPresetH264(context);
+ context->desc.h264enc.frame_num_cnt++;
+ } else if (u_reduce_video_profile(context->templat.profile) ==
PIPE_VIDEO_FORMAT_HEVC)
+ getEncParamPresetH265(context);
context->decoder->begin_frame(context->decoder, context->target,
&context->desc.base);
context->decoder->encode_bitstream(context->decoder, context->target,
coded_buf->derived_surface.resource,
&feedback);
@@ -630,7 +653,9 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id)
context->first_single_submitted = false;
surf->force_flushed = true;
}
- }
+ } else if (context->decoder->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE &&
+ u_reduce_video_profile(context->templat.profile) ==
PIPE_VIDEO_FORMAT_HEVC)
+ context->desc.h265enc.frame_num++;
mtx_unlock(&drv->mutex);
return VA_STATUS_SUCCESS;
}
diff --git a/src/gallium/state_trackers/va/picture_hevc_enc.c
b/src/gallium/state_trackers/va/picture_hevc_enc.c
new file mode 100644
index 0000000..4b56207
--- /dev/null
+++ b/src/gallium/state_trackers/va/picture_hevc_enc.c
@@ -0,0 +1,75 @@
+/**************************************************************************
+ *
+ * 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 "util/u_handle_table.h"
+#include "util/u_video.h"
+#include "va_private.h"
+
+VAStatus
+vlVaHandleVAEncPictureParameterBufferTypeHEVC(vlVaDriver *drv, vlVaContext
*context, vlVaBuffer *buf)
+{
+ /* TODO */
+
+ return VA_STATUS_SUCCESS;
+}
+
+VAStatus
+vlVaHandleVAEncSliceParameterBufferTypeHEVC(vlVaDriver *drv, vlVaContext
*context, vlVaBuffer *buf)
+{
+ /* TODO */
+
+ return VA_STATUS_SUCCESS;
+}
+
+VAStatus
+vlVaHandleVAEncSequenceParameterBufferTypeHEVC(vlVaDriver *drv, vlVaContext
*context, vlVaBuffer *buf)
+{
+ /* TODO */
+
+ return VA_STATUS_SUCCESS;
+}
+
+VAStatus
+vlVaHandleVAEncMiscParameterTypeRateControlHEVC(vlVaContext *context,
VAEncMiscParameterBuffer *misc)
+{
+ /* TODO */
+
+ return VA_STATUS_SUCCESS;
+}
+
+VAStatus
+vlVaHandleVAEncMiscParameterTypeFrameRateHEVC(vlVaContext *context,
VAEncMiscParameterBuffer *misc)
+{
+ /* TODO */
+
+ return VA_STATUS_SUCCESS;
+}
+
+void getEncParamPresetH265(vlVaContext *context)
+{
+ /* TODO */
+}
diff --git a/src/gallium/state_trackers/va/va_private.h
b/src/gallium/state_trackers/va/va_private.h
index 9b526ea..11b208c 100644
--- a/src/gallium/state_trackers/va/va_private.h
+++ b/src/gallium/state_trackers/va/va_private.h
@@ -428,10 +428,16 @@ void vlVaHandleIQMatrixBufferMJPEG(vlVaContext *context,
vlVaBuffer *buf);
void vlVaHandleHuffmanTableBufferType(vlVaContext *context, vlVaBuffer *buf);
void vlVaHandleSliceParameterBufferMJPEG(vlVaContext *context, vlVaBuffer
*buf);
void getEncParamPresetH264(vlVaContext *context);
+void getEncParamPresetH265(vlVaContext *context);
VAStatus vlVaHandleVAEncPictureParameterBufferTypeH264(vlVaDriver *drv,
vlVaContext *context, vlVaBuffer *buf);
VAStatus vlVaHandleVAEncSliceParameterBufferTypeH264(vlVaDriver *drv,
vlVaContext *context, vlVaBuffer *buf);
VAStatus vlVaHandleVAEncSequenceParameterBufferTypeH264(vlVaDriver *drv,
vlVaContext *context, vlVaBuffer *buf);
VAStatus vlVaHandleVAEncMiscParameterTypeRateControlH264(vlVaContext *context,
VAEncMiscParameterBuffer *buf);
VAStatus vlVaHandleVAEncMiscParameterTypeFrameRateH264(vlVaContext *context,
VAEncMiscParameterBuffer *buf);
+VAStatus vlVaHandleVAEncPictureParameterBufferTypeHEVC(vlVaDriver *drv,
vlVaContext *context, vlVaBuffer *buf);
+VAStatus vlVaHandleVAEncSliceParameterBufferTypeHEVC(vlVaDriver *drv,
vlVaContext *context, vlVaBuffer *buf);
+VAStatus vlVaHandleVAEncSequenceParameterBufferTypeHEVC(vlVaDriver *drv,
vlVaContext *context, vlVaBuffer *buf);
+VAStatus vlVaHandleVAEncMiscParameterTypeRateControlHEVC(vlVaContext *context,
VAEncMiscParameterBuffer *buf);
+VAStatus vlVaHandleVAEncMiscParameterTypeFrameRateHEVC(vlVaContext *context,
VAEncMiscParameterBuffer *buf);
#endif //VA_PRIVATE_H
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
