radeon/vce: cleanup cpb handling

v2: fix whitespace errors, minor coding style changes

Signed-off-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>

diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c
index 0d3fe0808672f781d26ad296aafaf32d5acc94b4..4b824f9ef10620db1aba34a9f160e23836b18e93 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vce.c
+++ b/src/gallium/drivers/radeon/radeon_vce.c
@@ -45,8 +45,6 @@
 #include "radeon_video.h"
 #include "radeon_vce.h"
 
-#define CPB_SIZE (40 * 1024 * 1024)
-
 /**
  * flush commands to the hardware
  */
@@ -213,6 +211,9 @@ struct pipe_video_codec *rvce_create_encoder(struct pipe_context *context,
 {
        struct r600_common_screen *rscreen = (struct r600_common_screen *)context->screen;
        struct rvce_encoder *enc;
+       struct pipe_video_buffer *tmp_buf, templat = {};
+       struct radeon_surface *tmp_surf;
+       unsigned pitch, vpitch;
 
        if (!rscreen->info.vce_fw_version) {
                RVID_ERR("Kernel doesn't supports VCE!\n");
@@ -246,8 +247,23 @@ struct pipe_video_codec *rvce_create_encoder(struct pipe_context *context,
        }
 
        enc->ws->cs_set_flush_callback(enc->cs, rvce_cs_flush, enc);
+       templat.buffer_format = PIPE_FORMAT_NV12;
+       templat.chroma_format = PIPE_VIDEO_CHROMA_FORMAT_420;
+       templat.width = enc->base.width;
+       templat.height = enc->base.height;
+       templat.interlaced = false;
+       if (!(tmp_buf = context->create_video_buffer(context, &templat))) {
+               RVID_ERR("Can't create video buffer.\n");
+               goto error;
+       }
 
-       if (!rvid_create_buffer(enc->ws, &enc->cpb, CPB_SIZE, RADEON_DOMAIN_VRAM)) {
+       get_buffer(((struct vl_video_buffer *)tmp_buf)->resources[0], NULL, &tmp_surf);
+       pitch = align(tmp_surf->level[0].pitch_bytes, 128);
+       vpitch = align(tmp_surf->npix_y, 16);
+       tmp_buf->destroy(tmp_buf);
+       if (!rvid_create_buffer(enc->ws, &enc->cpb,
+                       pitch * vpitch * 1.5 * (RVCE_NUM_CPB_FRAMES + RVCE_NUM_CPB_EXTRA_FRAMES),
+                       RADEON_DOMAIN_VRAM)) {
                RVID_ERR("Can't create CPB buffer.\n");
                goto error;
        }

diff --git a/src/gallium/drivers/radeon/radeon_vce.h b/src/gallium/drivers/radeon/radeon_vce.h
index 80495e5e8d70114437c311718e8ebe9d1db75133..9dc0c68eefb9109a40e4f6a3e281c038c8e54fa1 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vce.h
+++ b/src/gallium/drivers/radeon/radeon_vce.h
@@ -43,6 +43,9 @@
 #define RVCE_READWRITE(buf, domain) RVCE_CS(RVCE_RELOC(buf, RADEON_USAGE_READWRITE, domain) * 4)
 #define RVCE_END() *begin = (&enc->cs->buf[enc->cs->cdw] - begin) * 4; }
 
+#define RVCE_NUM_CPB_FRAMES 2
+#define RVCE_NUM_CPB_EXTRA_FRAMES 2
+
 struct r600_common_screen;
 
 /* driver dependent callback */

diff --git a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
index b0961a9cc293345afe4a5fd3d47b9ee7326a6a13..26c362961b8c0c2ec528f0d8db4f4a38ae0ff944 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
+++ b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
@@ -218,14 +218,22 @@ static void rdo(struct rvce_encoder *enc)
        RVCE_END();
 }
 
-static void encode(struct rvce_encoder *enc)
+static void frame_offset(struct rvce_encoder *enc, unsigned frame_num,
+                        unsigned *luma_offset, unsigned *chroma_offset)
 {
-       int i;
        unsigned pitch = align(enc->luma->level[0].pitch_bytes, 128);
        unsigned vpitch = align(enc->luma->npix_y, 16);
        unsigned fsize = pitch * (vpitch + vpitch / 2);
-       unsigned chroma_offset = pitch * vpitch;
-       unsigned luma_offset;
+       unsigned base_offset = RVCE_NUM_CPB_EXTRA_FRAMES * fsize;
+
+       *luma_offset = base_offset + (frame_num % RVCE_NUM_CPB_FRAMES) * fsize;
+       *chroma_offset = *luma_offset + pitch * vpitch;
+}
+
+static void encode(struct rvce_encoder *enc)
+{
+       int i;
+       unsigned luma_offset, chroma_offset;
 
        task_info(enc, 0x00000003);
 
@@ -282,7 +290,6 @@ static void encode(struct rvce_encoder *enc)
 
        RVCE_CS(0x00000000); // pictureStructure
 
-       luma_offset = (2 * ((enc->pic.frame_num - 1) % 2) * fsize + 2 * fsize); 
        if (enc->pic.picture_type == PIPE_H264_ENC_PICTURE_TYPE_IDR) { 
                RVCE_CS(0x00000000); // encPicType
                RVCE_CS(0x00000000); // frameNumber
@@ -291,11 +298,12 @@ static void encode(struct rvce_encoder *enc)
                RVCE_CS(0xffffffff); // chromaOffset
        }
        else if(enc->pic.picture_type == PIPE_H264_ENC_PICTURE_TYPE_P) {
+               frame_offset(enc, enc->pic.frame_num - 1, &luma_offset, &chroma_offset);
                RVCE_CS(0x00000000); // encPicType
                RVCE_CS(enc->pic.frame_num - 1); // frameNumber
                RVCE_CS(enc->pic.frame_num - 1); // pictureOrderCount
                RVCE_CS(luma_offset); // lumaOffset
-               RVCE_CS(chroma_offset + luma_offset); // chromaOffset
+               RVCE_CS(chroma_offset); // chromaOffset
        }
        for (i = 0; i < 2; ++i) {
                RVCE_CS(0x00000000); // pictureStructure
@@ -306,9 +314,9 @@ static void encode(struct rvce_encoder *enc)
                RVCE_CS(0xffffffff); // chromaOffset
        }
        
-       luma_offset = (2 * (enc->pic.frame_num % 2) * fsize + 2 * fsize);
+       frame_offset(enc, enc->pic.frame_num, &luma_offset, &chroma_offset);
        RVCE_CS(luma_offset); // encReconstructedLumaOffset
-       RVCE_CS(chroma_offset + luma_offset); // encReconstructedChromaOffset
+       RVCE_CS(chroma_offset); // encReconstructedChromaOffset
        RVCE_CS(0x00000000); // encColocBufferOffset
        RVCE_CS(0x00000000); // encReconstructedRefBasePictureLumaOffset
        RVCE_CS(0x00000000); // encReconstructedRefBasePictureChromaOffset