[vlc-commits] demux: ts: set DTSH descriptor

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Mar 14 11:13:51 2018 +0100| [7679323095e919c834b4ee298da2d3cf7f6c100a] | committer: Francois Cartegnie

demux: ts: set DTSH descriptor

(cherry picked from commit 4a4ecf29b795bfb65cfd87913acbbb337c379839)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=7679323095e919c834b4ee298da2d3cf7f6c100a
---

 modules/mux/mpeg/tables.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/mux/mpeg/tables.c b/modules/mux/mpeg/tables.c
index edf6445517..c3894f7da3 100644
--- a/modules/mux/mpeg/tables.c
+++ b/modules/mux/mpeg/tables.c
@@ -43,6 +43,7 @@
 #include "pes.h"
 
 #include "../../codec/jpeg2000.h"
+#include "../../packetizer/dts_header.h"
 
 #include <assert.h>
 
@@ -545,7 +546,11 @@ void BuildPMT( dvbpsi_t *p_dvbpsi, vlc_object_t *p_object,
         {
             uint8_t i_ver;
             /* DTS registration descriptor (ETSI TS 101 154 Annex F) */
-            if(popcount(p_stream->fmt->audio.i_frame_length) == 1)
+            if( p_stream->fmt->i_profile == PROFILE_DTS_HD )
+            {
+                i_ver = 'H';
+            }
+            else if(popcount(p_stream->fmt->audio.i_frame_length) == 1)
             {
                 i_ver = ctz( p_stream->fmt->audio.i_frame_length >> 8 );
                 if(i_ver == 0 || i_ver > 3)