Mesa (master): nvc0: use nvc0_m2mf_push_linear() to reduce code duplication
Module: Mesa
Branch: master
Commit: 126bd159409f61cb58e208dfc615c957d3d35a30
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=126bd159409f61cb58e208dfc615c957d3d35a30
Author: Samuel Pitoiset
Date: Tue Jul 26 00:46:47 2016 +0200
nvc0: use nvc0_m2mf_push_linear() to reduce code duplication
Signed-off-by: Samuel Pitoiset
Reviewed-by: Ilia Mirkin
---
src/gallium/drivers/nouveau/nvc0/nvc0_tex.c | 16 +++-
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
index 25a5a8e..40a9c93 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
@@ -474,7 +474,6 @@ nvc0_validate_tic(struct nvc0_context *nvc0, int s)
{
uint32_t commands[32];
struct nouveau_pushbuf *push = nvc0->base.pushbuf;
- struct nouveau_bo *txc = nvc0->screen->txc;
unsigned i;
unsigned n = 0;
bool need_flush = false;
@@ -495,18 +494,9 @@ nvc0_validate_tic(struct nvc0_context *nvc0, int s)
if (tic->id < 0) {
tic->id = nvc0_screen_tic_alloc(nvc0->screen, tic);
- PUSH_SPACE(push, 17);
- BEGIN_NVC0(push, NVC0_M2MF(OFFSET_OUT_HIGH), 2);
- PUSH_DATAh(push, txc->offset + (tic->id * 32));
- PUSH_DATA (push, txc->offset + (tic->id * 32));
- BEGIN_NVC0(push, NVC0_M2MF(LINE_LENGTH_IN), 2);
- PUSH_DATA (push, 32);
- PUSH_DATA (push, 1);
- BEGIN_NVC0(push, NVC0_M2MF(EXEC), 1);
- PUSH_DATA (push, 0x100111);
- BEGIN_NIC0(push, NVC0_M2MF(DATA), 8);
- PUSH_DATAp(push, &tic->tic[0], 8);
-
+ nvc0_m2mf_push_linear(&nvc0->base, nvc0->screen->txc, tic->id * 32,
+ NV_VRAM_DOMAIN(&nvc0->screen->base), 32,
+ tic->tic);
need_flush = true;
} else
if (res->status & NOUVEAU_BUFFER_STATUS_GPU_WRITING) {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): nvc0: use nve4_p2mf_push_linear() to reduce code duplication
Module: Mesa
Branch: master
Commit: c5236f0eccd5ce07cb18b751c6a48b2baf811aa0
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c5236f0eccd5ce07cb18b751c6a48b2baf811aa0
Author: Samuel Pitoiset
Date: Tue Jul 26 01:38:49 2016 +0200
nvc0: use nve4_p2mf_push_linear() to reduce code duplication
Signed-off-by: Samuel Pitoiset
Reviewed-by: Ilia Mirkin
---
src/gallium/drivers/nouveau/nvc0/nvc0_tex.c | 45 ++---
1 file changed, 9 insertions(+), 36 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
index 8abf1b5..25a5a8e 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
@@ -551,7 +551,6 @@ nvc0_validate_tic(struct nvc0_context *nvc0, int s)
static bool
nve4_validate_tic(struct nvc0_context *nvc0, unsigned s)
{
- struct nouveau_bo *txc = nvc0->screen->txc;
struct nouveau_pushbuf *push = nvc0->base.pushbuf;
unsigned i;
bool need_flush = false;
@@ -571,17 +570,9 @@ nve4_validate_tic(struct nvc0_context *nvc0, unsigned s)
if (tic->id < 0) {
tic->id = nvc0_screen_tic_alloc(nvc0->screen, tic);
- PUSH_SPACE(push, 16);
- BEGIN_NVC0(push, NVE4_P2MF(UPLOAD_DST_ADDRESS_HIGH), 2);
- PUSH_DATAh(push, txc->offset + (tic->id * 32));
- PUSH_DATA (push, txc->offset + (tic->id * 32));
- BEGIN_NVC0(push, NVE4_P2MF(UPLOAD_LINE_LENGTH_IN), 2);
- PUSH_DATA (push, 32);
- PUSH_DATA (push, 1);
- BEGIN_1IC0(push, NVE4_P2MF(UPLOAD_EXEC), 9);
- PUSH_DATA (push, 0x1001);
- PUSH_DATAp(push, &tic->tic[0], 8);
-
+ nve4_p2mf_push_linear(&nvc0->base, nvc0->screen->txc, tic->id * 32,
+ NV_VRAM_DOMAIN(&nvc0->screen->base), 32,
+ tic->tic);
need_flush = true;
} else
if (res->status & NOUVEAU_BUFFER_STATUS_GPU_WRITING) {
@@ -685,8 +676,6 @@ nvc0_validate_tsc(struct nvc0_context *nvc0, int s)
bool
nve4_validate_tsc(struct nvc0_context *nvc0, int s)
{
- struct nouveau_bo *txc = nvc0->screen->txc;
- struct nouveau_pushbuf *push = nvc0->base.pushbuf;
unsigned i;
bool need_flush = false;
@@ -700,17 +689,10 @@ nve4_validate_tsc(struct nvc0_context *nvc0, int s)
if (tsc->id < 0) {
tsc->id = nvc0_screen_tsc_alloc(nvc0->screen, tsc);
- PUSH_SPACE(push, 16);
- BEGIN_NVC0(push, NVE4_P2MF(UPLOAD_DST_ADDRESS_HIGH), 2);
- PUSH_DATAh(push, txc->offset + 65536 + (tsc->id * 32));
- PUSH_DATA (push, txc->offset + 65536 + (tsc->id * 32));
- BEGIN_NVC0(push, NVE4_P2MF(UPLOAD_LINE_LENGTH_IN), 2);
- PUSH_DATA (push, 32);
- PUSH_DATA (push, 1);
- BEGIN_1IC0(push, NVE4_P2MF(UPLOAD_EXEC), 9);
- PUSH_DATA (push, 0x1001);
- PUSH_DATAp(push, &tsc->tsc[0], 8);
-
+ nve4_p2mf_push_linear(&nvc0->base, nvc0->screen->txc,
+ 65536 + tsc->id * 32,
+ NV_VRAM_DOMAIN(&nvc0->screen->base),
+ 32, tsc->tsc);
need_flush = true;
}
nvc0->screen->tsc.lock[tsc->id / 32] |= 1 << (tsc->id % 32);
@@ -1142,7 +1124,6 @@ gm107_validate_surfaces(struct nvc0_context *nvc0,
struct nv04_resource *res = nv04_resource(view->resource);
struct nouveau_pushbuf *push = nvc0->base.pushbuf;
struct nvc0_screen *screen = nvc0->screen;
- struct nouveau_bo *txc = nvc0->screen->txc;
struct nv50_tic_entry *tic;
tic = nv50_tic_entry(nvc0->images_tic[stage][slot]);
@@ -1154,16 +1135,8 @@ gm107_validate_surfaces(struct nvc0_context *nvc0,
tic->id = nvc0_screen_tic_alloc(nvc0->screen, tic);
/* upload the texture view */
- PUSH_SPACE(push, 16);
- BEGIN_NVC0(push, NVE4_P2MF(UPLOAD_DST_ADDRESS_HIGH), 2);
- PUSH_DATAh(push, txc->offset + (tic->id * 32));
- PUSH_DATA (push, txc->offset + (tic->id * 32));
- BEGIN_NVC0(push, NVE4_P2MF(UPLOAD_LINE_LENGTH_IN), 2);
- PUSH_DATA (push, 32);
- PUSH_DATA (push, 1);
- BEGIN_1IC0(push, NVE4_P2MF(UPLOAD_EXEC), 9);
- PUSH_DATA (push, 0x1001);
- PUSH_DATAp(push, &tic->tic[0], 8);
+ nve4_p2mf_push_linear(&nvc0->base, nvc0->screen->txc, tic->id * 32,
+NV_VRAM_DOMAIN(&nvc0->screen->base), 32, tic->tic);
BEGIN_NVC0(push, NVC0_3D(TIC_FLUSH), 1);
PUSH_DATA (push, 0);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): build: Remove unused AX_CHECK_COMPILE_FLAG macro
Module: Mesa
Branch: master
Commit: 0420666ac01280f77b38caf7bba5ab92e6418793
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0420666ac01280f77b38caf7bba5ab92e6418793
Author: Andreas Boll
Date: Wed Jul 20 10:37:45 2016 +0200
build: Remove unused AX_CHECK_COMPILE_FLAG macro
Unused since 1a6ae840413d7fb6d2e83f6a83081d5246c7ac9e
Signed-off-by: Andreas Boll
Reviewed-by: Eric Engestrom
Reviewed-by: Emil Velikov
---
m4/ax_check_compile_flag.m4 | 72 -
1 file changed, 72 deletions(-)
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
deleted file mode 100644
index c3a8d69..000
--- a/m4/ax_check_compile_flag.m4
+++ /dev/null
@@ -1,72 +0,0 @@
-# ===
-# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===
-#
-# SYNOPSIS
-#
-# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE],
[EXTRA-FLAGS])
-#
-# DESCRIPTION
-#
-# Check whether the given FLAG works with the current language's compiler
-# or gives an error. (Warnings, however, are ignored)
-#
-# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-# success/failure.
-#
-# If EXTRA-FLAGS is defined, it is added to the current language's default
-# flags (e.g. CFLAGS) when the check is done. The check is thus made with
-# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
-# force the compiler to issue an error when a bad flag is given.
-#
-# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-# Copyright (c) 2008 Guido U. Draheim
-# Copyright (c) 2011 Maarten Bosmans
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see
Mesa (master): main: memcpy larger chunks in _mesa_propagate_uniforms_to_driver_storage
Module: Mesa
Branch: master
Commit: a354c389f524c2aa0fa64ac8b7e3d93c2cea4b81
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a354c389f524c2aa0fa64ac8b7e3d93c2cea4b81
Author: Nils Wallménius
Date: Fri Jul 22 13:10:03 2016 +0200
main: memcpy larger chunks in _mesa_propagate_uniforms_to_driver_storage
When possible, do the memcpy on larger blocks. This reduces cycles
spent in _mesa_propagate_uniforms_to_driver_storage from
1.51 % to 0.62% according to perf during the Unigine Heaven benchmark.
It did not affect the framerate of the benchmark. The system used for
testing was an i5 6600K with a Radeon R9 380.
Piglit hangs randomly on this system both with and without the patch
so i could not make a comparison.
v2: fixed whitespace
Signed-off-by: Nils Wallménius
Reviewed-by: Nicolai Hähnle
---
src/mesa/main/uniform_query.cpp | 29 +++--
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index ab22a0e..b9b9ff2 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -578,14 +578,31 @@ _mesa_propagate_uniforms_to_driver_storage(struct
gl_uniform_storage *uni,
unsigned j;
unsigned v;
-for (j = 0; j < count; j++) {
- for (v = 0; v < vectors; v++) {
- memcpy(dst, src, src_vector_byte_stride);
- src += src_vector_byte_stride;
- dst += store->vector_stride;
+if (src_vector_byte_stride == store->vector_stride) {
+ if (extra_stride) {
+ for (j = 0; j < count; j++) {
+ memcpy(dst, src, src_vector_byte_stride * vectors);
+ src += src_vector_byte_stride * vectors;
+ dst += store->vector_stride * vectors;
+
+ dst += extra_stride;
+ }
+ } else {
+ /* Unigine Heaven benchmark gets here */
+ memcpy(dst, src, src_vector_byte_stride * vectors * count);
+ src += src_vector_byte_stride * vectors * count;
+ dst += store->vector_stride * vectors * count;
}
+} else {
+ for (j = 0; j < count; j++) {
+ for (v = 0; v < vectors; v++) {
+ memcpy(dst, src, src_vector_byte_stride);
+ src += src_vector_byte_stride;
+ dst += store->vector_stride;
+ }
- dst += extra_stride;
+ dst += extra_stride;
+ }
}
break;
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): st/va: add conversion for yv12 to nv12in putimage v2
Module: Mesa
Branch: master
Commit: 34f46348438b29e20d06cca312616cfba8ee05f6
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=34f46348438b29e20d06cca312616cfba8ee05f6
Author: Boyuan Zhang
Date: Thu Jul 21 19:40:16 2016 -0400
st/va: add conversion for yv12 to nv12in putimage v2
For putimage call, if image format is yv12 (or IYUV with U V field swap) and
surface format is nv12, then we need to convert yv12 to nv12 and then copy
the converted data from image to surface. We can't use the existing logic
where surface is destroyed and re-created with yv12 format.
v2 (chk): fix some compiler warnings and commit message
Signed-off-by: Boyuan Zhang
Signed-off-by: Christian König
---
src/gallium/state_trackers/va/image.c | 34 +++---
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/gallium/state_trackers/va/image.c
b/src/gallium/state_trackers/va/image.c
index 36b2469..bd60d3e 100644
--- a/src/gallium/state_trackers/va/image.c
+++ b/src/gallium/state_trackers/va/image.c
@@ -471,7 +471,9 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface,
VAImageID image,
return VA_STATUS_ERROR_OPERATION_FAILED;
}
- if (format != surf->buffer->buffer_format) {
+ if ((format != surf->buffer->buffer_format) &&
+ ((format != PIPE_FORMAT_YV12) || (surf->buffer->buffer_format !=
PIPE_FORMAT_NV12)) &&
+ ((format != PIPE_FORMAT_IYUV) || (surf->buffer->buffer_format !=
PIPE_FORMAT_NV12))) {
struct pipe_video_buffer *tmp_buf;
struct pipe_video_buffer templat = surf->templat;
@@ -513,12 +515,30 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface,
VAImageID image,
unsigned width, height;
if (!views[i]) continue;
vlVaVideoSurfaceSize(surf, i, &width, &height);
- for (j = 0; j < views[i]->texture->array_size; ++j) {
- struct pipe_box dst_box = {0, 0, j, width, height, 1};
- drv->pipe->texture_subdata(drv->pipe, views[i]->texture, 0,
-PIPE_TRANSFER_WRITE, &dst_box,
-data[i] + pitches[i] * j,
-pitches[i] *
views[i]->texture->array_size, 0);
+ if (((format == PIPE_FORMAT_YV12) || (format == PIPE_FORMAT_IYUV)) &&
+(surf->buffer->buffer_format == PIPE_FORMAT_NV12)) {
+ struct pipe_transfer *transfer = NULL;
+ uint8_t *map = NULL;
+ struct pipe_box dst_box_1 = {0, 0, 0, width, height, 1};
+ map = drv->pipe->transfer_map(drv->pipe,
+ views[i]->texture,
+ 0,
+ PIPE_TRANSFER_DISCARD_RANGE,
+ &dst_box_1, &transfer);
+ if (map == NULL)
+return VA_STATUS_ERROR_OPERATION_FAILED;
+
+ u_copy_yv12_img_to_nv12_surf ((ubyte * const*)data, map, width,
height,
+ pitches[i], transfer->stride, i);
+ pipe_transfer_unmap(drv->pipe, transfer);
+ } else {
+ for (j = 0; j < views[i]->texture->array_size; ++j) {
+struct pipe_box dst_box = {0, 0, j, width, height, 1};
+drv->pipe->texture_subdata(drv->pipe, views[i]->texture, 0,
+ PIPE_TRANSFER_WRITE, &dst_box,
+ data[i] + pitches[i] * j,
+ pitches[i] *
views[i]->texture->array_size, 0);
+ }
}
}
pipe_mutex_unlock(drv->mutex);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): st/va: enable h264 VAAPI encode
Module: Mesa
Branch: master
Commit: dd208ea006c3c66bf64f21ecc1eaffdc0e57db5e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd208ea006c3c66bf64f21ecc1eaffdc0e57db5e
Author: Boyuan Zhang
Date: Thu Jul 21 19:40:22 2016 -0400
st/va: enable h264 VAAPI encode
Enable H.264 VAAPI encoding through config. Currently only H.264 baseline is
supported. Encode entrypoint is not accepted by driver.
Signed-off-by: Boyuan Zhang
---
src/gallium/state_trackers/va/config.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/gallium/state_trackers/va/config.c
b/src/gallium/state_trackers/va/config.c
index 889ce38..84bf913 100644
--- a/src/gallium/state_trackers/va/config.c
+++ b/src/gallium/state_trackers/va/config.c
@@ -94,11 +94,9 @@ vlVaQueryConfigEntrypoints(VADriverContextP ctx, VAProfile
profile,
PIPE_VIDEO_CAP_SUPPORTED))
entrypoint_list[(*num_entrypoints)++] = VAEntrypointVLD;
-#if 0
if (pscreen->get_video_param(pscreen, p, PIPE_VIDEO_ENTRYPOINT_ENCODE,
PIPE_VIDEO_CAP_SUPPORTED))
entrypoint_list[(*num_entrypoints)++] = VAEntrypointEncSlice;
-#endif
if (num_entrypoints == 0)
return VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
@@ -122,7 +120,7 @@ vlVaGetConfigAttributes(VADriverContextP ctx, VAProfile
profile, VAEntrypoint en
value = VA_RT_FORMAT_YUV420;
break;
case VAConfigAttribRateControl:
- value = VA_RC_NONE;
+ value = VA_RC_CQP | VA_RC_CBR;
break;
default:
value = VA_ATTRIB_NOT_SUPPORTED;
@@ -183,7 +181,6 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile,
VAEntrypoint entrypoin
config->entrypoint = PIPE_VIDEO_ENTRYPOINT_BITSTREAM;
break;
-#if 0
case VAEntrypointEncSlice:
if (!pscreen->get_video_param(pscreen, p, PIPE_VIDEO_ENTRYPOINT_ENCODE,
PIPE_VIDEO_CAP_SUPPORTED)) {
@@ -193,7 +190,6 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile,
VAEntrypoint entrypoin
config->entrypoint = PIPE_VIDEO_ENTRYPOINT_ENCODE;
break;
-#endif
default:
FREE(config);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): vl/util: add copy func for yv12image to nv12surface v2
Module: Mesa
Branch: master
Commit: 23b4ab1738f0f4470449c848b37b43568df4a60c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=23b4ab1738f0f4470449c848b37b43568df4a60c
Author: Boyuan Zhang
Date: Thu Jul 21 19:40:15 2016 -0400
vl/util: add copy func for yv12image to nv12surface v2
Add function to copy from yv12 image to nv12 surface for VAAPI putimage call.
We need this function in VaPutImage call where copying from yv12 image to nv12
surface for encoding. Existing function can't be used because it only work for
copying from yv12 surface to nv12 image in Vaapi.
v2: cleanup variable types and commit message
Signed-off-by: Boyuan Zhang
Signed-off-by: Christian König
---
src/gallium/auxiliary/util/u_video.h | 37
1 file changed, 37 insertions(+)
diff --git a/src/gallium/auxiliary/util/u_video.h
b/src/gallium/auxiliary/util/u_video.h
index 9196afc..7e743de 100644
--- a/src/gallium/auxiliary/util/u_video.h
+++ b/src/gallium/auxiliary/util/u_video.h
@@ -130,6 +130,43 @@ u_copy_yv12_to_nv12(void *const *destination_data,
}
static inline void
+u_copy_yv12_img_to_nv12_surf(ubyte *const *src,
+ ubyte *dst,
+ unsigned width,
+ unsigned height,
+ unsigned src_stride,
+ unsigned dst_stride,
+ int field)
+{
+ if (field == 0) {
+ ubyte *src_0 = src[field];
+ for (int i = 0; i < height ; i++) {
+ memcpy(dst, src_0, width);
+ dst += dst_stride;
+ src_0 += src_stride;
+ }
+ } else if (field == 1) {
+ const ubyte *src_1 = src[field];
+ const ubyte *src_2 = src[field+1];
+ bool odd = false;
+ for (unsigned i = 0; i < height ; i++) {
+ for (unsigned j = 0; j < width*2 ; j++) {
+if (odd == false) {
+ dst[j] = src_1[j/2];
+ odd = true;
+} else {
+ dst[j] = src_2[j/2];
+ odd = false;
+}
+ }
+ dst += dst_stride;
+ src_1 += src_stride;
+ src_2 += src_stride;
+ }
+ }
+}
+
+static inline void
u_copy_swap422_packed(void *const *destination_data,
uint32_t const *destination_pitches,
int src_plane, int src_field,
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): st/va: add functions for VAAPI encode
Module: Mesa
Branch: master
Commit: 85d807f2e04eb4f096fa619bc61c65cdcef446c8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=85d807f2e04eb4f096fa619bc61c65cdcef446c8
Author: Boyuan Zhang
Date: Thu Jul 21 19:40:18 2016 -0400
st/va: add functions for VAAPI encode
Add necessary functions/changes for VAAPI encoding to buffer and picture. These
changes will allow driver to handle all Vaapi encode related operations. This
patch doesn't change the Vaapi decode behaviour.
Signed-off-by: Boyuan Zhang
---
src/gallium/state_trackers/va/buffer.c | 6 +
src/gallium/state_trackers/va/picture.c| 172 -
src/gallium/state_trackers/va/va_private.h | 2 +
3 files changed, 178 insertions(+), 2 deletions(-)
diff --git a/src/gallium/state_trackers/va/buffer.c
b/src/gallium/state_trackers/va/buffer.c
index 7d3167b..dfcebbe 100644
--- a/src/gallium/state_trackers/va/buffer.c
+++ b/src/gallium/state_trackers/va/buffer.c
@@ -133,6 +133,12 @@ vlVaMapBuffer(VADriverContextP ctx, VABufferID buf_id,
void **pbuff)
if (!buf->derived_surface.transfer || !*pbuff)
return VA_STATUS_ERROR_INVALID_BUFFER;
+ if (buf->type == VAEncCodedBufferType) {
+ ((VACodedBufferSegment*)buf->data)->buf = *pbuff;
+ ((VACodedBufferSegment*)buf->data)->size = buf->coded_size;
+ ((VACodedBufferSegment*)buf->data)->next = NULL;
+ *pbuff = buf->data;
+ }
} else {
pipe_mutex_unlock(drv->mutex);
*pbuff = buf->data;
diff --git a/src/gallium/state_trackers/va/picture.c
b/src/gallium/state_trackers/va/picture.c
index 89ac024..4bb60f2 100644
--- a/src/gallium/state_trackers/va/picture.c
+++ b/src/gallium/state_trackers/va/picture.c
@@ -78,7 +78,8 @@ vlVaBeginPicture(VADriverContextP ctx, VAContextID
context_id, VASurfaceID rende
return VA_STATUS_SUCCESS;
}
- context->decoder->begin_frame(context->decoder, context->target,
&context->desc.base);
+ if (context->decoder->entrypoint != PIPE_VIDEO_ENTRYPOINT_ENCODE)
+ context->decoder->begin_frame(context->decoder, context->target,
&context->desc.base);
return VA_STATUS_SUCCESS;
}
@@ -278,6 +279,142 @@ handleVASliceDataBufferType(vlVaContext *context,
vlVaBuffer *buf)
num_buffers, (const void * const*)buffers, sizes);
}
+static VAStatus
+handleVAEncMiscParameterTypeRateControl(vlVaContext *context,
VAEncMiscParameterBuffer *misc)
+{
+ VAEncMiscParameterRateControl *rc = (VAEncMiscParameterRateControl
*)misc->data;
+ if (context->desc.h264enc.rate_ctrl.rate_ctrl_method ==
+ PIPE_H264_ENC_RATE_CONTROL_METHOD_CONSTANT)
+ context->desc.h264enc.rate_ctrl.target_bitrate = rc->bits_per_second;
+ else
+ context->desc.h264enc.rate_ctrl.target_bitrate = rc->bits_per_second *
rc->target_percentage;
+ context->desc.h264enc.rate_ctrl.peak_bitrate = rc->bits_per_second;
+ if (context->desc.h264enc.rate_ctrl.target_bitrate < 200)
+ context->desc.h264enc.rate_ctrl.vbv_buffer_size =
MIN2((context->desc.h264enc.rate_ctrl.target_bitrate * 2.75), 200);
+ else
+ context->desc.h264enc.rate_ctrl.vbv_buffer_size =
context->desc.h264enc.rate_ctrl.target_bitrate;
+ context->desc.h264enc.rate_ctrl.target_bits_picture =
+ context->desc.h264enc.rate_ctrl.target_bitrate /
context->desc.h264enc.rate_ctrl.frame_rate_num;
+ context->desc.h264enc.rate_ctrl.peak_bits_picture_integer =
+ context->desc.h264enc.rate_ctrl.peak_bitrate /
context->desc.h264enc.rate_ctrl.frame_rate_num;
+ context->desc.h264enc.rate_ctrl.peak_bits_picture_fraction = 0;
+
+ return VA_STATUS_SUCCESS;
+}
+
+static VAStatus
+handleVAEncSequenceParameterBufferType(vlVaDriver *drv, vlVaContext *context,
vlVaBuffer *buf)
+{
+ VAEncSequenceParameterBufferH264 *h264 = (VAEncSequenceParameterBufferH264
*)buf->data;
+ if (!context->decoder) {
+ context->templat.max_references = h264->max_num_ref_frames;
+ context->templat.level = h264->level_idc;
+ context->decoder = drv->pipe->create_video_codec(drv->pipe,
&context->templat);
+ if (!context->decoder)
+ return VA_STATUS_ERROR_ALLOCATION_FAILED;
+ }
+ context->desc.h264enc.gop_size = h264->intra_idr_period;
+ context->desc.h264enc.rate_ctrl.frame_rate_num = h264->time_scale / 2;
+ context->desc.h264enc.rate_ctrl.frame_rate_den = 1;
+ return VA_STATUS_SUCCESS;
+}
+
+static VAStatus
+handleVAEncMiscParameterBufferType(vlVaContext *context, vlVaBuffer *buf)
+{
+ VAStatus vaStatus = VA_STATUS_SUCCESS;
+ VAEncMiscParameterBuffer *misc;
+ misc = buf->data;
+
+ switch (misc->type) {
+ case VAEncMiscParameterTypeRateControl:
+ vaStatus = handleVAEncMiscParameterTypeRateControl(context, misc);
+ break;
+
+ default:
+ break;
+ }
+
+ return vaStatus;
+}
+
+static VAStatus
+handleVAEncPictureParameterBufferType(vlVaDriver *drv, vlVaContext *context,
vlVaBuffer *buf)
+{
+ VAEncPictureParameterBufferH264 *h264;
+ vlV
Mesa (master): st/va: add function to handle misc param type frame rate
Module: Mesa
Branch: master
Commit: 71da1354d7ce836af5081b109e1487b32348f7f4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=71da1354d7ce836af5081b109e1487b32348f7f4
Author: Boyuan Zhang
Date: Thu Jul 21 19:40:21 2016 -0400
st/va: add function to handle misc param type frame rate
Frame rate can be passed to driver either through
VAEncSequenceParameterBufferType or VAEncMiscParameterTypeFrameRate. Previous
code only implement the former one, which is used by Gstreamer-Vaapi. Now
adding implementation for VAEncMiscParameterTypeFrameRate. Also adding default
frame rate as 30 just in case application never provides frame rate information
to driver.
Signed-off-by: Boyuan Zhang
---
src/gallium/state_trackers/va/picture.c | 24 +++-
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/gallium/state_trackers/va/picture.c
b/src/gallium/state_trackers/va/picture.c
index 4abf155..b187452 100644
--- a/src/gallium/state_trackers/va/picture.c
+++ b/src/gallium/state_trackers/va/picture.c
@@ -117,6 +117,13 @@ getEncParamPreset(vlVaContext *context)
context->desc.h264enc.rate_ctrl.fill_data_enable = 1;
context->desc.h264enc.rate_ctrl.enforce_hrd = 1;
context->desc.h264enc.enable_vui = false;
+ if (context->desc.h264enc.rate_ctrl.frame_rate_num == 0)
+ context->desc.h264enc.rate_ctrl.frame_rate_num = 30;
+ context->desc.h264enc.rate_ctrl.target_bits_picture =
+ context->desc.h264enc.rate_ctrl.target_bitrate /
context->desc.h264enc.rate_ctrl.frame_rate_num;
+ context->desc.h264enc.rate_ctrl.peak_bits_picture_integer =
+ context->desc.h264enc.rate_ctrl.peak_bitrate /
context->desc.h264enc.rate_ctrl.frame_rate_num;
+ context->desc.h264enc.rate_ctrl.peak_bits_picture_fraction = 0;
context->desc.h264enc.ref_pic_mode = 0x0201;
}
@@ -319,16 +326,19 @@ handleVAEncMiscParameterTypeRateControl(vlVaContext
*context, VAEncMiscParameter
context->desc.h264enc.rate_ctrl.vbv_buffer_size =
MIN2((context->desc.h264enc.rate_ctrl.target_bitrate * 2.75), 200);
else
context->desc.h264enc.rate_ctrl.vbv_buffer_size =
context->desc.h264enc.rate_ctrl.target_bitrate;
- context->desc.h264enc.rate_ctrl.target_bits_picture =
- context->desc.h264enc.rate_ctrl.target_bitrate /
context->desc.h264enc.rate_ctrl.frame_rate_num;
- context->desc.h264enc.rate_ctrl.peak_bits_picture_integer =
- context->desc.h264enc.rate_ctrl.peak_bitrate /
context->desc.h264enc.rate_ctrl.frame_rate_num;
- context->desc.h264enc.rate_ctrl.peak_bits_picture_fraction = 0;
return VA_STATUS_SUCCESS;
}
static VAStatus
+handleVAEncMiscParameterTypeFrameRate(vlVaContext *context,
VAEncMiscParameterBuffer *misc)
+{
+ VAEncMiscParameterFrameRate *fr = (VAEncMiscParameterFrameRate *)misc->data;
+ context->desc.h264enc.rate_ctrl.frame_rate_num = fr->framerate;
+ return VA_STATUS_SUCCESS;
+}
+
+static VAStatus
handleVAEncSequenceParameterBufferType(vlVaDriver *drv, vlVaContext *context,
vlVaBuffer *buf)
{
VAEncSequenceParameterBufferH264 *h264 = (VAEncSequenceParameterBufferH264
*)buf->data;
@@ -357,6 +367,10 @@ handleVAEncMiscParameterBufferType(vlVaContext *context,
vlVaBuffer *buf)
vaStatus = handleVAEncMiscParameterTypeRateControl(context, misc);
break;
+ case VAEncMiscParameterTypeFrameRate:
+ vaStatus = handleVAEncMiscParameterTypeFrameRate(context, misc);
+ break;
+
default:
break;
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): st/va: get rate control method from configattrib v2
Module: Mesa
Branch: master
Commit: 10c1cc47a6adba9ea83d4df5c154c07f95ac3a40
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=10c1cc47a6adba9ea83d4df5c154c07f95ac3a40
Author: Boyuan Zhang
Date: Thu Jul 21 19:40:17 2016 -0400
st/va: get rate control method from configattrib v2
Rate control method is passed from app to driver through config attrib list.
That is why we need to store this rate control method to config. And later
on, we will pass this value to context->desc.h264enc.rate_ctrl.rate_ctrl_method.
v2 (chk): fix broken build and commit message
Signed-off-by: Boyuan Zhang
Signed-off-by: Christian König
---
src/gallium/state_trackers/va/config.c | 11 +++
src/gallium/state_trackers/va/context.c| 2 ++
src/gallium/state_trackers/va/va_private.h | 2 ++
3 files changed, 15 insertions(+)
diff --git a/src/gallium/state_trackers/va/config.c
b/src/gallium/state_trackers/va/config.c
index 7742087..889ce38 100644
--- a/src/gallium/state_trackers/va/config.c
+++ b/src/gallium/state_trackers/va/config.c
@@ -202,6 +202,17 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile,
VAEntrypoint entrypoin
config->profile = p;
+ for (int i = 0; i rc = PIPE_H264_ENC_RATE_CONTROL_METHOD_CONSTANT;
+ else if (attrib_list[i].value == VA_RC_VBR)
+config->rc = PIPE_H264_ENC_RATE_CONTROL_METHOD_VARIABLE;
+ else
+config->rc = PIPE_H264_ENC_RATE_CONTROL_METHOD_DISABLE;
+ }
+ }
+
pipe_mutex_lock(drv->mutex);
*config_id = handle_table_add(drv->htab, config);
pipe_mutex_unlock(drv->mutex);
diff --git a/src/gallium/state_trackers/va/context.c
b/src/gallium/state_trackers/va/context.c
index 8882cba..65ba7db 100644
--- a/src/gallium/state_trackers/va/context.c
+++ b/src/gallium/state_trackers/va/context.c
@@ -276,6 +276,8 @@ 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;
pipe_mutex_lock(drv->mutex);
*context_id = handle_table_add(drv->htab, context);
diff --git a/src/gallium/state_trackers/va/va_private.h
b/src/gallium/state_trackers/va/va_private.h
index 520db46..1addd87 100644
--- a/src/gallium/state_trackers/va/va_private.h
+++ b/src/gallium/state_trackers/va/va_private.h
@@ -229,6 +229,7 @@ typedef struct {
struct pipe_vc1_picture_desc vc1;
struct pipe_h264_picture_desc h264;
struct pipe_h265_picture_desc h265;
+ struct pipe_h264_enc_picture_desc h264enc;
} desc;
struct {
@@ -246,6 +247,7 @@ typedef struct {
typedef struct {
enum pipe_video_profile profile;
enum pipe_video_entrypoint entrypoint;
+ enum pipe_h264_enc_rate_control_method rc;
} vlVaConfig;
typedef struct {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): st/va: add preset values for VAAPI encode
Module: Mesa
Branch: master
Commit: b0ceb4cc4862f3d751973e230569c97e0119aa19
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b0ceb4cc4862f3d751973e230569c97e0119aa19
Author: Boyuan Zhang
Date: Thu Jul 21 19:40:19 2016 -0400
st/va: add preset values for VAAPI encode
Add some hardcoded values hardware needs mainly for rate control purpose. With
previously hardcoded values for OMX, the rate control result is not correct.
This change fixed the rate control result by setting correct values for Vaapi.
Signed-off-by: Boyuan Zhang
---
src/gallium/state_trackers/va/picture.c | 27 +++
1 file changed, 27 insertions(+)
diff --git a/src/gallium/state_trackers/va/picture.c
b/src/gallium/state_trackers/va/picture.c
index 4bb60f2..4abf155 100644
--- a/src/gallium/state_trackers/va/picture.c
+++ b/src/gallium/state_trackers/va/picture.c
@@ -95,6 +95,32 @@ vlVaGetReferenceFrame(vlVaDriver *drv, VASurfaceID
surface_id,
*ref_frame = NULL;
}
+static void
+getEncParamPreset(vlVaContext *context)
+{
+ //motion estimation preset
+ context->desc.h264enc.motion_est.motion_est_quarter_pixel = 0x0001;
+ context->desc.h264enc.motion_est.lsmvert = 0x0002;
+ context->desc.h264enc.motion_est.enc_disable_sub_mode = 0x0078;
+ context->desc.h264enc.motion_est.enc_en_ime_overw_dis_subm = 0x0001;
+ context->desc.h264enc.motion_est.enc_ime_overw_dis_subm_no = 0x0001;
+ context->desc.h264enc.motion_est.enc_ime2_search_range_x = 0x0004;
+ context->desc.h264enc.motion_est.enc_ime2_search_range_y = 0x0004;
+
+ //pic control preset
+ context->desc.h264enc.pic_ctrl.enc_cabac_enable = 0x0001;
+ context->desc.h264enc.pic_ctrl.enc_constraint_set_flags = 0x0040;
+
+ //rate control
+ context->desc.h264enc.rate_ctrl.vbv_buffer_size = 2000;
+ context->desc.h264enc.rate_ctrl.vbv_buf_lv = 48;
+ context->desc.h264enc.rate_ctrl.fill_data_enable = 1;
+ context->desc.h264enc.rate_ctrl.enforce_hrd = 1;
+ context->desc.h264enc.enable_vui = false;
+
+ context->desc.h264enc.ref_pic_mode = 0x0201;
+}
+
static VAStatus
handlePictureParameterBuffer(vlVaDriver *drv, vlVaContext *context, vlVaBuffer
*buf)
{
@@ -524,6 +550,7 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id)
if (context->decoder->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) {
coded_buf = context->coded_buf;
+ getEncParamPreset(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);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): st/va: add enviromental variable to disable interlace
Module: Mesa
Branch: master
Commit: 10dec2de2d9f568675d66d736b48701fa26f7b50
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=10dec2de2d9f568675d66d736b48701fa26f7b50
Author: Boyuan Zhang
Date: Thu Jul 21 19:40:20 2016 -0400
st/va: add enviromental variable to disable interlace
Add environmental variable to disable interlace mode. At VAAPI decoding stage,
driver can not distinguish b/w pure decoding case and transcoding case. And
since interlace encoding is not supported, we have to disable interlace for
transcoding case. The temporary solution is to use enviromental variable to
disable interlace mode.
Signed-off-by: Boyuan Zhang
---
src/gallium/state_trackers/va/surface.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/gallium/state_trackers/va/surface.c
b/src/gallium/state_trackers/va/surface.c
index 8ce4143..63727b6 100644
--- a/src/gallium/state_trackers/va/surface.c
+++ b/src/gallium/state_trackers/va/surface.c
@@ -43,6 +43,8 @@
#include "va_private.h"
+DEBUG_GET_ONCE_BOOL_OPTION(nointerlace, "VAAPI_DISABLE_INTERLACE", FALSE);
+
#include
static const enum pipe_format vpp_surface_formats[] = {
@@ -620,6 +622,8 @@ vlVaCreateSurfaces2(VADriverContextP ctx, unsigned int
format,
templat.width = width;
templat.height = height;
+ if (debug_get_option_nointerlace())
+ templat.interlaced = false;
memset(surfaces, VA_INVALID_ID, num_surfaces * sizeof(VASurfaceID));
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): st/va: add encode entrypoint v2
Module: Mesa
Branch: master
Commit: 5bcaa1b9e9707aea7be73b406345bb9e46f92a18
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5bcaa1b9e9707aea7be73b406345bb9e46f92a18
Author: Boyuan Zhang
Date: Thu Jul 21 19:40:14 2016 -0400
st/va: add encode entrypoint v2
VAAPI passes PIPE_VIDEO_ENTRYPOINT_ENCODE as entry point for encoding case. We
will save this encode entry point in config. config_id was used as profile
previously. Now, config has both profile and entrypoint field, and config_id is
used to get the config object. Later on, we pass this entrypoint to
context->templat.entrypoint instead of always hardcoded to
PIPE_VIDEO_ENTRYPOINT_BITSTREAM for decoding case previously. Encode entrypoint
is not accepted by driver until we enable Vaapi encode in later patch.
v2 (chk): fix commit message to match 80 chars, use switch instead of ifs,
fix memory leaks in the error path, implement
vlVaQueryConfigEntrypoints
as well, drop VAEntrypointEncPicture (only used for JPEG).
Signed-off-by: Boyuan Zhang
Signed-off-by: Christian König
---
src/gallium/state_trackers/va/config.c | 111 +
src/gallium/state_trackers/va/context.c| 59 ---
src/gallium/state_trackers/va/surface.c| 14 +++-
src/gallium/state_trackers/va/va_private.h | 5 ++
4 files changed, 150 insertions(+), 39 deletions(-)
diff --git a/src/gallium/state_trackers/va/config.c
b/src/gallium/state_trackers/va/config.c
index 9ca0aa8..7742087 100644
--- a/src/gallium/state_trackers/va/config.c
+++ b/src/gallium/state_trackers/va/config.c
@@ -34,6 +34,8 @@
#include "va_private.h"
+#include "util/u_handle_table.h"
+
DEBUG_GET_ONCE_BOOL_OPTION(mpeg4, "VAAPI_MPEG4_ENABLED", false)
VAStatus
@@ -88,10 +90,18 @@ vlVaQueryConfigEntrypoints(VADriverContextP ctx, VAProfile
profile,
return VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
pscreen = VL_VA_PSCREEN(ctx);
- if (!pscreen->get_video_param(pscreen, p, PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
PIPE_VIDEO_CAP_SUPPORTED))
- return VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
+ if (pscreen->get_video_param(pscreen, p, PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
+ PIPE_VIDEO_CAP_SUPPORTED))
+ entrypoint_list[(*num_entrypoints)++] = VAEntrypointVLD;
- entrypoint_list[(*num_entrypoints)++] = VAEntrypointVLD;
+#if 0
+ if (pscreen->get_video_param(pscreen, p, PIPE_VIDEO_ENTRYPOINT_ENCODE,
+ PIPE_VIDEO_CAP_SUPPORTED))
+ entrypoint_list[(*num_entrypoints)++] = VAEntrypointEncSlice;
+#endif
+
+ if (num_entrypoints == 0)
+ return VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
return VA_STATUS_SUCCESS;
}
@@ -128,29 +138,73 @@ VAStatus
vlVaCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint
entrypoint,
VAConfigAttrib *attrib_list, int num_attribs, VAConfigID
*config_id)
{
+ vlVaDriver *drv;
+ vlVaConfig *config;
struct pipe_screen *pscreen;
enum pipe_video_profile p;
if (!ctx)
return VA_STATUS_ERROR_INVALID_CONTEXT;
+ drv = VL_VA_DRIVER(ctx);
+
+ if (!drv)
+ return VA_STATUS_ERROR_INVALID_CONTEXT;
+
+ config = CALLOC(1, sizeof(vlVaConfig));
+ if (!config)
+ return VA_STATUS_ERROR_ALLOCATION_FAILED;
+
if (profile == VAProfileNone && entrypoint == VAEntrypointVideoProc) {
- *config_id = PIPE_VIDEO_PROFILE_UNKNOWN;
+ config->entrypoint = VAEntrypointVideoProc;
+ config->profile = PIPE_VIDEO_PROFILE_UNKNOWN;
+ pipe_mutex_lock(drv->mutex);
+ *config_id = handle_table_add(drv->htab, config);
+ pipe_mutex_unlock(drv->mutex);
return VA_STATUS_SUCCESS;
}
p = ProfileToPipe(profile);
- if (p == PIPE_VIDEO_PROFILE_UNKNOWN)
+ if (p == PIPE_VIDEO_PROFILE_UNKNOWN) {
+ FREE(config);
return VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
+ }
pscreen = VL_VA_PSCREEN(ctx);
- if (!pscreen->get_video_param(pscreen, p, PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
PIPE_VIDEO_CAP_SUPPORTED))
- return VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
- if (entrypoint != VAEntrypointVLD)
+ switch (entrypoint) {
+ case VAEntrypointVLD:
+ if (!pscreen->get_video_param(pscreen, p,
PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
+ PIPE_VIDEO_CAP_SUPPORTED)) {
+ FREE(config);
+ return VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
+ }
+
+ config->entrypoint = PIPE_VIDEO_ENTRYPOINT_BITSTREAM;
+ break;
+
+#if 0
+ case VAEntrypointEncSlice:
+ if (!pscreen->get_video_param(pscreen, p, PIPE_VIDEO_ENTRYPOINT_ENCODE,
+ PIPE_VIDEO_CAP_SUPPORTED)) {
+ FREE(config);
+ return VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
+ }
+
+ config->entrypoint = PIPE_VIDEO_ENTRYPOINT_ENCODE;
+ break;
+#endif
+
+ default:
+ FREE(config);
return VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT;
+ }
- *config_id = p;
+ config->profile = p;
+
+ pipe_mutex_lock(drv->
