[Mplayerxp-cvslog] CVS: mplayerxp/mplayerxp/libmpcodecs ad_a52.c,1.5,1.6 ad_hwac3.c,1.5,1.6

[Nick K. <nic...@us...>]

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs
In directory sc8-pr-cvs1:/tmp/cvs-serv9814

Modified Files:
	ad_a52.c ad_hwac3.c 
Log Message:
fixed problem of linking with ffmpeg

Index: ad_a52.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/ad_a52.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ad_a52.c	9 Nov 2002 10:24:39 -0000	1.5
+++ ad_a52.c	20 Jan 2003 18:45:03 -0000	1.6
@@ -12,10 +12,10 @@
 
 #include "interface/a52.h"
 #include "../mm_accel.h"
-sample_t * a52_samples;
-a52_state_t a52_state;
-uint32_t a52_accel=0;
-uint32_t a52_flags=0;
+sample_t * mpxp_a52_samples;
+a52_state_t mpxp_a52_state;
+uint32_t mpxp_a52_accel=0;
+uint32_t mpxp_a52_flags=0;
 extern unsigned mplayer_accel;
 #include "bswap.h"
 
@@ -49,7 +49,7 @@
 static int (** a52_resample_ptr) (float * _f, int16_t * s16);
 #define a52_resample(a,b) (*a52_resample_ptr)(a,b)
 
