Skip to content

F
ffmpeg.wasm-core
Commit b5328546 authored by Tim Walker's avatar Tim Walker Committed by Diego Biurrun
Browse files
Options

ac3: implement request_channel_layout. 

Signed-off-by: 's avatarDiego Biurrun <diego@biurrun.de>
parent c16bfb14
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 13 deletions
libavcodec/aac_ac3_parser.c
View file @ b5328546
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/channel_layout.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "parser.h" #include "parser.h"
#include "aac_ac3_parser.h" #include "aac_ac3_parser.h"
...@@ -83,9 +84,22 @@ get_next: ...@@ -83,9 +84,22 @@ get_next:
avctx->sample_rate = s->sample_rate; avctx->sample_rate = s->sample_rate;
/* (E-)AC-3: allow downmixing to stereo or mono */ /* (E-)AC-3: allow downmixing to stereo or mono */
if (avctx->request_channels > 0 && avctx->request_channels <= 2 && #if FF_API_REQUEST_CHANNELS
avctx->request_channels < s->channels) { FF_DISABLE_DEPRECATION_WARNINGS
avctx->channels = avctx->request_channels; if (avctx->request_channels == 1)
avctx->request_channel_layout = AV_CH_LAYOUT_MONO;
else if (avctx->request_channels == 2)
avctx->request_channel_layout = AV_CH_LAYOUT_STEREO;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if (s->channels > 1 &&
avctx->request_channel_layout == AV_CH_LAYOUT_MONO) {
avctx->channels = 1;
avctx->channel_layout = AV_CH_LAYOUT_MONO;
} else if (s->channels > 2 &&
avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} else { } else {
avctx->channels = s->channels; avctx->channels = s->channels;
avctx->channel_layout = s->channel_layout; avctx->channel_layout = s->channel_layout;
......
libavcodec/ac3dec.c
View file @ b5328546
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include "libavutil/channel_layout.h"
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "internal.h" #include "internal.h"
...@@ -178,10 +179,20 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) ...@@ -178,10 +179,20 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
/* allow downmixing to stereo or mono */ /* allow downmixing to stereo or mono */
if (avctx->request_channels > 0 && avctx->request_channels <= 2 && #if FF_API_REQUEST_CHANNELS
avctx->request_channels < avctx->channels) { FF_DISABLE_DEPRECATION_WARNINGS
avctx->channels = avctx->request_channels; if (avctx->request_channels == 1)
} avctx->request_channel_layout = AV_CH_LAYOUT_MONO;
else if (avctx->request_channels == 2)
avctx->request_channel_layout = AV_CH_LAYOUT_STEREO;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if (avctx->channels > 1 &&
avctx->request_channel_layout == AV_CH_LAYOUT_MONO)
avctx->channels = 1;
else if (avctx->channels > 2 &&
avctx->request_channel_layout == AV_CH_LAYOUT_STEREO)
avctx->channels = 2;
s->downmixed = 1; s->downmixed = 1;
for (i = 0; i < AC3_MAX_CHANNELS; i++) { for (i = 0; i < AC3_MAX_CHANNELS; i++) {
...@@ -1348,14 +1359,17 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, ...@@ -1348,14 +1359,17 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data,
s->output_mode = s->channel_mode; s->output_mode = s->channel_mode;
if (s->lfe_on) if (s->lfe_on)
s->output_mode |= AC3_OUTPUT_LFEON; s->output_mode |= AC3_OUTPUT_LFEON;
if (avctx->request_channels > 0 && avctx->request_channels <= 2 && if (s->channels > 1 &&
avctx->request_channels < s->channels) { avctx->request_channel_layout == AV_CH_LAYOUT_MONO) {
s->out_channels = avctx->request_channels; s->out_channels = 1;
s->output_mode = avctx->request_channels == 1 ? AC3_CHMODE_MONO : AC3_CHMODE_STEREO; s->output_mode = AC3_CHMODE_MONO;
s->channel_layout = avpriv_ac3_channel_layout_tab[s->output_mode]; } else if (s->channels > 2 &&
avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
s->out_channels = 2;
s->output_mode = AC3_CHMODE_STEREO;
} }
avctx->channels = s->out_channels; avctx->channels = s->out_channels;
avctx->channel_layout = s->channel_layout; avctx->channel_layout = avpriv_ac3_channel_layout_tab[s->output_mode];
/* set downmixing coefficients if needed */ /* set downmixing coefficients if needed */
if (s->channels != s->out_channels && !((s->output_mode & AC3_OUTPUT_LFEON) && if (s->channels != s->out_channels && !((s->output_mode & AC3_OUTPUT_LFEON) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment