[FFmpeg-cvslog] dca: consider a stream with XXCh/X96 in ExSS as DTS-HD HRA

[Anssi Hannula]

ffmpeg | branch: master | Anssi Hannula <anssi.hannula at iki.fi> | Fri Jan 21 20:00:40 2011 +0000| [cf9cb1f99a661f540523d559cd4018b71e70e8c0] | committer: Michael Niedermayer

dca: consider a stream with XXCh/X96 in ExSS as DTS-HD HRA

DTS-HD HRA streams do not always have an XBR extension in the extension
substream. Instead they can have only XXCh and X96 extensions in
there and still be considered DTS-HD HRA.

This is also confirmed with Onkyo TX-SR607 receiver which recognizes
such a stream as HiRes Audio.

Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 8f4a5d225c6cd65c5f306a200da991f8a59a439a)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf9cb1f99a661f540523d559cd4018b71e70e8c0
---

 libavcodec/dca.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index bc099e1..64a81d5 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1501,12 +1501,9 @@ static int dca_exss_parse_asset_header(DCAContext *s)
 
     if (extensions_mask & DCA_EXT_EXSS_XLL)
         s->profile = FF_PROFILE_DTS_HD_MA;
-    else if (extensions_mask & DCA_EXT_EXSS_XBR)
+    else if (extensions_mask & (DCA_EXT_EXSS_XBR | DCA_EXT_EXSS_X96 |
+                                DCA_EXT_EXSS_XXCH))
         s->profile = FF_PROFILE_DTS_HD_HRA;
-    else if (extensions_mask & DCA_EXT_EXSS_X96)
-        s->profile = FF_PROFILE_DTS_96_24;
-    else if (extensions_mask & DCA_EXT_EXSS_XXCH)
-        s->profile = FFMAX(s->profile, FF_PROFILE_DTS_ES);
 
     if (!(extensions_mask & DCA_EXT_CORE))
         av_log(s->avctx, AV_LOG_WARNING, "DTS core detection mismatch.\n");