From patchwork Mon Sep 19 21:17:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 651 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp78468vsd; Mon, 19 Sep 2016 14:17:47 -0700 (PDT) X-Received: by 10.28.105.146 with SMTP id z18mr133651wmh.109.1474319867132; Mon, 19 Sep 2016 14:17:47 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dx2si20464256wjd.28.2016.09.19.14.17.45; Mon, 19 Sep 2016 14:17:47 -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; 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 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 A6A44689B07; Tue, 20 Sep 2016 00:17:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE163689AB5 for ; Tue, 20 Sep 2016 00:17:20 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id b184so105205wma.3 for ; Mon, 19 Sep 2016 14:17:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=sRnHeQ8EFstVuM7Shl0Vi2bBkZ/kk7nBoHOS6eq08cE=; b=hsCZDCm3Q/Zf1DkFv2UbAd8e1MPCXD/WhTwToQouTYW9i2hTfuVOKsis6D1id9ja4s XR9z9qHt72sKII3pznxJttgCR4yBbSEvdZhar40bz6hOsSljtSBT3Z/PIn54F0W5MEPf nsb/6z8Kq59huackitSfMRJGCVNfZ8wQpAJz1OjjHYrJ8s4M2+UJQfNDp3ABy+0V8rM/ J6IV1ZH94vau+WlV4bnxICBAfBnJVjsRZmsVL2tj4E0GiF70WDcVXBXYNvbf2TDdFnYX nlekoXvLVQkK7ncq5/wbIxUGy4dESYgvLlqIAZ/iodEfh7KXPRJ0M64IGbOnMAPXzGgB gRFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=sRnHeQ8EFstVuM7Shl0Vi2bBkZ/kk7nBoHOS6eq08cE=; b=StqQjAbGq69OCOMvcNUgUl7fY9X/u56dhataU8byS/RCRP/r7u+jq4f/eDon9w2y5M 9OZb96wOsWBWL/ilhr1ySkFeaUSZT8pCCPOpo7OsiSKbq9oMQg7rw276PxIe6BHkwUKy oHvGgeot7zMaI5QqPmVpx9UcRGTQ/5ZcmJPOXoHJJbEcujFE/jdhg8x/O0Dfd9QJeSQp 2o9EcuhxC+ebRXc/iXlH4zXCjGpyIMFVIGs1wVSJCDGxHXiy9N+5w41uNim5GH7k77LU uEKlCMFmIz8wV/TQrY1bLcm2DYm4u2KoTyY2knoYRx0pGcKRbR3Kq8XPExx0z/OIXnYB XI8w== X-Gm-Message-State: AE9vXwOrznTPKhrQ5OnGrQr2JvkW1v4JmOi5S/DIcEWm8TtNgy/0kMHqs1RsN4PHbOy7Qg== X-Received: by 10.194.144.50 with SMTP id sj18mr20351753wjb.197.1474319854975; Mon, 19 Sep 2016 14:17:34 -0700 (PDT) Received: from computer.gigaset.lan (199-89.dsl.iskon.hr. [89.164.199.89]) by smtp.gmail.com with ESMTPSA id t65sm23910425wmt.15.2016.09.19.14.17.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Sep 2016 14:17:33 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Sep 2016 23:17:19 +0200 Message-Id: <1474319840-13896-1-git-send-email-onemda@gmail.com> X-Mailer: git-send-email 2.5.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec: add pcm_f16le and pcm_f24le 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 | 2 ++ libavcodec/allcodecs.c | 2 ++ libavcodec/avcodec.h | 2 ++ libavcodec/codec_desc.c | 14 ++++++++++++++ libavcodec/pcm.c | 34 ++++++++++++++++++++++++++++++++++ libavcodec/utils.c | 2 ++ 6 files changed, 56 insertions(+) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 276308b..72db88a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -655,6 +655,8 @@ OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_BLURAY_DECODER) += pcm-bluray.o OBJS-$(CONFIG_PCM_DVD_DECODER) += pcm-dvd.o +OBJS-$(CONFIG_PCM_F16LE_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_F24LE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_F32BE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_F32BE_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_F32LE_DECODER) += pcm.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index b403bf2..6acd753 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -474,6 +474,8 @@ void avcodec_register_all(void) REGISTER_ENCDEC (PCM_ALAW, pcm_alaw); REGISTER_DECODER(PCM_BLURAY, pcm_bluray); REGISTER_DECODER(PCM_DVD, pcm_dvd); + REGISTER_DECODER(PCM_F16LE, pcm_f16le); + REGISTER_DECODER(PCM_F24LE, pcm_f24le); REGISTER_ENCDEC (PCM_F32BE, pcm_f32be); REGISTER_ENCDEC (PCM_F32LE, pcm_f32le); REGISTER_ENCDEC (PCM_F64BE, pcm_f64be); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index db1061d..217bb27 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -448,6 +448,8 @@ enum AVCodecID { AV_CODEC_ID_PCM_S64LE = 0x10800, AV_CODEC_ID_PCM_S64BE, + AV_CODEC_ID_PCM_F16LE, + AV_CODEC_ID_PCM_F24LE, /* various ADPCM codecs */ AV_CODEC_ID_ADPCM_IMA_QT = 0x11000, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 24948ca..0eebf41 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1742,6 +1742,20 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_PCM_F16LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_f16le", + .long_name = NULL_IF_CONFIG_SMALL("PCM 16.8 floating point little-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { + .id = AV_CODEC_ID_PCM_F24LE, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_f24le", + .long_name = NULL_IF_CONFIG_SMALL("PCM 24.0 floating point little-endian"), + .props = AV_CODEC_PROP_LOSSLESS, + }, + { .id = AV_CODEC_ID_PCM_F32BE, .type = AVMEDIA_TYPE_AUDIO, .name = "pcm_f32be", diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 2e8e8e7..8c326c6 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -25,6 +25,7 @@ */ #include "libavutil/attributes.h" +#include "libavutil/float_dsp.h" #include "avcodec.h" #include "bytestream.h" #include "internal.h" @@ -225,6 +226,8 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, typedef struct PCMDecode { short table[256]; + AVFloatDSPContext *fdsp; + float scale; } PCMDecode; static av_cold int pcm_decode_init(AVCodecContext *avctx) @@ -246,6 +249,13 @@ static av_cold int pcm_decode_init(AVCodecContext *avctx) for (i = 0; i < 256; i++) s->table[i] = ulaw2linear(i); break; + case AV_CODEC_ID_PCM_F16LE: + case AV_CODEC_ID_PCM_F24LE: + s->scale = 1. / (1 << (avctx->bits_per_coded_sample - 1)); + s->fdsp = avpriv_float_dsp_alloc(0); + if (!s->fdsp) + return AVERROR(ENOMEM); + break; default: break; } @@ -258,6 +268,15 @@ static av_cold int pcm_decode_init(AVCodecContext *avctx) return 0; } +static av_cold int pcm_decode_close(AVCodecContext *avctx) +{ + PCMDecode *s = avctx->priv_data; + + av_freep(&s->fdsp); + + return 0; +} + /** * Read PCM samples macro * @param size Data size of native machine format @@ -400,6 +419,8 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, break; case AV_CODEC_ID_PCM_S32LE: case AV_CODEC_ID_PCM_F32LE: + case AV_CODEC_ID_PCM_F24LE: + case AV_CODEC_ID_PCM_F16LE: DECODE(32, le32, src, samples, n, 0, 0) break; case AV_CODEC_ID_PCM_S32LE_PLANAR: @@ -433,6 +454,8 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, break; case AV_CODEC_ID_PCM_F64LE: case AV_CODEC_ID_PCM_F32LE: + case AV_CODEC_ID_PCM_F24LE: + case AV_CODEC_ID_PCM_F16LE: case AV_CODEC_ID_PCM_S64LE: case AV_CODEC_ID_PCM_S32LE: case AV_CODEC_ID_PCM_S16LE: @@ -495,6 +518,14 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, return -1; } + if (avctx->codec_id == AV_CODEC_ID_PCM_F16LE || + avctx->codec_id == AV_CODEC_ID_PCM_F24LE) { + s->fdsp->vector_fmul_scalar((float *)frame->extended_data[0], + (const float *)frame->extended_data[0], + s->scale, FFALIGN(frame->nb_samples * avctx->channels, 4)); + emms_c(); + } + *got_frame_ptr = 1; return buf_size; @@ -530,6 +561,7 @@ AVCodec ff_ ## name_ ## _decoder = { \ .id = AV_CODEC_ID_ ## id_, \ .priv_data_size = sizeof(PCMDecode), \ .init = pcm_decode_init, \ + .close = pcm_decode_close, \ .decode = pcm_decode_frame, \ .capabilities = AV_CODEC_CAP_DR1, \ .sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \ @@ -549,6 +581,8 @@ AVCodec ff_ ## name_ ## _decoder = { \ /* Note: Do not forget to add new entries to the Makefile as well. */ PCM_CODEC (PCM_ALAW, AV_SAMPLE_FMT_S16, pcm_alaw, "PCM A-law / G.711 A-law"); +PCM_DECODER(PCM_F16LE, AV_SAMPLE_FMT_FLT, pcm_f16le, "PCM 16.8 floating point little-endian"); +PCM_DECODER(PCM_F24LE, AV_SAMPLE_FMT_FLT, pcm_f24le, "PCM 24.0 floating point little-endian"); PCM_CODEC (PCM_F32BE, AV_SAMPLE_FMT_FLT, pcm_f32be, "PCM 32-bit floating point big-endian"); PCM_CODEC (PCM_F32LE, AV_SAMPLE_FMT_FLT, pcm_f32le, "PCM 32-bit floating point little-endian"); PCM_CODEC (PCM_F64BE, AV_SAMPLE_FMT_DBL, pcm_f64be, "PCM 64-bit floating point big-endian"); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b0345b6..c199733 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3437,6 +3437,8 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id) case AV_CODEC_ID_PCM_U32LE: case AV_CODEC_ID_PCM_F32BE: case AV_CODEC_ID_PCM_F32LE: + case AV_CODEC_ID_PCM_F24LE: + case AV_CODEC_ID_PCM_F16LE: return 32; case AV_CODEC_ID_PCM_F64BE: case AV_CODEC_ID_PCM_F64LE: