diff options
Diffstat (limited to 'src/gallium/drivers/nouveau')
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_video.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c index 5377872077c..0fdc3cefa1d 100644 --- a/src/gallium/drivers/nouveau/nouveau_video.c +++ b/src/gallium/drivers/nouveau/nouveau_video.c @@ -108,21 +108,10 @@ nouveau_vpe_mb_dct_blocks(struct nouveau_decoder *dec, const struct pipe_mpeg12_ short *db = mb->blocks; for (cbb = 0x20; cbb > 0; cbb >>= 1) { if (cbb & cbp) { - static const int lookup[64] = { - 0, 1, 8,16, 9, 2, 3,10, - 17,24,32,25,18,11, 4, 5, - 12,19,26,33,40,48,41,34, - 27,20,13, 6, 7,14,21,28, - 35,42,49,56,57,50,43,36, - 29,22,15,23,30,37,44,51, - 58,59,52,45,38,31,39,46, - 53,60,61,54,47,55,62,63 - }; - int i, j = 0, found = 0; + int i, found = 0; for (i = 0; i < 64; ++i) { - if (!db[lookup[i]]) { j += 2; continue; } - dec->data[dec->data_pos++] = (db[lookup[i]] << 16) | j; - j = 0; + if (!db[i]) continue; + dec->data[dec->data_pos++] = (db[i] << 16) | (i * 2); found = 1; } if (found) @@ -443,6 +432,11 @@ nouveau_decoder_decode_macroblock(struct pipe_video_decoder *decoder, dec->past = nouveau_decoder_surface_index(dec, desc->ref[0]); if (nouveau_vpe_init(dec)) return; + + /* initialize scan order */ + nouveau_vpe_write(dec, 0x720000c0); + nouveau_vpe_write(dec, dec->data_pos); + mb = (const struct pipe_mpeg12_macroblock *)pipe_mb; for (i = 0; i < num_macroblocks; ++i, mb++) { if (mb->macroblock_type & PIPE_MPEG12_MB_TYPE_INTRA) { @@ -528,6 +522,8 @@ nouveau_create_decoder(struct pipe_context *context, goto vl; if (screen->device->chipset >= 0x98 && screen->device->chipset != 0xa0) goto vl; + if (screen->device->chipset < 0x31 || screen->device->chipset == 0x35) + goto vl; dec = CALLOC_STRUCT(nouveau_decoder); if (!dec) @@ -793,7 +789,8 @@ nouveau_video_buffer_create(struct pipe_context *pipe, * and it only supports the NV12 format */ if (templat->buffer_format != PIPE_FORMAT_NV12 || getenv("XVMC_VL") || - (screen->device->chipset >= 0x98 && screen->device->chipset != 0xa0)) + (screen->device->chipset >= 0x98 && screen->device->chipset != 0xa0) || + screen->device->chipset < 0x31 || screen->device->chipset == 0x35) return vl_video_buffer_create(pipe, templat); assert(templat->chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420); |