[FFmpeg-devel] [PATCH] Bink file demuxer and audio decoder

[Diego Biurrun]

On Wed, Jan 14, 2009 at 11:35:14AM -0600, Daniel Verkamp wrote:
> On Wed, Jan 14, 2009 at 5:03 AM, Diego Biurrun <diego at biurrun.de> wrote:
> >> - ATI/* has various chunks of files; appending the
> >> --append.this.to.complete.bik to the end of the un-suffixed file
> >> produces the full video, which works;
> >
> > IOW, these should be merged back together, right?
> 
> Yes, i.e. 'cat ATI-9700-Animusic-Movie-v1.0.bik
> ATI-9700-Animusic-Movie-v1.0.bik--append.this.to.complete.bik >
> complete.bik'  - this should result in a file with md5sum
> f36b8b7fb3ee45f33e9a0a158845b085.

Done.

> >> the .x file is just another truncated part of the video
> >
> > Truncated part of which video exactly?
> 
> The same as the other files in the dir; if the complete movie is
> concatenated as above, this file (and the other partial files) can
> just be removed.  I assume they are just a result of uploads that
> failed part of the way through...

Removed.

> >> --- /dev/null
> >> +++ b/libavcodec/dct.c
> >> @@ -0,0 +1,39 @@
> >> +#include "dsputil.h"
> >> +#include "fft4g.h"
> >
> > license header
> 
> >> --- /dev/null
> >> +++ b/libavcodec/rdft.c
> >> @@ -0,0 +1,39 @@
> >> +#include "dsputil.h"
> >> +#include "fft4g.h"
> >
> > license header
> 
> These files are not intended to be committed as-is, since they are
> just wrappers around the fft4g functions, which are incompatibly
> licensed; I can add the license header, but really these files should
> be replaced outright before any commit.

We have other wrapper files, they have a license header.

> >> --- /dev/null
> >> +++ b/libavcodec/binkaudio.c
> >> @@ -0,0 +1,285 @@
> >> +// from wmadata.h
> >
> > Ahem :)
> 
> Indeed, I noticed the duplication, but I don't know how to fix it -
> including wmadata.h directly causes a bunch of duplicated definitions
> at link time (perhaps some of the tables need to be made static?).  I
> will look into this before the next iteration of the patch.

I'd say split the table off into a separate header or object file.

> >> --- /dev/null
> >> +++ b/libavformat/bink.c
> >> @@ -0,0 +1,254 @@
> >> +/*
> >> + * Bink file Demuxer
> >
> > demuxer
> >
> > Documentation and changelog updates are missing from your patches.
> 
> Sorry, didn't notice these needed to be updated; will something like
> the attached work?

Yes, except for..

> --- a/Changelog
> +++ b/Changelog
> @@ -1,4 +1,5 @@
>  version <next>
> +- Bink file demuxer and Bink audio support in Bink and Smacker files
>  - The "device" muxers and demuxers are now in a new libavdevice library
>  - DV50 AKA DVCPRO50 encoder, decoder, muxer and demuxer
>  - DV100 AKA DVCPRO HD decoder and demuxer

Add your change to the bottom of the list.

Diego