[Mplayer-cvslog] CVS: main cfg-common.h,1.62,1.63 cfg-mplayer.h,1.170,1.171 mencoder.c,1.173,1.174 mplayer.c,1.587,1.588

[Anders Johansson]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv7136

Modified Files:
	cfg-common.h cfg-mplayer.h mencoder.c mplayer.c 
Log Message:
Adding -format and -af switches

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- cfg-common.h	5 Oct 2002 22:55:44 -0000	1.62
+++ cfg-common.h	6 Oct 2002 11:23:00 -0000	1.63
@@ -92,6 +92,7 @@
 	{"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL},
 	{"srate", &force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, NULL},
 	{"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 1, 6, NULL},
+	{"format", &audio_output_format, CONF_TYPE_INT, CONF_RANGE, 0, 0x00002000, NULL},
 
 // ------------------------- codec/vfilter options --------------------
 

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- cfg-mplayer.h	5 Oct 2002 23:00:18 -0000	1.170
+++ cfg-mplayer.h	6 Oct 2002 11:23:00 -0000	1.171
@@ -111,6 +111,14 @@
 /* from libvo/aspect.c */
 extern float monitor_aspect;
 
+#include "libaf/af.h"
+extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c
+struct config audio_filter_conf[]={       
+	{"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
+        {"force", &af_cfg.force, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
+	{NULL, NULL, 0, 0, 0, 0, NULL}
+};
+
 /* Options related to audio out plugins */
 struct config ao_plugin_conf[]={
 	{"list", &ao_plugin_cfg.plugin_list, CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -167,6 +175,7 @@
 	{"ao", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 
 	{"aop", ao_plugin_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+	{"af", audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 	{"dsp", "Use -ao oss:dsp_path!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
         {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"master", "Option -master has been removed, use -aop list=volume instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- mencoder.c	6 Oct 2002 10:49:41 -0000	1.173
+++ mencoder.c	6 Oct 2002 11:23:01 -0000	1.174
@@ -130,6 +130,7 @@
 static int skip_limit=-1;
 
 static int force_srate=0;
+static int audio_output_format=0;
 
 char *vobsub_out=NULL;
 unsigned int vobsub_out_index=0;
@@ -671,7 +672,7 @@
     } else {
 	mux_a->wf = malloc(sizeof(WAVEFORMATEX));
 	mux_a->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize;
-	mux_a->wf->wFormatTag = sh_audio->format;
+	mux_a->wf->wFormatTag = audio_output_format?audio_output_format:sh_audio->format;
 	mux_a->wf->nChannels = sh_audio->channels;
 	mux_a->wf->nSamplesPerSec = sh_audio->samplerate;
 	mux_a->wf->nAvgBytesPerSec=sh_audio->i_bps; //mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec;

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.587
retrieving revision 1.588
diff -u -r1.587 -r1.588
--- mplayer.c	5 Oct 2002 23:00:18 -0000	1.587
+++ mplayer.c	6 Oct 2002 11:23:01 -0000	1.588
@@ -212,6 +212,7 @@
 
 static float force_fps=0;
 static int force_srate=0;
+static int audio_output_format=0;
        int frame_dropping=0; // option  0=no drop  1= drop vo  2= drop decode
 static int play_n_frames=-1;
 static int play_n_frames_mf=-1;
@@ -1240,7 +1241,8 @@
       (ao_plugin_cfg.plugin_list), // plugin flag
       force_srate?force_srate:sh_audio->samplerate*playback_speed,
       audio_output_channels?audio_output_channels:
-      sh_audio->channels,sh_audio->sample_format,0))){
+      sh_audio->channels,audio_output_format?audio_output_format:
+      sh_audio->sample_format,0))){
     // FAILED:
     mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
     sh_audio=d_audio->sh=NULL; // -> nosound