AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

g3dvl: change picture parameter of decode_bitstream to general version

Browse Source 
Using pipe_mpeg12_picture_desc was unintentional here.
This commit is contained in:
Christian König
2011-07-14 19:37:02 +02:00
parent d4be170e8b
commit 13da00f07c
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
+5 -3
View File
@@ -380,10 +380,12 @@ vl_mpeg12_buffer_get_mv_stream(struct pipe_video_decode_buffer *buffer, int ref_
static void
vl_mpeg12_buffer_decode_bitstream(struct pipe_video_decode_buffer *buffer,
unsigned num_bytes, const void *data,
struct pipe_mpeg12_picture_desc *picture,
struct pipe_picture_desc *picture,
unsigned num_ycbcr_blocks[3])
{
struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
struct pipe_mpeg12_picture_desc *pic = (struct pipe_mpeg12_picture_desc *)picture;
struct vl_mpeg12_decoder *dec;
unsigned i;
@@ -393,9 +395,9 @@ vl_mpeg12_buffer_decode_bitstream(struct pipe_video_decode_buffer *buffer,
assert(dec);
for (i = 0; i < VL_MAX_PLANES; ++i)
vl_zscan_set_layout(&buf->zscan[i], picture->alternate_scan ? dec->zscan_alternate : dec->zscan_normal);
vl_zscan_set_layout(&buf->zscan[i], pic->alternate_scan ? dec->zscan_alternate : dec->zscan_normal);
vl_mpg12_bs_decode(&buf->bs, num_bytes, data, picture, num_ycbcr_blocks);
vl_mpg12_bs_decode(&buf->bs, num_bytes, data, pic, num_ycbcr_blocks);
}
static void
src/gallium/include/pipe/p_video_decoder.h
+1 -1
View File
@@ -121,7 +121,7 @@ struct pipe_video_decode_buffer
*/
void (*decode_bitstream)(struct pipe_video_decode_buffer *decbuf,
unsigned num_bytes, const void *data,
struct pipe_mpeg12_picture_desc *picture,
struct pipe_picture_desc *picture,
unsigned num_ycbcr_blocks[3]);
/**
src/gallium/state_trackers/vdpau/decode.c
+1 -1
View File
@@ -215,7 +215,7 @@ vlVdpDecoderRenderMpeg2(struct pipe_video_decoder *decoder,
for (i = 0; i < bitstream_buffer_count; ++i)
buffer->decode_bitstream(buffer, bitstream_buffers[i].bitstream_bytes,
bitstream_buffers[i].bitstream, &picture, num_ycbcr_blocks);
bitstream_buffers[i].bitstream, &picture.base, num_ycbcr_blocks);
buffer->end_frame(buffer);