@ -37,6 +37,7 @@
# include "bytestream.h"
# include "xvmc_internal.h"
# include "thread.h"
# include "version.h"
typedef struct Mpeg1Context {
MpegEncContext mpeg_enc_ctx ;
@ -756,6 +757,8 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
} else
memset ( s - > last_mv , 0 , sizeof ( s - > last_mv ) ) ; /* reset mv prediction */
s - > mb_intra = 1 ;
# if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
// if 1, we memcpy blocks in xvmcvideo
if ( CONFIG_MPEG_XVMC_DECODER & & s - > avctx - > xvmc_acceleration > 1 ) {
ff_xvmc_pack_pblocks ( s , - 1 ) ; // inter are always full blocks
@ -763,6 +766,8 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
exchange_uv ( s ) ;
}
}
FF_ENABLE_DEPRECATION_WARNINGS
# endif /* FF_API_XVMC */
if ( s - > codec_id = = AV_CODEC_ID_MPEG2VIDEO ) {
if ( s - > flags2 & CODEC_FLAG2_FAST ) {
@ -969,6 +974,8 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
return - 1 ;
}
# if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
//if 1, we memcpy blocks in xvmcvideo
if ( CONFIG_MPEG_XVMC_DECODER & & s - > avctx - > xvmc_acceleration > 1 ) {
ff_xvmc_pack_pblocks ( s , cbp ) ;
@ -976,6 +983,8 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
exchange_uv ( s ) ;
}
}
FF_ENABLE_DEPRECATION_WARNINGS
# endif /* FF_API_XVMC */
if ( s - > codec_id = = AV_CODEC_ID_MPEG2VIDEO ) {
if ( s - > flags2 & CODEC_FLAG2_FAST ) {
@ -1098,10 +1107,12 @@ static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
}
}
# if FF_API_XVMC
static const enum AVPixelFormat pixfmt_xvmc_mpg2_420 [ ] = {
AV_PIX_FMT_XVMC_MPEG2_IDCT ,
AV_PIX_FMT_XVMC_MPEG2_MC ,
AV_PIX_FMT_NONE } ;
# endif /* FF_API_XVMC */
static const enum AVPixelFormat mpeg12_hwaccel_pixfmt_list_420 [ ] = {
# if CONFIG_MPEG2_DXVA2_HWACCEL
@ -1122,16 +1133,19 @@ static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx)
Mpeg1Context * s1 = avctx - > priv_data ;
MpegEncContext * s = & s1 - > mpeg_enc_ctx ;
# if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
if ( avctx - > xvmc_acceleration )
return avctx - > get_format ( avctx , pixfmt_xvmc_mpg2_420 ) ;
else {
FF_ENABLE_DEPRECATION_WARNINGS
# endif /* FF_API_XVMC */
if ( s - > chroma_format < 2 )
return avctx - > get_format ( avctx , mpeg12_hwaccel_pixfmt_list_420 ) ;
else if ( s - > chroma_format = = 2 )
return AV_PIX_FMT_YUV422P ;
else
return AV_PIX_FMT_YUV444P ;
}
}
/* Call this function when we know all parameters.
@ -1229,9 +1243,12 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
avctx - > pix_fmt = mpeg_get_pixelformat ( avctx ) ;
avctx - > hwaccel = ff_find_hwaccel ( avctx ) ;
// until then pix_fmt may be changed right after codec init
if ( avctx - > pix_fmt = = AV_PIX_FMT_XVMC_MPEG2_IDCT | |
avctx - > hwaccel )
if ( avctx - > idct_algo = = FF_IDCT_AUTO )
# if FF_API_XVMC
if ( ( avctx - > pix_fmt = = AV_PIX_FMT_XVMC_MPEG2_IDCT | |
avctx - > hwaccel ) & & avctx - > idct_algo = = FF_IDCT_AUTO )
# else
if ( avctx - > hwaccel & & avctx - > idct_algo = = FF_IDCT_AUTO )
# endif /* FF_API_XVMC */
avctx - > idct_algo = FF_IDCT_SIMPLE ;
/* Quantization matrices may need reordering
@ -1557,11 +1574,15 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size)
return - 1 ;
}
# if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
// MPV_frame_start will call this function too,
// but we need to call it on every field
if ( CONFIG_MPEG_XVMC_DECODER & & s - > avctx - > xvmc_acceleration )
if ( ff_xvmc_field_start ( s , avctx ) < 0 )
return - 1 ;
FF_ENABLE_DEPRECATION_WARNINGS
# endif /* FF_API_XVMC */
return 0 ;
}
@ -1662,9 +1683,13 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
}
for ( ; ; ) {
# if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
// If 1, we memcpy blocks in xvmcvideo.
if ( CONFIG_MPEG_XVMC_DECODER & & s - > avctx - > xvmc_acceleration > 1 )
ff_xvmc_init_block ( s ) ; // set s->block
FF_ENABLE_DEPRECATION_WARNINGS
# endif /* FF_API_XVMC */
if ( mpeg_decode_mb ( s , s - > block ) < 0 )
return - 1 ;
@ -1854,8 +1879,12 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict)
av_log ( avctx , AV_LOG_ERROR , " hardware accelerator failed to decode picture \n " ) ;
}
# if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
if ( CONFIG_MPEG_XVMC_DECODER & & s - > avctx - > xvmc_acceleration )
ff_xvmc_field_end ( s ) ;
FF_ENABLE_DEPRECATION_WARNINGS
# endif /* FF_API_XVMC */
/* end of slice reached */
if ( /*s->mb_y << field_pic == s->mb_height &&*/ ! s - > first_field ) {
@ -1990,8 +2019,12 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
avctx - > pix_fmt = mpeg_get_pixelformat ( avctx ) ;
avctx - > hwaccel = ff_find_hwaccel ( avctx ) ;
if ( avctx - > pix_fmt = = AV_PIX_FMT_XVMC_MPEG2_IDCT | | avctx - > hwaccel )
if ( avctx - > idct_algo = = FF_IDCT_AUTO )
# if FF_API_XVMC
if ( ( avctx - > pix_fmt = = AV_PIX_FMT_XVMC_MPEG2_IDCT | | avctx - > hwaccel ) & &
avctx - > idct_algo = = FF_IDCT_AUTO )
# else
if ( avctx - > hwaccel & & avctx - > idct_algo = = FF_IDCT_AUTO )
# endif /* FF_API_XVMC */
avctx - > idct_algo = FF_IDCT_SIMPLE ;
if ( ff_MPV_common_init ( s ) < 0 )
@ -2436,6 +2469,7 @@ AVCodec ff_mpeg2video_decoder = {
. profiles = NULL_IF_CONFIG_SMALL ( mpeg2_video_profiles ) ,
} ;
# if FF_API_XVMC
# if CONFIG_MPEG_XVMC_DECODER
static av_cold int mpeg_mc_decode_init ( AVCodecContext * avctx )
{
@ -2469,3 +2503,4 @@ AVCodec ff_mpeg_xvmc_decoder = {
} ;
# endif
# endif /* FF_API_XVMC */