Commit cc4a1183 authored by Edward Hervey's avatar Edward Hervey

gstffmpegcodecmap: Add some new codec mappings

VP8
LAGARITH
GSM
GSM_MS
parent ed1b1eef
...@@ -943,6 +943,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, ...@@ -943,6 +943,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vp6-alpha", NULL); caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vp6-alpha", NULL);
break; break;
case CODEC_ID_VP8:
caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vp8", NULL);
break;
case CODEC_ID_THEORA: case CODEC_ID_THEORA:
caps = gst_ff_vid_caps_new (context, codec_id, "video/x-theora", NULL); caps = gst_ff_vid_caps_new (context, codec_id, "video/x-theora", NULL);
break; break;
...@@ -1182,6 +1186,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, ...@@ -1182,6 +1186,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
caps = gst_ff_vid_caps_new (context, codec_id, "video/x-zmbv", NULL); caps = gst_ff_vid_caps_new (context, codec_id, "video/x-zmbv", NULL);
break; break;
case CODEC_ID_LAGARITH:
caps = gst_ff_vid_caps_new (context, codec_id, "video/x-lagarith", NULL);
break;
case CODEC_ID_WS_VQA: case CODEC_ID_WS_VQA:
case CODEC_ID_IDCIN: case CODEC_ID_IDCIN:
...@@ -1430,6 +1438,14 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, ...@@ -1430,6 +1438,14 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
caps = gst_ff_aud_caps_new (context, codec_id, "audio/AMR-WB", NULL); caps = gst_ff_aud_caps_new (context, codec_id, "audio/AMR-WB", NULL);
break; break;
case CODEC_ID_GSM:
caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-gsm", NULL);
break;
case CODEC_ID_GSM_MS:
caps = gst_ff_aud_caps_new (context, codec_id, "audio/ms-gsm", NULL);
break;
case CODEC_ID_NELLYMOSER: case CODEC_ID_NELLYMOSER:
caps = caps =
gst_ff_aud_caps_new (context, codec_id, "audio/x-nellymoser", NULL); gst_ff_aud_caps_new (context, codec_id, "audio/x-nellymoser", NULL);
...@@ -3073,6 +3089,9 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context) ...@@ -3073,6 +3089,9 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
} else if (!strcmp (mimetype, "video/x-vp6-alpha")) { } else if (!strcmp (mimetype, "video/x-vp6-alpha")) {
id = CODEC_ID_VP6A; id = CODEC_ID_VP6A;
video = TRUE; video = TRUE;
} else if (!strcmp (mimetype, "video/x-vp8")) {
id = CODEC_ID_VP8;
video = TRUE;
} else if (!strcmp (mimetype, "video/x-flash-screen")) { } else if (!strcmp (mimetype, "video/x-flash-screen")) {
id = CODEC_ID_FLASHSV; id = CODEC_ID_FLASHSV;
video = TRUE; video = TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment