diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:24:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:28:53 +0100 |
| commit | 87db7e777262a7800cc6c76e07870f7a8f6301ed (patch) | |
| tree | a9ddb30c4f4408ba8a136f13c84d322ba9ea79b6 /libavformat/dtsdec.c | |
| parent | 634ce8ddad6b2c03d24bce12ba69f9217729d3f5 (diff) | |
| parent | 25f613f8be3b51e4396b93cda131e4631ba54302 (diff) | |
| download | ffmpeg-87db7e777262a7800cc6c76e07870f7a8f6301ed.tar.gz | |
Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'
* commit '25f613f8be3b51e4396b93cda131e4631ba54302':
dca: Move syncword definitions to a separate header
Conflicts:
libavcodec/dca_parser.c
libavformat/dtsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/dtsdec.c')
| -rw-r--r-- | libavformat/dtsdec.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c index d054f43537..50b14c6635 100644 --- a/libavformat/dtsdec.c +++ b/libavformat/dtsdec.c @@ -20,16 +20,13 @@ */ #include "libavcodec/bytestream.h" -#include "libavcodec/get_bits.h" #include "libavcodec/dca.h" +#include "libavcodec/dca_syncwords.h" +#include "libavcodec/get_bits.h" + #include "avformat.h" #include "rawdec.h" -#define DCA_MARKER_14B_BE 0x1FFFE800 -#define DCA_MARKER_14B_LE 0xFF1F00E8 -#define DCA_MARKER_RAW_BE 0x7FFE8001 -#define DCA_MARKER_RAW_LE 0xFE7F0180 - static int dts_probe(AVProbeData *p) { const uint8_t *buf, *bufp; @@ -53,18 +50,18 @@ static int dts_probe(AVProbeData *p) diff += FFABS(((int16_t)AV_RL16(buf)) - (int16_t)AV_RL16(buf-4)); /* regular bitstream */ - if (state == DCA_MARKER_RAW_BE) + if (state == DCA_SYNCWORD_CORE_BE) marker = 0; - else if (state == DCA_MARKER_RAW_LE) + else if (state == DCA_SYNCWORD_CORE_LE) marker = 1; /* 14 bits big-endian bitstream */ - else if (state == DCA_MARKER_14B_BE && + else if (state == DCA_SYNCWORD_CORE_14B_BE && (bytestream_get_be16(&bufp) & 0xFFF0) == 0x07F0) marker = 2; /* 14 bits little-endian bitstream */ - else if (state == DCA_MARKER_14B_LE && + else if (state == DCA_SYNCWORD_CORE_14B_LE && (bytestream_get_be16(&bufp) & 0xF0FF) == 0xF007) marker = 3; else |