Ticket #1104: mythtv_ac3.30.patch

libs/libmyth/libmyth.pro

@@ -39 +39 @@
 SOURCES += volumebase.cpp volumecontrol.cpp virtualkeyboard.cpp xmlparse.cpp
 
 INCLUDEPATH += ../libmythsamplerate ../libmythsoundtouch ../.. ../
+INCLUDEPATH += ../libavutil
 DEPENDPATH += ../libmythsamplerate ../libmythsoundtouch ../ ../libmythui
 DEPENDPATH += ../libmythupnp
+DEPENDPATH += ../libavutil ../libavcodec
 
 LIBS += -L../libmythsamplerate -lmythsamplerate-$${LIBVERSION}
 LIBS += -L../libmythsoundtouch -lmythsoundtouch-$${LIBVERSION}
+LIBS += -L../libavcodec -lmythavcodec-$${LIBVERSION}
 
 isEmpty(QMAKE_EXTENSION_SHLIB) {
   QMAKE_EXTENSION_SHLIB=so
@@ -192 +195 @@
 use_hidesyms {
     QMAKE_CXXFLAGS += -fvisibility=hidden
 }
+
+contains( CONFIG_LIBA52, yes ) {
+    LIBS += -la52
+}

libs/libmyth/audiooutput.h

@@ -31 +31 @@
     virtual ~AudioOutput() { };
 
     // reconfigure sound out for new params
-    virtual void Reconfigure(int audio_bits, int audio_channels,
-                             int audio_samplerate, bool audio_passthru) = 0;
+    virtual void Reconfigure(int audio_bits, 
+                             int audio_channels, 
+                             int audio_samplerate,
+                             bool audio_passthru,
+                             void* audio_codec = NULL
+                             ) = 0;
     
     virtual void SetStretchFactor(float factor);
 
@@ -74 +78 @@
         lastError = msg;
         VERBOSE(VB_IMPORTANT, "AudioOutput Error: " + lastError);
     }
+    void ClearError()
+     { lastError = QString::null; };
 
     void Warn(QString msg)
     {

libs/libmyth/audiooutputdx.h

@@ -35 +35 @@
     /// END HACK HACK HACK HACK
         
     virtual void Reset(void);
-    virtual void Reconfigure(int audio_bits,       int audio_channels,
-                             int audio_samplerate, int audio_passthru);
+    virtual void Reconfigure(int audio_bits, 
+                         int audio_channels, 
+                         int audio_samplerate,
+                         bool audio_passthru,
+                         AudioCodecMode aom = AUDIOCODECMODE_NORMAL);
     virtual void SetBlocking(bool blocking);
 
     virtual bool AddSamples(char *buffer, int samples, long long timecode);

libs/libmyth/audiooutputdx.cpp

@@ -130 +130 @@
     // FIXME: kedl: not sure what else could be required here?
 }
 
