[MPlayer-cvslog] CVS: main/libaf af_format.c, 1.19, 1.20 af_format.h, 1.4, 1.5

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main/libaf
In directory mail:/var2/tmp/cvs-serv27125

Modified Files:
	af_format.c af_format.h 
Log Message:
af_fmt2str_short

Index: af_format.c
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/af_format.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- af_format.c	28 Dec 2004 02:00:23 -0000	1.19
+++ af_format.c	28 Dec 2004 18:13:09 -0000	1.20
@@ -130,6 +130,8 @@
       i+=snprintf(&str[i],size-i,"MPEG 2 "); break;
     case(AF_FORMAT_AC3): 
       i+=snprintf(&str[i],size-i,"AC3 "); break;
+    case(AF_FORMAT_IMA_ADPCM): 
+      i+=snprintf(&str[i],size-i,"IMA ADPCM "); break;
     default:
       printf("Unknown special\n");
     }
@@ -155,6 +157,37 @@
   return str;
 }
 
+char *af_fmt2str_short(int format)
+{
+    switch(format)
+    {
+	// special
+	case AF_FORMAT_MU_LAW: return "mulaw";
+	case AF_FORMAT_A_LAW: return "alaw";
+	case AF_FORMAT_MPEG2: return "mpeg2";
+	case AF_FORMAT_AC3: return "ac3";
+	case AF_FORMAT_IMA_ADPCM: return "imaadpcm";
+	// ordinary
+	case AF_FORMAT_U8: return "u8";
+	case AF_FORMAT_S8: return "s8";
+	case AF_FORMAT_U16_LE: return "u16le";
+	case AF_FORMAT_U16_BE: return "u16be";
+	case AF_FORMAT_S16_LE: return "s16le";
+	case AF_FORMAT_S16_BE: return "s16be";
+	case AF_FORMAT_U24_LE: return "u24le";
+	case AF_FORMAT_U24_BE: return "u24be";
+	case AF_FORMAT_S24_LE: return "s24le";
+	case AF_FORMAT_S24_BE: return "s24be";
+	case AF_FORMAT_U32_LE: return "u32le";
+	case AF_FORMAT_U32_BE: return "u32be";
+	case AF_FORMAT_S32_LE: return "s32le";
+	case AF_FORMAT_S32_BE: return "s32be";
+	case AF_FORMAT_FLOAT_LE: return "floatle";
+	case AF_FORMAT_FLOAT_BE: return "floatbe";
+    }
+    return "??";
+}
+
 // Helper functions to check sanity for input arguments
 
 // Sanity check for bytes per sample

Index: af_format.h
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/af_format.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- af_format.h	27 Dec 2004 17:30:13 -0000	1.4
+++ af_format.h	28 Dec 2004 18:13:09 -0000	1.5
@@ -83,5 +83,6 @@
 extern int af_str2fmt(char *str);
 extern int af_fmt2bits(int format);
 extern char* af_fmt2str(int format, char* str, int size);
+extern char* af_fmt2str_short(int format);
 
 #endif /* __af_format_h__ */