@@ -84,6 +84,7 @@ version <next>:

 - Chronomaster DFA decoder

 - Mobotix MxPEG decoder

 - AAC encoding via libvo-aacenc

+- AMR-WB encoding via libvo-amrwbenc

 version 0.6:

@@ -179,6 +179,7 @@ External library support:

   --enable-libspeex        enable Speex decoding via libspeex [no]

   --enable-libtheora       enable Theora encoding via libtheora [no]

   --enable-libvo-aacenc    enable AAC encoding via libvo-aacenc [no]

+  --enable-libvo-amrwbenc  enable AMR-WB encoding via libvo-amrwbenc [no]

   --enable-libvorbis       enable Vorbis encoding via libvorbis,

                            native implementation exists [no]

   --enable-libvpx          enable VP8 support via libvpx [no]

@@ -939,6 +940,7 @@ CONFIG_LIST="

     libspeex

     libtheora

     libvo_aacenc

+    libvo_amrwbenc

     libvorbis

     libvpx

     libx264

@@ -1387,6 +1389,7 @@ libschroedinger_encoder_deps="libschroedinger"

 libspeex_decoder_deps="libspeex"

 libtheora_encoder_deps="libtheora"

 libvo_aacenc_encoder_deps="libvo_aacenc"

+libvo_amrwbenc_encoder_deps="libvo_amrwbenc"

 libvorbis_encoder_deps="libvorbis"

 libvpx_decoder_deps="libvpx"

 libvpx_encoder_deps="libvpx"

@@ -2529,6 +2532,7 @@ die_license_disabled nonfree libfaac

 die_license_disabled version3 libopencore_amrnb

 die_license_disabled version3 libopencore_amrwb

 die_license_disabled version3 libvo_aacenc

+die_license_disabled version3 libvo_amrwbenc

 enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }

@@ -2869,6 +2873,7 @@ enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schr

 enabled libspeex   && require  libspeex speex/speex.h speex_decoder_init -lspeex

 enabled libtheora  && require  libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg

 enabled libvo_aacenc && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc

+enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc

 enabled libvorbis  && require  libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg

 enabled libvpx     && {

     enabled libvpx_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx ||

@@ -3138,6 +3143,7 @@ echo "libspeex enabled          ${libspeex-no}"

 echo "libtheora enabled         ${libtheora-no}"

 echo "libva enabled             ${vaapi-no}"

 echo "libvo-aacenc support      ${libvo_aacenc-no}"

+echo "libvo-amrwbenc support    ${libvo_amrwbenc-no}"

 echo "libvorbis enabled         ${libvorbis-no}"

 echo "libvpx enabled            ${libvpx-no}"

 echo "libx264 enabled           ${libx264-no}"

@@ -588,7 +588,8 @@ following image formats are supported:

 @item ADPCM Yamaha           @tab  X  @tab  X

 @item AMR-NB                 @tab  E  @tab  X

     @tab encoding supported through external library libopencore-amrnb

-@item AMR-WB                 @tab     @tab  X

+@item AMR-WB                 @tab  E  @tab  X

+    @tab encoding supported through external library libvo-amrwbenc

 @item Apple lossless audio   @tab  X  @tab  X

     @tab QuickTime fourcc 'alac'

 @item Atrac 1                @tab     @tab  X

@@ -569,6 +569,7 @@ OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER)    += libschroedingerenc.o \

 OBJS-$(CONFIG_LIBSPEEX_DECODER)           += libspeexdec.o

 OBJS-$(CONFIG_LIBTHEORA_ENCODER)          += libtheoraenc.o

 OBJS-$(CONFIG_LIBVO_AACENC_ENCODER)       += libvo-aacenc.o mpeg4audio.o

+OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER)     += libvo-amrwbenc.o

 OBJS-$(CONFIG_LIBVORBIS_ENCODER)          += libvorbis.o vorbis_data.o

 OBJS-$(CONFIG_LIBVPX_DECODER)             += libvpxdec.o

 OBJS-$(CONFIG_LIBVPX_ENCODER)             += libvpxenc.o

@@ -367,6 +367,7 @@ void avcodec_register_all(void)

     REGISTER_DECODER (LIBSPEEX, libspeex);

     REGISTER_ENCODER (LIBTHEORA, libtheora);

     REGISTER_ENCODER (LIBVO_AACENC, libvo_aacenc);

