diff options
| author | Diego Biurrun <diego@biurrun.de> | 2015-02-25 13:50:15 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2015-03-04 13:29:33 +0100 |
| commit | 25f613f8be3b51e4396b93cda131e4631ba54302 (patch) | |
| tree | 1756308545fcc7ac113d975027085e63787942bd /libavformat/dtsdec.c | |
| parent | 1dc19729e92a96620000e09eba8e58cb458c9486 (diff) | |
dca: Move syncword definitions to a separate header
Diffstat (limited to 'libavformat/dtsdec.c')
| -rw-r--r-- | libavformat/dtsdec.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c index 9010711599..90e9d38582 100644 --- a/libavformat/dtsdec.c +++ b/libavformat/dtsdec.c @@ -20,14 +20,11 @@ */ #include "libavcodec/bytestream.h" +#include "libavcodec/dca_syncwords.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; @@ -42,16 +39,16 @@ static int dts_probe(AVProbeData *p) state = (state << 16) | bytestream_get_be16(&bufp); /* regular bitstream */ - if (state == DCA_MARKER_RAW_BE || state == DCA_MARKER_RAW_LE) + if (state == DCA_SYNCWORD_CORE_BE || state == DCA_SYNCWORD_CORE_LE) markers[0]++; /* 14 bits big-endian bitstream */ - if (state == DCA_MARKER_14B_BE) + if (state == DCA_SYNCWORD_CORE_14B_BE) if ((bytestream_get_be16(&bufp) & 0xFFF0) == 0x07F0) markers[1]++; /* 14 bits little-endian bitstream */ - if (state == DCA_MARKER_14B_LE) + if (state == DCA_SYNCWORD_CORE_14B_LE) if ((bytestream_get_be16(&bufp) & 0xF0FF) == 0xF007) markers[2]++; } |