diff options
Diffstat (limited to 'src/libmpeg2')
| -rw-r--r-- | src/libmpeg2/decode.c | 5 | ||||
| -rw-r--r-- | src/libmpeg2/libmpeg2_accel.c | 29 | ||||
| -rw-r--r-- | src/libmpeg2/libmpeg2_accel.h | 2 |
3 files changed, 30 insertions, 6 deletions
diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c index 63e6edbb4..5d3f78ec5 100644 --- a/src/libmpeg2/decode.c +++ b/src/libmpeg2/decode.c @@ -508,7 +508,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, mpeg2dec->frame_format, flags); libmpeg2_accel_new_frame( &mpeg2dec->accel, mpeg2dec->frame_format, - picture, ratio); + picture, ratio, flags); } else { ratio = get_aspect_ratio(mpeg2dec); picture->current_frame = @@ -520,7 +520,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, flags); libmpeg2_accel_new_frame( &mpeg2dec->accel, mpeg2dec->frame_format, - picture, ratio); + picture, ratio, flags); if (picture->forward_reference_frame && picture->forward_reference_frame != picture->backward_reference_frame) @@ -664,6 +664,7 @@ void mpeg2_discontinuity (mpeg2dec_t * mpeg2dec) { if( !picture ) return; + mpeg2dec->in_slice = 0; mpeg2dec->pts = 0; if ( picture->current_frame ) picture->current_frame->pts = 0; diff --git a/src/libmpeg2/libmpeg2_accel.c b/src/libmpeg2/libmpeg2_accel.c index 9d30e2b75..51e0b8b73 100644 --- a/src/libmpeg2/libmpeg2_accel.c +++ b/src/libmpeg2/libmpeg2_accel.c @@ -75,7 +75,7 @@ libmpeg2_accel_new_sequence(mpeg2dec_accel_t *accel, uint32_t frame_format, pict int libmpeg2_accel_new_frame(mpeg2dec_accel_t *accel, uint32_t frame_format, - picture_t *picture, double ratio) + picture_t *picture, double ratio, uint32_t flags) { if (picture->current_frame) { if (XINE_IMGFMT_XXMC == frame_format) { @@ -98,7 +98,7 @@ libmpeg2_accel_new_frame(mpeg2dec_accel_t *accel, uint32_t frame_format, */ if ( picture->picture_structure != 3 ) { - xxmc->acceleration &= ~( XINE_XVMC_ACCEL_IDCT | XINE_XVMC_ACCEL_MOCOMP ); + xxmc->acceleration &= ~( /* XINE_XVMC_ACCEL_IDCT | */ XINE_XVMC_ACCEL_MOCOMP ); } xxmc->mpeg = (picture->mpeg1) ? XINE_XVMC_MPEG_1:XINE_XVMC_MPEG_2; @@ -107,7 +107,7 @@ libmpeg2_accel_new_frame(mpeg2dec_accel_t *accel, uint32_t frame_format, picture->coded_picture_width, picture->coded_picture_height, ratio, - XINE_IMGFMT_XXMC, picture->picture_structure); + XINE_IMGFMT_XXMC, flags); } } return 0; @@ -150,6 +150,29 @@ int libmpeg2_accel_slice(mpeg2dec_accel_t *accel, uint32_t frame_format, picture_t *picture, int code, char * buffer, uint32_t chunk_size, uint8_t *chunk_buffer) { + /* + * Don't reference frames of other formats. They are invalid. This may happen if the + * xxmc plugin suddenly falls back to software decoding. + */ + + if (( picture->current_frame->picture_coding_type == XINE_PICT_P_TYPE ) || + ( picture->current_frame->picture_coding_type == XINE_PICT_B_TYPE )) { + if (! picture->forward_reference_frame) return 1; + if (picture->forward_reference_frame->format != picture->current_frame->format) { + picture->v_offset = 0; + return 1; + } + } + + if ( picture->current_frame->picture_coding_type == XINE_PICT_B_TYPE ) { + if (! picture->backward_reference_frame) return 1; + if (picture->backward_reference_frame->format != picture->current_frame->format) { + picture->v_offset = 0; + return 1; + } + } + + switch( frame_format ) { case XINE_IMGFMT_XXMC: { diff --git a/src/libmpeg2/libmpeg2_accel.h b/src/libmpeg2/libmpeg2_accel.h index 24079e124..41b081cc5 100644 --- a/src/libmpeg2/libmpeg2_accel.h +++ b/src/libmpeg2/libmpeg2_accel.h @@ -38,7 +38,7 @@ typedef struct { extern int libmpeg2_accel_discontinuity(mpeg2dec_accel_t *accel, uint32_t frame_format, picture_t *picture); extern int libmpeg2_accel_new_sequence(mpeg2dec_accel_t *accel, uint32_t frame_format, picture_t *picture); -extern int libmpeg2_accel_new_frame(mpeg2dec_accel_t *accel, uint32_t frame_format, picture_t *picture, double ratio); +extern int libmpeg2_accel_new_frame(mpeg2dec_accel_t *accel, uint32_t frame_format, picture_t *picture, double ratio, uint32_t flags); extern void libmpeg2_accel_frame_completion(mpeg2dec_accel_t *accel, uint32_t frame_format, picture_t *picture, int code); extern int libmpeg2_accel_slice(mpeg2dec_accel_t *accel, uint32_t frame_format, picture_t *picture, |