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 | |
| parent | 1dc19729e92a96620000e09eba8e58cb458c9486 (diff) | |
| download | ffmpeg-25f613f8be3b51e4396b93cda131e4631ba54302.tar.gz | |
dca: Move syncword definitions to a separate header
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/dtsdec.c | 13 | ||||
| -rw-r--r-- | libavformat/spdifenc.c | 11 |
2 files changed, 11 insertions, 13 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]++; } diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index f3acf48bd6..432654affd 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -51,6 +51,7 @@ #include "spdif.h" #include "libavcodec/ac3.h" #include "libavcodec/dca.h" +#include "libavcodec/dca_syncwords.h" #include "libavcodec/aacadtsdec.h" #include "libavutil/opt.h" @@ -251,25 +252,25 @@ static int spdif_header_dts(AVFormatContext *s, AVPacket *pkt) return AVERROR_INVALIDDATA; switch (syncword_dts) { - case DCA_MARKER_RAW_BE: + case DCA_SYNCWORD_CORE_BE: blocks = (AV_RB16(pkt->data + 4) >> 2) & 0x7f; core_size = ((AV_RB24(pkt->data + 5) >> 4) & 0x3fff) + 1; sample_rate = avpriv_dca_sample_rates[(pkt->data[8] >> 2) & 0x0f]; break; - case DCA_MARKER_RAW_LE: + case DCA_SYNCWORD_CORE_LE: blocks = (AV_RL16(pkt->data + 4) >> 2) & 0x7f; ctx->extra_bswap = 1; break; - case DCA_MARKER_14B_BE: + case DCA_SYNCWORD_CORE_14B_BE: blocks = (((pkt->data[5] & 0x07) << 4) | ((pkt->data[6] & 0x3f) >> 2)); break; - case DCA_MARKER_14B_LE: + case DCA_SYNCWORD_CORE_14B_LE: blocks = (((pkt->data[4] & 0x07) << 4) | ((pkt->data[7] & 0x3f) >> 2)); ctx->extra_bswap = 1; break; - case DCA_HD_MARKER: + case DCA_SYNCWORD_SUBSTREAM: /* We only handle HD frames that are paired with core. However, sometimes DTS-HD streams with core have a stray HD frame without core in the beginning of the stream. */ |