diff options
author | Ivan Kalvachev <ikalvachev@gmail.com> | 2013-12-14 21:29:15 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 22:03:47 +0100 |
commit | 1c63aed232febf4404659bf006237ee4f7f17c9c (patch) | |
tree | 8024b37b264802e26a7c481692b6ea1566e83284 /libavcodec | |
parent | c19f193c6b239782b10bd9df117da2e50468edf9 (diff) | |
download | ffmpeg-1c63aed232febf4404659bf006237ee4f7f17c9c.tar.gz |
Convert XvMC to hwaccel v3
Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/Makefile | 5 | ||||
-rw-r--r-- | libavcodec/allcodecs.c | 2 | ||||
-rw-r--r-- | libavcodec/avcodec.h | 24 | ||||
-rw-r--r-- | libavcodec/error_resilience.c | 20 | ||||
-rw-r--r-- | libavcodec/mpeg12dec.c | 91 | ||||
-rw-r--r-- | libavcodec/mpegvideo.c | 26 | ||||
-rw-r--r-- | libavcodec/mpegvideo.h | 1 | ||||
-rw-r--r-- | libavcodec/mpegvideo_xvmc.c | 53 | ||||
-rw-r--r-- | libavcodec/x86/dsputil_init.c | 8 | ||||
-rw-r--r-- | libavcodec/xvmc.h | 4 | ||||
-rw-r--r-- | libavcodec/xvmc_internal.h | 7 |
11 files changed, 103 insertions, 138 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fbcc576735..ef74f21429 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -297,7 +297,6 @@ OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.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_ENCODER) += mpeg12enc.o mpeg12.o OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o @@ -635,9 +634,11 @@ OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.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_VAAPI_HWACCEL) += vaapi_mpeg2.o vaapi_mpeg.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_VDPAU_HWACCEL) += vdpau_mpeg4.o OBJS-$(CONFIG_VC1_DXVA2_HWACCEL) += dxva2_vc1.o @@ -827,7 +828,7 @@ SKIPHEADERS += %_tablegen.h \ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.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_VDA) += vda.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index ffa828baf0..e3a825187f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -80,7 +80,9 @@ void avcodec_register_all(void) REGISTER_HWACCEL(H264_VAAPI, h264_vaapi); REGISTER_HWACCEL(H264_VDA, h264_vda); REGISTER_HWACCEL(H264_VDPAU, h264_vdpau); + REGISTER_HWACCEL(MPEG1_XVMC, mpeg1_xvmc); REGISTER_HWACCEL(MPEG1_VDPAU, mpeg1_vdpau); + REGISTER_HWACCEL(MPEG2_XVMC, mpeg2_xvmc); REGISTER_HWACCEL(MPEG2_DXVA2, mpeg2_dxva2); REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi); REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fbf31ef4f6..c614829aaf 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -767,7 +767,13 @@ typedef struct RcOverride{ #define CODEC_CAP_DR1 0x0002 #define CODEC_CAP_TRUNCATED 0x0008 #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 #endif /* FF_API_XVMC */ /** @@ -1695,7 +1701,7 @@ typedef struct AVCodecContext { * XVideo Motion Acceleration * - encoding: forbidden * - decoding: set by decoder - * @deprecated XvMC support is slated for removal. + * @deprecated XvMC doesn't need it anymore. */ attribute_deprecated int xvmc_acceleration; #endif /* FF_API_XVMC */ @@ -3100,6 +3106,8 @@ typedef struct AVCodec { int av_codec_get_max_lowres(const AVCodec *codec); +struct MpegEncContext; + /** * AVHWAccel. */ @@ -3161,6 +3169,7 @@ typedef struct AVHWAccel { * * Meaningful slice information (codec specific) is guaranteed to * 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 buf the slice data buffer base @@ -3188,6 +3197,17 @@ typedef struct AVHWAccel { * AVCodecContext.release_buffer(). */ 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; /** diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 8e3fb616be..ebd671a740 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -699,15 +699,11 @@ static int is_intra_more_likely(ERContext *s) if (undamaged_count < 5) 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 - if (CONFIG_MPEG_XVMC_DECODER && - s->avctx->xvmc_acceleration && + if (CONFIG_XVMC && + s->avctx->hwaccel && s->avctx->hwaccel->decode_mb && s->cur_pic->f.pict_type == AV_PICTURE_TYPE_I) return 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_XVMC */ skip_amount = FFMAX(undamaged_count / 50, 1); // check only up to 50 MBs is_intra_likely = 0; @@ -770,7 +766,7 @@ void ff_er_frame_start(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->cur_pic || s->cur_pic->field_picture @@ -795,7 +791,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, const int end_xy = s->mb_index2xy[end_i]; int mask = -1; - if (s->avctx->hwaccel) + if (s->avctx->hwaccel && s->avctx->hwaccel->decode_slice) return; if (start_i > end_i || start_xy > end_xy) { @@ -1188,13 +1184,9 @@ void ff_er_frame_end(ERContext *s) } else guess_mv(s); -#if FF_API_XVMC -FF_DISABLE_DEPRECATION_WARNINGS - /* the filters below are not XvMC compatible, skip them */ - if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) + /* the filters below manipulate raw image, skip them */ + if (CONFIG_XVMC && s->avctx->hwaccel && s->avctx->hwaccel->decode_mb) goto ec_clean; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_XVMC */ /* fill DC for inter blocks */ for (mb_y = 0; mb_y < s->mb_height; mb_y++) { for (mb_x = 0; mb_x < s->mb_width; mb_x++) { diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 653e78c301..de6b2b6859 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -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) */ #define MT_FIELD 1 @@ -777,17 +769,10 @@ 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) { + if (CONFIG_XVMC && s->pack_pblocks) { 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->flags2 & CODEC_FLAG2_FAST) { @@ -1000,17 +985,10 @@ FF_ENABLE_DEPRECATION_WARNINGS 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) { + if (CONFIG_XVMC && s->pack_pblocks) { 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->flags2 & CODEC_FLAG2_FAST) { @@ -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[] = { -#if FF_API_XVMC -#if CONFIG_MPEG_XVMC_DECODER - AV_PIX_FMT_XVMC_MPEG2_IDCT, - AV_PIX_FMT_XVMC_MPEG2_MC, +#if CONFIG_MPEG1_XVMC_HWACCEL + AV_PIX_FMT_XVMC, #endif -#endif /* FF_API_XVMC */ #if CONFIG_MPEG1_VDPAU_HWACCEL AV_PIX_FMT_VDPAU_MPEG1, AV_PIX_FMT_VDPAU, @@ -1149,12 +1124,9 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = { }; static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = { -#if FF_API_XVMC -#if CONFIG_MPEG_XVMC_DECODER - AV_PIX_FMT_XVMC_MPEG2_IDCT, - AV_PIX_FMT_XVMC_MPEG2_MC, +#if CONFIG_MPEG2_XVMC_HWACCEL + AV_PIX_FMT_XVMC, #endif -#endif /* FF_API_XVMC */ #if CONFIG_MPEG2_VDPAU_HWACCEL AV_PIX_FMT_VDPAU_MPEG2, AV_PIX_FMT_VDPAU, @@ -1191,25 +1163,21 @@ static enum AVPixelFormat mpeg_get_pixelformat(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); // until then pix_fmt may be changed right after codec init -#if FF_API_XVMC - if (avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT || -#else - if ( -#endif - avctx->hwaccel || uses_vdpau(avctx)) + if (avctx->hwaccel || uses_vdpau(avctx)) if (avctx->idct_algo == FF_IDCT_AUTO) 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. @@ -1630,16 +1598,6 @@ 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; } @@ -1711,7 +1669,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, return -1; } - if (avctx->hwaccel) { + if (avctx->hwaccel && avctx->hwaccel->decode_slice) { const uint8_t *buf_end, *buf_start = *buf - 4; /* include start_code */ int start_code = -1; 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, } 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) + if (CONFIG_XVMC && s->pack_pblocks) 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; @@ -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"); } -#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 && !s1->first_slice) { /* end of image */ diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index e96791af6b..cf7178466b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -39,7 +39,6 @@ #include "mpegvideo.h" #include "mjpegenc.h" #include "msmpeg4.h" -#include "xvmc_internal.h" #include "thread.h" #include <limits.h> @@ -1673,28 +1672,12 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) 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; } /* called after a frame has been decoded. */ 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)) && !s->avctx->hwaccel && !(s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) && @@ -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; -#if FF_API_XVMC -FF_DISABLE_DEPRECATION_WARNINGS - if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){ - ff_xvmc_decode_mb(s);//xvmc uses pblocks + if (CONFIG_XVMC && + s->avctx->hwaccel && s->avctx->hwaccel->decode_mb) { + s->avctx->hwaccel->decode_mb(s);//xvmc uses pblocks return; } -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_XVMC */ if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { /* print DCT coefficients */ diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 65c4f9e0d5..6786ec1a1e 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -693,6 +693,7 @@ typedef struct MpegEncContext { uint8_t *ptr_lastgob; 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 (*block)[64]; ///< points to one of the following blocks diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c index 664c0089a1..9fc97cb0f5 100644 --- a/libavcodec/mpegvideo_xvmc.c +++ b/libavcodec/mpegvideo_xvmc.c @@ -32,8 +32,6 @@ #include "xvmc_internal.h" #include "version.h" -#if FF_API_XVMC - /** * Initialize the block field of the MpegEncContext pointer passed as * parameter after making sure that the data is not corrupted. @@ -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); } +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 * in case not all blocks in the macroblock are coded. @@ -66,6 +73,9 @@ void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp) s->pblocks[i] = NULL; cbp += cbp; } + if (s->swap_uv) { + exchange_uv(s); + } } /** @@ -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. * 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]; const int mb_block_count = 4 + (1 << s->chroma_format); @@ -141,20 +152,22 @@ return -1; * 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. */ -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]; assert(render); if (render->filled_mv_blocks_num > 0) ff_mpeg_draw_horiz_band(s, 0, 0); + return 0; } /** * Synthesize the data needed by XvMC to render one macroblock of data. * 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; struct xvmc_pix_fmt *render; @@ -313,7 +326,7 @@ void ff_xvmc_decode_mb(MpegEncContext *s) * slowdown. */ } // 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], s->pblocks[i], sizeof(*s->pblocks[i])); } @@ -333,4 +346,30 @@ void ff_xvmc_decode_mb(MpegEncContext *s) 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 diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index 4c9f499021..36fa38fb2a 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -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; if (!high_bit_depth) { -#if FF_API_XVMC -FF_DISABLE_DEPRECATION_WARNINGS - if (!(CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)) { + if (!(CONFIG_XVMC && avctx->hwaccel && avctx->hwaccel->decode_mb)) { /* 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_blocks = ff_clear_blocks_sse; -#if FF_API_XVMC } -#endif /* FF_API_XVMC */ } c->vector_clipf = ff_vector_clipf_sse; diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h index efd69fc913..c2e187cc16 100644 --- a/libavcodec/xvmc.h +++ b/libavcodec/xvmc.h @@ -33,8 +33,6 @@ #include "version.h" #include "avcodec.h" -#if FF_API_XVMC - /** * @defgroup lavc_codec_hwaccel_xvmc XvMC * @ingroup lavc_codec_hwaccel @@ -169,6 +167,4 @@ attribute_deprecated struct xvmc_pix_fmt { * @} */ -#endif /* FF_API_XVMC */ - #endif /* AVCODEC_XVMC_H */ diff --git a/libavcodec/xvmc_internal.h b/libavcodec/xvmc_internal.h index 6a60add965..d365ef0266 100644 --- a/libavcodec/xvmc_internal.h +++ b/libavcodec/xvmc_internal.h @@ -25,14 +25,7 @@ #include "mpegvideo.h" #include "version.h" -#if FF_API_XVMC - void ff_xvmc_init_block(MpegEncContext *s); 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 */ |