From patchwork Wed Apr 20 11:39:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Malviya, Janpriya" X-Patchwork-Id: 35359 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp822430pzh; Wed, 20 Apr 2022 04:40:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyE/YhclSgTIse7pmqXjM1ISSl7/r9FMNDloE9o5si6zthcgifUHYdAuKC9wET0aWH+aSg9 X-Received: by 2002:a17:907:7fa9:b0:6e8:c0e1:5741 with SMTP id qk41-20020a1709077fa900b006e8c0e15741mr18681909ejc.159.1650454812351; Wed, 20 Apr 2022 04:40:12 -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 m19-20020a056402511300b00418c2b5bdedsi1551234edd.207.2022.04.20.04.40.11; Wed, 20 Apr 2022 04:40:12 -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=@bose.com header.s=pps1 header.b="i/RF/Vzo"; dkim=neutral (body hash did not verify) header.i=@bose.com header.s=selector1 header.b=Q2whbj0+; dkim=neutral (body hash did not verify) header.i=@bose.com header.s=selector1 header.b=Q2whbj0+; 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=QUARANTINE sp=NONE dis=NONE) header.from=bose.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A2BDF68B3CA; Wed, 20 Apr 2022 14:40:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx0a-00428a01.pphosted.com (mx0a-00428a01.pphosted.com [205.220.165.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95C2568B0EA for ; Wed, 20 Apr 2022 14:40:02 +0300 (EEST) Received: from pps.filterd (m0243506.ppops.net [127.0.0.1]) by mx0b-00428a01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 23K9RWOW015410 for ; Wed, 20 Apr 2022 07:40:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bose.com; h=from : to : cc : subject : date : message-id : content-type : content-transfer-encoding : mime-version; s=pps1; bh=7yJ6JCBrj9LX292V33Uu2ZE6ShmgLJe7P5YkUJ2AzRQ=; b=i/RF/Vzov1csfI1pgBNTc0cgQvH1d0azEh6migOqu9RHFRZehF/FhbesTyy0SpbZyZYB +psy+b7zsZakNsSqOXqcLs82e3LL7ms0a1wBXNW7zVGn836/mk/Eem9O+BRj+ktlmZ5h zTDAkoC7vrgtRsnmnwaKnW+rA/Y/bCq30WyJV2VvE2luADDJ2mb6eWZwfFPIFRWykDJJ JE+gFoXxW7iI34/0OZstw4z5OvvPNC0tKJymAP6i9FM8mzgLeSDzm82jbmChJ0fe8Zph tEuH9yxjh1uaEHFxJk78/h8Jqw8W4xrtDOdZgh6TQFeLlanGg8Eg6mDORSn0VJ6NywNE Aw== Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2170.outbound.protection.outlook.com [104.47.58.170]) by mx0b-00428a01.pphosted.com (PPS) with ESMTPS id 3fft0n5d54-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Apr 2022 07:40:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bose.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7yJ6JCBrj9LX292V33Uu2ZE6ShmgLJe7P5YkUJ2AzRQ=; b=Q2whbj0+twK96o8d0gaRP8NH6IJnqLg99Gd5mqfQrn7P2xZjs8cMax8MnHkL0AE7TsjDFPHa1GUFHv9af0sBn4wjxLcq9jgir8dLISSN1ueWi6AOdkP04Itd0kk5KiHLFeAeFg1SIVrHo3bs6Dvzrb6Xwn/nwMVmqxFLxPWu4Yg= Received: from BN0PR04CA0029.namprd04.prod.outlook.com (2603:10b6:408:ee::34) by SN6PR08MB5646.namprd08.prod.outlook.com (2603:10b6:805:101::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Wed, 20 Apr 2022 11:39:49 +0000 Received: from BN7NAM10FT035.eop-nam10.prod.protection.outlook.com (2603:10b6:408:ee:cafe::6d) by BN0PR04CA0029.outlook.office365.com (2603:10b6:408:ee::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20 via Frontend Transport; Wed, 20 Apr 2022 11:39:49 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 34.202.228.63) smtp.mailfrom=bose.com; dkim=pass (signature was verified) header.d=bose.com;dmarc=pass action=none header.from=bose.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning bose.com discourages use of 34.202.228.63 as permitted sender) Received: from dg1.bose.com (34.202.228.63) by BN7NAM10FT035.mail.protection.outlook.com (10.13.157.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.14 via Frontend Transport; Wed, 20 Apr 2022 11:39:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O5vp9mBtVqtqdrG3LOKPIncNd0bhshbw1ad5IMR1niMLMKpTnHG/FtfBCmicjJEOncl2gFdMMRDlePUbo3HCygC62Q23NH1P6NpLMxVeobsOh4oXNXGCt/ZVs4MR6rlxdxO0pDDiYmWxvkZdUuA/RjiLNqBK537h1tX3MfuVSrnYaIkrOewc72Jn7QlRAvJZ4E1oEiwl6MDJ/JGTxRpF3reIfbAGFAYBMZAeGPxbRy3oCUN5lESi7+X9VmUdl+mAryD0D2SjXnie8v8hBGE6rOvd60BoxHzuHaXEp7R9J1Xiw5c0xHylNf2xb+tazKdSpRHp0gZRmXAWQdPv5PFiYQ== 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=7yJ6JCBrj9LX292V33Uu2ZE6ShmgLJe7P5YkUJ2AzRQ=; b=P3BvgIXQiQ3R5vGjz3SkhaET1M3eis05mgOzAG/Xpgl0m0nk+2A5D1jhtT6D0NnIUg43DB4T77Aw5BSTCKmO6BsBwP7H9s+Hp8f1WKfLRXW6YRnIlfTFfa+P4L/4mxT9uhl/Bf46urbYnkynYo+qI/ufPka/vsnu+5RyNbhS3hQiZqZl9XDYZ5kLMKdPgqGWZrasctoWvYxAiqQah0uNmp6A7AiRpBjxEVLyaJAl9utKDJ4sulHwrhVQzgj2pu7WueTHr/f7hAVWEoozMJR5ZShSdF0d4erKmZa6pbpDtl59ww89eJdwe6GlzZC51kk6UwgvsUQaK1cnXkUsmorSkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bose.com; dmarc=pass action=none header.from=bose.com; dkim=pass header.d=bose.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bose.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7yJ6JCBrj9LX292V33Uu2ZE6ShmgLJe7P5YkUJ2AzRQ=; b=Q2whbj0+twK96o8d0gaRP8NH6IJnqLg99Gd5mqfQrn7P2xZjs8cMax8MnHkL0AE7TsjDFPHa1GUFHv9af0sBn4wjxLcq9jgir8dLISSN1ueWi6AOdkP04Itd0kk5KiHLFeAeFg1SIVrHo3bs6Dvzrb6Xwn/nwMVmqxFLxPWu4Yg= From: "Malviya, Janpriya" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/mov.c: Added configuration flag to skip cover art atom while opening mov parser Thread-Index: AdhUqy6BcCiEqrqFTEOmC5mKxAXuhA== X-DGNDLP: BoseProcessed1 Date: Wed, 20 Apr 2022 11:39:47 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_879e395e-e3b5-421f-8616-70a10f9451af_Enabled=true; MSIP_Label_879e395e-e3b5-421f-8616-70a10f9451af_SetDate=2022-04-20T11:37:37Z; MSIP_Label_879e395e-e3b5-421f-8616-70a10f9451af_Method=Standard; MSIP_Label_879e395e-e3b5-421f-8616-70a10f9451af_Name=879e395e-e3b5-421f-8616-70a10f9451af; MSIP_Label_879e395e-e3b5-421f-8616-70a10f9451af_SiteId=0beb0c35-9cbb-4feb-99e5-589e415c7944; MSIP_Label_879e395e-e3b5-421f-8616-70a10f9451af_ActionId=94f47b9d-44dc-4123-a3ee-bdf45e54c527; MSIP_Label_879e395e-e3b5-421f-8616-70a10f9451af_ContentBits=0 Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bose.com; x-ms-exchange-messagesentrepresentingtype: 1 X-MS-Office365-Filtering-Correlation-Id: e3ccd7c2-0b9d-481d-85ad-08da22c279ec x-ms-traffictypediagnostic: BN6PR08MB3570:EE_|BN7NAM10FT035:EE_|SN6PR08MB5646:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 5CSr7ygo772YlzdQw3vTi34fkwbgLhCWANBmYpnuNgkDqOHogrHwWTKtgd5P/mmzQ733pmL91r33n165otKeXTjd0Iyyoqg2p44/kbw6hb2JSb0s0AvNfu3tSHL5Er1uik+cXbE18s89O683c0GGT5HBgO7knapYoF2wqE/y12Vw40X8MYwXSSYe+ILtcGtTLVV9R0R4L4rQSpIhBkIlvWGq6b51IE6sQGMrHsdzLZFpqHFnbTuWrea7z59jnSpUctCK5Sn+/Zrz6G3r3LKc61L/d6D8kkkSMqZenrSLYKnkxqehQtxYO9d7H0skVwwOQRVG/JM9qvDd7wKEKKASJi7MtkaRWhT1sa/jif5mIYwseVKzkuDonjzZ/oWxq+1eztBZvD1R3lkJ+ufV16u7fot65VH3uAnCXppHLx3CKgBo5Eab8v5opefWHdvCrgCO2hVUYjmSvH8fyMKklv5/N33SeSu5wKOR1lmdegMLNTybVjjZy1pIST/85+V9c2uPy+dPaDPd+tVvjy2GMzgAF4twzsK9BWtEsPERTYQGCvcaJ0H7Iw9DcGvKE0ukgD9mG2/FYd65WY1zLEqrYyRuAPj3XSQdhdXz2SdVo4L8eyUt27ituoB1GG0oVTsrxC9Y4ZyfqI9IIZCr5hoXxEsUQsAbedpn+8Fuh0bP8kLb3vkGanm1cuM4j4lFROIZFfVA7xeUzDLQwO0pS3tQ/BU3iQ== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR08MB2655.namprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(33656002)(83380400001)(66556008)(66476007)(52536014)(64756008)(6506007)(66446008)(86362001)(8936002)(508600001)(186003)(66946007)(26005)(55016003)(5660300002)(7696005)(6916009)(76116006)(54906003)(2906002)(9686003)(316002)(4326008)(71200400001)(107886003)(38070700005)(8676002)(38100700002)(122000001); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR08MB3570 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BN7NAM10FT035.eop-nam10.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 36332d4a-7583-4245-f2d5-08da22c278dc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r2eyR6dgVYPyIVTuVxhhuhhBFKZTmB4xxDkeYAaoT6xy/OTeuYbAXC/LW6e3ksRUt55yZI2MsDsAarFT3Kz/zV1RG9l5ZY6cOjuZsgme0K9xRHUZhJ2dPgEKvIA7qNNXGwLWAA6fnWYoJ+G89f88KDyiXN1Iyj2XwAo8dhrooQCT3mZx52KzmEhqmkDUSAipGATrd3Okw4MamcaKpDNEOHlhkf6dzt+fKbKShS03njdKNJGiEyGkhkRX3sP4r33BCDEpCVu5Mp7+ytbBCiYGD5qTHxwVzYtdO0925VZyd7D6ePkK35yw3yG5X4XrKsOpk34+VMfwOwTwvsqxTAerYaMPkFMuCej+DWVTLohfAvV4XcMVSxaurUO2+W4Mcj9++SoAq9QZKFZQQTUF8z/sqnKhM4OaAM4wkyZzwmJgiqrDb817klmXxIVBjcgdmFQ6GQVQn+yxKREfUmBck8AJK+nB5UQEDKlnUtwJwfOgkbMxoeBioMWZEYZxbpyf4o7yw+FQSZGICdrl8ED7RqGXlLRhBADbkpfqgvEqkesHv46kuUgzpOlpKbKGBnywKxg9AoesaOmjlb6o2ZPuy+f7du6yF6M/yy766mFWLRvQgE2TuoN8b2vl63dKSt66Gsg2qSAZrr9SqCW2BcT17XgOyGPrAlzgzM9YhoOwaEQWu8PSFK0WclianBHUYYI+VFDG X-Forefront-Antispam-Report: CIP:34.202.228.63; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:dg1.bose.com; PTR:ec2-34-202-228-63.compute-1.amazonaws.com; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(956004)(81166007)(107886003)(336012)(186003)(26005)(83380400001)(47076005)(5660300002)(8936002)(36860700001)(356005)(52536014)(4326008)(33656002)(316002)(8676002)(82310400005)(70206006)(118246002)(6512007)(2906002)(6486002)(36736006)(40460700003)(70586007)(9686003)(6916009)(54906003)(86362001)(508600001); DIR:OUT; SFP:1101; X-OriginatorOrg: bose.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2022 11:39:49.0421 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3ccd7c2-0b9d-481d-85ad-08da22c279ec X-MS-Exchange-CrossTenant-Id: 5d8ae07e-7fd0-404d-85c1-453ff3dc8c1e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d8ae07e-7fd0-404d-85c1-453ff3dc8c1e; Ip=[34.202.228.63]; Helo=[dg1.bose.com] X-MS-Exchange-CrossTenant-AuthSource: BN7NAM10FT035.eop-nam10.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR08MB5646 X-Proofpoint-ORIG-GUID: IaeA5RYcxCmvNvBkW4g7r6gurnmQOcEX X-Proofpoint-GUID: IaeA5RYcxCmvNvBkW4g7r6gurnmQOcEX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-04-20_03,2022-04-20_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 impostorscore=0 mlxscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 phishscore=0 spamscore=0 mlxlogscore=839 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204200071 Subject: [FFmpeg-devel] [PATCH] libavformat/mov.c: Added configuration flag to skip cover art atom while opening mov parser 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: "Banerjee, Debasmit" , "Patel, Pratik" , "Van Iderstine, David" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pcCbtJMA7rri Hello ffmpeg dev team, Please look in attached patch. while integrating FFmpeg we require to add "skip_cover_page" options to skip cover art atom from parsing for M4A / MP4 streams. By default values set as 0 ( False ) so it will not impact others. Signed-off-by: Janpriya Malviya --- libavformat/isom.h | 1 + libavformat/mov.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/libavformat/isom.h b/libavformat/isom.h index 5caf42b..87f1fe3 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -315,6 +315,7 @@ typedef struct MOVContext { int have_read_mfra_size; uint32_t mfra_size; uint32_t max_stts_delta; + int skip_cover_page; } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); diff --git a/libavformat/mov.c b/libavformat/mov.c index 6c847de..5e94946 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -201,6 +201,12 @@ static int mov_read_covr(MOVContext *c, AVIOContext *pb, int type, int len) return 0; } + if ( c->skip_cover_page ){ + av_log(c->fc, AV_LOG_WARNING, "skip cover art from parsing \n"); + avio_skip(pb, len); + return 0; + } + sc = av_mallocz(sizeof(*sc)); if (!sc) return AVERROR(ENOMEM); @@ -8866,6 +8872,7 @@ static const AVOption mov_options[] = { { "enable_drefs", "Enable external track support.", OFFSET(enable_drefs), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, FLAGS }, { "max_stts_delta", "treat offsets above this value as invalid", OFFSET(max_stts_delta), AV_OPT_TYPE_INT, {.i64 = UINT_MAX-48000*10 }, 0, UINT_MAX, .flags = AV_OPT_FLAG_DECODING_PARAM }, + { "skip_cover_page", "Skip cover pages from parsing ", OFFSET(skip_cover_page),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, .flags = FLAGS }, { NULL }, };