From patchwork Wed Aug 17 13:29:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37327 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp84236pzh; Wed, 17 Aug 2022 06:29:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR4KwKjD3EOVZjt3WP+aMDu6rU0hjbl7LB+jdXwfeNVqi+5xd9timz4z559DdiQITUP7aCoB X-Received: by 2002:a17:907:d8d:b0:730:a937:fb01 with SMTP id go13-20020a1709070d8d00b00730a937fb01mr16294601ejc.246.1660742978242; Wed, 17 Aug 2022 06:29:38 -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 eb5-20020a0564020d0500b0043ab664c9e7si14547680edb.282.2022.08.17.06.29.37; Wed, 17 Aug 2022 06:29:38 -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=r0ZP20PA; 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 A39E868B8E8; Wed, 17 Aug 2022 16:29:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2087.outbound.protection.outlook.com [40.92.90.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F071668B7E6 for ; Wed, 17 Aug 2022 16:29:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jUl1TR8ONz5bZ4Cnjql53Oi2yMf3Amn0KW179Qn9HSXbB/GzuGhSNZTG2IXXYG7Q3YZwPTpSpH4G4nCnbtO0soBS+jnc+Os/k7eNGyjgJnDhiTMw4JBQ1uw3fx8zj3BfP5VkY1OREF7BwLRBlWiPQJFzWET4jlD/uYWDoXqd6D7hb3bAIJMnstaeJo9MSyJrg8qDP6Swgr7Ebg/MSrsaypvMmVxuoMPkgAjtj1D24iIXzCfWyrlq99xnmlYo4aiYrof+nvthwNk9v4qtVDgJ2CSo/L5V3Xaie6Bv8g/zPyEfpCXz2/QTgxIlMvdmGZGoJ+MQ3w9GQubWzkJNBmKRcA== 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=EildedH4JHMiGRJtG8zeWcptQ5kLs/ieAQkJcOUImvc=; b=L9tsAs6oK49MAYMK5Ypyyc+J3V+MjuUi0TPHX7UKNMOUBvoE8UKk/VkIWo2gyTRBeykmOu3jBEZjQo1DV7R9Z5ZBaMMvW/s0I0YWHvVrhegxkZG8VbyP6z8NZrsWL7uTkqIlewGakElenGdwd0nJ5G3jZMm8cxnRD+MUJ+VePnddZWJlHBzkioS3x21wciLQ9jtsnB/s0C5j2iCG9n+6xZyQehE8ghw8G20KiMU1aw7aQuNC5dyUYkTrQJWUp4UgoDgYh2Yl64wKJ0PQxRUOv86K+NMrTgJgi21ApzinfiXW1QrwbvTIt9rBA3PQp9ANyr9t8rA1oNtdkbn18NNgKg== 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=EildedH4JHMiGRJtG8zeWcptQ5kLs/ieAQkJcOUImvc=; b=r0ZP20PADcR0WJUaEN2/hPymLFUGC4BXupX2HkFR4o5QT+SzPBjyJtvWoTakPQg+vvBF9gV+LDzrEt184RnjITKdxfWQcG3y3ufYLKWeWxGSyrcnUgaTaT3J+9AXCPbEOXzd+c4iLQhIbnP0s4rjetWvjiKBJZSEk2ofNDpfMy6a17u1QtHXySwikJmSTWM2nvzlQgIiUpEZtAS6Vf9sbETbYuoeETiNZ/jwzZrLLak5C937AyNksJxZPMe7byr/0yQIWKBtA0dodBOTVXTnXl3Ef0hGbP68AS8EUIVoNpy1zTFx6pbIxjAwoMQwYYk+IxS1cLkSaNgSONZMQNe/cg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8509.eurprd01.prod.exchangelabs.com (2603:10a6:10:2f4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Wed, 17 Aug 2022 13:29:25 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.028; Wed, 17 Aug 2022 13:29:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Aug 2022 15:29:18 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rCITnaRj+HzeiEOwcdN8zvwUukmr1skh] X-ClientProxiedBy: ZR0P278CA0010.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::20) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220817132918.3783073-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 56ea7aa7-e779-4a57-1f7f-08da8054808e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTISFcQEGF4mJSjl423AJ2My2EhLw+JwiU99LaNnbRYeTiMrEvDdL5BJhx01G27hgXstm3cbq2PanILLeH4jqp2yVXuAFT4CtfVVKDUOw8q9uEzPkON1+PIZtqR78w33bY1mtq964lKlVOxQP9hcS/36ETJqKnWp0KZYTvWilqzCjuMsV5UgnyjP5LRi0apA+c0GaZewPm2AtUlSrb3xWgTAi+303d/tuLiJjDP+PmwqUZPRkRPLsGlq7zZ69fzz2SmRJQ5gNOOIWQFqjKMVG56RaFxIQtEO1EievQtokub2LkWxFLhZvTFGXf0+RL0KH5tqoyxsI4ksfPyeGKKwNOiE+E4t6vLF4HF6PxmOODYPGby9liHiPEPtjcdF1HhVV8jaSaLtOhVWDBTl1cDYPifmCRTNgfrJ+H9FQa3/HqWyKEoV9RMzc+ym7CuPulPTGhqTSrkyYhIH7LhfHoq9lfqqLbtKyBmviQAJ+uIgYV0nkJXYozaJQ9GnXG10lFU3JoYwmKtfDE1XZvIhN8PLtQZ17tuELm5/V0wjfYry431R1sRTzSLyxvjyEAVIGNcorPV4Uhv0Z93Morz6uy29D0yMmRacFHKk4IbfGOSSUrrn+aWfqzwSrXkpbBeBBa9hYVE/R9Bumga0XediDQzQuIqP7eYyvApoDWAfS/IGXuI4RE+1x1kuOMrDPW7QYdwn3DElVVhpLcGDcA49KG0tkFt608piVlb3drJKR6pIaRowrwmauI+ahfImsAnYjYStO0= X-MS-TrafficTypeDiagnostic: DU2PR01MB8509:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U5Q8RWUMYU0Et5dXsStk7Cy7IccM9EszAgVPNLvJ6hK7QKUxQ7EsrwSZkXz1BD1CRYQxOwdt1uvs3FunLUPMVWgxGx4L9xAPBWpPPXaql6BWd5o/Cb1H0zRJxIfHyynha+0QcSkau9HnZJQyznzqpEsPSfewoC5ujlLyIBIFsg9wjBQj2Qj1q1HeRSoxg7i0n9l+NV7DjFPFe9uE4fFjFHxhsLRp0GevNDuT6yLlbRBOqFoDa0xka2yzzEJCd6J+tNbmH6NYog3EwygYnPpL4ZawtyRcWFKirGsvHk0W3c/SDpnv6bDuIekw5ejwxGVr/tRa3EmabRPDxOik9lNENrux/hOXhMDrO1Ay2EBgFaWu136NDOmkg0CFia88I+h0u6UzGvV5RBzXk/MrQ69vnNn/uU3BmpIp/MQNm3N0628+1XU2gb/iHx9hav8repQ3A5G/Y9Qa7na6VK+UzEb6ZgSmEt5FFArbz4RDUDNRBAmacEJ2qSsGkKCqsh9MPsBg86cX7SPqzfVhJ9wnzzQNFILjnSRtU9a9ysOzAFnVkH20rkuR4mBMsfdMNbnMvVbturoQ6EU5W4TOUwYOhExNz8IKrdLvFm1hg96As61qfmp9DtIevwa8t7936v/5RkbryPPaXXQdPAptLx34FI1RgQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DNB+EyMwOXQugPCva2u+bJ1+3/9eulpPQMVntv2qVh3hwfXxcnqgmUWkmRZuGj/SpSmxPEqN/ZtZG3zqPiDFbSMbTUT3XdMQGlcBDxvwv6uPhrfT3TAjNMysIpwlJwmjxbrIuvdYWyUCJaXAYBbRa81IG8wMPD8Y3XObfphFUSvk/FxPSPhsv935VfKOrpl93/FoqlGAonOFqy8H7fZBaFiGXVYAZPmZC2Jd4hiJZd3D8qjWCcWbNhMSPedt9QBpHaIZZImjFih4E2ZSpEkoMBwPTjM56kSS3enKtUj8+78egXdEkvJEzwsvLyOfaDALY3p580ositxZz4iif900y8UdA/llRJJb66OrupVRYonuDJZhjWhdpHPsFlMg8Y3VJvg7+hqfJyqQ2Wiy6utOKD1JedZ3Vp+XiWpMg++WvqsSQVo4NFuMLtSBOT/E8gdnGPD21CPCFaOrT8iUAtqm74/C9dnDAu3UfwFnCbfxxAVexCW+g/7HmExRldYXS4Thb4OP9HzKG0acttveMmxFhJ5SRyoSLOTSgq/p4fiWjbgPKeQBhi7wqCsa/+Ji3Mc2GMGucyLOahsB9xMnvCqtLKp+fwHfC+f7yhI2KjCIejj9c00GmMgXrIixuY+DlWEPt134xOHxbW7KGK8/KaiQKF3yH2KKcv4ReOKNDDUNBr/n1CmxbhYRb8onVO9CksRZQdBjJdpWj3aioivYCQG84kP5EGlSI5YlqxM0ueF3qpeL/YbYV1HK/jzIR0p8cc/TiBQevjBQIbEcyqdqy38oO0fJJfz5c81mYz7QA6nPAUxoVcGSKMR3R2Mtp+KIHWF6xaqEh66vZLkTZOo7zRhqZPgSWUKzNhu4u83t5fiD9PJgLE5KxmDq3q0gMZsSZrS9spGmmXVuIOpv7W6O8REaxn9Rv6uJJrcre2q+oyOFHsfZIzTQMCQSPcjUmjjoEVHwsUtQL40rQFRst0ggJ74lUuQ54E5t4TgfGKR4KWRwydoHidP/gdedBX7HFBQqxDXnIRjWv55Am9ndGgJewPWLaK8ur/c/mJKXiPgo64t4GDtgHOXUx1DSs8deaY5a6JEpOuudf3gtjTpevK47hOjnVB9H9x63b39NQC8EgEFUyzC+4BSsBQY8PaEEfEw3Umx8q3+eRF/IXRheWTu2m91L6VkNsq/OXebwfcrpH9AH99X5m3RPLkZ2bBMqFvTXXPmcofQ9lpDDXcoyuXTJoc9Bo263NhgaTSLwLQFrRGdZUjBFCoDyvsqIS9iZGMudXVP/hVrLFjUF2/PYS9BSqqvnIMv4YCT919MPWK+Hevw7VkI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56ea7aa7-e779-4a57-1f7f-08da8054808e X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2022 13:29:25.3752 (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: DU2PR01MB8509 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/mpeg4videodec: Keep data_partitioning in sync between threads 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: 5abuWzzRBCK7 Fixes frame-threaded decoding of samples created by concatting a video with data partitioning and a video not using it. (Only the MPEG-4 decoder sets this, so it is synced in mpeg4_update_thread_context() despite being a MpegEncContext-field.) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index bfebc3806c..d89adf8d63 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3534,6 +3534,7 @@ static int mpeg4_update_thread_context(AVCodecContext *dst, s->vol_sprite_usage = s1->vol_sprite_usage; s->sprite_brightness_change = s1->sprite_brightness_change; s->num_sprite_warping_points = s1->num_sprite_warping_points; + s->m.data_partitioning = s1->m.data_partitioning; s->rvlc = s1->rvlc; s->resync_marker = s1->resync_marker; s->t_frame = s1->t_frame;