Mesa (master): st/va: add HEVC picture desc
Leo Liu
leoliu at kemper.freedesktop.org
Mon Feb 5 14:18:51 UTC 2018
Module: Mesa
Branch: master
Commit: ecc39443440dd1512b68d427b6b2ecd939a42173
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ecc39443440dd1512b68d427b6b2ecd939a42173
Author: Boyuan Zhang <boyuan.zhang at amd.com>
Date: Thu Jan 25 14:18:09 2018 -0500
st/va: add HEVC picture desc
Add HEVC picture desc, and add codec check when creating and destroying
context.
Signed-off-by: Boyuan Zhang <boyuan.zhang at amd.com>
Acked-by: Christian König <christian.koenig at amd.com>
---
src/gallium/state_trackers/va/context.c | 26 ++++++++++++++++++++++----
src/gallium/state_trackers/va/va_private.h | 1 +
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/gallium/state_trackers/va/context.c b/src/gallium/state_trackers/va/context.c
index 78e1f19ab7..f03b326ff1 100644
--- a/src/gallium/state_trackers/va/context.c
+++ b/src/gallium/state_trackers/va/context.c
@@ -284,8 +284,18 @@ vlVaCreateContext(VADriverContextP ctx, VAConfigID config_id, int picture_width,
context->desc.base.profile = config->profile;
context->desc.base.entry_point = config->entrypoint;
if (config->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) {
- context->desc.h264enc.rate_ctrl.rate_ctrl_method = config->rc;
- context->desc.h264enc.frame_idx = util_hash_table_create(handle_hash, handle_compare);
+ switch (u_reduce_video_profile(context->templat.profile)) {
+ case PIPE_VIDEO_FORMAT_MPEG4_AVC:
+ context->desc.h264enc.rate_ctrl.rate_ctrl_method = config->rc;
+ context->desc.h264enc.frame_idx = util_hash_table_create(handle_hash, handle_compare);
+ break;
+ case PIPE_VIDEO_FORMAT_HEVC:
+ context->desc.h265enc.rc.rate_ctrl_method = config->rc;
+ context->desc.h265enc.frame_idx = util_hash_table_create(handle_hash, handle_compare);
+ break;
+ default:
+ break;
+ }
}
mtx_lock(&drv->mutex);
@@ -314,8 +324,16 @@ vlVaDestroyContext(VADriverContextP ctx, VAContextID context_id)
if (context->decoder) {
if (context->desc.base.entry_point == PIPE_VIDEO_ENTRYPOINT_ENCODE) {
- if (context->desc.h264enc.frame_idx)
- util_hash_table_destroy (context->desc.h264enc.frame_idx);
+ if (u_reduce_video_profile(context->decoder->profile) ==
+ PIPE_VIDEO_FORMAT_MPEG4_AVC) {
+ if (context->desc.h264enc.frame_idx)
+ util_hash_table_destroy (context->desc.h264enc.frame_idx);
+ }
+ if (u_reduce_video_profile(context->decoder->profile) ==
+ PIPE_VIDEO_FORMAT_HEVC) {
+ if (context->desc.h265enc.frame_idx)
+ util_hash_table_destroy (context->desc.h265enc.frame_idx);
+ }
} else {
if (u_reduce_video_profile(context->decoder->profile) ==
PIPE_VIDEO_FORMAT_MPEG4_AVC) {
diff --git a/src/gallium/state_trackers/va/va_private.h b/src/gallium/state_trackers/va/va_private.h
index eef75c6bda..9b526ea68a 100644
--- a/src/gallium/state_trackers/va/va_private.h
+++ b/src/gallium/state_trackers/va/va_private.h
@@ -270,6 +270,7 @@ typedef struct {
struct pipe_h265_picture_desc h265;
struct pipe_mjpeg_picture_desc mjpeg;
struct pipe_h264_enc_picture_desc h264enc;
+ struct pipe_h265_enc_picture_desc h265enc;
} desc;
struct {
More information about the mesa-commit
mailing list