[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[320] mplayerxp

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

Revision: 320
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=320&view=rev
Author:   nickols_k
Date:     2012-11-10 12:52:42 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
fixes

Modified Paths:
--------------
    mplayerxp/postproc/af_channels.c
    mplayerxp/postproc/af_extrastereo.c
    mplayerxp/postproc/af_karaoke.c
    mplayerxp/postproc/af_lp.c
    mplayerxp/postproc/af_resample.c
    mplayerxp/postproc/af_sinesuppress.c
    mplayerxp/postproc/af_volnorm.c
    mplayerxp/postproc/af_volume.c
    mplayerxp/xmpcore/mp_aframe.h

Modified: mplayerxp/postproc/af_channels.c
===================================================================
--- mplayerxp/postproc/af_channels.c	2012-11-10 12:16:34 UTC (rev 319)
+++ mplayerxp/postproc/af_channels.c	2012-11-10 12:52:42 UTC (rev 320)
@@ -128,7 +128,7 @@
     // Set default channel assignment
     if(!s->router){
       int i;
-      // Make sure this filter isn't redundant 
+      // Make sure this filter isn't redundant
       if(af->data->nch == ((mp_aframe_t*)arg)->nch)
 	return MPXP_Detach;
 

Modified: mplayerxp/postproc/af_extrastereo.c
===================================================================
--- mplayerxp/postproc/af_extrastereo.c	2012-11-10 12:16:34 UTC (rev 319)
+++ mplayerxp/postproc/af_extrastereo.c	2012-11-10 12:52:42 UTC (rev 320)
@@ -37,7 +37,7 @@
     // Sanity check
     if(!arg) return MPXP_Error;
 
-    if(((mp_aframe_t*)arg)->format != (MPAF_SI|MPAF_NE) ||
+    if(!mpaf_testa(((mp_aframe_t*)arg)->format,MPAF_SI|MPAF_NE) ||
        (((mp_aframe_t*)arg)->nch != 2))
        return MPXP_Error;
 

Modified: mplayerxp/postproc/af_karaoke.c
===================================================================
--- mplayerxp/postproc/af_karaoke.c	2012-11-10 12:16:34 UTC (rev 319)
+++ mplayerxp/postproc/af_karaoke.c	2012-11-10 12:52:42 UTC (rev 320)
@@ -19,14 +19,14 @@
 // Initialization and runtime control
 static MPXP_Rc control(struct af_instance_s* af, int cmd, any_t* arg)
 {
-	switch(cmd){
-		case AF_CONTROL_REINIT:
-		af->data->rate	= ((mp_aframe_t*)arg)->rate;
-		af->data->nch	= ((mp_aframe_t*)arg)->nch;
-		af->data->format= MPAF_NE|MPAF_F|4;
-		return af_test_output(af,(mp_aframe_t*)arg);
-	}
-	return MPXP_Unknown;
+    switch(cmd){
+	case AF_CONTROL_REINIT:
+	af->data->rate	= ((mp_aframe_t*)arg)->rate;
+	af->data->nch	= ((mp_aframe_t*)arg)->nch;
+	af->data->format= MPAF_NE|MPAF_F|4;
+	return af_test_output(af,(mp_aframe_t*)arg);
+    }
+    return MPXP_Unknown;
 }
 
 // Deallocate memory 

Modified: mplayerxp/postproc/af_lp.c
===================================================================
--- mplayerxp/postproc/af_lp.c	2012-11-10 12:16:34 UTC (rev 319)
+++ mplayerxp/postproc/af_lp.c	2012-11-10 12:52:42 UTC (rev 320)
@@ -17,7 +17,7 @@
 // Initialization and runtime control
 static MPXP_Rc __FASTCALL__ control(struct af_instance_s* af, int cmd, any_t* arg)
 {
-  af_lp_t* s   = (af_lp_t*)af->setup; 
+  af_lp_t* s   = (af_lp_t*)af->setup;
   switch(cmd){
   case AF_CONTROL_REINIT:
     memcpy(af->data,(mp_aframe_t*)arg,sizeof(mp_aframe_t));

Modified: mplayerxp/postproc/af_resample.c
===================================================================
--- mplayerxp/postproc/af_resample.c	2012-11-10 12:16:34 UTC (rev 319)
+++ mplayerxp/postproc/af_resample.c	2012-11-10 12:52:42 UTC (rev 320)
@@ -78,7 +78,7 @@
 	case AF_CONTROL_REINIT: {
 	    enum AVSampleFormat avfmt;
 	    uint64_t		nch;
-	    mp_aframe_t*		n   = (mp_aframe_t*)arg; // New configuration
+	    mp_aframe_t*	n   = (mp_aframe_t*)arg; // New configuration
 	    int			rv  = MPXP_Ok;
 
 	    if(s->ctx) { swr_free(&s->ctx); s->ctx=NULL; }

Modified: mplayerxp/postproc/af_sinesuppress.c
===================================================================
--- mplayerxp/postproc/af_sinesuppress.c	2012-11-10 12:16:34 UTC (rev 319)
+++ mplayerxp/postproc/af_sinesuppress.c	2012-11-10 12:52:42 UTC (rev 320)
@@ -51,8 +51,7 @@
     af->data->rate   = ((mp_aframe_t*)arg)->rate;
     af->data->nch    = 1;
 #if 0
-    if (((mp_aframe_t*)arg)->format == MPAF_NE | MPAF_F)
-    {
+    if (mpaf_testa((mp_aframe_t*)arg)->format,MPAF_NE | MPAF_F) {
 	af->data->format = MPAF_FLOAT_NE|4;
 	af->play = play_float;
     }// else

Modified: mplayerxp/postproc/af_volnorm.c
===================================================================
--- mplayerxp/postproc/af_volnorm.c	2012-11-10 12:16:34 UTC (rev 319)
+++ mplayerxp/postproc/af_volnorm.c	2012-11-10 12:52:42 UTC (rev 320)
@@ -81,15 +81,14 @@
     af->data->rate   = ((mp_aframe_t*)arg)->rate;
     af->data->nch    = ((mp_aframe_t*)arg)->nch;
 
-    if(!(((mp_aframe_t*)arg)->format&(MPAF_F|MPAF_NE) ||
-	((mp_aframe_t*)arg)->format&(MPAF_SI|MPAF_NE)))
+    if(!(mpaf_testa(((mp_aframe_t*)arg)->format,MPAF_F|MPAF_NE) ||
+	mpaf_testa(((mp_aframe_t*)arg)->format,MPAF_SI|MPAF_NE)))
 	return MPXP_Error;
 
-    if(((mp_aframe_t*)arg)->format&(MPAF_F|MPAF_NE)){
+    if(mpaf_testa(((mp_aframe_t*)arg)->format,MPAF_F|MPAF_NE))
 	af->data->format = MPAF_F|MPAF_NE|4;
-    }else{
+    else
 	af->data->format = MPAF_SI|MPAF_NE|2;
-    }
     return af_test_output(af,(mp_aframe_t*)arg);
   case AF_CONTROL_SHOWCONF:
     MSG_INFO("[af_volnorm] using method %d\n",s->method);

Modified: mplayerxp/postproc/af_volume.c
===================================================================
--- mplayerxp/postproc/af_volume.c	2012-11-10 12:16:34 UTC (rev 319)
+++ mplayerxp/postproc/af_volume.c	2012-11-10 12:52:42 UTC (rev 320)
@@ -62,10 +62,9 @@
     af->data->rate   = ((mp_aframe_t*)arg)->rate;
     af->data->nch    = ((mp_aframe_t*)arg)->nch;
 
-    if(s->fast && (((mp_aframe_t*)arg)->format != (MPAF_F|MPAF_NE))){
-      af->data->format = MPAF_SI|MPAF_NE|2;
-    }
-    else{
+    if(s->fast && !mpaf_testa(((mp_aframe_t*)arg)->format,MPAF_F|MPAF_NE))
+	af->data->format = MPAF_SI|MPAF_NE|2;
+    else {
       // Cutoff set to 10Hz for forgetting factor
       float x = 2.0*M_PI*15.0/(float)af->data->rate;
       float t = 2.0-cos(x);

Modified: mplayerxp/xmpcore/mp_aframe.h
===================================================================
--- mplayerxp/xmpcore/mp_aframe.h	2012-11-10 12:16:34 UTC (rev 319)
+++ mplayerxp/xmpcore/mp_aframe.h	2012-11-10 12:52:42 UTC (rev 320)
@@ -43,6 +43,8 @@
 extern char* __FASTCALL__         mpaf_fmt2str(mpaf_format_e format, char* str, size_t size);
 extern mpaf_format_e __FASTCALL__ mpaf_str2fmt(const char *str);
 
+static inline int mpaf_test(mpaf_format_e f,unsigned bits) { return f&bits; }
+static inline int mpaf_testa(mpaf_format_e f,unsigned bits) { return (f&bits)==bits; }
 
 typedef struct mp_audio_frame_s {
     unsigned		flags; /* currently unused */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.