Ticket #8408: mythtv_lpcm.patch

libs/libmyth/audiooutputalsa.cpp

@@ -232 +232 @@
 #else
         format = SND_PCM_FORMAT_S24_LE;
 #endif
+    else if (audio_bits == 32)
+#ifdef WORDS_BIGENDIAN
+        format = SND_PCM_FORMAT_S32;
+#else
+        format = SND_PCM_FORMAT_S32_LE;
+#endif
     else
     {
         Error(QString("Unknown sample format: %1 bits.").arg(audio_bits));
@@ -275 +281 @@
         _ReorderSmpteToAlsa6ch((unsigned char *)buf, frames);
     else if (audio_bits == 16)
         _ReorderSmpteToAlsa6ch((short *)buf, frames);
+    else if (audio_bits == 32)
+        _ReorderSmpteToAlsa6ch((int *)buf, frames);
 }
 
 template <class AudioDataType>

libs/libmyth/audiooutputbase.cpp

@@ -265 +265 @@
     audio_passthru = settings.use_passthru;
     needs_upmix = lneeds_upmix;
 
-    if (audio_bits != 8 && audio_bits != 16)
+    if (audio_bits != 8 && audio_bits != 16 && audio_bits != 32)
     {
-        Error("AudioOutput only supports 8 or 16bit audio.");
+        Error("AudioOutput only supports 8 or 16 or 32bit audio.");
         return;
     }
 
@@ -284 +284 @@
 
     // Encode to AC-3 if not passing thru , there's > 2 channels
     // and a passthru device is defined
-    if (!audio_passthru && allow_ac3_passthru &&
-        (audio_channels > 2 || audio_reenc))
-        audio_enc = true;
+    // if (!audio_passthru && allow_ac3_passthru &&
+    //     (audio_channels > 2 || audio_reenc))
+    //     audio_enc = true;
 
     // Find out what sample rates we can output (if output layer supports it)
     vector<int> rates = GetSupportedRates();
@@ -701 +701 @@
         _AdjustVolume<char>((char *)buffer, len, music);
     else if (audio_bits == 16)
         _AdjustVolume<short>((short *)buffer, len, music);
+    else if (audio_bits == 32)
+        _AdjustVolume<int>((int *)buffer, len, music);
 }
 
 template <class AudioDataType>
@@ -921 +923 @@
         return _MonoToStereo((unsigned char *)s1, (unsigned char *)s2, samples);
     else if (audio_bits == 16)
         return _MonoToStereo((short *)s1, (short *)s2, samples);
+    else if (audio_bits == 32)
+        return _MonoToStereo((int *)s1, (int *)s2, samples);
     else
         return NULL; // 0
 }
@@ -1058 +1062 @@
                     audiobuffer[org_waud++] = mybuf[chan][itemp];
                     if (audio_bits == 16)
                         audiobuffer[org_waud++] = mybuf[chan][itemp+1];
-
+                    if (audio_bits == 32) {
+                        audiobuffer[org_waud++] = mybuf[chan][itemp+1];
+                        audiobuffer[org_waud++] = mybuf[chan][itemp+2];
+                        audiobuffer[org_waud++] = mybuf[chan][itemp+3];
+                    }
                     org_waud %= kAudioRingBufferSize;
                 }
             }
@@ -1393 +1401 @@
             buffer[i + offset_dst] = buffer[i + offset_src];
             if (audio_bits == 16)
                 buffer[i + offset_dst + 1] = buffer[i + offset_src + 1];
+            if (audio_bits == 32) {
+                buffer[i + offset_dst + 1] = buffer[i + offset_src + 1];
+                buffer[i + offset_dst + 2] = buffer[i + offset_src + 2];
+                buffer[i + offset_dst + 3] = buffer[i + offset_src + 3];
+            }
         }
     }
 

libs/libmythtv/avformatdecoder.cpp

@@ -3437 +3437 @@
         {
             vector<int> flang = filter_lang(atracks, *it);
 
-            if (allow_dts_passthru && !transcoding)
+            if (selTrack < 0)
+                selTrack = filter_max_ch(ic, atracks, flang, CODEC_ID_FLAC);
+
+            if (selTrack < 0)
+                selTrack = filter_max_ch(ic, atracks, flang, CODEC_ID_TRUEHD);
+
+            if (selTrack < 0 && allow_dts_passthru && !transcoding)
                 selTrack = filter_max_ch(ic, atracks, flang, CODEC_ID_DTS);
 
             if (selTrack < 0)
@@ -3452 +3458 @@
             VERBOSE(VB_AUDIO, LOC + "Trying to select audio track (wo/lang)");
             vector<int> flang = filter_lang(atracks, -1);
 
-            if (allow_dts_passthru && !transcoding)
+            if (selTrack < 0)
+                selTrack = filter_max_ch(ic, atracks, flang, CODEC_ID_FLAC);
+
+            if (selTrack < 0)
+                selTrack = filter_max_ch(ic, atracks, flang, CODEC_ID_TRUEHD);
+
+            if (selTrack < 0 && allow_dts_passthru && !transcoding)
                 selTrack = filter_max_ch(ic, atracks, flang, CODEC_ID_DTS);
 
             if (selTrack < 0)
@@ -4092 +4104 @@
                         }
 
                             // Convert sample format if required (Myth only handles 8 and 16 bits audio)
-                        if (ctx->sample_fmt != SAMPLE_FMT_S16 && ctx->sample_fmt != SAMPLE_FMT_U8)
+                        if (false && ctx->sample_fmt != SAMPLE_FMT_S16 && ctx->sample_fmt != SAMPLE_FMT_U8)
                         {
                             if (audio_src_fmt != ctx->sample_fmt)
                             {
@@ -4653 +4665 @@
         if (codec_ctx)
         {
             using_passthru = DoPassThrough(codec_ctx);
-            info = AudioInfo(codec_ctx->codec_id, codec_ctx->sample_rate,
-                            codec_ctx->channels, using_passthru);
+            info = AudioInfo(codec_ctx->codec_id, codec_ctx->channels * 
+                             av_get_bits_per_sample_format(codec_ctx->sample_fmt) / 8,
+                             codec_ctx->sample_rate, codec_ctx->channels, using_passthru);
         }
     }
 

libs/libmythtv/avformatdecoder.h

@@ -39 +39 @@
         channels(-1), do_passthru(false)
     {;}
 
-    AudioInfo(CodecID id, int sr, int ch, bool passthru) :
-        codec_id(id), sample_size(ch*2),   sample_rate(sr),
+    AudioInfo(CodecID id, int sample_size, int sr, int ch, bool passthru) :
+        codec_id(id), sample_size(sample_size),  sample_rate(sr),
         channels(ch), do_passthru(passthru)
     {;}