Mercurial > libavcodec.hg
changeset 9011:90c99bda19f5 libavcodec
Approved hunks for VAAPI / our new shiny hwaccel API
by Gwenole Beauchesne gbeauchesne splitted desktop com
| author | michael |
|---|---|
| date | Mon, 23 Feb 2009 13:35:52 +0000 |
| parents | b6a47d0b6b63 |
| children | 15a3df8c01fd |
| files | imgconvert.c mpeg12.c mpegvideo.c utils.c vc1.c |
| diffstat | 5 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/imgconvert.c Sun Feb 22 23:13:00 2009 +0000 +++ b/imgconvert.c Mon Feb 23 13:35:52 2009 +0000 @@ -57,6 +57,7 @@ uint8_t color_type; /**< color type (see FF_COLOR_xxx constants) */ uint8_t pixel_type; /**< pixel storage type (see FF_PIXEL_xxx constants) */ uint8_t is_alpha : 1; /**< true if alpha can be specified */ + uint8_t is_hwaccel : 1; /**< true if this is an HW accelerated format */ uint8_t x_chroma_shift; /**< X chroma subsampling factor is 2 ^ shift */ uint8_t y_chroma_shift; /**< Y chroma subsampling factor is 2 ^ shift */ uint8_t depth; /**< bit depth of the color components */ @@ -279,24 +280,31 @@ }, [PIX_FMT_XVMC_MPEG2_MC] = { .name = "xvmcmc", + .is_hwaccel = 1, }, [PIX_FMT_XVMC_MPEG2_IDCT] = { .name = "xvmcidct", + .is_hwaccel = 1, }, [PIX_FMT_VDPAU_MPEG1] = { .name = "vdpau_mpeg1", + .is_hwaccel = 1, }, [PIX_FMT_VDPAU_MPEG2] = { .name = "vdpau_mpeg2", + .is_hwaccel = 1, }, [PIX_FMT_VDPAU_H264] = { .name = "vdpau_h264", + .is_hwaccel = 1, }, [PIX_FMT_VDPAU_WMV3] = { .name = "vdpau_wmv3", + .is_hwaccel = 1, }, [PIX_FMT_VDPAU_VC1] = { .name = "vdpau_vc1", + .is_hwaccel = 1, }, [PIX_FMT_UYYVYY411] = { .name = "uyyvyy411", @@ -459,6 +467,11 @@ } } +int ff_is_hwaccel_pix_fmt(enum PixelFormat pix_fmt) +{ + return pix_fmt_info[pix_fmt].is_hwaccel; +} + int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt){ int i;
--- a/mpeg12.c Sun Feb 22 23:13:00 2009 +0000 +++ b/mpeg12.c Mon Feb 23 13:35:52 2009 +0000 @@ -26,6 +26,7 @@ */ //#define DEBUG +#include "internal.h" #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" @@ -1303,6 +1304,7 @@ avctx->pix_fmt = mpeg_get_pixelformat(avctx); //until then pix_fmt may be changed right after codec init if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT || + avctx->hwaccel || s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ) if( avctx->idct_algo == FF_IDCT_AUTO ) avctx->idct_algo = FF_IDCT_SIMPLE;
--- a/mpegvideo.c Sun Feb 22 23:13:00 2009 +0000 +++ b/mpegvideo.c Mon Feb 23 13:35:52 2009 +0000 @@ -955,7 +955,8 @@ //just to make sure that all data is rendered. if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){ ff_xvmc_field_end(s); - }else if(!(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) + }else if(!s->avctx->hwaccel + && !(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) && s->unrestricted_mv && s->current_picture.reference && !s->intra_only
--- a/utils.c Sun Feb 22 23:13:00 2009 +0000 +++ b/utils.c Mon Feb 23 13:35:52 2009 +0000 @@ -391,7 +391,9 @@ return 0; } -enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt){ +enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt){ + while (*fmt != PIX_FMT_NONE && ff_is_hwaccel_pix_fmt(*fmt)) + ++fmt; return fmt[0]; }