Pass codec pixel format list to get_format, if present, fix vdpau decoding

[ffmpeg] / tests / tiny_psnr.c

diff --git a/tests/tiny_psnr.c b/tests/tiny_psnr.c
index 05f3d4f267804e578f3528e3ecd125fa62881202..f8d1b7bfa51014f9a129f574e13f8d5a28298016 100644 (file)
--- a/tests/tiny_psnr.c
+++ b/tests/tiny_psnr.c
@@ -1,20 +1,21 @@
 /*
  * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdio.h>
@@ -22,6 +23,7 @@
 #include <inttypes.h>
 #include <assert.h>
 
+#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
 #define F 100
 #define SIZE 2048
 
@@ -48,7 +50,8 @@ uint64_t exp16_table[21]={
  195360063,
  582360139072LL,
 };
-#if 1
+
+#if 0
 // 16.16 fixpoint exp()
 static unsigned int exp16(unsigned int a){
     int i;
@@ -61,6 +64,8 @@ static unsigned int exp16(unsigned int a){
 
     return out;
 }
+#endif
+
 // 16.16 fixpoint log()
 static int64_t log16(uint64_t a){
     int i;
@@ -69,7 +74,7 @@ static int64_t log16(uint64_t a){
     if(a < 1<<16)
         return -log16((1LL<<32) / a);
     a<<=16;
-    
+
     for(i=20;i>=0;i--){
         int64_t b= exp16_table[i];
         if(a<(b<<16)) continue;
@@ -79,7 +84,6 @@ static int64_t log16(uint64_t a){
     return out;
 }
 
-#endif
 static uint64_t int_sqrt(uint64_t a)
 {
     uint64_t ret=0;
@@ -106,21 +110,33 @@ int main(int argc,char* argv[]){
     int len= argc<4 ? 1 : atoi(argv[3]);
     int64_t max= (1<<(8*len))-1;
     int shift= argc<5 ? 0 : atoi(argv[4]);
-    
+    int skip_bytes = argc<6 ? 0 : atoi(argv[5]);
+    int size0=0;
+    int size1=0;
+
     if(argc<3){
-        printf("tiny_psnr <file1> <file2> [<elem size> [<shift>]]\n");
+        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;
     }
-    
+
     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;
+    }
     fseek(f[shift<0], shift < 0 ? -shift : shift, SEEK_SET);
 
-    for(i=0;;){
-        if( fread(buf[0], SIZE, 1, f[0]) != 1) break;
-        if( fread(buf[1], SIZE, 1, f[1]) != 1) break;
-        
-        for(j=0; j<SIZE; i++,j++){
+    fseek(f[0],skip_bytes,SEEK_CUR);
+    fseek(f[1],skip_bytes,SEEK_CUR);
+
+    for(;;){
+        int s0= fread(buf[0], 1, SIZE, f[0]);
+        int s1= fread(buf[1], 1, SIZE, f[1]);
+
+        for(j=0; j<FFMIN(s0,s1); j++){
             int64_t a= buf[0][j];
             int64_t b= buf[1][j];
             if(len==2){
@@ -129,19 +145,24 @@ int main(int argc,char* argv[]){
             }
             sse += (a-b) * (a-b);
         }
+        size0 += s0;
+        size1 += s1;
+        if(s0+s1<=0)
+            break;
     }
-    
+
+    i= FFMIN(size0,size1)/len;
     if(!i) i=1;
     dev= int_sqrt( ((sse/i)*F*F) + (((sse%i)*F*F) + i/2)/i );
     if(sse)
-        psnr= ((2*log16(max<<16) + log16(i) - log16(sse))*284619LL*F + (1<<31)) / (1LL<<32);
+        psnr= ((2*log16(max<<16) + log16(i) - log16(sse))*284619LL*F + (1LL<<31)) / (1LL<<32);
     else
-        psnr= 100*F-1; //floating point free infinity :)
-    
-    printf("stddev:%3d.%02d PSNR:%2d.%02d bytes:%d\n", 
-        (int)(dev/F), (int)(dev%F), 
+        psnr= 1000*F-1; //floating point free infinity :)
+
+    printf("stddev:%5d.%02d PSNR:%3d.%02d bytes:%9d/%9d\n",
+        (int)(dev/F), (int)(dev%F),
         (int)(psnr/F), (int)(psnr%F),
-        i);
+        size0, size1);
     return 0;
 }