On Sun, Sep 09, 2012 at 04:09:32PM +0200, Luca Barbato wrote:
> From: Andrew D'Addesio <modchip...@gmail.com>
> 
> Additionally add the codec_id for it.

  ogg: add Opus parser

sounds like a better description

> ---
> 
> Split out from GSOC repository, voluteers to help me getting at least silk in
> would be much appreciated.
> 
>  libavcodec/Makefile        |    1 +
>  libavcodec/allcodecs.c     |    1 +
>  libavcodec/avcodec.h       |    1 +
>  libavcodec/codec_desc.c    |    7 ++
>  libavformat/Makefile       |    1 +
>  libavformat/oggdec.c       |    3 +-
>  libavformat/oggdec.h       |    1 +
>  libavformat/oggenc.c       |    2 +-
>  libavformat/oggparseopus.c |  136 
> ++++++++++++++++++++++++++++++++++++++++++++
>  9 files changed, 151 insertions(+), 2 deletions(-)
>  create mode 100644 libavformat/oggparseopus.c

Check the new codecs checklist in the dev docs.

> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -629,6 +629,7 @@ OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += 
> mpegaudio_parser.o \
>                                            mpegaudiodecheader.o 
> mpegaudiodata.o
>  OBJS-$(CONFIG_MPEGVIDEO_PARSER)        += mpegvideo_parser.o    \
>                                            mpeg12.o mpeg12data.o
> +OBJS-$(CONFIG_OPUS_DECODER)            += opus.o
>  OBJS-$(CONFIG_PNM_PARSER)              += pnm_parser.o pnm.o
>  OBJS-$(CONFIG_RV30_PARSER)             += rv34_parser.o
>  OBJS-$(CONFIG_RV40_PARSER)             += rv34_parser.o
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index c6df818..04a85a1 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -286,6 +286,7 @@ void avcodec_register_all(void)
>      REGISTER_DECODER (MPC8, mpc8);
>      REGISTER_ENCDEC  (NELLYMOSER, nellymoser);
> +    REGISTER_DECODER (OPUS, opus);
>      REGISTER_DECODER (QCELP, qcelp);
>      REGISTER_DECODER (QDM2, qdm2);

Decoder, parser, or what?

I suspect something went wrong during patch splitting.

> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -184,6 +184,7 @@ OBJS-$(CONFIG_OGG_DEMUXER)               += oggdec.o      
>    \
>                                              oggparsedirac.o  \
>                                              oggparseflac.o   \
>                                              oggparseogm.o    \
> +                                                                             
>         oggparseopus.o   \
>                                              oggparseskeleton.o \
>                                              oggparsespeex.o  \
>                                              oggparsetheora.o \

tabs

> --- a/libavformat/oggdec.c
> +++ b/libavformat/oggdec.c
> @@ -46,6 +46,7 @@ static const struct ogg_codec * const ogg_codecs[] = {
>      &ff_theora_codec,
>      &ff_flac_codec,
>      &ff_celt_codec,
> +    &ff_opus_codec,
>      &ff_old_dirac_codec,
>      &ff_old_flac_codec,
>      &ff_ogm_video_codec,

Was that supposed to be ordered?  Whatever ...

> --- /dev/null
> +++ b/libavformat/oggparseopus.c
> @@ -0,0 +1,136 @@
> +static int opus_header(AVFormatContext *s, int idx) {

K&R style function declarations

Diego
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to