comparison libao2/pl_volnorm.c @ 4943:511e8d8117e9

proper bsd fix & preventive fix for other archs w/o INT_MAX (INT_MAX is 0x7fffffff in the freebsd headers I have)

4942:acdff5b36ea9

#include "audio_out.h"
#include "audio_plugin.h"
#include "audio_plugin_internal.h"
#include "afmt.h"

#ifdef __FreeBSD__
#include "machine/limits.h"
#define INT16_MAX INT_MAX
#define INT16_MIN INT_MIN
#endif

static ao_info_t info = {
        "Volume normalizer",
        "volnorm",
        "pl <[e-mail]>",
        ""

// SMOOTH_* must be in ]0.0, 1.0[
// The new value accounts for SMOOTH_MUL in the value and history
#define SMOOTH_MUL 0.06
#define SMOOTH_LASTAVG 0.06

// ideal average level
#define MID_S16 (INT16_MAX * 0.25)

// silence level
#define SIL_S16 (INT16_MAX * 0.02)

// local data
static struct {
  int      inuse;     	// This plugin is in use TRUE, FALSE
  int      format;	// sample fomat

    }

    // Scale & clamp the samples
    for (i=0; i < len ; ++i) {
      tmp = data[i] * mul;
      CLAMP(tmp, INT16_MIN, INT16_MAX);
      data[i] = tmp;
    }

    // Evaluation of newavg (not 100% accurate because of values clamping)
    newavg = mul * curavg;

4943:511e8d8117e9

#include "audio_out.h"
#include "audio_plugin.h"
#include "audio_plugin_internal.h"
#include "afmt.h"

static ao_info_t info = {
        "Volume normalizer",
        "volnorm",
        "pl <[e-mail]>",
        ""

// SMOOTH_* must be in ]0.0, 1.0[
// The new value accounts for SMOOTH_MUL in the value and history
#define SMOOTH_MUL 0.06
#define SMOOTH_LASTAVG 0.06

// Some limits
#define MIN_S16 -32768
#define MAX_S16  32767

// ideal average level
#define MID_S16 (MAX_S16 * 0.25)

// silence level
#define SIL_S16 (MAX_S16 * 0.02)

// local data
static struct {
  int      inuse;     	// This plugin is in use TRUE, FALSE
  int      format;	// sample fomat

    }

    // Scale & clamp the samples
    for (i=0; i < len ; ++i) {
      tmp = data[i] * mul;
      CLAMP(tmp, MIN_S16, MAX_S16);
      data[i] = tmp;
    }

    // Evaluation of newavg (not 100% accurate because of values clamping)
    newavg = mul * curavg;