From patchwork Thu Aug 18 07:15:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5oia6ZOB6ZOu?= X-Patchwork-Id: 37344 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp153622pzh; Thu, 18 Aug 2022 00:16:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR5MGiuEzZJY9TVf0A6vL1oIo59Qx2ScKT6ZPejFpp703HzMEa7RYmkOxq5BQEbyLV3Jkyxt X-Received: by 2002:a17:907:1c26:b0:730:960f:118 with SMTP id nc38-20020a1709071c2600b00730960f0118mr1062190ejc.650.1660806967325; Thu, 18 Aug 2022 00:16:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660806967; cv=none; d=google.com; s=arc-20160816; b=jux+DHJ5VHNzscozWcOqqZcoCVySt6m9bOFYbUqJvZYZjPUmpA9uP+kDQWMNOXk7ly y9KTZxJaAX6twsuS5BrELBnQFRVAXNyTg3p+wbJG71JgHiraL7Zn1WwCAhT3vIm/Dlmj iXz81volB9HZYedM59Na4Oa6fIJod8Pp6yCCHrWi4yxWcoMNzdlFo1INKyRyg1DjgJph KAWIgpNDuUGrD2XAjwgDPDBRXff87u2VduhTccJ2LDYOtYLksjHE2XioHbostoZGndAx aUAF9+VOLyjEaloz5GXYQ0OVgsxutHdbsAlCvpb2KvHg//unHjHCGm+/cIKQaV4d4K6C PNSg== 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:content-language :accept-language:message-id:date:thread-index:thread-topic:to:from :delivered-to; bh=IVgWOEkfoIv7qSmS9tlnH+BGQynEoVPrFKflfRtCOUQ=; b=KZK7ELrHUvHWA633xpXC2I3UncgHtaSXKmOaUU0TJiKemCUFpDSyjvTO2tG2NLC/zp f5NJy9CcA9fzfEF1Rvii9MqxLRhmIAG/SgTn7OfQLqS8AzeoqyovmiW0SZezolgsdA7k euD+FV51sY4nlMliJ98vW57O7Km08C3v+P4v0ng6FKoNoiaoZI6UMjjuwFcQPJoYSQh2 Be098ntIyeSmGas15/F+csIvDJklVQAP4fDGVBBj+0ryoqHsDrsglauV/9w3GIATUEGg sSQT5HLrPV9mdfkTvRITjAPzh3wzqyWo//P7N20nA8deMSoxpXzRKKU4sD608jzob5+Z 6BcQ== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=360.cn Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k17-20020aa7d8d1000000b004408dd7eccbsi674449eds.184.2022.08.18.00.16.07; Thu, 18 Aug 2022 00:16:07 -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; 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=360.cn Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0781A68B99E; Thu, 18 Aug 2022 10:16:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.corp.qihoo.net (bjyt-esg-p03.qihoo.net [111.206.171.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAFD968B98E for ; Thu, 18 Aug 2022 10:15:56 +0300 (EEST) Received: from bjyt-exmbx04.corp.qihoo.net (unknown [36.110.235.125]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by Forcepoint Email with ESMTPS id 1B9F292EC2B66F32B4DD; Thu, 18 Aug 2022 15:15:54 +0800 (CST) Received: from bjyt-exmbx03.corp.qihoo.net (36.110.235.93) by bjyt-exmbx04.corp.qihoo.net (36.110.235.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 18 Aug 2022 15:15:53 +0800 Received: from bjyt-exmbx03.corp.qihoo.net ([fe80::f11f:7339:143c:b42b]) by bjyt-exmbx03.corp.qihoo.net ([fe80::f11f:7339:143c:b42b%4]) with mapi id 15.01.2308.027; Thu, 18 Aug 2022 15:15:53 +0800 From: =?eucgb2312_cn?b?xt3M+u+j?= To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] avcodec/mips: Fix MMI macro replaces in HEVC Decoder Thread-Index: AQHYstH4OSORbVE4SEWSu4BVJup6hg== Date: Thu, 18 Aug 2022 07:15:53 +0000 Message-ID: <09316e8e931c4f33a5980bb97ae3cca3@360.cn> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.19.100.31] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avcodec/mips: Fix MMI macro replaces in HEVC Decoder 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: "yinshiyou-hf@loongson.cn" , =?eucgb2312_cn?b?zO8=?= =?eucgb2312_cn?b?0MKzrA==?= , =?eucgb2312_cn?b?1cXWvsDa?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /MC5Ahs0+s5I The latest commit of Loongson MMI macro replaces were incorrect. It makes a mass of green tints on HEVC videos when playing. I've compared it with the older MMI implementation, and found out that several lines have been replaced by wrong macros. Signed-off-by: Qi Tiezheng --- libavcodec/mips/hevcdsp_mmi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.25.1 diff --git a/libavcodec/mips/hevcdsp_mmi.c b/libavcodec/mips/hevcdsp_mmi.c index 0ea88a7c08..2ded3fc0bb 100644 --- a/libavcodec/mips/hevcdsp_mmi.c +++ b/libavcodec/mips/hevcdsp_mmi.c @@ -80,7 +80,7 @@ void ff_hevc_put_hevc_qpel_h##w##_8_mmi(int16_t *dst, const uint8_t *_src, \ "paddh %[ftmp3], %[ftmp3], %[ftmp4] \n\t" \ "paddh %[ftmp5], %[ftmp5], %[ftmp6] \n\t" \ "paddh %[ftmp3], %[ftmp3], %[ftmp5] \n\t" \ - MMI_ULDC1(%[ftmp3], %[dst], 0x00) \ + MMI_USDC1(%[ftmp3], %[dst], 0x00) \ \ "daddi %[x], %[x], -0x01 \n\t" \ PTR_ADDIU "%[src], %[src], 0x04 \n\t" \ @@ -178,7 +178,7 @@ void ff_hevc_put_hevc_qpel_hv##w##_8_mmi(int16_t *dst, const uint8_t *_src,\ "paddh %[ftmp3], %[ftmp3], %[ftmp4] \n\t" \ "paddh %[ftmp5], %[ftmp5], %[ftmp6] \n\t" \ "paddh %[ftmp3], %[ftmp3], %[ftmp5] \n\t" \ - MMI_ULDC1(%[ftmp3], %[tmp], 0x00) \ + MMI_USDC1(%[ftmp3], %[tmp], 0x00) \ \ "daddi %[x], %[x], -0x01 \n\t" \ PTR_ADDIU "%[src], %[src], 0x04 \n\t" \ @@ -690,10 +690,10 @@ void ff_hevc_put_hevc_epel_bi_hv##w##_8_mmi(uint8_t *_dst, \ \ "1: \n\t" \ "2: \n\t" \ - MMI_ULDC1(%[ftmp3], %[src], 0x00) \ - MMI_ULDC1(%[ftmp4], %[src], 0x01) \ - MMI_ULDC1(%[ftmp5], %[src], 0x02) \ - MMI_ULDC1(%[ftmp6], %[src], 0x03) \ + MMI_ULWC1(%[ftmp2], %[src], 0x00) \ + MMI_ULWC1(%[ftmp3], %[src], 0x01) \ + MMI_ULWC1(%[ftmp4], %[src], 0x02) \ + MMI_ULWC1(%[ftmp5], %[src], 0x03) \ "punpcklbh %[ftmp2], %[ftmp2], %[ftmp0] \n\t" \ "pmullh %[ftmp2], %[ftmp2], %[ftmp1] \n\t" \ "punpcklbh %[ftmp3], %[ftmp3], %[ftmp0] \n\t" \ @@ -707,7 +707,7 @@ void ff_hevc_put_hevc_epel_bi_hv##w##_8_mmi(uint8_t *_dst, \ "paddh %[ftmp2], %[ftmp2], %[ftmp3] \n\t" \ "paddh %[ftmp4], %[ftmp4], %[ftmp5] \n\t" \ "paddh %[ftmp2], %[ftmp2], %[ftmp4] \n\t" \ - MMI_ULDC1(%[ftmp2], %[tmp], 0x00) \ + MMI_USDC1(%[ftmp2], %[tmp], 0x00) \ \ "daddi %[x], %[x], -0x01 \n\t" \ PTR_ADDIU "%[src], %[src], 0x04 \n\t" \ @@ -773,7 +773,7 @@ void ff_hevc_put_hevc_epel_bi_hv##w##_8_mmi(uint8_t *_dst, \ "paddw %[ftmp5], %[ftmp5], %[ftmp6] \n\t" \ "psraw %[ftmp5], %[ftmp5], %[ftmp0] \n\t" \ "packsswh %[ftmp3], %[ftmp3], %[ftmp5] \n\t" \ - MMI_ULDC1(%[ftmp4], %[tmp], 0x02) \ + MMI_ULDC1(%[ftmp4], %[tmp], 0x00) \ "li %[rtmp0], 0x10 \n\t" \ "dmtc1 %[rtmp0], %[ftmp8] \n\t" \ "punpcklhw %[ftmp5], %[ftmp2], %[ftmp3] \n\t" \