diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-08-05 15:09:23 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-08-05 15:09:23 +0000 |
| commit | f86f7a3a08809f55d0218312a8986c9693899245 (patch) | |
| tree | fad730f45e4c0a697ddfe07cb1c55285065b191d /src/libmpeg2/decode.c | |
| parent | 4b456d4e7062949eb1bbdf1b0708dff388b3f3f7 (diff) | |
| download | xine-lib-f86f7a3a08809f55d0218312a8986c9693899245.tar.gz xine-lib-f86f7a3a08809f55d0218312a8986c9693899245.tar.bz2 | |
handle dvdnav aspect force hints correctly with pan&scan
CVS patchset: 5250
CVS date: 2003/08/05 15:09:23
Diffstat (limited to 'src/libmpeg2/decode.c')
| -rw-r--r-- | src/libmpeg2/decode.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c index 372afd403..4ce672022 100644 --- a/src/libmpeg2/decode.c +++ b/src/libmpeg2/decode.c @@ -395,6 +395,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, data.width = picture->coded_picture_width; data.height = picture->coded_picture_height; data.aspect = picture->aspect_ratio_information; + data.pan_scan = mpeg2dec->force_pan_scan; xine_event_send(mpeg2dec->stream, &event); mpeg2dec->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] @@ -453,6 +454,9 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, else mpeg2dec->drop_frame = 1; } else { + int flags = VO_INTERLACED_FLAG | picture->picture_structure; + if (mpeg2dec->force_pan_scan) flags |= VO_PAN_SCAN_FLAG; + if ( picture->current_frame && picture->current_frame != picture->backward_reference_frame && picture->current_frame != picture->forward_reference_frame ) { @@ -482,7 +486,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, picture->coded_picture_height, ratio, XINE_IMGFMT_YV12, - VO_INTERLACED_FLAG | picture->picture_structure); + flags); else { picture->current_frame = mpeg2dec->stream->video_out->get_frame (mpeg2dec->stream->video_out, @@ -490,7 +494,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, picture->coded_picture_height, ratio, XINE_IMGFMT_YV12, - (VO_INTERLACED_FLAG | VO_PREDICTION_FLAG | picture->picture_structure)); + flags); if (picture->forward_reference_frame && picture->forward_reference_frame != picture->backward_reference_frame) picture->forward_reference_frame->free (picture->forward_reference_frame); @@ -804,6 +808,7 @@ void mpeg2_find_sequence_header (mpeg2dec_t * mpeg2dec, data.width = picture->coded_picture_width; data.height = picture->coded_picture_height; data.aspect = picture->aspect_ratio_information; + data.pan_scan = mpeg2dec->force_pan_scan; xine_event_send(mpeg2dec->stream, &event); mpeg2dec->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] @@ -852,6 +857,7 @@ static void process_userdata(mpeg2dec_t *mpeg2dec, uint8_t *buffer) data.width = mpeg2dec->picture->coded_picture_width; data.height = mpeg2dec->picture->coded_picture_height; data.aspect = mpeg2dec->picture->aspect_ratio_information; + data.pan_scan = mpeg2dec->force_pan_scan; xine_event_send(mpeg2dec->stream, &event); mpeg2dec->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] |