-static void *dll_handle;
+static void *dll_handle;
 static int load_dll(const char *libname)
 {
   if(!(dll_handle=ld_codec(libname,NULL))) return 0;
@@ -139,9 +139,9 @@
   sample_t level=1, bias=384;
   int flags=0;
   /* Dolby AC3 audio:*/
-  a52_accel = mplayer_accel;
-  a52_samples=a52_init (a52_accel);
-  if (a52_samples == NULL) {
+  mpxp_a52_accel = mplayer_accel;
+  mpxp_a52_samples=a52_init (mpxp_a52_accel);
+  if (mpxp_a52_samples == NULL) {
 	MSG_ERR("A52 init failed\n");
 	return 0;
   }
@@ -154,25 +154,25 @@
   sh_audio->channels=audio_output_channels;
 while(sh_audio->channels>0){
   switch(sh_audio->channels){
-	    case 1: a52_flags=A52_MONO; break;
-/*	    case 2: a52_flags=A52_STEREO; break;*/
-	    case 2: a52_flags=A52_DOLBY; break;
-/*	    case 3: a52_flags=A52_3F; break;*/
-	    case 3: a52_flags=A52_2F1R; break;
-	    case 4: a52_flags=A52_2F2R; break; /* 2+2*/
-	    case 5: a52_flags=A52_3F2R; break;
-	    case 6: a52_flags=A52_3F2R|A52_LFE; break; /* 5.1*/
+	    case 1: mpxp_a52_flags=A52_MONO; break;
+/*	    case 2: mpxp_a52_flags=A52_STEREO; break;*/
+	    case 2: mpxp_a52_flags=A52_DOLBY; break;
+/*	    case 3: mpxp_a52_flags=A52_3F; break;*/
+	    case 3: mpxp_a52_flags=A52_2F1R; break;
+	    case 4: mpxp_a52_flags=A52_2F2R; break; /* 2+2*/
+	    case 5: mpxp_a52_flags=A52_3F2R; break;
+	    case 6: mpxp_a52_flags=A52_3F2R|A52_LFE; break; /* 5.1*/
   }
   /* test:*/
-  flags=a52_flags|A52_ADJUST_LEVEL;
+  flags=mpxp_a52_flags|A52_ADJUST_LEVEL;
   MSG_V("A52 flags before a52_frame: 0x%X\n",flags);
-  if (a52_frame (&a52_state, sh_audio->a_in_buffer, &flags, &level, bias)){
+  if (a52_frame (&mpxp_a52_state, sh_audio->a_in_buffer, &flags, &level, bias)){
     MSG_ERR("a52: error decoding frame -> nosound\n");
     return 0;
   }
   MSG_V("A52 flags after a52_frame: 0x%X\n",flags);
   /* frame decoded, let's init resampler:*/
-  if(a52_resample_init(a52_accel,flags,sh_audio->channels)) break;
+  if(a52_resample_init(mpxp_a52_accel,flags,sh_audio->channels)) break;
   --sh_audio->channels; /* try to decrease no. of channels*/
 }
   if(sh_audio->channels<=0){
@@ -206,22 +206,22 @@
 int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
 {
     sample_t level=1, bias=384;
-    int flags=a52_flags|A52_ADJUST_LEVEL;
+    int flags=mpxp_a52_flags|A52_ADJUST_LEVEL;
     int i,len=-1;
 	if(!sh_audio->a_in_buffer_len) 
 	    if(a52_fillbuff(sh_audio)<0) return len; /* EOF */
 	sh_audio->a_in_buffer_len=0;
-	if (a52_frame (&a52_state, sh_audio->a_in_buffer, &flags, &level, bias)){
+	if (a52_frame (&mpxp_a52_state, sh_audio->a_in_buffer, &flags, &level, bias)){
 	    MSG_WARN("a52: error decoding frame\n");
 	    return len;
 	}
 	len=0;
 	for (i = 0; i < 6; i++) {
-	    if (a52_block (&a52_state, a52_samples)){
+	    if (a52_block (&mpxp_a52_state, mpxp_a52_samples)){
 		MSG_WARN("a52: error at resampling\n");
 		break;
 	    }
-	    len+=2*a52_resample(a52_samples,&buf[len]);
+	    len+=2*a52_resample(mpxp_a52_samples,&buf[len]);
 	}
   return len;
 }

Index: ad_hwac3.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/ad_hwac3.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ad_hwac3.c	7 Jun 2002 09:02:03 -0000	1.5
+++ ad_hwac3.c	20 Jan 2003 18:45:03 -0000	1.6
@@ -13,10 +13,10 @@
 #include "codecs_ld.h"
 #include "../libao2/afmt.h"
 
-extern sample_t * a52_samples;
-extern a52_state_t a52_state;
-extern uint32_t a52_accel;
-extern uint32_t a52_flags;
+extern sample_t * mpxp_a52_samples;
+extern a52_state_t mpxp_a52_state;
+extern uint32_t mpxp_a52_accel;
+extern uint32_t mxp_a52_flags;
 extern int a52_fillbuff(sh_audio_t *sh_audio);
 
 static ad_info_t info = 
@@ -35,7 +35,7 @@
 static int (*ac3_iec958_build_burst_ptr)(int length, int data_type, int big_endian, unsigned char * data, unsigned char * out);
 #define ac3_iec958_build_burst(a,b,c,d,e) (*ac3_iec958_build_burst_ptr)(a,b,c,d,e)
 
-static void *dll_handle;
+static void *dll_handle;
 static int load_dll(const char *libname)
 {
   if(!(dll_handle=ld_codec(libname,NULL))) return 0;
@@ -43,7 +43,7 @@
   return a52_init_ptr?1:0;
 }
 
-static void *dll_handle2;
+static void *dll_handle2;
 static int load2_dll(const char *libname)
 {
   if(!(dll_handle=ld_codec(libname,NULL))) return 0;
@@ -64,8 +64,8 @@
 int init(sh_audio_t *sh_audio)
 {
   /* Dolby AC3 passthrough:*/
-  a52_samples=a52_init (a52_accel); /* doesn't require mmx optimzation */
-  if (a52_samples == NULL) {
+  mpxp_a52_samples=a52_init (mpxp_a52_accel); /* doesn't require mmx optimzation */
+  if (mpxp_a52_samples == NULL) {
        MSG_ERR("A52 init failed\n");
        return 0;
   }