From patchwork Fri Dec 29 11:56:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 45382 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp4726316pzh; Fri, 29 Dec 2023 03:57:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IHy4YDGAGdghC3DL7aNaA+Tmx37Vao9NQdF5/Hxfuh+tscdeeOaybYAv/IGzqMV0OkkZIhf X-Received: by 2002:a19:6716:0:b0:50e:10e8:d544 with SMTP id b22-20020a196716000000b0050e10e8d544mr4853403lfc.68.1703851022445; Fri, 29 Dec 2023 03:57:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703851022; cv=none; d=google.com; s=arc-20160816; b=u0wgzccy4TSqXlB+ykPckhVTjc+gBt8nabR1RTrUxDcssAW8AE8cWskftT5JLpDkLt vj/gIWMnIGz2Rro07iDfTFZmJcZVOvdW4sGIm9sRXhlzOnCZ9D1wJEa/b28ulsvwY8fR XlvAdhocnm8TjL2PtWiUzTih0DGZvrn7nJ3+9rOmsXE3p/9tWKltK/75klYcYjW/m/tA WyV0QSJZpV9t6AUdXvE+M019d/kAhB8NrtouMaHPfTc9LHGBEMsE4QUDr3qbgJemLnrW NNGFxdUaUhd8zbtBmwq7y1OO6wU88qsCk2JDFzpfp/xCiWZUGW3t0ByR0U3DfCgi/BiF f/5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=TxEqB8f9btILpNIaxejwEexniez5Y2RzIh+QojkerKY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=evxEv8GfpbZKayyMFRmoD5F0RUYdcqsJQ3B4ljv36gmlVByUlFihLSPRMjW2YqZFb1 MPy74MCE5n4pHEqbzU6MJhHlaINadwQ8esFDS8FjJesoYAghVgmH5uKVucntO/pCwrdP KU5azWJTJB5mDbS5SWYcaepdJiF6KHT0Z42k5+JuCNXtzouQkToPXVNK4nskxOC7t+4W CT6VGG1yihgVqJ2G2DYrTNTdVLuZwFb7jmfMyC7PeEiqTo3dZwb6NZ5hAbVUHPtulrUc yFuuxkQzt9aoH57C+gAU3m82aYOxr9bzjStOHX6m7mX9eK9QY97ZC518oXcs79kI3LpJ SR6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XViltdwz; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wi5-20020a170906fd4500b00a271016ac5csi3045951ejb.526.2023.12.29.03.57.02; Fri, 29 Dec 2023 03:57:02 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XViltdwz; 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 sp=QUARANTINE 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 3B26068C313; Fri, 29 Dec 2023 13:56:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 224E568C313 for ; Fri, 29 Dec 2023 13:56:52 +0200 (EET) Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-67fb9df3699so41587886d6.2 for ; Fri, 29 Dec 2023 03:56:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703851010; x=1704455810; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=okUU6ItmFYCUOHf2oVSSFtIUDFA2R4iI5lDyBym/Ny4=; b=XViltdwzqROeuvy4CiG3tvNq+ezVzGDrFptcmwOUrPTravlQ1HEu5AUhz5TJi8u5JP 1o+ZJpvQRZOZqrcigHh0Evu5uTlkBvCxJKiKOLPPA+Vo106QgKOfpF71tLZUvNsw25+u 4h5Nhdk86RYB5GkOWLYqyqvXn22IzBUK9Y3Fb9+XkINuezgNC25wUxyuk+tLl6k7JEG0 2togqLftuU/gPRy4c9iDRgscGTNYg/VRwD1KtNUcEUc0vxlmN9F9qazNL2DPKeZVJFvH fWhpBeyImvpe0FB8a2Ac6vUBLsSa6LTSsZqYoPAkXsJtHQCsrrBBKCN5VXqdjz1fNvJN JZYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703851010; x=1704455810; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=okUU6ItmFYCUOHf2oVSSFtIUDFA2R4iI5lDyBym/Ny4=; b=ebHSCzU1jz6m3J0cW1SqiWylVQCT6xPzkZtnVCzTpu7SVqIrGYglfwT21N8oASSl6r R98mgDTfymeLxJc8oqlpxe2GQmLzl/MSzx/dGJDVZr7FZ/h4y5La/Gn0rPbecNBrHBle IFmFNE7qZTI3tC0CHPuDR9ezwbQem3HkGkQhBYRTnXkbzx3tokDBxHniEYuSL3GQdn0j 4KiazjYgk9pBGFsoHIDkfERZXymhPmINPDRbBw3P6uAnXwRneraECY6v6HeFVByYcGKK QJxLbWlXdjrU6A+HcpgBhyzKnZx9Ytyaf4U6DQQo+GfIiPa70O0AJ+hd+zFapsNf+5KN 1ZaQ== X-Gm-Message-State: AOJu0YwbRxQ6+GkiaT1E/pXks3zADgNVNshd0VLo6b9iBwae03OluQVf KUDIIJdd0KiYnCYZ1PubwIYqTHJ9bWMtra5eCKw9Hl3sX2DA8cby X-Received: by 2002:ad4:58e4:0:b0:67f:b8a0:9345 with SMTP id di4-20020ad458e4000000b0067fb8a09345mr12069483qvb.79.1703851010657; Fri, 29 Dec 2023 03:56:50 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Fri, 29 Dec 2023 19:56:39 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 1/3] lvac/svqenc: add ff_svq1enc_init 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Pc0BkOLhbA96 From 55fe9e001545ed3ae1f2c64666d07aebaeb83a2a Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Fri, 29 Dec 2023 13:08:25 +0800 Subject: [PATCH 1/3] lvac/svqenc: add ff_svq1enc_init This is for clarity and use in testing, consistent with other parts of the code --- libavcodec/svq1enc.c | 18 ++++++++++++------ libavcodec/svq1encdsp.h | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 764d047799..0dea405dec 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -634,18 +634,13 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx) s->y_block_height * sizeof(int32_t)); s->m.me.map = av_mallocz(2 * ME_MAP_SIZE * sizeof(*s->m.me.map)); s->m.new_picture = av_frame_alloc(); - s->svq1encdsp.ssd_int8_vs_int16 = ssd_int8_vs_int16_c; if (!s->m.me.scratchpad || !s->m.me.map || !s->mb_type || !s->dummy || !s->m.new_picture) return AVERROR(ENOMEM); s->m.me.score_map = s->m.me.map + ME_MAP_SIZE; -#if ARCH_PPC - ff_svq1enc_init_ppc(&s->svq1encdsp); -#elif ARCH_X86 - ff_svq1enc_init_x86(&s->svq1encdsp); -#endif + ff_svq1enc_init(&s->svq1encdsp); ff_h263_encode_init(&s->m); // mv_penalty @@ -764,3 +759,14 @@ const FFCodec ff_svq1_encoder = { AV_PIX_FMT_NONE }, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; + +void ff_svq1enc_init(SVQ1EncDSPContext *c) +{ + c->ssd_int8_vs_int16 = ssd_int8_vs_int16_c; + +#if ARCH_PPC + ff_svq1enc_init_ppc(c); +#elif ARCH_X86 + ff_svq1enc_init_x86(c); +#endif +} diff --git a/libavcodec/svq1encdsp.h b/libavcodec/svq1encdsp.h index 91b36735d7..618bf8463b 100644 --- a/libavcodec/svq1encdsp.h +++ b/libavcodec/svq1encdsp.h @@ -28,6 +28,7 @@ typedef struct SVQ1EncDSPContext { intptr_t size); } SVQ1EncDSPContext; +void ff_svq1enc_init(SVQ1EncDSPContext *c); void ff_svq1enc_init_ppc(SVQ1EncDSPContext *c); void ff_svq1enc_init_x86(SVQ1EncDSPContext *c); -- 2.43.0