*/
static GstCaps *
gst_ff_vid_caps_new (AVCodecContext * context, AVCodec * codec,
- enum CodecID codec_id, gboolean encode, const char *mimetype,
+ enum AVCodecID codec_id, gboolean encode, const char *mimetype,
const char *fieldname, ...)
{
GstCaps *caps = NULL;
*/
static GstCaps *
gst_ff_aud_caps_new (AVCodecContext * context, AVCodec * codec,
- enum CodecID codec_id, gboolean encode, const char *mimetype,
+ enum AVCodecID codec_id, gboolean encode, const char *mimetype,
const char *fieldname, ...)
{
GstCaps *caps = NULL;
*/
GstCaps *
-gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
+gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
AVCodecContext * context, gboolean encode)
{
GstCaps *caps = NULL;
break;
}
- /* FIXME: context->sub_id must be filled in during decoding */
caps =
gst_ff_vid_caps_new (context, NULL, codec_id, encode,
"video/x-pn-realvideo", "rmversion", G_TYPE_INT, version, NULL);
if (context) {
- gst_caps_set_simple (caps, "format", G_TYPE_INT, context->sub_id, NULL);
if (context->extradata_size >= 8) {
gst_caps_set_simple (caps,
"subformat", G_TYPE_INT, GST_READ_UINT32_BE (context->extradata),
case AV_CODEC_ID_FLIC:
case AV_CODEC_ID_VMDVIDEO:
case AV_CODEC_ID_VMDAUDIO:
- case AV_CODEC_ID_SNOW:
case AV_CODEC_ID_VIXL:
case AV_CODEC_ID_QPEG:
case AV_CODEC_ID_PGMYUV:
static GstCaps *
gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context,
- enum CodecID codec_id)
+ enum AVCodecID codec_id)
{
GstCaps *caps = NULL;
GstVideoFormat format;
static GstCaps *
gst_ffmpeg_smpfmt_to_caps (enum AVSampleFormat sample_fmt,
- AVCodecContext * context, AVCodec * codec, enum CodecID codec_id)
+ AVCodecContext * context, AVCodec * codec, enum AVCodecID codec_id)
{
GstCaps *caps = NULL;
GstAudioFormat format;
GstCaps *
gst_ffmpeg_codectype_to_audio_caps (AVCodecContext * context,
- enum CodecID codec_id, gboolean encode, AVCodec * codec)
+ enum AVCodecID codec_id, gboolean encode, AVCodec * codec)
{
GstCaps *caps = NULL;
GstCaps *
gst_ffmpeg_codectype_to_video_caps (AVCodecContext * context,
- enum CodecID codec_id, gboolean encode, AVCodec * codec)
+ enum AVCodecID codec_id, gboolean encode, AVCodec * codec)
{
GstCaps *caps;
*/
void
-gst_ffmpeg_caps_with_codecid (enum CodecID codec_id,
+gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id,
enum AVMediaType codec_type, const GstCaps * caps, AVCodecContext * context)
{
GstStructure *str;
}
break;
- case AV_CODEC_ID_RV10:
- case AV_CODEC_ID_RV20:
- case AV_CODEC_ID_RV30:
- case AV_CODEC_ID_RV40:
- {
- gint format;
-
- if (gst_structure_get_int (str, "format", &format))
- context->sub_id = format;
-
- break;
- }
case AV_CODEC_ID_COOK:
case AV_CODEC_ID_RA_288:
case AV_CODEC_ID_RA_144:
gboolean
gst_ffmpeg_formatid_get_codecids (const gchar * format_name,
- enum CodecID ** video_codec_list, enum CodecID ** audio_codec_list,
+ enum AVCodecID ** video_codec_list, enum AVCodecID ** audio_codec_list,
AVOutputFormat * plugin)
{
- static enum CodecID tmp_vlist[] = {
+ static enum AVCodecID tmp_vlist[] = {
AV_CODEC_ID_NONE,
AV_CODEC_ID_NONE
};
- static enum CodecID tmp_alist[] = {
+ static enum AVCodecID tmp_alist[] = {
AV_CODEC_ID_NONE,
AV_CODEC_ID_NONE
};
GST_LOG ("format_name : %s", format_name);
if (!strcmp (format_name, "mp4")) {
- static enum CodecID mp4_video_list[] = {
+ static enum AVCodecID mp4_video_list[] = {
AV_CODEC_ID_MPEG4, AV_CODEC_ID_H264,
AV_CODEC_ID_MJPEG,
AV_CODEC_ID_NONE
};
- static enum CodecID mp4_audio_list[] = {
+ static enum AVCodecID mp4_audio_list[] = {
AV_CODEC_ID_AAC, AV_CODEC_ID_MP3,
AV_CODEC_ID_NONE
};
*video_codec_list = mp4_video_list;
*audio_codec_list = mp4_audio_list;
} else if (!strcmp (format_name, "mpeg")) {
- static enum CodecID mpeg_video_list[] = { AV_CODEC_ID_MPEG1VIDEO,
+ static enum AVCodecID mpeg_video_list[] = { AV_CODEC_ID_MPEG1VIDEO,
AV_CODEC_ID_MPEG2VIDEO,
AV_CODEC_ID_H264,
AV_CODEC_ID_NONE
};
- static enum CodecID mpeg_audio_list[] = { AV_CODEC_ID_MP1,
+ static enum AVCodecID mpeg_audio_list[] = { AV_CODEC_ID_MP1,
AV_CODEC_ID_MP2,
AV_CODEC_ID_MP3,
AV_CODEC_ID_NONE
*video_codec_list = mpeg_video_list;
*audio_codec_list = mpeg_audio_list;
} else if (!strcmp (format_name, "dvd")) {
- static enum CodecID mpeg_video_list[] = { AV_CODEC_ID_MPEG2VIDEO,
+ static enum AVCodecID mpeg_video_list[] = { AV_CODEC_ID_MPEG2VIDEO,
AV_CODEC_ID_NONE
};
- static enum CodecID mpeg_audio_list[] = { AV_CODEC_ID_MP2,
+ static enum AVCodecID mpeg_audio_list[] = { AV_CODEC_ID_MP2,
AV_CODEC_ID_AC3,
AV_CODEC_ID_DTS,
AV_CODEC_ID_PCM_S16BE,
*video_codec_list = mpeg_video_list;
*audio_codec_list = mpeg_audio_list;
} else if (!strcmp (format_name, "mpegts")) {
- static enum CodecID mpegts_video_list[] = { AV_CODEC_ID_MPEG1VIDEO,
+ static enum AVCodecID mpegts_video_list[] = { AV_CODEC_ID_MPEG1VIDEO,
AV_CODEC_ID_MPEG2VIDEO,
AV_CODEC_ID_H264,
AV_CODEC_ID_NONE
};
- static enum CodecID mpegts_audio_list[] = { AV_CODEC_ID_MP2,
+ static enum AVCodecID mpegts_audio_list[] = { AV_CODEC_ID_MP2,
AV_CODEC_ID_MP3,
AV_CODEC_ID_AC3,
AV_CODEC_ID_DTS,
*video_codec_list = mpegts_video_list;
*audio_codec_list = mpegts_audio_list;
} else if (!strcmp (format_name, "vob")) {
- static enum CodecID vob_video_list[] =
+ static enum AVCodecID vob_video_list[] =
{ AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_NONE };
- static enum CodecID vob_audio_list[] = { AV_CODEC_ID_MP2, AV_CODEC_ID_AC3,
+ static enum AVCodecID vob_audio_list[] = { AV_CODEC_ID_MP2, AV_CODEC_ID_AC3,
AV_CODEC_ID_DTS, AV_CODEC_ID_NONE
};
*video_codec_list = vob_video_list;
*audio_codec_list = vob_audio_list;
} else if (!strcmp (format_name, "flv")) {
- static enum CodecID flv_video_list[] =
+ static enum AVCodecID flv_video_list[] =
{ AV_CODEC_ID_FLV1, AV_CODEC_ID_NONE };
- static enum CodecID flv_audio_list[] =
+ static enum AVCodecID flv_audio_list[] =
{ AV_CODEC_ID_MP3, AV_CODEC_ID_NONE };
*video_codec_list = flv_video_list;
*audio_codec_list = flv_audio_list;
} else if (!strcmp (format_name, "asf")) {
- static enum CodecID asf_video_list[] =
+ static enum AVCodecID asf_video_list[] =
{ AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2, AV_CODEC_ID_MSMPEG4V3,
AV_CODEC_ID_NONE
};
- static enum CodecID asf_audio_list[] =
+ static enum AVCodecID asf_audio_list[] =
{ AV_CODEC_ID_WMAV1, AV_CODEC_ID_WMAV2, AV_CODEC_ID_MP3,
AV_CODEC_ID_NONE
};
*video_codec_list = asf_video_list;
*audio_codec_list = asf_audio_list;
} else if (!strcmp (format_name, "dv")) {
- static enum CodecID dv_video_list[] =
+ static enum AVCodecID dv_video_list[] =
{ AV_CODEC_ID_DVVIDEO, AV_CODEC_ID_NONE };
- static enum CodecID dv_audio_list[] =
+ static enum AVCodecID dv_audio_list[] =
{ AV_CODEC_ID_PCM_S16LE, AV_CODEC_ID_NONE };
*video_codec_list = dv_video_list;
*audio_codec_list = dv_audio_list;
} else if (!strcmp (format_name, "mov")) {
- static enum CodecID mov_video_list[] = {
+ static enum AVCodecID mov_video_list[] = {
AV_CODEC_ID_SVQ1, AV_CODEC_ID_SVQ3, AV_CODEC_ID_MPEG4,
AV_CODEC_ID_H263, AV_CODEC_ID_H263P,
AV_CODEC_ID_H264, AV_CODEC_ID_DVVIDEO,
AV_CODEC_ID_MJPEG,
AV_CODEC_ID_NONE
};
- static enum CodecID mov_audio_list[] = {
+ static enum AVCodecID mov_audio_list[] = {
AV_CODEC_ID_PCM_MULAW, AV_CODEC_ID_PCM_ALAW, AV_CODEC_ID_ADPCM_IMA_QT,
AV_CODEC_ID_MACE3, AV_CODEC_ID_MACE6, AV_CODEC_ID_AAC,
AV_CODEC_ID_AMR_NB, AV_CODEC_ID_AMR_WB,
*video_codec_list = mov_video_list;
*audio_codec_list = mov_audio_list;
} else if ((!strcmp (format_name, "3gp") || !strcmp (format_name, "3g2"))) {
- static enum CodecID tgp_video_list[] = {
+ static enum AVCodecID tgp_video_list[] = {
AV_CODEC_ID_MPEG4, AV_CODEC_ID_H263, AV_CODEC_ID_H263P, AV_CODEC_ID_H264,
AV_CODEC_ID_NONE
};
- static enum CodecID tgp_audio_list[] = {
+ static enum AVCodecID tgp_audio_list[] = {
AV_CODEC_ID_AMR_NB, AV_CODEC_ID_AMR_WB,
AV_CODEC_ID_AAC,
AV_CODEC_ID_NONE
*video_codec_list = tgp_video_list;
*audio_codec_list = tgp_audio_list;
} else if (!strcmp (format_name, "mmf")) {
- static enum CodecID mmf_audio_list[] = {
+ static enum AVCodecID mmf_audio_list[] = {
AV_CODEC_ID_ADPCM_YAMAHA, AV_CODEC_ID_NONE
};
*video_codec_list = NULL;
*audio_codec_list = mmf_audio_list;
} else if (!strcmp (format_name, "amr")) {
- static enum CodecID amr_audio_list[] = {
+ static enum AVCodecID amr_audio_list[] = {
AV_CODEC_ID_AMR_NB, AV_CODEC_ID_AMR_WB,
AV_CODEC_ID_NONE
};
*video_codec_list = NULL;
*audio_codec_list = amr_audio_list;
} else if (!strcmp (format_name, "gif")) {
- static enum CodecID gif_image_list[] = {
+ static enum AVCodecID gif_image_list[] = {
AV_CODEC_ID_RAWVIDEO, AV_CODEC_ID_NONE
};
*video_codec_list = gif_image_list;
*video_codec_list = tmp_vlist;
*audio_codec_list = tmp_alist;
} else if ((!strcmp (format_name, "pva"))) {
- static enum CodecID tgp_video_list[] = {
+ static enum AVCodecID tgp_video_list[] = {
AV_CODEC_ID_MPEG2VIDEO,
AV_CODEC_ID_NONE
};
- static enum CodecID tgp_audio_list[] = {
+ static enum AVCodecID tgp_audio_list[] = {
AV_CODEC_ID_MP2,
AV_CODEC_ID_NONE
};
* optional extra info
*/
-enum CodecID
+enum AVCodecID
gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
{
- enum CodecID id = AV_CODEC_ID_NONE;
+ enum AVCodecID id = AV_CODEC_ID_NONE;
const gchar *mimetype;
const GstStructure *structure;
gboolean video = FALSE, audio = FALSE; /* we want to be sure! */