Mesa (master): state_trackers/vdpau: Add num_slices to mpeg12 picture structure

[Christian König]

Module: Mesa
Branch: master
Commit: c4d47f065ae2a015a9d2e9a060d71e04d5935c2b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4d47f065ae2a015a9d2e9a060d71e04d5935c2b

Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Mon Oct 31 10:24:34 2011 +0100

state_trackers/vdpau: Add num_slices to mpeg12 picture structure

Bitstream parsers might need that field.

Signed-off-by: Maarten Lankhorst <m.b.lankhorst at gmail.com>

---

 src/gallium/include/pipe/p_video_state.h  |    1 +
 src/gallium/state_trackers/vdpau/decode.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h
index e808700..53da1d8 100644
--- a/src/gallium/include/pipe/p_video_state.h
+++ b/src/gallium/include/pipe/p_video_state.h
@@ -134,6 +134,7 @@ struct pipe_mpeg12_picture_desc
    unsigned concealment_motion_vectors;
    unsigned intra_dc_precision;
    unsigned f_code[2][2];
+   unsigned num_slices;
 };
 
 struct pipe_mpeg12_quant_matrix
diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c
index aacb9ea..7689ce2 100644
--- a/src/gallium/state_trackers/vdpau/decode.c
+++ b/src/gallium/state_trackers/vdpau/decode.c
@@ -233,6 +233,7 @@ vlVdpDecoderRenderMpeg12(struct pipe_video_decoder *decoder,
    picture.f_code[0][1] = picture_info->f_code[0][1] - 1;
    picture.f_code[1][0] = picture_info->f_code[1][0] - 1;
    picture.f_code[1][1] = picture_info->f_code[1][1] - 1;
+   picture.num_slices = picture_info->slice_count;
 
    decoder->set_picture_parameters(decoder, &picture.base);