Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jul 2012 20:10:41 +0000 (22:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jul 2012 20:18:18 +0000 (22:18 +0200)
* commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea':
  Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer
  G.723.1 demuxer and decoder
  Add a shift parameter to celp_lp_synthesis_filter()
  libopenjpeg: K&R formatting cosmetics
  yadif: use emms_c() instead of inline assembly for emms invocations.
  ac3: don't use different names for option tables in the template file.
  lavfi: use const for AVFilterPad declarations in all filters.
  adpcm: don't duplicate identical AVSampleFmt array for each encoder.
  configure: cosmetics: Group test dependencies together
  configure: add more passthrough flags in tms470 filter
  configure: move flag filtering functions out of if/else blocks

Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/ac3enc_fixed.c
libavcodec/allcodecs.c
libavcodec/eac3enc.c
libavcodec/g723_1.c
libavcodec/g723_1_data.h
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/v210dec.h
libavcodec/version.h
libavfilter/af_anull.c
libavfilter/asrc_anullsrc.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_copy.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_format.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_libopencv.c
libavfilter/vf_lut.c
libavfilter/vf_null.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vf_showinfo.c
libavfilter/vf_slicify.c
libavfilter/vf_transpose.c
libavfilter/vf_unsharp.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/vsrc_color.c
libavfilter/vsrc_testsrc.c
libavformat/Makefile
libavformat/allformats.c
libavformat/g723_1.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
54 files changed:
1  2 
configure
libavcodec/ac3enc_fixed.c
libavcodec/adpcmenc.c
libavcodec/eac3enc.c
libavcodec/g723_1.c
libavcodec/g723_1_data.h
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/version.h
libavfilter/af_aformat.c
libavfilter/af_anull.c
libavfilter/af_channelmap.c
libavfilter/asrc_anullsrc.c
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_copy.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_format.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_libopencv.c
libavfilter/vf_lut.c
libavfilter/vf_null.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vf_showinfo.c
libavfilter/vf_slicify.c
libavfilter/vf_transpose.c
libavfilter/vf_unsharp.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/vsrc_color.c
libavfilter/vsrc_testsrc.c
libavformat/g723_1.c
libavformat/version.h

diff --cc configure
+++ b/configure
@@@ -1795,21 -1586,23 +1795,35 @@@ yadif_filter_deps="gpl
  # libraries
  avdevice_deps="avcodec avformat"
  avformat_deps="avcodec"
 +postproc_deps="gpl"
  
  # programs
 -avconv_deps="avcodec avfilter avformat avresample swscale
 -             aformat_filter asyncts_filter
 -             format_filter fps_filter scale_filter setpts_filter"
 -avplay_deps="avcodec avformat swscale sdl"
 -avplay_select="rdft"
 -avprobe_deps="avcodec avformat"
 -avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer !shared"
 -avserver_extralibs='$ldl'
 +ffmpeg_deps="avcodec avfilter avformat swscale swresample"
 +ffmpeg_select="buffersink_filter format_filter aformat_filter
 +               setpts_filter null_filter anull_filter abuffersink_filter"
 +ffplay_deps="avcodec avformat swscale swresample sdl"
 +ffplay_select="buffersink_filter rdft"
 +ffprobe_deps="avcodec avformat"
 +ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
 +ffserver_extralibs='$ldl'
  
 -doc_deps="texi2html"
 +doc_deps_any="texi2html makeinfo pod2man"
  
  # tests
 -
++colormatrix1_test_deps="colormatrix_filter"
++colormatrix2_test_deps="colormatrix_filter"
++flashsv2_test_deps="zlib"
+ mpg_test_deps="mpeg1system_muxer mpegps_demuxer"
++mpng_test_deps="zlib"
++pp_test_deps="mp_filter"
++pp2_test_deps="mp_filter"
++pp3_test_deps="mp_filter"
++pp4_test_deps="mp_filter"
++pp5_test_deps="mp_filter"
++pp6_test_deps="mp_filter"
+ seek_lavf_mxf_d10_test_deps="mxf_d10_test"
++zlib_test_deps="zlib"
++zmbv_test_deps="zlib"
  
  test_deps(){
      suf1=$1
  
  #define AC3ENC_TYPE AC3ENC_TYPE_AC3_FIXED
  #include "ac3enc_opts_template.c"
 -static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name,
 -                                      ac3_options, LIBAVUTIL_VERSION_INT };
 +
 +static const AVClass ac3enc_class = {
 +    .class_name = "Fixed-Point AC-3 Encoder",
 +    .item_name  = av_default_item_name,
-     .option     = ac3fixed_options,
++    .option     = ac3_options,
 +    .version    = LIBAVUTIL_VERSION_INT,
 +};
  
  #include "ac3enc_template.c"
  
Simple merge
  
  #define AC3ENC_TYPE AC3ENC_TYPE_EAC3
  #include "ac3enc_opts_template.c"
 -static const AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name,
 -                                       ac3_options, LIBAVUTIL_VERSION_INT };
  
-     .option     = eac3_options,
 +static const AVClass eac3enc_class = {
 +    .class_name = "E-AC-3 Encoder",
 +    .item_name  = av_default_item_name,
++    .option     = ac3_options,
 +    .version    = LIBAVUTIL_VERSION_INT,
 +};
  
  /**
   * LUT for finding a matching frame exponent strategy index from a set of
   * G.723.1 compatible decoder
   */
  
- #include "avcodec.h"
  #define BITSTREAM_READER_LE
+ #include "libavutil/audioconvert.h"
+ #include "libavutil/lzo.h"
+ #include "libavutil/opt.h"
+ #include "avcodec.h"
 +#include "internal.h"
  #include "get_bits.h"
  #include "acelp_vectors.h"
  #include "celp_filters.h"
  #include "celp_math.h"
  #include "lsp.h"
- #include "libavutil/lzo.h"
  #include "g723_1_data.h"
  
 -/**
 - * G723.1 frame types
 - */
 -enum FrameType {
 -    ACTIVE_FRAME,        ///< Active speech
 -    SID_FRAME,           ///< Silence Insertion Descriptor frame
 -    UNTRANSMITTED_FRAME
 -};
 -
 -enum Rate {
 -    RATE_6300,
 -    RATE_5300
 -};
 -
 -/**
 - * G723.1 unpacked data subframe
 - */
 -typedef struct {
 -    int ad_cb_lag;     ///< adaptive codebook lag
 -    int ad_cb_gain;
 -    int dirac_train;
 -    int pulse_sign;
 -    int grid_index;
 -    int amp_index;
 -    int pulse_pos;
 -} G723_1_Subframe;
 -
 -/**
 - * Pitch postfilter parameters
 - */
 -typedef struct {
 -    int     index;    ///< postfilter backward/forward lag
 -    int16_t opt_gain; ///< optimal gain
 -    int16_t sc_gain;  ///< scaling gain
 -} PPFParam;
 -
  typedef struct g723_1_context {
+     AVClass *class;
      AVFrame frame;
      G723_1_Subframe subframe[4];
-     FrameType cur_frame_type;
-     FrameType past_frame_type;
-     Rate cur_rate;
+     enum FrameType cur_frame_type;
+     enum FrameType past_frame_type;
+     enum Rate cur_rate;
      uint8_t lsp_index[LSP_BANDS];
      int pitch_lag[2];
      int erased_frames;
      int sid_gain;
      int cur_gain;
      int reflection_coef;
 -    int pf_gain;
 +    int pf_gain;                 ///< formant postfilter
 +                                 ///< gain scaling unit memory
 +
+     int postfilter;
 +    int16_t prev_data[HALF_FRAME_LEN];
 +    int16_t prev_weight_sig[PITCH_MAX];
 +
  
 -    int16_t audio[FRAME_LEN + LPC_ORDER];
 +    int16_t hpf_fir_mem;                   ///< highpass filter fir
 +    int     hpf_iir_mem;                   ///< and iir memories
 +    int16_t perf_fir_mem[LPC_ORDER];       ///< perceptual filter fir
 +    int16_t perf_iir_mem[LPC_ORDER];       ///< and iir memories
 +
 +    int16_t harmonic_mem[PITCH_MAX];
  } G723_1_Context;
  
  static av_cold int g723_1_decode_init(AVCodecContext *avctx)
  {
 -    G723_1_Context *p = avctx->priv_data;
 +    G723_1_Context *p  = avctx->priv_data;
  
 -    avctx->channel_layout = AV_CH_LAYOUT_MONO;
 -    avctx->sample_fmt     = AV_SAMPLE_FMT_S16;
 -    avctx->channels       = 1;
 -    avctx->sample_rate    = 8000;
 -    p->pf_gain            = 1 << 12;
 +    avctx->sample_fmt  = AV_SAMPLE_FMT_S16;
 +    p->pf_gain         = 1 << 12;
-     memcpy(p->prev_lsp, dc_lsp, LPC_ORDER * sizeof(int16_t));
  
      avcodec_get_frame_defaults(&p->frame);
 -    avctx->coded_frame    = &p->frame;
 +    avctx->coded_frame = &p->frame;
  
+     memcpy(p->prev_lsp, dc_lsp, LPC_ORDER * sizeof(*p->prev_lsp));
      return 0;
  }
  
@@@ -160,13 -194,13 +166,13 @@@ static int unpack_bitstream(G723_1_Cont
          }
      }
  
 -    p->subframe[0].grid_index = get_bits(&gb, 1);
 -    p->subframe[1].grid_index = get_bits(&gb, 1);
 -    p->subframe[2].grid_index = get_bits(&gb, 1);
 -    p->subframe[3].grid_index = get_bits(&gb, 1);
 +    p->subframe[0].grid_index = get_bits1(&gb);
 +    p->subframe[1].grid_index = get_bits1(&gb);
 +    p->subframe[2].grid_index = get_bits1(&gb);
 +    p->subframe[3].grid_index = get_bits1(&gb);
  
