adpcmenc: fix QT IMA ADPCM encoder

[ffmpeg] / tests / tiny_psnr.c

diff --git a/tests/tiny_psnr.c b/tests/tiny_psnr.c
index 66b6747af340cf1e019affe9435ddf6e8dba3422..2bdb4391cfb775dd387ba387fde3ed126b1a574c 100644 (file)
--- a/tests/tiny_psnr.c
+++ b/tests/tiny_psnr.c
@@ -1,25 +1,26 @@
 /*
  * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <inttypes.h>
 #include <assert.h>
 
@@ -51,21 +52,6 @@ uint64_t exp16_table[21]={
  582360139072LL,
 };
 
-#if 0
-// 16.16 fixpoint exp()
-static unsigned int exp16(unsigned int a){
-    int i;
-    int out= 1<<16;
-
-    for(i=19;i>=0;i--){
-        if(a&(1<<i))
-            out= (out*exp16_table[i] + (1<<15))>>16;
-    }
-
-    return out;
-}
-#endif
-
 // 16.16 fixpoint log()
 static int64_t log16(uint64_t a){
     int i;
@@ -117,18 +103,37 @@ int main(int argc,char* argv[]){
 
     if(argc<3){
         printf("tiny_psnr <file1> <file2> [<elem size> [<shift> [<skip bytes>]]]\n");
-        printf("For WAV files use the following:\n");
-        printf("./tiny_psnr file1.wav file2.wav 2 0 44 to skip the header.\n");
-        return -1;
+        printf("WAV headers are skipped automatically.\n");
+        return 1;
     }
 
     f[0]= fopen(argv[1], "rb");
     f[1]= fopen(argv[2], "rb");
     if(!f[0] || !f[1]){
         fprintf(stderr, "Could not open input files.\n");
-        return -1;
+        return 1;
+    }
+
+    for (i = 0; i < 2; i++) {
+        uint8_t *p = buf[i];
+        if (fread(p, 1, 12, f[i]) != 12)
+            return 1;
+        if (!memcmp(p,   "RIFF", 4) &&
+            !memcmp(p+8, "WAVE", 4)) {
+            if (fread(p, 1, 8, f[i]) != 8)
+                return 1;
+            while (memcmp(p, "data", 4)) {
+                int s = p[4] | p[5]<<8 | p[6]<<16 | p[7]<<24;
+                fseek(f[i], s, SEEK_CUR);
+                if (fread(p, 1, 8, f[i]) != 8)
+                    return 1;
+            }
+        } else {
+            fseek(f[i], -12, SEEK_CUR);
+        }
     }
-    fseek(f[shift<0], shift < 0 ? -shift : shift, SEEK_SET);
+
+    fseek(f[shift<0], abs(shift), SEEK_CUR);
 
     fseek(f[0],skip_bytes,SEEK_CUR);
     fseek(f[1],skip_bytes,SEEK_CUR);