From patchwork Sat Dec 15 12:24:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11428 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9038744CE88 for ; Sat, 15 Dec 2018 14:24:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE8D468AAD6; Sat, 15 Dec 2018 14:24:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AAD368AA89 for ; Sat, 15 Dec 2018 14:24:23 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id p4so7878093wrt.7 for ; Sat, 15 Dec 2018 04:24:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=s3Cy9arp8iPpin+Or6EK9OfTRvf3g4TolD49EYNBGr4=; b=Ut+snzZM5Oqb+rUCD6vw4/0uBQnGFJQ7CS78T1+8+YOD1CKQOkJT7RjKZAjidXusfF s/K3tKgFBrUE5wwxL25FeHrj39C/ClJNKio2X/rCcmyZg+JjyaFfy66zvTcfTrZj2uWA qoeiLZdBeP3fXKJG78T+A6WhgRJr0jXAHF7wFfY8QO/fmjl9y2zRSwrMZt2VCdafGMtH 6Tu8Q2OSSGk1T+sq2KBpsmqGFcDndQZSTZTe/LzIeR9okCN5Jx5SNR9qkJv0SUx8+F4a mCEaD0qCxcniqXBWwWPu5eXpc1FVntJ4JeW0Y5eHO1sFhJAHq6StkTEKZ9KJYPkmsQzh /rZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=s3Cy9arp8iPpin+Or6EK9OfTRvf3g4TolD49EYNBGr4=; b=YCv22sAhapiDnXOei+y5X3e7rXJaw3Sb9TDVNVjOosNrVkezTBzo4yEEKWiagsdWSm jVxYmdWO26jbcgM/5JXhaemK7E5ZCCxS4vBcujYzzO8IONjzdys8Ifd7woZavloGQD8O VD/Ox+NGvL8Q6dPJ2fu0j/x19mDmW+U6D2f7zOGM8udnTw76BgwL18IKXpnrQUjmTBpP 2l2cXeXQc7JHbibxDcSe88HNuq3f4Mq7V6tEKYfJx6XTLWhXCXE1eT4ZdozBspG9rUsA vCZgMNoszupmWL8QYZVFN4VcgiyeavawwNaiirbi+O645E6gk/EEfHK6CVylqFjOxT6r zYKw== X-Gm-Message-State: AA+aEWZrLPSvLLU9helURpQqe2w7/j0d4OAc7lJx2YXocBgBWrvy9Rcc s5ztXbpRzsfTDu4muf/lWZykdgXN X-Google-Smtp-Source: AFSGD/Wye3UZTQbGl+t93L6v9+7CLLXCYvAaMFz3y+BiURrS2QVTwQ/ALsmt0lNH2IQx6fsOfI+DAA== X-Received: by 2002:a5d:664a:: with SMTP id f10mr5291452wrw.311.1544876662576; Sat, 15 Dec 2018 04:24:22 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id t70sm9733901wmd.36.2018.12.15.04.24.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Dec 2018 04:24:21 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Dec 2018 13:24:12 +0100 Message-Id: <20181215122413.16474-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/g723_1: add support for stereo files X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/g723_1.h | 13 ++++++---- libavcodec/g723_1dec.c | 54 ++++++++++++++++++++++++------------------ libavcodec/g723_1enc.c | 14 ++++++----- 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/libavcodec/g723_1.h b/libavcodec/g723_1.h index f833af01c6..d60d481e67 100644 --- a/libavcodec/g723_1.h +++ b/libavcodec/g723_1.h @@ -116,9 +116,7 @@ typedef struct FCBParam { int pulse_sign[PULSE_MAX]; } FCBParam; -typedef struct g723_1_context { - AVClass *class; - +typedef struct G723_1_ChannelContext { G723_1_Subframe subframe[4]; enum FrameType cur_frame_type; enum FrameType past_frame_type; @@ -144,8 +142,6 @@ typedef struct g723_1_context { int reflection_coef; int pf_gain; ///< formant postfilter ///< gain scaling unit memory - int postfilter; - int16_t audio[FRAME_LEN + LPC_ORDER + PITCH_MAX + 4]; /* encoder */ @@ -158,6 +154,13 @@ typedef struct g723_1_context { int16_t perf_iir_mem[LPC_ORDER]; ///< and iir memories int16_t harmonic_mem[PITCH_MAX]; +} G723_1_ChannelContext; + +typedef struct G723_1_Context { + AVClass *class; + int postfilter; + + G723_1_ChannelContext ch[2]; } G723_1_Context; diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c index ab952ec66d..798d464c71 100644 --- a/libavcodec/g723_1dec.c +++ b/libavcodec/g723_1dec.c @@ -42,12 +42,16 @@ static av_cold int g723_1_decode_init(AVCodecContext *avctx) { - G723_1_Context *p = avctx->priv_data; + G723_1_Context *s = avctx->priv_data; + G723_1_ChannelContext *p = &s->ch[0]; - avctx->channel_layout = AV_CH_LAYOUT_MONO; - avctx->sample_fmt = AV_SAMPLE_FMT_S16; - avctx->channels = 1; - p->pf_gain = 1 << 12; + avctx->sample_fmt = AV_SAMPLE_FMT_S16P; + if (avctx->channels < 1 || avctx->channels > 2) { + av_log(avctx, AV_LOG_ERROR, "Only mono and stereo are supported (requested channels: %d).\n", avctx->channels); + return AVERROR(EINVAL); + } + avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO; + p->pf_gain = 1 << 12; memcpy(p->prev_lsp, dc_lsp, LPC_ORDER * sizeof(*p->prev_lsp)); memcpy(p->sid_lsp, dc_lsp, LPC_ORDER * sizeof(*p->sid_lsp)); @@ -65,7 +69,7 @@ static av_cold int g723_1_decode_init(AVCodecContext *avctx) * @param buf pointer to the input buffer * @param buf_size size of the input buffer */ -static int unpack_bitstream(G723_1_Context *p, const uint8_t *buf, +static int unpack_bitstream(G723_1_ChannelContext *p, const uint8_t *buf, int buf_size) { GetBitContext gb; @@ -344,7 +348,7 @@ static void comp_ppf_gains(int lag, PPFParam *ppf, enum Rate cur_rate, * @param ppf pitch postfilter parameters * @param cur_rate current bitrate */ -static void comp_ppf_coeff(G723_1_Context *p, int offset, int pitch_lag, +static void comp_ppf_coeff(G723_1_ChannelContext *p, int offset, int pitch_lag, PPFParam *ppf, enum Rate cur_rate) { @@ -430,7 +434,7 @@ static void comp_ppf_coeff(G723_1_Context *p, int offset, int pitch_lag, * * @return residual interpolation index if voiced, 0 otherwise */ -static int comp_interp_index(G723_1_Context *p, int pitch_lag, +static int comp_interp_index(G723_1_ChannelContext *p, int pitch_lag, int *exc_eng, int *scale) { int offset = PITCH_MAX + 2 * SUBFRAME_LEN; @@ -529,7 +533,7 @@ static void residual_interp(int16_t *buf, int16_t *out, int lag, * @param buf postfiltered output vector * @param energy input energy coefficient */ -static void gain_scale(G723_1_Context *p, int16_t * buf, int energy) +static void gain_scale(G723_1_ChannelContext *p, int16_t * buf, int energy) { int num, denom, gain, bits1, bits2; int i; @@ -572,7 +576,7 @@ static void gain_scale(G723_1_Context *p, int16_t * buf, int energy) * @param buf input buffer * @param dst output buffer */ -static void formant_postfilter(G723_1_Context *p, int16_t *lpc, +static void formant_postfilter(G723_1_ChannelContext *p, int16_t *lpc, int16_t *buf, int16_t *dst) { int16_t filter_coef[2][LPC_ORDER]; @@ -655,7 +659,7 @@ static inline int cng_rand(int *state, int base) return (*state & 0x7FFF) * base >> 15; } -static int estimate_sid_gain(G723_1_Context *p) +static int estimate_sid_gain(G723_1_ChannelContext *p) { int i, shift, seg, seg2, t, val, val_add, x, y; @@ -715,7 +719,7 @@ static int estimate_sid_gain(G723_1_Context *p) return val; } -static void generate_noise(G723_1_Context *p) +static void generate_noise(G723_1_ChannelContext *p) { int i, j, idx, t; int off[SUBFRAMES]; @@ -843,7 +847,7 @@ static void generate_noise(G723_1_Context *p) static int g723_1_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { - G723_1_Context *p = avctx->priv_data; + G723_1_Context *s = avctx->priv_data; AVFrame *frame = data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -855,9 +859,8 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, int16_t acb_vector[SUBFRAME_LEN]; int16_t *out; int bad_frame = 0, i, j, ret; - int16_t *audio = p->audio; - if (buf_size < frame_size[dec_mode]) { + if (buf_size < frame_size[dec_mode] * avctx->channels) { if (buf_size) av_log(avctx, AV_LOG_WARNING, "Expected %d bytes, got %d - skipping packet\n", @@ -866,6 +869,14 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, return buf_size; } + frame->nb_samples = FRAME_LEN; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + + for (int ch = 0; ch < avctx->channels; ch++) { + G723_1_ChannelContext *p = &s->ch[ch]; + int16_t *audio = p->audio; + if (unpack_bitstream(p, buf, buf_size) < 0) { bad_frame = 1; if (p->past_frame_type == ACTIVE_FRAME) @@ -874,11 +885,7 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, p->cur_frame_type = UNTRANSMITTED_FRAME; } - frame->nb_samples = FRAME_LEN; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) - return ret; - - out = (int16_t *)frame->data[0]; + out = (int16_t *)frame->extended_data[ch]; if (p->cur_frame_type == ACTIVE_FRAME) { if (!bad_frame) @@ -922,7 +929,7 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, &p->sid_gain, &p->cur_gain); /* Perform pitch postfiltering */ - if (p->postfilter) { + if (s->postfilter) { i = PITCH_MAX; for (j = 0; j < SUBFRAMES; i += SUBFRAME_LEN, j++) comp_ppf_coeff(p, i, p->pitch_lag[j >> 1], @@ -992,16 +999,17 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, 0, 1, 1 << 12); memcpy(p->synth_mem, p->audio + FRAME_LEN, LPC_ORDER * sizeof(*p->audio)); - if (p->postfilter) { + if (s->postfilter) { formant_postfilter(p, lpc, p->audio, out); } else { // if output is not postfiltered it should be scaled by 2 for (i = 0; i < FRAME_LEN; i++) out[i] = av_clip_int16(p->audio[LPC_ORDER + i] << 1); } + } *got_frame_ptr = 1; - return frame_size[dec_mode]; + return frame_size[dec_mode] * avctx->channels; } #define OFFSET(x) offsetof(G723_1_Context, x) diff --git a/libavcodec/g723_1enc.c b/libavcodec/g723_1enc.c index 4a4525eda9..fe3fd09c1d 100644 --- a/libavcodec/g723_1enc.c +++ b/libavcodec/g723_1enc.c @@ -42,7 +42,8 @@ static av_cold int g723_1_encode_init(AVCodecContext *avctx) { - G723_1_Context *p = avctx->priv_data; + G723_1_Context *s = avctx->priv_data; + G723_1_ChannelContext *p = &s->ch[0]; if (avctx->sample_rate != 8000) { av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n"); @@ -386,7 +387,7 @@ static void iir_filter(int16_t *fir_coef, int16_t *iir_coef, * @param flt_coef filter coefficients * @param unq_lpc unquantized lpc vector */ -static void perceptual_filter(G723_1_Context *p, int16_t *flt_coef, +static void perceptual_filter(G723_1_ChannelContext *p, int16_t *flt_coef, int16_t *unq_lpc, int16_t *buf) { int16_t vector[FRAME_LEN + LPC_ORDER]; @@ -635,7 +636,7 @@ static void synth_percept_filter(int16_t *qnt_lpc, int16_t *perf_lpc, * @param buf input signal * @param index the current subframe index */ -static void acb_search(G723_1_Context *p, int16_t *residual, +static void acb_search(G723_1_ChannelContext *p, int16_t *residual, int16_t *impulse_resp, const int16_t *buf, int index) { @@ -963,7 +964,7 @@ static void pack_fcb_param(G723_1_Subframe *subfrm, FCBParam *optim, * @param buf target vector * @param impulse_resp impulse response of the combined filter */ -static void fcb_search(G723_1_Context *p, int16_t *impulse_resp, +static void fcb_search(G723_1_ChannelContext *p, int16_t *impulse_resp, int16_t *buf, int index) { FCBParam optim; @@ -995,7 +996,7 @@ static void fcb_search(G723_1_Context *p, int16_t *impulse_resp, * @param frame output buffer * @param size size of the buffer */ -static int pack_bitstream(G723_1_Context *p, AVPacket *avpkt) +static int pack_bitstream(G723_1_ChannelContext *p, AVPacket *avpkt) { PutBitContext pb; int info_bits = 0; @@ -1056,7 +1057,8 @@ static int pack_bitstream(G723_1_Context *p, AVPacket *avpkt) static int g723_1_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr) { - G723_1_Context *p = avctx->priv_data; + G723_1_Context *s = avctx->priv_data; + G723_1_ChannelContext *p = &s->ch[0]; int16_t unq_lpc[LPC_ORDER * SUBFRAMES]; int16_t qnt_lpc[LPC_ORDER * SUBFRAMES]; int16_t cur_lsp[LPC_ORDER];