From patchwork Fri Aug 18 19:00:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 4746 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp1099702vsu; Fri, 18 Aug 2017 12:01:29 -0700 (PDT) X-Received: by 10.223.176.110 with SMTP id g43mr6804379wra.158.1503082889578; Fri, 18 Aug 2017 12:01:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503082889; cv=none; d=google.com; s=arc-20160816; b=gs/wChGt0EIQOYnXiRlE13qoFAAFSSm1TuTHKPeLCANtWGhec83REodWUY/LdARAQJ 8qwMmJUpKB9OuIZCjrB9/dQXd/QV12HcHT7IFvQcqRVS29qlNjH52egTWPGd5HrOT312 BwlFZglQdXdP21+mZ8Ug5PTkJzR3fawKzRLXEkbsrteLUmm32SPX/gFp2Akl5JiQS6c6 5ZwcBGCqXqTnuTRHJq22kxBCoR/m6GEhbQ6Rse9wz1jvpWlD4w56NtBIuNXNx+T+M2En Pg8K+5WlmySSAkBDLc/MPBFg3Bwq557Jc6BD6Tu2NhEttN2yl+gmduTADOYUHpvjPaGx 0VtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=9mokmPWqH3Vu9WdE5DivSQI0he0cxgJcpc9sbAoiLdU=; b=YjfzDFGaejHch6ywWt6Mn/7LgRFYCBUu4iwJ1kywNXC4i5O562+qhjrCzUVhVrIuCw foiKN7iPz1qJxbDHFAkSmOWt4M04Wg7wCPeqRuKxL5xjOA+NOT0J06hhcsfs0Mr1q1Os LgDxO/0KhIdSAjfYIqXv9nuizhRaDS7yKB74yFAvpzxGEdxC+oQNCPaSQlrWaT88U+ML GWuLLOX31QPbLtM6f0SJrXuHr4iW4qLvDBH8ljV+HJVFGjTI5RegQhEKE+WncVBKmDNm 8NDar/Lq8ANWZSDQu4WozNkOY/Xyz3/sD0Hmnbqr6Saj/abUDzsG6Vo9aZvyt42M/sj2 Y1CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FMM7Pby1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 191si1634553wmv.152.2017.08.18.12.01.27; Fri, 18 Aug 2017 12:01:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FMM7Pby1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AB086882BF; Fri, 18 Aug 2017 22:01:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk0-f43.google.com (mail-vk0-f43.google.com [209.85.213.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B5BA68062A for ; Fri, 18 Aug 2017 22:01:11 +0300 (EEST) Received: by mail-vk0-f43.google.com with SMTP id n125so35223434vke.1 for ; Fri, 18 Aug 2017 12:01:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=WLhzb1CO6qrUn1flsOvJlRlMEZz0jDInlFtGhd4rGas=; b=FMM7Pby1BLHFYzd6CnlxVrAJgEGJuqDi7q7VO25EqxJi90wBc7YygqiPkpC7p+BKYR pDoN5oL2OetGWguISHFOWQLBjyGkm4uR0ArwBPPnlY7mJzrmd9kR+cZyUHLCcIHGDxiJ HSzxLrLYU+awaF2bpcHyyXLtWSbufIORCJAv5hh58pVjWmYtmMCLx1m3t3sWn/X50LuR PGoRRdrlQU9c4hNXpVk1D7bHeinG7gKi96nXbmvK0Nc2VToRNBLGt1y/Yeqr+z55zB0h SyppgmHe+YEhEU2Xi++O1rDcUlY+uMXAtE714Ghx5VlG7B9f3EaWCDjK4EYMA/IzLv4q Hhng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=WLhzb1CO6qrUn1flsOvJlRlMEZz0jDInlFtGhd4rGas=; b=olcvd2XLhEIOr3LXl0d3DPkOHCbxYaWzQdt0uOP1iXozGc7YODY/tu9fXKB4B5zy+N Q5bY49kfNnYE40bTAfE3eMS0EhG6T0p3l9kY1Ll1pWq4PDKHwDdjEGH0r1dY8LceB6nU +GfNILE2ZxkHB5AegR1xb/Yv3PB0L+t8IKVBfafV0HgPqaAPWKqZsuxkXEtg+ypCzj5H fsQPu1PtuCQG4a9vOKgYLhonEJautWMl/KJr6CPNSMDVdJtCe14gCvwQXtlT3Okv0qlG +c/bRouPnbnKVOHf/QXUjDnhFMyl9TciD1tkCce7Sb9guBSDkS5xOWEb6tyRnmH/qU4j O03Q== X-Gm-Message-State: AHYfb5i/EMcPbtP5xKX6NhvCSnoHGDta19wmO/lzMY37HGj3lkDd4N2i IL7HmlLtrv2CGmfT4HOHJ0JNzQ+zCQ== X-Received: by 10.31.76.69 with SMTP id z66mr6551248vka.137.1503082875756; Fri, 18 Aug 2017 12:01:15 -0700 (PDT) MIME-Version: 1.0 Received: by 10.103.55.141 with HTTP; Fri, 18 Aug 2017 12:00:55 -0700 (PDT) From: Carl Eugen Hoyos Date: Fri, 18 Aug 2017 21:00:55 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/g726: Add a little-endian G.726 encoder 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch allows to encode samples that the binary decoder attached to ticket #6596 can decode, they have the same format as the ITU reference samples ("right-justified"). Please comment, Carl Eugen From 5e50b1489a45207890580e801d216a5abce06344 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Fri, 18 Aug 2017 20:57:54 +0200 Subject: [PATCH] lavc/g726: Add a little-endian G.726 encoder. Fixes ticket #6596. --- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 2 +- libavcodec/g726.c | 54 ++++++++++++++++++++++++++++++++++++++++-------- libavcodec/put_bits.h | 40 +++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 5 files changed, 88 insertions(+), 11 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b0c39ac..982d7f5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -763,6 +763,7 @@ OBJS-$(CONFIG_ADPCM_G722_ENCODER) += g722.o g722dsp.o g722enc.o OBJS-$(CONFIG_ADPCM_G726_DECODER) += g726.o OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o OBJS-$(CONFIG_ADPCM_G726LE_DECODER) += g726.o +OBJS-$(CONFIG_ADPCM_G726LE_ENCODER) += g726.o OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_APC_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_DAT4_DECODER) += adpcm.o adpcm_data.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 4712592..1e5942d 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -549,7 +549,7 @@ static void register_all(void) REGISTER_DECODER(ADPCM_EA_XAS, adpcm_ea_xas); REGISTER_ENCDEC (ADPCM_G722, adpcm_g722); REGISTER_ENCDEC (ADPCM_G726, adpcm_g726); - REGISTER_DECODER(ADPCM_G726LE, adpcm_g726le); + REGISTER_ENCDEC (ADPCM_G726LE, adpcm_g726le); REGISTER_DECODER(ADPCM_IMA_AMV, adpcm_ima_amv); REGISTER_DECODER(ADPCM_IMA_APC, adpcm_ima_apc); REGISTER_DECODER(ADPCM_IMA_DAT4, adpcm_ima_dat4); diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 6922b40..80cb064 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -292,7 +292,7 @@ static av_cold int g726_reset(G726Context *c) return 0; } -#if CONFIG_ADPCM_G726_ENCODER +#if CONFIG_ADPCM_G726_ENCODER || CONFIG_ADPCM_G726LE_ENCODER static int16_t g726_encode(G726Context* c, int16_t sig) { uint8_t i; @@ -308,6 +308,8 @@ static av_cold int g726_encode_init(AVCodecContext *avctx) { G726Context* c = avctx->priv_data; + c->little_endian = !strcmp(avctx->codec->name, "g726le"); + if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL && avctx->sample_rate != 8000) { av_log(avctx, AV_LOG_ERROR, "Sample rates other than 8kHz are not " @@ -356,9 +358,17 @@ static int g726_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, init_put_bits(&pb, avpkt->data, avpkt->size); for (i = 0; i < frame->nb_samples; i++) - put_bits(&pb, c->code_size, g726_encode(c, *samples++)); - - flush_put_bits(&pb); + if (c->little_endian) { + put_bits_le(&pb, c->code_size, g726_encode(c, *samples++)); + } else { + put_bits(&pb, c->code_size, g726_encode(c, *samples++)); + } + + if (c->little_endian) { + flush_put_bits_le(&pb); + } else { + flush_put_bits(&pb); + } avpkt->size = out_size; *got_packet_ptr = 1; @@ -372,6 +382,13 @@ static const AVOption options[] = { { NULL }, }; +static const AVCodecDefault defaults[] = { + { "b", "0" }, + { NULL }, +}; +#endif + +#if CONFIG_ADPCM_G726_ENCODER static const AVClass g726_class = { .class_name = "g726", .item_name = av_default_item_name, @@ -379,11 +396,6 @@ static const AVClass g726_class = { .version = LIBAVUTIL_VERSION_INT, }; -static const AVCodecDefault defaults[] = { - { "b", "0" }, - { NULL }, -}; - AVCodec ff_adpcm_g726_encoder = { .name = "g726", .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), @@ -400,6 +412,30 @@ AVCodec ff_adpcm_g726_encoder = { }; #endif +#if CONFIG_ADPCM_G726LE_ENCODER +static const AVClass g726le_class = { + .class_name = "g726le", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVCodec ff_adpcm_g726le_encoder = { + .name = "g726le", + .long_name = NULL_IF_CONFIG_SMALL("G.726 little endian ADPCM (\"right-justified\")"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_ADPCM_G726LE, + .priv_data_size = sizeof(G726Context), + .init = g726_encode_init, + .encode2 = g726_encode_frame, + .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .priv_class = &g726le_class, + .defaults = defaults, +}; +#endif + #if CONFIG_ADPCM_G726_DECODER || CONFIG_ADPCM_G726LE_DECODER static av_cold int g726_decode_init(AVCodecContext *avctx) { diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index b85e88f..1ceb1cc 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -119,6 +119,18 @@ static inline void flush_put_bits(PutBitContext *s) s->bit_buf = 0; } +static inline void flush_put_bits_le(PutBitContext *s) +{ + while (s->bit_left < 32) { + av_assert0(s->buf_ptr < s->buf_end); + *s->buf_ptr++ = s->bit_buf; + s->bit_buf >>= 8; + s->bit_left += 8; + } + s->bit_left = 32; + s->bit_buf = 0; +} + #ifdef BITSTREAM_WRITER_LE #define avpriv_align_put_bits align_put_bits_unsupported_here #define avpriv_put_string ff_put_string_unsupported_here @@ -197,6 +209,34 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) s->bit_left = bit_left; } +static inline void put_bits_le(PutBitContext *s, int n, unsigned int value) +{ + unsigned int bit_buf; + int bit_left; + + av_assert2(n <= 31 && value < (1U << n)); + + bit_buf = s->bit_buf; + bit_left = s->bit_left; + + bit_buf |= value << (32 - bit_left); + if (n >= bit_left) { + if (3 < s->buf_end - s->buf_ptr) { + AV_WL32(s->buf_ptr, bit_buf); + s->buf_ptr += 4; + } else { + av_log(NULL, AV_LOG_ERROR, "Internal error, put_bits buffer too small\n"); + av_assert2(0); + } + bit_buf = value >> bit_left; + bit_left += 32; + } + bit_left -= n; + + s->bit_buf = bit_buf; + s->bit_left = bit_left; +} + static inline void put_sbits(PutBitContext *pb, int n, int32_t value) { av_assert2(n >= 0 && n <= 31); diff --git a/libavcodec/version.h b/libavcodec/version.h index 02c4f41..7473000 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 102 +#define LIBAVCODEC_VERSION_MINOR 103 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ -- 1.7.10.4