-void AudioOutputDX::Reconfigure(int audio_bits, int audio_channels,
-                                int audio_samplerate, int audio_passthru)
+void AudioOutputDX::Reconfigure(int audio_bits, 
+                                int audio_channels, 
+                                int audio_samplerate,
+                                int audio_passthru,
+                                AudioCodecMode laom
+                                )
 {
     if (dsbuffer)
         DestroyDSBuffer();

libs/libmyth/audiooutputbase.h

@@ -18 +18 @@
 #include "samplerate.h"
 #include "SoundTouch.h"
 
-#define AUDBUFSIZE 768000
+struct AVCodecContext;
+class DigitalEncoder;
 #define AUDIO_SRC_IN_SIZE   16384
 #define AUDIO_SRC_OUT_SIZE (16384*6)
 #define AUDIO_TMP_BUF_SIZE (16384*6)
 
+//#define AUDBUFSIZE 768000
+//divisible by 12,10,8,6,4,2 and around 1024000
+//#define AUDBUFSIZE 1024080
+#define AUDBUFSIZE 1536000
+
 class AudioOutputBase : public AudioOutput
 {
  public:
@@ -35 +41 @@
     virtual ~AudioOutputBase();
 
     // reconfigure sound out for new params
-    virtual void Reconfigure(int audio_bits, int audio_channels,
-                             int audio_samplerate, bool audio_passthru);
+    virtual void Reconfigure(int audio_bits, 
+                             int audio_channels, 
+                             int audio_samplerate,
+                             bool audio_passthru,
+                             void* audio_codec = NULL);
     
     // do AddSamples calls block?
     virtual void SetBlocking(bool blocking);
@@ -125 +134 @@
     bool audio_passthru;
 
     float audio_stretchfactor;
+    AVCodecContext *audio_codec;
     AudioOutputSource source;
 
     bool killaudio;
@@ -133 +143 @@
     bool set_initial_vol;
     bool buffer_output_data_for_use; //  used by AudioOutputNULL
     
+    int configured_audio_channels;
+
  private:
     // resampler
     bool need_resampler;
@@ -144 +156 @@
 
     // timestretch
     soundtouch::SoundTouch * pSoundStretch;
+    DigitalEncoder * encoder;
 
     bool blocking; // do AddSamples calls block?
 
@@ -160 +173 @@
 
     pthread_mutex_t avsync_lock; /* must hold avsync_lock to read or write
                                     'audiotime' and 'audiotime_updated' */
-    int audiotime; // timecode of audio leaving the soundcard (same units as
+    long long audiotime; // timecode of audio leaving the soundcard (same units as
                    //                                          timecodes) ...
     struct timeval audiotime_updated; // ... which was last updated at this time
 
     /* Audio circular buffer */
     unsigned char audiobuffer[AUDBUFSIZE];  /* buffer */
     int raud, waud;     /* read and write positions */
-    int audbuf_timecode;    /* timecode of audio most recently placed into
+    long long audbuf_timecode;    /* timecode of audio most recently placed into
                    buffer */
 
     int numlowbuffer;

libs/libmyth/audiooutputbase.cpp

@@ -14 +14 @@
 #include <qdeepcopy.h>
 
 // MythTV headers
+#include "config.h"
 #include "audiooutputbase.h"
 
+extern "C" {
+#include "libavcodec/avcodec.h"
+#ifdef ENABLE_AC3_DECODER
+#include "libavcodec/parser.h"
+#else
+//#include "libavcodec/liba52/a52.h"
+#include <a52dec/a52.h>
+#endif
+}
+
+#if QT_VERSION < 0x030200
+#define LONGLONGCONVERT (long)
+#else
+#define LONGLONGCONVERT
+#endif
+
+#define LOC QString("DEnc: ");
+#define MAX_AC3_FRAME_SIZE 6144
+class DigitalEncoder
+{
+public:
+    DigitalEncoder();
+    ~DigitalEncoder();
+    void Dispose();
+    bool Init(CodecID codec_id, int bitrate, int samplerate, int channels);
+    size_t Encode(short * buff);
+
+    // if needed
+    char * GetFrameBuffer() 
+    { 
+        if (!frame_buffer && av_context)
+        {
+            frame_buffer = new char [one_frame_bytes];
+        }
+        return frame_buffer; 
+    }    
+    size_t FrameSize() const { return one_frame_bytes; }
+    char * GetOutBuff() const { return outbuf; }
+
+    size_t audio_bytes_per_sample;
+private:
+    AVCodecContext *av_context;
+    char * outbuf;
+    char * frame_buffer;
+    int outbuf_size;
+    size_t one_frame_bytes;
+};
+
+DigitalEncoder::DigitalEncoder()
+{
+    av_context = NULL;
+    outbuf = NULL;
+    outbuf_size = 0;
+    one_frame_bytes = 0;
+    frame_buffer = NULL;
+}
+
+DigitalEncoder::~DigitalEncoder()
+{
+    Dispose();
+}
+
+void DigitalEncoder::Dispose()
+{
+    if (av_context)
+    {
+        avcodec_close(av_context);
+        av_free(av_context);
+        av_context = NULL;
+    }
+    if (outbuf)
+    {
+        delete [] outbuf;
+        outbuf = NULL;
+        outbuf_size = 0;
+    }
+    if (frame_buffer)
+    {
+        delete [] frame_buffer;
+        frame_buffer = NULL;
+        one_frame_bytes = 0;
+    }
+}
+
+//CODEC_ID_AC3
+bool DigitalEncoder::Init(CodecID codec_id, int bitrate, int samplerate, int channels)
+{
+    AVCodec * codec;
+    int ret;
+
+    VERBOSE(VB_AUDIO, QString("DigitalEncoder::Init codecid=%1, br=%2, sr=%3, ch=%4")
+            .arg(codec_id_string(codec_id))
+            .arg(bitrate)
+            .arg(samplerate)
+            .arg(channels));
+    //codec = avcodec_find_encoder(codec_id);
+    // always AC3 as there is no DTS encoder at the moment 2005/1/9
+    codec = avcodec_find_encoder(CODEC_ID_AC3);
+    if (!codec)
+    {
+        VERBOSE(VB_IMPORTANT,"Error: could not find codec");
+        return false;
+    }
+    av_context = avcodec_alloc_context();
+    av_context->bit_rate = bitrate;
+    av_context->sample_rate = samplerate;
+    av_context->channels = channels;
+    // open it */
+    if ((ret = avcodec_open(av_context, codec)) < 0) 
+    {
+        VERBOSE(VB_IMPORTANT,"Error: could not open codec, invalid bitrate or samplerate");
+        Dispose();
+        return false;
+    }
+
+    size_t bytes_per_frame = av_context->channels * sizeof(short);
+    audio_bytes_per_sample = bytes_per_frame;
+    one_frame_bytes = bytes_per_frame * av_context->frame_size;
+
+    outbuf_size = 16384;    // ok for AC3 but DTS?
+    outbuf = new char [outbuf_size];
+    VERBOSE(VB_AUDIO, QString("DigitalEncoder::Init fs=%1, bpf=%2 ofb=%3")
+            .arg(av_context->frame_size)
+            .arg(bytes_per_frame)
+            .arg(one_frame_bytes)
+           );
+
+    return true;
+}
+
+static int DTS_SAMPLEFREQS[16] =
+{
+    0,      8000,   16000,  32000,  64000,  128000, 11025,  22050,
+    44100,  88200,  176400, 12000,  24000,  48000,  96000,  192000
+};
+
+static int DTS_BITRATES[30] =
+{
+    32000,    56000,    64000,    96000,    112000,   128000,
+    192000,   224000,   256000,   320000,   384000,   448000,
+    512000,   576000,   640000,   768000,   896000,   1024000,
+    1152000,  1280000,  1344000,  1408000,  1411200,  1472000,
+    1536000,  1920000,  2048000,  3072000,  3840000,  4096000
+};
+
+static int dts_decode_header(uint8_t *indata_ptr, int *rate,
+                             int *nblks, int *sfreq)
+{
+    uint id = ((indata_ptr[0] << 24) | (indata_ptr[1] << 16) |
+               (indata_ptr[2] << 8)  | (indata_ptr[3]));
+
+    if (id != 0x7ffe8001)
+        return -1;
+
+    int ftype = indata_ptr[4] >> 7;
+
+    int surp = (indata_ptr[4] >> 2) & 0x1f;
+    surp = (surp + 1) % 32;
+
+    *nblks = (indata_ptr[4] & 0x01) << 6 | (indata_ptr[5] >> 2);
+    ++*nblks;
+
+    int fsize = (indata_ptr[5] & 0x03) << 12 |
+                (indata_ptr[6]         << 4) | (indata_ptr[7] >> 4);
+    ++fsize;
+
+    *sfreq = (indata_ptr[8] >> 2) & 0x0f;
+    *rate = (indata_ptr[8] & 0x03) << 3 | ((indata_ptr[9] >> 5) & 0x07);
+
+    if (ftype != 1)
+    {
+        VERBOSE(VB_IMPORTANT, LOC +
+                QString("DTS: Termination frames not handled (ftype %1)")
+                .arg(ftype));
+        return -1;
+    }
+
+    if (*sfreq != 13)
+    {
+        VERBOSE(VB_IMPORTANT, LOC +
+                QString("DTS: Only 48kHz supported (sfreq %1)").arg(*sfreq));
+        return -1;
+    }
+
+    if ((fsize > 8192) || (fsize < 96))
+    {
+        VERBOSE(VB_IMPORTANT, LOC +
+                QString("DTS: fsize: %1 invalid").arg(fsize));
+        return -1;
+    }
+
+    if (*nblks != 8 && *nblks != 16 && *nblks != 32 &&
+        *nblks != 64 && *nblks != 128 && ftype == 1)
+    {
+        VERBOSE(VB_IMPORTANT, LOC +
+                QString("DTS: nblks %1 not valid for normal frame")
+                .arg(*nblks));
+        return -1;
+    }
+
+    return fsize;
+}
+
+static int dts_syncinfo(uint8_t *indata_ptr, int * /*flags*/,
+                        int *sample_rate, int *bit_rate)
+{
+    int nblks;
+    int rate;
+    int sfreq;
+
+    int fsize = dts_decode_header(indata_ptr, &rate, &nblks, &sfreq);
+    if (fsize >= 0)
+    {
+        if (rate >= 0 && rate <= 29)
+            *bit_rate = DTS_BITRATES[rate];
+        else
+            *bit_rate = 0;
+        if (sfreq >= 1 && sfreq <= 15)
+            *sample_rate = DTS_SAMPLEFREQS[sfreq];
+        else
+            *sample_rate = 0;
+    }
+    return fsize;
+}
+
+// until there is an easy way to do this with ffmpeg
+// get the code from libavcodec/parser.c made non static
+extern "C" int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate,
+                            int *bit_rate, int *samples);
+
+static int encode_frame(
+        bool dts, 
+        unsigned char *data,
+        size_t &len)
+{
+    size_t enc_len;
+    int flags, sample_rate, bit_rate;
+
+    // we don't do any length/crc validation of the AC3 frame here; presumably
+    // the receiver will have enough sense to do that.  if someone has a
+    // receiver that doesn't, here would be a good place to put in a call
+    // to a52_crc16_block(samples+2, data_size-2) - but what do we do if the
+    // packet is bad?  we'd need to send something that the receiver would
+    // ignore, and if so, may as well just assume that it will ignore
+    // anything with a bad CRC...
+
+    uint nr_samples = 0, block_len;
+    if (dts)
+    {
+        enc_len = dts_syncinfo(data+8, &flags, &sample_rate, &bit_rate);
+        int rate, sfreq, nblks;
+        dts_decode_header(data+8, &rate, &nblks, &sfreq);
+        nr_samples = nblks * 32;
+        block_len = nr_samples * 2 * 2;
+    }
+    else
+    {
+#ifdef ENABLE_AC3_DECODER
+        enc_len = ac3_sync(data+8, &flags, &sample_rate, &bit_rate, (int*)&block_len);
+#else
+        enc_len = a52_syncinfo(data+8, &flags, &sample_rate, &bit_rate);
+        block_len = MAX_AC3_FRAME_SIZE;
+#endif
+    }
+
+    if (enc_len == 0 || enc_len > len)
+    {
+        int l = len;
+        len = 0;
+        return l;
+    }
+
+    enc_len = min((uint)enc_len, block_len - 8);
+
+    //uint32_t x = *(uint32_t*)(data+8);
+    // in place swab
+    swab(data+8, data+8, enc_len);
+    //VERBOSE(VB_AUDIO|VB_TIMESTAMP, 
+    //        QString("DigitalEncoder::Encode swab test %1 %2")
+    //        .arg(x,0,16).arg(*(uint32_t*)(data+8),0,16));
+
+    // the following values come from libmpcodecs/ad_hwac3.c in mplayer.
+    // they form a valid IEC958 AC3 header.
+    data[0] = 0x72;
+    data[1] = 0xF8;
+    data[2] = 0x1F;
+    data[3] = 0x4E;
+    data[4] = 0x01;
+    if (dts)
+    {
+        switch(nr_samples)
+        {
+            case 512:
+                data[4] = 0x0B;      /* DTS-1 (512-sample bursts) */
+                break;
+
+            case 1024:
+                data[4] = 0x0C;      /* DTS-2 (1024-sample bursts) */
+                break;
+
+            case 2048:
+                data[4] = 0x0D;      /* DTS-3 (2048-sample bursts) */
+                break;
+
+            default:
+                VERBOSE(VB_IMPORTANT, LOC +
+                        QString("DTS: %1-sample bursts not supported")
+                        .arg(nr_samples));
+                data[4] = 0x00;
+                break;
+        }
+    }
+    data[5] = 0x00;
+    data[6] = (enc_len << 3) & 0xFF;
+    data[7] = (enc_len >> 5) & 0xFF;
+    memset(data + 8 + enc_len, 0, block_len - 8 - enc_len);
+    len = block_len;
+
+    return enc_len;
+}
+
+// must have exactly 1 frames worth of data
+size_t DigitalEncoder::Encode(short * buff)
+{
+    int encsize = 0;
+    size_t outsize = 0;
+ 
+    // put data in the correct spot for encode frame
+    outsize = avcodec_encode_audio(
+                av_context, 
+                ((uchar*)outbuf)+8, 
+                outbuf_size-8, 
+                buff);
+    size_t tmpsize = outsize;
+
+    outsize = MAX_AC3_FRAME_SIZE;
+    encsize = encode_frame(
+            //av_context->codec_id==CODEC_ID_DTS,
+            false,
+            (unsigned char*)outbuf, outsize);
+    VERBOSE(VB_AUDIO|VB_TIMESTAMP, 
+            QString("DigitalEncoder::Encode len1=%1 len2=%2 finallen=%3")
+                .arg(tmpsize)
+                .arg(encsize)
+                .arg(outsize)
+           );
+
+    return outsize;
+}
+#undef LOC
 #define LOC QString("AO: ")
 #define LOC_ERR QString("AO, ERROR: ")
 
@@ -24 +375 @@
     int     /*laudio_bits*/,       int               /*laudio_channels*/,
     int     /*laudio_samplerate*/, AudioOutputSource lsource,
     bool    lset_initial_vol,      bool              /*laudio_passthru*/) :
