[FFmpeg-devel] [PATCH] updated LGPL AC-3 decoder

[ods15 at ods15.dyndns.org]

On Sat, Jun 16, 2007 at 02:11:46PM +0200, Michael Niedermayer wrote:
> On Sun, Jun 03, 2007 at 11:02:05PM +0200, Michael Niedermayer wrote:
> > On Sun, Jun 03, 2007 at 02:46:20PM -0400, Justin Ruggles wrote:
> > > Michael Niedermayer wrote:
> > > > Hi
> > > > 
> > > > On Mon, May 07, 2007 at 08:50:00PM -0400, Justin Ruggles wrote:
> > > > 
> > > >>Michael Niedermayer wrote:
> > > >>
> > > >>[...]
> > > >>>and patch looks ok
> > > >>
> > > >>great.  now...
> > > >>
> > > >>Should I apply it all at once or try to go back to the original SoC code
> > > >>and do incremental changes?  I looked back at the original, and my best
> > > >>guess is that I changed about 75% of the code.  I could do it either way
> > > >>really.
> > > > 
> > > > 
> > > > incremental is better if its easy, but if you use some script to
> > > > automatically check all the revissions in then test it on a dummy
> > > > repository first and ensure it can deal with errors
> > > > the precommit check script might reject changes due to whitespace/tab issues
> > > > or there might be a conflicting commit in the middle (extreemly unlikely i 
> > > > know, but the script should stop if something unexpected happens ...)
> > > 
> > > I don't think I have the scriping skills to create such a thing.  I also
> > > don't really have a repo to test with.  I noticed others are working on
> > > last year's AAC decoder.  Are there plans to merge that into FFmpeg with
> > > history?  If so, is there already a script out there to do this?
> > > 
> > > If others are willing to help with getting the AC-3 decoder from the SoC
> > > branch to FFmpeg while preserving the history, I am willing to apply
> > > incremental changes to the SoC code to bring it inline with the current
> > > patch.  Otherwise, I think I should just apply it as-is so I don't screw
> > > anything up.
> > 
> > with git its a matter of
> > 
> > in SOC repo
> > git log --reverse --pretty=email -p <all relevant ac3 files/paths> >mypatch
> > 
> > in ffmpeg
> > git am mypatch
> > 
> > you might also have to do something if the pathes missmatch, and i guess
> > there are various other ways to achive the same with git (and yes iam
> > interrested to hear about these, iam a git newbee after all ...)
> > 
> > either way, after the above you would check if your local repo contains
> > all the revissions, and if dates/authors look approximately ok and
> > nothing unexpected happened and then just push it to mphq, well that
> > is if ffmpeg were finally converted to git
> > 
> > mans? whats the status of that, can we delay the merge until you
> > finish what you begun?
> > if no then ill leave it to root at mphq to write a script to workaround
> > the braindeadness of svn, or maybe someone (oded?) already has a script
> > to do that with svn ...
> 
> oded? do you still have the script? you used to checkin the vorbis code?

my script won't work with anything more than a single file or with 
anything more complicated than patching a single file, but here it is:

#!/bin/bah

mkdir patches
svn log vorbis_enc.c | perl a.pl
cd ../ffmpeg/libavcodec

svn cat -r2 ../../vorbis_enc/vorbis_enc.c > vorbis_enc.c
svn add vorbis_enc.c
svn commit vorbis_enc.c -m "skeleton for vorbis_enc.c"
for I in `seq 1 150`; do
        if test -e ../../vorbis_enc/patches/r$I; then
                patch < ../../vorbis_enc/patches/r$I
                svn commit vorbis_enc.c -m "`cat ../../vorbis_enc/patches/c$I`"
        fi
done


- ods15
-------------- next part --------------
A non-text attachment was scrubbed...
Name: a.pl
Type: text/x-perl
Size: 860 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20070617/6617c0f9/attachment.pl>