From patchwork Sun Nov 7 14:36:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31322 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:dc01:0:0:0:0:0 with SMTP id b1csp2580337iok; Sun, 7 Nov 2021 06:37:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzcRekykePxSV/FpRZ23N9LboK+VvIEbB/ds3c7KJUcVBTI7smZtorn+jGGlzQvLHClZSxq X-Received: by 2002:a17:907:1b1f:: with SMTP id mp31mr87308329ejc.319.1636295822332; Sun, 07 Nov 2021 06:37:02 -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 b8si12491580edz.535.2021.11.07.06.37.01; Sun, 07 Nov 2021 06:37:02 -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=ap+uiUMi; 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 8B4B568A7FD; Sun, 7 Nov 2021 16:36:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066059.outbound.protection.outlook.com [40.92.66.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D4218689972 for ; Sun, 7 Nov 2021 16:36:48 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CfJ5JVdlBoMtVm4Ob76uAF+sgXERLQZD9hC2wfywHSqdLInCs8qMcUcNyPr25Hj6bnYh2D0xMwyMyshDs7QrXhzgvfyXT3sTabLcHD66GhvldfFQBwdu1pLgeGH4RW8jnP0E2lIRQbB7KCcyHk1E8ia0AG8dcBslcQZSnJZGXmC96qWEXoyF1kw6CxqoL91asqCPaNaZFRTfX/dbZymg9AD8hJMhEoGwn4IRO4Ej7vQiJ4fO9t7JjiouANFtQbjk3EgzlcQIK7xNiCxStoM6grRJjxj/pXbFiLGlP5yHv+KJJi9AW5M8CltjUX9cXMJ0S0X0oXtN452+ziANllZdYA== 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=HZTNhA4MuHep2j8IIV0QLr+Ufdd3UKaHRpscelUqKoU=; b=fVTuyfZYOfQ5SZiqhscPhB8mOIpmwOX5xnmwPtXRcqeWZ5jm8vMXJIBRG7HOJK9WjeFyWQUhAf+G+y4Fs1IQaCiu4UWWJItHLmxLVScxm6kvlQq1gT5+QnO+i5BtPv0pV2imNyyei0hSKH+WwRiM+GIrPbOKMD6u18oSbngkoI8tLbb3hKWiAQKyqKIDlRmmWHBs8QE/qCyBcJZ395RSlRjWycH5xbiLlaNTGZTFQ++GExx/NmbiYirPd6PI07gtrk47jwV6vygjDcMg9hkrBUqldnqC+x7H3qQ0kVPLxnu/nC4bkk3m3j06joLtMc3kBi7CFwel0jfI4H/3qn0/nw== 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=HZTNhA4MuHep2j8IIV0QLr+Ufdd3UKaHRpscelUqKoU=; b=ap+uiUMivJumv1V5ahtqo12vm2AhgTRLdPUlu4dQRzw8y+3UtO66zih9iKseUQJ9fjK9Kg5ZVJcyfQKT2R1EkQBH+jy1p3Rd6GrBJFKxVcslXAb128BBb2j2nr5v9YirU61/7W7BdzNGjnXdLLhrzaxyXXjRrruht4tU6AnYEi94Bsq1dFhTHVzKiCO2ueUvRQKxAXPFb8GmM35KVT+cp9bbb3ji7OZkCYZy04ZLUI6psl+UQlw5FoGlwX59fp6m1jnH+qFxkiwwMhoXaQDq5vSq6TSIgRNrk2i3Z6eSat056Trhbm4XiUe5X3XkjjZ7e5i1vssWbPJ9uMW1qvSQiA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3009.eurprd03.prod.outlook.com (2603:10a6:206:18::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Sun, 7 Nov 2021 14:36:47 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.016; Sun, 7 Nov 2021 14:36:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Nov 2021 15:36:35 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [5uYUqW6kBL+JiLKLvKiP0rTNJw3rP/48] X-ClientProxiedBy: AM6PR05CA0017.eurprd05.prod.outlook.com (2603:10a6:20b:2e::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211107143635.214018-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by AM6PR05CA0017.eurprd05.prod.outlook.com (2603:10a6:20b:2e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Sun, 7 Nov 2021 14:36:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 53bd9e79-cae9-4366-90e8-08d9a1fc06c4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiToJ1zOhCTJM+/mZKD4SWs2fsknwzn/sFDyR02o3yBb/7SggtTQA6CELNJcN1eXTSt8gkfsWypvy1NIh3KDnq01kjjqmsd8H00HD/TvzRUWlQ7zUrViHc6NVs4QOyaL/CuV8TduinnADIiCp4i9f+9AIM8hMpjzHAgqz06rKXJBLQsoSBxd3ICqJOY9/gKKk3TqJ8e9Zs17m0s9JXA26ltkKEcFWW8HQOokOEJHb/lmNjQbKv7zbPnx07CwnpzLER4X3tbL1oYELiV14taSTAIgGlyjXB2IZMvKFdLczXaWk4FS8c1735CkawfgVCxJlKs01abA3QzwtZSFtqSU7NkJ/Fsj93r0CKkig6aKpOheUDgihbUw8Hjb6Z1Sc8cL0A6wPXudoYwk/btNo25GNKF3aSVjMrUy3zKi8sNLd5EoL8X/Qy+Y2fP9cFgKx00INJ0hDa84PMs6mvwz1cooJqAXMSOuOFrhdBmPzAJn38dM6ZCslDvp8MRmgqig90FD0UHtCsBIYd4hXomQYPyziRWH2LMkd+TxGiaKllw5YNJR1QccTNJDrErA135MintKStfEn2fwg2lqxAYeJc+LKNoPJ6JFJ4TTVNB8MyUCS7Qa6D/JN8Whh9jidlrknZ3E7NRxkKzQbzH1qpIQDo28wY18G+/l9e/NbCXLKcEnxdASZ71jYLtB/JyyRbm4WvxsAQ4t9mwlxUnOJ+csIQRKViQ9GNWXiYwMDbX4w2URw5XvwMIqYEdNb8jQstwHzdEl5Ro= X-MS-TrafficTypeDiagnostic: AM5PR03MB3009: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ArB9JDiXgjigWYAVj6PoTtwHezi27WeY92B3A4EKSEc93xL5l7QZX6EkdaGWAR3Ggs8rxrjl8kgttG7YuKWmEWBnY8bYWkqQREaf6g94FNcLw0LUaErtPUZ8nOlL1BN86TNuB0BP3SfXVCbRSnhXpINRi/7ghnpFC6UfbcjcdWPRtt57Q9rlLn/Otljzcx1ETT0zfdigBiAGlx0U6Mk1GJuWlFCPKs0sCmtGvzkEeDaegm8e+8yIn5MF7AJd2lUuBd2Hm66uZv1IiBGtvXX23ppnLXMai+oLq3gG5T3qtE8cW+BxyQv0ZQ9+Xo8ji1PIgGFyq9/bLx9QpY5wPvxb/86if7zsCXuyrB05v1Z4UJekwvT4ZMPmTbU2otMOQijn6/R+LtJqQ2XOnEvYwkxks+Tr42aWhjqfc2YqmYsMW+9U9mnulU63W6Xo3YxwBxUwBBHkmjICRkO+6HhGa8otBDQ6tr8Tflw+eGlYeFA/279eRqeGxUKza5LK1iNC7V1BKmDN/L65pUaxOIGadKMc0FpDsb9/eUoPGJZsOCofNlA= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NmMzjTQHDaQ8pVlrfv8lt637d0OEofXSlSU8gCCCxKr3k3/8D8sMc3AiB/w1W3T0fkemHTpe/mkxaqBiqAI4E10iH1nZLUEVxoBGps1XdKbJkScFf0elX23NZOOQLD50dCqQdksfKnJq/4/W1Vatn6bDoeDraPEJtxfnRVlTPsrUalwJG//Z7JYuTfUe1hFCEFCN0f8sWHXengcYiMWjJn8k9AZ8+zAgPtSq9Why2s7vsnmKYUkhmEUp/l33i5GDg+N4mcggapii79RMJYn9wNiZz63pJKC8EqQYY290sVBnSOLoKvw1/ofKqZCTOMTzRslOn5awtY80TnrJax7S4IyQ1yUBLVgSFJhakMrek6aVj/bQ85I2yqlXFJ77DfYtn6LwW+XV3jByNorWqSG4ySejFDGO/ta3x/xAmiDw2eUbMBXC4MB5Edbt6lewYYGJ0zH7mSeE8ojI9WtKx9RLbIY7ivkbZHEoYmnCQzflIw4PaigOexVJfTB2JWgF2YRGlid04dUbdDQs27ldxNVXVe5clk0S0G1wOtxPFl3gylJ1pzSVNaw9XOfIUxAAMmc6JcutlYG/jeDbLeFJIOgcDZw6camLg+ooPXwxbn7PVt+zTFcSfJnv/l9Jhor5RCvyUTvBm2TGRnuaUMf5prSxz4lJNFguu4HwMn9XyCRNIqfy71u899M8/tykCZ5Zh71/0aVj4sSeZngJwMNJvr5Dvw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53bd9e79-cae9-4366-90e8-08d9a1fc06c4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2021 14:36:46.9690 (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: AM5PR03MB3009 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/libx264: Simplify copying packet data 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: m+YpX26W4+ew x264.h: "the payloads of all output NALs are guaranteed to be sequential in memory." Therefore we can omit the loop. Signed-off-by: Andreas Rheinhardt --- libavcodec/libx264.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 4fe02dd11c..5f62c7b1d8 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -139,7 +139,6 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, X264Context *x4 = ctx->priv_data; uint8_t *p; uint64_t size = x4->sei_size; - int i; int ret; if (!nnal) @@ -165,14 +164,14 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, if (x4->sei_size > 0) { memcpy(p, x4->sei, x4->sei_size); p += x4->sei_size; + size -= x4->sei_size; x4->sei_size = 0; av_freep(&x4->sei); } - for (i = 0; i < nnal; i++){ - memcpy(p, nals[i].p_payload, nals[i].i_payload); - p += nals[i].i_payload; - } + /* x264 guarantees the payloads of the NALs + * to be sequential in memory. */ + memcpy(p, nals[0].p_payload, size); return 1; }