-
     effdsp(0),                  effdspstretched(0),
     audio_channels(-1),         audio_bytes_per_sample(0),
     audio_bits(-1),             audio_samplerate(-1),
@@ -35 +385 @@
     audio_passthru_device(QDeepCopy<QString>(laudio_passthru_device)),
     audio_passthru(false),      audio_stretchfactor(1.0f),
 
+    audio_codec(NULL),
     source(lsource),            killaudio(false),
 
     pauseaudio(false),          audio_actually_paused(false),
@@ -46 +397 @@
 
     src_ctx(NULL),
 
-    pSoundStretch(NULL),        blocking(false),
+    pSoundStretch(NULL),        
+    encoder(NULL),
+    blocking(false),
 
     lastaudiolen(0),            samples_buffered(0),
     audiotime(0),
@@ -61 +414 @@
     pthread_cond_init(&audio_bufsig, NULL);
 
     output_audio = 0; // TODO FIXME Not POSIX compatible!
+    configured_audio_channels = gContext->GetNumSetting("MaxChannels", 2);
 
     bzero(&src_data,          sizeof(SRC_DATA));
     bzero(src_in,             sizeof(float) * AUDIO_SRC_IN_SIZE);
@@ -108 +462 @@
             VERBOSE(VB_GENERAL, LOC + QString("Using time stretch %1")
                                         .arg(audio_stretchfactor));
             pSoundStretch = new soundtouch::SoundTouch();
-            pSoundStretch->setSampleRate(audio_samplerate);
-            pSoundStretch->setChannels(audio_channels);
+            if (audio_codec)
+            {
+                if (!encoder)
+                {
+                    VERBOSE(VB_AUDIO, LOC + QString("Creating Encoder for codec %1 origfs %2").arg(audio_codec->codec_id).arg(audio_codec->frame_size));
+                    encoder = new DigitalEncoder();
+                    if (!encoder->Init(audio_codec->codec_id,
+                                audio_codec->bit_rate,
+                                audio_codec->sample_rate,
+                                audio_codec->channels
+                                ))
+                    {
+                        // eeks
+                        delete encoder;
+                        encoder = NULL;
+                        VERBOSE(VB_AUDIO, LOC + QString("Failed to Create Encoder"));
+                    }
+                }
+            }
+            if (encoder)
+            {
+                pSoundStretch->setSampleRate(audio_codec->sample_rate);
+                pSoundStretch->setChannels(audio_codec->channels);
+            }
+            else
+            {
+                pSoundStretch->setSampleRate(audio_samplerate);
+                pSoundStretch->setChannels(audio_channels);
+            }
 
             pSoundStretch->setTempo(audio_stretchfactor);
             pSoundStretch->setSetting(SETTING_SEQUENCE_MS, 35);
@@ -132 +513 @@
 }
 
 void AudioOutputBase::Reconfigure(int laudio_bits, int laudio_channels, 
-                                 int laudio_samplerate, bool laudio_passthru)
+                                 int laudio_samplerate, bool laudio_passthru,
+                                 void* laudio_codec)
 {
+    int codec_id = CODEC_ID_NONE;
+    int lcodec_id = CODEC_ID_NONE;
+    int lcchannels = 0;
+    int cchannels = 0;
+    if (laudio_codec)
+    {
+        lcodec_id = ((AVCodecContext*)laudio_codec)->codec_id;
+        laudio_bits = 16;
+        laudio_channels = 2;
+        laudio_samplerate = 48000;
+        lcchannels = ((AVCodecContext*)laudio_codec)->channels;
+    }
+    if (audio_codec)
+    {
+        codec_id = audio_codec->codec_id;
+        cchannels = ((AVCodecContext*)audio_codec)->channels;
+    }
+    ClearError();
     if (laudio_bits == audio_bits && laudio_channels == audio_channels &&
-        laudio_samplerate == audio_samplerate &&
-        laudio_passthru == audio_passthru && !need_resampler)
+        laudio_samplerate == audio_samplerate && !need_resampler &&
+        laudio_passthru == audio_passthru &&
+        lcodec_id == codec_id && lcchannels == cchannels)
         return;
 
     KillAudio();
@@ -148 +549 @@
     waud = raud = 0;
     audio_actually_paused = false;
     
+    bool redo_stretch = (pSoundStretch && audio_channels != laudio_channels);
     audio_channels = laudio_channels;
     audio_bits = laudio_bits;
     audio_samplerate = laudio_samplerate;
