comparison libaf/af.c @ 32272:fd4cd29b6121

Automatic downmix using the pan filter when the requested channel count is 2 and the codec does not support it natively. Patch by Cl���ment B���sch, ubitux gmail com

32271:563b35a003b8

#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "osdep/strsep.h"

#include "af.h"

// Static list of filters
extern const af_info_t af_info_dummy;

      return AF_ERROR;
    }
    return AF_OK;
}

/* Initialize the stream "s". This function creates a new filter list
   if necessary according to the values set in input and output. Input
   and output should contain the format of the current movie and the
   formate of the preferred output respectively. The function is
   reentrant i.e. if called with an already initialized stream the

  if(AF_INIT_AUTO == (AF_INIT_TYPE_MASK & s->cfg.force))
    s->cfg.force = (s->cfg.force & ~AF_INIT_TYPE_MASK) | AF_INIT_TYPE;

  // Check if this is the first call
  if(!s->first){
    // Add all filters in the list (if there are any)
    if (s->cfg.list) {
      while(s->cfg.list[i]){
	if(!af_append(s,s->last,s->cfg.list[i++]))
	  return -1;

32272:fd4cd29b6121

#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "osdep/strsep.h"
#include "libmpcodecs/dec_audio.h"

#include "af.h"

// Static list of filters
extern const af_info_t af_info_dummy;

      return AF_ERROR;
    }
    return AF_OK;
}

/**
 * Automatic downmix to stereo in case the codec does not implement it.
 */
static void af_downmix(af_stream_t* s)
{
    static const char * const downmix_strs[AF_NCH + 1] = {
        /*                FL       FR       RL       RR          FC          LF         AL      AR */
        [3] = "pan=2:" "0.6:0:" "0:0.6:"                     "0.4:0.4",
        [4] = "pan=2:" "0.6:0:" "0:0.6:" "0.4:0:"  "0:0.4",
        [5] = "pan=2:" "0.5:0:" "0:0.5:" "0.2:0:"  "0:0.2:"  "0.3:0.3",
        [6] = "pan=2:" "0.4:0:" "0:0.4:" "0.2:0:"  "0:0.2:"  "0.3:0.3:"   "0.1:0.1",
        [7] = "pan=2:" "0.4:0:" "0:0.4:" "0.2:0:"  "0:0.2:"  "0.3:0.3:"              "0.1:0:" "0:0.1",
        [8] = "pan=2:" "0.4:0:" "0:0.4:" "0.15:0:" "0:0.15:" "0.25:0.25:" "0.1:0.1:" "0.1:0:" "0:0.1",
    };
    const char *af_pan_str = downmix_strs[s->input.nch];

    if (af_pan_str)
        af_append(s, s->first, af_pan_str);
}

/* Initialize the stream "s". This function creates a new filter list
   if necessary according to the values set in input and output. Input
   and output should contain the format of the current movie and the
   formate of the preferred output respectively. The function is
   reentrant i.e. if called with an already initialized stream the

  if(AF_INIT_AUTO == (AF_INIT_TYPE_MASK & s->cfg.force))
    s->cfg.force = (s->cfg.force & ~AF_INIT_TYPE_MASK) | AF_INIT_TYPE;

  // Check if this is the first call
  if(!s->first){
    // Append a downmix pan filter at the beginning of the chain if needed
    if (s->input.nch != audio_output_channels && audio_output_channels == 2)
      af_downmix(s);
    // Add all filters in the list (if there are any)
    if (s->cfg.list) {
      while(s->cfg.list[i]){
	if(!af_append(s,s->last,s->cfg.list[i++]))
	  return -1;