On Sat, Nov 26, 2011 at 05:06:29PM -0500, Justin Ruggles wrote:
> ---
>  libavcodec/dca.c |   33 +++++++++++++++++++++------------
>  1 files changed, 21 insertions(+), 12 deletions(-)
> 
> diff --git a/libavcodec/dca.c b/libavcodec/dca.c
> index 9d24b59..52a3747 100644
> --- a/libavcodec/dca.c
> +++ b/libavcodec/dca.c
> @@ -261,6 +261,7 @@ static av_always_inline int get_bitalloc(GetBitContext 
> *gb, BitAlloc *ba, int id
>  
>  typedef struct {
>      AVCodecContext *avctx;
> +    AVFrame frame;
>      /* Frame header */
>      int frame_type;             ///< type of the current frame
>      int samples_deficit;        ///< deficit sample count
> @@ -1635,9 +1636,8 @@ static void dca_exss_parse_header(DCAContext *s)
>   * Main frame decoding function
>   * FIXME add arguments
>   */
> -static int dca_decode_frame(AVCodecContext * avctx,
> -                            void *data, int *data_size,
> -                            AVPacket *avpkt)
> +static int dca_decode_frame(AVCodecContext *avctx, void *data,
> +                            int *got_frame_ptr, AVPacket *avpkt)
>  {
>      const uint8_t *buf = avpkt->data;
>      int buf_size = avpkt->size;
> @@ -1645,9 +1645,8 @@ static int dca_decode_frame(AVCodecContext * avctx,
>      int lfe_samples;
>      int num_core_channels = 0;
>      int i, ret;
> -    float   *samples_flt = data;
> -    int16_t *samples_s16 = data;
> -    int out_size;
> +    float   *samples_flt;
> +    int16_t *samples_s16;
>      DCAContext *s = avctx->priv_data;
>      int channels;
>      int core_ss_end;
> @@ -1839,11 +1838,14 @@ static int dca_decode_frame(AVCodecContext * avctx,
>          return AVERROR_PATCHWELCOME;
>      }
>  
> -    out_size = 256 / 8 * s->sample_blocks * channels *
> -               av_get_bytes_per_sample(avctx->sample_fmt);
> -    if (*data_size < out_size)
> -        return AVERROR(EINVAL);
> -    *data_size = out_size;
> +    /* get output buffer */
> +    s->frame.nb_samples = 256 * (s->sample_blocks / 8);
> +    if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) {
> +        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
> +        return ret;
> +    }
> +    samples_flt = (float   *)s->frame.data[0];
> +    samples_s16 = (int16_t *)s->frame.data[0];
>  
>      /* filter to get final output */
>      for (i = 0; i < (s->sample_blocks / 8); i++) {
> @@ -1877,6 +1879,9 @@ static int dca_decode_frame(AVCodecContext * avctx,
>          s->lfe_data[i] = s->lfe_data[i + lfe_samples];
>      }
>  
> +    *got_frame_ptr   = 1;
> +    *(AVFrame *)data = s->frame;
> +
>      return buf_size;
>  }
>  
> @@ -1919,6 +1924,9 @@ static av_cold int dca_decode_init(AVCodecContext * 
> avctx)
>          avctx->channels = avctx->request_channels;
>      }
>  
> +    avcodec_get_frame_defaults(&s->frame);
> +    avctx->coded_frame = &s->frame;
> +
>      return 0;
>  }
>  
> @@ -1926,6 +1934,7 @@ static av_cold int dca_decode_end(AVCodecContext * 
> avctx)
>  {
>      DCAContext *s = avctx->priv_data;
>      ff_mdct_end(&s->imdct);
> +
>      return 0;
>  }
>  

unrelated (though harmless) chunk

> @@ -1947,7 +1956,7 @@ AVCodec ff_dca_decoder = {
>      .decode = dca_decode_frame,
>      .close = dca_decode_end,
>      .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"),
> -    .capabilities = CODEC_CAP_CHANNEL_CONF,
> +    .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1,
>      .sample_fmts = (const enum AVSampleFormat[]) {
>          AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE
>      },
> -- 

patch looks OK
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to