Fix VA profiles definitions for gst_vaapi_profile_get_codec() to work.

This commit is contained in:
gb 2010-04-23 10:58:19 +00:00
parent b0493e729c
commit 6cb6c387e9

View file

@ -49,6 +49,17 @@ enum _GstVaapiCodec {
GST_VAAPI_CODEC_VC1 = GST_MAKE_FOURCC('V','C','1',0),
};
/**
* GST_VAAPI_MAKE_PROFILE:
* @codec: the #GstVaapiCodec without the GST_VAAPI_CODEC_ prefix
* @sub_id: a non-zero sub-codec id
*
* Macro that evaluates to the profile composed from @codec and
* @sub_id.
*/
#define GST_VAAPI_MAKE_PROFILE(codec, sub_id) \
(GST_VAAPI_CODEC_##codec | GST_MAKE_FOURCC(0,0,0,sub_id))
/**
* GstVaapiProfile:
* @GST_VAAPI_PROFILE_MPEG1:
@ -81,19 +92,19 @@ enum _GstVaapiCodec {
* The set of all profiles for #GstVaapiProfile.
*/
enum _GstVaapiProfile {
GST_VAAPI_PROFILE_MPEG1 = GST_VAAPI_CODEC_MPEG1|1,
GST_VAAPI_PROFILE_MPEG2_SIMPLE = GST_VAAPI_CODEC_MPEG2|1,
GST_VAAPI_PROFILE_MPEG2_MAIN = GST_VAAPI_CODEC_MPEG2|2,
GST_VAAPI_PROFILE_MPEG4_SIMPLE = GST_VAAPI_CODEC_MPEG4|1,
GST_VAAPI_PROFILE_MPEG4_ADVANCED_SIMPLE = GST_VAAPI_CODEC_MPEG4|2,
GST_VAAPI_PROFILE_MPEG4_MAIN = GST_VAAPI_CODEC_MPEG4|3,
GST_VAAPI_PROFILE_H263_BASELINE = GST_VAAPI_CODEC_H263|1,
GST_VAAPI_PROFILE_H264_BASELINE = GST_VAAPI_CODEC_H264|1,
GST_VAAPI_PROFILE_H264_MAIN = GST_VAAPI_CODEC_H264|2,
GST_VAAPI_PROFILE_H264_HIGH = GST_VAAPI_CODEC_H264|3,
GST_VAAPI_PROFILE_VC1_SIMPLE = GST_VAAPI_CODEC_VC1|1,
GST_VAAPI_PROFILE_VC1_MAIN = GST_VAAPI_CODEC_VC1|2,
GST_VAAPI_PROFILE_VC1_ADVANCED = GST_VAAPI_CODEC_VC1|3,
GST_VAAPI_PROFILE_MPEG1 = GST_VAAPI_MAKE_PROFILE(MPEG1,1),
GST_VAAPI_PROFILE_MPEG2_SIMPLE = GST_VAAPI_MAKE_PROFILE(MPEG2,1),
GST_VAAPI_PROFILE_MPEG2_MAIN = GST_VAAPI_MAKE_PROFILE(MPEG2,2),
GST_VAAPI_PROFILE_MPEG4_SIMPLE = GST_VAAPI_MAKE_PROFILE(MPEG4,1),
GST_VAAPI_PROFILE_MPEG4_ADVANCED_SIMPLE = GST_VAAPI_MAKE_PROFILE(MPEG4,2),
GST_VAAPI_PROFILE_MPEG4_MAIN = GST_VAAPI_MAKE_PROFILE(MPEG4,3),
GST_VAAPI_PROFILE_H263_BASELINE = GST_VAAPI_MAKE_PROFILE(H263,1),
GST_VAAPI_PROFILE_H264_BASELINE = GST_VAAPI_MAKE_PROFILE(H264,1),
GST_VAAPI_PROFILE_H264_MAIN = GST_VAAPI_MAKE_PROFILE(H264,2),
GST_VAAPI_PROFILE_H264_HIGH = GST_VAAPI_MAKE_PROFILE(H264,3),
GST_VAAPI_PROFILE_VC1_SIMPLE = GST_VAAPI_MAKE_PROFILE(VC1,1),
GST_VAAPI_PROFILE_VC1_MAIN = GST_VAAPI_MAKE_PROFILE(VC1,2),
GST_VAAPI_PROFILE_VC1_ADVANCED = GST_VAAPI_MAKE_PROFILE(VC1,3),
};
/**