[PATCH 18/18] add E-AC3 handling to DVB-SI fixups
Karl Dietz
dekarl at mythtv.org
Fri Jan 18 00:13:22 UTC 2013
---
mythtv/libs/libmythtv/mpeg/mpegtables.cpp | 7 +++++++
mythtv/libs/libmythtv/mpeg/mpegtables.h | 2 ++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/mythtv/libs/libmythtv/mpeg/mpegtables.cpp b/mythtv/libs/libmythtv/mpeg/mpegtables.cpp
index 5e36cd1..8591d57 100644
--- a/mythtv/libs/libmythtv/mpeg/mpegtables.cpp
+++ b/mythtv/libs/libmythtv/mpeg/mpegtables.cpp
@@ -52,6 +52,9 @@ uint StreamID::Normalize(uint stream_id, const desc_list_t &desc,
if (MPEGDescriptor::Find(desc, DescriptorID::ac3))
return AC3Audio;
+ if (MPEGDescriptor::Find(desc, DescriptorID::eac3))
+ return EAC3Audio;
+
QString reg;
const unsigned char *d = MPEGDescriptor::Find(
desc, DescriptorID::registration);
@@ -947,6 +950,8 @@ const char *StreamID::toString(uint streamID)
// audio
case StreamID::AC3Audio:
return "audio-ac3"; // EIT, PMT
+ case StreamID::EAC3Audio:
+ return "audio-eac3"; // EIT, PMT
case StreamID::MPEG2Audio:
return "audio-mp2-layer[1,2,3]"; // EIT, PMT
case StreamID::MPEG1Audio:
@@ -1024,6 +1029,8 @@ QString StreamID::GetDescription(uint stream_id)
return "13818-3 AAC LATM MPEG-2 Audio";
case StreamID::AC3Audio:
return "AC3 Audio";
+ case StreamID::EAC3Audio:
+ return "E-AC3 Audio";
case StreamID::DTSAudio:
return "DTS Audio";
diff --git a/mythtv/libs/libmythtv/mpeg/mpegtables.h b/mythtv/libs/libmythtv/mpeg/mpegtables.h
index 7fb3533..ce5b5b9 100644
--- a/mythtv/libs/libmythtv/mpeg/mpegtables.h
+++ b/mythtv/libs/libmythtv/mpeg/mpegtables.h
@@ -122,6 +122,7 @@ class MTV_PUBLIC StreamID
MPEG2AACAudio = 0x0f, ///< ISO 13818-7 Audio w/ADTS syntax
MPEG2AudioAmd1 = 0x11, ///< ISO 13818-3/AMD-1 Audio using LATM syntax
AC3Audio = 0x81,
+ EAC3Audio = 0x87, ///< salvaged from VLC's code
DTSAudio = 0x8a,
// DSM-CC Object Carousel
@@ -177,6 +178,7 @@ class MTV_PUBLIC StreamID
(StreamID::MPEG2AudioAmd1 == type) ||
(StreamID::MPEG2AACAudio == type) ||
(StreamID::AC3Audio == type) ||
+ (StreamID::EAC3Audio == type) ||
(StreamID::DTSAudio == type));
}
/// Returns true iff stream contains DSMCC Object Carousel
--
1.7.4.1
--------------010507060604090507060609--
More information about the mythtv-users
mailing list