fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-21 15:28:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

xvmc: futher optimize ycbcr upload

Browse source
This commit is contained in:
Christian König 2011-04-25 10:33:48 +02:00
parent 7f04fe5338
commit 7cde6722b0
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/state_trackers/xorg/xvmc/surface.c
View file

@ -150,12 +150,15 @@ UploadYcbcrBlocks(XvMCSurfacePrivate *surface,
enum pipe_mpeg12_dct_intra intra;
enum pipe_mpeg12_dct_type coding;
unsigned tb, x, y;
unsigned tb, x, y, luma_blocks;
short *blocks;
assert(surface);
assert(xvmc_mb);
if (!xvmc_mb->coded_block_pattern)
return;
intra = xvmc_mb->macroblock_type & XVMC_MB_TYPE_INTRA ?
PIPE_MPEG12_DCT_INTRA : PIPE_MPEG12_DCT_DELTA;
@ -164,7 +167,7 @@ UploadYcbcrBlocks(XvMCSurfacePrivate *surface,
blocks = xvmc_blocks->blocks + xvmc_mb->index * BLOCK_SIZE_SAMPLES;
for (y = 0; y < 2; ++y) {
for (y = 0, luma_blocks = 0; y < 2; ++y) {
for (x = 0; x < 2; ++x, ++tb) {
if (xvmc_mb->coded_block_pattern & const_empty_block_mask_420[0][y][x]) {
@ -174,16 +177,20 @@ UploadYcbcrBlocks(XvMCSurfacePrivate *surface,
stream->intra = intra;
stream->coding = coding;
memcpy(surface->ycbcr[0].buffer, blocks, BLOCK_SIZE_BYTES);
surface->ycbcr[0].num_blocks_added++;
surface->ycbcr[0].stream++;
surface->ycbcr[0].buffer += BLOCK_SIZE_SAMPLES;
blocks += BLOCK_SIZE_SAMPLES;
luma_blocks++;
}
}
}
if (luma_blocks > 0) {
memcpy(surface->ycbcr[0].buffer, blocks, BLOCK_SIZE_BYTES * luma_blocks);
surface->ycbcr[0].buffer += BLOCK_SIZE_SAMPLES * luma_blocks;
blocks += BLOCK_SIZE_SAMPLES * luma_blocks;
}
/* TODO: Implement 422, 444 */
//assert(ctx->base.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420);
@ -224,7 +231,8 @@ MacroBlocksToPipe(XvMCSurfacePrivate *surface,
unsigned mv_pos = xvmc_mb->x + surface->mv_stride * xvmc_mb->y;
unsigned mv_weights[2];
UploadYcbcrBlocks(surface, xvmc_mb, xvmc_blocks);
if (xvmc_mb->macroblock_type & (XVMC_MB_TYPE_PATTERN | XVMC_MB_TYPE_INTRA))
UploadYcbcrBlocks(surface, xvmc_mb, xvmc_blocks);
MacroBlockTypeToPipeWeights(xvmc_mb, mv_weights);