diff options
| author | Anssi Hannula <anssi.hannula@iki.fi> | 2011-01-21 20:00:40 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-01-21 22:20:20 +0000 |
| commit | 8f4a5d225c6cd65c5f306a200da991f8a59a439a (patch) | |
| tree | 2a85700d064f0e552005a338376d3405e4a1db8f /libavcodec/dca.c | |
| parent | 187e23478bc5c066ff8eef562925471ac179644e (diff) | |
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@mansr.com>
Diffstat (limited to 'libavcodec/dca.c')
| -rw-r--r-- | libavcodec/dca.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c index bc099e1376..64a81d577c 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"); |