From patchwork Wed Jan 2 18:53:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11635 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 89FEA44E07C for ; Wed, 2 Jan 2019 21:01:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E23E68A10A; Wed, 2 Jan 2019 21:01:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E72AD689E94 for ; Wed, 2 Jan 2019 21:01:44 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id x10so31456281wrs.8 for ; Wed, 02 Jan 2019 11:01:53 -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=4d6wpcDphEA3QpciJi6REO0goZV8ZABuaVmooUH6kCw=; b=AL5V9qP9ivORmWoQnsUU8bhI3NBdt+r3xjIlX0K9XJzyGhNM5WO73U3ZFmBIoUcs7P A7IZoVUirVTKPJN7P1N5gpo3rKO61iSE45XuqtrBWPbTXCm+XZbrHPZTC7RGo6cgTtXm dxviOta2wwYwiI6g960Sbs67A/8CC4iz6SIYaxLcZFKmD50idh80q/6h12ghTpNVbMEq ITlZ9C4VJJmCwOwA711jq52LWVXfLfUPr8cVuPCiPZCzS381b+1F4fc0vQcOr3efJ1C2 a92dsGqTmknRFhhWJVDu2WDCEIeNf518V2B4PwJyl4J7eKvVEdU3gggpQDvFMLODO1M4 7KIA== 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=4d6wpcDphEA3QpciJi6REO0goZV8ZABuaVmooUH6kCw=; b=gyzCXsmz5vqDSYBV3wXxq9HI9Xr0VoeVDyfPtObCPan91J0dP23GYJCkZGSumWYIDH aAuVD7mXzx9lhVoMnPHkWlVLWPWKHL+bun0jK9vh2NeIHm/3liZVmu/62VJ6S+JbyCX+ u1157aJtn+6g+Bs04ccbn/eNVOvlWAAEbLZKiyZ9ubLC7Fp09nyMeRjNn/TXNSAnnUer Gy5ofyd73ECUKEb4rrJmMYKmV+9ydpfpquHpx/5kFt7lR40/tuThSxJ9Tz1kFoJNg78n RUhkFzrebsmX+ehlx0AIs+K7VYpp3lxNWD3U3kDysF1Dluep2Kqje+VisDQGr8LhT/i/ 5M9A== X-Gm-Message-State: AJcUukcg02kN/Jv2WT9Aayebjm2kX4wIae9wcATd0cNpy/IJj0/shg2d 4dOlmlXCemiI2bXnJeddvCoCt4Wh X-Google-Smtp-Source: ALg8bN5fu4zRbvRgwkn5t/NvltoKOma3uZQ9FBJL0lpd8CXOlMgr54EfGepAk5qxtOvDYOEGPFW1qg== X-Received: by 2002:a5d:4586:: with SMTP id p6mr38154366wrq.69.1546455227727; Wed, 02 Jan 2019 10:53:47 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id o16sm52276836wrn.11.2019.01.02.10.53.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jan 2019 10:53:46 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Jan 2019 19:53:37 +0100 Message-Id: <20190102185338.4910-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec: add HCOM decoder 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/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 ++ libavcodec/hcom.c | 137 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 147 insertions(+) create mode 100644 libavcodec/hcom.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 99799ceed2..bf746c143d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -362,6 +362,7 @@ OBJS-$(CONFIG_H264_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_H264_V4L2M2M_ENCODER) += v4l2_m2m_enc.o OBJS-$(CONFIG_HAP_DECODER) += hapdec.o hap.o OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o +OBJS-$(CONFIG_HCOM_DECODER) += hcom.o OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o \ hevc_cabac.o hevc_refs.o hevcpred.o \ hevcdsp.o hevc_filter.o hevc_data.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 4755af71b2..fe0376e27e 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -424,6 +424,7 @@ extern AVCodec ff_g723_1_decoder; extern AVCodec ff_g729_decoder; extern AVCodec ff_gsm_decoder; extern AVCodec ff_gsm_ms_decoder; +extern AVCodec ff_hcom_decoder; extern AVCodec ff_iac_decoder; extern AVCodec ff_ilbc_decoder; extern AVCodec ff_imc_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 92567ec6d0..e92d7accf4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -646,6 +646,7 @@ enum AVCodecID { AV_CODEC_ID_APTX_HD, AV_CODEC_ID_SBC, AV_CODEC_ID_ATRAC9, + AV_CODEC_ID_HCOM, /* subtitle codecs */ AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 2363a53283..10a639101c 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2943,6 +2943,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ATRAC9 (Adaptive TRansform Acoustic Coding 9)"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_HCOM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "hcom", + .long_name = NULL_IF_CONFIG_SMALL("HCOM Audio"), + .props = AV_CODEC_PROP_LOSSY, + }, /* subtitle codecs */ { diff --git a/libavcodec/hcom.c b/libavcodec/hcom.c new file mode 100644 index 0000000000..e516d20a94 --- /dev/null +++ b/libavcodec/hcom.c @@ -0,0 +1,137 @@ +/* + * HCOM audio decoder + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/intreadwrite.h" + +#include "avcodec.h" +#include "bytestream.h" +#include "internal.h" + +typedef struct HEntry { + int16_t l, r; +} HEntry; + +typedef struct HCOMContext { + AVCodecContext *avctx; + + uint8_t first_sample; + uint8_t sample; + int dict_entries; + int dict_entry; + int delta_compression; + + HEntry *dict; +} HCOMContext; + +static av_cold int hcom_init(AVCodecContext *avctx) +{ + HCOMContext *s = avctx->priv_data; + + if (avctx->channels != 1) { + av_log(avctx, AV_LOG_ERROR, "invalid number of channels\n"); + return AVERROR_INVALIDDATA; + } + + if (avctx->extradata_size <= 7) + return AVERROR_INVALIDDATA; + s->dict_entries = AV_RB16(avctx->extradata); + if (avctx->extradata_size < s->dict_entries * 4 + 7) + return AVERROR_INVALIDDATA; + s->delta_compression = AV_RB32(avctx->extradata + 2); + s->sample = s->first_sample = avctx->extradata[avctx->extradata_size - 1]; + + s->dict = av_calloc(s->dict_entries, sizeof(*s->dict)); + if (!s->dict) + return AVERROR(ENOMEM); + for (int i = 0; i < s->dict_entries; i++) { + s->dict[i].l = AV_RB16(avctx->extradata + 6 + 4 * i); + s->dict[i].r = AV_RB16(avctx->extradata + 6 + 4 * i + 2); + } + + avctx->sample_fmt = AV_SAMPLE_FMT_U8; + s->dict_entry = 0; + + return 0; +} + +static int hcom_decode(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *pkt) +{ + HCOMContext *s = avctx->priv_data; + AVFrame *frame = data; + GetByteContext gb; + uint32_t current; + int ret, n = 0; + + if (pkt->size > INT16_MAX) + return AVERROR_INVALIDDATA; + + frame->nb_samples = pkt->size * 8; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + + bytestream2_init(&gb, pkt->data, pkt->size); + while (bytestream2_get_bytes_left(&gb) >= 4) { + int bits = 32; + + current = bytestream2_get_be32(&gb); + + while (bits-- > 0) { + + if (current & 0x80000000) { + s->dict_entry = s->dict[s->dict_entry].r; + } else { + s->dict_entry = s->dict[s->dict_entry].l; + } + + current = current << 1; + if (s->dict[s->dict_entry].l < 0) { + int16_t datum; + + datum = s->dict[s->dict_entry].r; + + if (!s->delta_compression) + s->sample = 0; + s->sample = (s->sample + datum) & 0xFF; + + frame->data[0][n++] = s->sample; + + s->dict_entry = 0; + } + } + } + + frame->nb_samples = n; + + *got_frame = 1; + + return pkt->size; +} + +AVCodec ff_hcom_decoder = { + .name = "hcom", + .long_name = NULL_IF_CONFIG_SMALL("HCOM Audio"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_HCOM, + .priv_data_size = sizeof(HCOMContext), + .init = hcom_init, + .decode = hcom_decode, + .capabilities = AV_CODEC_CAP_DR1, +};