Commit 1c63aed2 authored by Ivan Kalvachev's avatar Ivan Kalvachev Committed by Michael Niedermayer

Convert XvMC to hwaccel v3

Signed-off-by: 's avatarIvan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent c19f193c
...@@ -1318,6 +1318,7 @@ HWACCEL_LIST=" ...@@ -1318,6 +1318,7 @@ HWACCEL_LIST="
vaapi vaapi
vda vda
vdpau vdpau
xvmc
" "
LIBRARY_LIST=" LIBRARY_LIST="
...@@ -2039,6 +2040,7 @@ vaapi_deps="va_va_h" ...@@ -2039,6 +2040,7 @@ vaapi_deps="va_va_h"
vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads" vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore" vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
xvmc_deps="X11_extensions_XvMClib_h"
h263_vaapi_hwaccel_deps="vaapi" h263_vaapi_hwaccel_deps="vaapi"
h263_vaapi_hwaccel_select="h263_decoder" h263_vaapi_hwaccel_select="h263_decoder"
...@@ -2059,10 +2061,14 @@ h264_vdpau_hwaccel_deps="vdpau" ...@@ -2059,10 +2061,14 @@ h264_vdpau_hwaccel_deps="vdpau"
h264_vdpau_hwaccel_select="h264_decoder" h264_vdpau_hwaccel_select="h264_decoder"
mpeg_vdpau_decoder_deps="vdpau" mpeg_vdpau_decoder_deps="vdpau"
mpeg_vdpau_decoder_select="mpeg2video_decoder" mpeg_vdpau_decoder_select="mpeg2video_decoder"
mpeg_xvmc_hwaccel_deps="xvmc"
mpeg_xvmc_hwaccel_select="mpeg2video_decoder"
mpeg1_vdpau_decoder_deps="vdpau" mpeg1_vdpau_decoder_deps="vdpau"
mpeg1_vdpau_decoder_select="mpeg1video_decoder" mpeg1_vdpau_decoder_select="mpeg1video_decoder"
mpeg1_vdpau_hwaccel_deps="vdpau" mpeg1_vdpau_hwaccel_deps="vdpau"
mpeg1_vdpau_hwaccel_select="mpeg1video_decoder" mpeg1_vdpau_hwaccel_select="mpeg1video_decoder"
mpeg1_xvmc_hwaccel_deps="xvmc"
mpeg1_xvmc_hwaccel_select="mpeg1video_decoder"
mpeg2_crystalhd_decoder_select="crystalhd" mpeg2_crystalhd_decoder_select="crystalhd"
mpeg2_dxva2_hwaccel_deps="dxva2" mpeg2_dxva2_hwaccel_deps="dxva2"
mpeg2_dxva2_hwaccel_select="mpeg2video_decoder" mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
...@@ -2070,6 +2076,8 @@ mpeg2_vaapi_hwaccel_deps="vaapi" ...@@ -2070,6 +2076,8 @@ mpeg2_vaapi_hwaccel_deps="vaapi"
mpeg2_vaapi_hwaccel_select="mpeg2video_decoder" mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
mpeg2_vdpau_hwaccel_deps="vdpau" mpeg2_vdpau_hwaccel_deps="vdpau"
mpeg2_vdpau_hwaccel_select="mpeg2video_decoder" mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"
mpeg2_xvmc_hwaccel_deps="xvmc"
mpeg2_xvmc_hwaccel_select="mpeg2video_decoder"
mpeg4_crystalhd_decoder_select="crystalhd" mpeg4_crystalhd_decoder_select="crystalhd"
mpeg4_vaapi_hwaccel_deps="vaapi" mpeg4_vaapi_hwaccel_deps="vaapi"
mpeg4_vaapi_hwaccel_select="mpeg4_decoder" mpeg4_vaapi_hwaccel_select="mpeg4_decoder"
...@@ -2454,7 +2462,7 @@ enable static ...@@ -2454,7 +2462,7 @@ enable static
enable swscale_alpha enable swscale_alpha
# Enable hwaccels by default. # Enable hwaccels by default.
enable dxva2 vaapi vdpau enable dxva2 vaapi vdpau xvmc
# build settings # build settings
SHFLAGS='-shared -Wl,-soname,$$(@F)' SHFLAGS='-shared -Wl,-soname,$$(@F)'
......
...@@ -297,7 +297,6 @@ OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o ...@@ -297,7 +297,6 @@ OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o
OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o
OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.o \ OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.o \
mpegvideo.o error_resilience.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o
OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o
OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
...@@ -635,9 +634,11 @@ OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o ...@@ -635,9 +634,11 @@ OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o
OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o
OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o
OBJS-$(CONFIG_MPEG1_VDPAU_HWACCEL) += vdpau_mpeg12.o OBJS-$(CONFIG_MPEG1_VDPAU_HWACCEL) += vdpau_mpeg12.o
OBJS-$(CONFIG_MPEG1_XVMC_HWACCEL) += mpegvideo_xvmc.o
OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o
OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o vaapi_mpeg.o OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o vaapi_mpeg.o
OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL) += vdpau_mpeg12.o OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL) += vdpau_mpeg12.o
OBJS-$(CONFIG_MPEG2_XVMC_HWACCEL) += mpegvideo_xvmc.o
OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o vaapi_mpeg.o OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o vaapi_mpeg.o
OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL) += vdpau_mpeg4.o OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL) += vdpau_mpeg4.o
OBJS-$(CONFIG_VC1_DXVA2_HWACCEL) += dxva2_vc1.o OBJS-$(CONFIG_VC1_DXVA2_HWACCEL) += dxva2_vc1.o
...@@ -827,7 +828,7 @@ SKIPHEADERS += %_tablegen.h \ ...@@ -827,7 +828,7 @@ SKIPHEADERS += %_tablegen.h \
SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h
SKIPHEADERS-$(CONFIG_LIBUTVIDEO) += libutvideo.h SKIPHEADERS-$(CONFIG_LIBUTVIDEO) += libutvideo.h
SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h
SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
SKIPHEADERS-$(CONFIG_VDA) += vda.h SKIPHEADERS-$(CONFIG_VDA) += vda.h
SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h
......
...@@ -80,7 +80,9 @@ void avcodec_register_all(void) ...@@ -80,7 +80,9 @@ void avcodec_register_all(void)
REGISTER_HWACCEL(H264_VAAPI, h264_vaapi); REGISTER_HWACCEL(H264_VAAPI, h264_vaapi);
REGISTER_HWACCEL(H264_VDA, h264_vda); REGISTER_HWACCEL(H264_VDA, h264_vda);
REGISTER_HWACCEL(H264_VDPAU, h264_vdpau); REGISTER_HWACCEL(H264_VDPAU, h264_vdpau);
REGISTER_HWACCEL(MPEG1_XVMC, mpeg1_xvmc);
REGISTER_HWACCEL(MPEG1_VDPAU, mpeg1_vdpau); REGISTER_HWACCEL(MPEG1_VDPAU, mpeg1_vdpau);
REGISTER_HWACCEL(MPEG2_XVMC, mpeg2_xvmc);
REGISTER_HWACCEL(MPEG2_DXVA2, mpeg2_dxva2); REGISTER_HWACCEL(MPEG2_DXVA2, mpeg2_dxva2);
REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi); REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi);
REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau); REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau);
......
...@@ -767,7 +767,13 @@ typedef struct RcOverride{ ...@@ -767,7 +767,13 @@ typedef struct RcOverride{
#define CODEC_CAP_DR1 0x0002 #define CODEC_CAP_DR1 0x0002
#define CODEC_CAP_TRUNCATED 0x0008 #define CODEC_CAP_TRUNCATED 0x0008
#if FF_API_XVMC #if FF_API_XVMC
/* Codec can export data for HW decoding (XvMC). */ /* Codec can export data for HW decoding. This flag indicates that
* the codec would call get_format() with list that might contain HW accelerated
* pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick any of them
* including raw image format.
* The application can use the passed context to determine bitstream version,
* chroma format, resolution etc.
*/
#define CODEC_CAP_HWACCEL 0x0010 #define CODEC_CAP_HWACCEL 0x0010
#endif /* FF_API_XVMC */ #endif /* FF_API_XVMC */
/** /**
...@@ -1695,7 +1701,7 @@ typedef struct AVCodecContext { ...@@ -1695,7 +1701,7 @@ typedef struct AVCodecContext {
* XVideo Motion Acceleration * XVideo Motion Acceleration
* - encoding: forbidden * - encoding: forbidden
* - decoding: set by decoder * - decoding: set by decoder
* @deprecated XvMC support is slated for removal. * @deprecated XvMC doesn't need it anymore.
*/ */
attribute_deprecated int xvmc_acceleration; attribute_deprecated int xvmc_acceleration;
#endif /* FF_API_XVMC */ #endif /* FF_API_XVMC */
...@@ -3100,6 +3106,8 @@ typedef struct AVCodec { ...@@ -3100,6 +3106,8 @@ typedef struct AVCodec {
int av_codec_get_max_lowres(const AVCodec *codec); int av_codec_get_max_lowres(const AVCodec *codec);
struct MpegEncContext;
/** /**
* AVHWAccel. * AVHWAccel.
*/ */
...@@ -3161,6 +3169,7 @@ typedef struct AVHWAccel { ...@@ -3161,6 +3169,7 @@ typedef struct AVHWAccel {
* *
* Meaningful slice information (codec specific) is guaranteed to * Meaningful slice information (codec specific) is guaranteed to
* be parsed at this point. This function is mandatory. * be parsed at this point. This function is mandatory.
* The only exception is XvMC, that works on MB level.
* *
* @param avctx the codec context * @param avctx the codec context
* @param buf the slice data buffer base * @param buf the slice data buffer base
...@@ -3188,6 +3197,17 @@ typedef struct AVHWAccel { ...@@ -3188,6 +3197,17 @@ typedef struct AVHWAccel {
* AVCodecContext.release_buffer(). * AVCodecContext.release_buffer().
*/ */
int priv_data_size; int priv_data_size;
/**
* Called for every Macroblock in a slice.
*
* XvMC uses it to replace the ff_MPV_decode_mb().
* Instead of decoding to raw picture, MB parameters are
* stored in an array provided by the video driver.
*
* @param s the mpeg context
*/
void (*decode_mb)(struct MpegEncContext *s);
} AVHWAccel; } AVHWAccel;
/** /**
......
...@@ -699,15 +699,11 @@ static int is_intra_more_likely(ERContext *s) ...@@ -699,15 +699,11 @@ static int is_intra_more_likely(ERContext *s)
if (undamaged_count < 5) if (undamaged_count < 5)
return 0; // almost all MBs damaged -> use temporal prediction return 0; // almost all MBs damaged -> use temporal prediction
#if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
// prevent dsp.sad() check, that requires access to the image // prevent dsp.sad() check, that requires access to the image
if (CONFIG_MPEG_XVMC_DECODER && if (CONFIG_XVMC &&
s->avctx->xvmc_acceleration && s->avctx->hwaccel && s->avctx->hwaccel->decode_mb &&
s->cur_pic->f.pict_type == AV_PICTURE_TYPE_I) s->cur_pic->f.pict_type == AV_PICTURE_TYPE_I)
return 1; return 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
skip_amount = FFMAX(undamaged_count / 50, 1); // check only up to 50 MBs skip_amount = FFMAX(undamaged_count / 50, 1); // check only up to 50 MBs
is_intra_likely = 0; is_intra_likely = 0;
...@@ -770,7 +766,7 @@ void ff_er_frame_start(ERContext *s) ...@@ -770,7 +766,7 @@ void ff_er_frame_start(ERContext *s)
static int er_supported(ERContext *s) static int er_supported(ERContext *s)
{ {
if(s->avctx->hwaccel || if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice ||
s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU || s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ||
!s->cur_pic || !s->cur_pic ||
s->cur_pic->field_picture s->cur_pic->field_picture
...@@ -795,7 +791,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, ...@@ -795,7 +791,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty,
const int end_xy = s->mb_index2xy[end_i]; const int end_xy = s->mb_index2xy[end_i];
int mask = -1; int mask = -1;
if (s->avctx->hwaccel) if (s->avctx->hwaccel && s->avctx->hwaccel->decode_slice)
return; return;
if (start_i > end_i || start_xy > end_xy) { if (start_i > end_i || start_xy > end_xy) {
...@@ -1188,13 +1184,9 @@ void ff_er_frame_end(ERContext *s) ...@@ -1188,13 +1184,9 @@ void ff_er_frame_end(ERContext *s)
} else } else
guess_mv(s); guess_mv(s);
#if FF_API_XVMC /* the filters below manipulate raw image, skip them */
FF_DISABLE_DEPRECATION_WARNINGS if (CONFIG_XVMC && s->avctx->hwaccel && s->avctx->hwaccel->decode_mb)
/* the filters below are not XvMC compatible, skip them */
if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration)
goto ec_clean; goto ec_clean;
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
/* fill DC for inter blocks */ /* fill DC for inter blocks */
for (mb_y = 0; mb_y < s->mb_height; mb_y++) { for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
for (mb_x = 0; mb_x < s->mb_width; mb_x++) { for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
......
...@@ -666,14 +666,6 @@ static inline int get_qscale(MpegEncContext *s) ...@@ -666,14 +666,6 @@ static inline int get_qscale(MpegEncContext *s)
} }
} }
static void exchange_uv(MpegEncContext *s)
{
int16_t (*tmp)[64];
tmp = s->pblocks[4];
s->pblocks[4] = s->pblocks[5];
s->pblocks[5] = tmp;
}
/* motion type (for MPEG-2) */ /* motion type (for MPEG-2) */
#define MT_FIELD 1 #define MT_FIELD 1
...@@ -777,17 +769,10 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) ...@@ -777,17 +769,10 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
} else } else
memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */ memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */
s->mb_intra = 1; s->mb_intra = 1;
#if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
// if 1, we memcpy blocks in xvmcvideo // if 1, we memcpy blocks in xvmcvideo
if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) { if (CONFIG_XVMC && s->pack_pblocks) {
ff_xvmc_pack_pblocks(s, -1); // inter are always full blocks ff_xvmc_pack_pblocks(s, -1); // inter are always full blocks
if (s->swap_uv) {
exchange_uv(s);
}
} }
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
if (s->flags2 & CODEC_FLAG2_FAST) { if (s->flags2 & CODEC_FLAG2_FAST) {
...@@ -1000,17 +985,10 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -1000,17 +985,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
return -1; return -1;
} }
#if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
//if 1, we memcpy blocks in xvmcvideo //if 1, we memcpy blocks in xvmcvideo
if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) { if (CONFIG_XVMC && s->pack_pblocks) {
ff_xvmc_pack_pblocks(s, cbp); ff_xvmc_pack_pblocks(s, cbp);
if (s->swap_uv) {
exchange_uv(s);
}
} }
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
if (s->flags2 & CODEC_FLAG2_FAST) { if (s->flags2 & CODEC_FLAG2_FAST) {
...@@ -1134,12 +1112,9 @@ static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm, ...@@ -1134,12 +1112,9 @@ static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
} }
static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = { static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = {
#if FF_API_XVMC #if CONFIG_MPEG1_XVMC_HWACCEL
#if CONFIG_MPEG_XVMC_DECODER AV_PIX_FMT_XVMC,
AV_PIX_FMT_XVMC_MPEG2_IDCT,
AV_PIX_FMT_XVMC_MPEG2_MC,
#endif #endif
#endif /* FF_API_XVMC */
#if CONFIG_MPEG1_VDPAU_HWACCEL #if CONFIG_MPEG1_VDPAU_HWACCEL
AV_PIX_FMT_VDPAU_MPEG1, AV_PIX_FMT_VDPAU_MPEG1,
AV_PIX_FMT_VDPAU, AV_PIX_FMT_VDPAU,
...@@ -1149,12 +1124,9 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = { ...@@ -1149,12 +1124,9 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = {
}; };
static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = { static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = {
#if FF_API_XVMC #if CONFIG_MPEG2_XVMC_HWACCEL
#if CONFIG_MPEG_XVMC_DECODER AV_PIX_FMT_XVMC,
AV_PIX_FMT_XVMC_MPEG2_IDCT,
AV_PIX_FMT_XVMC_MPEG2_MC,
#endif #endif
#endif /* FF_API_XVMC */
#if CONFIG_MPEG2_VDPAU_HWACCEL #if CONFIG_MPEG2_VDPAU_HWACCEL
AV_PIX_FMT_VDPAU_MPEG2, AV_PIX_FMT_VDPAU_MPEG2,
AV_PIX_FMT_VDPAU, AV_PIX_FMT_VDPAU,
...@@ -1191,25 +1163,21 @@ static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx) ...@@ -1191,25 +1163,21 @@ static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx)
static void setup_hwaccel_for_pixfmt(AVCodecContext *avctx) static void setup_hwaccel_for_pixfmt(AVCodecContext *avctx)
{ {
#if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
if (avctx->pix_fmt != AV_PIX_FMT_XVMC_MPEG2_IDCT && avctx->pix_fmt != AV_PIX_FMT_XVMC_MPEG2_MC) {
avctx->xvmc_acceleration = 0;
} else if (!avctx->xvmc_acceleration) {
avctx->xvmc_acceleration = 2;
}
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
avctx->hwaccel = ff_find_hwaccel(avctx); avctx->hwaccel = ff_find_hwaccel(avctx);
// until then pix_fmt may be changed right after codec init // until then pix_fmt may be changed right after codec init
#if FF_API_XVMC if (avctx->hwaccel || uses_vdpau(avctx))
if (avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT ||
#else
if (
#endif
avctx->hwaccel || uses_vdpau(avctx))
if (avctx->idct_algo == FF_IDCT_AUTO) if (avctx->idct_algo == FF_IDCT_AUTO)
avctx->idct_algo = FF_IDCT_SIMPLE; avctx->idct_algo = FF_IDCT_SIMPLE;
if (avctx->hwaccel && avctx->pix_fmt == AV_PIX_FMT_XVMC) {
Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
s->pack_pblocks = 1;
#if FF_API_XVMC
avctx->xvmc_acceleration = 2;
#endif /* FF_API_XVMC */
}
} }
/* Call this function when we know all parameters. /* Call this function when we know all parameters.
...@@ -1630,16 +1598,6 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) ...@@ -1630,16 +1598,6 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size)
return -1; 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; return 0;
} }
...@@ -1711,7 +1669,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, ...@@ -1711,7 +1669,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
return -1; return -1;
} }
if (avctx->hwaccel) { if (avctx->hwaccel && avctx->hwaccel->decode_slice) {
const uint8_t *buf_end, *buf_start = *buf - 4; /* include start_code */ const uint8_t *buf_end, *buf_start = *buf - 4; /* include start_code */
int start_code = -1; int start_code = -1;
buf_end = avpriv_find_start_code(buf_start + 2, *buf + buf_size, &start_code); buf_end = avpriv_find_start_code(buf_start + 2, *buf + buf_size, &start_code);
...@@ -1741,13 +1699,9 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, ...@@ -1741,13 +1699,9 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
} }
for (;;) { for (;;) {
#if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
// If 1, we memcpy blocks in xvmcvideo. // If 1, we memcpy blocks in xvmcvideo.
if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) if (CONFIG_XVMC && s->pack_pblocks)
ff_xvmc_init_block(s); // set s->block ff_xvmc_init_block(s); // set s->block
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
if (mpeg_decode_mb(s, s->block) < 0) if (mpeg_decode_mb(s, s->block) < 0)
return -1; return -1;
...@@ -1949,13 +1903,6 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) ...@@ -1949,13 +1903,6 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict)
av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n"); 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 */ /* end of slice reached */
if (/*s->mb_y << field_pic == s->mb_height &&*/ !s->first_field && !s1->first_slice) { if (/*s->mb_y << field_pic == s->mb_height &&*/ !s->first_field && !s1->first_slice) {
/* end of image */ /* end of image */
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include "mpegvideo.h" #include "mpegvideo.h"
#include "mjpegenc.h" #include "mjpegenc.h"
#include "msmpeg4.h" #include "msmpeg4.h"
#include "xvmc_internal.h"
#include "thread.h" #include "thread.h"
#include <limits.h> #include <limits.h>
...@@ -1673,28 +1672,12 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) ...@@ -1673,28 +1672,12 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
update_noise_reduction(s); update_noise_reduction(s);
} }
#if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration)
return ff_xvmc_field_start(s, avctx);
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
return 0; return 0;
} }
/* called after a frame has been decoded. */ /* called after a frame has been decoded. */
void ff_MPV_frame_end(MpegEncContext *s) void ff_MPV_frame_end(MpegEncContext *s)
{ {
#if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS
/* redraw edges for the frame if decoding didn't complete */
// just to make sure that all data is rendered.
if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) {
ff_xvmc_field_end(s);
} else
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
if ((s->er.error_count || !(s->avctx->codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND)) && if ((s->er.error_count || !(s->avctx->codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND)) &&
!s->avctx->hwaccel && !s->avctx->hwaccel &&
!(s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) && !(s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) &&
...@@ -2618,14 +2601,11 @@ void MPV_decode_mb_internal(MpegEncContext *s, int16_t block[12][64], ...@@ -2618,14 +2601,11 @@ void MPV_decode_mb_internal(MpegEncContext *s, int16_t block[12][64],
{ {
const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
#if FF_API_XVMC if (CONFIG_XVMC &&
FF_DISABLE_DEPRECATION_WARNINGS s->avctx->hwaccel && s->avctx->hwaccel->decode_mb) {
if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){ s->avctx->hwaccel->decode_mb(s);//xvmc uses pblocks
ff_xvmc_decode_mb(s);//xvmc uses pblocks
return; return;
} }
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { if(s->avctx->debug&FF_DEBUG_DCT_COEFF) {
/* print DCT coefficients */ /* print DCT coefficients */
......
...@@ -693,6 +693,7 @@ typedef struct MpegEncContext { ...@@ -693,6 +693,7 @@ typedef struct MpegEncContext {
uint8_t *ptr_lastgob; uint8_t *ptr_lastgob;
int swap_uv; //vcr2 codec is an MPEG-2 variant with U and V swapped int swap_uv; //vcr2 codec is an MPEG-2 variant with U and V swapped
int pack_pblocks; //xvmc needs to keep blocks without gaps.
int16_t (*pblocks[12])[64]; int16_t (*pblocks[12])[64];
int16_t (*block)[64]; ///< points to one of the following blocks int16_t (*block)[64]; ///< points to one of the following blocks
......
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
#include "xvmc_internal.h" #include "xvmc_internal.h"
#include "version.h" #include "version.h"
#if FF_API_XVMC
/** /**
* Initialize the block field of the MpegEncContext pointer passed as * Initialize the block field of the MpegEncContext pointer passed as
* parameter after making sure that the data is not corrupted. * parameter after making sure that the data is not corrupted.
...@@ -49,6 +47,15 @@ void ff_xvmc_init_block(MpegEncContext *s) ...@@ -49,6 +47,15 @@ void ff_xvmc_init_block(MpegEncContext *s)
s->block = (int16_t (*)[64])(render->data_blocks + render->next_free_data_block_num * 64); s->block = (int16_t (*)[64])(render->data_blocks + render->next_free_data_block_num * 64);
} }
static void exchange_uv(MpegEncContext *s)
{
int16_t (*tmp)[64];
tmp = s->pblocks[4];
s->pblocks[4] = s->pblocks[5];
s->pblocks[5] = tmp;
}
/** /**
* Fill individual block pointers, so there are no gaps in the data_block array * Fill individual block pointers, so there are no gaps in the data_block array
* in case not all blocks in the macroblock are coded. * in case not all blocks in the macroblock are coded.
...@@ -66,6 +73,9 @@ void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp) ...@@ -66,6 +73,9 @@ void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp)
s->pblocks[i] = NULL; s->pblocks[i] = NULL;
cbp += cbp; cbp += cbp;
} }
if (s->swap_uv) {
exchange_uv(s);
}
} }
/** /**
...@@ -73,8 +83,9 @@ void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp) ...@@ -73,8 +83,9 @@ void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp)
* This function should be called for every new field and/or frame. * This function should be called for every new field and/or frame.
* It should be safe to call the function a few times for the same field. * It should be safe to call the function a few times for the same field.
*/ */
int ff_xvmc_field_start(MpegEncContext *s, AVCodecContext *avctx) static int ff_xvmc_field_start(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size)
{ {
struct MpegEncContext *s = avctx->priv_data;
struct xvmc_pix_fmt *last, *next, *render = (struct xvmc_pix_fmt*)s->current_picture.f.data[2]; struct xvmc_pix_fmt *last, *next, *render = (struct xvmc_pix_fmt*)s->current_picture.f.data[2];
const int mb_block_count = 4 + (1 << s->chroma_format); const int mb_block_count = 4 + (1 << s->chroma_format);
...@@ -141,20 +152,22 @@ return -1; ...@@ -141,20 +152,22 @@ return -1;
* some leftover blocks, for example from error_resilience(), may remain. * some leftover blocks, for example from error_resilience(), may remain.
* It should be safe to call the function a few times for the same field. * It should be safe to call the function a few times for the same field.
*/ */
void ff_xvmc_field_end(MpegEncContext *s) static int ff_xvmc_field_end(AVCodecContext *avctx)
{ {
struct MpegEncContext *s = avctx->priv_data;
struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.f.data[2]; struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.f.data[2];
assert(render); assert(render);
if (render->filled_mv_blocks_num > 0) if (render->filled_mv_blocks_num > 0)
ff_mpeg_draw_horiz_band(s, 0, 0); ff_mpeg_draw_horiz_band(s, 0, 0);
return 0;
} }
/** /**
* Synthesize the data needed by XvMC to render one macroblock of data. * Synthesize the data needed by XvMC to render one macroblock of data.
* Fill all relevant fields, if necessary do IDCT. * Fill all relevant fields, if necessary do IDCT.
*/ */
void ff_xvmc_decode_mb(MpegEncContext *s) static void ff_xvmc_decode_mb(struct MpegEncContext *s)
{ {
XvMCMacroBlock *mv_block; XvMCMacroBlock *mv_block;
struct xvmc_pix_fmt *render; struct xvmc_pix_fmt *render;
...@@ -313,7 +326,7 @@ void ff_xvmc_decode_mb(MpegEncContext *s) ...@@ -313,7 +326,7 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
* slowdown. */ * slowdown. */
} }
// copy blocks only if the codec doesn't support pblocks reordering // copy blocks only if the codec doesn't support pblocks reordering
if (s->avctx->xvmc_acceleration == 1) { if (!s->pack_pblocks) {
memcpy(&render->data_blocks[render->next_free_data_block_num*64], memcpy(&render->data_blocks[render->next_free_data_block_num*64],
s->pblocks[i], sizeof(*s->pblocks[i])); s->pblocks[i], sizeof(*s->pblocks[i]));
} }
...@@ -333,4 +346,30 @@ void ff_xvmc_decode_mb(MpegEncContext *s) ...@@ -333,4 +346,30 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
ff_mpeg_draw_horiz_band(s, 0, 0); ff_mpeg_draw_horiz_band(s, 0, 0);
} }
#endif /* FF_API_XVMC */ #if CONFIG_MPEG1_XVMC_HWACCEL
AVHWAccel ff_mpeg1_xvmc_hwaccel = {
.name = "mpeg1_xvmc",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG1VIDEO,
.pix_fmt = AV_PIX_FMT_XVMC,
.start_frame = ff_xvmc_field_start,
.end_frame = ff_xvmc_field_end,
.decode_slice = NULL,
.decode_mb = ff_xvmc_decode_mb,
.priv_data_size = 0,
};
#endif
#if CONFIG_MPEG2_XVMC_HWACCEL
AVHWAccel ff_mpeg2_xvmc_hwaccel = {
.name = "mpeg2_xvmc",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO,
.pix_fmt = AV_PIX_FMT_XVMC,
.start_frame = ff_xvmc_field_start,
.end_frame = ff_xvmc_field_end,
.decode_slice = NULL,
.decode_mb = ff_xvmc_decode_mb,
.priv_data_size = 0,
};
#endif
...@@ -583,17 +583,11 @@ static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, ...@@ -583,17 +583,11 @@ static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx,
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;
if (!high_bit_depth) { if (!high_bit_depth) {
#if FF_API_XVMC if (!(CONFIG_XVMC && avctx->hwaccel && avctx->hwaccel->decode_mb)) {
FF_DISABLE_DEPRECATION_WARNINGS
if (!(CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)) {
/* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */ /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
c->clear_block = ff_clear_block_sse; c->clear_block = ff_clear_block_sse;
c->clear_blocks = ff_clear_blocks_sse; c->clear_blocks = ff_clear_blocks_sse;
#if FF_API_XVMC
} }
#endif /* FF_API_XVMC */
} }
c->vector_clipf = ff_vector_clipf_sse; c->vector_clipf = ff_vector_clipf_sse;
......
...@@ -33,8 +33,6 @@ ...@@ -33,8 +33,6 @@
#include "version.h" #include "version.h"
#include "avcodec.h" #include "avcodec.h"
#if FF_API_XVMC
/** /**
* @defgroup lavc_codec_hwaccel_xvmc XvMC * @defgroup lavc_codec_hwaccel_xvmc XvMC
* @ingroup lavc_codec_hwaccel * @ingroup lavc_codec_hwaccel
...@@ -169,6 +167,4 @@ attribute_deprecated struct xvmc_pix_fmt { ...@@ -169,6 +167,4 @@ attribute_deprecated struct xvmc_pix_fmt {
* @} * @}
*/ */
#endif /* FF_API_XVMC */
#endif /* AVCODEC_XVMC_H */ #endif /* AVCODEC_XVMC_H */
...@@ -25,14 +25,7 @@ ...@@ -25,14 +25,7 @@
#include "mpegvideo.h" #include "mpegvideo.h"
#include "version.h" #include "version.h"
#if FF_API_XVMC
void ff_xvmc_init_block(MpegEncContext *s); void ff_xvmc_init_block(MpegEncContext *s);
void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp); void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp);
int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx);
void ff_xvmc_field_end(MpegEncContext *s);
void ff_xvmc_decode_mb(MpegEncContext *s);
#endif /* FF_API_XVMC */
#endif /* AVCODEC_XVMC_INTERNAL_H */ #endif /* AVCODEC_XVMC_INTERNAL_H */
...@@ -324,6 +324,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -324,6 +324,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.flags = AV_PIX_FMT_FLAG_HWACCEL, .flags = AV_PIX_FMT_FLAG_HWACCEL,
}, },
#endif /* FF_API_XVMC */ #endif /* FF_API_XVMC */
#if !FF_API_XVMC
[AV_PIX_FMT_XVMC] = {
.name = "xvmc",
.flags = AV_PIX_FMT_FLAG_HWACCEL,
},
#endif /* !FF_API_XVMC */
[AV_PIX_FMT_UYVY422] = { [AV_PIX_FMT_UYVY422] = {
.name = "uyvy422", .name = "uyvy422",
.nb_components = 3, .nb_components = 3,
......
...@@ -83,6 +83,7 @@ enum AVPixelFormat { ...@@ -83,6 +83,7 @@ enum AVPixelFormat {
#if FF_API_XVMC #if FF_API_XVMC
AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
AV_PIX_FMT_XVMC_MPEG2_IDCT, AV_PIX_FMT_XVMC_MPEG2_IDCT,
#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT
#endif /* FF_API_XVMC */ #endif /* FF_API_XVMC */
AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
...@@ -262,6 +263,9 @@ enum AVPixelFormat { ...@@ -262,6 +263,9 @@ enum AVPixelFormat {
AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */ AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */
AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */ AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */
AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */ AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */
#if !FF_API_XVMC
AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing
#endif /* !FF_API_XVMC */
AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment