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

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

Revision: 406
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=406&view=rev
Author:   nickols_k
Date:     2012-11-18 12:37:12 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
improve readability

Modified Paths:
--------------
    mplayerxp/libmpcodecs/ad_dca.cpp
    mplayerxp/libmpcodecs/ad_faad.cpp
    mplayerxp/libmpcodecs/dec_audio.cpp
    mplayerxp/libmpdemux/s_oss.c
    mplayerxp/postproc/af.cpp
    mplayerxp/postproc/af_ao2.cpp
    mplayerxp/postproc/af_ffenc.cpp
    mplayerxp/xmpcore/mp_aframe.cpp
    mplayerxp/xmpcore/mp_aframe.h

Modified: mplayerxp/libmpcodecs/ad_dca.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.cpp	2012-11-18 12:30:09 UTC (rev 405)
+++ mplayerxp/libmpcodecs/ad_dca.cpp	2012-11-18 12:37:12 UTC (rev 406)
@@ -137,9 +137,9 @@
 #define DCA_FMT24 AFMT_S24_LE
 #endif
     sh->afmt=bps2afmt(2);
-    if(	af_query_fmt(sh->afilter,mpaf_format_decode(AFMT_FLOAT32)) == MPXP_Ok||
-	af_query_fmt(sh->afilter,mpaf_format_decode(DCA_FMT32)) == MPXP_Ok ||
-	af_query_fmt(sh->afilter,mpaf_format_decode(DCA_FMT24)) == MPXP_Ok)
+    if(	af_query_fmt(sh->afilter,afmt2mpaf(AFMT_FLOAT32)) == MPXP_Ok||
+	af_query_fmt(sh->afilter,afmt2mpaf(DCA_FMT32)) == MPXP_Ok ||
+	af_query_fmt(sh->afilter,afmt2mpaf(DCA_FMT24)) == MPXP_Ok)
     {
 	sh->afmt=AFMT_FLOAT32;
     }

Modified: mplayerxp/libmpcodecs/ad_faad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.cpp	2012-11-18 12:30:09 UTC (rev 405)
+++ mplayerxp/libmpcodecs/ad_faad.cpp	2012-11-18 12:37:12 UTC (rev 406)
@@ -217,9 +217,9 @@
 #endif
     /* Set the maximal quality */
     /* This is useful for expesive audio cards */
-    if(af_query_fmt(sh->afilter,mpaf_format_decode(AFMT_FLOAT32)) == MPXP_Ok ||
-	af_query_fmt(sh->afilter,mpaf_format_decode(NeAAC_FMT32)) == MPXP_Ok ||
-	af_query_fmt(sh->afilter,mpaf_format_decode(NeAAC_FMT24)) == MPXP_Ok) {
+    if(af_query_fmt(sh->afilter,afmt2mpaf(AFMT_FLOAT32)) == MPXP_Ok ||
+	af_query_fmt(sh->afilter,afmt2mpaf(NeAAC_FMT32)) == MPXP_Ok ||
+	af_query_fmt(sh->afilter,afmt2mpaf(NeAAC_FMT24)) == MPXP_Ok) {
 	    sh->afmt=AFMT_FLOAT32;
 	    NeAAC_conf->outputFormat=FAAD_FMT_FLOAT;
     } else {

Modified: mplayerxp/libmpcodecs/dec_audio.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.cpp	2012-11-18 12:30:09 UTC (rev 405)
+++ mplayerxp/libmpcodecs/dec_audio.cpp	2012-11-18 12:37:12 UTC (rev 406)
@@ -188,12 +188,12 @@
     // input format: same as codec's output format:
     afs->input.rate   = in_samplerate;
     afs->input.nch    = in_channels;
-    afs->input.format = mpaf_format_decode(in_format);
+    afs->input.format = afmt2mpaf(in_format);
 
     // output format: same as ao driver's input format (if missing, fallback to input)
     afs->output.rate   = *out_samplerate ? *out_samplerate : afs->input.rate;
     afs->output.nch    = *out_channels ? *out_channels : afs->input.nch;
-    if(*out_format)	afs->output.format = mpaf_format_decode(*out_format);
+    if(*out_format)	afs->output.format = afmt2mpaf(*out_format);
     else		afs->output.format = afs->input.format;
 
     // filter config:
@@ -210,7 +210,7 @@
 
     *out_samplerate=afs->output.rate;
     *out_channels=afs->output.nch;
-    *out_format=mpaf_format_encode(afs->output.format);
+    *out_format=mpaf2afmt(afs->output.format);
 
     sh_audio->af_bps = afs->output.rate*afs->output.nch*(afs->output.format&MPAF_BPS_MASK);
 
@@ -235,19 +235,19 @@
     // input format: same as codec's output format:
     afs->input.rate   = in_samplerate;
     afs->input.nch    = in_channels;
-    afs->input.format = mpaf_format_decode(in_format);
+    afs->input.format = afmt2mpaf(in_format);
 
     // output format: same as ao driver's input format (if missing, fallback to input)
     afs->output.rate   = out_samplerate ? out_samplerate : afs->input.rate;
     afs->output.nch    = out_channels ? out_channels : afs->input.nch;
-    afs->output.format = mpaf_format_decode(out_format ? out_format : afs->input.format);
+    afs->output.format = afmt2mpaf(out_format ? out_format : afs->input.format);
 
     // filter config:
     memcpy(&afs->cfg,&af_cfg,sizeof(af_cfg_t));
 
     MSG_V("Building audio filter chain for %dHz/%dch/%dbit (%s) -> %dHz/%dch/%dbit (%s)...\n",
-	afs->input.rate,afs->input.nch,(afs->input.format&MPAF_BPS_MASK)*8,ao_format_name(mpaf_format_encode(afs->input.format)),
-	afs->output.rate,afs->output.nch,(afs->output.format&MPAF_BPS_MASK)*8,ao_format_name(mpaf_format_encode(afs->output.format)));
+	afs->input.rate,afs->input.nch,(afs->input.format&MPAF_BPS_MASK)*8,ao_format_name(mpaf2afmt(afs->input.format)),
+	afs->output.rate,afs->output.nch,(afs->output.format&MPAF_BPS_MASK)*8,ao_format_name(mpaf2afmt(afs->output.format)));
 
     // let's autoprobe it!
     if(MPXP_Ok != RND_RENAME7(af_init)(afs,1)){
@@ -331,7 +331,7 @@
     mp_aframe_t* pafd; // filter output
     afd=new_mp_aframe(	sh_audio->rate,
 			sh_audio->nch,
-			mpaf_format_decode(sh_audio->afmt)
+			afmt2mpaf(sh_audio->afmt)
 			,0); // xp_idx
     afd->audio=buf;
     afd->len=len;

Modified: mplayerxp/libmpdemux/s_oss.c
===================================================================
--- mplayerxp/libmpdemux/s_oss.c	2012-11-18 12:30:09 UTC (rev 405)
+++ mplayerxp/libmpdemux/s_oss.c	2012-11-18 12:37:12 UTC (rev 406)
@@ -99,7 +99,7 @@
 	afd.rate=oss_priv->samplerate;
 	afd.nch=oss_priv->nchannels;
 	afd.format=oss_priv->sampleformat;
-	oss_fmt=mpaf_format_encode(oss_priv->sampleformat);
+	oss_fmt=mpaf2afmt(oss_priv->sampleformat);
 	tmp=oss_fmt;
 	if(ioctl(stream->fd, SNDCTL_DSP_SETFMT, &oss_fmt)<0)
 	    MSG_ERR("[s_oss] Can't set format %s (will use %s)\n",ao_format_name(tmp),ao_format_name(oss_fmt));

Modified: mplayerxp/postproc/af.cpp
===================================================================
--- mplayerxp/postproc/af.cpp	2012-11-18 12:30:09 UTC (rev 405)
+++ mplayerxp/postproc/af.cpp	2012-11-18 12:37:12 UTC (rev 406)
@@ -577,7 +577,7 @@
     af_instance_t* filt = s?s->first:NULL;
     const char *filt_name=filt?filt->info->name:"ao2";
     if(strcmp(filt_name,"ao2")==0) return RND_RENAME7(ao_control)(ao_data,AOCONTROL_QUERY_FORMAT,fmt);
-    else if(mpaf_format_decode(fmt)==filt->conf.format) return MPXP_True;
+    else if(afmt2mpaf(fmt)==filt->conf.format) return MPXP_True;
     return MPXP_False;
 }
 

Modified: mplayerxp/postproc/af_ao2.cpp
===================================================================
--- mplayerxp/postproc/af_ao2.cpp	2012-11-18 12:30:09 UTC (rev 405)
+++ mplayerxp/postproc/af_ao2.cpp	2012-11-18 12:37:12 UTC (rev 406)
@@ -117,7 +117,7 @@
     if(!arg) return MPXP_Error;
     s->rate = af->conf.rate = find_best_rate(arg->rate);
     s->nch = af->conf.nch  = find_best_ch(arg->nch);
-    s->format = af->conf.format = mpaf_format_decode(find_best_fmt(mpaf_format_encode(arg->format)));
+    s->format = af->conf.format = afmt2mpaf(find_best_fmt(mpaf2afmt(arg->format)));
     return af_test_output(af,arg);
 }
 

Modified: mplayerxp/postproc/af_ffenc.cpp
===================================================================
--- mplayerxp/postproc/af_ffenc.cpp	2012-11-18 12:30:09 UTC (rev 405)
+++ mplayerxp/postproc/af_ffenc.cpp	2012-11-18 12:37:12 UTC (rev 406)
@@ -109,7 +109,7 @@
     /* correct in format */
     af->conf.rate   = arg->rate;
     af->conf.nch    = arg->nch;
-    af->conf.format = mpaf_format_decode(find_atag(s->cname)<<16);
+    af->conf.format = afmt2mpaf(find_atag(s->cname)<<16);
     MSG_V("[af_ffenc] Was reinitialized, rate=%iHz, nch = %i, format = 0x%08X\n"
 	,af->conf.rate,af->conf.nch,af->conf.format);
     return MPXP_Ok;

Modified: mplayerxp/xmpcore/mp_aframe.cpp
===================================================================
--- mplayerxp/xmpcore/mp_aframe.cpp	2012-11-18 12:30:09 UTC (rev 405)
+++ mplayerxp/xmpcore/mp_aframe.cpp	2012-11-18 12:37:12 UTC (rev 406)
@@ -10,7 +10,7 @@
 enum { AFMT_AF_FLAGS=0x70000000 };
 
 /* Decodes the format from mplayer format to libaf format */
-mpaf_format_e __FASTCALL__ mpaf_format_decode(unsigned ifmt)
+mpaf_format_e __FASTCALL__ afmt2mpaf(unsigned ifmt)
 {
     mpaf_format_e ofmt = mpaf_format_e(0);
     // Check input ifmt
@@ -47,7 +47,7 @@
 }
 
 /* Encodes the format from libaf format to mplayer (OSS) format */
-unsigned __FASTCALL__ mpaf_format_encode(mpaf_format_e fmt)
+unsigned __FASTCALL__ mpaf2afmt(mpaf_format_e fmt)
 {
     switch(fmt&MPAF_SPECIAL_MASK) {
 	case 0: // PCM:

Modified: mplayerxp/xmpcore/mp_aframe.h
===================================================================
--- mplayerxp/xmpcore/mp_aframe.h	2012-11-18 12:30:09 UTC (rev 405)
+++ mplayerxp/xmpcore/mp_aframe.h	2012-11-18 12:37:12 UTC (rev 406)
@@ -56,8 +56,8 @@
 #endif
 
 /* Decodes the format from mplayer format to libaf format */
-extern mpaf_format_e __FASTCALL__ mpaf_format_decode(unsigned format);
-extern unsigned __FASTCALL__      mpaf_format_encode(mpaf_format_e fmt);
+extern mpaf_format_e __FASTCALL__ afmt2mpaf(unsigned format);
+extern unsigned __FASTCALL__      mpaf2afmt(mpaf_format_e fmt);
 extern char* __FASTCALL__         mpaf_fmt2str(mpaf_format_e format, char* str, size_t size);
 extern mpaf_format_e __FASTCALL__ mpaf_str2fmt(const char *str);
 

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