From patchwork Fri Jun 9 20:35:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendi X-Patchwork-Id: 42028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp1419494pzb; Fri, 9 Jun 2023 13:35:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6QJJFqf9lEfO6WFGIJ0oG2mILHgruxFjhajxibBXp6s3a1zjZ9s4S61cWkyec4iZ+efgHM X-Received: by 2002:a05:6402:3c6:b0:510:d889:88c8 with SMTP id t6-20020a05640203c600b00510d88988c8mr2144795edw.38.1686342927933; Fri, 09 Jun 2023 13:35:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686342927; cv=none; d=google.com; s=arc-20160816; b=jXhxoHlfA4ww/0QR1C+ebdqHYtSLpJwe3AFJboEJh4UagDi0Re8UFwLgviBZvuB3fu /M08wz3un9dubSyGPOgaBCgn2BAUESsb9sHR9K64YfxPhzewBmJSFWZcQlZ0lsz6tq21 ApajES+riqQjzktpRkkYVs2m2NFfy9ofxmMFb+Sousdo9FGNDJIpWd+htFxvX+C0hrjh a81vPTBImMUGh+Wjh6sFF3inaLpTHe64JLCSdYZ+6EMDxwA7RO1i7jwRamVf+VoIuhXp U1IfYaw5yNtt+NSZyyCtyJQYjVhnK3bj1pntxFp4K8ylX1+eanuCwxLTIaWKc6TqySKm 1RMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:from:to :content-language:user-agent:mime-version:date:message-id :dkim-signature:delivered-to; bh=ZS/S47Xe3WYa3d1QU6GGa0MhdZJVT3fVEh5vIRm/1xE=; b=VVGHJxDz5IpUme4FfbD8KK/RcuXn/BRZZLJ2oHm1n1giFJcBr8GsWCHWrQhiLUs/ic iI83Qd9QLdRj2FuGkpsM7yXJvMpdyXuoi1tMRwQ1GDbrCPSy2I7NTKZYg16MCuLJqut9 XVIuvLTI5P62++Iq+bGa+/ZBWYfUJU4yPccpV4ORyAEw00+4/vDJNlhkOu73hZfvhSTp zYlyXNN7dSarvsYQSN3v+DcVgHDD9Ynkk1OeHyZg5SM7jvv0a0bLLyHO4V6F6P3KoZ6y SW4GhNrZ/nBoIn03iGsaaTYWQrCRBn2N5ekaxWm9SngvbEBG8nFTsurVONke+CkKs2ti lEzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20221208 header.b=BCHekD30; 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=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w12-20020a50fa8c000000b005167bb22382si2654227edr.588.2023.06.09.13.35.25; Fri, 09 Jun 2023 13:35:27 -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=@googlemail.com header.s=20221208 header.b=BCHekD30; 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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 127FE68C2FD; Fri, 9 Jun 2023 23:35:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7770868019F for ; Fri, 9 Jun 2023 23:35:15 +0300 (EEST) Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-97881a996a0so385423366b.0 for ; Fri, 09 Jun 2023 13:35:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1686342915; x=1688934915; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=JpzW2lLAaP3Xx+067LR+jVpJ2/6R2lAwtcpjurLI64c=; b=BCHekD30nUAqD4VQdSm740/nPVNnU7k7QyC2nunuQxWEma51/SbYcMzipnd6+XP+mC gWfjQja823w+bfBT8u006BSYU0pTgfVToE8XY42MPEcKnB98Ob2QbxZqALGVXGN47wvg 43iwAXLOtPk2y1Ahr+exB/pmXnjrkRrHzQeVrFkrDAJv++GpKGuSGZYCDJL3VB1AOxWF kRMW08iNS5ivNdNvjKF5R4Xr6gCg1P5xym9BFgVqIooh5q8RYkcmyzzcb03pBFOlSj6K tYGGZo/825wdnkevZDUbDZFBjcw5C4X+elUvsvwYHQrGy1QDECqK8KPDfVsO3fZaEHc2 XDfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686342915; x=1688934915; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JpzW2lLAaP3Xx+067LR+jVpJ2/6R2lAwtcpjurLI64c=; b=SiKaWY9pDY+iqp69Z1+f6gm8cg1VNdNuWgvsSUDwcxm1N8XXX5VBTt/hGX1MkhGv1c cugGhBOlC0EDE1k0mE1MRoyEZHr+HTfZR6LiCfSemLD4FtF7cR1LB42yW/djEV+D0MB7 jU5YGGn0lIdtjKdnE56ocYY4aGP0sBjimViJi3cMOoXh46h80xvVAc8kZUN1r27cElvA +TkuRuQ7ww6K3N5U9+F7oXqg+JDIG9V9DBpcL2TByQbYL6aosccuSrqZYJH424JqhmUB IxtJ9jXvDYlHS32p9KdbipK2nuPsLbXopr/l+ZUK7wW1KfGUr6f6Qoeqp6G40EYMocOF R/Ew== X-Gm-Message-State: AC+VfDwk3mWlDWGLxDwd9rNyqzR5YHYlXtL3VYOOAMzfdzPCrFl7MvIX rcA6UIj0wDTm3DBm9RWGPEALJZuSfQJ4B3dI X-Received: by 2002:a17:907:981:b0:96a:30b5:cfb0 with SMTP id bf1-20020a170907098100b0096a30b5cfb0mr2918299ejc.22.1686342914484; Fri, 09 Jun 2023 13:35:14 -0700 (PDT) Received: from [10.1.97.26] ([81.95.5.36]) by smtp.gmail.com with ESMTPSA id mh2-20020a170906eb8200b0097073f1ed84sm1721995ejb.4.2023.06.09.13.35.13 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 09 Jun 2023 13:35:13 -0700 (PDT) Message-ID: <79da1bee-27e5-aa8d-f35c-35228b03d8a7@googlemail.com> Date: Fri, 9 Jun 2023 22:35:12 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Betterbird/102.12.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org From: Hendi Subject: [FFmpeg-devel] [PATCH] avformat/mov: Add support for uuid-based senc box 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: jisXkL7+5kkS Attached. From eca7929274b9bfd7c5aa8a76177dafaa57ab91a5 Mon Sep 17 00:00:00 2001 From: Hendi Date: Fri, 9 Jun 2023 01:46:30 +0200 Subject: [PATCH] avformat/mov: Add support for uuid-based senc box In PIFF-branded mp4 files, the senc data comes in a uuid box. Signed-off-by: Hendi --- libavformat/mov.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2e4df42256..1cfa14e7b4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6256,6 +6256,8 @@ out: return ret; } +static int mov_read_senc(MOVContext *c, AVIOContext *pb, MOVAtom atom); + static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; @@ -6274,6 +6276,10 @@ static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom) 0xff, 0xcc, 0x82, 0x63, 0xf8, 0x55, 0x4a, 0x93, 0x88, 0x14, 0x58, 0x7a, 0x02, 0x52, 0x1f, 0xdd, }; + static const AVUUID uuid_piff_senc = { + 0xa2, 0x39, 0x4f, 0x52, 0x5a, 0x9b, 0x4f, 0x14, + 0xa2, 0x44, 0x6c, 0x42, 0x7c, 0x64, 0x8d, 0xf4 + }; if (atom.size < AV_UUID_LEN || atom.size >= FFMIN(INT_MAX, SIZE_MAX)) return AVERROR_INVALIDDATA; @@ -6356,6 +6362,8 @@ static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom) return ret; if (!sc->spherical) av_log(c->fc, AV_LOG_WARNING, "Invalid spherical metadata found\n"); + } else if (av_uuid_equal(uuid, uuid_piff_senc)) { + mov_read_senc(c, pb, atom); } return 0;