From patchwork Sun Oct 2 21:18:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38525 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp963901pzh; Sun, 2 Oct 2022 14:18:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM72A+PIYEQTi0z2mdBgNP4c6yVUyCMWGI48yVih+vAXQfeGn22P1Lgqn1+WomYvVFZC9VEU X-Received: by 2002:a17:907:7204:b0:783:ce92:d75e with SMTP id dr4-20020a170907720400b00783ce92d75emr12840084ejc.682.1664745507031; Sun, 02 Oct 2022 14:18:27 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2-20020a170906318200b00783ac0b4d32si5833649ejy.941.2022.10.02.14.18.26; Sun, 02 Oct 2022 14:18:27 -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=@outlook.com header.s=selector1 header.b=Xidsl7K5; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B26F68BC02; Mon, 3 Oct 2022 00:18:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075028.outbound.protection.outlook.com [40.92.75.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B200468B2A8 for ; Mon, 3 Oct 2022 00:18:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iVTBeZTeqWr4mbPIqVgEI64wvJiz0sil8m40MxqIpSmR4oVCpGPvyKeR05FKfy+wvCQ3J914fD+uBkEYB2IbeDSPDhIWl3NEDiS2yICY2/l5UOvxVrMst394xkKZni9mWfhce3yVZfu+Pfa81ffDREFK/zVolUzvjtPP5R0Epahpu0PJL1wzSgR2l2tZFBcKhaXVmiGQwnkZf5vscUhL+MipbkhObo0EGTr+ej1z2QIKOgENgTthgHyu/+qDfW7RjqbdZ9h9EBP3iwL3vfLs91PMKEMn7uQdHR6W4ojvPVJWiLYN8/G/aHMCbhIS9KsU1+ILwX48yRQmyRjUZyObBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VDjoc6AK6OFy4PgJtB+oxtsMEpbCnnnrSdcYmqUVnM8=; b=RWmuU4IpWlK0wjuCPpZXmh3NoUL2VDgsXC4coTRDwT5IbfTeT5QUdB8b5mHt7zBr49zXKeQ3zP5InwKBEFy5R5+7m/zpmIegvquVZPBmvFdWmkb7YwluYJTmiA7a54waQYXZl1sqwfWEEgUrNqNBFewj1UkJ0KMMymhETc0fYpwhXq6IZchn9zp/H/5R+mgGKVaX3UiRfYfUM/ddYZx0kNOGJbld6Q47AQ/PLGx3bgd6pd1KICVyG4rAa39hWPAsUWDfMBXqhc978Zea2BxrL6DJNvHx68F+OrmN2cG4hsIOUph/aJ8l35P9J0Ug2GfK1OaKXrxIEnd4u41FfPQ8Jw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VDjoc6AK6OFy4PgJtB+oxtsMEpbCnnnrSdcYmqUVnM8=; b=Xidsl7K5ntdn4sL6tohxhPEai2OAdj94czNjCDEqrq9uaumEkHBxbUO0Mbni/NlUC/lnQ8yfL9jQtGRfhvKW9wg4uVgwu/QMJv8yMkZtkhG8k1zTEquOWnoyP1g3swP1NzoNkUHDwFvRQU8N7oHMYZbvzcxNftXwSIecxqaTn2XkLlNLjB+QroVDqLDtcgTHSiTzXXogeGKJxQum6szf8NEjjeANO9hakZ53GG7GS8xIFRpk8FJ9RXsYuMKAYxkugszqEFpwssBB6VF2UBLg23qar71X8Fi6YLCEZ/yu9cmFvDri2ARWajJOFdspdO3WVaUC2DjlE5cm5uBxmrfXWw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0290.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Sun, 2 Oct 2022 21:18:16 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.023; Sun, 2 Oct 2022 21:18:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Oct 2022 23:18:11 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [4H0IptBO0xYTO3/8ihvsCqoMfbQuGgT2CC2HxXB7Ee8=] X-ClientProxiedBy: ZR0P278CA0180.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221002211815.959423-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0290:EE_ X-MS-Office365-Filtering-Correlation-Id: c7f12f7c-dcb4-44ed-1330-08daa4bb9ee2 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmq9S+lyC0Rq4VBpsdMYmcOkV/OnGDDUVJc7Ekb94FRqrkvIr7mnCtF6BaoRHWsTL8ThNTsKRKbWZwRrWKyccD92ctbPKyr/C0LzrWMumis4PnAUliiUXhKPhdX8ByXiyct5sGJlR5BV5wDX0+nK16WYX4EDzDQwQMXFjJRzEKUEfsEf5Cn3ZfdOjmkhzP7tn/hUr5Iu9F6TntLnFLIdlcZSMf1gEBPwX97kgwOjEEUEC6LlAMG9xItWcRvlcLqk3mywnZTHlT2N6B7QT2MWJqAw5V7DFqZUyRQfF8E9aOdvKW5s0e3rriP7ljuOuArNVvzXHlLjgcZU5yHHCh3RmEoofpH55qmBwOtZkQt2SwXhm3LLMIQsUHwhm+Z0X5u5k9QmOBgKMRF7p3yw7R1t0JiYf03zpPA1j/DjFRHkPAk4osIjZ+kaqVmRHczPr+kJFuJ6boMehNK9umbNYFgi5XeW8Sc5wfGmkULtMHAilXvt3G+hyI3ovl9AsIUsFktWPxi7YQ9ZOOucf2ewufs0ih9UNkOPKUBVtMzouePwi6FaUb0I18HNhhMTJfKnC55aQ8kxELyzxLTRydb5zgXHmarRdBW6oU3HXqqQY3jYzzb2wLPxHV6IMh2FUPYhQewupwdRIU/Jo5e3dyKWGwFIwpu+d7Ok7XlzuClHvm5rnXLC6gNZyESZqkiNfG2E/vvF6554mt9RY/Sy7R/fhjcgTmvl307P35WMyktszKMtBK7uWurzi37UQIIABEJ+KrjbvRA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BzpMzMPPzD9NJ7vrv19G2wm4nPs2sE7uBw3mYTURhz351vzNrHfp1+LhrbMgpcGjwluPEAQuIrNgP5WvxevIznmTd0QzfQmW87buzf8UzvVxR1D76CRbBGPNvuSWsGVLsKKS762WV8oYRdBsys0yD5pKkO2y2XbL7I41k4IWpS1unxLi09HiRCIY5WUfG4C/SSv3zCmhfj4pQPo+0K8ddbu+PzS/TAY5JpVB3IUnjvc2yfKU2S0bzvFHseYbxXR5y3KrTm5R4fBrfbrvVsN8ymeeBYyu8UAjLL1j6GyA2I3oBlKxW/NNSS6g8Uq0EbwjdL2iJM0edUtUoYWdy5yv1S2JP5wufOR9h0Tq8lXXSzUzrHcOLJXbS1R6heTs1cBFuX7Rcnf0+sKDChz/OXzOwb7i+K/nRiTsKOmSDWoGQ4nFOw3w7EPchyUzlkm4pZGNc01Ldd2M+3sBEVmdr8lw+3sEyDR/ywTFRqwoyqIlDAOgoUOGoBr+mrwxoMVs2ghK8VqGt6pqi/ifAQIfoH9vHrJimInCkX5wgS52VvWVzUptzDGOFz1GwibanpvVQBmKj8qRV6f9X1pDCkELNHGOWSzNxH+JWpCiFQ/6S6Mpp5mv7Xy3qNhSJr/M/XAwULvDk0RaB2D6med/sDJWsOVM6cOLgZXcRq48xjrhzEa2GLswQkOLBXVlgm+1wsMY9Nx0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: l+lJUmS+4lqrtE5fZ4RObFiLcmMtA3ZZK1wAMYVKJ/wfQYGq+Lw7aIUWF/OIbRlWX30zIIwem8rtPa2GTCQofDuhXh+1PUdTpshhfMxqzYIk8rIcWbgd0APRVgwL9AwodsXJeD5Ch2ZP/HQig3Esy2qwyrWEbD7Cn5ZOh+2wWwHv5SHr6JgX+bHUo6u5lvRMJ6eQj5gbkLMYhAsZ1peN9M0qtIR9ayKdQ8TD8P+E8CMOqSy9fnICxqlDBP8Uzjkuv1boMJhxeACgwIck2Uz9D7BpAz+sW61gKU+vULI9wYZMcnyzaEU6DNskj/JSBlkFXl3p4Oy/9T8kLEDZEEw9NIodVLncwY8oy2gjp9PDK8imkDaC/8aqhgpRx4TaOELQSbSP8GUG9TUIPH/62P3rbg5wT5nqlkt4f7gaPzNdup/oVoZFwxAM6drpib0nDUmaNP+jsfdJejFy7cu6M53VGC/da1US3nkD1slHlwnL+oqKCodjxlErDHlmhrhIfpQ6XrRAMrF5oCJvFOBc+nTfitjhefQImg1joHHvm6E+wkTRya5CtPN9p23gMYaQDWJ5P3+PtHh1+bqalKvI6QkFDxf0E3ERmcAHa2HWxmvREVuOAO/fwYSDYE0VvMvHMi8X2oXdBU8+kYZ0brh3HEg5r+TOh9bAXWorxxjTCpsXuGb01IxrCXfjscMY2RAzaAQ28LA3HLRGIBFHb7hEsMncB51z/SIqHZgoeZ+IMtl8mQXsM6NcemSA1K8rB9eURP5PrfeYEgm7c2Qhu0BJ9YWdZth3rRgTbpCJsRCWUv+3OYmuRVJ01BpeaMU85SPEddAiEawIHTE5CNXNpDQeITzlEwj+f7fchdfxiEWV+QABBdjmfNEjPFFnD+S/9cKXVOb7xBN58l3JW6OJfemVKq8CKo6pS2gyYbbQMhWjlWWSmpIqt/RyVZFsb9htSItLz56Z9adITKTvRSyGx1kWU/5lD4V+oPHmKUFKD5t535mEvKbJmpeS4uA/SOt1KUnvb1QmCQQhVtfdr4Owdr7Gb3imuPyTs7vav8eImXPyERDM3fYXJd8De3cN5KjHhxoL4btxAvFFmxX+8zq4Uvhn9oLFlLy5w+6K+OXFpmxiy2a/WPjYZspYy4EP5sMXxq3dgvQ0EjcNWyXZ8/x7J7cStmoTk2cTIsE4upeE0hTy7YRsNvR8o2dDpn80OM3LfjXBGSCrq3MlOVHw3PZszFR+qecJ08rDO0P7eJ6ZK6U/tDFGa2C1OY82NfrgA0Pz7tL8D/XORGrirM/eQhfR3/U2+V/rShWoJTbbaMjI5emxLrjeVKA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7f12f7c-dcb4-44ed-1330-08daa4bb9ee2 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2022 21:18:15.9521 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0290 Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/mpegvideo_enc: Move SpeedHQ check to speedhqenc.c 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Xe/t7ViGXKYX Also set this only once and not for every frame. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 3 --- libavcodec/speedhqenc.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 0b398c56ab..3af0c1c0f3 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3753,9 +3753,6 @@ static int encode_picture(MpegEncContext *s, int picture_number) s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); s->qscale = 8; } - } else if (s->out_format == FMT_SPEEDHQ) { - s->y_dc_scale_table= - s->c_dc_scale_table= ff_mpeg2_dc_scale_table[3]; } //FIXME var duplication diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index 747ed679bd..b92af2775e 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -36,6 +36,7 @@ #include "mpeg12data.h" #include "mpeg12enc.h" #include "mpegvideo.h" +#include "mpegvideodata.h" #include "mpegvideoenc.h" #include "speedhqenc.h" @@ -111,6 +112,9 @@ av_cold int ff_speedhq_encode_init(MpegEncContext *s) s->intra_chroma_ac_vlc_length = s->intra_chroma_ac_vlc_last_length = uni_speedhq_ac_vlc_len; + s->y_dc_scale_table = + s->c_dc_scale_table = ff_mpeg2_dc_scale_table[3]; + switch (s->avctx->pix_fmt) { case AV_PIX_FMT_YUV420P: s->avctx->codec_tag = MKTAG('S','H','Q','0');