+    audio_codec = (AVCodecContext*)laudio_codec;
     audio_passthru = laudio_passthru;
     if (audio_bits != 8 && audio_bits != 16)
     {
@@ -169 +572 @@
     
     numlowbuffer = 0;
 
+    VERBOSE(VB_GENERAL, QString("Opening audio device '%1'. ch %2 sr %3")
+            .arg(audio_main_device).arg(audio_channels).arg(audio_samplerate));
+    
     // Actually do the device specific open call
     if (!OpenDevice())
     {
         VERBOSE(VB_AUDIO, LOC_ERR + "Aborting reconfigure");
         pthread_mutex_unlock(&avsync_lock);
         pthread_mutex_unlock(&audio_buflock);
+        if (GetError().isEmpty())
+            Error("Aborting reconfigure");
+        VERBOSE(VB_AUDIO, "Aborting reconfigure");
         return;
     }
 
@@ -197 +606 @@
     current_seconds = -1;
     source_bitrate = -1;
 
+    // NOTE: this wont do anything as above samplerate vars are set equal
     // Check if we need the resampler
     if (audio_samplerate != laudio_samplerate)
     {
@@ -221 +631 @@
 
     VERBOSE(VB_AUDIO, LOC + QString("Audio Stretch Factor: %1")
             .arg(audio_stretchfactor));
+    VERBOSE(VB_AUDIO, QString("Audio Codec Used: %1")
+            .arg(audio_codec?codec_id_string(audio_codec->codec_id):"not set"));
 
-    SetStretchFactorLocked(audio_stretchfactor);
-    if (pSoundStretch)
+    if (redo_stretch)
     {
-        pSoundStretch->setSampleRate(audio_samplerate);
-        pSoundStretch->setChannels(audio_channels);
+        float laudio_stretchfactor = audio_stretchfactor;
+        delete pSoundStretch;
+        pSoundStretch = NULL;
+        audio_stretchfactor = 0.0;
+        SetStretchFactorLocked(laudio_stretchfactor);
     }
+    else
+    {
+        SetStretchFactorLocked(audio_stretchfactor);
+        if (pSoundStretch)
+        {
+            // if its passthru then we need to reencode
+            if (audio_codec)
+            {
+                if (!encoder)
+                {
+                    VERBOSE(VB_AUDIO, LOC + QString("Creating Encoder for codec %1").arg(audio_codec->codec_id));
+                    encoder = new DigitalEncoder();
+                    if (!encoder->Init(audio_codec->codec_id,
+                                audio_codec->bit_rate,
+                                audio_codec->sample_rate,
+                                audio_codec->channels
+                                ))
+                    {
+                        // eeks
+                        delete encoder;
+                        encoder = NULL;
+                        VERBOSE(VB_AUDIO, LOC + QString("Failed to Create Encoder"));
+                    }
+                }
+            }
+            if (encoder)
+            {
+                pSoundStretch->setSampleRate(audio_codec->sample_rate);
+                pSoundStretch->setChannels(audio_codec->channels);
+            }
+            else
+            {
+                pSoundStretch->setSampleRate(audio_samplerate);
+                pSoundStretch->setChannels(audio_channels);
+            }
+        }
+    }
 
     // Setup visualisations, zero the visualisations buffers
     prepareVisuals();
@@ -273 +724 @@
         pSoundStretch = NULL;
     }
 
+    if (encoder)
+    {
+        delete encoder;
+        encoder = NULL;
+    }
+
     CloseDevice();
 
     killAudioLock.unlock();
@@ -286 +743 @@
 
 void AudioOutputBase::Pause(bool paused)
 {
+    VERBOSE(VB_AUDIO, LOC+ QString("Pause %0").arg(paused));
     pauseaudio = paused;
     audio_actually_paused = false;
 }
@@ -368 +826 @@
        The reason is that computing 'audiotime' requires acquiring the audio 
        lock, which the video thread should not do. So, we call 'SetAudioTime()'
        from the audio thread, and then call this from the video thread. */
-    int ret;
+    long long ret;
     struct timeval now;
 
     if (audiotime == 0)
@@ -380 +838 @@
 
     ret = (now.tv_sec - audiotime_updated.tv_sec) * 1000;
     ret += (now.tv_usec - audiotime_updated.tv_usec) / 1000;
-    ret = (int)(ret * audio_stretchfactor);
+    ret = (long long)(ret * audio_stretchfactor);
 
+#if 1
+    VERBOSE(VB_AUDIO|VB_TIMESTAMP, 
+            QString("GetAudiotime now=%1.%2, set=%3.%4, ret=%5, audt=%6 sf=%7")
+            .arg(now.tv_sec).arg(now.tv_usec)
+            .arg(audiotime_updated.tv_sec).arg(audiotime_updated.tv_usec)
+            .arg(ret)
+            .arg(audiotime)
+            .arg(audio_stretchfactor)
+           );
+#endif
+
     ret += audiotime;
 
     pthread_mutex_unlock(&avsync_lock);
-    return ret;
+    return (int)ret;
 }
 
 void AudioOutputBase::SetAudiotime(void)
@@ -422 +891 @@
     // include algorithmic latencies
     if (pSoundStretch)
     {
+        // add the effect of any unused but processed samples, AC3 reencode does this
+        totalbuffer += (int)(pSoundStretch->numSamples() * audio_bytes_per_sample);
         // add the effect of unprocessed samples in time stretch algo
         totalbuffer += (int)((pSoundStretch->numUnprocessedSamples() *
                               audio_bytes_per_sample) / audio_stretchfactor);
     }
-               
+
     audiotime = audbuf_timecode - (int)(totalbuffer * 100000.0 /
                                    (audio_bytes_per_sample * effdspstretched));
  
     gettimeofday(&audiotime_updated, NULL);
+#if 1
+    VERBOSE(VB_AUDIO|VB_TIMESTAMP, 
+            QString("SetAudiotime set=%1.%2, audt=%3 atc=%4 tb=%5 sb=%6 eds=%7 abps=%8 sf=%9")
+            .arg(audiotime_updated.tv_sec).arg(audiotime_updated.tv_usec)
+            .arg(audiotime)
+            .arg(audbuf_timecode)
+            .arg(totalbuffer)
+            .arg(soundcard_buffer)
+            .arg(effdspstretched)
+            .arg(audio_bytes_per_sample)
+            .arg(audio_stretchfactor)
+           );
+#endif
 
     pthread_mutex_unlock(&avsync_lock);
     pthread_mutex_unlock(&audio_buflock);
@@ -498 +982 @@
     // NOTE: This function is not threadsafe
 
     int afree = audiofree(true);
-    int len = samples * audio_bytes_per_sample;
+    int len = samples * (encoder?encoder->audio_bytes_per_sample:audio_bytes_per_sample);
 
     // Check we have enough space to write the data
     if (need_resampler && src_ctx)
@@ -509 +993 @@
         VERBOSE(VB_AUDIO|VB_TIMESTAMP, LOC + QString(
                 "AddSamples FAILED bytes=%1, used=%2, free=%3, timecode=%4") 
                 .arg(len).arg(AUDBUFSIZE-afree).arg(afree)
-                .arg(timecode)); 
-
+                .arg(LONGLONGCONVERT timecode)); 
         return false; // would overflow
     }
 
