case GST_VAAPI_CODEC_MPEG4: return CODEC_ID_MPEG4;
case GST_VAAPI_CODEC_H263: return CODEC_ID_H263;
case GST_VAAPI_CODEC_H264: return CODEC_ID_H264;
+ case GST_VAAPI_CODEC_WMV3: return CODEC_ID_WMV3;
case GST_VAAPI_CODEC_VC1: return CODEC_ID_VC1;
}
return CODEC_ID_NONE;
input encoded buffers represent the whole NAL unit */
parser_is_needed = priv->avctx->extradata_size == 0;
break;
+ case CODEC_ID_WMV3:
+ /* There is no WMV3 parser in FFmpeg */
+ parser_is_needed = FALSE;
+ break;
default:
parser_is_needed = TRUE;
break;
#include "gstvaapicompat.h"
#include "gstvaapiprofile.h"
-#define GST_VAAPI_PROFILE_CODEC(profile) \
- ((GstVaapiCodec)(((guint32)profile) & GST_MAKE_FOURCC(0xff,0xff,0xff,0)))
-
typedef struct _GstVaapiProfileMap GstVaapiProfileMap;
typedef struct _GstVaapiEntrypointMap GstVaapiEntrypointMap;
}
if (!profile)
profile = gst_vaapi_profile_from_codec_data(
- GST_VAAPI_PROFILE_CODEC(m->profile),
+ gst_vaapi_profile_get_codec(m->profile),
codec_data
);
gst_caps_unref(caps_test);
GstVaapiCodec
gst_vaapi_profile_get_codec(GstVaapiProfile profile)
{
- return GST_VAAPI_PROFILE_CODEC(profile);
+ GstVaapiCodec codec;
+
+ switch (profile) {
+ case GST_VAAPI_PROFILE_VC1_SIMPLE:
+ case GST_VAAPI_PROFILE_VC1_MAIN:
+ codec = GST_VAAPI_CODEC_WMV3;
+ break;
+ case GST_VAAPI_PROFILE_VC1_ADVANCED:
+ codec = GST_VAAPI_CODEC_VC1;
+ break;
+ default:
+ codec = (guint32)profile & GST_MAKE_FOURCC(0xff,0xff,0xff,0);
+ break;
+ }
+ return codec;
}
/**
* @GST_VAAPI_CODEC_MPEG4: MPEG-4 Part 2 (ISO/IEC 14496-2)
* @GST_VAAPI_CODEC_H263: H.263
* @GST_VAAPI_CODEC_H264: H.264 aka MPEG-4 Part 10 (ISO/IEC 14496-10)
- * @GST_VAAPI_CODEC_VC1: VC-1 (SMPTE 421M)
+ * @GST_VAAPI_CODEC_WMV3: Windows Media Video 9. VC-1 Simple or Main profile (SMPTE 421M)
+ * @GST_VAAPI_CODEC_VC1: VC-1 Advanced profile (SMPTE 421M)
*
* The set of all codecs for #GstVaapiCodec.
*/
GST_VAAPI_CODEC_MPEG4 = GST_MAKE_FOURCC('M','P','4',0),
GST_VAAPI_CODEC_H263 = GST_MAKE_FOURCC('2','6','3',0),
GST_VAAPI_CODEC_H264 = GST_MAKE_FOURCC('2','6','4',0),
+ GST_VAAPI_CODEC_WMV3 = GST_MAKE_FOURCC('W','M','V',0),
GST_VAAPI_CODEC_VC1 = GST_MAKE_FOURCC('V','C','1',0),
};
* @GST_VAAPI_PROFILE_VC1_SIMPLE:
* VC-1 simple profile
* @GST_VAAPI_PROFILE_VC1_MAIN:
- * VC-1 main profile (WMV3)
+ * VC-1 main profile
* @GST_VAAPI_PROFILE_VC1_ADVANCED:
* VC-1 advanced profile
*