Re: [Mesa-dev] [PATCH 06/13] radeon/vcn: add jpeg decode implementation
On 2018-08-16 01:19 PM, Leo Liu wrote:
On 08/16/2018 12:06 PM, boyuan.zh...@amd.com wrote:
From: Boyuan Zhang
Add a new file to handle VCN Jpeg decode specific functions. Use Jpeg
specific cmd sending function in end_frame call.
Signed-off-by: Boyuan Zhang
---
src/gallium/drivers/radeon/Makefile.sources | 1 +
src/gallium/drivers/radeon/meson.build | 1 +
src/gallium/drivers/radeon/radeon_vcn_dec.c | 32 ++--
src/gallium/drivers/radeon/radeon_vcn_dec.h | 4 +
src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c | 99
5 files changed, 130 insertions(+), 7 deletions(-)
create mode 100644 src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c
diff --git a/src/gallium/drivers/radeon/Makefile.sources
b/src/gallium/drivers/radeon/Makefile.sources
index f8ee860..e3ee82c 100644
--- a/src/gallium/drivers/radeon/Makefile.sources
+++ b/src/gallium/drivers/radeon/Makefile.sources
@@ -10,6 +10,7 @@ C_SOURCES := \
r600_texture.c \
radeon_uvd.c \
radeon_uvd.h \
+ radeon_vcn_dec_jpeg.c \
radeon_vcn_dec.c \
radeon_vcn_dec.h \
radeon_vcn_enc_1_2.c \
diff --git a/src/gallium/drivers/radeon/meson.build
b/src/gallium/drivers/radeon/meson.build
index 582a5ff..c984a75 100644
--- a/src/gallium/drivers/radeon/meson.build
+++ b/src/gallium/drivers/radeon/meson.build
@@ -33,6 +33,7 @@ files_libradeon = files(
'radeon_vcn_enc_1_2.c',
'radeon_vcn_enc.c',
'radeon_vcn_enc.h',
+ 'radeon_vcn_dec_jpeg.c',
'radeon_vcn_dec.c',
'radeon_vcn_dec.h',
'radeon_uvd_enc_1_1.c',
diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.c
b/src/gallium/drivers/radeon/radeon_vcn_dec.c
index 30a8952..861a40e 100644
--- a/src/gallium/drivers/radeon/radeon_vcn_dec.c
+++ b/src/gallium/drivers/radeon/radeon_vcn_dec.c
@@ -991,6 +991,10 @@ static unsigned calc_dpb_size(struct
radeon_decoder *dec)
dpb_size = MAX2(dpb_size, 30 * 1024 * 1024);
break;
+ case PIPE_VIDEO_FORMAT_JPEG:
+ dpb_size = 0;
+ break;
+
default:
// something is missing here
assert(0);
@@ -1078,6 +1082,7 @@ static void radeon_dec_decode_bitstream(struct
pipe_video_codec *decoder,
const unsigned *sizes)
{
struct radeon_decoder *dec = (struct radeon_decoder*)decoder;
+ enum pipe_video_format format =
u_reduce_video_profile(picture->profile);
unsigned i;
assert(decoder);
@@ -1089,6 +1094,9 @@ static void radeon_dec_decode_bitstream(struct
pipe_video_codec *decoder,
struct rvid_buffer *buf = >bs_buffers[dec->cur_buffer];
unsigned new_size = dec->bs_size + sizes[i];
+ if (format == PIPE_VIDEO_FORMAT_JPEG)
+ new_size += 2; /* save for EOI */
+
if (new_size > buf->res->buf->size) {
dec->ws->buffer_unmap(buf->res->buf);
if (!si_vid_resize_buffer(dec->screen, dec->cs, buf,
new_size)) {
@@ -1108,6 +1116,13 @@ static void radeon_dec_decode_bitstream(struct
pipe_video_codec *decoder,
dec->bs_size += sizes[i];
dec->bs_ptr += sizes[i];
}
+
+ if (format == PIPE_VIDEO_FORMAT_JPEG) {
+ ((uint8_t *)dec->bs_ptr)[0] = 0xff; /* EOI */
+ ((uint8_t *)dec->bs_ptr)[1] = 0xd9;
+ dec->bs_size += 2;
+ dec->bs_ptr += 2;
+ }
Can this also be moved to ST?
With handleVASliceDataBufferType() after
buffers[num_buffers] = buf->data;
sizes[num_buffers] = buf->size;
++num_buffers;
by increasing the buffers size to 3.
Regards,
Leo
Agree! This part should be moved to ST as well.
Please see the new patches #6 #7 #8 with this changes.
Regards,
Boyuan
}
/**
@@ -1270,14 +1285,14 @@ struct pipe_video_codec
*radeon_create_decoder(struct pipe_context *context,
}
dpb_size = calc_dpb_size(dec);
-
- if (!si_vid_create_buffer(dec->screen, >dpb, dpb_size,
PIPE_USAGE_DEFAULT)) {
- RVID_ERR("Can't allocated dpb.\n");
- goto error;
+ if (dpb_size) {
+ if (!si_vid_create_buffer(dec->screen, >dpb, dpb_size,
PIPE_USAGE_DEFAULT)) {
+ RVID_ERR("Can't allocated dpb.\n");
+ goto error;
+ }
+ si_vid_clear_buffer(context, >dpb);
}
- si_vid_clear_buffer(context, >dpb);
-
if (dec->stream_type == RDECODE_CODEC_H264_PERF) {
unsigned ctx_size = calc_ctx_size_h264_perf(dec);
if (!si_vid_create_buffer(dec->screen, >ctx, ctx_size,
PIPE_USAGE_DEFAULT)) {
@@ -1304,7 +1319,10 @@ struct pipe_video_codec
*radeon_create_decoder(struct pipe_context *context,
next_buffer(dec);
- dec->send_cmd = send_cmd_dec;
+ if (stream_type == RDECODE_CODEC_JPEG)
+ dec->send_cmd = send_cmd_jpeg;
+ else
+ dec->send_cmd = send_cmd_dec;
return >base;
diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.h
b/src/gallium/drivers/radeon/radeon_vcn_dec.h
index 05e4847..782eb65 100644
---
Re: [Mesa-dev] [PATCH 06/13] radeon/vcn: add jpeg decode implementation
On 08/16/2018 12:06 PM, boyuan.zh...@amd.com wrote:
From: Boyuan Zhang
Add a new file to handle VCN Jpeg decode specific functions. Use Jpeg
specific cmd sending function in end_frame call.
Signed-off-by: Boyuan Zhang
---
src/gallium/drivers/radeon/Makefile.sources | 1 +
src/gallium/drivers/radeon/meson.build | 1 +
src/gallium/drivers/radeon/radeon_vcn_dec.c | 32 ++--
src/gallium/drivers/radeon/radeon_vcn_dec.h | 4 +
src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c | 99
5 files changed, 130 insertions(+), 7 deletions(-)
create mode 100644 src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c
diff --git a/src/gallium/drivers/radeon/Makefile.sources
b/src/gallium/drivers/radeon/Makefile.sources
index f8ee860..e3ee82c 100644
--- a/src/gallium/drivers/radeon/Makefile.sources
+++ b/src/gallium/drivers/radeon/Makefile.sources
@@ -10,6 +10,7 @@ C_SOURCES := \
r600_texture.c \
radeon_uvd.c \
radeon_uvd.h \
+ radeon_vcn_dec_jpeg.c \
radeon_vcn_dec.c \
radeon_vcn_dec.h \
radeon_vcn_enc_1_2.c \
diff --git a/src/gallium/drivers/radeon/meson.build
b/src/gallium/drivers/radeon/meson.build
index 582a5ff..c984a75 100644
--- a/src/gallium/drivers/radeon/meson.build
+++ b/src/gallium/drivers/radeon/meson.build
@@ -33,6 +33,7 @@ files_libradeon = files(
'radeon_vcn_enc_1_2.c',
'radeon_vcn_enc.c',
'radeon_vcn_enc.h',
+ 'radeon_vcn_dec_jpeg.c',
'radeon_vcn_dec.c',
'radeon_vcn_dec.h',
'radeon_uvd_enc_1_1.c',
diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.c
b/src/gallium/drivers/radeon/radeon_vcn_dec.c
index 30a8952..861a40e 100644
--- a/src/gallium/drivers/radeon/radeon_vcn_dec.c
+++ b/src/gallium/drivers/radeon/radeon_vcn_dec.c
@@ -991,6 +991,10 @@ static unsigned calc_dpb_size(struct radeon_decoder *dec)
dpb_size = MAX2(dpb_size, 30 * 1024 * 1024);
break;
+ case PIPE_VIDEO_FORMAT_JPEG:
+ dpb_size = 0;
+ break;
+
default:
// something is missing here
assert(0);
@@ -1078,6 +1082,7 @@ static void radeon_dec_decode_bitstream(struct
pipe_video_codec *decoder,
const unsigned *sizes)
{
struct radeon_decoder *dec = (struct radeon_decoder*)decoder;
+ enum pipe_video_format format =
u_reduce_video_profile(picture->profile);
unsigned i;
assert(decoder);
@@ -1089,6 +1094,9 @@ static void radeon_dec_decode_bitstream(struct
pipe_video_codec *decoder,
struct rvid_buffer *buf = >bs_buffers[dec->cur_buffer];
unsigned new_size = dec->bs_size + sizes[i];
+ if (format == PIPE_VIDEO_FORMAT_JPEG)
+ new_size += 2; /* save for EOI */
+
if (new_size > buf->res->buf->size) {
dec->ws->buffer_unmap(buf->res->buf);
if (!si_vid_resize_buffer(dec->screen, dec->cs, buf,
new_size)) {
@@ -1108,6 +1116,13 @@ static void radeon_dec_decode_bitstream(struct
pipe_video_codec *decoder,
dec->bs_size += sizes[i];
dec->bs_ptr += sizes[i];
}
+
+ if (format == PIPE_VIDEO_FORMAT_JPEG) {
+ ((uint8_t *)dec->bs_ptr)[0] = 0xff; /* EOI */
+ ((uint8_t *)dec->bs_ptr)[1] = 0xd9;
+ dec->bs_size += 2;
+ dec->bs_ptr += 2;
+ }
Can this also be moved to ST?
With handleVASliceDataBufferType() after
buffers[num_buffers] = buf->data;
sizes[num_buffers] = buf->size;
++num_buffers;
by increasing the buffers size to 3.
Regards,
Leo
}
/**
@@ -1270,14 +1285,14 @@ struct pipe_video_codec *radeon_create_decoder(struct
pipe_context *context,
}
dpb_size = calc_dpb_size(dec);
-
- if (!si_vid_create_buffer(dec->screen, >dpb, dpb_size,
PIPE_USAGE_DEFAULT)) {
- RVID_ERR("Can't allocated dpb.\n");
- goto error;
+ if (dpb_size) {
+ if (!si_vid_create_buffer(dec->screen, >dpb, dpb_size,
PIPE_USAGE_DEFAULT)) {
+ RVID_ERR("Can't allocated dpb.\n");
+ goto error;
+ }
+ si_vid_clear_buffer(context, >dpb);
}
- si_vid_clear_buffer(context, >dpb);
-
if (dec->stream_type == RDECODE_CODEC_H264_PERF) {
unsigned ctx_size = calc_ctx_size_h264_perf(dec);
if (!si_vid_create_buffer(dec->screen, >ctx, ctx_size,
PIPE_USAGE_DEFAULT)) {
@@ -1304,7 +1319,10 @@ struct pipe_video_codec *radeon_create_decoder(struct
pipe_context *context,
next_buffer(dec);
- dec->send_cmd = send_cmd_dec;
+ if (stream_type == RDECODE_CODEC_JPEG)
+ dec->send_cmd = send_cmd_jpeg;
+ else
+ dec->send_cmd = send_cmd_dec;
return >base;
diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.h
