From patchwork Sun Jan 30 06:27:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33933 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1771963iov; Sat, 29 Jan 2022 22:33:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwdXw0fni80ZOxJHTSQDXGh1O5v7RcabUrK31c4bv95s7lw8EJWtTF3kONkqKQeE8R8J6YE X-Received: by 2002:aa7:c0d6:: with SMTP id j22mr15711029edp.240.1643524406967; Sat, 29 Jan 2022 22:33:26 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dn8si5627894ejc.1000.2022.01.29.22.33.26; Sat, 29 Jan 2022 22:33:26 -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=@outlook.com header.s=selector1 header.b=jaOfdcIB; 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 6B61168B2E5; Sun, 30 Jan 2022 08:29:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2108.outbound.protection.outlook.com [40.92.91.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B79C568B22C for ; Sun, 30 Jan 2022 08:29:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WcUv5Ouh+0+7xzBa0kDWHVNxxzLf7PRGAEaw4fG4ABPaqnsJFQWktE85BjSN/c6Zy9OhtK3lqEJM6fHgXjDQl/vjq/Sg1f61qiRgaDO5CI5aeeX2/eKHRDxSCvY5PbZUZXprpLu2CjSX1j6EbxLSLJSkMO2Aa5uvor1H4MAZspy4TSZ+6qOjKpLVeSZFxols+n1rXRMds5LLYPGizEyJn7Ay09dMCy9yghft0uJcnP6+Ei465DidDHL+dYQXHFBRBLUtKTbjkdDE3qf2Sun7mp9TO1YE7fd8ew9yoAT1653rYcbzvmH5LM5kcgbxCLwzERvYxW8/n8rCGdZqa8O0nA== 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=SSQYZMVfx0xtBof2Jj6W65vVKrGiAlFGTuYMgqerHk0=; b=n9WiYjLcDyOAQS1TvxAwq37vhmlftnMkS50WB0evtiAKBrgafaGgpK3//8aivo+ez8ytquWtQQweHz/C5+kaB9tWGx9vzDh3pUuhIlnz8ScUoUoUsyMvHLVegvaPO04e2k275OiEF+FJp4X98yGhbmn5pzxnjG9tHxLiySkFec+l6qSdRbjNRdXDkz3VpO08IkCN44fzWSc9JcfCUTudXFzecKqKsBt1lQsxcQePRwifDrPXdWO0eOsA5VcrFW/FRYPVTt9+OnDIv4cEGF7k0Oy8Px/QHXVB9EiHGbjhUWvxNt29TdbLmJNjsyTCphWJpXgOy9epYy+vQqHklEVOfw== 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=SSQYZMVfx0xtBof2Jj6W65vVKrGiAlFGTuYMgqerHk0=; b=jaOfdcIBxePWUmoRqZ1kAWQNQ6j6O3kpawmwhFBxaFxbUwJNMeERdFU3gc1pf7d3LeruVc9HF9MSWvosz9TtfyUXnW77CrKtwQ1ylszEMg9u+bDaJfuqltFfwY94LN+hLF9M1Nq1iXncceck6xolz7gwHuLZOjtRvsVZN3wj9QsYi0Ub8x7APtnH4rENGpbhPDhq1ytglnXJLMgIWoqaYgim+X7Xu7wEw4V/3E3nqnj43o8fD0Uge2wLs46o5yo6ZUxy1EcVDFqUbY8czdObgUlDoencvfyOb0w2WbU0wvLPdSOQsC+U6M5h8RwpK7ch51LP6wOJjU5+wNCAvgJp7A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB6239.eurprd03.prod.outlook.com (2603:10a6:800:140::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sun, 30 Jan 2022 06:29:11 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4930.021; Sun, 30 Jan 2022 06:29:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:41 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [ev73eEPCRbFKp/6kSbS6Pj49TtdKl8Lt] X-ClientProxiedBy: AM6PR10CA0044.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220130062749.936489-32-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8f867cdd-a408-4bba-8df4-08d9e3b9d3e8 X-MS-TrafficTypeDiagnostic: VI1PR03MB6239:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NEuLnHqzyvUIYmaNFJyTzROb6n9hKcN9hGtFj1lAkw1biqclHfwD8UQ1Mfdkj2YHBfWajP2JRP04yaHBBYYuXOx/Wc8jgjZfRoVwdLj+o+jvTYV+i1jynBUtVRccf+G116oBLgoi8x3KBZM8q6xIY4CV5wDbq9loiuxytUIOU55zeBUmErdNmqeuCVpzEJiK0Zx9ehn0cXddzK4UIdXlBdJ+KtNTCCWUkCn/Dn04Y7uF86A4L/JBA1+Q5ytecleM1zFy0dTZW9wPdFeWIwBzHeuNLVDYlzrB5PXhNGL9haOxh+Y91tpPyrlYS7FKOKTqMAP1O06168ZujJQqnGwcJVxHqqhB/Va3RI+HRT8r7OPNzheABrLOshw0fPnwv8bGB1Ag9ICtc6hEN7MN1RHmhF0JdnwHPgzfgo7ddUJzpA7WUduaHqctQSiTNaeFlxiDkH/DEEMgCZqMlbEcXF16TBpKC9eanSdXDKZDWIW/CbjjsCbINwvMP/LArxW+xHvLJx7kC8HrDQso4P5q/tYC+v+qhTPrSDBkO2iEdhS+tmo= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Rl+lPhrqneSJB3uGCknn0hqsuRKsimQjKEfZBIIs8O3lpjvG5TCLm6UYrJaPkeBlCiBkx4FA5T2Xt8HKdriLJ4gBWJHDjBfyk4zhNe3M5f9pD7TndPRxBBdhFGFj9dY4vW1H76/hzVLSChsUnM/8s0oDn35Vp9iIsQ0kNmn8guTTI/uGzhZH6OmAzgC4lLjeB8K7RFrZ9C7gDDcBiGlIaaUWn5Hcy2IBEvR3im04ME7QvAw7wgiMEMKi64RyAobDPrd4Jz1IMJ1drh6SaVqUKsXgJxC67nEXML04rmxeAfqdsIgM2xYtGP6hkY3M/XDRRQM2jcGtYRhTcKkYlN4GySCuKqZiK+I8c0LFX2BfkKacbi4GGr/0oKVdyVGinoPgZwm/u3AbTDp3rCL5SvyxP2M+9p3wCK+qJRFw9/Kq03LtKzY5VOtgFWN6uXcebckwyzXYg+O7OYSdl27fFWSmhPo/3whKzaufHmQYaRI5bEZAPyrl04JcrRSr+tY9VFp+V3e6shAQMguqWG4Cwl+K62QO9HOuuGc/CJQQvI0P4ZWZXZR9IG8ZslOSaXop8kr7Jt24eTNJxYFQlf7/cUZetmee79ZoT0yKDAQSapkxxPa44eLtheFKdKI1OeI3KcasgczOTI9AU0CWa8RwvJt4gMqrb044pHE+bNF/K6EV0uCUVgvwwyLPBb/pnsjWWonxX3JJntQSBjrr94zqzqU7YCAbwwuYefsdVqhAiif9O0IYYZg59EBaL5vOIiGdKj5YWPyo+HXYQCdkCyFYu3PMLKwSbCt3vpcrLLhIi56DVvmcT4pgf3q3dOrPuEU+fK14jrBjYJMYd0MB9aAFYOQt0+LeHUGRrCT+MEnSJE2ccob3d3SQI4TrtYdWl2vRvy17ELLCwb0Mb0vUEgfRBtCb6RDavWBRxJtxsrHkORxpPr0/2paotukOkrRuXe2lbsSxdocpxSritpElknq6RT4tWw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f867cdd-a408-4bba-8df4-08d9e3b9d3e8 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 06:29:11.4104 (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: VI1PR03MB6239 Subject: [FFmpeg-devel] [PATCH 33/41] avcodec/mpegvideo: Move brd_scale to MPVMainEncContext 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: pT7cipyuE18U Only used by the main encoding thread. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.h | 1 - libavcodec/mpegvideo_enc.c | 6 +++--- libavcodec/mpegvideoenc.h | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 0e8e11743e..c11aba340e 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -410,7 +410,6 @@ typedef struct MPVContext { int top_field_first; int concealment_motion_vectors; int q_scale_type; - int brd_scale; int intra_vlc_format; int alternate_scan; #define VIDEO_FORMAT_COMPONENT 0 diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index b90eb43399..1039a50db8 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -907,8 +907,8 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); m->tmp_frames[i]->format = AV_PIX_FMT_YUV420P; - m->tmp_frames[i]->width = s->width >> s->brd_scale; - m->tmp_frames[i]->height = s->height >> s->brd_scale; + m->tmp_frames[i]->width = s->width >> m->brd_scale; + m->tmp_frames[i]->height = s->height >> m->brd_scale; ret = av_frame_get_buffer(m->tmp_frames[i], 0); if (ret < 0) @@ -1222,7 +1222,7 @@ static int estimate_best_b_count(MPVMainEncContext *m) { MPVEncContext *const s = &m->common; AVPacket *pkt; - const int scale = s->brd_scale; + const int scale = m->brd_scale; int width = s->width >> scale; int height = s->height >> scale; int i, j, out_size, p_lambda, b_lambda, lambda2; diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index 55c265edbe..539bdf3065 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -73,6 +73,7 @@ typedef struct MPVMainEncContext { AVFrame *tmp_frames[MAX_B_FRAMES + 2]; int b_frame_strategy; int b_sensitivity; + int brd_scale; } MPVMainEncContext; /* mpegvideo_enc common options */ @@ -155,7 +156,7 @@ FF_MPV_OPT_CMP_FUNC, \ #define FF_MPV_COMMON_BFRAME_OPTS \ {"b_strategy", "Strategy to choose between I/P/B-frames", FF_MPV_MAIN_OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, FF_MPV_OPT_FLAGS }, \ {"b_sensitivity", "Adjust sensitivity of b_frame_strategy 1", FF_MPV_MAIN_OFFSET(b_sensitivity), AV_OPT_TYPE_INT, {.i64 = 40 }, 1, INT_MAX, FF_MPV_OPT_FLAGS }, \ -{"brd_scale", "Downscale frames for dynamic B-frame decision", FF_MPV_OFFSET(brd_scale), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 3, FF_MPV_OPT_FLAGS }, +{"brd_scale", "Downscale frames for dynamic B-frame decision", FF_MPV_MAIN_OFFSET(brd_scale), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 3, FF_MPV_OPT_FLAGS }, #if FF_API_MPEGVIDEO_OPTS #define FF_MPV_DEPRECATED_MPEG_QUANT_OPT \ @@ -167,7 +168,7 @@ FF_MPV_OPT_CMP_FUNC, \ #define FF_MPV_DEPRECATED_BFRAME_OPTS \ { "b_strategy", "Deprecated, does nothing", FF_MPV_MAIN_OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, \ { "b_sensitivity", "Deprecated, does nothing", FF_MPV_MAIN_OFFSET(b_sensitivity), AV_OPT_TYPE_INT, { .i64 = 40 }, 1, INT_MAX, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, \ - { "brd_scale", "Deprecated, does nothing", FF_MPV_OFFSET(brd_scale), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, + { "brd_scale", "Deprecated, does nothing", FF_MPV_MAIN_OFFSET(brd_scale), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, #endif extern const AVClass ff_mpv_enc_class;