-     if (p->cur_rate == Rate6k3) {
+     if (p->cur_rate == RATE_6300) {
 -        skip_bits(&gb, 1);  /* skip reserved bit */
 +        skip_bits1(&gb);  /* skip reserved bit */
  
          /* Compute pulse_pos index using the 13-bit combined position index */
          temp = get_bits(&gb, 13);
@@@ -554,9 -598,9 +560,9 @@@ static void gen_acb_excitation(int16_t 
      get_residual(residual, prev_excitation, lag);
  
      /* Select quantization table */
-     if (cur_rate == Rate6k3 && pitch_lag < SUBFRAME_LEN - 2) {
 -    if (cur_rate == RATE_6300 && pitch_lag < SUBFRAME_LEN - 2)
++    if (cur_rate == RATE_6300 && pitch_lag < SUBFRAME_LEN - 2) {
          cb_ptr = adaptive_cb_gain85;
 -    else
 +    else
          cb_ptr = adaptive_cb_gain170;
  
      /* Calculate adaptive vector */
@@@ -976,23 -1020,23 +982,23 @@@ static int g723_1_decode_frame(AVCodecC
      }
  
      if (unpack_bitstream(p, buf, buf_size) < 0) {
 -        bad_frame = 1;
 -        if (p->past_frame_type == ACTIVE_FRAME)
 -            p->cur_frame_type = ACTIVE_FRAME;
 -        else
 -            p->cur_frame_type = UNTRANSMITTED_FRAME;
 +        bad_frame         = 1;
-         p->cur_frame_type = p->past_frame_type == ActiveFrame ?
-                             ActiveFrame : UntransmittedFrame;
++        p->cur_frame_type = p->past_frame_type == ACTIVE_FRAME ?
++                            ACTIVE_FRAME : UNTRANSMITTED_FRAME;
      }
  
 -    p->frame.nb_samples = FRAME_LEN;
 +    p->frame.nb_samples = FRAME_LEN + LPC_ORDER;
      if ((ret = avctx->get_buffer(avctx, &p->frame)) < 0) {
 -         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 -         return ret;
 +        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 +        return ret;
      }
 +    out= (int16_t*)p->frame.data[0];
 +
  
-     if(p->cur_frame_type == ActiveFrame) {
-         if (!bad_frame) {
 -    if (p->cur_frame_type == ACTIVE_FRAME) {
++    if(p->cur_frame_type == ACTIVE_FRAME) {
+         if (!bad_frame)
              p->erased_frames = 0;
-         } else if(p->erased_frames != 3)
 -        else if (p->erased_frames != 3)
++        else if(p->erased_frames != 3)
              p->erased_frames++;
  
          inverse_quant(cur_lsp, p->prev_lsp, p->lsp_index, bad_frame);
      return frame_size[dec_mode];
  }
  
 -#define OFFSET(x) offsetof(G723_1_Context, x)
 -#define AD     AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM
 -
 -static const AVOption options[] = {
 -    { "postfilter", "postfilter on/off", OFFSET(postfilter), AV_OPT_TYPE_INT,
 -      { 1 }, 0, 1, AD },
 -    { NULL }
 +AVCodec ff_g723_1_decoder = {
 +    .name           = "g723_1",
 +    .type           = AVMEDIA_TYPE_AUDIO,
 +    .id             = CODEC_ID_G723_1,
 +    .priv_data_size = sizeof(G723_1_Context),
 +    .init           = g723_1_decode_init,
 +    .decode         = g723_1_decode_frame,
 +    .long_name      = NULL_IF_CONFIG_SMALL("G.723.1"),
 +    .capabilities   = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
  };
  
 +#if CONFIG_G723_1_ENCODER
 +#define BITSTREAM_WRITER_LE
 +#include "put_bits.h"
  
 -static const AVClass g723_1dec_class = {
 -    .class_name = "G.723.1 decoder",
 -    .item_name  = av_default_item_name,
 -    .option     = options,
 -    .version    = LIBAVUTIL_VERSION_INT,
 -};
 +static av_cold int g723_1_encode_init(AVCodecContext *avctx)
 +{
 +    G723_1_Context *p = avctx->priv_data;
  
 -AVCodec ff_g723_1_decoder = {
 +    if (avctx->sample_rate != 8000) {
 +        av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n");
 +        return -1;
 +    }
 +
 +    if (avctx->channels != 1) {
 +        av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");
 +        return AVERROR(EINVAL);
 +    }
 +
 +    if (avctx->bit_rate == 6300) {
-         p->cur_rate = Rate6k3;
++        p->cur_rate = RATE_6300;
 +    } else if (avctx->bit_rate == 5300) {
 +        av_log(avctx, AV_LOG_ERROR, "Bitrate not supported yet, use 6.3k\n");
 +        return AVERROR_PATCHWELCOME;
 +    } else {
 +        av_log(avctx, AV_LOG_ERROR,
 +               "Bitrate not supported, use 6.3k\n");
 +        return AVERROR(EINVAL);
 +    }
 +    avctx->frame_size = 240;
 +    memcpy(p->prev_lsp, dc_lsp, LPC_ORDER * sizeof(int16_t));
 +
 +    return 0;
 +}
 +
 +/**
 + * Remove DC component from the input signal.
 + *
 + * @param buf input signal
 + * @param fir zero memory
 + * @param iir pole memory
 + */
 +static void highpass_filter(int16_t *buf, int16_t *fir, int *iir)
 +{
 +    int i;
 +    for (i = 0; i < FRAME_LEN; i++) {
 +        *iir   = (buf[i] << 15) + ((-*fir) << 15) + MULL2(*iir, 0x7f00);
 +        *fir   = buf[i];
 +        buf[i] = av_clipl_int32((int64_t)*iir + (1 << 15)) >> 16;
 +    }
 +}
 +
 +/**
 + * Estimate autocorrelation of the input vector.
 + *
 + * @param buf      input buffer
 + * @param autocorr autocorrelation coefficients vector
 + */
 +static void comp_autocorr(int16_t *buf, int16_t *autocorr)
 +{
 +    int i, scale, temp;
 +    int16_t vector[LPC_FRAME];
 +
 +    memcpy(vector, buf, LPC_FRAME * sizeof(int16_t));
 +    scale_vector(vector, LPC_FRAME);
 +
 +    /* Apply the Hamming window */
 +    for (i = 0; i < LPC_FRAME; i++)
 +        vector[i] = (vector[i] * hamming_window[i] + (1 << 14)) >> 15;
 +
 +    /* Compute the first autocorrelation coefficient */
 +    temp = dot_product(vector, vector, LPC_FRAME, 0);
 +
 +    /* Apply a white noise correlation factor of (1025/1024) */
 +    temp += temp >> 10;
 +
 +    /* Normalize */
 +    scale = normalize_bits_int32(temp);
 +    autocorr[0] = av_clipl_int32((int64_t)(temp << scale) +
 +                                 (1 << 15)) >> 16;
 +
 +    /* Compute the remaining coefficients */
 +    if (!autocorr[0]) {
 +        memset(autocorr + 1, 0, LPC_ORDER * sizeof(int16_t));
 +    } else {
 +        for (i = 1; i <= LPC_ORDER; i++) {
 +           temp = dot_product(vector, vector + i, LPC_FRAME - i, 0);
 +           temp = MULL2((temp << scale), binomial_window[i - 1]);
 +           autocorr[i] = av_clipl_int32((int64_t)temp + (1 << 15)) >> 16;
 +        }
 +    }
 +}
 +
 +/**
 + * Use Levinson-Durbin recursion to compute LPC coefficients from
 + * autocorrelation values.
 + *
 + * @param lpc      LPC coefficients vector
 + * @param autocorr autocorrelation coefficients vector
 + * @param error    prediction error
 + */
 +static void levinson_durbin(int16_t *lpc, int16_t *autocorr, int16_t error)
 +{
 +    int16_t vector[LPC_ORDER];
 +    int16_t partial_corr;
 +    int i, j, temp;
 +
 +    memset(lpc, 0, LPC_ORDER * sizeof(int16_t));
 +
 +    for (i = 0; i < LPC_ORDER; i++) {
 +        /* Compute the partial correlation coefficient */
 +        temp = 0;
 +        for (j = 0; j < i; j++)
 +            temp -= lpc[j] * autocorr[i - j - 1];
 +        temp = ((autocorr[i] << 13) + temp) << 3;
 +
 +        if (FFABS(temp) >= (error << 16))
 +            break;
 +
 +        partial_corr = temp / (error << 1);
 +
 +        lpc[i] = av_clipl_int32((int64_t)(partial_corr << 14) +
 +                                (1 << 15)) >> 16;
 +
 +        /* Update the prediction error */
 +        temp  = MULL2(temp, partial_corr);
 +        error = av_clipl_int32((int64_t)(error << 16) - temp +
 +                                (1 << 15)) >> 16;
 +
 +        memcpy(vector, lpc, i * sizeof(int16_t));
 +        for (j = 0; j < i; j++) {
 +            temp = partial_corr * vector[i - j - 1] << 1;
 +            lpc[j] = av_clipl_int32((int64_t)(lpc[j] << 16) - temp +
 +                                    (1 << 15)) >> 16;
 +        }
 +    }
 +}
 +
 +/**
 + * Calculate LPC coefficients for the current frame.
 + *
 + * @param buf       current frame
 + * @param prev_data 2 trailing subframes of the previous frame
 + * @param lpc       LPC coefficients vector
 + */
 +static void comp_lpc_coeff(int16_t *buf, int16_t *lpc)
 +{
 +    int16_t autocorr[(LPC_ORDER + 1) * SUBFRAMES];
 +    int16_t *autocorr_ptr = autocorr;
 +    int16_t *lpc_ptr      = lpc;
 +    int i, j;
 +
 +    for (i = 0, j = 0; j < SUBFRAMES; i += SUBFRAME_LEN, j++) {
 +        comp_autocorr(buf + i, autocorr_ptr);
 +        levinson_durbin(lpc_ptr, autocorr_ptr + 1, autocorr_ptr[0]);
 +
 +        lpc_ptr += LPC_ORDER;
 +        autocorr_ptr += LPC_ORDER + 1;
 +    }
 +}
 +
 +static void lpc2lsp(int16_t *lpc, int16_t *prev_lsp, int16_t *lsp)
 +{
 +    int f[LPC_ORDER + 2]; ///< coefficients of the sum and difference
 +                          ///< polynomials (F1, F2) ordered as
 +                          ///< f1[0], f2[0], ...., f1[5], f2[5]
 +
 +    int max, shift, cur_val, prev_val, count, p;
 +    int i, j;
 +    int64_t temp;
 +
 +    /* Initialize f1[0] and f2[0] to 1 in Q25 */
 +    for (i = 0; i < LPC_ORDER; i++)
 +        lsp[i] = (lpc[i] * bandwidth_expand[i] + (1 << 14)) >> 15;
 +
 +    /* Apply bandwidth expansion on the LPC coefficients */
 +    f[0] = f[1] = 1 << 25;
 +
 +    /* Compute the remaining coefficients */
 +    for (i = 0; i < LPC_ORDER / 2; i++) {
 +        /* f1 */
 +        f[2 * i + 2] = -f[2 * i] - ((lsp[i] + lsp[LPC_ORDER - 1 - i]) << 12);
 +        /* f2 */
 +        f[2 * i + 3] = f[2 * i + 1] - ((lsp[i] - lsp[LPC_ORDER - 1 - i]) << 12);
 +    }
 +
 +    /* Divide f1[5] and f2[5] by 2 for use in polynomial evaluation */
 +    f[LPC_ORDER] >>= 1;
 +    f[LPC_ORDER + 1] >>= 1;
 +
 +    /* Normalize and shorten */
 +    max = FFABS(f[0]);
 +    for (i = 1; i < LPC_ORDER + 2; i++)
 +        max = FFMAX(max, FFABS(f[i]));
 +
 +    shift = normalize_bits_int32(max);
 +
 +    for (i = 0; i < LPC_ORDER + 2; i++)
 +        f[i] = av_clipl_int32((int64_t)(f[i] << shift) + (1 << 15)) >> 16;
 +
 +    /**
 +     * Evaluate F1 and F2 at uniform intervals of pi/256 along the
 +     * unit circle and check for zero crossings.
 +     */
 +    p    = 0;
 +    temp = 0;
 +    for (i = 0; i <= LPC_ORDER / 2; i++)
 +        temp += f[2 * i] * cos_tab[0];
 +    prev_val = av_clipl_int32(temp << 1);
 +    count    = 0;
 +    for ( i = 1; i < COS_TBL_SIZE / 2; i++) {
 +        /* Evaluate */
 +        temp = 0;
 +        for (j = 0; j <= LPC_ORDER / 2; j++)
 +            temp += f[LPC_ORDER - 2 * j + p] * cos_tab[i * j % COS_TBL_SIZE];
 +        cur_val = av_clipl_int32(temp << 1);
 +
 +        /* Check for sign change, indicating a zero crossing */
 +        if ((cur_val ^ prev_val) < 0) {
 +            int abs_cur  = FFABS(cur_val);
 +            int abs_prev = FFABS(prev_val);
 +            int sum      = abs_cur + abs_prev;
 +
 +            shift        = normalize_bits_int32(sum);
 +            sum          <<= shift;
 +            abs_prev     = abs_prev << shift >> 8;
 +            lsp[count++] = ((i - 1) << 7) + (abs_prev >> 1) / (sum >> 16);
 +
 +            if (count == LPC_ORDER)
 +                break;
 +
 +            /* Switch between sum and difference polynomials */
 +            p ^= 1;
 +
 +            /* Evaluate */
 +            temp = 0;
 +            for (j = 0; j <= LPC_ORDER / 2; j++){
 +                temp += f[LPC_ORDER - 2 * j + p] *
 +                        cos_tab[i * j % COS_TBL_SIZE];
 +            }
 +            cur_val = av_clipl_int32(temp<<1);
 +        }
 +        prev_val = cur_val;
 +    }
 +
 +    if (count != LPC_ORDER)
 +        memcpy(lsp, prev_lsp, LPC_ORDER * sizeof(int16_t));
 +}
 +
 +/**
 + * Quantize the current LSP subvector.
 + *
 + * @param num    band number
 + * @param offset offset of the current subvector in an LPC_ORDER vector
 + * @param size   size of the current subvector
 + */
 +#define get_index(num, offset, size) \
 +{\
 +    int error, max = -1;\
 +    int16_t temp[4];\
 +    int i, j;\
 +    for (i = 0; i < LSP_CB_SIZE; i++) {\
 +        for (j = 0; j < size; j++){\
 +            temp[j] = (weight[j + (offset)] * lsp_band##num[i][j] +\
 +                      (1 << 14)) >> 15;\
 +        }\
 +        error =  dot_product(lsp + (offset), temp, size, 1) << 1;\
 +        error -= dot_product(lsp_band##num[i], temp, size, 1);\
 +        if (error > max) {\
 +            max = error;\
 +            lsp_index[num] = i;\
 +        }\
 +    }\
 +}
 +
 +/**
 + * Vector quantize the LSP frequencies.
 + *
 + * @param lsp      the current lsp vector
 + * @param prev_lsp the previous lsp vector
 + */
 +static void lsp_quantize(uint8_t *lsp_index, int16_t *lsp, int16_t *prev_lsp)
 +{
 +    int16_t weight[LPC_ORDER];
 +    int16_t min, max;
 +    int shift, i;
 +
 +    /* Calculate the VQ weighting vector */
 +    weight[0] = (1 << 20) / (lsp[1] - lsp[0]);
 +    weight[LPC_ORDER - 1] = (1 << 20) /
 +                            (lsp[LPC_ORDER - 1] - lsp[LPC_ORDER - 2]);
 +
 +    for (i = 1; i < LPC_ORDER - 1; i++) {
 +        min  = FFMIN(lsp[i] - lsp[i - 1], lsp[i + 1] - lsp[i]);
 +        if (min > 0x20)
 +            weight[i] = (1 << 20) / min;
 +        else
 +            weight[i] = INT16_MAX;
 +    }
 +
 +    /* Normalize */
 +    max = 0;
 +    for (i = 0; i < LPC_ORDER; i++)
 +        max = FFMAX(weight[i], max);
 +
 +    shift = normalize_bits_int16(max);
 +    for (i = 0; i < LPC_ORDER; i++) {
 +        weight[i] <<= shift;
 +    }
 +
 +    /* Compute the VQ target vector */
 +    for (i = 0; i < LPC_ORDER; i++) {
 +        lsp[i] -= dc_lsp[i] +
 +                  (((prev_lsp[i] - dc_lsp[i]) * 12288 + (1 << 14)) >> 15);
 +    }
 +
 +    get_index(0, 0, 3);
 +    get_index(1, 3, 3);
 +    get_index(2, 6, 4);
 +}
 +
 +/**
 + * Apply the formant perceptual weighting filter.
 + *
 + * @param flt_coef filter coefficients
 + * @param unq_lpc  unquantized lpc vector
 + */
 +static void perceptual_filter(G723_1_Context *p, int16_t *flt_coef,
 +                              int16_t *unq_lpc, int16_t *buf)
 +{
 +    int16_t vector[FRAME_LEN + LPC_ORDER];
 +    int i, j, k, l = 0;
 +
 +    memcpy(buf, p->iir_mem, sizeof(int16_t) * LPC_ORDER);
 +    memcpy(vector, p->fir_mem, sizeof(int16_t) * LPC_ORDER);
 +    memcpy(vector + LPC_ORDER, buf + LPC_ORDER, sizeof(int16_t) * FRAME_LEN);
 +
 +    for (i = LPC_ORDER, j = 0; j < SUBFRAMES; i += SUBFRAME_LEN, j++) {
 +        for (k = 0; k < LPC_ORDER; k++) {
 +            flt_coef[k + 2 * l] = (unq_lpc[k + l] * percept_flt_tbl[0][k] +
 +                                  (1 << 14)) >> 15;
 +            flt_coef[k + 2 * l + LPC_ORDER] = (unq_lpc[k + l] *
 +                                             percept_flt_tbl[1][k] +
 +                                             (1 << 14)) >> 15;
 +        }
 +        iir_filter(flt_coef + 2 * l, flt_coef + 2 * l + LPC_ORDER, vector + i,
 +                   buf + i, 0);
 +        l += LPC_ORDER;
 +    }
 +    memcpy(p->iir_mem, buf + FRAME_LEN, sizeof(int16_t) * LPC_ORDER);
 +    memcpy(p->fir_mem, vector + FRAME_LEN, sizeof(int16_t) * LPC_ORDER);
 +}
 +
 +/**
 + * Estimate the open loop pitch period.
 + *
 + * @param buf   perceptually weighted speech
 + * @param start estimation is carried out from this position
 + */
 +static int estimate_pitch(int16_t *buf, int start)
 +{
 +    int max_exp = 32;
 +    int max_ccr = 0x4000;
 +    int max_eng = 0x7fff;
 +    int index   = PITCH_MIN;
 +    int offset  = start - PITCH_MIN + 1;
 +
 +    int ccr, eng, orig_eng, ccr_eng, exp;
 +    int diff, temp;
 +
 +    int i;
 +
 +    orig_eng = dot_product(buf + offset, buf + offset, HALF_FRAME_LEN, 0);
 +
 +    for (i = PITCH_MIN; i <= PITCH_MAX - 3; i++) {
 +        offset--;
 +
 +        /* Update energy and compute correlation */
 +        orig_eng += buf[offset] * buf[offset] -
 +                    buf[offset + HALF_FRAME_LEN] * buf[offset + HALF_FRAME_LEN];
 +        ccr      =  dot_product(buf + start, buf + offset, HALF_FRAME_LEN, 0);
 +        if (ccr <= 0)
 +            continue;
 +
 +        /* Split into mantissa and exponent to maintain precision */
 +        exp  =   normalize_bits_int32(ccr);
 +        ccr  =   av_clipl_int32((int64_t)(ccr << exp) + (1 << 15)) >> 16;
 +        exp  <<= 1;
 +        ccr  *=  ccr;
 +        temp =   normalize_bits_int32(ccr);
 +        ccr  =   ccr << temp >> 16;
 +        exp  +=  temp;
 +
 +        temp =   normalize_bits_int32(orig_eng);
 +        eng  =   av_clipl_int32((int64_t)(orig_eng << temp) + (1 << 15)) >> 16;
 +        exp  -=  temp;
 +
 +        if (ccr >= eng) {
 +            exp--;
 +            ccr >>= 1;
 +        }
 +        if (exp > max_exp)
 +            continue;
 +
 +        if (exp + 1 < max_exp)
 +            goto update;
 +
 +        /* Equalize exponents before comparison */
 +        if (exp + 1 == max_exp)
 +            temp = max_ccr >> 1;
 +        else
 +            temp = max_ccr;
 +        ccr_eng = ccr * max_eng;
 +        diff    = ccr_eng - eng * temp;
 +        if (diff > 0 && (i - index < PITCH_MIN || diff > ccr_eng >> 2)) {
 +update:
 +            index   = i;
 +            max_exp = exp;
 +            max_ccr = ccr;
 +            max_eng = eng;
 +        }
 +    }
 +    return index;
 +}
 +
 +/**
 + * Compute harmonic noise filter parameters.
 + *
 + * @param buf       perceptually weighted speech
 + * @param pitch_lag open loop pitch period
 + * @param hf        harmonic filter parameters
 + */
 +static void comp_harmonic_coeff(int16_t *buf, int16_t pitch_lag, HFParam *hf)
 +{
 +    int ccr, eng, max_ccr, max_eng;
 +    int exp, max, diff;
 +    int energy[15];
 +    int i, j;
 +
 +    for (i = 0, j = pitch_lag - 3; j <= pitch_lag + 3; i++, j++) {
 +        /* Compute residual energy */
 +        energy[i << 1] = dot_product(buf - j, buf - j, SUBFRAME_LEN, 0);
 +        /* Compute correlation */
 +        energy[(i << 1) + 1] = dot_product(buf, buf - j, SUBFRAME_LEN, 0);
 +    }
 +
 +    /* Compute target energy */
 +    energy[14] = dot_product(buf, buf, SUBFRAME_LEN, 0);
 +
 +    /* Normalize */
 +    max = 0;
 +    for (i = 0; i < 15; i++)
 +        max = FFMAX(max, FFABS(energy[i]));
 +
 +    exp = normalize_bits_int32(max);
 +    for (i = 0; i < 15; i++) {
 +        energy[i] = av_clipl_int32((int64_t)(energy[i] << exp) +
 +                                   (1 << 15)) >> 16;
 +    }
 +
 +    hf->index = -1;
 +    hf->gain  =  0;
 +    max_ccr   =  1;
 +    max_eng   =  0x7fff;
 +
 +    for (i = 0; i <= 6; i++) {
 +        eng = energy[i << 1];
 +        ccr = energy[(i << 1) + 1];
 +
 +        if (ccr <= 0)
 +            continue;
 +
 +        ccr  = (ccr * ccr + (1 << 14)) >> 15;
 +        diff = ccr * max_eng - eng * max_ccr;
 +        if (diff > 0) {
 +            max_ccr   = ccr;
 +            max_eng   = eng;
 +            hf->index = i;
 +        }
 +    }
 +
 +    if (hf->index == -1) {
 +        hf->index = pitch_lag;
 +        return;
 +    }
 +
 +    eng = energy[14] * max_eng;
 +    eng = (eng >> 2) + (eng >> 3);
 +    ccr = energy[(hf->index << 1) + 1] * energy[(hf->index << 1) + 1];
 +    if (eng < ccr) {
 +        eng = energy[(hf->index << 1) + 1];
 +
 +        if (eng >= max_eng)
 +            hf->gain = 0x2800;
 +        else
 +            hf->gain = ((eng << 15) / max_eng * 0x2800 + (1 << 14)) >> 15;
 +    }
 +    hf->index += pitch_lag - 3;
 +}
 +
 +/**
 + * Apply the harmonic noise shaping filter.
 + *
 + * @param hf filter parameters
 + */
 +static void harmonic_filter(HFParam *hf, int16_t *src, int16_t *dest)
 +{
 +    int i;
 +
 +    for (i = 0; i < SUBFRAME_LEN; i++) {
 +        int64_t temp = hf->gain * src[i - hf->index] << 1;
 +        dest[i] = av_clipl_int32((src[i] << 16) - temp + (1 << 15)) >> 16;
 +    }
 +}
 +
 +static void harmonic_noise_sub(HFParam *hf, int16_t *src, int16_t *dest)
 +{
 +    int i;
 +    for (i = 0; i < SUBFRAME_LEN; i++) {
 +        int64_t temp = hf->gain * src[i - hf->index] << 1;
 +        dest[i] = av_clipl_int32(((dest[i] - src[i]) << 16) + temp +
 +                                 (1 << 15)) >> 16;
 +
 +    }
 +}
 +
 +/**
 + * Combined synthesis and formant perceptual weighting filer.
 + *
 + * @param qnt_lpc  quantized lpc coefficients
 + * @param perf_lpc perceptual filter coefficients
 + * @param perf_fir perceptual filter fir memory
 + * @param perf_iir perceptual filter iir memory
 + * @param scale    the filter output will be scaled by 2^scale
 + */
 +static void synth_percept_filter(int16_t *qnt_lpc, int16_t *perf_lpc,
 +                                 int16_t *perf_fir, int16_t *perf_iir,
 +                                 int16_t *src, int16_t *dest, int scale)
 +{
 +    int i, j;
 +    int16_t buf_16[SUBFRAME_LEN + LPC_ORDER];
 +    int64_t buf[SUBFRAME_LEN];
 +
 +    int16_t *bptr_16 = buf_16 + LPC_ORDER;
 +
 +    memcpy(buf_16, perf_fir, sizeof(int16_t) * LPC_ORDER);
 +    memcpy(dest - LPC_ORDER, perf_iir, sizeof(int16_t) * LPC_ORDER);
 +
 +    for (i = 0; i < SUBFRAME_LEN; i++) {
 +        int64_t temp = 0;
 +        for (j = 1; j <= LPC_ORDER; j++)
 +            temp -= qnt_lpc[j - 1] * bptr_16[i - j];
 +
 +        buf[i]     = (src[i] << 15) + (temp << 3);
 +        bptr_16[i] = av_clipl_int32(buf[i] + (1 << 15)) >> 16;
 +    }
 +
 +    for (i = 0; i < SUBFRAME_LEN; i++) {
 +        int64_t fir = 0, iir = 0;
 +        for (j = 1; j <= LPC_ORDER; j++) {
 +            fir -= perf_lpc[j - 1] * bptr_16[i - j];
 +            iir += perf_lpc[j + LPC_ORDER - 1] * dest[i - j];
 +        }
 +        dest[i] = av_clipl_int32(((buf[i] + (fir << 3)) << scale) + (iir << 3) +
 +                                 (1 << 15)) >> 16;
 +    }
 +    memcpy(perf_fir, buf_16 + SUBFRAME_LEN, sizeof(int16_t) * LPC_ORDER);
 +    memcpy(perf_iir, dest + SUBFRAME_LEN - LPC_ORDER,
 +           sizeof(int16_t) * LPC_ORDER);
 +}
 +
 +/**
 + * Compute the adaptive codebook contribution.
 + *
 + * @param buf   input signal
 + * @param index the current subframe index
 + */
 +static void acb_search(G723_1_Context *p, int16_t *residual,
 +                       int16_t *impulse_resp, int16_t *buf,
 +                       int index)
 +{
 +
 +    int16_t flt_buf[PITCH_ORDER][SUBFRAME_LEN];
 +
 +    const int16_t *cb_tbl = adaptive_cb_gain85;
 +
 +    int ccr_buf[PITCH_ORDER * SUBFRAMES << 2];
 +
 +    int pitch_lag = p->pitch_lag[index >> 1];
 +    int acb_lag   = 1;
 +    int acb_gain  = 0;
 +    int odd_frame = index & 1;
 +    int iter      = 3 + odd_frame;
 +    int count     = 0;
 +    int tbl_size  = 85;
 +
 +    int i, j, k, l, max;
 +    int64_t temp;
 +
 +    if (!odd_frame) {
 +        if (pitch_lag == PITCH_MIN)
 +            pitch_lag++;
 +        else
 +            pitch_lag = FFMIN(pitch_lag, PITCH_MAX - 5);
 +    }
 +
 +    for (i = 0; i < iter; i++) {
 +        get_residual(residual, p->prev_excitation, pitch_lag + i - 1);
 +
 +        for (j = 0; j < SUBFRAME_LEN; j++) {
 +            temp = 0;
 +            for (k = 0; k <= j; k++)
 +                temp += residual[PITCH_ORDER - 1 + k] * impulse_resp[j - k];
 +            flt_buf[PITCH_ORDER - 1][j] = av_clipl_int32((temp << 1) +
 +                                                         (1 << 15)) >> 16;
 +        }
 +
 +        for (j = PITCH_ORDER - 2; j >= 0; j--) {
 +            flt_buf[j][0] = ((residual[j] << 13) + (1 << 14)) >> 15;
 +            for (k = 1; k < SUBFRAME_LEN; k++) {
 +                temp = (flt_buf[j + 1][k - 1] << 15) +
 +                       residual[j] * impulse_resp[k];
 +                flt_buf[j][k] = av_clipl_int32((temp << 1) + (1 << 15)) >> 16;
 +            }
 +        }
 +
 +        /* Compute crosscorrelation with the signal */
 +        for (j = 0; j < PITCH_ORDER; j++) {
 +            temp = dot_product(buf, flt_buf[j], SUBFRAME_LEN, 0);
 +            ccr_buf[count++] = av_clipl_int32(temp << 1);
 +        }
 +
 +        /* Compute energies */
 +        for (j = 0; j < PITCH_ORDER; j++) {
 +            ccr_buf[count++] = dot_product(flt_buf[j], flt_buf[j],
 +                                           SUBFRAME_LEN, 1);
 +        }
 +
 +        for (j = 1; j < PITCH_ORDER; j++) {
 +            for (k = 0; k < j; k++) {
 +                temp = dot_product(flt_buf[j], flt_buf[k], SUBFRAME_LEN, 0);
 +                ccr_buf[count++] = av_clipl_int32(temp<<2);
 +            }
 +        }
 +    }
 +
 +    /* Normalize and shorten */
 +    max = 0;
 +    for (i = 0; i < 20 * iter; i++)
 +        max = FFMAX(max, FFABS(ccr_buf[i]));
 +
 +    temp = normalize_bits_int32(max);
 +
 +    for (i = 0; i < 20 * iter; i++){
 +        ccr_buf[i] = av_clipl_int32((int64_t)(ccr_buf[i] << temp) +
 +                                    (1 << 15)) >> 16;
 +    }
 +
 +    max = 0;
 +    for (i = 0; i < iter; i++) {
 +        /* Select quantization table */
 +        if (!odd_frame && pitch_lag + i - 1 >= SUBFRAME_LEN - 2 ||
 +            odd_frame && pitch_lag >= SUBFRAME_LEN - 2) {
 +            cb_tbl = adaptive_cb_gain170;
 +            tbl_size = 170;
 +        }
 +
 +        for (j = 0, k = 0; j < tbl_size; j++, k += 20) {
 +            temp = 0;
 +            for (l = 0; l < 20; l++)
 +                temp += ccr_buf[20 * i + l] * cb_tbl[k + l];
 +            temp =  av_clipl_int32(temp);
 +
 +            if (temp > max) {
 +                max      = temp;
 +                acb_gain = j;
 +                acb_lag  = i;
 +            }
 +        }
 +    }
 +
 +    if (!odd_frame) {
 +        pitch_lag += acb_lag - 1;
 +        acb_lag   =  1;
 +    }
 +
 +    p->pitch_lag[index >> 1]      = pitch_lag;
 +    p->subframe[index].ad_cb_lag  = acb_lag;
 +    p->subframe[index].ad_cb_gain = acb_gain;
 +}
 +
 +/**
 + * Subtract the adaptive codebook contribution from the input
 + * to obtain the residual.
 + *
 + * @param buf target vector
 + */
 +static void sub_acb_contrib(int16_t *residual, int16_t *impulse_resp,
 +                            int16_t *buf)
 +{
 +    int i, j;
 +    /* Subtract adaptive CB contribution to obtain the residual */
 +    for (i = 0; i < SUBFRAME_LEN; i++) {
 +        int64_t temp = buf[i] << 14;
 +        for (j = 0; j <= i; j++)
 +            temp -= residual[j] * impulse_resp[i - j];
 +
 +        buf[i] = av_clipl_int32((temp << 2) + (1 << 15)) >> 16;
 +    }
 +}
 +
 +/**
 + * Quantize the residual signal using the fixed codebook (MP-MLQ).
 + *
 + * @param optim optimized fixed codebook parameters
 + * @param buf   excitation vector
 + */
 +static void get_fcb_param(FCBParam *optim, int16_t *impulse_resp,
 +                          int16_t *buf, int pulse_cnt, int pitch_lag)
 +{
 +    FCBParam param;
 +    int16_t impulse_r[SUBFRAME_LEN];
 +    int16_t temp_corr[SUBFRAME_LEN];
 +    int16_t impulse_corr[SUBFRAME_LEN];
 +
 +    int ccr1[SUBFRAME_LEN];
 +    int ccr2[SUBFRAME_LEN];
 +    int amp, err, max, max_amp_index, min, scale, i, j, k, l;
 +
 +    int64_t temp;
 +
 +    /* Update impulse response */
 +    memcpy(impulse_r, impulse_resp, sizeof(int16_t) * SUBFRAME_LEN);
 +    param.dirac_train = 0;
 +    if (pitch_lag < SUBFRAME_LEN - 2) {
 +        param.dirac_train = 1;
 +        gen_dirac_train(impulse_r, pitch_lag);
 +    }
 +
 +    for (i = 0; i < SUBFRAME_LEN; i++)
 +        temp_corr[i] = impulse_r[i] >> 1;
 +
 +    /* Compute impulse response autocorrelation */
 +    temp = dot_product(temp_corr, temp_corr, SUBFRAME_LEN, 1);
 +
 +    scale = normalize_bits_int32(temp);
 +    impulse_corr[0] = av_clipl_int32((temp << scale) + (1 << 15)) >> 16;
 +
 +    for (i = 1; i < SUBFRAME_LEN; i++) {
 +        temp = dot_product(temp_corr + i, temp_corr, SUBFRAME_LEN - i, 1);
 +        impulse_corr[i] = av_clipl_int32((temp << scale) + (1 << 15)) >> 16;
 +    }
 +
 +    /* Compute crosscorrelation of impulse response with residual signal */
 +    scale -= 4;
 +    for (i = 0; i < SUBFRAME_LEN; i++){
 +        temp = dot_product(buf + i, impulse_r, SUBFRAME_LEN - i, 1);
 +        if (scale < 0)
 +            ccr1[i] = temp >> -scale;
 +        else
 +            ccr1[i] = av_clipl_int32(temp << scale);
 +    }
 +
 +    /* Search loop */
 +    for (i = 0; i < GRID_SIZE; i++) {
 +        /* Maximize the crosscorrelation */
 +        max = 0;
 +        for (j = i; j < SUBFRAME_LEN; j += GRID_SIZE) {
 +            temp = FFABS(ccr1[j]);
 +            if (temp >= max) {
 +                max = temp;
 +                param.pulse_pos[0] = j;
 +            }
 +        }
 +
 +        /* Quantize the gain (max crosscorrelation/impulse_corr[0]) */
 +        amp = max;
 +        min = 1 << 30;
 +        max_amp_index = GAIN_LEVELS - 2;
 +        for (j = max_amp_index; j >= 2; j--) {
 +            temp = av_clipl_int32((int64_t)fixed_cb_gain[j] *
 +                                  impulse_corr[0] << 1);
 +            temp = FFABS(temp - amp);
 +            if (temp < min) {
 +                min = temp;
 +                max_amp_index = j;
 +            }
 +        }
 +
 +        max_amp_index--;
 +        /* Select additional gain values */
 +        for (j = 1; j < 5; j++) {
 +            for (k = i; k < SUBFRAME_LEN; k += GRID_SIZE) {
 +                temp_corr[k] = 0;
 +                ccr2[k]      = ccr1[k];
 +            }
 +            param.amp_index = max_amp_index + j - 2;
 +            amp = fixed_cb_gain[param.amp_index];
 +
 +            param.pulse_sign[0] = (ccr2[param.pulse_pos[0]] < 0) ? -amp : amp;
 +            temp_corr[param.pulse_pos[0]] = 1;
 +
 +            for (k = 1; k < pulse_cnt; k++) {
 +                max = -1 << 30;
 +                for (l = i; l < SUBFRAME_LEN; l += GRID_SIZE) {
 +                    if (temp_corr[l])
 +                        continue;
 +                    temp = impulse_corr[FFABS(l - param.pulse_pos[k - 1])];
 +                    temp = av_clipl_int32((int64_t)temp *
 +                                          param.pulse_sign[k - 1] << 1);
 +                    ccr2[l] -= temp;
 +                    temp = FFABS(ccr2[l]);
 +                    if (temp > max) {
 +                        max = temp;
 +                        param.pulse_pos[k] = l;
 +                    }
 +                }
 +
 +                param.pulse_sign[k] = (ccr2[param.pulse_pos[k]] < 0) ?
 +                                      -amp : amp;
 +                temp_corr[param.pulse_pos[k]] = 1;
 +            }
 +
 +            /* Create the error vector */
 +            memset(temp_corr, 0, sizeof(int16_t) * SUBFRAME_LEN);
 +
 +            for (k = 0; k < pulse_cnt; k++)
 +                temp_corr[param.pulse_pos[k]] = param.pulse_sign[k];
 +
 +            for (k = SUBFRAME_LEN - 1; k >= 0; k--) {
 +                temp = 0;
 +                for (l = 0; l <= k; l++) {
 +                    int prod = av_clipl_int32((int64_t)temp_corr[l] *
 +                                              impulse_r[k - l] << 1);
 +                    temp     = av_clipl_int32(temp + prod);
 +                }
 +                temp_corr[k] = temp << 2 >> 16;
 +            }
 +
 +            /* Compute square of error */
 +            err = 0;
 +            for (k = 0; k < SUBFRAME_LEN; k++) {
 +                int64_t prod;
 +                prod = av_clipl_int32((int64_t)buf[k] * temp_corr[k] << 1);
 +                err  = av_clipl_int32(err - prod);
 +                prod = av_clipl_int32((int64_t)temp_corr[k] * temp_corr[k]);
 +                err  = av_clipl_int32(err + prod);
 +            }
 +
 +            /* Minimize */
 +            if (err < optim->min_err) {
 +                optim->min_err     = err;
 +                optim->grid_index  = i;
 +                optim->amp_index   = param.amp_index;
 +                optim->dirac_train = param.dirac_train;
 +
 +                for (k = 0; k < pulse_cnt; k++) {
 +                    optim->pulse_sign[k] = param.pulse_sign[k];
 +                    optim->pulse_pos[k]  = param.pulse_pos[k];
 +                }
 +            }
 +        }
 +    }
 +}
 +
 +/**
 + * Encode the pulse position and gain of the current subframe.
 + *
 + * @param optim optimized fixed CB parameters
 + * @param buf   excitation vector
 + */
 +static void pack_fcb_param(G723_1_Subframe *subfrm, FCBParam *optim,
 +                           int16_t *buf, int pulse_cnt)
 +{
 +    int i, j;
 +
 +    j = PULSE_MAX - pulse_cnt;
 +
 +    subfrm->pulse_sign = 0;
 +    subfrm->pulse_pos  = 0;
 +
 +    for (i = 0; i < SUBFRAME_LEN >> 1; i++) {
 +        int val = buf[optim->grid_index + (i << 1)];
 +        if (!val) {
 +            subfrm->pulse_pos += combinatorial_table[j][i];
 +        } else {
 +            subfrm->pulse_sign <<= 1;
 +            if (val < 0) subfrm->pulse_sign++;
 +            j++;
 +
 +            if (j == PULSE_MAX) break;
 +        }
 +    }
 +    subfrm->amp_index   = optim->amp_index;
 +    subfrm->grid_index  = optim->grid_index;
 +    subfrm->dirac_train = optim->dirac_train;
 +}
 +
 +/**
 + * Compute the fixed codebook excitation.
 + *
 + * @param buf          target vector
 + * @param impulse_resp impulse response of the combined filter
 + */
 +static void fcb_search(G723_1_Context *p, int16_t *impulse_resp,
 +                       int16_t *buf, int index)
 +{
 +    FCBParam optim;
 +    int pulse_cnt = pulses[index];
 +    int i;
 +
 +    optim.min_err = 1 << 30;
 +    get_fcb_param(&optim, impulse_resp, buf, pulse_cnt, SUBFRAME_LEN);
 +
 +    if (p->pitch_lag[index >> 1] < SUBFRAME_LEN - 2) {
 +        get_fcb_param(&optim, impulse_resp, buf, pulse_cnt,
 +                      p->pitch_lag[index >> 1]);
 +    }
 +
 +    /* Reconstruct the excitation */
 +    memset(buf, 0, sizeof(int16_t) * SUBFRAME_LEN);
 +    for (i = 0; i < pulse_cnt; i++)
 +        buf[optim.pulse_pos[i]] = optim.pulse_sign[i];
 +
 +    pack_fcb_param(&p->subframe[index], &optim, buf, pulse_cnt);
 +
 +    if (optim.dirac_train)
 +        gen_dirac_train(buf, p->pitch_lag[index >> 1]);
 +}
 +
 +/**
 + * Pack the frame parameters into output bitstream.
 + *
 + * @param frame output buffer
 + * @param size  size of the buffer
 + */
 +static int pack_bitstream(G723_1_Context *p, unsigned char *frame, int size)
 +{
 +    PutBitContext pb;
 +    int info_bits, i, temp;
 +
 +    init_put_bits(&pb, frame, size);
 +
-     if (p->cur_rate == Rate6k3) {
++    if (p->cur_rate == RATE_6300) {
 +        info_bits = 0;
 +        put_bits(&pb, 2, info_bits);
 +    }
 +
 +    put_bits(&pb, 8, p->lsp_index[2]);
 +    put_bits(&pb, 8, p->lsp_index[1]);
 +    put_bits(&pb, 8, p->lsp_index[0]);
 +
 +    put_bits(&pb, 7, p->pitch_lag[0] - PITCH_MIN);
 +    put_bits(&pb, 2, p->subframe[1].ad_cb_lag);
 +    put_bits(&pb, 7, p->pitch_lag[1] - PITCH_MIN);
 +    put_bits(&pb, 2, p->subframe[3].ad_cb_lag);
 +
 +    /* Write 12 bit combined gain */
 +    for (i = 0; i < SUBFRAMES; i++) {
 +        temp = p->subframe[i].ad_cb_gain * GAIN_LEVELS +
 +               p->subframe[i].amp_index;
-         if (p->cur_rate ==  Rate6k3)
++        if (p->cur_rate ==  RATE_6300)
 +            temp += p->subframe[i].dirac_train << 11;
 +        put_bits(&pb, 12, temp);
 +    }
 +
 +    put_bits(&pb, 1, p->subframe[0].grid_index);
 +    put_bits(&pb, 1, p->subframe[1].grid_index);
 +    put_bits(&pb, 1, p->subframe[2].grid_index);
 +    put_bits(&pb, 1, p->subframe[3].grid_index);
 +
-     if (p->cur_rate == Rate6k3) {
++    if (p->cur_rate == RATE_6300) {
 +        skip_put_bits(&pb, 1); /* reserved bit */
 +
 +        /* Write 13 bit combined position index */
 +        temp = (p->subframe[0].pulse_pos >> 16) * 810 +
 +               (p->subframe[1].pulse_pos >> 14) *  90 +
 +               (p->subframe[2].pulse_pos >> 16) *   9 +
 +               (p->subframe[3].pulse_pos >> 14);
 +        put_bits(&pb, 13, temp);
 +
 +        put_bits(&pb, 16, p->subframe[0].pulse_pos & 0xffff);
 +        put_bits(&pb, 14, p->subframe[1].pulse_pos & 0x3fff);
 +        put_bits(&pb, 16, p->subframe[2].pulse_pos & 0xffff);
 +        put_bits(&pb, 14, p->subframe[3].pulse_pos & 0x3fff);
 +
 +        put_bits(&pb, 6, p->subframe[0].pulse_sign);
 +        put_bits(&pb, 5, p->subframe[1].pulse_sign);
 +        put_bits(&pb, 6, p->subframe[2].pulse_sign);
 +        put_bits(&pb, 5, p->subframe[3].pulse_sign);
 +    }
 +
 +    flush_put_bits(&pb);
 +    return frame_size[info_bits];
 +}
 +
 +static int g723_1_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
 +                            const AVFrame *frame, int *got_packet_ptr)
 +{
 +    G723_1_Context *p = avctx->priv_data;
 +    int16_t unq_lpc[LPC_ORDER * SUBFRAMES];
 +    int16_t qnt_lpc[LPC_ORDER * SUBFRAMES];
 +    int16_t cur_lsp[LPC_ORDER];
 +    int16_t weighted_lpc[LPC_ORDER * SUBFRAMES << 1];
 +    int16_t vector[FRAME_LEN + PITCH_MAX];
 +    int offset, ret;
 +    int16_t *in = (const int16_t *)frame->data[0];
 +
 +    HFParam hf[4];
 +    int i, j;
 +
 +    highpass_filter(in, &p->hpf_fir_mem, &p->hpf_iir_mem);
 +
 +    memcpy(vector, p->prev_data, HALF_FRAME_LEN * sizeof(int16_t));
 +    memcpy(vector + HALF_FRAME_LEN, in, FRAME_LEN * sizeof(int16_t));
 +
 +    comp_lpc_coeff(vector, unq_lpc);
 +    lpc2lsp(&unq_lpc[LPC_ORDER * 3], p->prev_lsp, cur_lsp);
 +    lsp_quantize(p->lsp_index, cur_lsp, p->prev_lsp);
 +
 +    /* Update memory */
 +    memcpy(vector + LPC_ORDER, p->prev_data + SUBFRAME_LEN,
 +           sizeof(int16_t) * SUBFRAME_LEN);
 +    memcpy(vector + LPC_ORDER + SUBFRAME_LEN, in,
 +           sizeof(int16_t) * (HALF_FRAME_LEN + SUBFRAME_LEN));
 +    memcpy(p->prev_data, in + HALF_FRAME_LEN,
 +           sizeof(int16_t) * HALF_FRAME_LEN);
 +    memcpy(in, vector + LPC_ORDER, sizeof(int16_t) * FRAME_LEN);
 +
 +    perceptual_filter(p, weighted_lpc, unq_lpc, vector);
 +
 +    memcpy(in, vector + LPC_ORDER, sizeof(int16_t) * FRAME_LEN);
 +    memcpy(vector, p->prev_weight_sig, sizeof(int16_t) * PITCH_MAX);
 +    memcpy(vector + PITCH_MAX, in, sizeof(int16_t) * FRAME_LEN);
 +
 +    scale_vector(vector, FRAME_LEN + PITCH_MAX);
 +
 +    p->pitch_lag[0] = estimate_pitch(vector, PITCH_MAX);
 +    p->pitch_lag[1] = estimate_pitch(vector, PITCH_MAX + HALF_FRAME_LEN);
 +
 +    for (i = PITCH_MAX, j = 0; j < SUBFRAMES; i += SUBFRAME_LEN, j++)
 +        comp_harmonic_coeff(vector + i, p->pitch_lag[j >> 1], hf + j);
 +
 +    memcpy(vector, p->prev_weight_sig, sizeof(int16_t) * PITCH_MAX);
 +    memcpy(vector + PITCH_MAX, in, sizeof(int16_t) * FRAME_LEN);
 +    memcpy(p->prev_weight_sig, vector + FRAME_LEN, sizeof(int16_t) * PITCH_MAX);
 +
 +    for (i = 0, j = 0; j < SUBFRAMES; i += SUBFRAME_LEN, j++)
 +        harmonic_filter(hf + j, vector + PITCH_MAX + i, in + i);
 +
 +    inverse_quant(cur_lsp, p->prev_lsp, p->lsp_index, 0);
 +    lsp_interpolate(qnt_lpc, cur_lsp, p->prev_lsp);
 +
 +    memcpy(p->prev_lsp, cur_lsp, sizeof(int16_t) * LPC_ORDER);
 +
 +    offset = 0;
 +    for (i = 0; i < SUBFRAMES; i++) {
 +        int16_t impulse_resp[SUBFRAME_LEN];
 +        int16_t residual[SUBFRAME_LEN + PITCH_ORDER - 1];
 +        int16_t flt_in[SUBFRAME_LEN];
 +        int16_t zero[LPC_ORDER], fir[LPC_ORDER], iir[LPC_ORDER];
 +
 +        /**
 +         * Compute the combined impulse response of the synthesis filter,
 +         * formant perceptual weighting filter and harmonic noise shaping filter
 +         */
 +        memset(zero, 0, sizeof(int16_t) * LPC_ORDER);
 +        memset(vector, 0, sizeof(int16_t) * PITCH_MAX);
 +        memset(flt_in, 0, sizeof(int16_t) * SUBFRAME_LEN);
 +
 +        flt_in[0] = 1 << 13; /* Unit impulse */
 +        synth_percept_filter(qnt_lpc + offset, weighted_lpc + (offset << 1),
 +                             zero, zero, flt_in, vector + PITCH_MAX, 1);
 +        harmonic_filter(hf + i, vector + PITCH_MAX, impulse_resp);
 +
 +         /* Compute the combined zero input response */
 +        flt_in[0] = 0;
 +        memcpy(fir, p->perf_fir_mem, sizeof(int16_t) * LPC_ORDER);
 +        memcpy(iir, p->perf_iir_mem, sizeof(int16_t) * LPC_ORDER);
 +
 +        synth_percept_filter(qnt_lpc + offset, weighted_lpc + (offset << 1),
 +                             fir, iir, flt_in, vector + PITCH_MAX, 0);
 +        memcpy(vector, p->harmonic_mem, sizeof(int16_t) * PITCH_MAX);
 +        harmonic_noise_sub(hf + i, vector + PITCH_MAX, in);
 +
 +        acb_search(p, residual, impulse_resp, in, i);
 +        gen_acb_excitation(residual, p->prev_excitation,p->pitch_lag[i >> 1],
 +                           p->subframe[i], p->cur_rate);
 +        sub_acb_contrib(residual, impulse_resp, in);
 +
 +        fcb_search(p, impulse_resp, in, i);
 +
 +        /* Reconstruct the excitation */
 +        gen_acb_excitation(impulse_resp, p->prev_excitation, p->pitch_lag[i >> 1],
-                            p->subframe[i], Rate6k3);
++                           p->subframe[i], RATE_6300);
 +
 +        memmove(p->prev_excitation, p->prev_excitation + SUBFRAME_LEN,
 +               sizeof(int16_t) * (PITCH_MAX - SUBFRAME_LEN));
 +        for (j = 0; j < SUBFRAME_LEN; j++)
 +            in[j] = av_clip_int16((in[j] << 1) + impulse_resp[j]);
 +        memcpy(p->prev_excitation + PITCH_MAX - SUBFRAME_LEN, in,
 +               sizeof(int16_t) * SUBFRAME_LEN);
 +
 +        /* Update filter memories */
 +        synth_percept_filter(qnt_lpc + offset, weighted_lpc + (offset << 1),
 +                             p->perf_fir_mem, p->perf_iir_mem,
 +                             in, vector + PITCH_MAX, 0);
 +        memmove(p->harmonic_mem, p->harmonic_mem + SUBFRAME_LEN,
 +                sizeof(int16_t) * (PITCH_MAX - SUBFRAME_LEN));
 +        memcpy(p->harmonic_mem + PITCH_MAX - SUBFRAME_LEN, vector + PITCH_MAX,
 +               sizeof(int16_t) * SUBFRAME_LEN);
 +
 +        in += SUBFRAME_LEN;
 +        offset += LPC_ORDER;
 +    }
 +
 +    if ((ret = ff_alloc_packet2(avctx, avpkt, 24)))
 +        return ret;
 +
 +    *got_packet_ptr = 1;
 +    avpkt->size = pack_bitstream(p, avpkt->data, avpkt->size);
 +    return 0;
 +}
 +
 +AVCodec ff_g723_1_encoder = {
      .name           = "g723_1",
      .type           = AVMEDIA_TYPE_AUDIO,
      .id             = CODEC_ID_G723_1,
  
  /**
   * @file
 - * G.723.1 compatible decoder data tables
 + * G723.1 compatible decoder data tables
   */
  
- #ifndef AVCODEC_G729_DATA_H
- #define AVCODEC_G729_DATA_H
 -#ifndef AVCODEC_G723_1_DATA_H
 -#define AVCODEC_G723_1_DATA_H
++#ifndef AVCODEC_G729_1_DATA_H
++#define AVCODEC_G729_1_DATA_H
  
  #include <stdint.h>
  
  #define GAIN_LEVELS     24
  #define COS_TBL_SIZE    512
  
 -static const uint8_t frame_size[4] = { 24, 20, 4, 1 };
 +/**
 + * G723.1 frame types
 + */
- typedef enum {
-     ActiveFrame,        ///< Active speech
-     SIDFrame,           ///< Silence Insertion Descriptor frame
-     UntransmittedFrame
++typedef enum FrameType {
++    ACTIVE_FRAME,        ///< Active speech
++    SID_FRAME,           ///< Silence Insertion Descriptor frame
++    UNTRANSMITTED_FRAME
 +} FrameType;
 +
 +static const uint8_t frame_size[4] = {24, 20, 4, 1};
 +
- typedef enum {
-     Rate6k3,
-     Rate5k3
++typedef enum Rate {
++    RATE_6300,
++    RATE_5300
 +} Rate;
 +
 +/**
 + * G723.1 unpacked data subframe
 + */
- typedef struct {
++typedef struct G723_1_Subframe {
 +    int ad_cb_lag;     ///< adaptive codebook lag
 +    int ad_cb_gain;
 +    int dirac_train;
 +    int pulse_sign;
 +    int grid_index;
 +    int amp_index;
 +    int pulse_pos;
 +} G723_1_Subframe;
 +
 +/**
 + * Pitch postfilter parameters
 + */
 +typedef struct {
 +    int     index;    ///< postfilter backward/forward lag
 +    int16_t opt_gain; ///< optimal gain
 +    int16_t sc_gain;  ///< scaling gain
 +} PPFParam;
 +
 +/**
 + * Harmonic filter parameters
 + */
 +typedef struct {
 +    int index;
 +    int gain;
 +} HFParam;
 +
 +/**
 + * Optimized fixed codebook excitation parameters
 + */
 +typedef struct {
 +    int min_err;
 +    int amp_index;
 +    int grid_index;
 +    int dirac_train;
 +    int pulse_pos[PULSE_MAX];
 +    int pulse_sign[PULSE_MAX];
 +} FCBParam;
  
 -/* Postfilter gain weighting factors scaled by 2^15 */
 -static const int16_t ppf_gain_weight[2] = { 0x1800, 0x2000 };
 +/**
 + * Postfilter gain weighting factors scaled by 2^15
 + */
 +static const int16_t ppf_gain_weight[2] = {0x1800, 0x2000};
  
 -/* LSP DC component */
 +/**
 + * LSP DC component
 + */
  static const int16_t dc_lsp[LPC_ORDER] = {
 -    0x0c3b, 0x1271, 0x1e0a, 0x2a36, 0x3630,
 -    0x406f, 0x4d28, 0x56f4, 0x638c, 0x6c46
 +    0x0c3b,
 +    0x1271,
 +    0x1e0a,
 +    0x2a36,
 +    0x3630,
 +    0x406f,
 +    0x4d28,
 +    0x56f4,
 +    0x638c,
 +    0x6c46
  };
  
 -/* Cosine table scaled by 2^14 */
 +/**
 + * Cosine table scaled by 2^14
 + */
  static const int16_t cos_tab[COS_TBL_SIZE] = {
      16384,  16383,  16379,  16373,  16364,  16353,  16340,  16324,
      16305,  16284,  16261,  16235,  16207,  16176,  16143,  16107,
@@@ -1261,62 -1183,12 +1261,62 @@@ static const int16_t adaptive_cb_gain17
      -4534,  -2487,  -3932,  -4166,  -2113,  -3341,  -3540,  -3070
  };
  
 -/* 0.65^i (Zero part) and 0.75^i (Pole part) scaled by 2^15 */
 +/**
 + * 0.65^i (Zero part) and 0.75^i (Pole part) scaled by 2^15
 + */
  static const int16_t postfilter_tbl[2][LPC_ORDER] = {
      /* Zero */
 -    { 21299, 13844,  8999,  5849, 3802, 2471, 1606, 1044,  679,  441 },
 +    {21299, 13844,  8999,  5849, 3802, 2471, 1606, 1044,  679,  441},
      /* Pole */
 -    { 24576, 18432, 13824, 10368, 7776, 5832, 4374, 3281, 2460, 1845 }
 +    {24576, 18432, 13824, 10368, 7776, 5832, 4374, 3281, 2460, 1845}
 +};
 +
 +/**
 + * Hamming window coefficients scaled by 2^15
 + */
 +static const int16_t hamming_window[LPC_FRAME] = {
 +     2621,  2631,  2659,  2705,  2770,  2853,  2955,  3074,  3212,  3367,
 +     3541,  3731,  3939,  4164,  4405,  4663,  4937,  5226,  5531,  5851,
 +     6186,  6534,  6897,  7273,  7661,  8062,  8475,  8899,  9334,  9780,
 +    10235, 10699, 11172, 11653, 12141, 12636, 13138, 13645, 14157, 14673,
 +    15193, 15716, 16242, 16769, 17298, 17827, 18356, 18884, 19411, 19935,
 +    20457, 20975, 21489, 21999, 22503, 23002, 23494, 23978, 24455, 24924,
 +    25384, 25834, 26274, 26704, 27122, 27529, 27924, 28306, 28675, 29031,
 +    29373, 29700, 30012, 30310, 30592, 30857, 31107, 31340, 31557, 31756,
 +    31938, 32102, 32249, 32377, 32488, 32580, 32654, 32710, 32747, 32766,
 +    32766, 32747, 32710, 32654, 32580, 32488, 32377, 32249, 32102, 31938,
 +    31756, 31557, 31340, 31107, 30857, 30592, 30310, 30012, 29700, 29373,
 +    29031, 28675, 28306, 27924, 27529, 27122, 26704, 26274, 25834, 25384,
 +    24924, 24455, 23978, 23494, 23002, 22503, 21999, 21489, 20975, 20457,
 +    19935, 19411, 18884, 18356, 17827, 17298, 16769, 16242, 15716, 15193,
 +    14673, 14157, 13645, 13138, 12636, 12141, 11653, 11172, 10699, 10235,
 +     9780, 9334,   8899,  8475,  8062,  7661,  7273,  6897,  6534,  6186,
 +     5851, 5531,   5226,  4937,  4663,  4405,  4164,  3939,  3731,  3541,
 +     3367, 3212,   3074,  2955,  2853,  2770,  2705,  2659,  2631,  2621
 +};
 +
 +/**
 + * Binomial window coefficients scaled by 2^15
 + */
 +static const int16_t binomial_window[LPC_ORDER] = {
 +    32749, 32695, 32604, 32477, 32315, 32118, 31887, 31622, 31324, 30995
 +};
 +
 +/**
 + * 0.994^i scaled by 2^15
 + */
 +static const int16_t bandwidth_expand[LPC_ORDER] = {
 +    32571, 32376, 32182, 31989, 31797, 31606, 31416, 31228, 31040, 30854
 +};
 +
 +/**
 + * 0.5^i scaled by 2^15
 + */
 +static const int16_t percept_flt_tbl[2][LPC_ORDER] = {
 +    /* Zero part */
 +    {29491, 26542, 23888, 21499, 19349, 17414, 15673, 14106, 12695, 11425},
 +    /* Pole part */
 +    {16384,  8192,  4096,  2048,  1024,   512,   256,   128,    64,    32}
  };
  
- #endif /* AVCODEC_G729_DATA_H */
 -#endif /* AVCODEC_G723_1_DATA_H */
++#endif /* AVCODEC_G729_1_DATA_H */
   */
  
  /**
- * @file
- * JPEG 2000 decoder using libopenjpeg
- */
+  * @file
+  * JPEG 2000 decoder using libopenjpeg
+  */
+ #define  OPJ_STATIC
+ #include <openjpeg.h>
  
- #include "libavutil/opt.h"
  #include "libavutil/imgutils.h"
- #include "avcodec.h"
 +#include "libavutil/pixfmt.h"
  #include "libavutil/intreadwrite.h"
+ #include "libavutil/opt.h"
+ #include "avcodec.h"
  #include "thread.h"
- #define  OPJ_STATIC
- #include <openjpeg.h>
  
  #define JP2_SIG_TYPE    0x6A502020
  #define JP2_SIG_VALUE   0x0D0A870A
@@@ -61,146 -43,15 +62,147 @@@ typedef struct 
      int lowqual;
  } LibOpenJPEGContext;
  
- static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image, enum PixelFormat pix_fmt){
 -static int check_image_attributes(opj_image_t *image)
++static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image, enum PixelFormat pix_fmt)
+ {
 -    return image->comps[0].dx   == image->comps[1].dx   &&
 -           image->comps[1].dx   == image->comps[2].dx   &&
 -           image->comps[0].dy   == image->comps[1].dy   &&
 -           image->comps[1].dy   == image->comps[2].dy   &&
 -           image->comps[0].prec == image->comps[1].prec &&
 -           image->comps[1].prec == image->comps[2].prec;
 +    AVPixFmtDescriptor descriptor = av_pix_fmt_descriptors[pix_fmt];
 +    int match = 1;
 +
 +    if (descriptor.nb_components != image->numcomps) {
 +        return 0;
 +    }
 +
 +    switch (descriptor.nb_components) {
 +    case 4: match = match && descriptor.comp[3].depth_minus1 + 1 >= image->comps[3].prec &&
 +                             1 == image->comps[3].dx &&
 +                             1 == image->comps[3].dy;
 +    case 3: match = match && descriptor.comp[2].depth_minus1 + 1 >= image->comps[2].prec &&
 +                             1 << descriptor.log2_chroma_w == image->comps[2].dx &&
 +                             1 << descriptor.log2_chroma_h == image->comps[2].dy;
 +    case 2: match = match && descriptor.comp[1].depth_minus1 + 1 >= image->comps[1].prec &&
 +                             1 << descriptor.log2_chroma_w == image->comps[1].dx &&
 +                             1 << descriptor.log2_chroma_h == image->comps[1].dy;
 +    case 1: match = match && descriptor.comp[0].depth_minus1 + 1 >= image->comps[0].prec &&
 +                             1 == image->comps[0].dx &&
 +                             1 == image->comps[0].dy;
 +    default:
 +        break;
 +    }
 +
 +    return match;
 +}
 +
 +static inline enum PixelFormat libopenjpeg_guess_pix_fmt(const opj_image_t *image) {
 +    int index;
 +    const enum PixelFormat *possible_fmts = NULL;
 +    int possible_fmts_nb = 0;
 +
 +    switch (image->color_space) {
 +    case CLRSPC_SRGB:
 +        possible_fmts = libopenjpeg_rgb_pix_fmts;
 +        possible_fmts_nb = FF_ARRAY_ELEMS(libopenjpeg_rgb_pix_fmts);
 +        break;
 +    case CLRSPC_GRAY:
 +        possible_fmts = libopenjpeg_gray_pix_fmts;
 +        possible_fmts_nb = FF_ARRAY_ELEMS(libopenjpeg_gray_pix_fmts);
 +        break;
 +    case CLRSPC_SYCC:
 +        possible_fmts = libopenjpeg_yuv_pix_fmts;
 +        possible_fmts_nb = FF_ARRAY_ELEMS(libopenjpeg_yuv_pix_fmts);
 +        break;
 +    default:
 +        possible_fmts = libopenjpeg_all_pix_fmts;
 +        possible_fmts_nb = FF_ARRAY_ELEMS(libopenjpeg_all_pix_fmts);
 +        break;
 +    }
 +
 +    for (index = 0; index < possible_fmts_nb; ++index) {
 +        if (libopenjpeg_matches_pix_fmt(image, possible_fmts[index])) {
 +            return possible_fmts[index];
 +        }
 +    }
 +
 +    return PIX_FMT_NONE;
 +}
 +
 +static inline int libopenjpeg_ispacked(enum PixelFormat pix_fmt) {
 +    int i, component_plane;
 +
 +    if (pix_fmt == PIX_FMT_GRAY16)
 +        return 0;
 +
 +    component_plane = av_pix_fmt_descriptors[pix_fmt].comp[0].plane;
-     for(i = 1; i < av_pix_fmt_descriptors[pix_fmt].nb_components; i++) {
++    for (i = 1; i < av_pix_fmt_descriptors[pix_fmt].nb_components; i++) {
 +        if (component_plane != av_pix_fmt_descriptors[pix_fmt].comp[i].plane)
 +            return 0;
 +    }
 +    return 1;
 +}
 +
 +static inline void libopenjpeg_copy_to_packed8(AVFrame *picture, opj_image_t *image) {
 +    uint8_t *img_ptr;
 +    int index, x, y, c;
-     for(y = 0; y < picture->height; y++) {
++    for (y = 0; y < picture->height; y++) {
 +        index = y*picture->width;
 +        img_ptr = picture->data[0] + y*picture->linesize[0];
-         for(x = 0; x < picture->width; x++, index++) {
-             for(c = 0; c < image->numcomps; c++) {
++        for (x = 0; x < picture->width; x++, index++) {
++            for (c = 0; c < image->numcomps; c++) {
 +                *img_ptr++ = image->comps[c].data[index];
 +            }
 +        }
 +    }
 +}
 +
 +static inline void libopenjpeg_copy_to_packed16(AVFrame *picture, opj_image_t *image) {
 +    uint16_t *img_ptr;
 +    int index, x, y, c;
 +    int adjust[4];
-     for (x = 0; x < image->numcomps; x++) {
++    for (x = 0; x < image->numcomps; x++)
 +        adjust[x] = FFMAX(FFMIN(16 - image->comps[x].prec, 8), 0);
-     }
++
 +    for (y = 0; y < picture->height; y++) {
 +        index = y*picture->width;
 +        img_ptr = (uint16_t*) (picture->data[0] + y*picture->linesize[0]);
 +        for (x = 0; x < picture->width; x++, index++) {
 +            for (c = 0; c < image->numcomps; c++) {
 +                *img_ptr++ = image->comps[c].data[index] << adjust[c];
 +            }
 +        }
 +    }
 +}
 +
 +static inline void libopenjpeg_copyto8(AVFrame *picture, opj_image_t *image) {
 +    int *comp_data;
 +    uint8_t *img_ptr;
 +    int index, x, y;
 +
-     for(index = 0; index < image->numcomps; index++) {
++    for (index = 0; index < image->numcomps; index++) {
 +        comp_data = image->comps[index].data;
-         for(y = 0; y < image->comps[index].h; y++) {
++        for (y = 0; y < image->comps[index].h; y++) {
 +            img_ptr = picture->data[index] + y * picture->linesize[index];
-             for(x = 0; x < image->comps[index].w; x++) {
++            for (x = 0; x < image->comps[index].w; x++) {
 +                *img_ptr = (uint8_t) *comp_data;
 +                img_ptr++;
 +                comp_data++;
 +            }
 +        }
 +    }
 +}
 +
 +static inline void libopenjpeg_copyto16(AVFrame *picture, opj_image_t *image) {
 +    int *comp_data;
 +    uint16_t *img_ptr;
 +    int index, x, y;
-     for(index = 0; index < image->numcomps; index++) {
++    for (index = 0; index < image->numcomps; index++) {
 +        comp_data = image->comps[index].data;
-         for(y = 0; y < image->comps[index].h; y++) {
++        for (y = 0; y < image->comps[index].h; y++) {
 +            img_ptr = (uint16_t*) (picture->data[index] + y * picture->linesize[index]);
-             for(x = 0; x < image->comps[index].w; x++) {
++            for (x = 0; x < image->comps[index].w; x++) {
 +                *img_ptr = *comp_data;
 +                img_ptr++;
 +                comp_data++;
 +            }
 +        }
 +    }
  }
  
  static av_cold int libopenjpeg_decode_init(AVCodecContext *avctx)
@@@ -257,8 -107,10 +259,8 @@@ static int libopenjpeg_decode_frame(AVC
          return -1;
      }
      opj_set_event_mgr((opj_common_ptr)dec, NULL, NULL);
 -
      ctx->dec_params.cp_limit_decoding = LIMIT_TO_MAIN_HEADER;
-     ctx->dec_params.cp_layer  = ctx->lowqual;
 -    ctx->dec_params.cp_reduce         = ctx->lowres;
+     ctx->dec_params.cp_layer          = ctx->lowqual;
      // Tie decoder with decoding parameters
      opj_setup_decoder(dec, &ctx->dec_params);
      stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
      width  = image->x1 - image->x0;
      height = image->y1 - image->y0;
  
-     if(av_image_check_size(width, height, 0, avctx) < 0) {
-         av_log(avctx, AV_LOG_ERROR, "%dx%d dimension invalid.\n", width, height);
 -    if (ctx->lowres) {
 -        width  = (width  + (1 << ctx->lowres) - 1) >> ctx->lowres;
 -        height = (height + (1 << ctx->lowres) - 1) >> ctx->lowres;
 -    }
 -
+     if (av_image_check_size(width, height, 0, avctx) < 0) {
+         av_log(avctx, AV_LOG_ERROR,
+                "%dx%d dimension invalid.\n", width, height);
          goto done;
      }
      avcodec_set_dimensions(avctx, width, height);
  
 -    switch (image->numcomps) {
 -    case 1:
 -        avctx->pix_fmt = PIX_FMT_GRAY8;
 -        break;
 -    case 3:
 -        if (check_image_attributes(image)) {
 -            avctx->pix_fmt = PIX_FMT_RGB24;
 -        } else {
 -            avctx->pix_fmt = PIX_FMT_GRAY8;
 -            av_log(avctx, AV_LOG_ERROR,
 -                   "Only first component will be used.\n");
 +    if (avctx->pix_fmt != PIX_FMT_NONE) {
 +        if (!libopenjpeg_matches_pix_fmt(image, avctx->pix_fmt)) {
 +            avctx->pix_fmt = PIX_FMT_NONE;
          }
 -        break;
 -    case 4:
 -        has_alpha      = 1;
 -        avctx->pix_fmt = PIX_FMT_RGBA;
 -        break;
 -    default:
 -        av_log(avctx, AV_LOG_ERROR, "%d components unsupported.\n",
 -               image->numcomps);
 +    }
 +
 +    if (avctx->pix_fmt == PIX_FMT_NONE) {
 +        avctx->pix_fmt = libopenjpeg_guess_pix_fmt(image);
 +    }
 +
 +    if (avctx->pix_fmt == PIX_FMT_NONE) {
 +        av_log(avctx, AV_LOG_ERROR, "Unable to determine pixel format\n");
          goto done;
      }
 +    for (i = 0; i < image->numcomps; i++)
 +        if (image->comps[i].prec > avctx->bits_per_raw_sample)
 +            avctx->bits_per_raw_sample = image->comps[i].prec;
  
-     if(picture->data[0])
+     if (picture->data[0])
          ff_thread_release_buffer(avctx, picture);
  
-     if(ff_thread_get_buffer(avctx, picture) < 0){
+     if (ff_thread_get_buffer(avctx, picture) < 0) {
          av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed\n");
 -        return -1;
 +        goto done;
      }
  
 -    ff_thread_finish_setup(avctx);
 -
      ctx->dec_params.cp_limit_decoding = NO_LIMITATION;
-     // Tie decoder with decoding parameters
 +    ctx->dec_params.cp_reduce = avctx->lowres;
+     // Tie decoder with decoding parameters.
      opj_setup_decoder(dec, &ctx->dec_params);
      stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
-     if(!stream) {
-         av_log(avctx, AV_LOG_ERROR, "Codestream could not be opened for reading.\n");
+     if (!stream) {
+         av_log(avctx, AV_LOG_ERROR,
+                "Codestream could not be opened for reading.\n");
 -        opj_destroy_decompress(dec);
 -        return -1;
 +        goto done;
      }
  
-     // Decode the codestream
 +    opj_image_destroy(image);
+     // Decode the codestream.
      image = opj_decode_with_info(dec, stream, NULL);
      opj_cio_close(stream);
-     if(!image) {
++    if (!image) {
 +        av_log(avctx, AV_LOG_ERROR, "Error decoding codestream.\n");
 +        goto done;
 +    }
  
 -    for (x = 0; x < image->numcomps; x++)
 -        adjust[x] = FFMAX(image->comps[x].prec - 8, 0);
 -
 -    for (y = 0; y < avctx->height; y++) {
 -        index   = y * avctx->width;
 -        img_ptr = picture->data[0] + y * picture->linesize[0];
 -        for (x = 0; x < avctx->width; x++, index++) {
 -            *img_ptr++ = image->comps[0].data[index] >> adjust[0];
 -            if (image->numcomps > 2 && check_image_attributes(image)) {
 -                *img_ptr++ = image->comps[1].data[index] >> adjust[1];
 -                *img_ptr++ = image->comps[2].data[index] >> adjust[2];
 -                if (has_alpha)
 -                    *img_ptr++ = image->comps[3].data[index] >> adjust[3];
 -            }
 +    pixel_size = av_pix_fmt_descriptors[avctx->pix_fmt].comp[0].step_minus1 + 1;
 +    ispacked = libopenjpeg_ispacked(avctx->pix_fmt);
 +
 +    switch (pixel_size) {
 +    case 1:
 +        if (ispacked) {
 +            libopenjpeg_copy_to_packed8(picture, image);
 +        } else {
 +            libopenjpeg_copyto8(picture, image);
          }
 +        break;
 +    case 2:
 +        if (ispacked) {
 +            libopenjpeg_copy_to_packed8(picture, image);
 +        } else {
 +            libopenjpeg_copyto16(picture, image);
 +        }
 +        break;
 +    case 3:
 +    case 4:
 +        if (ispacked) {
 +            libopenjpeg_copy_to_packed8(picture, image);
 +        }
 +        break;
 +    case 6:
 +    case 8:
 +        if (ispacked) {
 +            libopenjpeg_copy_to_packed16(picture, image);
 +        }
 +        break;
 +    default:
 +        av_log(avctx, AV_LOG_ERROR, "unsupported pixel size %d\n", pixel_size);
 +        goto done;
      }
  
      *output    = ctx->image;
@@@ -388,7 -236,8 +397,7 @@@ static av_cold int libopenjpeg_decode_c
  #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
  
  static const AVOption options[] = {
-     { "lowqual",       "Limit the number of layers used for decoding",         OFFSET(lowqual),        AV_OPT_TYPE_INT,   { 0 }, 0, INT_MAX, VD },
+     { "lowqual", "Limit the number of layers used for decoding",    OFFSET(lowqual), AV_OPT_TYPE_INT, { 0 }, 0, INT_MAX, VD },
 -    { "lowres",  "Lower the decoding resolution by a power of two", OFFSET(lowres),  AV_OPT_TYPE_INT, { 0 }, 0, INT_MAX, VD },
      { NULL },
  };
  
  #define  OPJ_STATIC
  #include <openjpeg.h>
  
- #include "libavutil/opt.h"
- #include "libavutil/imgutils.h"
 +#include "libavutil/avassert.h"
- #include "avcodec.h"
+ #include "libavutil/imgutils.h"
  #include "libavutil/intreadwrite.h"
+ #include "libavutil/opt.h"
+ #include "avcodec.h"
  #include "internal.h"
  
  typedef struct {
@@@ -284,24 -252,21 +284,23 @@@ static int libopenjpeg_copy_unpacked8(A
          for (y = 0; y < height; ++y) {
              image_index = y * width;
              frame_index = y * frame->linesize[compno];
-             for (x = 0; x < width; ++x) {
+             for (x = 0; x < width; ++x)
 -                image->comps[compno].data[image_index++] =
 -                    frame->data[compno][frame_index++];
 +                image->comps[compno].data[image_index++] = frame->data[compno][frame_index++];
-             }
          }
      }
 +
 +    return 1;
  }
  
 -static void libopenjpeg_copy_unpacked16(AVCodecContext *avctx,
 -                                        const AVFrame *frame,
 -                                        opj_image_t *image)
 +static int libopenjpeg_copy_unpacked16(AVCodecContext *avctx, const AVFrame *frame, opj_image_t *image)
  {
      int compno;
 -    int x, y;
 -    int width, height;
 -    int image_index, frame_index;
 +    int x;
 +    int y;
 +    int width;
 +    int height;
 +    int image_index;
 +    int frame_index;
      const int numcomps = image->numcomps;
      uint16_t *frame_ptr;
  
          for (y = 0; y < height; ++y) {
              image_index = y * width;
              frame_index = y * (frame->linesize[compno] / 2);
-             for (x = 0; x < width; ++x) {
+             for (x = 0; x < width; ++x)
 -                image->comps[compno].data[image_index++] =
 -                    frame_ptr[frame_index++];
 +                image->comps[compno].data[image_index++] = frame_ptr[frame_index++];
-             }
          }
      }
 +
 +    return 1;
  }
  
  static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
  {
      LibOpenJPEGContext *ctx = avctx->priv_data;
      opj_cinfo_t *compress = ctx->compress;
-     opj_image_t *image = ctx->image;
+     opj_image_t *image    = ctx->image;
      opj_cio_t *stream;
 +    int cpyresult = 0;
      int ret, len;
  
      // x0, y0 is the top left corner of the image
@@@ -480,16 -420,14 +478,16 @@@ AVCodec ff_libopenjpeg_encoder = 
      .encode2        = libopenjpeg_encode_frame,
      .close          = libopenjpeg_encode_close,
      .capabilities   = 0,
-     .pix_fmts       = (const enum PixelFormat[]){
+     .pix_fmts       = (const enum PixelFormat[]) {
 -        PIX_FMT_RGB24, PIX_FMT_RGBA, PIX_FMT_RGB48,
 -        PIX_FMT_GRAY8, PIX_FMT_GRAY16, PIX_FMT_Y400A,
 +        PIX_FMT_RGB24, PIX_FMT_RGBA, PIX_FMT_RGB48, PIX_FMT_RGBA64,
 +        PIX_FMT_GRAY8, PIX_FMT_GRAY8A, PIX_FMT_GRAY16,
          PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUVA420P,
 -        PIX_FMT_YUV440P, PIX_FMT_YUV444P,
 -        PIX_FMT_YUV411P, PIX_FMT_YUV410P,
 +        PIX_FMT_YUV440P, PIX_FMT_YUV444P, PIX_FMT_YUVA422P,
 +        PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_YUVA444P,
          PIX_FMT_YUV420P9, PIX_FMT_YUV422P9, PIX_FMT_YUV444P9,
          PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_YUV444P10,
 +        PIX_FMT_YUV420P12, PIX_FMT_YUV422P12, PIX_FMT_YUV444P12,
 +        PIX_FMT_YUV420P14, PIX_FMT_YUV422P14, PIX_FMT_YUV444P14,
          PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16,
          PIX_FMT_NONE
      },
@@@ -27,8 -27,8 +27,8 @@@
   */
  
  #define LIBAVCODEC_VERSION_MAJOR 54
- #define LIBAVCODEC_VERSION_MINOR  43
 -#define LIBAVCODEC_VERSION_MINOR 23
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR  44
 +#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index b1d8fd3,0000000..ee68eca
mode 100644,000000..100644
--- /dev/null
@@@ -1,494 -1,0 +1,494 @@@
-     .outputs   = (const AVFilterPad[]) {{ .name      = "default",
-                                     .type            = AVMEDIA_TYPE_VIDEO,
-                                     .request_frame   = movie_request_frame,
-                                     .config_props    = movie_config_output_props, },
-                                   { .name = NULL}},
 +/*
 + * Copyright (c) 2010 Stefano Sabatini
 + * Copyright (c) 2008 Victor Paesa
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg 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.
 + *
 + * FFmpeg 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 FFmpeg; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + */
 +
 +/**
 + * @file
 + * movie video source
 + *
 + * @todo use direct rendering (no allocation of a new frame)
 + * @todo support a PTS correction mechanism
 + * @todo support more than one output stream
 + */
 +
 +/* #define DEBUG */
 +
 +#include <float.h>
 +#include "libavutil/avstring.h"
 +#include "libavutil/opt.h"
 +#include "libavutil/imgutils.h"
 +#include "libavformat/avformat.h"
 +#include "audio.h"
 +#include "avcodec.h"
 +#include "avfilter.h"
 +#include "formats.h"
 +#include "internal.h"
 +#include "video.h"
 +
 +typedef enum {
 +    STATE_DECODING,
 +    STATE_FLUSHING,
 +    STATE_DONE,
 +} MovieState;
 +
 +typedef struct {
 +    /* common A/V fields */
 +    const AVClass *class;
 +    int64_t seek_point;   ///< seekpoint in microseconds
 +    double seek_point_d;
 +    char *format_name;
 +    char *file_name;
 +    int stream_index;
 +    int loop_count;
 +
 +    AVFormatContext *format_ctx;
 +    AVCodecContext *codec_ctx;
 +    MovieState state;
 +    AVFrame *frame;   ///< video frame to store the decoded images in
 +
 +    /* video-only fields */
 +    int w, h;
 +    AVFilterBufferRef *picref;
 +
 +    /* audio-only fields */
 +    int bps;            ///< bytes per sample
 +    AVPacket pkt, pkt0;
 +    AVFilterBufferRef *samplesref;
 +} MovieContext;
 +
 +#define OFFSET(x) offsetof(MovieContext, x)
 +
 +static const AVOption movie_options[]= {
 +{"format_name",  "set format name",         OFFSET(format_name),  AV_OPT_TYPE_STRING, {.str =  0},  CHAR_MIN, CHAR_MAX },
 +{"f",            "set format name",         OFFSET(format_name),  AV_OPT_TYPE_STRING, {.str =  0},  CHAR_MIN, CHAR_MAX },
 +{"stream_index", "set stream index",        OFFSET(stream_index), AV_OPT_TYPE_INT,    {.dbl = -1},  -1,       INT_MAX  },
 +{"si",           "set stream index",        OFFSET(stream_index), AV_OPT_TYPE_INT,    {.dbl = -1},  -1,       INT_MAX  },
 +{"seek_point",   "set seekpoint (seconds)", OFFSET(seek_point_d), AV_OPT_TYPE_DOUBLE, {.dbl =  0},  0,        (INT64_MAX-1) / 1000000 },
 +{"sp",           "set seekpoint (seconds)", OFFSET(seek_point_d), AV_OPT_TYPE_DOUBLE, {.dbl =  0},  0,        (INT64_MAX-1) / 1000000 },
 +{"loop",         "set loop count",          OFFSET(loop_count),   AV_OPT_TYPE_INT,    {.dbl =  1},  0,        INT_MAX  },
 +{NULL},
 +};
 +
 +AVFILTER_DEFINE_CLASS(movie);
 +
 +static av_cold int movie_common_init(AVFilterContext *ctx, const char *args,
 +                                     enum AVMediaType type)
 +{
 +    MovieContext *movie = ctx->priv;
 +    AVInputFormat *iformat = NULL;
 +    AVCodec *codec;
 +    int64_t timestamp;
 +    int ret;
 +
 +    movie->class = &movie_class;
 +    av_opt_set_defaults(movie);
 +
 +    if (args)
 +        movie->file_name = av_get_token(&args, ":");
 +    if (!movie->file_name || !*movie->file_name) {
 +        av_log(ctx, AV_LOG_ERROR, "No filename provided!\n");
 +        return AVERROR(EINVAL);
 +    }
 +
 +    if (*args++ == ':' && (ret = av_set_options_string(movie, args, "=", ":")) < 0) {
 +        av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
 +        return ret;
 +    }
 +
 +    movie->seek_point = movie->seek_point_d * 1000000 + 0.5;
 +
 +    av_register_all();
 +
 +    // Try to find the movie format (container)
 +    iformat = movie->format_name ? av_find_input_format(movie->format_name) : NULL;
 +
 +    movie->format_ctx = NULL;
 +    if ((ret = avformat_open_input(&movie->format_ctx, movie->file_name, iformat, NULL)) < 0) {
 +        av_log(ctx, AV_LOG_ERROR,
 +               "Failed to avformat_open_input '%s'\n", movie->file_name);
 +        return ret;
 +    }
 +    if ((ret = avformat_find_stream_info(movie->format_ctx, NULL)) < 0)
 +        av_log(ctx, AV_LOG_WARNING, "Failed to find stream info\n");
 +
 +    // if seeking requested, we execute it
 +    if (movie->seek_point > 0) {
 +        timestamp = movie->seek_point;
 +        // add the stream start time, should it exist
 +        if (movie->format_ctx->start_time != AV_NOPTS_VALUE) {
 +            if (timestamp > INT64_MAX - movie->format_ctx->start_time) {
 +                av_log(ctx, AV_LOG_ERROR,
 +                       "%s: seek value overflow with start_time:%"PRId64" seek_point:%"PRId64"\n",
 +                       movie->file_name, movie->format_ctx->start_time, movie->seek_point);
 +                return AVERROR(EINVAL);
 +            }
 +            timestamp += movie->format_ctx->start_time;
 +        }
 +        if ((ret = av_seek_frame(movie->format_ctx, -1, timestamp, AVSEEK_FLAG_BACKWARD)) < 0) {
 +            av_log(ctx, AV_LOG_ERROR, "%s: could not seek to position %"PRId64"\n",
 +                   movie->file_name, timestamp);
 +            return ret;
 +        }
 +    }
 +
 +    /* select the media stream */
 +    if ((ret = av_find_best_stream(movie->format_ctx, type,
 +                                   movie->stream_index, -1, NULL, 0)) < 0) {
 +        av_log(ctx, AV_LOG_ERROR, "No %s stream with index '%d' found\n",
 +               av_get_media_type_string(type), movie->stream_index);
 +        return ret;
 +    }
 +    movie->stream_index = ret;
 +    movie->codec_ctx = movie->format_ctx->streams[movie->stream_index]->codec;
 +
 +    /*
 +     * So now we've got a pointer to the so-called codec context for our video
 +     * stream, but we still have to find the actual codec and open it.
 +     */
 +    codec = avcodec_find_decoder(movie->codec_ctx->codec_id);
 +    if (!codec) {
 +        av_log(ctx, AV_LOG_ERROR, "Failed to find any codec\n");
 +        return AVERROR(EINVAL);
 +    }
 +
 +    if ((ret = avcodec_open2(movie->codec_ctx, codec, NULL)) < 0) {
 +        av_log(ctx, AV_LOG_ERROR, "Failed to open codec\n");
 +        return ret;
 +    }
 +
 +    av_log(ctx, AV_LOG_VERBOSE, "seek_point:%"PRIi64" format_name:%s file_name:%s stream_index:%d\n",
 +           movie->seek_point, movie->format_name, movie->file_name,
 +           movie->stream_index);
 +
 +    if (!(movie->frame = avcodec_alloc_frame()) ) {
 +        av_log(ctx, AV_LOG_ERROR, "Failed to alloc frame\n");
 +        return AVERROR(ENOMEM);
 +    }
 +
 +    return 0;
 +}
 +
 +static av_cold void movie_common_uninit(AVFilterContext *ctx)
 +{
 +    MovieContext *movie = ctx->priv;
 +
 +    av_free(movie->file_name);
 +    av_free(movie->format_name);
 +    if (movie->codec_ctx)
 +        avcodec_close(movie->codec_ctx);
 +    if (movie->format_ctx)
 +        avformat_close_input(&movie->format_ctx);
 +
 +    avfilter_unref_buffer(movie->picref);
 +    av_freep(&movie->frame);
 +
 +    avfilter_unref_buffer(movie->samplesref);
 +}
 +
 +#if CONFIG_MOVIE_FILTER
 +
 +static av_cold int movie_init(AVFilterContext *ctx, const char *args)
 +{
 +    MovieContext *movie = ctx->priv;
 +    int ret;
 +
 +    if ((ret = movie_common_init(ctx, args, AVMEDIA_TYPE_VIDEO)) < 0)
 +        return ret;
 +
 +    movie->w = movie->codec_ctx->width;
 +    movie->h = movie->codec_ctx->height;
 +
 +    return 0;
 +}
 +
 +static int movie_query_formats(AVFilterContext *ctx)
 +{
 +    MovieContext *movie = ctx->priv;
 +    enum PixelFormat pix_fmts[] = { movie->codec_ctx->pix_fmt, PIX_FMT_NONE };
 +
 +    ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
 +    return 0;
 +}
 +
 +static int movie_config_output_props(AVFilterLink *outlink)
 +{
 +    MovieContext *movie = outlink->src->priv;
 +
 +    outlink->w = movie->w;
 +    outlink->h = movie->h;
 +    outlink->time_base = movie->format_ctx->streams[movie->stream_index]->time_base;
 +
 +    return 0;
 +}
 +
 +static int movie_get_frame(AVFilterLink *outlink)
 +{
 +    MovieContext *movie = outlink->src->priv;
 +    AVPacket pkt;
 +    int ret = 0, frame_decoded;
 +    AVStream *st = movie->format_ctx->streams[movie->stream_index];
 +
 +    if (movie->state == STATE_DONE)
 +        return 0;
 +
 +    while (1) {
 +        if (movie->state == STATE_DECODING) {
 +            ret = av_read_frame(movie->format_ctx, &pkt);
 +            if (ret == AVERROR_EOF) {
 +                int64_t timestamp;
 +                if (movie->loop_count != 1) {
 +                    timestamp = movie->seek_point;
 +                    if (movie->format_ctx->start_time != AV_NOPTS_VALUE)
 +                        timestamp += movie->format_ctx->start_time;
 +                    if (av_seek_frame(movie->format_ctx, -1, timestamp, AVSEEK_FLAG_BACKWARD) < 0) {
 +                        movie->state = STATE_FLUSHING;
 +                    } else if (movie->loop_count>1)
 +                        movie->loop_count--;
 +                    continue;
 +                } else {
 +                    movie->state = STATE_FLUSHING;
 +                }
 +            } else if (ret < 0)
 +                break;
 +        }
 +
 +        // Is this a packet from the video stream?
 +        if (pkt.stream_index == movie->stream_index || movie->state == STATE_FLUSHING) {
 +            avcodec_decode_video2(movie->codec_ctx, movie->frame, &frame_decoded, &pkt);
 +
 +            if (frame_decoded) {
 +                /* FIXME: avoid the memcpy */
 +                movie->picref = ff_get_video_buffer(outlink, AV_PERM_WRITE | AV_PERM_PRESERVE |
 +                                                    AV_PERM_REUSE2, outlink->w, outlink->h);
 +                av_image_copy(movie->picref->data, movie->picref->linesize,
 +                              (void*)movie->frame->data,  movie->frame->linesize,
 +                              movie->picref->format, outlink->w, outlink->h);
 +                avfilter_copy_frame_props(movie->picref, movie->frame);
 +
 +                /* FIXME: use a PTS correction mechanism as that in
 +                 * ffplay.c when some API will be available for that */
 +                /* use pkt_dts if pkt_pts is not available */
 +                movie->picref->pts = movie->frame->pkt_pts == AV_NOPTS_VALUE ?
 +                    movie->frame->pkt_dts : movie->frame->pkt_pts;
 +
 +                if (!movie->frame->sample_aspect_ratio.num)
 +                    movie->picref->video->sample_aspect_ratio = st->sample_aspect_ratio;
 +                av_dlog(outlink->src,
 +                        "movie_get_frame(): file:'%s' pts:%"PRId64" time:%lf pos:%"PRId64" aspect:%d/%d\n",
 +                        movie->file_name, movie->picref->pts,
 +                        (double)movie->picref->pts * av_q2d(st->time_base),
 +                        movie->picref->pos,
 +                        movie->picref->video->sample_aspect_ratio.num,
 +                        movie->picref->video->sample_aspect_ratio.den);
 +                // We got it. Free the packet since we are returning
 +                av_free_packet(&pkt);
 +
 +                return 0;
 +            } else if (movie->state == STATE_FLUSHING) {
 +                movie->state = STATE_DONE;
 +                av_free_packet(&pkt);
 +                return AVERROR_EOF;
 +            }
 +        }
 +        // Free the packet that was allocated by av_read_frame
 +        av_free_packet(&pkt);
 +    }
 +
 +    return ret;
 +}
 +
 +static int movie_request_frame(AVFilterLink *outlink)
 +{
 +    AVFilterBufferRef *outpicref;
 +    MovieContext *movie = outlink->src->priv;
 +    int ret;
 +
 +    if (movie->state == STATE_DONE)
 +        return AVERROR_EOF;
 +    if ((ret = movie_get_frame(outlink)) < 0)
 +        return ret;
 +
 +    outpicref = avfilter_ref_buffer(movie->picref, ~0);
 +    ff_start_frame(outlink, outpicref);
 +    ff_draw_slice(outlink, 0, outlink->h, 1);
 +    ff_end_frame(outlink);
 +    avfilter_unref_buffer(movie->picref);
 +    movie->picref = NULL;
 +
 +    return 0;
 +}
 +
 +AVFilter avfilter_vsrc_movie = {
 +    .name          = "movie",
 +    .description   = NULL_IF_CONFIG_SMALL("Read from a movie source."),
 +    .priv_size     = sizeof(MovieContext),
 +    .init          = movie_init,
 +    .uninit        = movie_common_uninit,
 +    .query_formats = movie_query_formats,
 +
 +    .inputs    = (const AVFilterPad[]) {{ .name = NULL }},
++    .outputs   = (const AVFilterPad[]) {{ .name            = "default",
++                                          .type            = AVMEDIA_TYPE_VIDEO,
++                                          .request_frame   = movie_request_frame,
++                                          .config_props    = movie_config_output_props, },
++                                        { .name = NULL}},
 +};
 +
 +#endif  /* CONFIG_MOVIE_FILTER */
 +
 +#if CONFIG_AMOVIE_FILTER
 +
 +static av_cold int amovie_init(AVFilterContext *ctx, const char *args)
 +{
 +    MovieContext *movie = ctx->priv;
 +    int ret;
 +
 +    if ((ret = movie_common_init(ctx, args, AVMEDIA_TYPE_AUDIO)) < 0)
 +        return ret;
 +
 +    movie->bps = av_get_bytes_per_sample(movie->codec_ctx->sample_fmt);
 +    return 0;
 +}
 +
 +static int amovie_query_formats(AVFilterContext *ctx)
 +{
 +    MovieContext *movie = ctx->priv;
 +    AVCodecContext *c = movie->codec_ctx;
 +
 +    enum AVSampleFormat sample_fmts[] = { c->sample_fmt, -1 };
 +    int sample_rates[] = { c->sample_rate, -1 };
 +    int64_t chlayouts[] = { c->channel_layout ? c->channel_layout :
 +                            av_get_default_channel_layout(c->channels), -1 };
 +
 +    ff_set_common_formats        (ctx, ff_make_format_list(sample_fmts));
 +    ff_set_common_samplerates    (ctx, ff_make_format_list(sample_rates));
 +    ff_set_common_channel_layouts(ctx, avfilter_make_format64_list(chlayouts));
 +
 +    return 0;
 +}
 +
 +static int amovie_config_output_props(AVFilterLink *outlink)
 +{
 +    MovieContext *movie = outlink->src->priv;
 +    AVCodecContext *c = movie->codec_ctx;
 +
 +    outlink->sample_rate = c->sample_rate;
 +    outlink->time_base = movie->format_ctx->streams[movie->stream_index]->time_base;
 +
 +    return 0;
 +}
 +
 +static int amovie_get_samples(AVFilterLink *outlink)
 +{
 +    MovieContext *movie = outlink->src->priv;
 +    AVPacket pkt;
 +    int ret, got_frame = 0;
 +
 +    if (!movie->pkt.size && movie->state == STATE_DONE)
 +        return AVERROR_EOF;
 +
 +    /* check for another frame, in case the previous one was completely consumed */
 +    if (!movie->pkt.size) {
 +        while ((ret = av_read_frame(movie->format_ctx, &pkt)) >= 0) {
 +            // Is this a packet from the selected stream?
 +            if (pkt.stream_index != movie->stream_index) {
 +                av_free_packet(&pkt);
 +                continue;
 +            } else {
 +                movie->pkt0 = movie->pkt = pkt;
 +                break;
 +            }
 +        }
 +
 +        if (ret == AVERROR_EOF) {
 +            movie->state = STATE_DONE;
 +            return ret;
 +        }
 +    }
 +
 +    /* decode and update the movie pkt */
 +    avcodec_get_frame_defaults(movie->frame);
 +    ret = avcodec_decode_audio4(movie->codec_ctx, movie->frame, &got_frame, &movie->pkt);
 +    if (ret < 0) {
 +        movie->pkt.size = 0;
 +        return ret;
 +    }
 +    movie->pkt.data += ret;
 +    movie->pkt.size -= ret;
 +
 +    /* wrap the decoded data in a samplesref */
 +    if (got_frame) {
 +        int nb_samples = movie->frame->nb_samples;
 +        int data_size =
 +            av_samples_get_buffer_size(NULL, movie->codec_ctx->channels,
 +                                       nb_samples, movie->codec_ctx->sample_fmt, 1);
 +        if (data_size < 0)
 +            return data_size;
 +        movie->samplesref =
 +            ff_get_audio_buffer(outlink, AV_PERM_WRITE, nb_samples);
 +        memcpy(movie->samplesref->data[0], movie->frame->data[0], data_size);
 +        movie->samplesref->pts = movie->pkt.pts;
 +        movie->samplesref->pos = movie->pkt.pos;
 +        movie->samplesref->audio->sample_rate = movie->codec_ctx->sample_rate;
 +    }
 +
 +    // We got it. Free the packet since we are returning
 +    if (movie->pkt.size <= 0)
 +        av_free_packet(&movie->pkt0);
 +
 +    return 0;
 +}
 +
 +static int amovie_request_frame(AVFilterLink *outlink)
 +{
 +    MovieContext *movie = outlink->src->priv;
 +    int ret;
 +
 +    if (movie->state == STATE_DONE)
 +        return AVERROR_EOF;
 +    do {
 +        if ((ret = amovie_get_samples(outlink)) < 0)
 +            return ret;
 +    } while (!movie->samplesref);
 +
 +    ff_filter_samples(outlink, avfilter_ref_buffer(movie->samplesref, ~0));
 +    avfilter_unref_buffer(movie->samplesref);
 +    movie->samplesref = NULL;
 +
 +    return 0;
 +}
 +
 +AVFilter avfilter_asrc_amovie = {
 +    .name          = "amovie",
 +    .description   = NULL_IF_CONFIG_SMALL("Read audio from a movie source."),
 +    .priv_size     = sizeof(MovieContext),
 +    .init          = amovie_init,
 +    .uninit        = movie_common_uninit,
 +    .query_formats = amovie_query_formats,
 +
 +    .inputs    = (const AVFilterPad[]) {{ .name = NULL }},
 +    .outputs   = (const AVFilterPad[]) {{ .name      = "default",
 +                                    .type            = AVMEDIA_TYPE_AUDIO,
 +                                    .request_frame   = amovie_request_frame,
 +                                    .config_props    = amovie_config_output_props, },
 +                                  { .name = NULL}},
 +};
 +
 +#endif /* CONFIG_AMOVIE_FILTER */
Simple merge
@@@ -126,15 -118,15 +126,15 @@@ AVFilter avfilter_vf_blackframe = 
  
      .query_formats = query_formats,
  
-     .inputs    = (const AVFilterPad[]) {{ .name       = "default",
-                                     .type             = AVMEDIA_TYPE_VIDEO,
-                                     .draw_slice       = draw_slice,
-                                     .get_video_buffer = ff_null_get_video_buffer,
-                                     .start_frame      = ff_null_start_frame_keep_ref,
-                                     .end_frame        = end_frame, },
-                                   { .name = NULL}},
+     .inputs    = (const AVFilterPad[]) {{ .name = "default",
+                                           .type             = AVMEDIA_TYPE_VIDEO,
+                                           .draw_slice       = draw_slice,
+                                           .get_video_buffer = ff_null_get_video_buffer,
 -                                          .start_frame      = ff_null_start_frame,
++                                          .start_frame      = ff_null_start_frame_keep_ref,
+                                           .end_frame        = end_frame, },
+                                         { .name = NULL}},
  
 -    .outputs   = (const AVFilterPad[]) {{ .name             = "default",
 -                                          .type             = AVMEDIA_TYPE_VIDEO },
 -                                        { .name = NULL}},
 +    .outputs   = (const AVFilterPad[]) {{ .name       = "default",
 +                                    .type             = AVMEDIA_TYPE_VIDEO },
 +                                  { .name = NULL}},
  };
@@@ -339,14 -341,13 +339,14 @@@ AVFilter avfilter_vf_boxblur = 
      .uninit        = uninit,
      .query_formats = query_formats,
  
-     .inputs    = (const AVFilterPad[]) {{ .name       = "default",
-                                     .type             = AVMEDIA_TYPE_VIDEO,
-                                     .config_props     = config_input,
-                                     .draw_slice       = null_draw_slice,
-                                     .end_frame        = end_frame,
-                                     .min_perms        = AV_PERM_READ },
-                                   { .name = NULL}},
-     .outputs   = (const AVFilterPad[]) {{ .name       = "default",
-                                     .type             = AVMEDIA_TYPE_VIDEO, },
-                                   { .name = NULL}},
+     .inputs    = (const AVFilterPad[]) {{ .name             = "default",
+                                           .type             = AVMEDIA_TYPE_VIDEO,
+                                           .config_props     = config_input,
 -                                          .draw_slice       = draw_slice,
++                                          .draw_slice       = null_draw_slice,
++                                          .end_frame        = end_frame,
+                                           .min_perms        = AV_PERM_READ },
+                                         { .name = NULL}},
+     .outputs   = (const AVFilterPad[]) {{ .name             = "default",
+                                           .type             = AVMEDIA_TYPE_VIDEO, },
+                                         { .name = NULL}},
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -813,19 -878,18 +813,19 @@@ AVFilter avfilter_vf_drawtext = 
      .uninit        = uninit,
      .query_formats = query_formats,
  
-     .inputs    = (const AVFilterPad[]) {{ .name       = "default",
-                                     .type             = AVMEDIA_TYPE_VIDEO,
-                                     .get_video_buffer = ff_null_get_video_buffer,
-                                     .start_frame      = ff_null_start_frame,
-                                     .draw_slice       = null_draw_slice,
-                                     .end_frame        = end_frame,
-                                     .config_props     = config_input,
-                                     .min_perms        = AV_PERM_WRITE |
-                                                         AV_PERM_READ,
-                                     .rej_perms        = AV_PERM_PRESERVE },
-                                   { .name = NULL}},
-     .outputs   = (const AVFilterPad[]) {{ .name       = "default",
-                                     .type             = AVMEDIA_TYPE_VIDEO, },
-                                   { .name = NULL}},
+     .inputs    = (const AVFilterPad[]) {{ .name             = "default",
+                                           .type             = AVMEDIA_TYPE_VIDEO,
+                                           .get_video_buffer = ff_null_get_video_buffer,
 -                                          .start_frame      = start_frame,
++                                          .start_frame      = ff_null_start_frame,
+                                           .draw_slice       = null_draw_slice,
+                                           .end_frame        = end_frame,
+                                           .config_props     = config_input,
+                                           .min_perms        = AV_PERM_WRITE |
+                                                               AV_PERM_READ,
+                                           .rej_perms        = AV_PERM_PRESERVE },
+                                         { .name = NULL}},
+     .outputs   = (const AVFilterPad[]) {{ .name             = "default",
+                                           .type             = AVMEDIA_TYPE_VIDEO, },
+                                         { .name = NULL}},
 +    .process_command = command,
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -168,14 -151,13 +168,14 @@@ AVFilter avfilter_vf_hflip = 
      .priv_size = sizeof(FlipContext),
      .query_formats = query_formats,
  
-     .inputs    = (const AVFilterPad[]) {{ .name      = "default",
-                                     .type            = AVMEDIA_TYPE_VIDEO,
-                                     .start_frame     = start_frame,
-                                     .draw_slice      = draw_slice,
-                                     .config_props    = config_props,
-                                     .min_perms       = AV_PERM_READ, },
-                                   { .name = NULL}},
-     .outputs   = (const AVFilterPad[]) {{ .name      = "default",
-                                     .type            = AVMEDIA_TYPE_VIDEO, },
-                                   { .name = NULL}},
+     .inputs    = (const AVFilterPad[]) {{ .name            = "default",
+                                           .type            = AVMEDIA_TYPE_VIDEO,
++                                          .start_frame     = start_frame,
+                                           .draw_slice      = draw_slice,
+                                           .config_props    = config_props,
+                                           .min_perms       = AV_PERM_READ, },
+                                         { .name = NULL}},
+     .outputs   = (const AVFilterPad[]) {{ .name            = "default",
+                                           .type            = AVMEDIA_TYPE_VIDEO, },
+                                         { .name = NULL}},
  };
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -610,27 -368,27 +610,27 @@@ AVFilter avfilter_vf_overlay = 
  
      .query_formats = query_formats,
  
-     .inputs    = (const AVFilterPad[]) {{ .name      = "main",
-                                     .type            = AVMEDIA_TYPE_VIDEO,
-                                     .get_video_buffer= get_video_buffer,
-                                     .config_props    = config_input_main,
-                                     .start_frame     = start_frame_main,
-                                     .draw_slice      = draw_slice_main,
-                                     .end_frame       = end_frame_main,
-                                     .min_perms       = AV_PERM_READ,
-                                     .rej_perms       = AV_PERM_REUSE2|AV_PERM_PRESERVE, },
-                                   { .name            = "overlay",
-                                     .type            = AVMEDIA_TYPE_VIDEO,
-                                     .config_props    = config_input_overlay,
-                                     .start_frame     = start_frame_over,
-                                     .draw_slice      = null_draw_slice,
-                                     .end_frame       = end_frame_over,
-                                     .min_perms       = AV_PERM_READ,
-                                     .rej_perms       = AV_PERM_REUSE2, },
-                                   { .name = NULL}},
-     .outputs   = (const AVFilterPad[]) {{ .name      = "default",
-                                     .type            = AVMEDIA_TYPE_VIDEO,
-                                     .config_props    = config_output,
-                                     .request_frame   = request_frame, },
-                                   { .name = NULL}},
+     .inputs    = (const AVFilterPad[]) {{ .name            = "main",
+                                           .type            = AVMEDIA_TYPE_VIDEO,
 -                                          .start_frame     = start_frame,
+                                           .get_video_buffer= get_video_buffer,
+                                           .config_props    = config_input_main,
 -                                          .draw_slice      = draw_slice,
 -                                          .end_frame       = end_frame,
++                                          .start_frame     = start_frame_main,
++                                          .draw_slice      = draw_slice_main,
++                                          .end_frame       = end_frame_main,
+                                           .min_perms       = AV_PERM_READ,
+                                           .rej_perms       = AV_PERM_REUSE2|AV_PERM_PRESERVE, },
+                                         { .name            = "overlay",
+                                           .type            = AVMEDIA_TYPE_VIDEO,
 -                                          .start_frame     = start_frame_overlay,
+                                           .config_props    = config_input_overlay,
++                                          .start_frame     = start_frame_over,
+                                           .draw_slice      = null_draw_slice,
 -                                          .end_frame       = null_end_frame,
++                                          .end_frame       = end_frame_over,
+                                           .min_perms       = AV_PERM_READ,
+                                           .rej_perms       = AV_PERM_REUSE2, },
+                                         { .name = NULL}},
+     .outputs   = (const AVFilterPad[]) {{ .name            = "default",
+                                           .type            = AVMEDIA_TYPE_VIDEO,
+                                           .config_props    = config_output,
 -                                          .poll_frame      = poll_frame },
++                                          .request_frame   = request_frame, },
+                                         { .name = NULL}},
  };
@@@ -368,18 -414,20 +368,18 @@@ AVFilter avfilter_vf_pad = 
  
      .priv_size     = sizeof(PadContext),
      .init          = init,
 -    .uninit        = uninit,
      .query_formats = query_formats,
  
-     .inputs    = (const AVFilterPad[]) {{ .name       = "default",
-                                     .type             = AVMEDIA_TYPE_VIDEO,
-                                     .config_props     = config_input,
-                                     .get_video_buffer = get_video_buffer,
-                                     .start_frame      = start_frame,
-                                     .draw_slice       = draw_slice, },
-                                   { .name = NULL}},
-     .outputs   = (const AVFilterPad[]) {{ .name       = "default",
-                                     .type             = AVMEDIA_TYPE_VIDEO,
-                                     .config_props     = config_output, },
-                                   { .name = NULL}},
+     .inputs    = (const AVFilterPad[]) {{ .name             = "default",
+                                           .type             = AVMEDIA_TYPE_VIDEO,
+                                           .config_props     = config_input,
+                                           .get_video_buffer = get_video_buffer,
+                                           .start_frame      = start_frame,
 -                                          .draw_slice       = draw_slice,
 -                                          .end_frame        = end_frame, },
++                                          .draw_slice       = draw_slice, },
+                                         { .name = NULL}},
+     .outputs   = (const AVFilterPad[]) {{ .name             = "default",
+                                           .type             = AVMEDIA_TYPE_VIDEO,
+                                           .config_props     = config_output, },
+                                         { .name = NULL}},
  };
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -91,15 -86,15 +91,15 @@@ AVFilter avfilter_vf_showinfo = 
      .priv_size = sizeof(ShowInfoContext),
      .init      = init,
  
-     .inputs    = (const AVFilterPad[]) {{ .name       = "default",
-                                     .type             = AVMEDIA_TYPE_VIDEO,
-                                     .get_video_buffer = ff_null_get_video_buffer,
-                                     .start_frame      = ff_null_start_frame_keep_ref,
-                                     .end_frame        = end_frame,
-                                     .min_perms        = AV_PERM_READ, },
-                                   { .name = NULL}},
+     .inputs    = (const AVFilterPad[]) {{ .name = "default",
+                                           .type             = AVMEDIA_TYPE_VIDEO,
+                                           .get_video_buffer = ff_null_get_video_buffer,
 -                                          .start_frame      = ff_null_start_frame,
++                                          .start_frame      = ff_null_start_frame_keep_ref,
+                                           .end_frame        = end_frame,
+                                           .min_perms        = AV_PERM_READ, },
+                                         { .name = NULL}},
  
-     .outputs   = (const AVFilterPad[]) {{ .name       = "default",
-                                     .type             = AVMEDIA_TYPE_VIDEO },
-                                   { .name = NULL}},
+     .outputs   = (const AVFilterPad[]) {{ .name             = "default",
+                                           .type             = AVMEDIA_TYPE_VIDEO },
+                                         { .name = NULL}},
  };
Simple merge
@@@ -204,15 -205,14 +204,15 @@@ AVFilter avfilter_vf_transpose = 
  
      .query_formats = query_formats,
  
-     .inputs    = (const AVFilterPad[]) {{ .name      = "default",
-                                     .type            = AVMEDIA_TYPE_VIDEO,
-                                     .start_frame     = start_frame,
-                                     .draw_slice      = null_draw_slice,
-                                     .end_frame       = end_frame,
-                                     .min_perms       = AV_PERM_READ, },
-                                   { .name = NULL}},
-     .outputs   = (const AVFilterPad[]) {{ .name      = "default",
-                                     .config_props    = config_props_output,
-                                     .type            = AVMEDIA_TYPE_VIDEO, },
-                                   { .name = NULL}},
+     .inputs    = (const AVFilterPad[]) {{ .name            = "default",
+                                           .type            = AVMEDIA_TYPE_VIDEO,
+                                           .start_frame     = start_frame,
++                                          .draw_slice      = null_draw_slice,
+                                           .end_frame       = end_frame,
+                                           .min_perms       = AV_PERM_READ, },
+                                         { .name = NULL}},
+     .outputs   = (const AVFilterPad[]) {{ .name            = "default",
+                                           .config_props    = config_props_output,
+                                           .type            = AVMEDIA_TYPE_VIDEO, },
+                                         { .name = NULL}},
  };
Simple merge
Simple merge
@@@ -403,19 -399,18 +402,19 @@@ AVFilter avfilter_vf_yadif = 
      .uninit        = uninit,
      .query_formats = query_formats,
  
-     .inputs    = (const AVFilterPad[]) {{ .name       = "default",
-                                     .type             = AVMEDIA_TYPE_VIDEO,
-                                     .start_frame      = start_frame,
-                                     .get_video_buffer = get_video_buffer,
-                                     .draw_slice       = null_draw_slice,
-                                     .end_frame        = end_frame,
-                                     .rej_perms        = AV_PERM_REUSE2, },
-                                   { .name = NULL}},
-     .outputs   = (const AVFilterPad[]) {{ .name       = "default",
-                                     .type             = AVMEDIA_TYPE_VIDEO,
-                                     .poll_frame       = poll_frame,
-                                     .request_frame    = request_frame,
-                                     .config_props     = config_props, },
-                                   { .name = NULL}},
+     .inputs    = (const AVFilterPad[]) {{ .name             = "default",
+                                           .type             = AVMEDIA_TYPE_VIDEO,
+                                           .start_frame      = start_frame,
+                                           .get_video_buffer = get_video_buffer,
+                                           .draw_slice       = null_draw_slice,
 -                                          .end_frame        = end_frame, },
++                                          .end_frame        = end_frame,
++                                          .rej_perms        = AV_PERM_REUSE2, },
+                                         { .name = NULL}},
+     .outputs   = (const AVFilterPad[]) {{ .name             = "default",
+                                           .type             = AVMEDIA_TYPE_VIDEO,
+                                           .poll_frame       = poll_frame,
+                                           .request_frame    = request_frame,
+                                           .config_props     = config_props, },
+                                         { .name = NULL}},
  };
Simple merge
Simple merge
@@@ -77,6 -80,6 +80,6 @@@ AVInputFormat ff_g723_1_demuxer = 
      .long_name   = NULL_IF_CONFIG_SMALL("G.723.1 format"),
      .read_header = g723_1_init,
      .read_packet = g723_1_read_packet,
-     .extensions = "tco,rco,g723_1",
-     .flags = AVFMT_GENERIC_INDEX
 -    .extensions  = "tco",
++    .extensions  = "tco,rco,g723_1",
+     .flags       = AVFMT_GENERIC_INDEX
  };
@@@ -30,8 -30,8 +30,8 @@@
  #include "libavutil/avutil.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 54
- #define LIBAVFORMAT_VERSION_MINOR 18
 -#define LIBAVFORMAT_VERSION_MINOR 10
 -#define LIBAVFORMAT_VERSION_MICRO  0
++#define LIBAVFORMAT_VERSION_MINOR 19
 +#define LIBAVFORMAT_VERSION_MICRO 100
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \