Commit 098d3891 authored by Paul B Mahol's avatar Paul B Mahol

EVRC decoder

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent c74d4658
...@@ -7,6 +7,7 @@ version <next>: ...@@ -7,6 +7,7 @@ version <next>:
- Error diffusion dither in Swscale - Error diffusion dither in Swscale
- Chained Ogg support - Chained Ogg support
- Theora Midstream reconfiguration support - Theora Midstream reconfiguration support
- EVRC decoder
version 1.1: version 1.1:
......
...@@ -814,6 +814,7 @@ following image formats are supported: ...@@ -814,6 +814,7 @@ following image formats are supported:
@item DSP Group TrueSpeech @tab @tab X @item DSP Group TrueSpeech @tab @tab X
@item DV audio @tab @tab X @item DV audio @tab @tab X
@item Enhanced AC-3 @tab X @tab X @item Enhanced AC-3 @tab X @tab X
@item EVRC (Enhanced Variable Rate Codec) @tab @tab X
@item FLAC (Free Lossless Audio Codec) @tab X @tab IX @item FLAC (Free Lossless Audio Codec) @tab X @tab IX
@item G.723.1 @tab X @tab X @item G.723.1 @tab X @tab X
@item G.729 @tab @tab X @item G.729 @tab @tab X
......
...@@ -187,6 +187,7 @@ OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o ...@@ -187,6 +187,7 @@ OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o
OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o
OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o
OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o
OBJS-$(CONFIG_EVRC_DECODER) += evrcdec.o acelp_vectors.o lsp.o
OBJS-$(CONFIG_EXR_DECODER) += exr.o OBJS-$(CONFIG_EXR_DECODER) += exr.o
OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o
OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1.o OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1.o
......
...@@ -323,6 +323,7 @@ void avcodec_register_all(void) ...@@ -323,6 +323,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (DCA, dca); REGISTER_ENCDEC (DCA, dca);
REGISTER_DECODER(DSICINAUDIO, dsicinaudio); REGISTER_DECODER(DSICINAUDIO, dsicinaudio);
REGISTER_ENCDEC (EAC3, eac3); REGISTER_ENCDEC (EAC3, eac3);
REGISTER_DECODER(EVRC, evrc);
REGISTER_DECODER(FFWAVESYNTH, ffwavesynth); REGISTER_DECODER(FFWAVESYNTH, ffwavesynth);
REGISTER_ENCDEC (FLAC, flac); REGISTER_ENCDEC (FLAC, flac);
REGISTER_ENCDEC (G723_1, g723_1); REGISTER_ENCDEC (G723_1, g723_1);
......
This diff is collapsed.
This diff is collapsed.
...@@ -2339,6 +2339,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) ...@@ -2339,6 +2339,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
case AV_CODEC_ID_ADPCM_IMA_QT: return 64; case AV_CODEC_ID_ADPCM_IMA_QT: return 64;
case AV_CODEC_ID_ADPCM_EA_XAS: return 128; case AV_CODEC_ID_ADPCM_EA_XAS: return 128;
case AV_CODEC_ID_AMR_NB: case AV_CODEC_ID_AMR_NB:
case AV_CODEC_ID_EVRC:
case AV_CODEC_ID_GSM: case AV_CODEC_ID_GSM:
case AV_CODEC_ID_QCELP: case AV_CODEC_ID_QCELP:
case AV_CODEC_ID_RA_288: return 160; case AV_CODEC_ID_RA_288: return 160;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 54 #define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MINOR 89 #define LIBAVCODEC_VERSION_MINOR 90
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
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