@@ -547 +1030 @@
 
 int AudioOutputBase::WaitForFreeSpace(int samples)
 {
-    int len = samples * audio_bytes_per_sample;
+    int abps = encoder?encoder->audio_bytes_per_sample:audio_bytes_per_sample;
+    int len = samples * abps;
     int afree = audiofree(false);
 
     while (len > afree)
     {
         if (blocking)
         {
-            VERBOSE(VB_AUDIO, LOC + "Waiting for free space");
+            VERBOSE(VB_AUDIO|VB_TIMESTAMP, LOC + "Waiting for free space");
             // wait for more space
             pthread_cond_wait(&audio_bufsig, &audio_buflock);
             afree = audiofree(false);
         }
         else
         {
-            VERBOSE(VB_IMPORTANT, LOC_ERR +
-                    "Audio buffer overflow, audio data lost!");
-            samples = afree / audio_bytes_per_sample;
-            len = samples * audio_bytes_per_sample;
+            VERBOSE(VB_IMPORTANT, LOC_ERR + 
+                    QString("Audio buffer overflow, %1 audio samples lost!")
+                        .arg(samples-afree / abps));
+            samples = afree / abps;
+            len = samples * abps;
             if (src_ctx) 
             {
                 int error = src_reset(src_ctx);
@@ -589 +1074 @@
     
     int afree = audiofree(false);
 
-    VERBOSE(VB_AUDIO|VB_TIMESTAMP,
-            LOC + QString("_AddSamples bytes=%1, used=%2, free=%3, timecode=%4")
-            .arg(samples * audio_bytes_per_sample)
-            .arg(AUDBUFSIZE-afree).arg(afree).arg((long)timecode));
+    int abps = encoder?encoder->audio_bytes_per_sample:audio_bytes_per_sample;
+    VERBOSE(VB_AUDIO|VB_TIMESTAMP, 
+            LOC + QString("_AddSamples samples=%1 bytes=%2, used=%3, free=%4, timecode=%5")
+            .arg(samples)
+            .arg(samples * abps)
+            .arg(AUDBUFSIZE-afree).arg(afree).arg(LONGLONGCONVERT timecode));
     
     len = WaitForFreeSpace(samples);
 
     if (interleaved) 
     {
         char *mybuf = (char*)buffer;
+#if 0
+#ifdef ENABLE_AC3_DECODER
+        if (audio_channels == 6)
+        {
+            // reorder samples from L:C:R:LL:LR:LFE to L:R:LL:LR:C:LFE
+            int i;
+            short * p = (short*)buffer;
+            for(i=0;i<samples;i++,p+=6)
+            {
+                short x = p[1];
+                p[1] = p[2];
+                p[2] = p[3];
+                p[3] = p[4];
+                p[4] = x;
+            }
+        }
+#endif
+#endif
         int bdiff = AUDBUFSIZE - org_waud;
         if (bdiff < len)
         {
@@ -629 +1134 @@
 
     if (pSoundStretch)
     {
+
         // does not change the timecode, only the number of samples
         // back to orig pos
         org_waud = waud;
         int bdiff = AUDBUFSIZE - org_waud;
-        int nSamplesToEnd = bdiff/audio_bytes_per_sample;
+        int nSamplesToEnd = bdiff/abps;
         if (bdiff < len)
         {
             pSoundStretch->putSamples((soundtouch::SAMPLETYPE*)(audiobuffer + 
                                       org_waud), nSamplesToEnd);
             pSoundStretch->putSamples((soundtouch::SAMPLETYPE*)audiobuffer,
-                                      (len - bdiff) / audio_bytes_per_sample);
+                                      (len - bdiff) / abps);
         }
         else
         {
             pSoundStretch->putSamples((soundtouch::SAMPLETYPE*)(audiobuffer + 
-                                      org_waud), len / audio_bytes_per_sample);
+                                      org_waud), len / abps);
         }
 
-        int newLen = 0;
-        int nSamples;
-        len = WaitForFreeSpace(pSoundStretch->numSamples() * 
-                               audio_bytes_per_sample);
-        do 
+        if (encoder)
         {
-            int samplesToGet = len/audio_bytes_per_sample;
-            if (samplesToGet > nSamplesToEnd)
+            // pull out a packet's worth and reencode it until we dont have enough
+            // for any more packets
+            soundtouch::SAMPLETYPE* temp_buff = 
+                (soundtouch::SAMPLETYPE*)encoder->GetFrameBuffer();
+            size_t frameSize = encoder->FrameSize()/abps;
+            VERBOSE(VB_AUDIO|VB_TIMESTAMP,
+                    QString("_AddSamples Enc sfs=%1 bfs=%2 sss=%3")
+                    .arg(frameSize)
+                    .arg(encoder->FrameSize())
+                    .arg(pSoundStretch->numSamples())
+                   );
+            // process the same number of samples as it creates a full encoded buffer
+            // just like before
+            while (pSoundStretch->numSamples() >= frameSize)
             {
-                samplesToGet = nSamplesToEnd;    
+                int got = pSoundStretch->receiveSamples(temp_buff, frameSize);
+                int amount = encoder->Encode(temp_buff);
+                VERBOSE(VB_AUDIO|VB_TIMESTAMP, 
+                        QString("_AddSamples Enc bytes=%1 got=%2 left=%3")
+                        .arg(amount)
+                        .arg(got)
+                        .arg(pSoundStretch->numSamples())
+                       );
+                if (amount == 0)
+                    continue;
+                //len = WaitForFreeSpace(amount);
+                char * ob = encoder->GetOutBuff();
+                if (amount >= bdiff)
+                {
+                    memcpy(audiobuffer + org_waud, ob, bdiff);
+                    ob += bdiff;
+                    amount -= bdiff;
+                    org_waud = 0;
+                }
+                if (amount > 0)
+                    memcpy(audiobuffer + org_waud, ob, amount);
+                bdiff = AUDBUFSIZE - amount;
+                org_waud += amount;
             }
-
-            nSamples = pSoundStretch->receiveSamples((soundtouch::SAMPLETYPE*)
-                                      (audiobuffer + org_waud), samplesToGet);
-            if (nSamples == nSamplesToEnd)
+        }
+        else
+        {
+            int newLen = 0;
+            int nSamples;
+            len = WaitForFreeSpace(pSoundStretch->numSamples() * 
+                                   audio_bytes_per_sample);
+            do 
             {
-                org_waud = 0;
-                nSamplesToEnd = AUDBUFSIZE/audio_bytes_per_sample;
-            }
-            else
-            {
-                org_waud += nSamples * audio_bytes_per_sample;
-                nSamplesToEnd -= nSamples;
-            }
+                int samplesToGet = len/audio_bytes_per_sample;
+                if (samplesToGet > nSamplesToEnd)
+                {
+                    samplesToGet = nSamplesToEnd;    
+                }
 
-            newLen += nSamples * audio_bytes_per_sample;
-            len -= nSamples * audio_bytes_per_sample;
-        } while (nSamples > 0);
+                nSamples = pSoundStretch->receiveSamples((soundtouch::SAMPLETYPE*)
+                                          (audiobuffer + org_waud), samplesToGet);
+                if (nSamples == nSamplesToEnd)
+                {
+                    org_waud = 0;
+                    nSamplesToEnd = AUDBUFSIZE/audio_bytes_per_sample;
+                }
+                else
+                {
+                    org_waud += nSamples * audio_bytes_per_sample;
+                    nSamplesToEnd -= nSamples;
+                }
+
+                newLen += nSamples * audio_bytes_per_sample;
+                len -= nSamples * audio_bytes_per_sample;
+            } while (nSamples > 0);
+        }
     }
 
     waud = org_waud;
@@ -750 +1301 @@
             space_on_soundcard = getSpaceOnSoundcard();
 
             if (space_on_soundcard != last_space_on_soundcard) {
-                VERBOSE(VB_AUDIO, LOC + QString("%1 bytes free on soundcard")
+                VERBOSE(VB_AUDIO|VB_TIMESTAMP, LOC + QString("%1 bytes free on soundcard")
                         .arg(space_on_soundcard));
                 last_space_on_soundcard = space_on_soundcard;
             }
@@ -763 +1314 @@
                     WriteAudio(zeros, fragment_size);
                 } else {
                     // this should never happen now -dag
-                    VERBOSE(VB_AUDIO, LOC +
+                    VERBOSE(VB_AUDIO|VB_TIMESTAMP, LOC + 
                             QString("waiting for space on soundcard "
                                     "to write zeros: have %1 need %2")
                             .arg(space_on_soundcard).arg(fragment_size));
@@ -799 +1350 @@
         if (fragment_size > audiolen(true))
         {
             if (audiolen(true) > 0)  // only log if we're sending some audio
-                VERBOSE(VB_AUDIO, LOC +
+                VERBOSE(VB_AUDIO|VB_TIMESTAMP, LOC +
                         QString("audio waiting for buffer to fill: "
                                 "have %1 want %2")
                         .arg(audiolen(true)).arg(fragment_size));
 
-            VERBOSE(VB_AUDIO, LOC + "Broadcasting free space avail");
+            //VERBOSE(VB_AUDIO|VB_TIMESTAMP, LOC + "Broadcasting free space avail");
             pthread_mutex_lock(&audio_buflock);
             pthread_cond_broadcast(&audio_bufsig);
             pthread_mutex_unlock(&audio_buflock);
@@ -818 +1369 @@
         if (fragment_size > space_on_soundcard)
         {
             if (space_on_soundcard != last_space_on_soundcard) {
-                VERBOSE(VB_AUDIO, LOC +
+                VERBOSE(VB_AUDIO|VB_TIMESTAMP, LOC +
                         QString("audio waiting for space on soundcard: "
                                 "have %1 need %2")
                         .arg(space_on_soundcard).arg(fragment_size));
@@ -880 +1431 @@
 
         /* update raud */
         raud = (raud + fragment_size) % AUDBUFSIZE;
-        VERBOSE(VB_AUDIO, LOC + "Broadcasting free space avail");
+        //VERBOSE(VB_AUDIO|VB_TIMESTAMP, LOC + "Broadcasting free space avail");
         pthread_cond_broadcast(&audio_bufsig);
 
         written_size = fragment_size;

libs/libmyth/audiooutputalsa.cpp

@@ -52 +52 @@
     QString real_device = (audio_passthru) ?
         audio_passthru_device : audio_main_device;
 
+    int index;
+    if ((index=real_device.find('|'))>=0)
+    {
+        if (audio_channels != 2)
+            real_device = real_device.mid(index+1);
+        else
+            real_device = real_device.left(index);
+    }
+
     VERBOSE(VB_GENERAL, QString("Opening ALSA audio device '%1'.")
             .arg(real_device));
 
@@ -89 +98 @@
     }
     else
     {
-        fragment_size = 6144; // nicely divisible by 2,4,6,8 channels @ 16-bits
-        buffer_time = 500000;  // .5 seconds
+        //fragment_size = 6144; // nicely divisible by 2,4,6,8 channels @ 16-bits
+        //fragment_size = 3072*audio_channels; // nicely divisible by 2,4,6,8 channels @ 16-bits
+        fragment_size = (audio_bits * audio_channels * audio_samplerate) / (8*30);
+        buffer_time = 100000;  // .5 seconds
         period_time = buffer_time / 4;  // 4 interrupts per buffer
     }
 
@@ -162 +173 @@
     
     tmpbuf = aubuf;
 
-    VERBOSE(VB_AUDIO, QString("WriteAudio: Preparing %1 bytes (%2 frames)")
+    VERBOSE(VB_AUDIO|VB_TIMESTAMP, QString("WriteAudio: Preparing %1 bytes (%2 frames)")
             .arg(size).arg(frames));
     
     while (frames > 0) 

programs/mythfrontend/globalsettings.cpp

@@ -58 +58 @@
 #endif
 #ifdef USING_ALSA
     gc->addSelection("ALSA:default", "ALSA:default");
+    gc->addSelection("ALSA:analog", "ALSA:analog");
+    gc->addSelection("ALSA:digital", "ALSA:digital");
+    gc->addSelection("ALSA:mixed-analog", "ALSA:mixed-analog");
+    gc->addSelection("ALSA:mixed-digital", "ALSA:mixed-digital");
 #endif
 #ifdef USING_ARTS
     gc->addSelection("ARTS:", "ARTS:");
@@ -73 +77 @@
     return gc;
 }
 
+static HostComboBox *MaxAudioChannels()
+{
+    HostComboBox *gc = new HostComboBox("MaxChannels",false);
+    gc->setLabel(QObject::tr("Max Audio Channels"));
+    //gc->addSelection(QObject::tr("Mono"), "1");
+    //gc->addSelection(QObject::tr("Stereo L+R"), "2", true); // default
+    //gc->addSelection(QObject::tr("3 Channel: L C R"), "3");
+    //gc->addSelection(QObject::tr("4 Channel: L R LS RS"), "4");
+    //gc->addSelection(QObject::tr("5 Channel: L C R LS RS"), "5");
+    //gc->addSelection(QObject::tr("6 Channel: L C R LS RS LFE"), "6");
+    gc->addSelection(QObject::tr("Stereo"), "2", true); // default
+    gc->addSelection(QObject::tr("6 Channel"), "6");
+    gc->setHelpText(
+            QObject::tr("Set the maximum number of audio channels to be decoded. "
+                "This is for multi-channel/surround audio playback."));
+    return gc;
+}
+
 static HostComboBox *PassThroughOutputDevice()
 {
     HostComboBox *gc = new HostComboBox("PassThruOutputDevice", true);
@@ -3103 +3125 @@
              new VerticalConfigurationGroup(false, false, true, true);
          vgrp0->addChild(AC3PassThrough());
          vgrp0->addChild(DTSPassThrough());
+         addChild(MaxAudioChannels());
 
          VerticalConfigurationGroup *vgrp1 =
              new VerticalConfigurationGroup(false, false, true, true);

programs/mythtranscode/transcode.cpp

@@ -55 +55 @@
 
     // reconfigure sound out for new params
     virtual void Reconfigure(int audio_bits, int audio_channels,
-                             int audio_samplerate, bool audio_passthru)
+                             int audio_samplerate, bool audio_passthru,
+                             void * = NULL)
     {
+        ClearError();
         (void)audio_samplerate;
         (void)audio_passthru;
         bits = audio_bits;
         channels = audio_channels;
         bytes_per_sample = bits * channels / 8;
+        if (channels>2)
+            Error("Invalid channel count");
     }
 
     // dsprate is in 100 * samples/second

programs/mythuitest/mythuitest.pro

@@ -6 +6 @@
 TARGET = mythuitest
 CONFIG += thread opengl
 
+LIBS += -L../../libs/libavcodec -L../../libs/libavutil
+LIBS += -lmythavcodec-$$LIBVERSION -lmythavutil-$$LIBVERSION
 LIBS += $$EXTRA_LIBS
 
+TARGETDEPS += ../../libs/libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+TARGETDEPS += ../../libs/libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+
 macx {
     # Duplication of source with libmyth (e.g. oldsettings.cpp)
     # means that the linker complains, so we have to ignore duplicates 

libs/libmythtv/avformatdecoder.h

@@ -259 +259 @@
     bool              allow_ac3_passthru;
     bool              allow_dts_passthru;
     bool              disable_passthru;
+    int               max_channels;
 
     AudioInfo         audioIn;
     AudioInfo         audioOut;

libs/libmythtv/avformatdecoder.cpp

@@ -52 +52 @@
 #define MAX_AC3_FRAME_SIZE 6144
 
 /** Set to zero to allow any number of AC3 channels. */
+#define MAXCHANNELSELECT 1
+#if MAXCHANNELSELECT
+#define MAX_OUTPUT_CHANNELS compiler error
+#else
 #define MAX_OUTPUT_CHANNELS 2
+#endif
 
 static int cc608_parity(uint8_t byte);
 static int cc608_good_parity(const int *parity_table, uint16_t data);
@@ -417 +422 @@
 
     allow_ac3_passthru = gContext->GetNumSetting("AC3PassThru", false);
     allow_dts_passthru = gContext->GetNumSetting("DTSPassThru", false);
+    max_channels = gContext->GetNumSetting("MaxChannels", 2);
 
     audioIn.sample_size = -32; // force SetupAudioStream to run once
     itv = GetNVP()->GetInteractiveTV();
@@ -1579 +1614 @@
                             <<") type ("<<codec_type_string(enc->codec_type)
                             <<") already open, leaving it alone.");
                 }
+#if MAXCHANNELSELECT
+#if 0
+                if (enc->cqp != max_channels)
+                {
+                    VERBOSE(VB_IMPORTANT, LOC + QString("Setting maxchannels to %1, %2").arg(max_channels).arg(enc->cqp));
+                    enc->cqp = max_channels;
+                }
+#endif
+#endif
                 //assert(enc->codec_id);
+                VERBOSE(VB_GENERAL, QString("AVFD: codec %1 has %2 channels").arg(codec_id_string(enc->codec_id)).arg(enc->channels));
 
+#if !MAXCHANNELSELECT
                 // HACK BEGIN REALLY UGLY HACK FOR DTS PASSTHRU
                 if (enc->codec_id == CODEC_ID_DTS)
                 {
@@ -1589 +1635 @@
                     // enc->bit_rate = what??;
                 }
                 // HACK END REALLY UGLY HACK FOR DTS PASSTHRU
+#endif
 
                 bitrate += enc->bit_rate;
                 break;
@@ -3260 +3315 @@
                     if (!curstream->codec->channels)
                     {
                         QMutexLocker locker(&avcodeclock);
+#if MAXCHANNELSELECT
+                        VERBOSE(VB_IMPORTANT, LOC + QString("Setting channels to %1").arg(audioOut.channels));
+#if 0
+                        curstream->codec->cqp = max_channels;
+#endif
+                        curstream->codec->channels = audioOut.channels;
+#else
                         curstream->codec->channels = MAX_OUTPUT_CHANNELS;
+#endif
                         ret = avcodec_decode_audio(
                             curstream->codec, audioSamples,
                             &data_size, ptr, len);
 
                         reselectAudioTrack |= curstream->codec->channels;
                     }
+#if MAXCHANNELSELECT
+#if 0
+                    if (curstream->codec->cqp != max_channels)
+                    {
+                        VERBOSE(VB_IMPORTANT, LOC + QString("Setting maxchannels to %1, %2").arg(max_channels).arg(curstream->codec->cqp));
+                        curstream->codec->cqp = max_channels;
+                    }
+#endif
+#endif
 
                     if (reselectAudioTrack)
                     {
@@ -3320 +3392 @@
                     {
                         AVCodecContext *ctx = curstream->codec;
 
+#if MAXCHANNELSELECT
                         if ((ctx->channels == 0) ||
+                            (ctx->channels > audioOut.channels))
+                            ctx->channels = audioOut.channels;
+#else
+                        if ((ctx->channels == 0) ||
                             (ctx->channels > MAX_OUTPUT_CHANNELS))
                             ctx->channels = MAX_OUTPUT_CHANNELS;
+#endif
 
                         ret = avcodec_decode_audio(
                             ctx, audioSamples, &data_size, ptr, len);
@@ -3675 +3753 @@
 
 void AvFormatDecoder::SetDisablePassThrough(bool disable)
 {
+#if MAXCHANNELSELECT
+    // can only disable never reenable as once tiemstretch is on its on for the session
+    if (disable_passthru)
+        return;
+#endif
     if (selectedTrack[kTrackTypeAudio].av_stream_index < 0)
     {
         disable_passthru = disable;
         return;
     }
-
+ 
     if (disable != disable_passthru)
     {
         disable_passthru = disable;
@@ -3707 +3790 @@
     AVCodecContext *codec_ctx = NULL;
     AudioInfo old_in  = audioIn;
     AudioInfo old_out = audioOut;
+    bool using_passthru = false;
 
     if ((currentTrack[kTrackTypeAudio] >= 0) &&
         (selectedTrack[kTrackTypeAudio].av_stream_index <=
@@ -3716 +3800 @@
     {
         assert(curstream);
         assert(curstream->codec);
-        codec_ctx = curstream->codec;        
+        codec_ctx = curstream->codec;
         bool do_ac3_passthru = (allow_ac3_passthru && !transcoding &&
-                                !disable_passthru &&
                                 (codec_ctx->codec_id == CODEC_ID_AC3));
         bool do_dts_passthru = (allow_dts_passthru && !transcoding &&
-                                !disable_passthru &&
                                 (codec_ctx->codec_id == CODEC_ID_DTS));
+        using_passthru = do_ac3_passthru || do_dts_passthru;
         info = AudioInfo(codec_ctx->codec_id,
                          codec_ctx->sample_rate, codec_ctx->channels,
-                         do_ac3_passthru || do_dts_passthru);
+                         using_passthru && !disable_passthru);
     }
 
     if (info == audioIn)
         return false; // no change
 
+    QString ptmsg = "";
+    if (using_passthru)
+    {
+        ptmsg = QString(" using passthru");
+    }
     VERBOSE(VB_AUDIO, LOC + "Initializing audio parms from " +
             QString("audio track #%1").arg(currentTrack[kTrackTypeAudio]+1));
 
     audioOut = audioIn = info;
+#if MAXCHANNELSELECT
+    if (using_passthru)
+#else
     if (audioIn.do_passthru)
+#endif
     {
         // A passthru stream looks like a 48KHz 2ch (@ 16bit) to the sound card
-        audioOut.channels    = 2;
-        audioOut.sample_rate = 48000;
-        audioOut.sample_size = 4;
+        AudioInfo digInfo = audioOut;
+        if (!disable_passthru)
+        {
+            digInfo.channels    = 2;
+            digInfo.sample_rate = 48000;
+            digInfo.sample_size = 4;
+        }
+        if (audioOut.channels > max_channels)
+        {
+            audioOut.channels = max_channels;
+            audioOut.sample_size = audioOut.channels * 2;
+            codec_ctx->channels = audioOut.channels;
+        }
+#if MAXCHANNELSELECT
+        VERBOSE(VB_AUDIO, LOC + "Audio format changed digital passthrough " +
+                QString("%1\n\t\t\tfrom %2 ; %3\n\t\t\tto   %4 ; %5")
+                .arg(digInfo.toString())
+                .arg(old_in.toString()).arg(old_out.toString())
+                .arg(audioIn.toString()).arg(audioOut.toString()));
+
+        if (digInfo.sample_rate > 0)
+            GetNVP()->SetEffDsp(digInfo.sample_rate * 100);
+
+        //GetNVP()->SetAudioParams(audioOut.bps(), audioOut.channels,
+        //                         audioOut.sample_rate);
+        GetNVP()->SetAudioParams(digInfo.bps(), digInfo.channels,
+                                 digInfo.sample_rate, audioIn.do_passthru);
+        // allow the audio stuff to reencode
+        GetNVP()->SetAudioCodec(codec_ctx);
+        GetNVP()->ReinitAudio();
+        return true;
+#endif
     }
+#if MAXCHANNELSELECT
     else
     {
+        if (audioOut.channels > max_channels)
+        {
+            audioOut.channels = max_channels;
+            audioOut.sample_size = audioOut.channels * 2;
+            codec_ctx->channels = audioOut.channels;
+        }
+    }
+    bool audiook;
+#if 0
+    do 
+    {
+#endif
+#else
+    else
+    {
         if (audioOut.channels > MAX_OUTPUT_CHANNELS)
         {
             audioOut.channels = MAX_OUTPUT_CHANNELS;
@@ -3751 +3888 @@
             codec_ctx->channels = MAX_OUTPUT_CHANNELS;
         }
     }
+#endif
 
     VERBOSE(VB_AUDIO, LOC + "Audio format changed " +
             QString("\n\t\t\tfrom %1 ; %2\n\t\t\tto   %3 ; %4")
@@ -3763 +3901 @@
     GetNVP()->SetAudioParams(audioOut.bps(), audioOut.channels,
                              audioOut.sample_rate,
                              audioIn.do_passthru);
-    GetNVP()->ReinitAudio();
+    // allow the audio stuff to reencode
+    GetNVP()->SetAudioCodec(using_passthru?codec_ctx:NULL);
+    QString errMsg = GetNVP()->ReinitAudio();
+#if MAXCHANNELSELECT
+        audiook = errMsg.isEmpty();
+#if 0
+        if (!audiook)
+        {
+            switch (audioOut.channels)
+            {
+#if 0
+                case 8:
+                    audioOut.channels = 6;
+                    break;
+#endif
+                case 6:
+#if 0
+                    audioOut.channels = 5;
+                    break;
+                case 5:
+                    audioOut.channels = 4;
+                    break;
+                case 4:
+                    audioOut.channels = 3;
+                    break;
+                case 3:
+#endif
+                    audioOut.channels = 2;
+                    break;
+#if 0
+                case 2:
+                    audioOut.channels = 1;
+                    break;
+#endif
+                default:
+                    // failed to reconfigure under any circumstances
+                    audiook = true;
+                    audioOut.channels = 0;
+                    break;
+            }
+            audioOut.sample_size = audioOut.channels * 2;
+            codec_ctx->channels = audioOut.channels;
+        }
+    } while (!audiook);
+#endif
+#endif
 
     return true;
 }

libs/libmythtv/NuppelVideoPlayer.h

@@ -127 +127 @@
     void SetAudioInfo(const QString &main, const QString &passthru, uint rate);
     void SetAudioParams(int bits, int channels, int samplerate, bool passthru);
     void SetEffDsp(int dsprate);
+    void SetAudioCodec(void *ac);
 
     // Sets
     void SetParentWidget(QWidget *widget)     { parentWidget = widget; }
@@ -681 +682 @@
     int      audio_bits;
     int      audio_samplerate;
     float    audio_stretchfactor;
+    void     *audio_codec;
     bool     audio_passthru;
 
     // Picture-in-Picture

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -206 +206 @@
       audio_passthru_device(QString::null),
       audio_channels(2),            audio_bits(-1),
       audio_samplerate(44100),      audio_stretchfactor(1.0f),
+      audio_codec(NULL),
       // Picture-in-Picture
       pipplayer(NULL), setpipplayer(NULL), needsetpipplayer(false),
       // Preview window support
@@ -767 +768 @@
     if (audioOutput)
     {
         audioOutput->Reconfigure(audio_bits, audio_channels,
-                                 audio_samplerate, audio_passthru);
+                                 audio_samplerate, audio_passthru,
+                                 audio_codec);
         errMsg = audioOutput->GetError();
         if (!errMsg.isEmpty())
             audioOutput->SetStretchFactor(audio_stretchfactor);
@@ -3607 +3619 @@
     audio_passthru = passthru;
 }
 
+void NuppelVideoPlayer::SetAudioCodec(void* ac)
+{
+    audio_codec = ac;
+}
+
 void NuppelVideoPlayer::SetEffDsp(int dsprate)
 {
     if (audioOutput)

libs/libavcodec/liba52.c

@@ -134 +134 @@
     }
 }
 
+static inline int16_t convert(int32_t i)
+{
+    return av_clip_int16(i - 0x43c00000);
+}
+
+void float2s16_2 (float * _f, int16_t * s16)
+{
+    int i;
+    int32_t * f = (int32_t *) _f;
+
+    for (i = 0; i < 256; i++) {
+        s16[2*i] = convert (f[i]);
+        s16[2*i+1] = convert (f[i+256]);
+    }
+}
+
+void float2s16_4 (float * _f, int16_t * s16)
+{
+    int i;
+    int32_t * f = (int32_t *) _f;
+
+    for (i = 0; i < 256; i++) {
+        s16[4*i] = convert (f[i]);
+        s16[4*i+1] = convert (f[i+256]);
+        s16[4*i+2] = convert (f[i+512]);
+        s16[4*i+3] = convert (f[i+768]);
+    }
+}
+
+void float2s16_5 (float * _f, int16_t * s16)
+{
+    int i;
+    int32_t * f = (int32_t *) _f;
+
+    for (i = 0; i < 256; i++) {
+        s16[5*i] = convert (f[i]);
+        s16[5*i+1] = convert (f[i+256]);
+        s16[5*i+2] = convert (f[i+512]);
+        s16[5*i+3] = convert (f[i+768]);
+        s16[5*i+4] = convert (f[i+1024]);
+    }
+}
+
+#define LIKEAC3DEC 1
+int channels_multi (int flags)
+{
+    if (flags & A52_LFE)
+        return 6;
+    else if (flags & 1) /* center channel */
+        return 5;
+    else if ((flags & A52_CHANNEL_MASK) == A52_2F2R)
+        return 4;
+    else
+        return 2;
+}
+
+void float2s16_multi (float * _f, int16_t * s16, int flags)
+{
+    int i;
+    int32_t * f = (int32_t *) _f;
+
+    switch (flags) {
+    case A52_MONO:
+        for (i = 0; i < 256; i++) {
+            s16[5*i] = s16[5*i+1] = s16[5*i+2] = s16[5*i+3] = 0;
+            s16[5*i+4] = convert (f[i]);
+        }
+        break;
+    case A52_CHANNEL:
+    case A52_STEREO:
+    case A52_DOLBY:
+        float2s16_2 (_f, s16);
+        break;
+    case A52_3F:
+        for (i = 0; i < 256; i++) {
+            s16[5*i] = convert (f[i]);
+            s16[5*i+1] = convert (f[i+512]);
+            s16[5*i+2] = s16[5*i+3] = 0;
+            s16[5*i+4] = convert (f[i+256]);
+        }
+        break;
+    case A52_2F2R:
+        float2s16_4 (_f, s16);
+        break;
+    case A52_3F2R:
+        float2s16_5 (_f, s16);
+        break;
+    case A52_MONO | A52_LFE:
+        for (i = 0; i < 256; i++) {
+#if LIKEAC3DEC
+            s16[6*i] = s16[6*i+2] = s16[6*i+3] = s16[6*i+4] = 0;
+            s16[6*i+1] = convert (f[i+256]);
+            s16[6*i+5] = convert (f[i]);
+#else
+            s16[6*i] = s16[6*i+1] = s16[6*i+2] = s16[6*i+3] = 0;
+            s16[6*i+4] = convert (f[i+256]);
+            s16[6*i+5] = convert (f[i]);
+#endif
+        }
+        break;
+    case A52_CHANNEL | A52_LFE:
+    case A52_STEREO | A52_LFE:
+    case A52_DOLBY | A52_LFE:
+        for (i = 0; i < 256; i++) {
+#if LIKEAC3DEC
+            s16[6*i] = convert (f[i+256]);
+            s16[6*i+2] = convert (f[i+512]);
+            s16[6*i+1] = s16[6*i+3] = s16[6*i+4] = 0;
+            s16[6*i+5] = convert (f[i]);
+#else
+            s16[6*i] = convert (f[i+256]);
+            s16[6*i+1] = convert (f[i+512]);
+            s16[6*i+2] = s16[6*i+3] = s16[6*i+4] = 0;
+            s16[6*i+5] = convert (f[i]);
+#endif
+        }
+        break;
+    case A52_3F | A52_LFE:
+        for (i = 0; i < 256; i++) {
+#if LIKEAC3DEC
+            s16[6*i] = convert (f[i+256]);
+            s16[6*i+2] = convert (f[i+768]);
+            s16[6*i+3] = s16[6*i+4] = 0;
+            s16[6*i+1] = convert (f[i+512]);
+            s16[6*i+5] = convert (f[i]);
+#else
+            s16[6*i] = convert (f[i+256]);
+            s16[6*i+1] = convert (f[i+768]);
+            s16[6*i+2] = s16[6*i+3] = 0;
+            s16[6*i+4] = convert (f[i+512]);
+            s16[6*i+5] = convert (f[i]);
+#endif
+        }
+        break;
+    case A52_2F2R | A52_LFE:
+        for (i = 0; i < 256; i++) {
+#if LIKEAC3DEC
+            s16[6*i] = convert (f[i+256]);
+            s16[6*i+1] = 0;
+            s16[6*i+2] = convert (f[i+512]);
+            s16[6*i+3] = convert (f[i+768]);
+            s16[6*i+4] = convert (f[i+1024]);
+            s16[6*i+5] = convert (f[i]);
+#else
+            s16[6*i] = convert (f[i+256]);
+            s16[6*i+1] = convert (f[i+512]);
+            s16[6*i+2] = convert (f[i+768]);
+            s16[6*i+3] = convert (f[i+1024]);
+            s16[6*i+4] = 0;
+            s16[6*i+5] = convert (f[i]);
+#endif
+        }
+        break;
+    case A52_3F2R | A52_LFE:
+        for (i = 0; i < 256; i++) {
+#if LIKEAC3DEC
+            s16[6*i] = convert (f[i+256]);
+            s16[6*i+1] = convert (f[i+512]);
+            s16[6*i+2] = convert (f[i+768]);
+            s16[6*i+3] = convert (f[i+1024]);
+            s16[6*i+4] = convert (f[i+1280]);
+            s16[6*i+5] = convert (f[i]);
+#else
+            s16[6*i] = convert (f[i+256]);
+            s16[6*i+1] = convert (f[i+768]);
+            s16[6*i+2] = convert (f[i+1024]);
+            s16[6*i+3] = convert (f[i+1280]);
+            s16[6*i+4] = convert (f[i+512]);
+            s16[6*i+5] = convert (f[i]);
+#endif
+        }
+        break;
+    }
+}
+
 /**** end */
 
 #define HEADER_SIZE 7
@@ -177 +352 @@
                     /* update codec info */
                     avctx->sample_rate = sample_rate;
                     s->channels = ac3_channels[s->flags & 7];
+                    if (avctx->cqp >= 0)
+                        avctx->channels = avctx->cqp;
                     if (s->flags & A52_LFE)
                         s->channels++;
                     if (avctx->channels == 0)
@@ -199 +376 @@
             s->inbuf_ptr += len;
             buf_size -= len;
         } else {
+            int chans;
             flags = s->flags;
             if (avctx->channels == 1)
                 flags = A52_MONO;
-            else if (avctx->channels == 2)
-                flags = A52_STEREO;
+            else if (avctx->channels == 2) {
+                if (s->channels>2)
+                    flags = A52_DOLBY;
+                else
+                    flags = A52_STEREO;
+            }
             else
                 flags |= A52_ADJUST_LEVEL;
             level = 1;
+            chans = channels_multi(flags);
             if (s->a52_frame(s->state, s->inbuf, &flags, &level, 384)) {
             fail:
                 av_log(avctx, AV_LOG_ERROR, "Error decoding frame\n");
@@ -217 +400 @@
             for (i = 0; i < 6; i++) {
                 if (s->a52_block(s->state))
                     goto fail;
-                float_to_int(s->samples, out_samples + i * 256 * avctx->channels, avctx->channels);
+                float2s16_multi(s->samples, out_samples + i * 256 * chans, flags);
             }
             s->inbuf_ptr = s->inbuf;
             s->frame_size = 0;

libs/libavcodec/ac3_parser.c

@@ -84 +84 @@
     return 0;
 }
 
-static int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate,
+/*static*/ int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate,
                     int *bit_rate, int *samples)
 {
     int err;