[FFmpeg-devel] [PATCH 09/10] fmtconvert: Remove float_interleave*

[Ganesh Ajjanagadde]

On Fri, Aug 21, 2015 at 9:21 PM, Timothy Gu <timothygu99 at gmail.com> wrote:
> They were not public or used anywhere.
> ---
>  libavcodec/fmtconvert.c | 31 -------------------------------
>  libavcodec/fmtconvert.h |  4 ----
>  2 files changed, 35 deletions(-)
>
> diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c
> index e6fc509..1de1d31 100644
> --- a/libavcodec/fmtconvert.c
> +++ b/libavcodec/fmtconvert.c
> @@ -51,34 +51,3 @@ av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx)
>      if (ARCH_X86) ff_fmt_convert_init_x86(c, avctx);
>      if (HAVE_MIPSFPU) ff_fmt_convert_init_mips(c);
>  }
> -
> -/* ffdshow custom code */
> -void float_interleave(float *dst, const float **src, long len, int channels)
> -{
> -    int i,j,c;
> -    if(channels==2){
> -        for(i=0; i<len; i++){
> -            dst[2*i]   = src[0][i] / 32768.0f;
> -            dst[2*i+1] = src[1][i] / 32768.0f;
> -        }
> -    }else{
> -        for(c=0; c<channels; c++)
> -            for(i=0, j=c; i<len; i++, j+=channels)
> -                dst[j] = src[c][i] / 32768.0f;
> -    }
> -}
> -
> -void float_interleave_noscale(float *dst, const float **src, long len, int channels)
> -{
> -    int i,j,c;
> -    if(channels==2){
> -        for(i=0; i<len; i++){
> -            dst[2*i]   = src[0][i];
> -            dst[2*i+1] = src[1][i];
> -        }
> -    }else{
> -        for(c=0; c<channels; c++)
> -            for(i=0, j=c; i<len; i++, j+=channels)
> -                dst[j] = src[c][i];
> -    }
> -}
> diff --git a/libavcodec/fmtconvert.h b/libavcodec/fmtconvert.h
> index 401ac3a..4b8b958 100644
> --- a/libavcodec/fmtconvert.h
> +++ b/libavcodec/fmtconvert.h
> @@ -63,8 +63,4 @@ void ff_fmt_convert_init_ppc(FmtConvertContext *c, AVCodecContext *avctx);
>  void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx);
>  void ff_fmt_convert_init_mips(FmtConvertContext *c);
>
> -/* ffdshow custom code */
> -void float_interleave(float *dst, const float **src, long len, int channels);
> -void float_interleave_noscale(float *dst, const float **src, long len, int channels);
> -
>  #endif /* AVCODEC_FMTCONVERT_H */

I don't know if this code will get used at some point in the future.
Looking at the logs, it seems like it was meant to be dropped but was missed
in commit d74a8cb7e42f703be5796eeb485f06af710ae8ca
merged in 5c17377e28e818d3074a608d42821d66f1d26e8d

As such, LGTM.

> --
> 1.9.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel