From patchwork Mon Jul 8 17:52:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50414 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5941951vqv; Mon, 8 Jul 2024 10:52:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWaeu+Z9nQeOLJ7FySs8EV5D8j31ui+eRbyll/GT9ZWyM2iJxEdI4aHnRGGnyaGsy+pJK2T5rVm3TXpuZSesBnsNeKDumfW8SMIwQ== X-Google-Smtp-Source: AGHT+IGgzuUGO1EqPBV31+eXZM0mK0XlRSeMKimmPTqAE7NTgQfBlqIFEiBtvdF27mmlNdNGbHNl X-Received: by 2002:a17:907:7808:b0:a6f:b67d:959e with SMTP id a640c23a62f3a-a780b87f058mr18557666b.53.1720461159854; Mon, 08 Jul 2024 10:52:39 -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 a640c23a62f3a-a780ab2c914si12960366b.724.2024.07.08.10.52.39; Mon, 08 Jul 2024 10:52:39 -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=C63xDqp9; 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 2C61968DA4A; Mon, 8 Jul 2024 20:52:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2095.outbound.protection.outlook.com [40.92.58.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C166968DA4A for ; Mon, 8 Jul 2024 20:52:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XwEy1KwfqYwqoLsvcCX60VmETuzamtBfF+xPOXMvhCBWLITd1GwPEN4xQ8xIACIWwXUIQbK+o2h8gSqyqWFjtYOTi6jktmXeM3haMcaUkLPDHF3Wzbjg/aCdtq8rdPaNBbXo2etyK9pciPrbOBfZXMFVvX3noEgfPi0oP6kDa5KN23jdpNWKoU9f1381cXR+bIzGmD60kaZ0MaOVivkO7m5rB98Y/VCr44z+xBZyegJYIwm/9tuGh9hHY5sab0k44EX4C6k8surka2LMMvTWtn5rNp4IpMiux3wqyTBwGSTzhmLhzuZ5qkC0T5wPNOM9dnd8C6pxAoOOZM/lbBnk+A== 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=yYe8v5hsSlJa9grDMiu5m56lBDYeOKdEOP5fdLvoV5Q=; b=A7Ipd9oJ7uIk4PVpocAhuoJl9E/5rppXaSl8CXwHD7JFYG9fLsjKaNkWui6mbFmnNDw7XeWs5cz6ntICFEe/4UO0LmFnU8V4jelgaohh8LGfPdMHmL75Yr7LFv1ZNDkq89XaN/e/ggL6XHTyv5rp8JlMzuo8b5R5TYS2m+xWIeQebdM//+sBDQVOTS+KyjAHBoonOPzXEYVWtxJm/p6AlWfCDXE2Q4CTD129u8HFjolbM55qm71znFWR/qOJDOCZrdsN1G67jlE8/Uhl0TR6FIsgjsKsI2g4WIMKevK5++vC1jA5tO4WUFyJBE3p5tg5VEc1TEDGZsMQ2zhmMMHvcg== 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=yYe8v5hsSlJa9grDMiu5m56lBDYeOKdEOP5fdLvoV5Q=; b=C63xDqp9UmxZ8F56eBNbVjmv/4g4ax8NbWlqRl4rD38L2xhqjChBG0cCekcYa/rjSVQgwzbN3NOqf2AJkGZBThm61hlQudQDvsOonNZLqlVS0UgH7wB8vqX2XAt0pKZ9hSUC7JhZFaAEmx6PsVPhgWQ2XqoRAdsHyU18qu4Fm8Og++KybyWVsMEOQhEGiMTQcaVgjtmmBuQ4xxXrzzeSxOObgGfEqvJcAcWSMkdPj98hzccyJ8EfYrKGkrnWNqkYGYzRnxaiwHnE1ZVDJI3lPUOEgekXqJZ0pdnXCtkCto6HGmzZ6Keah6TomA3ZhGc+/MpZyGg6okTkIn6izSLW2w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0179.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Mon, 8 Jul 2024 17:52:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7741.033; Mon, 8 Jul 2024 17:52:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2024 19:52:17 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [+TZ1p3HSrLePbjX8rMknXDHdionSC1dJc4A2kECMvyA=] X-ClientProxiedBy: ZR0P278CA0091.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240708175218.892808-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0179:EE_ X-MS-Office365-Filtering-Correlation-Id: b306bf40-aa76-48dd-dcc1-08dc9f76ba5a X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|8060799006|461199028|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: WiI0ewWsTEHy4LZT57HVoW98EgjMKQeSrSJB3Z+saPMx6bdh4nvyk+YDJVvXFAQHuKoLC7incvw7dqtShod0Le4rLlhUm3pDCE9kTgbvFSmlEmo6k7ath0TB4HltiO5u37v6eR5IhL7Y4zxMDw5m0e71A94jNn/AcPzr5Q6eLgRlUytlWXlDo0R+XDoy0Fo7i4T3hdOEzRMlbVF1kKyobudFa8cOMplX7IuqrPBWVY7YayIbWoT+mfEkPMAPecPddNbAnrhH/A2OaXDjdYIr9RWaiN1vWMoOodtLN1Ska8N/KpqLzQZSCcXJs+hsd/sVvu3vLuspVfUmWZ5pHdmwCYq/jeG2jc4CcpStPnyBZM14IRls7LeAOwqlsYkHDjiyZD5j9FqbDA/Flgyluor/aykHf9JsoZS0Mloh1XNGC7w6eaa7gag5dzHxRqWl1ff62ksmd9OmdAJpwvDxXUKZjTDB63zrQuLEL9vQe2CDc7Qv9umQZBekVFd6TAiPCLXXkcoTiyRrxxc2yHLm8YkWaCGY8jeRcNZCyAluUKi8Lj7Iuzyh1krS5Vt3KedLnU69cXBqJKtFsWUDFZzhGosBGqOdfgp6GNfBpIp6ixi4mKDm+J4eTRxA5Culupx2anoHY0LdU3Q47MZn58ubSo21fO0IrOAl6uapZ1N2W0FxU8MvOZQjaDUfUx7cHAWdgxCg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MOyfGTn0pfbQsloJuhDlc5WIglqxsswlajnumUwCZ1Blmf3+K6p31Y2OrT89JWA5s6UAyNpYbezU6BIH9PjThDZ4TebujHOCFny7jJX311U8g78iIs0UEB+bJFW4yK0dtjtSpvOODe/hTO2379SWpLTypHkTpVBw62pEqb3qySOs30HSdFY79dIi6Sqwc/xUgxFfSRT8krrwooPtM/RYzVr7drf1DoPSzLrvKdYRfA08xTFO9m2kQeQQq4vt/g7jT0vZuEzFy7LxrGrJtqkOpIeGCQv3EjhA/9CA5dhjP6c7Ze/JLgRlxp+hR88EB1s9xISYhXiUwb4Nef+1KKA9uH8gf2cA/bkoxwM0HJBmlTHShEiEZqPEP9TCK830Ve+VlMwNFqPQJ0vfFE9g8yLolqOyQHWOt1WoMHAKoNyU/8WWVlmaGGYnsjkEDdeo29vflDQQj+RljbURtiiMp7EjK8BSzyPlPkNLWr+/g/1miJDf7BHDrlWPFpfbEeGfcnRk/tHdbb81fo6kWIQIeN8EQsFR8hUJSHh90Go1wY61XAgGPIq3QgTliVeL30ltEC8lzSR+PvmWsKlgGyuHmZtpNo0j3JGawRVAWeePz2mYGla4Trcda5V4zpjuE6qJ9BLmz627vgq8LIx5XbNdXrsqmDcVCEHXCBOAOKJ66j8mEP1to3hW7vsESj3QkY9WaOZfUQqtClAYIV3+EiramgwwhFGpoNZHkI3eGJl93lX8TnzhxODcxe0zcnZ9g+6whHMqXbq23BxnVjc3t1IT8M9k8kGt04NowKfuT/uFipuXUA/nw2aTJxZNducy9A8xi319gaFU7XY5wOtNDkLF/MFQHeEYC4rnasuL+YmnDmoFWDjLKRCdRKWVZttGOwkedJEkyS7s/6jTKiU1ZvjIsAIir9+8uOIAPk9oPEFvSeBMwN/eG3f90k0ZHCahc6Wt7t23WwJiCqVTPU+QMyVMIGLDDuyyb1IyTExZGrmp2dKSsg14ugMPGBYHZcgIQuiyyWhRlBgaJa9MPeFPEnYpuSGVf6rLu/Dksu+46oX8uboY0Q8a7KCNuoPPtUdb1gurmnaajai7uK8J8HZPGP19kuueGahxB5Cy2v7XILEh8URuabPYWGfjs/s6VY4+IJsOmeqPCC3JKh4mfST9a8tfaAwe1bxeP3xdH4cvQ6l0GBjAn0I9hEyKh7OzC2kd6VB3xU/4EOWnYGFjcTaBSuvXlsXNwEek+IDFvrOYDV3WyXKEYFSGY4JGgeq+xoPJn11Z2aPX7RBzeN4VFfVzEuakFmM5+Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b306bf40-aa76-48dd-dcc1-08dc9f76ba5a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 17:52:26.3299 (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: PR3P250MB0179 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/matroskaenc: Only write useful cropping values 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: xYQyy6EW7mAf Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 4b91283119..a98d33abf3 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1799,10 +1799,14 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, return AVERROR(EINVAL); } - ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPB, bottom); - ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPT, top); - ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPL, left); - ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPR, right); + if (bottom) + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPB, bottom); + if (top) + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPT, top); + if (left) + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPL, left); + if (right) + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPR, right); cropped_width -= left + right; cropped_height -= top + bottom;