Adding SW volume control

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4860 b3059339-0415-0410-9bf9-f77b7e298cf2

cfg-mplayer.h

@@ -106,6 +106,7 @@ struct config ao_plugin_conf[]={
 	{"delay", &ao_plugin_cfg.pl_delay_len, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
 	{"format", &ao_plugin_cfg.pl_format_type, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
 	{"fout", &ao_plugin_cfg.pl_resample_fout, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
+	{"volume", &ao_plugin_cfg.pl_volume_volume, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
@@ -141,7 +142,7 @@ static config_t mplayer_opts[]={
 //	{"dsp", &dsp, CONF_TYPE_STRING, CONF_NOCFG, 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 was obsolete and has been removed\n" , CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"master", "Option -master has been removed, use -aop list=volume instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 2, 6, NULL},
 #ifdef HAVE_X11
 	{"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL},

libao2/Makefile

@@ -4,7 +4,7 @@ include config.mak
 LIBNAME = libao2.a
 
 # TODO: moveout ao_sdl.c so it's only used when SDL is detected
-SRCS=afmt.c audio_out.c ao_mpegpes.c ao_null.c ao_pcm.c ao_plugin.c pl_delay.c pl_format.c pl_surround.c remez.c pl_resample.c $(OPTIONAL_SRCS)
+SRCS=afmt.c audio_out.c ao_mpegpes.c ao_null.c ao_pcm.c ao_plugin.c pl_delay.c pl_format.c pl_surround.c remez.c pl_resample.c pl_volume.c $(OPTIONAL_SRCS)
 
 OBJS=$(SRCS:.c=.o)
 

libao2/ao_plugin.c

@@ -36,8 +36,8 @@ typedef struct ao_plugin_local_data_s
 static ao_plugin_local_data_t ao_plugin_local_data={NULL,0,0.0,NULL,NULL,AO_PLUGINS};
 
 // global data 
-volatile ao_plugin_data_t ao_plugin_data; // Data used by the plugins
-volatile ao_plugin_cfg_t  ao_plugin_cfg=CFG_DEFAULTS; // Set in cfg-mplayer.h
+ao_plugin_data_t ao_plugin_data;             // Data used by the plugins
+ao_plugin_cfg_t  ao_plugin_cfg=CFG_DEFAULTS; // Set in cfg-mplayer.h
 
 // to set/get/query special features/parameters
 static int control(int cmd,int arg){
@@ -45,6 +45,15 @@ static int control(int cmd,int arg){
   case AOCONTROL_SET_PLUGIN_DRIVER:
     ao_plugin_local_data.driver=(ao_functions_t*)arg;
     return CONTROL_OK;
+  case AOCONTROL_GET_VOLUME:
+  case AOCONTROL_SET_VOLUME:
+  {
+    int r=audio_plugin_volume.control(cmd,arg);
+    if(CONTROL_OK != r)
+      return driver()->control(cmd,arg);
+    else
+      return r;
+  }
   default:
     return driver()->control(cmd,arg);
   }

libao2/audio_plugin.h

@@ -35,27 +35,30 @@ typedef struct ao_plugin_cfg_s
   int pl_format_type;	// Output format
   int pl_delay_len;	// Number of samples to delay sound output
   int pl_resample_fout;	// Output frequency from resampling
+  int pl_volume_volume; // Initial volume setting
 } ao_plugin_cfg_t;
 
-extern volatile ao_plugin_cfg_t ao_plugin_cfg;
+extern ao_plugin_cfg_t ao_plugin_cfg;
 
 // Configuration defaults
 #define CFG_DEFAULTS { \
  NULL, \
  AFMT_S16_LE, \
  0, \
- 48000 \
+ 48000, \
+ 255 \
 };
 
 // This block should not be available in the pl_xxxx files
 // due to compilation issues
 #ifndef PLUGIN
-#define NPL 4+1 // Number of PLugins ( +1 list ends with NULL )
+#define NPL 5+1 // Number of PLugins ( +1 list ends with NULL )
 // List of plugins 
 extern ao_plugin_functions_t audio_plugin_delay;
 extern ao_plugin_functions_t audio_plugin_format; 
 extern ao_plugin_functions_t audio_plugin_surround;
 extern ao_plugin_functions_t audio_plugin_resample;
+extern ao_plugin_functions_t audio_plugin_volume;
 
 
 #define AO_PLUGINS { \
@@ -63,6 +66,7 @@ extern ao_plugin_functions_t audio_plugin_resample;
    &audio_plugin_format, \
    &audio_plugin_surround, \
    &audio_plugin_resample, \
+   &audio_plugin_volume, \
    NULL \
 }
 #endif /* PLUGIN */

libao2/pl_volume.c

@@ -0,0 +1,133 @@
+/* This audio output plugin changes the volume of the sound, and can
+   be used when the mixer doesn't support the PCM channel. The volume
+   is set in fixed steps between 0 - 2^8. */
+
+#define PLUGIN
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <inttypes.h>
+
+#include "audio_out.h"
+#include "audio_plugin.h"
+#include "audio_plugin_internal.h"
+#include "afmt.h"
+
+static ao_info_t info =
+{
+        "Volume control audio plugin",
+        "volume",
+        "Anders",
+        ""
+};
+
+LIBAO_PLUGIN_EXTERN(volume)
+
+// local data
+typedef struct pl_volume_s
+{
+  uint16_t volume;   	// output volume level
+  int      inuse;     	// This plugin is in use TRUE, FALSE
+  int      format;	// sample fomat
+} pl_volume_t;
+
+static pl_volume_t pl_volume={0,0,0};
+
+// to set/get/query special features/parameters
+static int control(int cmd,int arg){
+  switch(cmd){
+  case AOCONTROL_PLUGIN_SET_LEN:
+    return CONTROL_OK;
+  case AOCONTROL_GET_VOLUME:{
+    if(pl_volume.inuse){
+      ((ao_control_vol_t *)arg)->right=((float)pl_volume.volume)/2.55;
+      ((ao_control_vol_t *)arg)->left=((float)pl_volume.volume)/2.55;
+      return CONTROL_OK;
+    }
+    else
+      return CONTROL_ERROR;
+  }
+  case AOCONTROL_SET_VOLUME:{
+    if(pl_volume.inuse){
+      // Calculate avarage between left and right
+      float vol =2.55*((((ao_control_vol_t *)arg)->right)+(((ao_control_vol_t *)arg)->left))/2;
+      pl_volume.volume=(uint16_t)vol;
+      // Volume must be between 0 and 255
+      if(vol > 255)
+	pl_volume.volume = 0xFF;
+      if(vol < 0)
+	pl_volume.volume = 0;
+      return CONTROL_OK;
+    }
+    else
+      return CONTROL_ERROR;
+  }
+  }
+  return CONTROL_UNKNOWN;
+}
+
+// open & setup audio device
+// return: 1=success 0=fail
+static int init(){
+  // Sanity sheck this plugin supports AFMT_U8 and AFMT_S16_LE
+  switch(ao_plugin_data.format){
+  case(AFMT_U8):
+  case(AFMT_S16_LE):
+    break;
+  default: 
+    fprintf(stderr,"[pl_volume] Audio format not yet suported \n");
+    return 0;
+  }
+  // Initialize volume to this value
+  pl_volume.volume=ao_plugin_cfg.pl_volume_volume;
+  pl_volume.format=ao_plugin_data.format;
+  /* The inuse flag is used in control to detremine if the return
+  value since that function always is called from ao_plugin regardless
+  of wether this plugin is in use or not. */
+  pl_volume.inuse=1;
+  // Tell the world what we are up to
+  printf("[pl_volume] Software volume control in use.\n");
+  return 1;
+}
+
+// close plugin
+static void uninit(){
+  pl_volume.inuse=0;
+}
+
+// empty buffers
+static void reset(){
+}
+
+// processes 'ao_plugin_data.len' bytes of 'data'
+// called for every block of data
+static int play(){
+  register int i=0;
+  // Change the volume.
+  switch(pl_volume.format){
+  case(AFMT_U8):{
+    register uint8_t* data=(uint8_t*)ao_plugin_data.data;
+    for(i=0;i<ao_plugin_data.len;i++){
+      data[i]=(((data[i]-128) * pl_volume.volume) >> 8) + 128;
+    }
+    break;
+  }
+  case(AFMT_S16_LE):{
+    register int len=ao_plugin_data.len>>1;
+    register int16_t* data=(int16_t*)ao_plugin_data.data;
+    for(i=0;i<len;i++)
+      data[i]=(data[i]* pl_volume.volume)>>8;
+    break;
+  }
+  default: 
+    return 0;
+  }
+  return 1;
+
+}
+
+
+
+
+