diff options
Diffstat (limited to 'ext/ffmpeg')
| -rw-r--r-- | ext/ffmpeg/gstffmpegcodecmap.c | 11 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegprotocol.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 45581a5..96ede9f 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -443,6 +443,9 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id, case CODEC_ID_TRUEHD: maxchannels = 8; break; + case CODEC_ID_ADPCM_G722: + maxchannels = 1; + break; default: break; } @@ -1274,6 +1277,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-alaw", NULL); break; + case CODEC_ID_ADPCM_G722: + caps = gst_ff_aud_caps_new (context, codec_id, "audio/G722", NULL); + break; + case CODEC_ID_ADPCM_G726: { /* the G726 decoder can also handle G721 */ @@ -3161,6 +3168,10 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context) } if (id != CODEC_ID_NONE) audio = TRUE; + + } else if (!strcmp (mimetype, "audio/G722")) { + id = CODEC_ID_ADPCM_G722; + audio = TRUE; } else if (!strcmp (mimetype, "video/x-4xm")) { id = CODEC_ID_4XM; video = TRUE; diff --git a/ext/ffmpeg/gstffmpegprotocol.c b/ext/ffmpeg/gstffmpegprotocol.c index f46ac28..713a874 100644 --- a/ext/ffmpeg/gstffmpegprotocol.c +++ b/ext/ffmpeg/gstffmpegprotocol.c @@ -154,7 +154,7 @@ gst_ffmpegdata_read (URLContext * h, unsigned char *buf, int size) } static int -gst_ffmpegdata_write (URLContext * h, unsigned char *buf, int size) +gst_ffmpegdata_write (URLContext * h, const unsigned char *buf, int size) { GstProtocolInfo *info; GstBuffer *outbuf; |