virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avcodec/mlp: move sync defines to common header

Browse Source
This commit is contained in:
Paul B Mahol 2021-09-05 18:10:53 +02:00
parent 3ea0171ea3
commit 0c87b43c6c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mlp.h
View File

@ -24,6 +24,9 @@
#include <stdint.h> #include <stdint.h>
#define SYNC_MLP 0xbb
#define SYNC_TRUEHD 0xba
/** Last possible matrix channel for each codec */ /** Last possible matrix channel for each codec */
#define MAX_MATRIX_CHANNEL_MLP 5 #define MAX_MATRIX_CHANNEL_MLP 5
#define MAX_MATRIX_CHANNEL_TRUEHD 7 #define MAX_MATRIX_CHANNEL_TRUEHD 7

4
libavcodec/mlpdec.c
View File

@ -391,7 +391,7 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
* substream is Stereo. Subsequent substreams' layouts are indicated in the * substream is Stereo. Subsequent substreams' layouts are indicated in the
* major sync. */ * major sync. */
if (m->avctx->codec_id == AV_CODEC_ID_MLP) { if (m->avctx->codec_id == AV_CODEC_ID_MLP) {
if (mh.stream_type != 0xbb) { if (mh.stream_type != SYNC_MLP) {
avpriv_request_sample(m->avctx, avpriv_request_sample(m->avctx,
"unexpected stream_type %X in MLP", "unexpected stream_type %X in MLP",
mh.stream_type); mh.stream_type);
@ -401,7 +401,7 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
m->substream[0].mask = AV_CH_LAYOUT_STEREO; m->substream[0].mask = AV_CH_LAYOUT_STEREO;
m->substream[substr].mask = mh.channel_layout_mlp; m->substream[substr].mask = mh.channel_layout_mlp;
} else { } else {
if (mh.stream_type != 0xba) { if (mh.stream_type != SYNC_TRUEHD) {
avpriv_request_sample(m->avctx, avpriv_request_sample(m->avctx,
"unexpected stream_type %X in !MLP", "unexpected stream_type %X in !MLP",
mh.stream_type); mh.stream_type);

3
libavcodec/mlpenc.c
View File

@ -215,9 +215,6 @@ static const BestOffset restart_best_offset[NUM_CODEBOOKS] = {{0}};
#define SYNC_MAJOR 0xf8726f #define SYNC_MAJOR 0xf8726f
#define MAJOR_SYNC_INFO_SIGNATURE 0xB752 #define MAJOR_SYNC_INFO_SIGNATURE 0xB752
#define SYNC_MLP 0xbb
#define SYNC_TRUEHD 0xba
/* must be set for DVD-A */ /* must be set for DVD-A */
#define FLAGS_DVDA 0x4000 #define FLAGS_DVDA 0x4000
/* FIFO delay must be constant */ /* FIFO delay must be constant */