From patchwork Tue Mar 5 22:51:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 46819 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d90e:b0:19e:cdac:8cce with SMTP id jd14csp38204pzb; Tue, 5 Mar 2024 14:52:15 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWhHW6FGD0CdeHE8OBGdle/pwg4W5b3sZ71n/cTfJeHZ0EbU3py0689btxujUdN+XUng1KZGV337UtgeplgbHbn8mO7LK/Dm/aTTQ== X-Google-Smtp-Source: AGHT+IFgSsbeAWa67OkSuPlT2cG3AbecWPdZnsO3r2Ez4GjgcGqhE2Gu8O+rGxwiBB5d+DyeQjty X-Received: by 2002:a05:6512:716:b0:513:2a5b:cae with SMTP id b22-20020a056512071600b005132a5b0caemr855129lfs.2.1709679135393; Tue, 05 Mar 2024 14:52:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709679135; cv=none; d=google.com; s=arc-20160816; b=RUrISRItp8mKYamjK+WLYhbrPvcCbPqAvJ6WQVOava6ggSXdtoysg0uqLPHFICvcjf PtN4g5LzVyBOtxq00d5ksx3Z/6nr8av+dbcv6ifetf0BytBz9xSWbuK17rhVY4dMfIlJ soFgHh1qm17FDHEPrIb9BmbFqmvjEGSr6A4hfb8cJ1ebi3AdRlZ12N5Imhs2U3Wvnnmo o7+56ZQezO7qoZ+noaBIKmm0dNxrwPE5ftsUaMC7yx7X11Ranyx7A31uwCtHzHn+NjoR 5om0U7tSbGyndnUmzAoxHveAOrL5zRT8FQtoWmghh/77Fu49EmkqphKBm8WeFvEUo7up 6V2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=8HPJs9Ziy4qwxpeC13MepQsMqCUPc9cmPvNLi4P9Oig=; fh=s+G8Ss4JbeMFkWPSp2LmIH/LXFyBlALRiww1j3FPjHY=; b=WxRoaxOdZlMeg0oXiYnQn5uJuYjEFaAi/UOSMtzcB7kqVJb3WyI1VAidpLu8vGrB0Y Bbr/Tz2cHUmWhm1bDVwP5W0QNRg/yT+v4t9QNSUu+zpW9D2d0NCWkRFXb6kwq26qKwc+ g/zxAFdbto8FLSDTXl1GCHyZrPU0iRURzKuSvyBsBaM8XgNz1zniGORsGe6gc+h0xYJY OIbGmBvttDOHE2WpAbB2+adPyOxnhoOe+rSb70XensDSWoQndOxwTGowcqtLmq43ELv3 N1I6VPitzl0OMWLvvK8tkfeoF8KbBFwSdC07aqhOhP+HHO4SazBGDU2JKqNq/XrRxc+l 0WFg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w18-20020a17090652d200b00a442272c6fcsi5476193ejn.798.2024.03.05.14.52.14; Tue, 05 Mar 2024 14:52:15 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 65EE868CA4C; Wed, 6 Mar 2024 00:52:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C429368C90C for ; Wed, 6 Mar 2024 00:51:56 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 95E62E9CE4; Tue, 5 Mar 2024 23:51:56 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OPvXGlq6LGGn; Tue, 5 Mar 2024 23:51:55 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 09178E9D0F; Tue, 5 Mar 2024 23:51:55 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Mar 2024 23:51:40 +0100 Message-Id: <20240305225147.6849-2-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240305225147.6849-1-cus@passwd.hu> References: <20240305225147.6849-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/9] avcodec/bsf/pcm_rechunk: add some more supported PCM formats X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XunumIVm4ymy Signed-off-by: Marton Balint --- libavcodec/bsf/pcm_rechunk.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/libavcodec/bsf/pcm_rechunk.c b/libavcodec/bsf/pcm_rechunk.c index 9bbc5a74d6..7198554c17 100644 --- a/libavcodec/bsf/pcm_rechunk.c +++ b/libavcodec/bsf/pcm_rechunk.c @@ -108,6 +108,18 @@ static int get_next_nb_samples(AVBSFContext *ctx) } } +static void set_silence(AVCodecParameters *par, uint8_t *buf, size_t size) +{ + int c = 0; + switch (par->codec_id) { + case AV_CODEC_ID_PCM_ALAW: c = 0xd5; break; + case AV_CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_VIDC: c = 0xff; break; + case AV_CODEC_ID_PCM_U8: c = 0x80; break; + } + memset(buf, c, size); +} + static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt) { PCMContext *s = ctx->priv_data; @@ -158,7 +170,7 @@ static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt) ret = ff_bsf_get_packet_ref(ctx, s->in_pkt); if (ret == AVERROR_EOF && s->out_pkt->size) { if (s->pad) { - memset(s->out_pkt->data + s->out_pkt->size, 0, data_size - s->out_pkt->size); + set_silence(ctx->par_in, s->out_pkt->data + s->out_pkt->size, data_size - s->out_pkt->size); s->out_pkt->size = data_size; } else { nb_samples = s->out_pkt->size / s->sample_size; @@ -194,11 +206,17 @@ static const AVClass pcm_rechunk_class = { static const enum AVCodecID codec_ids[] = { // 8 bit + AV_CODEC_ID_PCM_ALAW, + AV_CODEC_ID_PCM_MULAW, + AV_CODEC_ID_PCM_VIDC, AV_CODEC_ID_PCM_S8, + AV_CODEC_ID_PCM_SGA, + AV_CODEC_ID_PCM_U8, // 16 bit AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE, // 24 bit + AV_CODEC_ID_PCM_S24DAUD, AV_CODEC_ID_PCM_S24BE, AV_CODEC_ID_PCM_S24LE, // 32 bit