From patchwork Tue Jun 4 13:55:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 49545 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9183:0:b0:460:55fa:d5ed with SMTP id s3csp2704535vqg; Tue, 4 Jun 2024 06:55:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUOl87ODZLfIdkgzJ/VL4exSByL2JdCxlSjNgiXsk+a9u+09Idu4FBkmBGZ0JHQIUby9SNoAIE/Ju2nb7WyMVQsI2s3CLWXxElRQA== X-Google-Smtp-Source: AGHT+IGDIskT75wqFnebwnV+WWWBR0bwXj+5Ctcly/uckho6eimfk8RX0Mjf0GC+KYlvCxfMpLZ2 X-Received: by 2002:a17:907:9252:b0:a67:7649:3c38 with SMTP id a640c23a62f3a-a6822049abemr602307866b.49.1717509353909; Tue, 04 Jun 2024 06:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717509353; cv=none; d=google.com; s=arc-20160816; b=GdcfsK+Xac/gdrqvLeCqn9XTKuL0gcaZWWO4yrfdp4KnVg540iflss9KYm1gY9CDkW V2MT8sZ/O5uqYNM4t2ICV4lPuQQX++hS+wDEdJxkIKdoqekiNhK/yzaWhbm5GY18q0e6 C016GUrynfIuu5L+OD1wy+P4u67rnrCfkIPq5iS5zyKRBaMvOWXUCVsDSH/lIg2HwO8e aGI356p7MSaJXc8TAmUiAf2ExrmxjzyJJma68S4L04riLmKukGhce8zQZtstoG/zf6Bu 0++RVtr3EYiC48K244F9nIGg6KNoixm3OrbnLvhcozkP5rcbgRaCuT3x1x/NqU58n63q a71Q== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=JSlyabsrNZ96rpbRVZaidk5AhZTaJwgG7vynuZxMpJU=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=TCJOR37I6r85YbTT0Nf+gLiOEeFCgsR/p42DXu5LoCv2th/xZgUOchPRFbn+TvNCAB 5D+DEj1tZB/cxKxXcE1Nl3/jGm2F+GwlWY63zkaGWolMtZ6oH7st+uOX6eI6ZoYsjyxN KjN0ARk9qfLxfOPpQ/QFL1ciZB1AvKvgZlN9AtOKWrVytt/37SOjZf+KGKFmseP1NkCg u0PzOIrO2LSq1JQrQ2Sx+NGdpdQaETiYVkZ+1+AdoaV+sAZXQDQLUXx5ZbEF/webaYib c1sm0p8zYF4JoKBwjEDjX+EaGpvMbEw42j/EL1oMyrb7ZPFu+EILZ9QpzbicBCnJLbry kx1Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=KmMzPnsH; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a68f2536a77si252788866b.806.2024.06.04.06.55.44; Tue, 04 Jun 2024 06:55:53 -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=@foxmail.com header.s=s201512 header.b=KmMzPnsH; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 97B2E68D70D; Tue, 4 Jun 2024 16:55:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-205.mail.qq.com (out203-205-221-205.mail.qq.com [203.205.221.205]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2128E68D6FA for ; Tue, 4 Jun 2024 16:55:20 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1717509307; bh=d4A7o7YdDjpwMK7C4G5HUV34m0i5VLC61FRvHABVSQA=; h=From:To:Cc:Subject:Date; b=KmMzPnsHlbUKuSz2YH8h7OpEzXeEw1lQgEQVX4kPyS20FugCJYt6u/C84+vPU4Fv2 TzS+E0hWOmkgVSiTt4RnTAqa8aY2XRb+2ETwJvsqXwGLpr1E3d/mntdYXkxA9nWgBv y/Ut6GHlRcOb0n1NHCDd/oe7My1oAZVXabomvP9E= Received: from ZHILIZHAO-MB1.tencent.com ([113.108.77.51]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id DC59C61C; Tue, 04 Jun 2024 21:55:05 +0800 X-QQ-mid: xmsmtpt1717509305th64abx9c Message-ID: X-QQ-XMAILINFO: M/NR0wiIuy70pgZa/WcfiCNKt5oiC+PKJ96DcZrY1zMJW4StYoVq3ufTNBfX/E Rfa3WMRocjERMtEfUmgYNjUUUlZXwpkXOfz97/wd8Hk4fAHS5+lmFQOHkt21gfOr9EFOy0nBCq7c spJLY1F6MEZuQ8rn1HJ7vSvORKVV1U8tPD2ygbsJmaWYiiuTBiAuO8+0YvTBmFyKjAOTbI5WTImz hrUQCjSkypfwESdFWrxDwN5OKWsUk80l3PiO7Cc7yJmTeppeaj6/qgY45ZiMYYV3DdBbTBYGdOm+ RZUeT5ltizwUnOv5PPfBg/APXz6JzWrC5NuYS6tzRX4En2yLjBHL+JkWxQmZZpBOcpfwpNB9MpKf Smb1nIHV/BWppaPSreXnZrCb2l3egNtd3g/SqDt2Eu1MwXqTf+AD0kGBYBrJMxqDpjHOpRYSuJBW Xqj0ZouNFrl27MPsZx+HAVjOt1Ppxr5sGV7uYVi5NRzyquLU0ud4pD2fq34hJirpiowWB8XaPKUY UW1/ocn4FxvyliJCJ2YDh3VHISdm7a2jI4NU5UBWEnxsIlKBIcgZIdw0p6+YwHdhq4QFr9uhRb6n CHpvywHxSXu96Izvk5qv7pbTJqJvETA+akP1bWz0CBo4YPI6cR4QAHn24IfyMK4UiA+8g0fb+u4/ dAO3SRSl+5E3QgsDzcgGsmJNRnyH8w5KU0h/vtf1NeIn6STYoGeCuT9IehnII678+eQYnqFK6E20 bzh3mmJacKe7sSIoQ3q8csDc4fnB8pQAVl/q6yO0epcdfsWRGXcb81f1rvTdILbuvwbK5l93+eC5 73BnGhApytfcus/r8Frx8OvZloQlx+i5CpmjmMrHkZzYIsStTeJruqDj8GBP0O142jP4fbyaP0Xe 9SiQZgaDGg9PMgo8CNZLd4ygsilM01olgCt2y2gy15Re2YfoDasBLvq/TJP8RU812FPxsELOLC1D IZrfXf7/JwL7fPehfJ9h02liS2AaovmsPoAt4hxr81VzvKofgnLA== X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2024 21:55:00 +0800 X-OQ-MSGID: <20240604135504.83169-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] checkasm/sw_rgb: test rgb24 to yuv 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: f+JdRwvuKyIM From: Zhao Zhili --- tests/checkasm/sw_rgb.c | 103 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c index 7cd815e5be..cc9b957461 100644 --- a/tests/checkasm/sw_rgb.c +++ b/tests/checkasm/sw_rgb.c @@ -24,6 +24,8 @@ #include "libavutil/mem_internal.h" #include "libswscale/rgb2rgb.h" +#include "libswscale/swscale.h" +#include "libswscale/swscale_internal.h" #include "checkasm.h" @@ -179,8 +181,89 @@ static void check_interleave_bytes(void) } } +#define MAX_LINE_SIZE 1920 + +static void check_rgb_to_y(struct SwsContext *ctx) +{ + static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE}; + + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]); + LOCAL_ALIGNED_32(uint8_t, dst0_y, [MAX_LINE_SIZE * 2]); + LOCAL_ALIGNED_32(uint8_t, dst1_y, [MAX_LINE_SIZE * 2]); + + declare_func(void, uint8_t *dst, const uint8_t *src, + const uint8_t *unused1, const uint8_t *unused2, int width, + uint32_t *rgb2yuv, void *opq); + + randomize_buffers(src, MAX_LINE_SIZE * 3); + + for (int i = 0; i < FF_ARRAY_ELEMS(input_sizes); i++) { + int w = input_sizes[i]; + + if (check_func(ctx->lumToYV12, "rgb24_to_y_%d", w)) { + memset(dst0_y, 0xFA, MAX_LINE_SIZE * 2); + memset(dst1_y, 0xFA, MAX_LINE_SIZE * 2); + + call_ref(dst0_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL); + call_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL); + + if (memcmp(dst0_y, dst1_y, w * 2)) + fail(); + + bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL); + } + } +} + +static void check_rgb_to_uv(struct SwsContext *ctx) +{ + static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE}; + + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]); + LOCAL_ALIGNED_32(uint8_t, dst0_u, [MAX_LINE_SIZE * 2]); + LOCAL_ALIGNED_32(uint8_t, dst0_v, [MAX_LINE_SIZE * 2]); + LOCAL_ALIGNED_32(uint8_t, dst1_u, [MAX_LINE_SIZE * 2]); + LOCAL_ALIGNED_32(uint8_t, dst1_v, [MAX_LINE_SIZE * 2]); + + declare_func(void, uint8_t *dstU, uint8_t *dstV, + const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, + int width, uint32_t *pal, void *opq); + + randomize_buffers(src, MAX_LINE_SIZE * 3); + + for (int i = 0; i < 2; i++) { + ctx->chrSrcHSubSample = i ? 1 : 0; + ctx->srcFormat = AV_PIX_FMT_RGB24; + ctx->dstFormat = i ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV444P; + ff_sws_init_scale(ctx); + + for (int j = 0; j < FF_ARRAY_ELEMS(input_sizes); j++) { + int w = input_sizes[j] >> i; + + if (check_func(ctx->chrToYV12, "rgb24_to_uv%s_%d", i ? "_half" : "", w)) { + memset(dst0_u, 0xFF, MAX_LINE_SIZE * 2); + memset(dst0_v, 0xFF, MAX_LINE_SIZE * 2); + memset(dst1_u, 0xFF, MAX_LINE_SIZE * 2); + memset(dst1_v, 0xFF, MAX_LINE_SIZE * 2); + + call_ref(dst0_u, dst0_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL); + call_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL); + + if (memcmp(dst0_u, dst1_u, w * 2) || memcmp(dst0_v, dst1_v, w * 2)) + fail(); + + bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL); + } + } + } +} + void checkasm_check_sw_rgb(void) { + struct SwsContext *ctx; + int *inv_table, *table; + int in_full, out_full, brightness, contrast, saturation; + ff_sws_rgb2rgb_init(); check_shuffle_bytes(shuffle_bytes_2103, "shuffle_bytes_2103"); @@ -203,4 +286,24 @@ void checkasm_check_sw_rgb(void) check_interleave_bytes(); report("interleave_bytes"); + + ctx = sws_getContext(MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_RGB24, + MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_YUV420P, + SWS_ACCURATE_RND | SWS_BITEXACT, NULL, NULL, NULL); + if (!ctx) + fail(); + + sws_getColorspaceDetails(ctx, &inv_table, &in_full, + &table, &out_full, + &brightness, &contrast, &saturation); + sws_setColorspaceDetails(ctx, inv_table, in_full, + table, out_full, + brightness, contrast, saturation); + check_rgb_to_y(ctx); + report("rgb_to_y"); + + check_rgb_to_uv(ctx); + report("rgb_to_uv"); + + sws_freeContext(ctx); } From patchwork Tue Jun 4 13:55:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 49548 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9183:0:b0:460:55fa:d5ed with SMTP id s3csp2704996vqg; Tue, 4 Jun 2024 06:56:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPn5wka9EVaSETnUje9ZxsMHVhX3u6GcTd9K82SNA9PFqwrnCqWkxJ8QtFU7oSFIeYf1fHFlVWJrR1afzm8weR6rMAi0EU8GZlcQ== X-Google-Smtp-Source: AGHT+IGvz0orye2biDT/TF+MjCM/vbmoIAUJN2Wb8lYNu9+6ScM9zB/QuHGMlbL4v42FU9lTAMkw X-Received: by 2002:ac2:5bdd:0:b0:529:b023:6b9d with SMTP id 2adb3069b0e04-52b8957377emr9444311e87.16.1717509403092; Tue, 04 Jun 2024 06:56:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717509403; cv=none; d=google.com; s=arc-20160816; b=jEbtkgBp9ZPObQj+1NVXWa/hVscqHtINw3OQ6tTd3wMOTup/PtUqkEYNAnKNF+Zk7K xYxhmEHJZ3USOSoglOK76ltL6eZdl4WdCmBlJq0jd1NkWV0oXe/e3H71L2EQujMuDSsz pAmiQY1cX0p3skRj+IhgXNqFTvcFGhSg20jXg638DkFD7kGKpdRfg2g6akTUCM+cy6sL H6fTRNSNKrB8ka61Nfkds/1EKJ+2fH+GExGsrt42pe7avWWKkjVnThTiVpcugW3Neth0 nLKK7lOuITsnBSWhReHSNcR9VstppZ7TjS6JpTV/2X/PQzZrT9xWuFKzh9jPwJu1sX39 qqQQ== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=wfIBnoLqWQtPR3Tsp1/NUKhnfEBneR+j/E1U4G1IziI=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=Ricdm9j7k27GCTVvxL8j0Z79zJjZrLp9YT53ZVxf4GriGTodMEUNiFHb7jgQdC1TJi CrkSJsjxcjTeOqe3oZMP6PIN7qUCv4dHaZj8+/lWz8XCqNzf/2mm3kqr70tlAf8C4Gkc wTtnRk/DoDUMc2rUTJetIX4gzyA1b5vG0br4UiFLy39VczAfjnA3EeWJqnpLOJGl5/3c qRtrvqMr/T+9/pRn5dUgIBSNED/+JFPOSeg2IW2vftp0DDSNnmF71H/ZTD3tO7cui1JI wdOjWawQx2cWFopBpdvHclyiyrPTbPZkKViUqpy8ez0pprx5KhMET62/NikOroaDMQxg bXUQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=gaHfhk42; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57a31c766e7si5179137a12.371.2024.06.04.06.56.42; Tue, 04 Jun 2024 06:56:43 -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=@foxmail.com header.s=s201512 header.b=gaHfhk42; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A82F68D700; Tue, 4 Jun 2024 16:56:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-221.mail.qq.com (out203-205-221-221.mail.qq.com [203.205.221.221]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BE6368D6C8 for ; Tue, 4 Jun 2024 16:56:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1717509386; bh=YF7NrHmifiw/5M6C7Ae/IfeWvkX8ZEEVYPQLV2XekGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gaHfhk42jrqZTHW83xGAQoyqbr9VqUVml5B3NLx8rMTKV7V6jjq2AJLZAs3eU3xSU srrBCu1dtw5UAtc/SIvm3j2jieImI0IJYUyv47mFJ9/NIvu1o3hozHZYWEjJ+evL/9 4dyJ8/wFv+TDfrd6rz3ySMEznnkEdZXNj5vbX7Eg= Received: from ZHILIZHAO-MB1.tencent.com ([113.108.77.51]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id DC59C61C; Tue, 04 Jun 2024 21:55:05 +0800 X-QQ-mid: xmsmtpt1717509307tbmvfnls8 Message-ID: X-QQ-XMAILINFO: OAkKprrIulfQKZuid/0qdVdJd3/GOXslzCoV0ss4G4uNkmcC/gpOkMZ6vtZtUH 1IT8bYgA+yhzE+/MZz+gmivGmc+36b9TAxfab1nDip2Ajs1oyyOP6pxMjtnKt2psb5ptv+6REuOU KmZfqb8E7jikwRuTxxn6hG5uQV2nihwwoMDXH6NT8tmqiTefPyQf0pQ/klDIOONERr4agXe5MhG7 2ktLBi2rLusqI8JPZ8iTdDx1RuJdIEe8CHK54+Mhets4YLY7lLWfqDoTjxOxwmB8cTs6egu6nTnc uXcVAfWUpoO/SXWcgFrDxsu4tyN9T1ObdgMkL74q6U4Upbv0c2CRMYIgevUyYjVRN+kIaS6w9M2T hDE8aOsJTTd877+i7OodfSig/6BFC1jSOVp5h0x15pU+nsWg9CFPjX+9B1BvLK9mxpuW2y8BsWch Qqc6Wrkjl2KfOOmlDuprqhokGqM1avpW+nzWU489eyiHlk4KJ1Q9MqCT5FnBIUIUz5AFxK4osMJm bwt3EUdCjq6x2UYZuB4DcthMA/MtsIC+XB4RjsdOx1Q5+jw7VveZ3FQyZzhG+8k508f3jmEMfnMh 3zYIaF0h9ht1GXxtoGEp3z57UX9P942iws2q2z202POlAS2sBaLWJ3yU7QpEHhOaAQpPloeqO4wc HULNAswJ8Y972ZYc0EgyMmyMc6/A/aI+oFo+u7gaTLQwzf1kaFDvshYuuUvlZK3+J5ObZTTRnJur OVeH5tw21b1nqgUHV0w9venp505QrSq8qP0B6rYJT+Lj5RtGHwCggUjlp6mRRTbXTvW/mzBC/lPw qAndfHANiETsFYax+O5KqIUx087WHiPhmnSDYyaYUe2WCY7gaJukFWBcD9xvqX+vb6DdF5Mv6/Rv Jp8qguyn+DdwNsS4iWR2ujRPVL82T8YbmvO1Qccj9+RMzR9nGZ78p6cn1ueq+7fxVXZ4Tu5M/Alv eurdi6MKGGh+y3yJABwIrUXqK4Oc0HyGEE7O7fR9Tch5d65YDADQ== X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2024 21:55:01 +0800 X-OQ-MSGID: <20240604135504.83169-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240604135504.83169-1-quinkblack@foxmail.com> References: <20240604135504.83169-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] swscale/aarch64: Add rgb24 to yuv implementation 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uKTy0qdi0Dv1 From: Zhao Zhili Test on Apple M1: rgb24_to_uv_1080_c: 7.2 rgb24_to_uv_1080_neon: 5.5 rgb24_to_uv_1280_c: 8.2 rgb24_to_uv_1280_neon: 6.2 rgb24_to_uv_1920_c: 12.5 rgb24_to_uv_1920_neon: 9.5 rgb24_to_uv_half_540_c: 6.5 rgb24_to_uv_half_540_neon: 3.0 rgb24_to_uv_half_640_c: 7.5 rgb24_to_uv_half_640_neon: 3.2 rgb24_to_uv_half_960_c: 12.5 rgb24_to_uv_half_960_neon: 6.0 rgb24_to_y_1080_c: 4.5 rgb24_to_y_1080_neon: 3.5 rgb24_to_y_1280_c: 5.2 rgb24_to_y_1280_neon: 4.2 rgb24_to_y_1920_c: 8.0 rgb24_to_y_1920_neon: 6.0 Signed-off-by: Zhao Zhili --- libswscale/aarch64/Makefile | 1 + libswscale/aarch64/input.S | 229 +++++++++++++++++++++++++++++++++++ libswscale/aarch64/swscale.c | 25 ++++ 3 files changed, 255 insertions(+) create mode 100644 libswscale/aarch64/input.S diff --git a/libswscale/aarch64/Makefile b/libswscale/aarch64/Makefile index da1d909561..adfd90a1b6 100644 --- a/libswscale/aarch64/Makefile +++ b/libswscale/aarch64/Makefile @@ -3,6 +3,7 @@ OBJS += aarch64/rgb2rgb.o \ aarch64/swscale_unscaled.o \ NEON-OBJS += aarch64/hscale.o \ + aarch64/input.o \ aarch64/output.o \ aarch64/rgb2rgb_neon.o \ aarch64/yuv2rgb_neon.o \ diff --git a/libswscale/aarch64/input.S b/libswscale/aarch64/input.S new file mode 100644 index 0000000000..ee0d223c6e --- /dev/null +++ b/libswscale/aarch64/input.S @@ -0,0 +1,229 @@ +/* + * Copyright (c) 2024 Zhao Zhili + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/aarch64/asm.S" + +.macro rgb24_to_yuv_load_rgb, src + ld3 { v16.16b, v17.16b, v18.16b }, [\src] + ushll v19.8h, v16.8b, #0 // v19: r + ushll v20.8h, v17.8b, #0 // v20: g + ushll v21.8h, v18.8b, #0 // v21: b + ushll2 v22.8h, v16.16b, #0 // v22: r + ushll2 v23.8h, v17.16b, #0 // v23: g + ushll2 v24.8h, v18.16b, #0 // v24: b +.endm + +.macro rgb24_to_yuv_product, r, g, b, dst1, dst2, dst, coef0, coef1, coef2, right_shift + mov \dst1\().16b, v6.16b // dst1 = const_offset + mov \dst2\().16b, v6.16b // dst2 = const_offset + smlal \dst1\().4s, \coef0\().4h, \r\().4h // dst1 += rx * r + smlal2 \dst2\().4s, \coef0\().8h, \r\().8h // dst2 += rx * r + smlal \dst1\().4s, \coef1\().4h, \g\().4h // dst1 += gx * g + smlal2 \dst2\().4s, \coef1\().8h, \g\().8h // dst2 += gx * g + smlal \dst1\().4s, \coef2\().4h, \b\().4h // dst1 += bx * b + smlal2 \dst2\().4s, \coef2\().8h, \b\().8h // dst2 += bx * b + sqshrn \dst\().4h, \dst1\().4s, \right_shift // dst_lower_half = dst1 >> right_shift + sqshrn2 \dst\().8h, \dst2\().4s, \right_shift // dst_higher_half = dst2 >> right_shift +.endm + +function ff_rgb24ToY_neon, export=1 + cmp w4, #0 // check width > 0 + b.le 4f + + ldp w10, w11, [x5], #8 // w10: ry, w11: gy + dup v0.8h, w10 + dup v1.8h, w11 + ldr w12, [x5] // w12: by + dup v2.8h, w12 + + mov w9, #256 // w9 = 1 << (RGB2YUV_SHIFT - 7) + movk w9, #8, lsl #16 // w9 += 32 << (RGB2YUV_SHIFT - 1) + dup v6.4s, w9 // w9: const_offset + + mov x2, #0 // w2: i + and w3, w4, #0xFFFFFFF0 // w3 = width / 16 * 16 + cbz w3, 3f +1: + rgb24_to_yuv_load_rgb x1 + rgb24_to_yuv_product v19, v20, v21, v25, v26, v16, v0, v1, v2, #9 + rgb24_to_yuv_product v22, v23, v24, v27, v28, v17, v0, v1, v2, #9 + stp q16, q17, [x0], #32 // store to dst + + add w2, w2, #16 // i += 16 + add x1, x1, #48 // src += 48 + cmp w2, w3 // i < (width / 16 * 16) + b.lt 1b + b 3f +2: + ldrb w13, [x1] // w13: r + ldrb w14, [x1, #1] // w14: g + ldrb w15, [x1, #2] // w15: b + + smaddl x13, w13, w10, x9 // x13 = ry * r + const_offset + smaddl x13, w14, w11, x13 // x13 += gy * g + smaddl x13, w15, w12, x13 // x13 += by * b + asr w13, w13, #9 // x13 >>= 9 + strh w13, [x0], #2 // store to dst + + add w2, w2, #1 // i++ + add x1, x1, #3 // src += 3 +3: + cmp w2, w4 // i < width + b.lt 2b +4: + ret +endfunc + +.macro rgb24_load_uv_coeff half + add x6, x6, #12 + + ldp w10, w11, [x6], #8 // w10: ru, w11: gu + dup v0.8h, w10 + dup v1.8h, w11 + + ldp w12, w13, [x6], #8 // w12: bu, w13: rv + dup v2.8h, w12 + dup v3.8h, w13 + + ldp w14, w15, [x6], #8 // w14: gv, w15: bv + dup v4.8h, w14 + dup v5.8h, w15 + + .if \half + mov w9, #512 + movk w9, #128, lsl #16 // w9: const_offset + .else + mov w9, #256 + movk w9, #64, lsl #16 // w9: const_offset + .endif + dup v6.4s, w9 +.endm + +function ff_rgb24ToUV_half_neon, export=1 + cmp w5, #0 // check width > 0 + b.le 4f + + rgb24_load_uv_coeff half=1 + + mov x9, #0 // x9: i + and w7, w5, #0xFFFFFFF8 // w7 = width / 8 * 8 + cbz w7, 3f +1: + ld3 { v16.16b, v17.16b, v18.16b }, [x3] + uaddlp v19.8h, v16.16b // v19: r + uaddlp v20.8h, v17.16b // v20: g + uaddlp v21.8h, v18.16b // v21: b + + rgb24_to_yuv_product v19, v20, v21, v22, v23, v16, v0, v1, v2, #10 + str q16, [x0], #16 // store dst_u + rgb24_to_yuv_product v19, v20, v21, v24, v25, v17, v3, v4, v5, #10 + str q17, [x1], #16 // store dst_v + + add w9, w9, #8 // i += 8 + add x3, x3, #48 // src += 48 + cmp w9, w7 // i < (width * 8 / 8) + b.lt 1b + b 3f +2: + ldrb w2, [x3] // w2: r1 + ldrb w4, [x3, #3] // w4: r2 + add w2, w2, w4 // w2 = r1 + r2 + + ldrb w4, [x3, #1] // w4: g1 + ldrb w7, [x3, #4] // w7: g2 + add w4, w4, w7 // w4 = g1 + g2 + + ldrb w7, [x3, #2] // w7: b1 + ldrb w8, [x3, #5] // w8: b2 + add w7, w7, w8 // w7 = b1 + b2 + + umov w8, v6.s[0] // dst_u = const_offset + smaddl x8, w2, w10, x8 // dst_u += ru * r + smaddl x8, w4, w11, x8 // dst_u += gu * g + smaddl x8, w7, w12, x8 // dst_u += bu * b + asr x8, x8, #10 // dst_u >>= 10 + strh w8, [x0], #2 // store dst_u + + umov w8, v6.s[0] // dst_v = const_offset + smaddl x8, w2, w13, x8 // dst_v += rv * r + smaddl x8, w4, w14, x8 // dst_v += gv * g + smaddl x8, w7, w15, x8 // dst_v += bv * b + asr x8, x8, #10 // dst_v >>= 10 + strh w8, [x1], #2 // store dst_v + + add w9, w9, #1 // i++ + add x3, x3, #6 // src += 6 +3: + cmp w9, w5 + b.lt 2b +4: + ret +endfunc + +function ff_rgb24ToUV_neon, export=1 + cmp w5, #0 // check width > 0 + b.le 4f + + rgb24_load_uv_coeff half=0 + + mov x2, #0 // w2: i + and w4, w5, #0xFFFFFFF0 // w4: width / 16 * 16 + cbz w4, 3f +1: + rgb24_to_yuv_load_rgb x3 + rgb24_to_yuv_product v19, v20, v21, v25, v26, v16, v0, v1, v2, #9 + rgb24_to_yuv_product v22, v23, v24, v27, v28, v17, v0, v1, v2, #9 + stp q16, q17, [x0], #32 // store to dst_u + rgb24_to_yuv_product v19, v20, v21, v25, v26, v16, v3, v4, v5, #9 + rgb24_to_yuv_product v22, v23, v24, v27, v28, v17, v3, v4, v5, #9 + stp q16, q17, [x1], #32 // store to dst_v + + add w2, w2, #16 // i += 16 + add x3, x3, #48 // src += 48 + cmp w2, w4 // i < (width / 16 * 16) + b.lt 1b + b 3f +2: + ldrb w16, [x3] // w16: r + ldrb w17, [x3, #1] // w17: g + ldrb w4, [x3, #2] // w4: b + + umov w7, v6.s[0] // w7 = const_offset + + smaddl x8, w16, w10, x7 // x8 = ru * r + const_offset + smaddl x8, w17, w11, x8 // x8 += gu * g + smaddl x8, w4, w12, x8 // x8 += bu * b + asr w8, w8, #9 // x8 >>= 9 + strh w8, [x0], #2 // store to dst_u + + smaddl x8, w16, w13, x7 // x8 = rv * r + const_offset + smaddl x8, w17, w14, x8 // x8 += gv * g + smaddl x8, w4, w15, x8 // x8 += bv * b + asr w8, w8, #9 // x8 >>= 9 + strh w8, [x1], #2 // store to dst_v + + add w2, w2, #1 // i++ + add x3, x3, #3 // src += 3 +3: + cmp w2, w5 // i < width + b.lt 2b +4: + ret +endfunc diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c index bbd9719a44..4c4ea39dc1 100644 --- a/libswscale/aarch64/swscale.c +++ b/libswscale/aarch64/swscale.c @@ -201,6 +201,20 @@ void ff_yuv2plane1_8_neon( default: break; \ } +void ff_rgb24ToY_neon(uint8_t *_dst, const uint8_t *src, const uint8_t *unused1, + const uint8_t *unused2, int width, + uint32_t *rgb2yuv, void *opq); + +void ff_rgb24ToUV_neon(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *unused0, + const uint8_t *src1, + const uint8_t *src2, int width, uint32_t *rgb2yuv, + void *opq); + +void ff_rgb24ToUV_half_neon(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *unused0, + const uint8_t *src1, + const uint8_t *src2, int width, uint32_t *rgb2yuv, + void *opq); + av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) { int cpu_flags = av_get_cpu_flags(); @@ -212,5 +226,16 @@ av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) if (c->dstBpc == 8) { c->yuv2planeX = ff_yuv2planeX_8_neon; } + switch (c->srcFormat) { + case AV_PIX_FMT_RGB24: + c->lumToYV12 = ff_rgb24ToY_neon; + if (c->chrSrcHSubSample) + c->chrToYV12 = ff_rgb24ToUV_half_neon; + else + c->chrToYV12 = ff_rgb24ToUV_neon; + break; + default: + break; + } } } From patchwork Tue Jun 4 13:55:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 49544 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9183:0:b0:460:55fa:d5ed with SMTP id s3csp2704526vqg; Tue, 4 Jun 2024 06:55:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUEJU1BvWWecXYvgTtv3WyMKSywyngUqaLxbBpQmROru7VYqCIVm31ugk5ArAj6B2Jwe2qbnAWD99A/rXdWA4pvr02w0WtPCrTTjA== X-Google-Smtp-Source: AGHT+IF6Gq/aNw9TVAGsd87CVmSW2daDySwkeBgQXZHUjENaPF1UlKV7Qg4MC22TMJmmXh9RAMc3 X-Received: by 2002:a05:6512:3d10:b0:52b:851e:256 with SMTP id 2adb3069b0e04-52b8956960bmr9619542e87.2.1717509353077; Tue, 04 Jun 2024 06:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717509353; cv=none; d=google.com; s=arc-20160816; b=qt4QZnA8KIqN/qanZ9Sj8QbdbthSgj/XSzr8ndOxPUunTaHtNMe0e+1A/vXG/UKPaY RJu4dpxhjbgalL7GE4tTOKDHVBdUsZAHdKiEv3ACOeSdHRKIDFmrueZpH9jZtQxEFd8b 7nrtKmSnBHP5MN8s02EphQZp3QJS9a0H9OfXbQP9fzP+xiNjerMLaFP6YcZ359C5pDX8 +ynQaxjEVn48cwdpWXVLIf3NM8VBj3zLnkZffF/Ws7MVxjgX23jWmzlU8RXncdbm3EsV J8rMgGbG1XNRWbWCePtfRjBcB6VuKObg0LMz9M1tHmgV9NBzgjyXzI0zkE1J2QsQdrYg GoKA== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=XH00J3AigAkfx6f7VZHa/2sE9qUOxQE6ARjmiFmJerk=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=HZxnbNhYOpBS13ZLyEjJI97aOjOTEgGyiLOekiLl7Oi1Pjhqe8REHp7m9qw/uzfcn/ cEiPJzFaNpc3N4FyFLpHwM2eu9xVFwvP/oVxwo8Wxqw8pUFDTRdB/VsQGx6sX2suK5S3 BhWWiJzgOOZNEqCqbv7/cZC6VioWNDjI4Kr7Yqql39fQVHAno9D3AjA0gmRWOkCmea+k fMbMAU8uF9MPoPeusU+ckDSqnrW05fApnLuO/qU/NsQYW4WdWkXzCAGyFq0QoO6IldnM 4CaCw2UHlET/g7IUGRDjqhB2Qd8v88x7q8agKv7EsVl9PNEj6g2t/9/kgHmD8+tIpWzj +M8g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=yxhStjps; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57a31b81058si5318566a12.112.2024.06.04.06.55.32; Tue, 04 Jun 2024 06:55:53 -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=@foxmail.com header.s=s201512 header.b=yxhStjps; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 495FB68D702; Tue, 4 Jun 2024 16:55:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7740968D6C8 for ; Tue, 4 Jun 2024 16:55:19 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1717509308; bh=9/8gfB4hstNpn6x0uxEXjQjEGI97NdKZDcr046pZ+iM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=yxhStjpsyWpcYJks0RrbukLfC/bLMGDfLSUIEopP2HhYdHd4gCI56uvmIeqceFafS d6t4Jtq5LVDYhlrm63eFhaQ52D1taZV6xFb+D0Z8F8UHPmUiPSBPtNlcBUYCvzRYD7 WhPAB/XuQwkARswo6BvDuv4gwL1wFs4nXRmaDshw= Received: from ZHILIZHAO-MB1.tencent.com ([113.108.77.51]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id DC59C61C; Tue, 04 Jun 2024 21:55:05 +0800 X-QQ-mid: xmsmtpt1717509307tf943mqyc Message-ID: X-QQ-XMAILINFO: OZZSS56D9fAj/BZeIY7ibKMCh2hjn2f8rh9SdUJizVmz+kesYd2lwV4o0P3/mB Lol1WVKl5zdzLAS849u5yEdV0KX86io/KbkBlAtB58XFrk9inJAa1AQUyoFQg2TCrzsh10AzBNb+ fu8VXegtxJEhLryLgqIaKfO5bfGKyi9XMd52u4dX0tWHtpDasW0Z16ZWuFcdeYNWh7fEWLG9k3ZW J7SipMjxIq9iIh3Z46i50gCUwvpkojq75Yljocg3Ff8bsokNhnYJPBDv6c4z9wh094TxKgJnBdmr w6VBZ4mjbBhnWJlbJQoSzbD3rwyLEcehgNFwSO7uNkFh9u1pDWZ3Qeu1LafIYikSRKb6cyWajuD0 jmQcWeQJ9ks8CkPv/LVzqtGR1f6XBcWLXdEv+IXUFK0Q4arqSamPEjjMOhs90C03WhM6xikTKhfL j98iQTkP436UXwfPdIH3WiDkRsxzW6I2+e4CO6P4HbHxNf7bZXxLhhaDfcEjxmE9+fEqLmQ9ukuu 9QLUJ5zQZLuijm2DoJPlb71hS/U4MYQJQW4zM4RYQsDJ79u3QQPynB0rafsYvZb9x2WvvG75Vu0+ OhQUz8wv06u604yBMAMX1nUSvPnm4mFDK48PkOg9CAZICEtxfOYbLyk0jo1amH9n27DwfE0q2jva O4FUqxkevWBj8a64U2qt6UH3MTdtaDw2pBZ0YeCOW/pyZB5VcXf0taSj6lQ0QQCX2gapqW7Y0x/4 BPi6yiFTTgxCvKTVq5RIOhb2oehgy8cmdxiZs+aTd/mKGW/Rd2EGXj1xla32ve0cT+bjYDgV1Q0c IoQQ1+um7mbw4EwlymWdWvpbsGAznDC/Ayv7sWzFL5RT94wbomIk8YoyE5ToEaP7Bywo+iUf+OgO WoHM/qPN2bJ5ExxVbAQICaR7K1sYCIs5ulR4/6wxI/lLEtMBykxqikFS167GHeIFPC5/edGV1cr4 JNvToEPxAxl9C0xf/e6Nb1WR9ZHz/WE3t3N52xM8P2ryOsUozTmg== X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2024 21:55:02 +0800 X-OQ-MSGID: <20240604135504.83169-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240604135504.83169-1-quinkblack@foxmail.com> References: <20240604135504.83169-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avutil/aarch64: Skip define AV_READ_TIME for apple 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 42WvQWkOSpIT From: Zhao Zhili It will fallback to mach_absolute_time inside libavutil/timer.h --- libavutil/aarch64/timer.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavutil/aarch64/timer.h b/libavutil/aarch64/timer.h index 8b28fd354c..fadc9568f8 100644 --- a/libavutil/aarch64/timer.h +++ b/libavutil/aarch64/timer.h @@ -24,13 +24,7 @@ #include #include "config.h" -#if defined(__APPLE__) - -#include - -#define AV_READ_TIME mach_absolute_time - -#elif HAVE_INLINE_ASM +#if HAVE_INLINE_ASM && !defined(__APPLE__) #define AV_READ_TIME read_time From patchwork Tue Jun 4 13:55:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 49547 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9183:0:b0:460:55fa:d5ed with SMTP id s3csp2704653vqg; Tue, 4 Jun 2024 06:56:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW0S0BGrkZaK8JZGk7BdvT0v1ZlR/7OAEhw2BslXIAcqCNF+9TOIkDkV+pDzVCDvaPJDOv1S9xMARh6uLm06ejsyEom1HmilYfUhA== X-Google-Smtp-Source: AGHT+IEjDCaGmCG9ol48/01ICqpi54OJfU17ebFbXjaf1jBYm1JgxZ27j0zBq3wDxz+unikH935T X-Received: by 2002:a17:907:516:b0:a59:b88c:2b2a with SMTP id a640c23a62f3a-a6821b71cdemr631435766b.50.1717509365927; Tue, 04 Jun 2024 06:56:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717509365; cv=none; d=google.com; s=arc-20160816; b=m3ue5dJcrZ1Q5l39abuZkxTLoorg0Y2Z7kXB8rIMLyGRLp80OLKDOfEId0goa/H5TI 6u9vTF+HZA1flWKpXYkqOXQGyt0iRp8wKMv0HBKKDZeX4Q81EJNa24AnDv3Bf8YI5puh 5ILtoEyclv1Ys1YvguGSBRksaEoVQzw9QHeRzVMiDayZIb3hxadLorZ5flUSjp35c5Ct KX8id9jkXUxa8ggj0LW9D8/lnWisCGczMw3rZ8ECvcf1CZT9dJUa3CImOigA+OnjbYPu o60/UtyBYtt2OkjokAevaSoA2ARB3MzGHMWgRMA4/LWbG3ZZJEwndCUI2EP1h8TJyX3Y 6VKQ== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=gfmH/wqPVzVBGN6F4PS2orUhZqx0vCjmcFmBcIqRWl8=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=SONyKpW4k5e/MV/dTlAkbrupcKJavrRZtGn40TWkIGKYVbhnEWaFVQuyw3XAYU1Fcj dkmyuWZQr3beHeaCkFdRpTVmhHvtn17IoZN8aKgmfTdTWciC9u7sx/7LCFQ5K0bubnha fFjs2tCT0gbPX03Ot7w0TsOEh2ZYdGgF1WE4hSoSACq/91xh+zEjJp271+1TNFGRbCyg Hyym/CKljt+DoJiXaFBBfumZ6PxxPAd4OUb1O1Luwc0LjZydjTKRPtKjsBlbGNebpdnU agGKAxq38M9sNkCvSugepXe6VO3JcAq1uDO09FKx1qyjwpqAm+CG+2lkSKr2x/OrUa/g bhHQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=tpd2Vu2N; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a691740d423si180392266b.102.2024.06.04.06.56.04; Tue, 04 Jun 2024 06:56:05 -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=@foxmail.com header.s=s201512 header.b=tpd2Vu2N; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CEB0368D714; Tue, 4 Jun 2024 16:55:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-80.mail.qq.com (out203-205-251-80.mail.qq.com [203.205.251.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BED5468D6FA for ; Tue, 4 Jun 2024 16:55:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1717509309; bh=8nR3hXTFPhmXyMWZEPO1v5DP9gO7q88/bcN1D9Mmn2Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tpd2Vu2N/PahLhbI0wwJfcemprc7M7GhY7wmEoQ2XPuht45FzJmqpo2AoMEKGEJdP 1be+1R3QUiq4Ypo3cWcDExjDxiSzohCCoJEcvL13lvOtn7QI4EVFG+uWEw3QWelWps O1oGD8bk58hdxDWHIlPAeqCproXVHsmG6zSncpTs= Received: from ZHILIZHAO-MB1.tencent.com ([113.108.77.51]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id DC59C61C; Tue, 04 Jun 2024 21:55:05 +0800 X-QQ-mid: xmsmtpt1717509308toyxlky4w Message-ID: X-QQ-XMAILINFO: OKkKo7I1HxIefiM35g090iNFi8bxmhcGVNUWJ1FOMYTB5jzu/+82Afzg4RIj7S 3bxucJx262rF+tpc6tINz8zZkEfQl6U8DKOoGV+t8vOJjQgYqhG+9AzQvBI1caAfo4I9h7HA7a44 8FiBRGg/wV+zTqQ1FhlRSUhVPNYfPeioTC/OyEZ6TKfI5kIzrmt97rfVeihhvgawuoOiIVPGnybb Tkz//GpPlMPwDNTe+3FUjIG4MiUxKt8fASJKHSvCjnDdzLdyIVDaqe9quEhqcpWlI7P+9Y4jRs6G gz/osT0j+sNRUSIvDXc8nBCAlOdN1Ul0DrSg/l9iWBqlMCcTbWJF9McdUsHCMiqmrvOjz8KHTMVh H237mBKOG27bjzKod+2ThQ9X2DYud9bl8IynGXe5C+lCfP68qnWG86/2LDD0A4sBPxAT2xL8Uu2M /W6pOdHu8hH3qbS5SiIkIaiSm8ctU9Ji7oQan737+913e0OQ7B4Zkr3xWhk/RUpF/HfD2CZ5YNT2 yjChK5g21C2RJXgIG9sdaJfmT+cMpDSRT7Mjgg48ckyP1a+9O84ts/hy2JVmY5d8jLrU7oj7D+W8 tV850CufSGtYxPqBty5FHFwwa6OoUH1dYUGOTaTLdlLIv9AQOuliAYB05xHWa/HXwwIuCzhJclPj v6RYhQcoet4g+/WMXHFGv7ZLEzJPgMMjeQg9f1OfuqJrnA8AfETTszneIcpJSKJZnEtu5gZJKVmi TDaAtqherZsSbfiO5SCYW3aCZlvMT3w0r3Fy9Y4YLdlxp9069mtKHZYY3+r5VYTe24xIX8yjYOpY jav/A8TUr0cnt8eXcqLlrXDOAceGY7CPnIMsas88sKsGHhcfhbhgh0A8WCAaD5KIv/msL13fxxdW 4AD9Do5hcOE50LbiJCoX8aTGWLzQmAytwqJN0BSn3jvady6dPai8WhLQ2bhK2BwOiLFAIOtTUhD2 ucPaWxhSyyaiSR9hYfiWnqeayY26XTOFbLvN0GiQMl3kSd/oV+OhOVQTuLDEs3kzBrfCeGQLMzEI yJNmI8xg== X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2024 21:55:03 +0800 X-OQ-MSGID: <20240604135504.83169-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240604135504.83169-1-quinkblack@foxmail.com> References: <20240604135504.83169-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avutil/timer: Add clock_gettime as a fallback of AV_READ_TIME 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bES/UaWcNQ99 From: Zhao Zhili --- libavutil/timer.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavutil/timer.h b/libavutil/timer.h index 2cd299eca3..74c4d84e69 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -46,6 +46,8 @@ #include "macos_kperf.h" #elif HAVE_MACH_ABSOLUTE_TIME #include +#elif HAVE_CLOCK_GETTIME +#include #endif #include "common.h" @@ -70,6 +72,9 @@ # define AV_READ_TIME gethrtime # elif HAVE_MACH_ABSOLUTE_TIME # define AV_READ_TIME mach_absolute_time +# elif HAVE_CLOCK_GETTIME && defined(CLOCK_MONOTONIC) +# include "libavutil/time.h" +# define AV_READ_TIME av_gettime_relative # endif #endif From patchwork Tue Jun 4 13:55:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 49546 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9183:0:b0:460:55fa:d5ed with SMTP id s3csp2704543vqg; Tue, 4 Jun 2024 06:55:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUkJKdqcAl/9iHuUP/neU1tARduXQk590mNnrdbGtZysxh2J4E//E/9yErjgtwiPaniJre3Kz9UHCpsLKyGbZK6N0TwPo/RI2qOoA== X-Google-Smtp-Source: AGHT+IFfzZ/vCfNDkee7LEhtbGournoAlfJPtK7ab+5oLTuV+qt5CbjVzt1SHbQha8sxRd79iRI/ X-Received: by 2002:a50:c34d:0:b0:57a:70fa:8875 with SMTP id 4fb4d7f45d1cf-57a70fa8d1amr2567759a12.40.1717509354642; Tue, 04 Jun 2024 06:55:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717509354; cv=none; d=google.com; s=arc-20160816; b=iOjQUGSKmTMqBnUbckC96YPIn2Dzc3rAsh+ow6CIShskm9GvvL6+zTJ/l6PJ9DRK2x GwckN4gd1vo51CwjOEfjya1SEDhAT5VXPU1br7tJMpZP8B3YQzEEJOoioLnU6S43o+hB L8vnh+hNHaOKvdknIrE7Em67zovbwNOaCmNJykB/clheZ/3Y8ZJVfThyiVJvLqh/kvvT Gj6iCbE38xSiKUz/Po76Fajd0DrzsMNz3etELSNLEZXGafm6xO4JqZY97q9CqKQQUdGE 6akFvRf4Aj7fipD4qdhpDLXUL2PHnykdYc38IOSMotZog/jdtKoJeiFe8m5bCrNHjpqA 5LLQ== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=+eObdjZSiXAHo3H47kzsYJC3pwsBmE+t8vnfk/FETYc=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=JBu5Yybj/53T4NDSS2/AwJfKtR1j/CQwSv6RqTqGfqZo74wXBPvX8tLnYkcrJtDV1X QimFKxhItWP+1+ohF4Xm/434cvUJbxeA1hSL1yRsNW4s4Z0INCkSa/r3zuzaIovYl8v6 UnFwR/QXlR1GAqb1Ixn0CAMUuYEs2ZlACJlj9ChAW9+F3AeIqw7SVo4ivRu2rYA0WF+e ubFAc6jHUVZ9IIJGRseub6yiPHHAQXAl9ZwAQr82+JeJJdCCz7Xgs/JUqgIDahvZHuml qJSdcOaabZogcXSSPZ2yujQvXVYAhjANam0ONZdJ6bqer/MhXVDVUh95tUfO3pDDKaYt JPNg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=iAksBJjO; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57a31ca5be6si4940746a12.526.2024.06.04.06.55.54; Tue, 04 Jun 2024 06:55:54 -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=@foxmail.com header.s=s201512 header.b=iAksBJjO; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA69568D70F; Tue, 4 Jun 2024 16:55:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-36.mail.qq.com (out203-205-251-36.mail.qq.com [203.205.251.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 837AC68D6FB for ; Tue, 4 Jun 2024 16:55:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1717509310; bh=xmCXBScyJLrDZlxzXtVZUkTn+xNpo+IpzQikocvEfeo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iAksBJjOyOfEvUQhx9qV/CauAD2Mhn6TFacnfqjqs8EMDmVh9mt5I974cl0HiZ8+D 6EiOw64jquODDASqAUCnWb8aTK630gdL/yHo9tKnbXFfSzrZPh8bva6cnMVdAj1gA1 A/FNr12axYiBGoiQuJNYYoUbzz1oK3aacyFu57W8= Received: from ZHILIZHAO-MB1.tencent.com ([113.108.77.51]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id DC59C61C; Tue, 04 Jun 2024 21:55:05 +0800 X-QQ-mid: xmsmtpt1717509309txv4hnh89 Message-ID: X-QQ-XMAILINFO: NkHKfw09D6j8Mr3e6EuYzqu22Zhec5siHF1e/p6cjNMXDQq6B4ESS/7UW3AtYa PM5CMjd98Wd2Xtj5x+gwCvpFJR+W0Jb5HRV/tWff8WcXmuJ4TZk4Guk5pFp4BsQq21NACIuZ33Df FmlOIQ/T1DgSFuwzvY9rep/tKnGCemE5f3LyLMp3UGo4Ox4053L4q45nz6aJcPX0t7IE92yQesXX GKO36x/pgdEjPlNW+81eduI7cVmgkRDrPlELNPez9UkpsI+HCh6bp3fcOomJ5Oe6DQZ9fBRqvxUG t6Dtz4DVSfVCuuQKl0FZUJb+zWtjPruSbiYsNQYOOiu18fn0SGH74PHAW4eBJ9t10PaKhBBjQoJ8 emlQxqvbDJ1gk3T8ccUgvIxSKLjuOVXGg9wqRVBD4MHS99ZAkwQ92Dm8HDbbM44+B+mhuOkfwgiG TQUqdYMXggzMDCJcmz8A7COiGhiTpjX7EbI7z3KBuQ4sCCVXPDqHwym3TGY4yLdUHc72eav35syA ATk0dVvHob2hWL6Hv1ZWjEVslYUOwj4It8ik4X6W4XOyjR6hBGMjU9gb4eWZbVOn7pKyHDdCfP14 2ZM1uwSGRhec/1jeMxS8AEtGngSn2NKDQEk+HLRuxCxjirWzgoawvdHUbEF5Zc4CjGHErC6S5JcH ThHxMwm2nCvQAj5YKaRkdZ+xLYPyAO6rbk39fExQG2jpT8uKg5uL9sCvSRsly4e83tANgUUNVURn UCQFt+kVv3viFe5fyuNTThkP3hWRelNPEd6bs/ZeQOBQ1DWoN37LrIo2kDqKRV/7gyx6lQ2cNuQB 14KIfKUuNHUKCUZxi/PvHvyQMaHtapSHy5DOlhIS50YoHIgkeS0G9eO44KdmFru1KqID8+V+Ihjs yF/TcsZ6+DTa2g38BXDymV1i5pLVn37QG4948Jjswppj8vfecAj5hlAuZBLUVzIfFd4rtuEHxEXu XxgPPdoAewXbN2SaisHx6JKVL9M5cEvLPq0lJVWGMysKVN1SD/0g== X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2024 21:55:04 +0800 X-OQ-MSGID: <20240604135504.83169-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240604135504.83169-1-quinkblack@foxmail.com> References: <20240604135504.83169-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avutil/aarch64: Fallback to clock_gettime as timer on Android 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GE1Uo4V2cpdl From: Zhao Zhili The inline asm doesn't work on Android. --- libavutil/aarch64/timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/aarch64/timer.h b/libavutil/aarch64/timer.h index fadc9568f8..13a58b48e4 100644 --- a/libavutil/aarch64/timer.h +++ b/libavutil/aarch64/timer.h @@ -24,7 +24,7 @@ #include #include "config.h" -#if HAVE_INLINE_ASM && !defined(__APPLE__) +#if HAVE_INLINE_ASM && !defined(__APPLE__) && !defined(__ANDROID__) #define AV_READ_TIME read_time