diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:00:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:00:10 +0100 |
| commit | 5f231d909f158e40d20281b88e7aecc2333057fe (patch) | |
| tree | 4a7a02aad0bc1d864181b156306dfb3c2aed0f32 /libavcodec/vdpau.c | |
| parent | f3458a56c117674bf6003b59250c79a13308c05f (diff) | |
| parent | ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118 (diff) | |
Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'
* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118':
vdpau: add a convenience function for getting a decoder profile.
Conflicts:
doc/APIchanges
libavcodec/vdpau.c
libavcodec/vdpau.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.c')
| -rw-r--r-- | libavcodec/vdpau.c | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 7a4d1458a9..b848174f90 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -438,4 +438,47 @@ void ff_vdpau_mpeg4_decode_picture(MpegEncContext *s, const uint8_t *buf, } #endif /* CONFIG_MPEG4_VDPAU_DECODER */ +int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile) +{ +#define PROFILE(prof) \ +do { \ + *profile = prof; \ + return 0; \ +} while (0) + + switch (avctx->codec_id) { + case AV_CODEC_ID_MPEG1VIDEO: PROFILE(VDP_DECODER_PROFILE_MPEG1); + case AV_CODEC_ID_MPEG2VIDEO: + switch (avctx->profile) { + case FF_PROFILE_MPEG2_MAIN: PROFILE(VDP_DECODER_PROFILE_MPEG2_MAIN); + case FF_PROFILE_MPEG2_SIMPLE: PROFILE(VDP_DECODER_PROFILE_MPEG2_SIMPLE); + default: return AVERROR(EINVAL); + } + case AV_CODEC_ID_H263: PROFILE(VDP_DECODER_PROFILE_MPEG4_PART2_ASP); + case AV_CODEC_ID_MPEG4: + switch (avctx->profile) { + case FF_PROFILE_MPEG4_SIMPLE: PROFILE(VDP_DECODER_PROFILE_MPEG4_PART2_SP); + case FF_PROFILE_MPEG4_ADVANCED_SIMPLE: PROFILE(VDP_DECODER_PROFILE_MPEG4_PART2_ASP); + default: return AVERROR(EINVAL); + } + case AV_CODEC_ID_H264: + switch (avctx->profile) { + case FF_PROFILE_H264_CONSTRAINED_BASELINE: + case FF_PROFILE_H264_BASELINE: PROFILE(VDP_DECODER_PROFILE_H264_BASELINE); + case FF_PROFILE_H264_MAIN: PROFILE(VDP_DECODER_PROFILE_H264_MAIN); + case FF_PROFILE_H264_HIGH: PROFILE(VDP_DECODER_PROFILE_H264_HIGH); + default: return AVERROR(EINVAL); + } + case AV_CODEC_ID_WMV3: + case AV_CODEC_ID_VC1: + switch (avctx->profile) { + case FF_PROFILE_VC1_SIMPLE: PROFILE(VDP_DECODER_PROFILE_VC1_SIMPLE); + case FF_PROFILE_VC1_MAIN: PROFILE(VDP_DECODER_PROFILE_VC1_MAIN); + case FF_PROFILE_VC1_ADVANCED: PROFILE(VDP_DECODER_PROFILE_VC1_ADVANCED); + default: return AVERROR(EINVAL); + } + } + return AVERROR(EINVAL); +} + /* @}*/ |