g3dvl: change picture parameter of decode_bitstream to general version

Using pipe_mpeg12_picture_desc was unintentional here.

diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
index 5b214b83cf510e7361dad09951b3576e0f7166ab..61d947ca4c8e11b6c1146d4ad42df49dc7cb27fd 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
+++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
@@ -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

diff --git a/src/gallium/include/pipe/p_video_decoder.h b/src/gallium/include/pipe/p_video_decoder.h
index deda992a36ce7289fa2e80a91b43f9eb76613b5a..f063d8f3a1b9495700bd5bc67f34794212a45044 100644 (file)
--- a/src/gallium/include/pipe/p_video_decoder.h
+++ b/src/gallium/include/pipe/p_video_decoder.h
@@ -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]);
 
    /**

diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c
index 0696278ac3e4203280b805c107cb86c15d643ba2..269c7a4baf8e115ea2377ba80cfcb73c07597e0a 100644 (file)
--- a/src/gallium/state_trackers/vdpau/decode.c
+++ b/src/gallium/state_trackers/vdpau/decode.c
@@ -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);