radeon/vce: remove RVCE_NUM_CPB_EXTRA_FRAMES

Doesn't seems to be needed any more.

Signed-off-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Christian König 2014-04-07 17:26:31 +02:00
parent ce57c8e925
commit ee4439c562
3 changed files with 2 additions and 4 deletions

View file

@ -262,7 +262,7 @@ struct pipe_video_codec *rvce_create_encoder(struct pipe_context *context,
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),
pitch * vpitch * 1.5 * RVCE_NUM_CPB_FRAMES,
RADEON_DOMAIN_VRAM)) {
RVID_ERR("Can't create CPB buffer.\n");
goto error;

View file

@ -44,7 +44,6 @@
#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;

View file

@ -224,9 +224,8 @@ static void frame_offset(struct rvce_encoder *enc, unsigned frame_num,
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 base_offset = RVCE_NUM_CPB_EXTRA_FRAMES * fsize;
*luma_offset = base_offset + (frame_num % RVCE_NUM_CPB_FRAMES) * fsize;
*luma_offset = (frame_num % RVCE_NUM_CPB_FRAMES) * fsize;
*chroma_offset = *luma_offset + pitch * vpitch;
}