From patchwork Sun Jul 16 14:24:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42762 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4864218pzb; Sun, 16 Jul 2023 07:23:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlFO1cgjGDpXIZw2aHuEecXqfcie5O6+K/aLLzXMvz+Mr2z05wS2S8FZ3z0x9FtjMnptyCYK X-Received: by 2002:a50:ed8e:0:b0:51d:d280:6c51 with SMTP id h14-20020a50ed8e000000b0051dd2806c51mr10459010edr.1.1689517434378; Sun, 16 Jul 2023 07:23:54 -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 t5-20020a05640203c500b0051e1690103bsi12726936edw.574.2023.07.16.07.23.54; Sun, 16 Jul 2023 07:23: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=@outlook.com header.s=selector1 header.b=gGoDFBMm; 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 685CF68C645; Sun, 16 Jul 2023 17:23:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2027.outbound.protection.outlook.com [40.92.65.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E826368C51E for ; Sun, 16 Jul 2023 17:23:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dhd9JFdYKEIYaGC3MVgKqWL5hcOt2VtttuoqE+cO0lBjR+29FW0HYH/ZTafYkKnNnmkuZ3uL2mI2Llr1ZlQn2/WJ3YkAgHw2oP/9SYeaAv0eEjnSO1wrKXz7Odc3E6jSYXUeq7JVN5dFBsAhPtFRqU7bHOWvrwL+JRs8vQ6XaqN/IFtJ5fy3Z7BORNX8H9vxKyfQThf6lFd5TfX69DyQNJ8d4YBv4T9bpGbMzLQM1x8EBZfchVRTgBHlvunY9YtKM3n6ZF56UiBab5kAlltRYuQHmSH1M/Ise12m4zfgrO5lwDDv+ZcQAoy5O8x9rKvOtYbX8X3htex64lLxZcn2kw== 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=7uXrlhdE8ldsbqP4TdbPfGY7EF9d5umh1f8hE918ZmU=; b=OG7OsSA9zXopCcoituHe2416LLR2sppx6AP0XuGim9l+kGoDaLh2uG5k75DqE7w/ocpn9pX/zOnZva93JxuL6RUnELIvf9XnRS/t6t79MUxeBlPAgLMSJRggqGzHwHR+VjW9T3KYFye17/6B/nHMHQrj/XQMBo2i/bowtX5PG7mHZfmevgzpdsZQDXWLV5H9FU5n4ZZfkCQBPhvzqNoOmcY8g1Tu+q87o8LSNP1tzSTnkdAC5mRmy63jSVXfVpUgG5/xrrQSbx6yn94u9lGpglr8rjRP49PGJwy8t28rSUHj63pdlMSQalKGHt44vMogFnTQuPqxVX9/DfrEBx+KUw== 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=7uXrlhdE8ldsbqP4TdbPfGY7EF9d5umh1f8hE918ZmU=; b=gGoDFBMmB1CJD4VlUzkenMxq6zjmDAgZsuz2wshX6ERkW3EsMvV/MbgIhM7IcNdIJ2SmUoaVEpWsQpoadA/GyzHzCt9stDqKMvrQ6bO8QVf5OuaCPa52QjqocirmyrX5/tRfVuqMBT4Py8i83+DPl8H5/SnFOQcxEcT9tKhImsV12er5jCh94RehjIRso6JNif7N1/OFbNZCUvWbPGHHFBkeuz76JyunV9j9D30qvQbL+uD/Sh1GbiyQffWXRhvV0/aK6vfuHNI4jbjPg3mQUQWivlKkwMr2suhRO5k1lIG/JgG0VCmq4gOkIdOrGsnkGSbu4onCR4P7OFtmPQ5M9A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0336.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Sun, 16 Jul 2023 14:23:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8%4]) with mapi id 15.20.6588.028; Sun, 16 Jul 2023 14:23:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 16:24:36 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [1UawMr2IBcpCgYC/gMBWv1wgpzMHGT3f] X-ClientProxiedBy: FR3P281CA0185.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::18) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230716142436.4105246-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0336:EE_ X-MS-Office365-Filtering-Correlation-Id: dee467ff-86c5-48a8-aaea-08db86083c94 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKz4zPL+otEBjNYttkpcFUDpRGiTlMGVF+S/2lktZGGJAH+jfduLHam+5V/H2emNOGjYFjVTkcXn5tokIer2GHmu+7vFmBUEHF6z5BZ4EZuIvW9A8CQHhKD1+fcJILe/8lYHy/A/o0on3FEQ/G5GUvD/mbis+QzcEiVJXlrCSGjiTHGmvInCUX5hjrIR79VaC0NmD4UUmxWT/AzLdZ3kUxHPY6MO72B3uCYMQdv653AyhN/PGsDZUP3wU1kcpSUxYdnN80mjYbH035+OOXB40QHIeJxKEpopR9XkbVpw0WEXU5d8NqWWMXj5s7AihDnkzOsGIPkI+lth7nl4mhYfvHuWJZZ1tJG/i1Hg6ycwAJ5dWMRHRYjs60Hi4RjgNQ7RUh4nX7XbBSgGJgSm/GbhHdNuZoi7Hcoqu+pDUVuAfO9wgkHAfSX1HmzBDQH5gSH5heib88CmCl/dlWRca4LBNChNMCe3+QtcGMn7XtiH5V1VjdWBiqsCjlqtkHzu4h8fdybSdLlNoFSNWmrP24/wVGE64tiqZeFxXb/WTbkQMVGYATHRoP9hTIxc1kGdkFTEFtqbQGkq0a60ZOklD4I+cm74RFDYlK9ZA+/Em3EVxtBuR+Po4jd2cIKQt680ESQTXIwoMWtgoiW9fGsCc7AVXLFycS6r7NvJ0KjSfSaO+Kpuy45K95tZPrXjefQpZ9stDUhqCaUuMDLeRwWSBICI0ntNoGPVMwmtCpk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x/Clqm8K6XR87sjPRfLcGAPNQaJAp2kdtI0zu9DuX1VEZBoz/jmPDlvlJIg9RVoiQLFbH2DBFKX+jKZ12qBsKGzRrgGo57WSwpyc3ZWSzftOxebA7vN1MvISH55rNAnrG4LkeGaEQ/wbz1dtoJNU5oCTfK3w8u+dRvEFo3/31a9+aYdRIKC5US+LQvQMheN5fo0sc05HMh++4xlLgfbCJ/f6fPvIWeO/5R66K/LTxfmOB2ofiiN/usyv3ueNRwmCEWR2WjKJvpSJ6xQhyvSaptpfT4g5pVHkrJRiCF/62HfjBod9k94lrzTRhq7PwRogzs41fa1mzXqUymCf/daJjIOqJjQi/tXdViSSgbmtt44+FrhrO1gM47J+glGQp7LcUXh2Y55JX8cfM7M70Se3ThFWy0xCuBrfYr5N6im7ZdfUkMVfyfIqxAR4+SebRDcQsUphO4kIMxFEWhBXY0Sa3dH6ExqUzXL8keEHN8zjI+oZDUgc4IFtL83NedJn/d7wIUKCnTQRLpHk9f//bphXkdDGjy6EKueyCARiBBqkxD8/0Rq/1pNZLpezqHjTzZ2jym6RmRybtPrkyMfRiiotbHtdQaDhVhddtGzQBy3pTz0BNhMJT+FAAuhWItlz0TJV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 44qB8cSFqYpXJOjdMdx0gZkS3+lCtcVaS+uTHNN0R/U9CtBnqYPTIPpQkw83B+557CGAONLzmUxnLmOwZNGHhXIb+SzSwNbCT8Rzuk6i+GhdS6k0+N74HcObnL86PqcP6Y3xciru3Fd9buF9lG9qsbZaEkoJYFmBr/JCqtFhkCZTH5MRb8AoRXjXRJiNdQN4/FAtMge6w2qVmejAsobliQrRXl90VQycLcOtZPQxhFuEdvA5mLGlW8EFELQoOI7PBsxAx2jNqpa4w1tnxzUyyWENzKriiAJ8vt3omo1Dz5jBmKnjERRFRJeyjH88gVumfoBgGYr/LAz086/ncjEItq2BKf9tTKEo7ph7dsIjdQsROY/Yxq9hs3z3kyx1D0yZbRERf6V84oQ0v472bNgXhn6CiqIikayDwqlkduHyDGZjzaOyH2EV1rkuVoXePOC09zIPNCEoMOYBPrhh2wRprEw3Pu0yqg3ct6nhuSoWcdWPke/V0lt9MkFwK6wCa650CilZ59IzKvIKDNkBYXYQZpqtntxT34iFUtxEMT2GfNpQAQOwv13btacQDcGiQQHed8FKP+PZ2tOBurcg3t4pr6cT/Dqe5dK2+SctbVtc67piAhiaB1sPdpSoc0+zDhdO4Ss6JiNANOgE4MQWh8bvEnxjcuDJgBrx6n4VKCUIci5fevPxhwCkJtjqx7fy9FZIoM4Q1C0eoaoycaR6XQ8/EChan0KBvHAxK9n/7cIEKC5dcCLFlekgzATyJ+tXknfE8/G3PbHyXDo2vrT0u1Wke7bhMCOhlFoB21lfeNyXDHVXM2NZpT9iy0SqUIOrCLhqvnLpbzAQ6UktmYHGhtYK3rxEVaKpTJSqb+p7k8sGyv7/GixHoQ2PSHKA68TfNq+856zM+N6ZGSdjgJCFvP9BVTXL8e8dUxPKwTtNCN9Qs0tcTXIpbkmxhEw9o4QkFUNM24OC2LD7zFIty8+J3hYUjxn04c0QQxJ82j/RUyjBQ1iQ0NprmW/PDou1onCsX3LyeRh4L4oUhRoLerLh22loilz+T9c9kdbhgkTYzK+tM4WPT16br1PU2eeRCsIWzsWVxfAXcekpdyRVeSd2MYItyrJQlxwEUMObm6oCsB5DxYYChZaRPEUN1uWsPqzkod3WVoYlCISftIloRaSyT+cO/CJ3tSFfXGJlJMzMITYxETL6NlH8rFAM7AlM4sGNqZeNknAHYbb2ORRIohK7VVq3Ev/fOkJz+XyHm1Ti+ZETy/xeP0cU51Hss4NUKhz+oxgg X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dee467ff-86c5-48a8-aaea-08db86083c94 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2023 14:23:33.9780 (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: DU2P250MB0336 Subject: [FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg_enc: Reindentate after the last commit 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: S4ZZaX0A3OOO Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_enc.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 2c7e29af24..8b750de4e5 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -304,31 +304,31 @@ int enc_open(OutputStream *ost, AVFrame *frame) enc_ctx->bits_per_raw_sample = FFMIN(fd->bits_per_raw_sample, av_pix_fmt_desc_get(enc_ctx->pix_fmt)->comp[0].depth); - enc_ctx->color_range = frame->color_range; - enc_ctx->color_primaries = frame->color_primaries; - enc_ctx->color_trc = frame->color_trc; - enc_ctx->colorspace = frame->colorspace; - enc_ctx->chroma_sample_location = frame->chroma_location; + enc_ctx->color_range = frame->color_range; + enc_ctx->color_primaries = frame->color_primaries; + enc_ctx->color_trc = frame->color_trc; + enc_ctx->colorspace = frame->colorspace; + enc_ctx->chroma_sample_location = frame->chroma_location; enc_ctx->framerate = fr; ost->st->avg_frame_rate = fr; // Field order: autodetection - if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) && - ost->top_field_first >= 0) - if (ost->top_field_first) - frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; - else - frame->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST; - - if (frame->flags & AV_FRAME_FLAG_INTERLACED) { - if (enc->id == AV_CODEC_ID_MJPEG) - enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TT:AV_FIELD_BB; - else - enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TB:AV_FIELD_BT; - } else - enc_ctx->field_order = AV_FIELD_PROGRESSIVE; + if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) && + ost->top_field_first >= 0) + if (ost->top_field_first) + frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; + else + frame->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST; + + if (frame->flags & AV_FRAME_FLAG_INTERLACED) { + if (enc->id == AV_CODEC_ID_MJPEG) + enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TT:AV_FIELD_BB; + else + enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TB:AV_FIELD_BT; + } else + enc_ctx->field_order = AV_FIELD_PROGRESSIVE; // Field order: override if (ost->top_field_first == 0) {