[10/12] st/va: add HEVC encode functions

Submitted by Zhang, Boyuan on Jan. 25, 2018, 10:46 p.m.

Details

Message ID 1516920410-2867-10-git-send-email-boyuan.zhang@amd.com
State New
Headers show
Series "Series without cover letter" ( rev: 2 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Zhang, Boyuan Jan. 25, 2018, 10:46 p.m.
From: Boyuan Zhang <boyuan.zhang@amd.com>

Add a separate file for HEVC encode functions.

Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com>
---
 src/gallium/state_trackers/va/Makefile.sources   |  1 +
 src/gallium/state_trackers/va/picture.c          | 56 +++++++++++++++++--
 src/gallium/state_trackers/va/picture_hevc_enc.c | 69 ++++++++++++++++++++++++
 src/gallium/state_trackers/va/va_private.h       |  5 ++
 4 files changed, 128 insertions(+), 3 deletions(-)
 create mode 100644 src/gallium/state_trackers/va/picture_hevc_enc.c

Patch hide | download patch | download mbox

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/picture.c b/src/gallium/state_trackers/va/picture.c
index 537e931..e26996c 100644
--- a/src/gallium/state_trackers/va/picture.c
+++ b/src/gallium/state_trackers/va/picture.c
@@ -139,6 +139,31 @@  getEncParamPreset(vlVaContext *context)
    context->desc.h264enc.ref_pic_mode = 0x00000201;
 }
 
+static void
+getEncParamPresetH265(vlVaContext *context)
+{
+   //rate control
+   context->desc.h265enc.rc.vbv_buffer_size = 20000000;
+   context->desc.h265enc.rc.vbv_buf_lv = 48;
+   context->desc.h265enc.rc.fill_data_enable = 1;
+   context->desc.h265enc.rc.enforce_hrd = 1;
+   if (context->desc.h265enc.rc.frame_rate_num == 0 ||
+         context->desc.h265enc.rc.frame_rate_den == 0) {
+      context->desc.h265enc.rc.frame_rate_num = 30;
+      context->desc.h265enc.rc.frame_rate_den = 1;
+   }
+   context->desc.h265enc.rc.target_bits_picture =
+      context->desc.h265enc.rc.target_bitrate *
+      ((float)context->desc.h265enc.rc.frame_rate_den /
+       context->desc.h265enc.rc.frame_rate_num);
+   context->desc.h265enc.rc.peak_bits_picture_integer =
+      context->desc.h265enc.rc.peak_bitrate *
+      ((float)context->desc.h265enc.rc.frame_rate_den /
+       context->desc.h265enc.rc.frame_rate_num);
+
+   context->desc.h265enc.rc.peak_bits_picture_fraction = 0;
+}
+
 static VAStatus
 handlePictureParameterBuffer(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf)
 {
@@ -356,6 +381,10 @@  handleVAEncMiscParameterTypeRateControl(vlVaContext *context, VAEncMiscParameter
       status = vlVaHandleVAEncMiscParameterTypeRateControlH264(context, misc);
       break;
 
+   case PIPE_VIDEO_FORMAT_HEVC:
+      status = vlVaHandleVAEncMiscParameterTypeRateControlHEVC(context, misc);
+      break;
+
    default:
       break;
    }
@@ -373,6 +402,10 @@  handleVAEncMiscParameterTypeFrameRate(vlVaContext *context, VAEncMiscParameterBu
       status = vlVaHandleVAEncMiscParameterTypeFrameRateH264(context, misc);
       break;
 
+   case PIPE_VIDEO_FORMAT_HEVC:
+      status = vlVaHandleVAEncMiscParameterTypeFrameRateHEVC(context, misc);
+      break;
+
    default:
       break;
    }
@@ -390,6 +423,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;
    }
@@ -430,6 +467,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;
    }
@@ -447,6 +488,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;
    }
@@ -640,8 +685,11 @@  vlVaEndPicture(VADriverContextP ctx, VAContextID context_id)
 
    if (context->decoder->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) {
       coded_buf = context->coded_buf;
-      getEncParamPreset(context);
-      context->desc.h264enc.frame_num_cnt++;
+      if (u_reduce_video_profile(context->templat.profile) == PIPE_VIDEO_FORMAT_MPEG4_AVC) {
+         getEncParamPreset(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);
@@ -670,7 +718,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..144bb8c
--- /dev/null
+++ b/src/gallium/state_trackers/va/picture_hevc_enc.c
@@ -0,0 +1,69 @@ 
+/**************************************************************************
+ *
+ * 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 "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;
+}
diff --git a/src/gallium/state_trackers/va/va_private.h b/src/gallium/state_trackers/va/va_private.h
index c022feb..2cef16b 100644
--- a/src/gallium/state_trackers/va/va_private.h
+++ b/src/gallium/state_trackers/va/va_private.h
@@ -432,5 +432,10 @@  VAStatus vlVaHandleVAEncSliceParameterBufferTypeH264(vlVaDriver *drv, vlVaContex
 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