#define SCALE_FACTOR_SNORM (32768.0f / 256.0f)
#define SCALE_FACTOR_SSCALED (1.0f / 256.0f)
-static const unsigned const_empty_block_mask_420[3][2][2] = {
- { { 0x20, 0x10 }, { 0x08, 0x04 } },
- { { 0x02, 0x02 }, { 0x02, 0x02 } },
- { { 0x01, 0x01 }, { 0x01, 0x01 } }
+static const enum pipe_format const_zscan_source_formats[] = {
+ PIPE_FORMAT_R16_SNORM,
+ PIPE_FORMAT_R16_SSCALED
};
+static const unsigned num_zscan_source_formats =
+ sizeof(const_zscan_source_formats) / sizeof(enum pipe_format);
+
static const enum pipe_format const_idct_source_formats[] = {
PIPE_FORMAT_R16G16B16A16_SNORM,
PIPE_FORMAT_R16G16B16A16_SSCALED
static const unsigned num_mc_source_formats =
sizeof(const_mc_source_formats) / sizeof(enum pipe_format);
-static void
-map_buffers(struct vl_mpeg12_decoder *ctx, struct vl_mpeg12_buffer *buffer)
+static bool
+init_zscan_buffer(struct vl_mpeg12_buffer *buffer)
{
- struct pipe_sampler_view **sampler_views;
- struct pipe_resource *tex;
+ enum pipe_format formats[3];
+
+ struct pipe_sampler_view **source;
+ struct pipe_surface **destination;
+
+ struct vl_mpeg12_decoder *dec;
+
unsigned i;
- assert(ctx && buffer);
+ assert(buffer);
- if (ctx->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
- sampler_views = buffer->idct_source->get_sampler_views(buffer->idct_source);
+ dec = (struct vl_mpeg12_decoder*)buffer->base.decoder;
+
+ formats[0] = formats[1] = formats[2] = dec->zscan_source_format;
+ buffer->zscan_source = vl_video_buffer_init(dec->base.context, dec->pipe,
+ dec->blocks_per_line * BLOCK_WIDTH * BLOCK_HEIGHT,
+ dec->max_blocks / dec->blocks_per_line,
+ 1, PIPE_VIDEO_CHROMA_FORMAT_444,
+ formats, PIPE_USAGE_STATIC);
+ if (!buffer->zscan_source)
+ goto error_source;
+
+ source = buffer->zscan_source->get_sampler_view_planes(buffer->zscan_source);
+ if (!source)
+ goto error_sampler;
+
+ if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
+ destination = dec->idct_source->get_surfaces(dec->idct_source);
else
- sampler_views = buffer->mc_source->get_sampler_views(buffer->mc_source);
- assert(sampler_views);
+ destination = dec->mc_source->get_surfaces(dec->mc_source);
- for (i = 0; i < VL_MAX_PLANES; ++i) {
- tex = sampler_views[i]->texture;
+ if (!destination)
+ goto error_surface;
- struct pipe_box rect =
- {
- 0, 0, 0,
- tex->width0,
- tex->height0,
- 1
- };
+ for (i = 0; i < VL_MAX_PLANES; ++i)
+ if (!vl_zscan_init_buffer(i == 0 ? &dec->zscan_y : &dec->zscan_c,
+ &buffer->zscan[i], source[i], destination[i]))
+ goto error_plane;
- buffer->tex_transfer[i] = ctx->pipe->get_transfer
- (
- ctx->pipe, tex,
- 0, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
- &rect
- );
+ return true;
- buffer->texels[i] = ctx->pipe->transfer_map(ctx->pipe, buffer->tex_transfer[i]);
- }
+error_plane:
+ for (; i > 0; --i)
+ vl_zscan_cleanup_buffer(&buffer->zscan[i - 1]);
+
+error_surface:
+error_sampler:
+ buffer->zscan_source->destroy(buffer->zscan_source);
+
+error_source:
+ return false;
}
static void
-upload_block(struct vl_mpeg12_buffer *buffer, unsigned plane,
- unsigned x, unsigned y, short *block,
- bool intra, enum pipe_mpeg12_dct_type type)
+cleanup_zscan_buffer(struct vl_mpeg12_buffer *buffer)
{
- unsigned tex_pitch;
- short *texels;
-
unsigned i;
assert(buffer);
- assert(block);
-
- vl_vb_add_ycbcr(&buffer->vertex_stream, plane, x, y, intra, type);
-
- tex_pitch = buffer->tex_transfer[plane]->stride / sizeof(short);
- texels = buffer->texels[plane] + y * tex_pitch * BLOCK_HEIGHT + x * BLOCK_WIDTH;
- for (i = 0; i < BLOCK_HEIGHT; ++i)
- memcpy(texels + i * tex_pitch, block + i * BLOCK_WIDTH, BLOCK_WIDTH * sizeof(short));
+ for (i = 0; i < VL_MAX_PLANES; ++i)
+ vl_zscan_cleanup_buffer(&buffer->zscan[i]);
+ buffer->zscan_source->destroy(buffer->zscan_source);
}
-static void
-upload_buffer(struct vl_mpeg12_decoder *ctx,
- struct vl_mpeg12_buffer *buffer,
- struct pipe_mpeg12_macroblock *mb)
+static bool
+init_idct_buffer(struct vl_mpeg12_buffer *buffer)
{
- short *blocks;
- unsigned tb, x, y;
+ struct pipe_sampler_view **idct_source_sv, **mc_source_sv;
+ struct pipe_surface **idct_surfaces;
+
+ struct vl_mpeg12_decoder *dec;
+
+ unsigned i;
- assert(ctx);
assert(buffer);
- assert(mb);
- blocks = mb->blocks;
+ dec = (struct vl_mpeg12_decoder*)buffer->base.decoder;
- for (y = 0; y < 2; ++y) {
- for (x = 0; x < 2; ++x, ++tb) {
- if (mb->cbp & (*ctx->empty_block_mask)[0][y][x]) {
- upload_block(buffer, 0, mb->mbx * 2 + x, mb->mby * 2 + y, blocks,
- mb->dct_intra, mb->dct_type);
- blocks += BLOCK_WIDTH * BLOCK_HEIGHT;
- }
- }
- }
+ idct_source_sv = dec->idct_source->get_sampler_view_planes(dec->idct_source);
+ if (!idct_source_sv)
+ goto error_source_sv;
- /* TODO: Implement 422, 444 */
- assert(ctx->base.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420);
+ mc_source_sv = dec->mc_source->get_sampler_view_planes(dec->mc_source);
+ if (!mc_source_sv)
+ goto error_mc_source_sv;
- for (tb = 1; tb < 3; ++tb) {
- if (mb->cbp & (*ctx->empty_block_mask)[tb][0][0]) {
- upload_block(buffer, tb, mb->mbx, mb->mby, blocks,
- mb->dct_intra, mb->dct_type);
- blocks += BLOCK_WIDTH * BLOCK_HEIGHT;
- }
- }
-}
+ idct_surfaces = dec->mc_source->get_surfaces(dec->mc_source);
+ if (!idct_surfaces)
+ goto error_surfaces;
-static void
-unmap_buffers(struct vl_mpeg12_decoder *ctx, struct vl_mpeg12_buffer *buffer)
-{
- unsigned i;
+ for (i = 0; i < 3; ++i)
+ if (!vl_idct_init_buffer(i == 0 ? &dec->idct_y : &dec->idct_c,
+ &buffer->idct[i], idct_source_sv[i],
+ mc_source_sv[i], idct_surfaces[i]))
+ goto error_plane;
+
+ return true;
- assert(ctx && buffer);
+error_plane:
+ for (; i > 0; --i)
+ vl_idct_cleanup_buffer(i == 1 ? &dec->idct_c : &dec->idct_y, &buffer->idct[i - 1]);
- for (i = 0; i < VL_MAX_PLANES; ++i) {
- ctx->pipe->transfer_unmap(ctx->pipe, buffer->tex_transfer[i]);
- ctx->pipe->transfer_destroy(ctx->pipe, buffer->tex_transfer[i]);
- }
+error_surfaces:
+error_mc_source_sv:
+error_source_sv:
+ return false;
}
static void
dec = (struct vl_mpeg12_decoder*)buf->base.decoder;
assert(dec);
- buf->idct_source->destroy(buf->idct_source);
- buf->idct_intermediate->destroy(buf->idct_intermediate);
vl_idct_cleanup_buffer(&dec->idct_y, &buf->idct[0]);
vl_idct_cleanup_buffer(&dec->idct_c, &buf->idct[1]);
vl_idct_cleanup_buffer(&dec->idct_c, &buf->idct[2]);
}
+static bool
+init_mc_buffer(struct vl_mpeg12_buffer *buf)
+{
+ struct vl_mpeg12_decoder *dec;
+
+ assert(buf);
+
+ dec = (struct vl_mpeg12_decoder*)buf->base.decoder;
+ assert(dec);
+
+ if(!vl_mc_init_buffer(&dec->mc_y, &buf->mc[0]))
+ goto error_mc_y;
+
+ if(!vl_mc_init_buffer(&dec->mc_c, &buf->mc[1]))
+ goto error_mc_cb;
+
+ if(!vl_mc_init_buffer(&dec->mc_c, &buf->mc[2]))
+ goto error_mc_cr;
+
+ return true;
+
+error_mc_cr:
+ vl_mc_cleanup_buffer(&buf->mc[1]);
+
+error_mc_cb:
+ vl_mc_cleanup_buffer(&buf->mc[0]);
+
+error_mc_y:
+ return false;
+}
+
+static void
+cleanup_mc_buffer(struct vl_mpeg12_buffer *buf)
+{
+ unsigned i;
+
+ assert(buf);
+
+ for (i = 0; i < VL_MAX_PLANES; ++i)
+ vl_mc_cleanup_buffer(&buf->mc[i]);
+}
+
static void
vl_mpeg12_buffer_destroy(struct pipe_video_decode_buffer *buffer)
{
struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
struct vl_mpeg12_decoder *dec;
- unsigned i;
assert(buf);
dec = (struct vl_mpeg12_decoder*)buf->base.decoder;
assert(dec);
+ cleanup_zscan_buffer(buf);
+
if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
cleanup_idct_buffer(buf);
- buf->mc_source->destroy(buf->mc_source);
+ cleanup_mc_buffer(buf);
+
vl_vb_cleanup(&buf->vertex_stream);
- for (i = 0; i < VL_MAX_PLANES; ++i)
- vl_mc_cleanup_buffer(&buf->mc[i]);
FREE(buf);
}
{
struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
struct vl_mpeg12_decoder *dec;
+
+ struct pipe_sampler_view **sampler_views;
+ unsigned i;
+
assert(buf);
dec = (struct vl_mpeg12_decoder *)buf->base.decoder;
assert(dec);
vl_vb_map(&buf->vertex_stream, dec->pipe);
- map_buffers(dec, buf);
+
+ sampler_views = buf->zscan_source->get_sampler_view_planes(buf->zscan_source);
+
+ assert(sampler_views);
+
+ for (i = 0; i < VL_MAX_PLANES; ++i) {
+ struct pipe_resource *tex = sampler_views[i]->texture;
+ struct pipe_box rect =
+ {
+ 0, 0, 0,
+ tex->width0,
+ tex->height0,
+ 1
+ };
+
+ buf->tex_transfer[i] = dec->pipe->get_transfer
+ (
+ dec->pipe, tex,
+ 0, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ &rect
+ );
+
+ buf->texels[i] = dec->pipe->transfer_map(dec->pipe, buf->tex_transfer[i]);
+ }
+
+ if (dec->base.entrypoint == PIPE_VIDEO_ENTRYPOINT_BITSTREAM) {
+ struct pipe_ycbcr_block *ycbcr_stream[VL_MAX_PLANES];
+ struct pipe_motionvector *mv_stream[VL_MAX_REF_FRAMES];
+
+ for (i = 0; i < VL_MAX_PLANES; ++i)
+ ycbcr_stream[i] = vl_vb_get_ycbcr_stream(&buf->vertex_stream, i);
+
+ for (i = 0; i < VL_MAX_REF_FRAMES; ++i)
+ mv_stream[i] = vl_vb_get_mv_stream(&buf->vertex_stream, i);
+
+ vl_mpg12_bs_set_buffers(&buf->bs, ycbcr_stream, buf->texels, mv_stream);
+ } else {
+ for (i = 0; i < VL_MAX_PLANES; ++i)
+ vl_zscan_set_layout(&buf->zscan[i], dec->zscan_linear);
+ }
+}
+
+static struct pipe_ycbcr_block *
+vl_mpeg12_buffer_get_ycbcr_stream(struct pipe_video_decode_buffer *buffer, int component)
+{
+ struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
+
+ assert(buf);
+
+ return vl_vb_get_ycbcr_stream(&buf->vertex_stream, component);
+}
+
+static short *
+vl_mpeg12_buffer_get_ycbcr_buffer(struct pipe_video_decode_buffer *buffer, int component)
+{
+ struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
+
+ assert(buf);
+ assert(component < VL_MAX_PLANES);
+
+ return buf->texels[component];
+}
+
+static unsigned
+vl_mpeg12_buffer_get_mv_stream_stride(struct pipe_video_decode_buffer *buffer)
+{
+ struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
+
+ assert(buf);
+
+ return vl_vb_get_mv_stream_stride(&buf->vertex_stream);
+}
+
+static struct pipe_motionvector *
+vl_mpeg12_buffer_get_mv_stream(struct pipe_video_decode_buffer *buffer, int ref_frame)
+{
+ struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
+
+ assert(buf);
+
+ return vl_vb_get_mv_stream(&buf->vertex_stream, ref_frame);
}
static void
-vl_mpeg12_buffer_add_macroblocks(struct pipe_video_decode_buffer *buffer,
- unsigned num_macroblocks,
- struct pipe_macroblock *macroblocks)
+vl_mpeg12_buffer_decode_bitstream(struct pipe_video_decode_buffer *buffer,
+ unsigned num_bytes, const void *data,
+ struct pipe_mpeg12_picture_desc *picture,
+ unsigned num_ycbcr_blocks[3])
{
- struct pipe_mpeg12_macroblock *mb = (struct pipe_mpeg12_macroblock*)macroblocks;
struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
struct vl_mpeg12_decoder *dec;
unsigned i;
assert(buf);
- dec = (struct vl_mpeg12_decoder*)buf->base.decoder;
+ dec = (struct vl_mpeg12_decoder *)buf->base.decoder;
assert(dec);
- assert(num_macroblocks);
- assert(macroblocks);
- assert(macroblocks->codec == PIPE_VIDEO_CODEC_MPEG12);
+ for (i = 0; i < VL_MAX_PLANES; ++i)
+ vl_zscan_set_layout(&buf->zscan[i], picture->alternate_scan ? dec->zscan_alternate : dec->zscan_normal);
- for ( i = 0; i < num_macroblocks; ++i ) {
- vl_vb_add_block(&buf->vertex_stream, &mb[i]);
- upload_buffer(dec, buf, &mb[i]);
- }
+ vl_mpg12_bs_decode(&buf->bs, num_bytes, data, picture, num_ycbcr_blocks);
}
static void
{
struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
struct vl_mpeg12_decoder *dec;
+ unsigned i;
+
assert(buf);
dec = (struct vl_mpeg12_decoder *)buf->base.decoder;
assert(dec);
vl_vb_unmap(&buf->vertex_stream, dec->pipe);
- unmap_buffers(dec, buf);
+
+ for (i = 0; i < VL_MAX_PLANES; ++i) {
+ dec->pipe->transfer_unmap(dec->pipe, buf->tex_transfer[i]);
+ dec->pipe->transfer_destroy(dec->pipe, buf->tex_transfer[i]);
+ }
}
static void
dec->pipe->bind_fs_state(dec->pipe, NULL);
dec->pipe->delete_depth_stencil_alpha_state(dec->pipe, dec->dsa);
+ dec->pipe->delete_sampler_state(dec->pipe, dec->sampler_ycbcr);
vl_mc_cleanup(&dec->mc_y);
vl_mc_cleanup(&dec->mc_c);
+ dec->mc_source->destroy(dec->mc_source);
if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT) {
vl_idct_cleanup(&dec->idct_y);
vl_idct_cleanup(&dec->idct_c);
+ dec->idct_source->destroy(dec->idct_source);
}
+ vl_zscan_cleanup(&dec->zscan_y);
+ vl_zscan_cleanup(&dec->zscan_c);
+
dec->pipe->delete_vertex_elements_state(dec->pipe, dec->ves_ycbcr);
dec->pipe->delete_vertex_elements_state(dec->pipe, dec->ves_mv);
pipe_resource_reference(&dec->quads.buffer, NULL);
pipe_resource_reference(&dec->pos.buffer, NULL);
- FREE(dec);
-}
-
-static bool
-init_idct_buffer(struct vl_mpeg12_buffer *buffer)
-{
- enum pipe_format formats[3];
-
- struct pipe_sampler_view **idct_source_sv, **idct_intermediate_sv;
- struct pipe_surface **idct_surfaces;
-
- struct vl_mpeg12_decoder *dec;
-
- unsigned i;
-
- assert(buffer);
-
- dec = (struct vl_mpeg12_decoder*)buffer->base.decoder;
-
- formats[0] = formats[1] = formats[2] = dec->idct_source_format;
- buffer->idct_source = vl_video_buffer_init(dec->base.context, dec->pipe,
- dec->base.width / 4, dec->base.height, 1,
- dec->base.chroma_format,
- formats, PIPE_USAGE_STREAM);
- if (!buffer->idct_source)
- goto error_source;
-
- formats[0] = formats[1] = formats[2] = dec->idct_intermediate_format;
- buffer->idct_intermediate = vl_video_buffer_init(dec->base.context, dec->pipe,
- dec->base.width / dec->nr_of_idct_render_targets,
- dec->base.height / 4, dec->nr_of_idct_render_targets,
- dec->base.chroma_format,
- formats, PIPE_USAGE_STATIC);
-
- if (!buffer->idct_intermediate)
- goto error_intermediate;
-
- idct_source_sv = buffer->idct_source->get_sampler_views(buffer->idct_source);
- if (!idct_source_sv)
- goto error_source_sv;
-
- idct_intermediate_sv = buffer->idct_intermediate->get_sampler_views(buffer->idct_intermediate);
- if (!idct_intermediate_sv)
- goto error_intermediate_sv;
-
- idct_surfaces = buffer->mc_source->get_surfaces(buffer->mc_source);
- if (!idct_surfaces)
- goto error_surfaces;
-
- for (i = 0; i < 3; ++i)
- if (!vl_idct_init_buffer(i == 0 ? &dec->idct_y : &dec->idct_c,
- &buffer->idct[i], idct_source_sv[i],
- idct_intermediate_sv[i], idct_surfaces[i]))
- goto error_plane;
-
- return true;
-
-error_plane:
- for (; i > 0; --i)
- vl_idct_cleanup_buffer(i == 1 ? &dec->idct_c : &dec->idct_y, &buffer->idct[i - 1]);
-
-error_surfaces:
-error_intermediate_sv:
-error_source_sv:
- buffer->idct_intermediate->destroy(buffer->idct_intermediate);
-
-error_intermediate:
- buffer->idct_source->destroy(buffer->idct_source);
+ pipe_sampler_view_reference(&dec->zscan_linear, NULL);
+ pipe_sampler_view_reference(&dec->zscan_normal, NULL);
+ pipe_sampler_view_reference(&dec->zscan_alternate, NULL);
-error_source:
- return false;
+ FREE(dec);
}
static struct pipe_video_decode_buffer *
vl_mpeg12_create_buffer(struct pipe_video_decoder *decoder)
{
- enum pipe_format formats[3];
-
struct vl_mpeg12_decoder *dec = (struct vl_mpeg12_decoder*)decoder;
struct vl_mpeg12_buffer *buffer;
- struct pipe_sampler_view **mc_source_sv;
-
assert(dec);
buffer = CALLOC_STRUCT(vl_mpeg12_buffer);
buffer->base.decoder = decoder;
buffer->base.destroy = vl_mpeg12_buffer_destroy;
buffer->base.map = vl_mpeg12_buffer_map;
- buffer->base.add_macroblocks = vl_mpeg12_buffer_add_macroblocks;
+ buffer->base.get_ycbcr_stream = vl_mpeg12_buffer_get_ycbcr_stream;
+ buffer->base.get_ycbcr_buffer = vl_mpeg12_buffer_get_ycbcr_buffer;
+ buffer->base.get_mv_stream_stride = vl_mpeg12_buffer_get_mv_stream_stride;
+ buffer->base.get_mv_stream = vl_mpeg12_buffer_get_mv_stream;
+ buffer->base.decode_bitstream = vl_mpeg12_buffer_decode_bitstream;
buffer->base.unmap = vl_mpeg12_buffer_unmap;
- vl_vb_init(&buffer->vertex_stream, dec->pipe,
- dec->base.width / MACROBLOCK_WIDTH,
- dec->base.height / MACROBLOCK_HEIGHT);
-
- formats[0] = formats[1] = formats[2] =dec->mc_source_format;
- buffer->mc_source = vl_video_buffer_init(dec->base.context, dec->pipe,
- dec->base.width, dec->base.height, 1,
- dec->base.chroma_format,
- formats, PIPE_USAGE_STATIC);
+ if (!vl_vb_init(&buffer->vertex_stream, dec->pipe,
+ dec->base.width / MACROBLOCK_WIDTH,
+ dec->base.height / MACROBLOCK_HEIGHT))
+ goto error_vertex_buffer;
- if (!buffer->mc_source)
- goto error_mc_source;
+ if (!init_mc_buffer(buffer))
+ goto error_mc;
if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
if (!init_idct_buffer(buffer))
goto error_idct;
- mc_source_sv = buffer->mc_source->get_sampler_views(buffer->mc_source);
- if (!mc_source_sv)
- goto error_mc_source_sv;
-
- if(!vl_mc_init_buffer(&dec->mc_y, &buffer->mc[0], mc_source_sv[0]))
- goto error_mc_y;
+ if (!init_zscan_buffer(buffer))
+ goto error_zscan;
- if(!vl_mc_init_buffer(&dec->mc_c, &buffer->mc[1], mc_source_sv[1]))
- goto error_mc_cb;
-
- if(!vl_mc_init_buffer(&dec->mc_c, &buffer->mc[2], mc_source_sv[2]))
- goto error_mc_cr;
+ if (dec->base.entrypoint == PIPE_VIDEO_ENTRYPOINT_BITSTREAM)
+ vl_mpg12_bs_init(&buffer->bs,
+ dec->base.width / MACROBLOCK_WIDTH,
+ dec->base.height / MACROBLOCK_HEIGHT);
return &buffer->base;
-error_mc_cr:
- vl_mc_cleanup_buffer(&buffer->mc[1]);
-
-error_mc_cb:
- vl_mc_cleanup_buffer(&buffer->mc[0]);
-
-error_mc_y:
-error_mc_source_sv:
+error_zscan:
if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
cleanup_idct_buffer(buffer);
error_idct:
- buffer->mc_source->destroy(buffer->mc_source);
+ cleanup_mc_buffer(buffer);
-error_mc_source:
+error_mc:
vl_vb_cleanup(&buffer->vertex_stream);
-error_vertex_stream:
+error_vertex_buffer:
FREE(buffer);
return NULL;
}
static void
vl_mpeg12_decoder_flush_buffer(struct pipe_video_decode_buffer *buffer,
+ unsigned num_ycbcr_blocks[3],
struct pipe_video_buffer *refs[2],
- struct pipe_video_buffer *dst,
- struct pipe_fence_handle **fence)
+ struct pipe_video_buffer *dst)
{
struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer *)buffer;
struct vl_mpeg12_decoder *dec;
- struct pipe_sampler_view **sv[2];
+ struct pipe_sampler_view **sv[VL_MAX_REF_FRAMES], **mc_source_sv;
struct pipe_surface **surfaces;
struct pipe_vertex_buffer vb[3];
- unsigned i, j;
+ unsigned i, j, component;
+ unsigned nr_components;
assert(buf);
assert(dec);
for (i = 0; i < 2; ++i)
- sv[i] = refs[i] ? refs[i]->get_sampler_views(refs[i]) : NULL;
-
- surfaces = dst->get_surfaces(dst);
+ sv[i] = refs[i] ? refs[i]->get_sampler_view_planes(refs[i]) : NULL;
vb[0] = dec->quads;
vb[1] = dec->pos;
+ surfaces = dst->get_surfaces(dst);
+
dec->pipe->bind_vertex_elements_state(dec->pipe, dec->ves_mv);
for (i = 0; i < VL_MAX_PLANES; ++i) {
+ if (!surfaces[i]) continue;
+
vl_mc_set_surface(&buf->mc[i], surfaces[i]);
- for (j = 0; j < 2; ++j) {
- if (sv[j] == NULL) continue;
+ for (j = 0; j < VL_MAX_REF_FRAMES; ++j) {
+ if (!sv[j]) continue;
vb[2] = vl_vb_get_mv(&buf->vertex_stream, j);;
dec->pipe->set_vertex_buffers(dec->pipe, 3, vb);
dec->pipe->bind_vertex_elements_state(dec->pipe, dec->ves_ycbcr);
for (i = 0; i < VL_MAX_PLANES; ++i) {
- unsigned num_instances = vl_vb_restart(&buf->vertex_stream, i);
+ if (!num_ycbcr_blocks[i]) continue;
vb[1] = vl_vb_get_ycbcr(&buf->vertex_stream, i);
dec->pipe->set_vertex_buffers(dec->pipe, 2, vb);
- if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
- vl_idct_flush(i == 0 ? &dec->idct_y : &dec->idct_c, &buf->idct[i], num_instances);
+ vl_zscan_render(&buf->zscan[i] , num_ycbcr_blocks[i]);
- vl_mc_render_ycbcr(&buf->mc[i], num_instances);
+ if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
+ vl_idct_flush(i == 0 ? &dec->idct_y : &dec->idct_c, &buf->idct[i], num_ycbcr_blocks[i]);
}
- dec->pipe->flush(dec->pipe, fence);
-}
+ mc_source_sv = dec->mc_source->get_sampler_view_planes(dec->mc_source);
+ for (i = 0, component = 0; i < VL_MAX_PLANES; ++i) {
+ if (!surfaces[i]) continue;
-static void
-vl_mpeg12_decoder_clear_buffer(struct pipe_video_decode_buffer *buffer)
-{
- struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer *)buffer;
- unsigned i;
+ nr_components = util_format_get_nr_components(surfaces[i]->texture->format);
+ for (j = 0; j < nr_components; ++j, ++component) {
+ if (!num_ycbcr_blocks[i]) continue;
- assert(buf);
+ vb[1] = vl_vb_get_ycbcr(&buf->vertex_stream, component);
+ dec->pipe->set_vertex_buffers(dec->pipe, 2, vb);
- for (i = 0; i < VL_MAX_PLANES; ++i)
- vl_vb_restart(&buf->vertex_stream, i);
+ if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
+ vl_idct_prepare_stage2(component == 0 ? &dec->idct_y : &dec->idct_c, &buf->idct[component]);
+ else {
+ dec->pipe->set_fragment_sampler_views(dec->pipe, 1, &mc_source_sv[component]);
+ dec->pipe->bind_fragment_sampler_states(dec->pipe, 1, &dec->sampler_ycbcr);
+ }
+ vl_mc_render_ycbcr(&buf->mc[i], j, num_ycbcr_blocks[component]);
+ }
+ }
}
static bool
init_pipe_state(struct vl_mpeg12_decoder *dec)
{
struct pipe_depth_stencil_alpha_state dsa;
+ struct pipe_sampler_state sampler;
unsigned i;
assert(dec);
dec->dsa = dec->pipe->create_depth_stencil_alpha_state(dec->pipe, &dsa);
dec->pipe->bind_depth_stencil_alpha_state(dec->pipe, dec->dsa);
+ memset(&sampler, 0, sizeof(sampler));
+ sampler.wrap_s = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
+ sampler.wrap_t = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
+ sampler.wrap_r = PIPE_TEX_WRAP_CLAMP_TO_BORDER;
+ sampler.min_img_filter = PIPE_TEX_FILTER_NEAREST;
+ sampler.min_mip_filter = PIPE_TEX_MIPFILTER_NONE;
+ sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST;
+ sampler.compare_mode = PIPE_TEX_COMPARE_NONE;
+ sampler.compare_func = PIPE_FUNC_ALWAYS;
+ sampler.normalized_coords = 1;
+ dec->sampler_ycbcr = dec->pipe->create_sampler_state(dec->pipe, &sampler);
+ if (!dec->sampler_ycbcr)
+ return false;
+
return true;
}
}
static bool
-init_idct(struct vl_mpeg12_decoder *dec, unsigned buffer_width, unsigned buffer_height)
+init_zscan(struct vl_mpeg12_decoder *dec)
{
- unsigned chroma_width, chroma_height;
- struct pipe_sampler_view *matrix, *transpose;
- float matrix_scale, transpose_scale;
+ unsigned num_channels;
- dec->nr_of_idct_render_targets = dec->pipe->screen->get_param(dec->pipe->screen, PIPE_CAP_MAX_RENDER_TARGETS);
+ assert(dec);
- // more than 4 render targets usually doesn't makes any seens
- dec->nr_of_idct_render_targets = MIN2(dec->nr_of_idct_render_targets, 4);
+ dec->blocks_per_line = 4;
+ dec->max_blocks =
+ (dec->base.width * dec->base.height) /
+ (BLOCK_WIDTH * BLOCK_HEIGHT);
- dec->idct_source_format = find_first_supported_format(dec, const_idct_source_formats,
- num_idct_source_formats, PIPE_TEXTURE_2D);
+ dec->zscan_source_format = find_first_supported_format(dec, const_zscan_source_formats,
+ num_zscan_source_formats, PIPE_TEXTURE_2D);
- if (dec->idct_source_format == PIPE_FORMAT_NONE)
+ if (dec->zscan_source_format == PIPE_FORMAT_NONE)
return false;
- dec->idct_intermediate_format = find_first_supported_format(dec, const_idct_intermediate_formats,
- num_idct_intermediate_formats, PIPE_TEXTURE_3D);
+ dec->zscan_linear = vl_zscan_layout(dec->pipe, vl_zscan_linear, dec->blocks_per_line);
+ dec->zscan_normal = vl_zscan_layout(dec->pipe, vl_zscan_normal, dec->blocks_per_line);
+ dec->zscan_alternate = vl_zscan_layout(dec->pipe, vl_zscan_alternate, dec->blocks_per_line);
+
+ num_channels = dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT ? 4 : 1;
- if (dec->idct_intermediate_format == PIPE_FORMAT_NONE)
+ if (!vl_zscan_init(&dec->zscan_y, dec->pipe, dec->base.width, dec->base.height,
+ dec->blocks_per_line, dec->max_blocks, num_channels))
return false;
- switch (dec->idct_source_format) {
+ if (!vl_zscan_init(&dec->zscan_c, dec->pipe, dec->chroma_width, dec->chroma_height,
+ dec->blocks_per_line, dec->max_blocks, num_channels))
+ return false;
+
+ return true;
+}
+
+static bool
+init_idct(struct vl_mpeg12_decoder *dec, float *mc_scale)
+{
+ unsigned nr_of_idct_render_targets;
+ enum pipe_format formats[3];
+
+ struct pipe_sampler_view *matrix, *transpose = NULL;
+ float matrix_scale, transpose_scale;
+
+ nr_of_idct_render_targets = dec->pipe->screen->get_param(dec->pipe->screen, PIPE_CAP_MAX_RENDER_TARGETS);
+
+ // more than 4 render targets usually doesn't makes any seens
+ nr_of_idct_render_targets = MIN2(nr_of_idct_render_targets, 4);
+
+ formats[0] = formats[1] = formats[2] = find_first_supported_format(dec, const_idct_source_formats,
+ num_idct_source_formats, PIPE_TEXTURE_2D);
+
+ switch (formats[0]) {
+ case PIPE_FORMAT_NONE:
+ goto error_idct_format;
+
case PIPE_FORMAT_R16G16B16A16_SSCALED:
matrix_scale = SCALE_FACTOR_SSCALED;
break;
return false;
}
- if (dec->idct_intermediate_format == PIPE_FORMAT_R16G16B16A16_FLOAT ||
- dec->idct_intermediate_format == PIPE_FORMAT_R32G32B32A32_FLOAT)
+ dec->idct_source = vl_video_buffer_init(dec->base.context, dec->pipe,
+ dec->base.width / 4, dec->base.height, 1,
+ dec->base.chroma_format,
+ formats, PIPE_USAGE_STATIC);
+ if (!dec->idct_source)
+ goto error_idct_source;
+
+ formats[0] = formats[1] = formats[2] = find_first_supported_format(dec, const_idct_intermediate_formats,
+ num_idct_intermediate_formats, PIPE_TEXTURE_3D);
+
+ switch (formats[0]) {
+ case PIPE_FORMAT_NONE:
+ goto error_mc_format;
+
+ case PIPE_FORMAT_R16G16B16A16_FLOAT:
+ case PIPE_FORMAT_R32G32B32A32_FLOAT:
transpose_scale = 1.0f;
- else
- transpose_scale = matrix_scale = sqrt(matrix_scale);
+ *mc_scale = 1.0f;
+ break;
- if (dec->mc_source_format == PIPE_FORMAT_R16_SSCALED)
+ case PIPE_FORMAT_R16_SSCALED:
+ transpose_scale = matrix_scale = sqrt(matrix_scale);
transpose_scale /= SCALE_FACTOR_SSCALED;
+ *mc_scale = SCALE_FACTOR_SSCALED;
+ break;
+
+ default:
+ transpose_scale = matrix_scale = sqrt(matrix_scale);
+ *mc_scale = 1.0f;
+ break;
+ }
+
+ dec->mc_source = vl_video_buffer_init(dec->base.context, dec->pipe,
+ dec->base.width / nr_of_idct_render_targets,
+ dec->base.height / 4, nr_of_idct_render_targets,
+ dec->base.chroma_format,
+ formats, PIPE_USAGE_STATIC);
+
+ if (!dec->mc_source)
+ goto error_mc_source;
if (!(matrix = vl_idct_upload_matrix(dec->pipe, matrix_scale)))
goto error_matrix;
} else
pipe_sampler_view_reference(&transpose, matrix);
- if (!vl_idct_init(&dec->idct_y, dec->pipe, buffer_width, buffer_height,
- dec->nr_of_idct_render_targets, matrix, transpose))
+ if (!vl_idct_init(&dec->idct_y, dec->pipe, dec->base.width, dec->base.height,
+ nr_of_idct_render_targets, matrix, transpose))
goto error_y;
- if (dec->base.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420) {
- chroma_width = buffer_width / 2;
- chroma_height = buffer_height / 2;
- } else if (dec->base.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_422) {
- chroma_width = buffer_width;
- chroma_height = buffer_height / 2;
- } else {
- chroma_width = buffer_width;
- chroma_height = buffer_height;
- }
-
- if(!vl_idct_init(&dec->idct_c, dec->pipe, chroma_width, chroma_height,
- dec->nr_of_idct_render_targets, matrix, transpose))
+ if(!vl_idct_init(&dec->idct_c, dec->pipe, dec->chroma_width, dec->chroma_height,
+ nr_of_idct_render_targets, matrix, transpose))
goto error_c;
pipe_sampler_view_reference(&matrix, NULL);
pipe_sampler_view_reference(&transpose, NULL);
+
return true;
error_c:
pipe_sampler_view_reference(&matrix, NULL);
error_matrix:
+ dec->mc_source->destroy(dec->mc_source);
+
+error_mc_source:
+error_mc_format:
+ dec->idct_source->destroy(dec->idct_source);
+
+error_idct_source:
+error_idct_format:
return false;
}
+static bool
+init_mc_source_widthout_idct(struct vl_mpeg12_decoder *dec, float *mc_scale)
+{
+ enum pipe_format formats[3];
+
+ formats[0] = formats[1] = formats[2] = find_first_supported_format(dec, const_mc_source_formats,
+ num_mc_source_formats, PIPE_TEXTURE_2D);
+
+ switch (formats[0]) {
+ case PIPE_FORMAT_NONE:
+ return false;
+
+ case PIPE_FORMAT_R16_SNORM:
+ *mc_scale = SCALE_FACTOR_SNORM;
+ break;
+
+ case PIPE_FORMAT_R16_SSCALED:
+ *mc_scale = SCALE_FACTOR_SSCALED;
+ break;
+
+ default:
+ assert(0);
+ return false;
+ }
+
+ dec->mc_source = vl_video_buffer_init(dec->base.context, dec->pipe,
+ dec->base.width, dec->base.height, 1,
+ dec->base.chroma_format,
+ formats, PIPE_USAGE_STATIC);
+
+ return dec->mc_source;
+}
+
+static void
+mc_vert_shader_callback(void *priv, struct vl_mc *mc,
+ struct ureg_program *shader,
+ unsigned first_output,
+ struct ureg_dst tex)
+{
+ struct vl_mpeg12_decoder *dec = priv;
+ struct ureg_dst o_vtex;
+
+ assert(priv && mc);
+ assert(shader);
+
+ if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT) {
+ struct vl_idct *idct = mc == &dec->mc_y ? &dec->idct_y : &dec->idct_c;
+ vl_idct_stage2_vert_shader(idct, shader, first_output, tex);
+ } else {
+ o_vtex = ureg_DECL_output(shader, TGSI_SEMANTIC_GENERIC, first_output);
+ ureg_MOV(shader, ureg_writemask(o_vtex, TGSI_WRITEMASK_XY), ureg_src(tex));
+ }
+}
+
+static void
+mc_frag_shader_callback(void *priv, struct vl_mc *mc,
+ struct ureg_program *shader,
+ unsigned first_input,
+ struct ureg_dst dst)
+{
+ struct vl_mpeg12_decoder *dec = priv;
+ struct ureg_src src, sampler;
+
+ assert(priv && mc);
+ assert(shader);
+
+ if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT) {
+ struct vl_idct *idct = mc == &dec->mc_y ? &dec->idct_y : &dec->idct_c;
+ vl_idct_stage2_frag_shader(idct, shader, first_input, dst);
+ } else {
+ src = ureg_DECL_fs_input(shader, TGSI_SEMANTIC_GENERIC, first_input, TGSI_INTERPOLATE_LINEAR);
+ sampler = ureg_DECL_sampler(shader, 0);
+ ureg_TEX(shader, dst, TGSI_TEXTURE_2D, src, sampler);
+ }
+}
+
struct pipe_video_decoder *
vl_create_mpeg12_decoder(struct pipe_video_context *context,
struct pipe_context *pipe,
dec->base.destroy = vl_mpeg12_destroy;
dec->base.create_buffer = vl_mpeg12_create_buffer;
dec->base.flush_buffer = vl_mpeg12_decoder_flush_buffer;
- dec->base.clear_buffer = vl_mpeg12_decoder_clear_buffer;
-
- dec->base.width = align(width, MACROBLOCK_WIDTH);
- dec->base.height = align(height, MACROBLOCK_HEIGHT);
dec->pipe = pipe;
/* TODO: Implement 422, 444 */
assert(dec->base.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420);
- dec->empty_block_mask = &const_empty_block_mask_420;
- dec->mc_source_format = find_first_supported_format(dec, const_mc_source_formats,
- num_mc_source_formats, PIPE_TEXTURE_3D);
+ if (dec->base.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420) {
+ dec->chroma_width = dec->base.width / 2;
+ dec->chroma_height = dec->base.height / 2;
+ } else if (dec->base.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_422) {
+ dec->chroma_width = dec->base.width;
+ dec->chroma_height = dec->base.height / 2;
+ } else {
+ dec->chroma_width = dec->base.width;
+ dec->chroma_height = dec->base.height;
+ }
- if (dec->mc_source_format == PIPE_FORMAT_NONE)
- return NULL;
+ if (!init_zscan(dec))
+ goto error_zscan;
if (entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT) {
- if (!init_idct(dec, dec->base.width, dec->base.height))
- goto error_idct;
- if (dec->mc_source_format == PIPE_FORMAT_R16_SSCALED)
- mc_scale = SCALE_FACTOR_SSCALED;
- else
- mc_scale = 1.0f;
+ if (!init_idct(dec, &mc_scale))
+ goto error_sources;
} else {
- switch (dec->mc_source_format) {
- case PIPE_FORMAT_R16_SNORM:
- mc_scale = SCALE_FACTOR_SNORM;
- break;
-
- case PIPE_FORMAT_R16_SSCALED:
- mc_scale = SCALE_FACTOR_SSCALED;
- break;
-
- default:
- assert(0);
- return NULL;
- }
+ if (!init_mc_source_widthout_idct(dec, &mc_scale))
+ goto error_sources;
}
- if (!vl_mc_init(&dec->mc_y, dec->pipe, dec->base.width, dec->base.height, MACROBLOCK_HEIGHT, mc_scale))
+ if (!vl_mc_init(&dec->mc_y, dec->pipe, dec->base.width, dec->base.height, MACROBLOCK_HEIGHT, mc_scale,
+ mc_vert_shader_callback, mc_frag_shader_callback, dec))
goto error_mc_y;
// TODO
- if (!vl_mc_init(&dec->mc_c, dec->pipe, dec->base.width, dec->base.height, BLOCK_HEIGHT, mc_scale))
+ if (!vl_mc_init(&dec->mc_c, dec->pipe, dec->base.width, dec->base.height, BLOCK_HEIGHT, mc_scale,
+ mc_vert_shader_callback, mc_frag_shader_callback, dec))
goto error_mc_c;
if (!init_pipe_state(dec))
if (entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT) {
vl_idct_cleanup(&dec->idct_y);
vl_idct_cleanup(&dec->idct_c);
+ dec->idct_source->destroy(dec->idct_source);
}
+ dec->mc_source->destroy(dec->mc_source);
-error_idct:
+error_sources:
+ vl_zscan_cleanup(&dec->zscan_y);
+ vl_zscan_cleanup(&dec->zscan_c);
+
+error_zscan:
FREE(dec);
return NULL;
}
projects / mesa.git / blobdiff