[FFmpeg-devel] [PATCH] asf.c: move packet_time_start=0 statement

[Ronald S. Bultje]

Hi,

On Thu, Dec 4, 2008 at 10:34 AM, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Thu, Dec 04, 2008 at 08:44:18AM -0500, Ronald S. Bultje wrote:
>> +    for (;;) {
>> +        int ret;
>> +
>> +        /* parse cached packets, if any */
>> +        if ((ret = asf_parse_packet(s, pkt)) <= 0)
>> +            return ret;
>
>> +        else if ((ret = asf_get_packet(s)) < 0) {
>
> you dont need the else

Fixed.

[..]
> and i assume you have tested this patch with normal asf/wma/wmv and the
> regression tests?

It fails both before and after for one file, a WMA file, with this:

@@ -205,7 +205,7 @@
 353368 ./tests/data/a-flac.flac
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.vsynth.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-4435d87463cd6c5407bd88cca241ca56 *./tests/data/a-wmav1.asf
+6f7f3116b801ea641ce14f827de05cce *./tests/data/a-wmav1.asf
 106004 ./tests/data/a-wmav1.asf
 stddev:12251.38 PSNR: 14.56 bytes:  1056812/  1058444
 stddev: 2105.96 PSNR: 29.85 bytes:  1048620/  1058444

This is because of the non-fixed point WMA impl, as referenced earlier here:

http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2008-November/056294.html
(see your reply to that email also)

(and several other times for the same MD5sum.) Maybe both md5s should
be accepted as OK? this is on MacOSX 10.4, with:
$ gcc -v
Using built-in specs.
Target: i686-apple-darwin8
Configured with: /private/var/tmp/gcc/gcc-5367.obj~1/src/configure
--disable-checking -enable-werror --prefix=/usr --mandir=/share/man
--enable-languages=c,objc,c++,obj-c++
--program-transform-name=/^[cg][^.-]*$/s/$/-4.0/
--with-gxx-include-dir=/include/c++/4.0.0 --with-slibdir=/usr/lib
--build=powerpc-apple-darwin8 --with-arch=nocona --with-tune=generic
--program-prefix= --host=i686-apple-darwin8
--target=i686-apple-darwin8
Thread model: posix
gcc version 4.0.1 (Apple Computer, Inc. build 5367)

Anyway, since the md5 before and after is the same, here's the new
patch attached with a slight modification to ensure similar behaviour
of old/new code. Other than this one above, make test works also.

Ronald
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: asf-remove-packet-state-machine.patch
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20081206/b670f333/attachment.txt>