From patchwork Tue Feb 23 17:25:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 25923 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 C0CD1449F21 for ; Tue, 23 Feb 2021 19:31:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A7EF368AB79; Tue, 23 Feb 2021 19:31:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C64BF68AB51 for ; Tue, 23 Feb 2021 19:31:45 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id t11so35749772ejx.6 for ; Tue, 23 Feb 2021 09:31:45 -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=v4GQMj4wWrayTPXPRwq3WOwaG4I16iXL1mVoSFlnEhE=; b=fttvGcr84mAYBUgcv3MsrOz5GDYYgcvkxm2OYiM85ydt4Pjk3Yo6C6I1nJoajBY8ua Owyb4ZFuvoCgRqpyBwRIUFd80VhKMFIKZnoMvLxCRWUXriZYMmT+rU4fDzsylK2Ag4kv VLcUzK628+AO6Jxt1LxZllk7O56CSDitiFGWDq2omEnkNAswSje5XP13/X3vKz4ZX0tF 7pOq4/QmnHex7Y74UPaZ5u6pTR3ZDDVFCeO2YvJCkCeLhBCt0ccoU42ZQ1yMiKZYFdDF IgAgQGDBbQWIVzBDfx+EI1vltMD5YoSjftZYiKSyyCvKRAoAzD1XgGL/14uQy0T51FGn RXQw== 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=v4GQMj4wWrayTPXPRwq3WOwaG4I16iXL1mVoSFlnEhE=; b=niJWQ3GkBrmFtdr1WF3RXu7KU8MwJ2jlFgFNTnG27iq2NUAURAew1fcF+yfI4bTyAj Dj1+SHWJ3c287nWY41wqt1xirAKU6kJuS25slyFX6Snqju/t3/v5RHZjOB7ESUye05N7 axfg/6ZU2eczy2/BZwuFZEQbuGCKyB3x2A4ywx/1MpTLUjx0LpfSJy5+dsoJrxm188pt Sp5V4/ur4TIxkWYir0Hr4BUKhqmDcM3ckDcUnoHsLioa8zjwd/pXvTYPYtq/oUjx7Sb7 fdEH1Mb/E24ME3uKUGB96tQBgU2X1YqsKLq8u7dnyiNAro5Bh7rNd3W1pERxUkZeTyQP jzag== X-Gm-Message-State: AOAM533wiS77kUuhP+ZVic6TaIpnt/HalMGJLVOAVIZoD296vE7B6e2k LsX3AxlFviemdW8HZTbAMPnHdPXmDibpoQ== X-Google-Smtp-Source: ABdhPJx8Db/YVhKcfCeJQCEKQ+CCP0ccf1G0VmMeKVNqv6lDSf8HednJbMMWZuQsxGpAcBn7feJLJg== X-Received: by 2002:aa7:c641:: with SMTP id z1mr1058185edr.95.1614101119479; Tue, 23 Feb 2021 09:25:19 -0800 (PST) Received: from localhost.localdomain ([109.227.52.18]) by smtp.gmail.com with ESMTPSA id s18sm12964456ejc.79.2021.02.23.09.25.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 09:25:19 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Feb 2021 18:25:07 +0100 Message-Id: <20210223172509.29631-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec: add SGA PCM 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/codec_desc.c | 7 +++++++ libavcodec/codec_id.h | 1 + libavcodec/pcm.c | 9 +++++++++ libavcodec/utils.c | 1 + 6 files changed, 20 insertions(+) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7077241a67..8685c15eeb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -830,6 +830,7 @@ OBJS-$(CONFIG_PCM_S64BE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_S64BE_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_S64LE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_S64LE_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_SGA_DECODER) += pcm.o OBJS-$(CONFIG_PCM_U8_DECODER) += pcm.o OBJS-$(CONFIG_PCM_U8_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_U16BE_DECODER) += pcm.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 354d146379..990998b64b 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -568,6 +568,7 @@ extern AVCodec ff_pcm_s64be_encoder; extern AVCodec ff_pcm_s64be_decoder; extern AVCodec ff_pcm_s64le_encoder; extern AVCodec ff_pcm_s64le_decoder; +extern AVCodec ff_pcm_sga_decoder; extern AVCodec ff_pcm_u8_encoder; extern AVCodec ff_pcm_u8_decoder; extern AVCodec ff_pcm_u16be_encoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 8e695b11d2..f64ba488f2 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2096,6 +2096,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("PCM Archimedes VIDC"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_PCM_SGA, + .type = AVMEDIA_TYPE_AUDIO, + .name = "pcm_sga", + .long_name = NULL_IF_CONFIG_SMALL("PCM SGA"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, /* various ADPCM codecs */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 56a69cf1c2..7dd316afd2 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -346,6 +346,7 @@ enum AVCodecID { AV_CODEC_ID_PCM_F16LE, AV_CODEC_ID_PCM_F24LE, AV_CODEC_ID_PCM_VIDC, + AV_CODEC_ID_PCM_SGA, /* various ADPCM codecs */ AV_CODEC_ID_ADPCM_IMA_QT = 0x11000, diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 7f0af8564f..19d04e9181 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -419,6 +419,14 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, for (; n > 0; n--) *samples++ = *src++ + 128; break; + case AV_CODEC_ID_PCM_SGA: + for (; n > 0; n--) { + int sign = *src >> 7; + int magn = *src & 0x7f; + *samples++ = sign ? 128 - magn : 128 + magn; + src++; + } + break; case AV_CODEC_ID_PCM_S8_PLANAR: n /= avctx->channels; for (c = 0; c < avctx->channels; c++) { @@ -622,3 +630,4 @@ PCM_CODEC (PCM_U32LE, AV_SAMPLE_FMT_S32, pcm_u32le, "PCM unsigned PCM_CODEC (PCM_S64BE, AV_SAMPLE_FMT_S64, pcm_s64be, "PCM signed 64-bit big-endian"); PCM_CODEC (PCM_S64LE, AV_SAMPLE_FMT_S64, pcm_s64le, "PCM signed 64-bit little-endian"); PCM_CODEC (PCM_VIDC, AV_SAMPLE_FMT_S16, pcm_vidc, "PCM Archimedes VIDC"); +PCM_DECODER(PCM_SGA, AV_SAMPLE_FMT_U8, pcm_sga, "PCM SGA"); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 4d1909b581..db6cd0cde8 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1547,6 +1547,7 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id) case AV_CODEC_ID_PCM_VIDC: case AV_CODEC_ID_PCM_S8: case AV_CODEC_ID_PCM_S8_PLANAR: + case AV_CODEC_ID_PCM_SGA: case AV_CODEC_ID_PCM_U8: case AV_CODEC_ID_SDX2_DPCM: case AV_CODEC_ID_DERF_DPCM: