Added support for EAC3 audio from other sources

4 files changed, 10 insertions, 4 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c8ca17a3..70ac90d8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2272,6 +2272,7 @@ Jürgen Schneider <ivory7@gmx.de>
  in cKbdRemote
  for reporting a possible discrepancy of the primary device number in the LSTD and
  PRIM commands
+ for adding support for EAC3 audio from other sources
 
 Christian Wieninger <cwieninger@gmx.de>
  for suggesting to add cMenuEditStrItem::InEditMode()
diff --git a/HISTORY b/HISTORY
index 4745574d..5f290488 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9348,7 +9348,7 @@ Video Disk Recorder Revision History
   Senzel).
 - Official release.
 
-2019-03-12: Version 2.4.1
+2019-03-15: Version 2.4.1
 
 - Fixed handling the tfRecording flag in the SVDRP commands MODT and UPDT (reported
   by Johann Friedrichs).
@@ -9380,3 +9380,4 @@ Video Disk Recorder Revision History
   Helmut Binder).
 - Fixed processing transponder data in the NIT (thanks to Helmut Binder).
 - Fixed triggering the SDT filter when parsing the NIT (thanks to Helmut Binder).
+- Added support for EAC3 audio from other sources (thanks to Jürgen Schneider).
diff --git a/pat.c b/pat.c
index 7e8b183a..00eed49f 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 4.4 2019/03/11 13:20:27 kls Exp $
+ * $Id: pat.c 4.5 2019/03/15 10:14:35 kls Exp $
  */
 
 #include "pat.h"
@@ -545,6 +545,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                          }
                       // fall through
               case 0x81: // STREAMTYPE_USER_PRIVATE
+              case 0x87: // eac3
                       if (Setup.StandardCompliance == STANDARD_ANSISCTE) { // ATSC A/53 AUDIO (ANSI/SCTE 57)
                          char lang[MAXLANGCODE1] = { 0 };
                          SI::Descriptor *d;
@@ -575,7 +576,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                          break;
                          }
                       // fall through
-              case 0x83 ... 0xFF: // STREAMTYPE_USER_PRIVATE
+              case 0x83 ... 0x86: // STREAMTYPE_USER_PRIVATE
+              case 0x88 ... 0xFF: // STREAMTYPE_USER_PRIVATE
                       {
                       char lang[MAXLANGCODE1] = { 0 };
                       bool IsAc3 = false;
diff --git a/remux.c b/remux.c
index 6993e9b7..f778c91f 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 4.7 2017/04/29 12:25:09 kls Exp $
+ * $Id: remux.c 4.8 2019/03/15 10:14:35 kls Exp $
  */
 
 #include "remux.h"
@@ -839,9 +839,11 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                       break;
            case 0x81: // STREAMTYPE_USER_PRIVATE - AC3 audio for ATSC and BD
            case 0x82: // STREAMTYPE_USER_PRIVATE - DTS audio for BD
+           case 0x87: // eac3
                       {
                       dbgpatpmt(" %s",
                           stream.getStreamType() == 0x81 ? "AC3" :
+                          stream.getStreamType() == 0x87 ? "AC3" :
                           stream.getStreamType() == 0x82 ? "DTS" : "");
                       char lang[MAXLANGCODE1] = { 0 };
                       SI::Descriptor *d;