Ticket #7409: t7409_mythtv_dts_skip_dts_hd_v3.diff

libs/libmythtv/avformatdecoder.cpp

@@ -63 +63 @@
 
 #define MAX_AC3_FRAME_SIZE 6144
 
+// defines from libavcodec/dca.h
+#define DCA_MARKER_RAW_BE 0x7FFE8001
+#define DCA_MARKER_RAW_LE 0xFE7F0180
+#define DCA_MARKER_14B_BE 0x1FFFE800
+#define DCA_MARKER_14B_LE 0xFF1F00E8
+#define DCA_HD_MARKER     0x64582025
+
 static const float eps = 1E-5;
 
 static const int max_video_queue_size = 180;
@@ -3732 +3739 @@
         while (!have_err && len > 0)
         {
             int ret = 0;
+            bool dts = false;
             switch (ctype)
             {
                 case CODEC_TYPE_AUDIO:
@@ -3848 +3856 @@
                     if (audioOut.do_passthru)
                     {
                         data_size = pkt->size;
-                        bool dts = CODEC_ID_DTS == curstream->codec->codec_id;
+                        dts = CODEC_ID_DTS == curstream->codec->codec_id;
                         ret = encode_frame(dts, ptr, len,
                                            audioSamples, data_size);
                         s = (char *)audioSamples;
@@ -3940 +3948 @@
 
                     if (ret < 0)
                     {
-                        VERBOSE(VB_IMPORTANT, LOC_ERR +
-                                "Unknown audio decoding error");
+                        if (dts && ret == -2)
+                        {
+                            VERBOSE(VB_AUDIO+VB_EXTRA, LOC +
+                                    "DTS frame not supported");
+                        }
+                        else
+                        {
+                            VERBOSE(VB_IMPORTANT, LOC_ERR +
+                                    "Unknown audio decoding error");
+                        }
                         have_err = true;
                         continue;
                     }
@@ -4555 +4571 @@
     if (dts)
     {
         enc_len = dts_syncinfo(data, &flags, &sample_rate, &bit_rate);
+        if (enc_len < 0)
+            return enc_len;
         int rate, sfreq, nblks;
         dts_decode_header(data, &rate, &nblks, &sfreq);
         nr_samples = nblks * 32;
@@ -4670 +4688 @@
     uint id = ((indata_ptr[0] << 24) | (indata_ptr[1] << 16) |
                (indata_ptr[2] << 8)  | (indata_ptr[3]));
 
-    if (id != 0x7ffe8001)
-        return -1;
+    switch (id)
+    {
+        case DCA_MARKER_RAW_BE: break;
+        case DCA_MARKER_RAW_LE: return -2; // DTS frame not supported
+        case DCA_MARKER_14B_BE: return -2; // DTS frame not supported
+        case DCA_MARKER_14B_LE: return -2; // DTS frame not supported
+        case DCA_HD_MARKER:     return -2; // DTS frame not supported
+        default:                return -1; // DTS frame unknown
+    }
 
     int ftype = indata_ptr[4] >> 7;