+    REGISTER_ENCODER (LIBVO_AMRWBENC, libvo_amrwbenc);

     REGISTER_ENCODER (LIBVORBIS, libvorbis);

     REGISTER_ENCDEC  (LIBVPX, libvpx);

     REGISTER_ENCODER (LIBX264, libx264);

new file mode 100644

@@ -0,0 +1,127 @@

+/*

+ * AMR Audio encoder stub

+ * Copyright (c) 2003 the ffmpeg project

+ *

+ * This file is part of Libav.

+ *

+ * Libav is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

+ *

+ * Libav is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with Libav; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+ */

+

+#include <vo-amrwbenc/enc_if.h>

+

+#include "avcodec.h"

+

+static const char wb_bitrate_unsupported[] =

+    "bitrate not supported: use one of 6.6k, 8.85k, 12.65k, 14.25k, 15.85k, "

+    "18.25k, 19.85k, 23.05k, or 23.85k\n";

+

+typedef struct AMRWB_bitrates {

+    int rate;

+    int mode;

+} AMRWB_bitrates;

+

+typedef struct AMRWBContext {

+    void  *state;

+    int    mode;

+    int    allow_dtx;

+} AMRWBContext;

+

+static int getWBBitrateMode(int bitrate)

+{

+    /* make the correspondance between bitrate and mode */

+    AMRWB_bitrates rates[] = { { 6600, 0},

+                               { 8850, 1},

+                               {12650, 2},

+                               {14250, 3},

+                               {15850, 4},

+                               {18250, 5},

+                               {19850, 6},

+                               {23050, 7},

+                               {23850, 8}, };

+    int i;

+

+    for (i = 0; i < 9; i++)

+        if (rates[i].rate == bitrate)

+            return rates[i].mode;

+    /* no bitrate matching, return an error */

+    return -1;

+}

+

+static av_cold int amr_wb_encode_init(AVCodecContext *avctx)

+{

+    AMRWBContext *s = avctx->priv_data;

+

+    if (avctx->sample_rate != 16000) {

+        av_log(avctx, AV_LOG_ERROR, "Only 16000Hz sample rate supported\n");

+        return -1;

+    }

+

+    if (avctx->channels != 1) {

+        av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");

+        return -1;

+    }

+

+    if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) {

+        av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported);

+        return -1;

+    }

+

+    avctx->frame_size  = 320;

+    avctx->coded_frame = avcodec_alloc_frame();

+

+    s->state     = E_IF_init();

+    s->allow_dtx = 0;

+

+    return 0;

+}

+

+static int amr_wb_encode_close(AVCodecContext *avctx)

+{

+    AMRWBContext *s = avctx->priv_data;

+

+    E_IF_exit(s->state);

+    av_freep(&avctx->coded_frame);

+    return 0;

+}

+

+static int amr_wb_encode_frame(AVCodecContext *avctx,

+                               unsigned char *frame/*out*/,

+                               int buf_size, void *data/*in*/)

+{

+    AMRWBContext *s = avctx->priv_data;

+    int size;

+

+    if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) {

+        av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported);

+        return -1;

+    }

+    size = E_IF_encode(s->state, s->mode, data, frame, s->allow_dtx);

+    return size;

+}

+

+AVCodec ff_libvo_amrwbenc_encoder = {

+    "libvo_amrwbenc",

+    CODEC_TYPE_AUDIO,

+    CODEC_ID_AMR_WB,

+    sizeof(AMRWBContext),

+    amr_wb_encode_init,

+    amr_wb_encode_frame,

+    amr_wb_encode_close,

+    NULL,

+    .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},

+    .long_name = NULL_IF_CONFIG_SMALL("libvo-amrwbenc Adaptive Multi-Rate "

+                                      "(AMR) Wide-Band"),

+};

+

@@ -21,7 +21,7 @@

 #define AVCODEC_VERSION_H

 #define LIBAVCODEC_VERSION_MAJOR 52

-#define LIBAVCODEC_VERSION_MINOR 118

+#define LIBAVCODEC_VERSION_MINOR 119

 #define LIBAVCODEC_VERSION_MICRO  0

 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \