From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 63645482BC for ; Mon, 19 May 2025 12:16:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 7E85368D667; Mon, 19 May 2025 15:15:59 +0300 (EEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 58E0C68D5A7 for ; Mon, 19 May 2025 15:15:53 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-742c7a52e97so917826b3a.3 for ; Mon, 19 May 2025 05:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747656951; x=1748261751; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kMnoIyB04rhwS1smoSnWCVAa+4oAKt1eFIzeG8w+zvI=; b=RS/5Fx4Iulp1sLkopdurRedIZL5L2CwOmXR/y3cHa31Vn+2jpYHB188fUvtiAwAYYL 00mzoHIM6HVrSE0UEPPuM/y1oX5ISOQSNz9WRmj2D4CvzKW6pkwUDKVKtwrbzq1tDBSR SFNV/yDJaygv/p5KYjoGHInKkWhJQ5P2dPZm4YLmpF8NZ9xHkvAkdftSGsBxqIeugi07 V/pesJ1ETtrJ495s/gTEl+qEbZdSX3+BthD3YFQpcgyTe4hWKUznKMnZh9escX3hZ+EJ Tq9jKlAIwTXYtklhhox7a4BwAN6w51nf6ZO8Ps13B+dpthHsOa1/KbhNvPaTjZcekPH7 Klzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747656951; x=1748261751; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kMnoIyB04rhwS1smoSnWCVAa+4oAKt1eFIzeG8w+zvI=; b=iXa3sgJX9lc/ctxg4HPFKeSHWE4WUg0m1pRKb+VXMhTQBp4T4wi+2U0e593QqHQ4vP cqfiw4Prx50j5YhZbGxWoX1DHcczugeesLUZyMu8B0iBJQawT8O77jCptTSPRsubVc6o uBMK6AvKRZ8iIqzvZ619eGFwyhSUjHRdZ841OuZbMJp6YePjSFjhtIXXnovUYDGG35wo jOxwoTGhvWMRoU0OON+b7ovNycVvo5O9pVnxIjme2kza0FvWUCn4+SPD74pKI2RrUyF7 9cm46ex6hEXawe+91jwYSkN//i8CTLkk2MCC1Ibt0yq37WuyJTvSPX0m9jhmnbZWmFEa astg== X-Gm-Message-State: AOJu0YxojefWECpbsxTChBvKrYbHCWmlMLjWcjXzHi3pwl/lVL+j7bXf LC+8JgJ37nJhQPNRNfMSEUBfpjABB+yAPf+nEjSLw36dR4B0M5lG7GGsRcpBHQ== X-Gm-Gg: ASbGncuIuUh1wo+2Kr+mlVzH9SReHuMWKRpfqn249tR2XpnyASYw/6qdkzTxdxfOJXY mw6Bzg2o11JSP3qZ1NnSy07lBA5gzta3DHkZ1JHFsZC0WZzPovw7ElkS15pu3ouAvH05gDMwJ7h FX3spzK7z1c9gTbhdJQ/cnZ008ghk+GS1nw9IghTPkeqMgAW1wDxmVjJMB2ZQmbuWZ0ccUQU4Yd T4XUEarAVMp54ZlFLUI0u2jrJlE2vtxZNyL5BssKynXo4sOW4ouZZGwP7fWDBmn+X+L7vg2y6v+ Dhm1pq6epTIPIuaV2CuOj08juWjlLcliJB6J0xh/Ap2fkk+vgUdQeJxcDoNr/zW9mXCwUR5xZuc nNA== X-Google-Smtp-Source: AGHT+IFRHrzJLMOOKQ6+rh1iA/mPJSDjNYCRYp6HJrbpG889FJf+2ZJmDts8zgCl9GB3AcVPrAqt1Q== X-Received: by 2002:a05:6a00:990:b0:740:9a4b:fb2a with SMTP id d2e1a72fcca58-742acd72901mr17266013b3a.20.1747656951082; Mon, 19 May 2025 05:15:51 -0700 (PDT) Received: from chenyu29.mioffice.cn ([43.224.245.247]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a9876d39sm6238897b3a.146.2025.05.19.05.15.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 May 2025 05:15:50 -0700 (PDT) From: chenyu202107@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 May 2025 20:15:36 +0800 Message-Id: <20250519121537.509658-1-chenyu202107@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/1] avcodec/pcm: reduce code size 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: chenyu Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: chenyu add depends to pcm.c for reducing size when ALAW/MULAW/VIDC not defined Signed-off-by: chenyu --- libavcodec/pcm.c | 36 +++++++++++++++++++++++++++++++----- libavcodec/pcm_tablegen.h | 22 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index bff61f2195..60a2c544a8 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -44,15 +44,20 @@ static av_cold int pcm_encode_init(AVCodecContext *avctx) #if !CONFIG_HARDCODED_TABLES switch (avctx->codec->id) { #define INIT_ONCE(id, name) \ - case AV_CODEC_ID_PCM_ ## id: \ - if (CONFIG_PCM_ ## id ## _ENCODER) { \ + case AV_CODEC_ID_PCM_ ## id: { \ static AVOnce init_static_once = AV_ONCE_INIT; \ ff_thread_once(&init_static_once, pcm_ ## name ## _tableinit); \ - } \ - break + break; \ + } +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER INIT_ONCE(ALAW, alaw); +#endif +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER INIT_ONCE(MULAW, ulaw); +#endif +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER INIT_ONCE(VIDC, vidc); +#endif default: break; } @@ -216,24 +221,30 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, bytestream_put_buffer(&dst, src, n * sample_size); } break; +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER case AV_CODEC_ID_PCM_ALAW: for (; n > 0; n--) { v = *samples++; *dst++ = linear_to_alaw[(v + 32768) >> 2]; } break; +#endif +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER case AV_CODEC_ID_PCM_MULAW: for (; n > 0; n--) { v = *samples++; *dst++ = linear_to_ulaw[(v + 32768) >> 2]; } break; +#endif +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER case AV_CODEC_ID_PCM_VIDC: for (; n > 0; n--) { v = *samples++; *dst++ = linear_to_vidc[(v + 32768) >> 2]; } break; +#endif default: return -1; } @@ -327,20 +338,25 @@ static av_cold av_unused int pcm_lut_decode_init(AVCodecContext *avctx) PCMLUTDecode *s = avctx->priv_data; switch (avctx->codec_id) { +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER case AV_CODEC_ID_PCM_ALAW: for (int i = 0; i < 256; i++) s->table[i] = alaw2linear(i); break; +#endif +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER case AV_CODEC_ID_PCM_MULAW: for (int i = 0; i < 256; i++) s->table[i] = ulaw2linear(i); break; +#endif +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER case AV_CODEC_ID_PCM_VIDC: for (int i = 0; i < 256; i++) s->table[i] = vidc2linear(i); break; } - +#endif avctx->sample_fmt = AV_SAMPLE_FMT_S16; s->base.sample_size = 1; @@ -545,6 +561,9 @@ static int pcm_decode_frame(AVCodecContext *avctx, AVFrame *frame, bytestream_get_buffer(&src, samples, n * sample_size); } break; +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER || \ + CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER || \ + CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER case AV_CODEC_ID_PCM_ALAW: case AV_CODEC_ID_PCM_MULAW: case AV_CODEC_ID_PCM_VIDC: { @@ -555,6 +574,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, AVFrame *frame, *samples_16++ = lut[*src++]; break; } +#endif case AV_CODEC_ID_PCM_LXF: { int i; @@ -655,7 +675,9 @@ const FFCodec ff_ ## name_ ## _decoder = { \ * to the table in pcm_decode_init() as well. */ // AV_CODEC_ID_* pcm_* name // AV_SAMPLE_FMT_* long name DecodeContext decode init func +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER PCM_CODEC_EXT(ALAW, S16, alaw, "PCM A-law / G.711 A-law", PCMLUTDecode, pcm_lut_decode_init); +#endif PCM_DEC_EXT (F16LE, FLT, f16le, "PCM 16.8 floating point little-endian", PCMScaleDecode, pcm_scale_decode_init); PCM_DEC_EXT (F24LE, FLT, f24le, "PCM 24.0 floating point little-endian", PCMScaleDecode, pcm_scale_decode_init); PCM_CODEC (F32BE, FLT, f32be, "PCM 32-bit floating point big-endian"); @@ -663,7 +685,9 @@ PCM_CODEC (F32LE, FLT, f32le, "PCM 32-bit floating point little PCM_CODEC (F64BE, DBL, f64be, "PCM 64-bit floating point big-endian"); PCM_CODEC (F64LE, DBL, f64le, "PCM 64-bit floating point little-endian"); PCM_DECODER (LXF, S32P,lxf, "PCM signed 20-bit little-endian planar"); +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER PCM_CODEC_EXT(MULAW, S16, mulaw, "PCM mu-law / G.711 mu-law", PCMLUTDecode, pcm_lut_decode_init); +#endif PCM_CODEC (S8, U8, s8, "PCM signed 8-bit"); PCM_CODEC (S8_PLANAR, U8P, s8_planar, "PCM signed 8-bit planar"); PCM_CODEC (S16BE, S16, s16be, "PCM signed 16-bit big-endian"); @@ -686,5 +710,7 @@ PCM_CODEC (U32BE, S32, u32be, "PCM unsigned 32-bit big-endian") PCM_CODEC (U32LE, S32, u32le, "PCM unsigned 32-bit little-endian"); PCM_CODEC (S64BE, S64, s64be, "PCM signed 64-bit big-endian"); PCM_CODEC (S64LE, S64, s64le, "PCM signed 64-bit little-endian"); +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER PCM_CODEC_EXT(VIDC, S16, vidc, "PCM Archimedes VIDC", PCMLUTDecode, pcm_lut_decode_init); +#endif PCM_DECODER (SGA, U8, sga, "PCM SGA"); diff --git a/libavcodec/pcm_tablegen.h b/libavcodec/pcm_tablegen.h index 7274c3cd17..590ba59814 100644 --- a/libavcodec/pcm_tablegen.h +++ b/libavcodec/pcm_tablegen.h @@ -42,6 +42,7 @@ #define VIDC_SEG_SHIFT (5) #define VIDC_SEG_MASK (0xE0) +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER /* alaw2linear() - Convert an A-law value to 16-bit linear PCM */ static av_cold int alaw2linear(unsigned char a_val) { @@ -57,7 +58,9 @@ static av_cold int alaw2linear(unsigned char a_val) return (a_val & SIGN_BIT) ? t : -t; } +#endif +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER static av_cold int ulaw2linear(unsigned char u_val) { int t; @@ -74,7 +77,9 @@ static av_cold int ulaw2linear(unsigned char u_val) return (u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS); } +#endif +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER static av_cold int vidc2linear(unsigned char u_val) { int t; @@ -88,6 +93,7 @@ static av_cold int vidc2linear(unsigned char u_val) return (u_val & VIDC_SIGN_BIT) ? (BIAS - t) : (t - BIAS); } +#endif #if CONFIG_HARDCODED_TABLES #define pcm_alaw_tableinit() @@ -96,10 +102,19 @@ static av_cold int vidc2linear(unsigned char u_val) #include "libavcodec/pcm_tables.h" #else /* 16384 entries per table */ +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER static uint8_t linear_to_alaw[16384]; +#endif +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER static uint8_t linear_to_ulaw[16384]; +#endif +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER static uint8_t linear_to_vidc[16384]; +#endif +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER || \ + CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER || \ + CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw, int (*xlaw2linear)(unsigned char), int mask) @@ -123,21 +138,28 @@ static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw, } linear_to_xlaw[0] = linear_to_xlaw[1]; } +#endif +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER static void pcm_alaw_tableinit(void) { build_xlaw_table(linear_to_alaw, alaw2linear, 0xd5); } +#endif +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER static void pcm_ulaw_tableinit(void) { build_xlaw_table(linear_to_ulaw, ulaw2linear, 0xff); } +#endif +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER static void pcm_vidc_tableinit(void) { build_xlaw_table(linear_to_vidc, vidc2linear, 0xff); } +#endif #endif /* CONFIG_HARDCODED_TABLES */ #endif /* AVCODEC_PCM_TABLEGEN_H */ -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".