From patchwork Wed Apr 20 11:09:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Malviya, Janpriya" X-Patchwork-Id: 35358 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp809518pzh; Wed, 20 Apr 2022 04:10:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSGknDxUlwPNuW46a1gIjd787n/Om8IwsoOufgPtCTJ9R9SbmkS8sI1t/IdfKsgGzlb4uc X-Received: by 2002:a17:907:72cd:b0:6ef:fe0e:c40d with SMTP id du13-20020a17090772cd00b006effe0ec40dmr2507259ejc.363.1650453004307; Wed, 20 Apr 2022 04:10:04 -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 y18-20020a1709063db200b006e8af8dea96si1548744ejh.247.2022.04.20.04.10.02; Wed, 20 Apr 2022 04:10:04 -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=VPWHwsaD; dkim=neutral (body hash did not verify) header.i=@bose.com header.s=selector1 header.b=DXk7lcMb; dkim=neutral (body hash did not verify) header.i=@bose.com header.s=selector1 header.b=DXk7lcMb; 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 143B868B392; Wed, 20 Apr 2022 14:09:59 +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 5D85C68A34B for ; Wed, 20 Apr 2022 14:09:51 +0300 (EEST) Received: from pps.filterd (m0243507.ppops.net [127.0.0.1]) by mx0b-00428a01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 23K9RLDv023306 for ; Wed, 20 Apr 2022 07:09:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bose.com; h=from : to : subject : date : message-id : content-type : content-transfer-encoding : mime-version; s=pps1; bh=CqjX5CChLCIgKcZyfMQm8Lr66aDpCwjZO8F4x+M2S5M=; b=VPWHwsaDT7Rrf/N60np9PfJPODQbxiQ026Id7/EqsAILS3hqynKILbRBtBhpHLcqd5kZ OECnwQjh08ubUsDpc2jvWynLKBHW2bpZQL9o0cul1JqpBeqU6tpryes7/U4891d9Fcyx uHQyCjrjvlzP58MhUgMUmB0PWyfDs5rZRV0+E12TtyCmXdo3la2T/STozUV8t7vDVheM KlVLBCz194koynMa6KNvv+jt8W1zP8kXsOxMOa+SM+XtEs7x7F5v4+nNXFE4XqgH6D8q KgoUU9r7Q8Xv6CvACz1Gw3Hi1jMwSSm+FhlcVrk9+wELyZ7naLqgZnTZup7gGB9eOGEC Ug== Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2045.outbound.protection.outlook.com [104.47.66.45]) by mx0b-00428a01.pphosted.com (PPS) with ESMTPS id 3ffqumndr6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Apr 2022 07:09:48 -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=CqjX5CChLCIgKcZyfMQm8Lr66aDpCwjZO8F4x+M2S5M=; b=DXk7lcMbSmsabAT959csZFcilae4S+7B4LDXKRVlPTB9CEh65PrupsFCDVS1ghhpnzS8NeI3DKcRGcUzKqE80YGu6AuiFkvaGm7vbBVE+do+XriHq9DLiCahkWjsFDjmRrZlW7ZhpI3IMuu8nnH40sJC74X+5Hpt0mXi4uOR1rQ= Received: from MW4PR03CA0190.namprd03.prod.outlook.com (2603:10b6:303:b8::15) by SA2PR08MB6459.namprd08.prod.outlook.com (2603:10b6:806:f8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Wed, 20 Apr 2022 11:09:45 +0000 Received: from MW2NAM10FT005.eop-nam10.prod.protection.outlook.com (2603:10b6:303:b8:cafe::98) by MW4PR03CA0190.outlook.office365.com (2603:10b6:303:b8::15) 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:09:45 +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 MW2NAM10FT005.mail.protection.outlook.com (10.13.154.75) 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:09:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kDnOmjcYjpe1Xsg47+G2jMh65f6CUAHiIfWll9OVHFJoYN5k+3f2goOrRM0lcXiKx5VklDLcMVLgRD0x3167SsIWNT2tcu9IWjJV71lAzuPNHZokdVfIssAFXWEJCa6vTCOiUdnK7WzOEOsLxyymyXNW0ITtVf02yTlkNal5SPATU+2QtGWDLucFt1tcht6fB1cNAvTnF7l9WMv5x/Hu8MRnfmLGf28+aCS6xclbo5AIfWkcXw7U0060nNlzGg17QP8iQTy8ugGyOGFqTA95072p8+O72XXjbzL8GXmzV6cazU+4zIVdLiUL/0g4VaoBlTrufxKX9Kk4rbK1ZtUmsA== 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=CqjX5CChLCIgKcZyfMQm8Lr66aDpCwjZO8F4x+M2S5M=; b=Lo5RYYecqhGQE7mKc5BtKiM6QqzTKiRDJjzDQnnCigxq/czc7J06CayAHpCcaD7ojHp5IyJIoSJN6kMR9wrhDDoc1x8/MT4SQWX/s9x1jFsqzXiIZ0feP4F1EeZdhrQxUFiEkRKYT74i5EZ9cybIilrnX30FH9IH2pD95WYB4gpuMm1ZgEtD5SgbpCVyyBgItDxxY8qJoS+8TatVysvmtTSJD8GGDhhjqlAi/xTHg0xlmDLVKJ2atz9uBppdIY1D3jFLg2LM3W8d2f3f+hLzryZNyNY+73TfSVyr3jswd3929TI0DgsiuY3A+9Vab5cLD/it3ggWMHS3NRjls8Vhsw== 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=CqjX5CChLCIgKcZyfMQm8Lr66aDpCwjZO8F4x+M2S5M=; b=DXk7lcMbSmsabAT959csZFcilae4S+7B4LDXKRVlPTB9CEh65PrupsFCDVS1ghhpnzS8NeI3DKcRGcUzKqE80YGu6AuiFkvaGm7vbBVE+do+XriHq9DLiCahkWjsFDjmRrZlW7ZhpI3IMuu8nnH40sJC74X+5Hpt0mXi4uOR1rQ= From: "Malviya, Janpriya" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] Added configuration flag to skip cover art atom while opening mov parser Thread-Index: AdhUoSCMEXRcTYWJR2GhjdhbRfDumg== X-DGNDLP: BoseProcessed1 Date: Wed, 20 Apr 2022 11:09:37 +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-20T10:52:03Z; 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=a6f09fdc-a575-447d-8ce6-5a72b5fc3157; 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: 01070f06-a3d4-441c-f8ab-08da22be4661 x-ms-traffictypediagnostic: BN6PR08MB2820:EE_|MW2NAM10FT005:EE_|SA2PR08MB6459: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: c6H+aR3z7CJgMptsRVzxKGh9R1vANiIXnIJZG5HxooC8xNLn5oX5NYE2DcGqVWCOLW2IHjwgJKz6IJrN+T4hxHQ32GmtwCUg7bm8O46v4KXxRenuMCvRQOu6sfq1mYVSCK36V/CMQ0Fv9tCn+5PISKwu8Z4r6s6IJiRjbbFSszx9XBQXqU90ZhcSAoPoeST9Qsn4/vGkvKjY4vA11lUQKqVB5QaChPZFiBgdzM4qdXJJLW8cqXEsPm9VexByB6gpy0ltbbbFedDt+gA8hzSpB55nF/rU2cBIHyS/5bmp6BOBTUjQ3Li1yFmM5rUD68/QqWa34VgTjvqpnn+ISI4ob3LJhF82OlD9Q3Edcq53hFbv7CTogwnHrbUIRrevWCzoWGcN6a3kFkzrgM9UiXquzvaX8T+I+3arFBCuuDbaOZuQqbQSysbp1sRY9HkgXsPpzrUO5zKUuH2ArUcrJ3TYFtS4KL3/ID5Q0ViDqDo25yDsSIpFyVAVbxWAsr06WIEOlxNKyGBIyU3WUrP8jWBSLKU/fSA8mM+GxjFiIYkV3KV7bclkhgtnrps0YAJvyzFImQwr2OGqF197x/0h1eyebkz9sT5180fMGLhFspfWAG3eCAuB3Ygpt/Lr4KpgNhUL/VoN27LG4tvvLCRrI2WImlBdxnqNSdnhxr/1bqnxB+o7blpnv6nZh9i/MAvN8Hlggqi48jRBKjc6DJUGi9Iz8Q== 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)(71200400001)(38100700002)(38070700005)(8936002)(55016003)(508600001)(186003)(5660300002)(66446008)(66476007)(64756008)(2906002)(8676002)(66946007)(83380400001)(76116006)(66556008)(52536014)(6916009)(6506007)(86362001)(122000001)(26005)(33656002)(316002)(7696005)(9686003); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR08MB2820 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: MW2NAM10FT005.eop-nam10.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: b647e213-3849-47ea-aa45-08da22be4277 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p7J1b6/S3IHN73N6IYLDE90BuuEfvlo3Q+NmSkwXoOOOXsg0SDQTVHsIadO7vHj1QdmqTj2WiJAF1e2I2eBE9VG9Q2XVVSlo0+Vgk3eCDoGZJB0UBr4uvUajgnxyNOPaXL1skXXc2q6tKHCsdXClQmIYbl5flMZcXwbnitHfjNECSZGjNZi3/gMCL/af5ZuZlXc6uZ/24mCa33zuUd0oi5TsG/I1oAblrBPzfsy99rXUfy5Nz1Jhsq/n+yuGKlOG+q8/M7Ut0dgtN8tuRjgChY4vXgh4kGu1/r+rrnfBFma0xAzVyt0vQCFBj9YpVSspqwoJwudcXDg75eae1OvgmKR94cuBKkpi5Wi0REX0ZFlcpiQnHokXONXGttyLSSzeufgkFQTQJD3M6xz8hxEIX2e3CcZVZuykOcn9u5gyQI90kRQh2t2ZsGiUAQ+MrWmkefBAYpUYo4vS55uITc3AW00nQETHWibTqozZf1qpb9Ml84AENJvcNwvikZzD3gGNI9cvaLtghkXZi5MJX632teqzGztxH1n0bDgeBUTW4DNzDiSSPoHenwZxCHoOlmG2TCmSdzIXYIKlD4wRQWMXpTBkzFcfEd1Yfib/FEd3cBngLLX8nwGxHSSbZpozb2gXrjg4gf9NVv9LE4x82xAvVroqOJrJnsXmL+sIFA65reB2Z/8qsVetFZ+SLK1xCMu6 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)(6916009)(8676002)(86362001)(956004)(9686003)(6512007)(2906002)(26005)(33656002)(8936002)(6666004)(6486002)(82310400005)(70206006)(70586007)(508600001)(52536014)(36860700001)(336012)(356005)(47076005)(186003)(83380400001)(316002)(40460700003)(36736006)(5660300002)(81166007)(118246002); DIR:OUT; SFP:1101; X-OriginatorOrg: bose.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2022 11:09:44.4428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01070f06-a3d4-441c-f8ab-08da22be4661 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: MW2NAM10FT005.eop-nam10.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR08MB6459 X-Proofpoint-ORIG-GUID: YOMZ375GmCM6rJhD17wRzhQvNVMKfoXx X-Proofpoint-GUID: YOMZ375GmCM6rJhD17wRzhQvNVMKfoXx 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_02,2022-04-20_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 phishscore=0 priorityscore=1501 mlxlogscore=914 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 suspectscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204200070 Subject: [FFmpeg-devel] [PATCH] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PgCkVEVA6fbB 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 }, };