generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dca: Move syncword definitions to a separate header

Browse Source
This commit is contained in:
Diego Biurrun
2015-02-25 13:50:15 +01:00
parent 1dc19729e9
commit 25f613f8be
7 changed files with 63 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/dtsdec.c
View File

@@ -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]++;
}