[vlc-commits] demux: ts: set dolbyvision to non default

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Feb 22 15:16:37 2018 +0100| [71741e17b10ad8059e03e2f1bc871506beb33225] | committer: Jean-Baptiste Kempf

demux: ts: set dolbyvision to non default

(cherry picked from commit d1ad873a5d46183ea31b7bd4e9f92d326b42a1fc)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/mpeg/ts_psi.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
index 433af26bca..4e08c8b971 100644
--- a/modules/demux/mpeg/ts_psi.c
+++ b/modules/demux/mpeg/ts_psi.c
@@ -1584,6 +1584,12 @@ static void FillPESFromDvbpsiES( demux_t *p_demux,
          PMTEsHasRegistration( p_demux, p_dvbpsies, "HDMV" ) )
         p_pes->p_es->fmt.i_priority = ES_PRIORITY_NOT_DEFAULTABLE;
 
+    /* Disable dolbyvision */
+    if ( registration_type == TS_PMT_REGISTRATION_BLURAY &&
+         p_dvbpsies->i_pid == 0x1015 &&
+         PMTEsHasRegistration( p_demux, p_dvbpsies, "HDMV" ) )
+        p_pes->p_es->fmt.i_priority = ES_PRIORITY_NOT_DEFAULTABLE;
+
     /* PES packets usually contain truncated frames */
     p_pes->p_es->fmt.b_packetized = false;