[Ffmpeg-cvslog] r8240 - trunk/libavformat/asf-enc.c

[Guillaume POIRIER]

Hi,

On 3/5/07, michael <subversion at mplayerhq.hu> wrote:
> Author: michael
> Date: Mon Mar  5 03:41:49 2007
> New Revision: 8240
>
> Modified:
>    trunk/libavformat/asf-enc.c
>
> Log:
> create codec_comment_header which looks more like what M$ creates, sane or not ...
>
>
> Modified: trunk/libavformat/asf-enc.c
> ==============================================================================
> --- trunk/libavformat/asf-enc.c (original)
> +++ trunk/libavformat/asf-enc.c Mon Mar  5 03:41:49 2007
> @@ -428,8 +428,17 @@ static int asf_write_header1(AVFormatCon
>          enc = s->streams[n]->codec;
>          p = avcodec_find_encoder(enc->codec_id);
>
> -        put_le16(pb, asf->streams[n].num);
> -        put_str16(pb, p ? p->name : enc->codec_name);
> +        if(enc->codec_type == CODEC_TYPE_AUDIO)
> +            put_le16(pb, 2);
> +        else if(enc->codec_type == CODEC_TYPE_VIDEO)
> +            put_le16(pb, 1);
> +        else
> +            put_le16(pb, -1);
> +
> +        if(enc->codec_id == CODEC_ID_WMAV2)
> +            put_str16(pb, "Windows Media Audio V8");
> +        else
> +            put_str16(pb, p ? p->name : enc->codec_name);
>          put_le16(pb, 0); /* no parameters */

Doesn't this break regression tests?

Here's what I'm getting:

../ffmpeg_g -y -flags +bitexact -dct fastint -idct simple -y -i
./data/a-wmav2.asf -f wav ./data/out.wav
FFmpeg version SVN-r8242, Copyright (c) 2000-2007 Fabrice Bellard, et al.
  configuration: --enable-gpl --cpu=nocona
  libavutil version: 49.3.0
  libavcodec version: 51.38.0
  libavformat version: 51.10.0
  built on Mar  5 2007 10:30:45, gcc: 4.1.2 20061028 (prerelease)
(Debian 4.1.1-19)
size=    1032kB time=6.0 bitrate=1411.3kbits/s
--- ./data/ffmpeg.regression    2007-03-05 10:52:41.000000000 +0100
+++ /passauvegarde/dori/gpoirier/snapshot/ffmpeg-vanilla/tests/ffmpeg.regression.ref
   2007-02-13 15:57:03.000000000 +0100
@@ -188,11 +188,11 @@
 353368 ./data/a-flac.flac
 c4228df189aad9567a037727d0e763e4 *./data/out.wav
 stddev: 33.31 PSNR:65.87 bytes:1040384
-885affac24b064633c17d92ea23bbe3a *./data/a-wmav1.asf
+8fc0032faee2785502a506b6d0470833 *./data/a-wmav1.asf
 99604 ./data/a-wmav1.asf
 stddev:12251.50 PSNR:14.56 bytes:1056768
 stddev:2106.00 PSNR:29.85 bytes:1048576
-cf5d1f5ed52230ee3b92efd53f59a668 *./data/a-wmav2.asf
-99644 ./data/a-wmav2.asf
+f249fbe66d28027cf5f63d85d49844a7 *./data/a-wmav2.asf
+99610 ./data/a-wmav2.asf
 stddev:12255.92 PSNR:14.55 bytes:1056768
 stddev:2099.31 PSNR:29.88 bytes:1048576

Regression test: Error.
make[1]: *** [codectest] Error 1

Guillaume