History

avcodec/mlpenc: add 2.1 layout support for truehd

Paul B Mahol committed 3 years ago

Commit 393d1ee1 parent 7bf41441 file · +3 −1Browse files

Unified · Split

libavcodec/mlpenc.c+3−1
@@ -597,6 +597,7 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx) · 596 unmodified lines
597597 ctx->ch8_presentation_mod= 1;
598598 ctx->thd_substream_info = 0x14;
599599 break;
600+ case AV_CH_LAYOUT_2POINT1:
600601 case AV_CH_LAYOUT_SURROUND:
601602 case AV_CH_LAYOUT_5POINT0:
602603 case AV_CH_LAYOUT_5POINT1:
@@ -2323,10 +2324,11 @@ const FFCodec ff_truehd_encoder = { · 1720 unmodified lines
23232324 .p.priv_class = &mlp_class,
23242325 .p.sample_fmts = (const enum AVSampleFormat[]) {AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE},
23252326 .p.supported_samplerates = (const int[]) {44100, 48000, 88200, 96000, 176400, 192000, 0},
2326− CODEC_OLD_CHANNEL_LAYOUTS(AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_SURROUND, AV_CH_LAYOUT_5POINT0, AV_CH_LAYOUT_5POINT1)
2327+ CODEC_OLD_CHANNEL_LAYOUTS(AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_2POINT1, AV_CH_LAYOUT_SURROUND, AV_CH_LAYOUT_5POINT0, AV_CH_LAYOUT_5POINT1)
23272328 .p.ch_layouts = (const AVChannelLayout[]) {
23282329 AV_CHANNEL_LAYOUT_MONO,
23292330 AV_CHANNEL_LAYOUT_STEREO,
2331+ AV_CHANNEL_LAYOUT_2POINT1,
23302332 AV_CHANNEL_LAYOUT_SURROUND,
23312333 AV_CHANNEL_LAYOUT_5POINT0,
23322334 AV_CHANNEL_LAYOUT_5POINT1,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t