comparison libmpcodecs/ad_pcm.c @ 25315:dfa8a510c81c

Fix all current known multi-channel wrong order problems by adding common functions for channel reordering. This fixes these modules by adding channel reordering code for 5.0/5.1 audio: ao: pcm ad: dmo, faad, ffmpeg(ac3, dca, libfaad, liba52), pcm ae: faac, lavc(ac3, libfaac), pcm

25314:02e2e7a5599a

#include <unistd.h>

#include "config.h"
#include "ad_internal.h"
#include "libaf/af_format.h"

static ad_info_t info = 
{
	"Uncompressed PCM audio decoder",
	"pcm",

  if (len > maxlen)
      // if someone needs hundreds of channels adjust audio_out_minsize
      // based on channels in preinit()
      return -1;
  len=demux_read_data(sh_audio->ds,buf,len);
  return len;
}

25315:dfa8a510c81c

#include <unistd.h>

#include "config.h"
#include "ad_internal.h"
#include "libaf/af_format.h"
#include "libaf/reorder_ch.h"

static ad_info_t info = 
{
	"Uncompressed PCM audio decoder",
	"pcm",

  if (len > maxlen)
      // if someone needs hundreds of channels adjust audio_out_minsize
      // based on channels in preinit()
      return -1;
  len=demux_read_data(sh_audio->ds,buf,len);
  if (len > 0 && sh_audio->channels >= 5) {
    reorder_channel_nch(buf, AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT,
                        AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT,
                        sh_audio->channels,
                        len / sh_audio->samplesize, sh_audio->samplesize);
  }
  return len;
}