From patchwork Mon Sep 30 17:41:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51941 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp2131206vqb; Mon, 30 Sep 2024 10:41:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV4q9xe+dLlnP2dlVN7QOkAFNRgIMgY0JrCqSltl/DwmKPHdC0wzfhkLiLAysjksb5gAGstaTajCEKC2ZHfb2oh@gmail.com X-Google-Smtp-Source: AGHT+IE71J/FMVmcORtQH2xdE5GpMQC7ETZ7q22uYo9OiNQpylLoT7q2/Kvf1IypSqcXhGz6Tp52 X-Received: by 2002:a17:906:f5a1:b0:a8d:2624:1a83 with SMTP id a640c23a62f3a-a93d8b77f91mr447608966b.14.1727718066312; Mon, 30 Sep 2024 10:41:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727718066; cv=none; d=google.com; s=arc-20240605; b=OwThacPidMajgkNSHM3HI8usCtfOOXJ8qLqiT2HbZuoPlJnbD4uvB2+RHNMaM3aqsk wjB/DyxqgFJD8M2Ev7kFnd7byBASj3c9blZuDBWhH/yN/T5AZ4Jtd+MKkf5NZio+KDB9 9oeqAq3c6F8s5x4gyGggtXN/bHe4fw/tTVaqNK6op+swSFyebNGJ3RUi4J1tfN/OM3+W H35vWQjdVG9IlRW0GXrGRCDnvAPeHBIHPoA4Otpt6eqyaiHjp0Pr/lAMjsC3NMdtCcAr jDTFN/JR8dnUu5fdPTIROOxqnAvTNHHJkxF11xyIP+9j8QfI0g12i61uVsMS2+sEBzJe RMPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=lQXT8NdMsQc5QH29kW4wn2RRNaJqjqhzuLIJcbsw1MY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=eH1+eEonHSOrff8GC3pgh9fQ3kViRkBTy0XsbtuWJca6XlCTsaUIbdIJqbHs/avG1l NjJKJFZvyT6/02aV4Sdlg1M8d/HZPzJ0ltq5NI+8DD5YY2pUd9vflRh8JpEOaodSHJ4z 4/swRNNTvb8m7aONTjKMiIGojFd7y1NcFctIykxESyEZDxqC9b6wmSTQFJIvdK1SfY0G xNQ+nDKhYiC8jKCMRdpVeRFTK2thNbrDoT84d/gfCGG3dUjcEXeRoYKDTlbhXQEI6+Az BpMpTqfW7iJMc8haP0KvEzhIXIvhpIfnyDVs32xVJh5z1/bPoYCvROnqPBuYqHV4doNz 35Iw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=fZUMwdIN; 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=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a93c290369esi579627666b.223.2024.09.30.10.41.05; Mon, 30 Sep 2024 10:41:06 -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=@gmail.com header.s=20230601 header.b=fZUMwdIN; 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=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A10A168DD98; Mon, 30 Sep 2024 20:41:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 463D868DBE4 for ; Mon, 30 Sep 2024 20:40:56 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-20aff65aa37so37931625ad.1 for ; Mon, 30 Sep 2024 10:40:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727718054; x=1728322854; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=C4lCm2itmbDSGPKdEXse1kjJGCwbAY7kse80G04kx1c=; b=fZUMwdINfolFHe7CKXdgZCFd6RsORa5J27WSBPRExTTjIbe596dNq7z1LQpE1526zT 7aEo4vW3kydcs0w6nNVUlwPiqm/ULvSX82ai277y0th9X1YOwqRev4Vu96vwvkYulgj8 XQFFdchLmZM9Wx1WxLZ0xDuLT7MY/G97thByqq77d/FH/hivwQYjQyspu6zn+MFhpAL/ k7gx8PFU3HpdV5uTAjK01VYl1ti8Kzb0TbUM7ZXxhCw/x2tVpxIsPDxC/ge0A5QB7ckZ n2mN+HznnulkiRKElcRrOXOCCfMosG88tgqSdQ9oP7upSvs5bbtib3SCDibtl+PMiEo/ uqZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727718054; x=1728322854; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=C4lCm2itmbDSGPKdEXse1kjJGCwbAY7kse80G04kx1c=; b=Koa0zATVObrX2BWZV0YHq1NrFnALIiyl+Ft5WmhjgYKi2jJYXtiUip5mBxrOLHU4E7 H0gbSMlB7rt269K3U+S6kgplKTGhY2jcAlkLLr0uVMLX9q5y0tl2/BODF4ucGSux7emh qcu2e/GpKEFwhcrshxTLS1c9P+6DYEjtu61UsXctprLc8lvfbhRfI4OVU6Z6v0j092wG qOclyxoTYBUTL93DHvmvKCWJS0CT7J09euUi6Cxq4/r6YLQYI0kQluQTjyWKHgWvxiY+ XMTa+7R9fIdgJFZxOHvLosAatuKs7S8VGTtKroGMcfzLcZKkm1ajubad6pceYL+BiBNE Ul6w== X-Gm-Message-State: AOJu0YwR6/lZgFuQGT0E7h5lQmRXfTvlaEzm5wrWV09arlIKCi7zzg9i ZnJuT4a874jdZdOPQVkUaX7miNG/nlcJhsuAVc5bLRjdvcXUuyTYBKWMEA== X-Received: by 2002:a17:903:22cf:b0:20b:7ed8:3986 with SMTP id d9443c01a7336-20b7ed83c33mr72465235ad.24.1727718053798; Mon, 30 Sep 2024 10:40:53 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20b37d90c52sm57126315ad.86.2024.09.30.10.40.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 10:40:53 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Sep 2024 14:41:18 -0300 Message-ID: <20240930174119.6426-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: factorize getting the current item 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: 7XMUg1Bq5YXa Signed-off-by: James Almer --- libavformat/mov.c | 58 +++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 67e87094cf..b3b92bbb91 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -189,6 +189,24 @@ static int mov_read_mac_string(MOVContext *c, AVIOContext *pb, int len, return p - dst; } +/** + * Get the current item in the parsing process. + */ +static HEIFItem *get_curr_item(MOVContext *c) +{ + HEIFItem *item = NULL; + + for (int i = 0; i < c->nb_heif_item; i++) { + if (c->heif_item[i].item_id != c->cur_item_id) + continue; + + item = &c->heif_item[i]; + break; + } + + return item; +} + /** * Get the current stream in the parsing process. This can either be the * latest stream added to the context, or the stream referenced by an item. @@ -196,23 +214,17 @@ static int mov_read_mac_string(MOVContext *c, AVIOContext *pb, int len, static AVStream *get_curr_st(MOVContext *c) { AVStream *st = NULL; + HEIFItem *item; if (c->fc->nb_streams < 1) return NULL; - for (int i = 0; i < c->nb_heif_item; i++) { - HEIFItem *item = &c->heif_item[i]; - - if (!item->st) - continue; - if (item->st->id != c->cur_item_id) - continue; + if (c->cur_item_id == -1) + return c->fc->streams[c->fc->nb_streams-1]; + item = get_curr_item(c); + if (item) st = item->st; - break; - } - if (!st && c->cur_item_id == -1) - st = c->fc->streams[c->fc->nb_streams-1]; return st; } @@ -8913,6 +8925,7 @@ static int mov_read_iref(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_ispe(MOVContext *c, AVIOContext *pb, MOVAtom atom) { + HEIFItem *item; uint32_t width, height; avio_r8(pb); /* version */ @@ -8923,12 +8936,10 @@ static int mov_read_ispe(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_TRACE, "ispe: item_id %d, width %u, height %u\n", c->cur_item_id, width, height); - for (int i = 0; i < c->nb_heif_item; i++) { - if (c->heif_item[i].item_id == c->cur_item_id) { - c->heif_item[i].width = width; - c->heif_item[i].height = height; - break; - } + item = get_curr_item(c); + if (item) { + item->width = width; + item->height = height; } return 0; @@ -8936,6 +8947,7 @@ static int mov_read_ispe(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_irot(MOVContext *c, AVIOContext *pb, MOVAtom atom) { + HEIFItem *item; int angle; angle = avio_r8(pb) & 0x3; @@ -8943,13 +8955,11 @@ static int mov_read_irot(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_TRACE, "irot: item_id %d, angle %u\n", c->cur_item_id, angle); - for (int i = 0; i < c->nb_heif_item; i++) { - if (c->heif_item[i].item_id == c->cur_item_id) { - // angle * 90 specifies the angle (in anti-clockwise direction) - // in units of degrees. - c->heif_item[i].rotation = angle * 90; - break; - } + item = get_curr_item(c); + if (item) { + // angle * 90 specifies the angle (in anti-clockwise direction) + // in units of degrees. + item->rotation = angle * 90; } return 0; From patchwork Mon Sep 30 17:41:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51942 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp2162688vqb; Mon, 30 Sep 2024 11:36:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW9ik9w9uDne9a2I3i0K1BNrjZQ67Tpgrg5E4dxL6kL11NIztl3nSXObsu1raELSF3Zz2Ls2pUfW7ExXdnhcRR5@gmail.com X-Google-Smtp-Source: AGHT+IFfeH/mlMv9gQaXQ1djekdCVa8N1VbMIvnDHYGdxq4lELXdN4/flhIUJJE8HS307If5qj/5 X-Received: by 2002:a2e:a992:0:b0:2f6:6198:1cfa with SMTP id 38308e7fff4ca-2f9d41979c5mr75172921fa.41.1727721374311; Mon, 30 Sep 2024 11:36:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727721374; cv=none; d=google.com; s=arc-20240605; b=DgQbkrbxgKHF+ldbdACGWv5UtJoq7htX9TarCTWa08fSfZE8Rw0Uu7+KtA5X/4k9Dc 46kOfF0Lz+gFVhVfoOsVIKd3aIk8aCERD19riDdyCb2YICNJk03KSRxuTTNynug7ylkT xGMBKcsCpvEuydwaJvu6VUFVwnqMIa7BKpef6KrGe7VFnE1UcAW77l2KiUwy2xRXj4V9 dr/s+GZsNujYJTlPoRAK4sCmu6+mtYnESixrzy7WJshnBo7WDcVLlco8tZIL2M/x4R+N lyxE1PmJWoJeJyzWBbL7yZuB5pkSzxakUSFeHYlfDjppNGOsY/aG+wryhp6mI6WYZdY5 3bEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=IckTHwdt3AEzti5Efj1ArHNgc4YZMVlbKmObdlZZQY4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=XSwABvjiXtArhlOWttHd+dvKuJpb7CT7FVDyA9Ptou7HER+YW7C765syrerxP840dm qCMm0DplC2LbJfDkpjwcInQGLIsRmUh8D/f+aRf8knzuHZ4jYF9c2KMPAyepUYgEjtk9 hkFQxkExuo5Me05P0CsKUKz0cZOoK619HL/N8K/K3eLqCTyyKlxMYLaPAPSrhfm91pJo /n7HLjW90ArldK7Ge5MBOjJyeZDID7WBaHFnVagcep8QJ5WCRBYpLQ7PxX+3xO5KOwn9 Fj8BuF6xuDkfmFgQUlzlaM6xU8MA8xaffgVFDw5mh2StToGo3wTi305wW8xSmSUH5sCq zxng==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=cWIa8zrb; 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=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f9d4636771si25998511fa.494.2024.09.30.11.36.13; Mon, 30 Sep 2024 11:36:14 -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=@gmail.com header.s=20230601 header.b=cWIa8zrb; 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=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE9FF68DDAA; Mon, 30 Sep 2024 20:41:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6964568DD98 for ; Mon, 30 Sep 2024 20:40:57 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-20b6c311f62so16590805ad.0 for ; Mon, 30 Sep 2024 10:40:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727718055; x=1728322855; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JNQyCh4vFRF1kNADzkEnQBXzejvryekFLB83k/MCSFQ=; b=cWIa8zrbRlXdGXzz1SoL6x3q6dNAaXPsCEz1L/eXuFH6jRbC7F2Oamh6F7ApMM/E++ byx/LTCM+CiW8uv6cDp8miMnJkdf0PNlkAeZS9/tZipQtu3Kf6pBMf5WiWufIJKKTiy3 Acgw5nunDW/ZSfYIKzpFvBTpRKVm55Ep42V77hglU1b5hbzwJ8sLlduC0gAAz/uPhox7 gXlhgw0ibAmRyznuHyPfHpk1FtFA2uMXaeFeExFhWzU0ow2HFrEe9VZjolyyFloqRk33 vEK5kkiuRUJ00ryh9A8RaENVeSzLJBZlTfH5bYdDSl7HFLPlK1MCrTryJIi5SNVfrLKf lb9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727718055; x=1728322855; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JNQyCh4vFRF1kNADzkEnQBXzejvryekFLB83k/MCSFQ=; b=uqKEGtCWpuiYx+n+XY0XjmU5OJ/qmgyRRRqlvvBDa+NXT3WKo+eOg56/lSNzSNTFfX POoaFt57PoKI7z7psBQ364udHR1aHBLIBExllNySdoMxLZ6ojJNxZs7AXzoxVU74fvRG FHx8orMg38VtPST/e7/M1b7wTpZStItuptyYT5mrmYQSTrHEME/Eqcg37/pwegndgqyL a1WEBNo/ymU8h9xjviIimvQv8UVHRslolrbbwFLmmUctAQ2AZtPRhQAUik1hULm9W6q5 EklF6lHos/D01AHE8avAArGUqRNLwRsWjlNNQo/RWIHAwU3F3/sciEJcP6s9ccmAmyMt fW/g== X-Gm-Message-State: AOJu0YyoQLYFH7hWqee3iF6C4jDnN/EsEsaBoKkuNd5ZE4Xh67zTl7Iw MIAglIfNG9IwukYYw/gM4Lg7uVlj+h8Vx2ZZaSx1MYwGLToxizZNgNH9/w== X-Received: by 2002:a17:903:244d:b0:202:9b7:1dc with SMTP id d9443c01a7336-20b37bb8b9dmr195227685ad.54.1727718055213; Mon, 30 Sep 2024 10:40:55 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20b37d90c52sm57126315ad.86.2024.09.30.10.40.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 10:40:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Sep 2024 14:41:19 -0300 Message-ID: <20240930174119.6426-2-jamrial@gmail.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240930174119.6426-1-jamrial@gmail.com> References: <20240930174119.6426-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mov: parse colr boxes that reference tile grids 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: /IfZ9yOI0Cij Signed-off-by: James Almer --- libavformat/isom.h | 2 ++ libavformat/mov.c | 70 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index 204addbab2..bc208772f9 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -286,6 +286,8 @@ typedef struct HEIFItem { int rotation; int type; int is_idat_relative; + uint8_t *icc_profile; + size_t icc_profile_size; } HEIFItem; typedef struct HEIFGrid { diff --git a/libavformat/mov.c b/libavformat/mov.c index b3b92bbb91..f7f5df4503 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2031,13 +2031,17 @@ static int mov_read_pcmc(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; + HEIFItem *item = NULL; char color_parameter_type[5] = { 0 }; uint16_t color_primaries, color_trc, color_matrix; int ret; st = get_curr_st(c); - if (!st) - return 0; + if (!st) { + item = get_curr_item(c); + if (!item) + return 0; + } ret = ffio_read_size(pb, color_parameter_type, 4); if (ret < 0) @@ -2051,16 +2055,29 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom) } if (!strncmp(color_parameter_type, "prof", 4)) { - AVPacketSideData *sd = av_packet_side_data_new(&st->codecpar->coded_side_data, - &st->codecpar->nb_coded_side_data, - AV_PKT_DATA_ICC_PROFILE, - atom.size - 4, 0); - if (!sd) - return AVERROR(ENOMEM); - ret = ffio_read_size(pb, sd->data, atom.size - 4); + AVPacketSideData *sd; + uint8_t *icc_profile; + if (st) { + sd = av_packet_side_data_new(&st->codecpar->coded_side_data, + &st->codecpar->nb_coded_side_data, + AV_PKT_DATA_ICC_PROFILE, + atom.size - 4, 0); + if (!sd) + return AVERROR(ENOMEM); + icc_profile = sd->data; + } else { + av_freep(&item->icc_profile); + icc_profile = item->icc_profile = av_malloc(atom.size - 4); + if (!icc_profile) { + item->icc_profile_size = 0; + return AVERROR(ENOMEM); + } + item->icc_profile_size = atom.size - 4; + } + ret = ffio_read_size(pb, icc_profile, atom.size - 4); if (ret < 0) return ret; - } else { + } else if (st) { color_primaries = avio_rb16(pb); color_trc = avio_rb16(pb); color_matrix = avio_rb16(pb); @@ -9714,8 +9731,10 @@ static int mov_read_close(AVFormatContext *s) av_freep(&mov->aes_decrypt); av_freep(&mov->chapter_tracks); - for (i = 0; i < mov->nb_heif_item; i++) + for (i = 0; i < mov->nb_heif_item; i++) { av_freep(&mov->heif_item[i].name); + av_freep(&mov->heif_item[i].icc_profile); + } av_freep(&mov->heif_item); for (i = 0; i < mov->nb_heif_grid; i++) { av_freep(&mov->heif_grid[i].tile_id_list); @@ -9861,6 +9880,20 @@ fail: return ret; } +static int set_icc_profile_from_item(AVPacketSideData **coded_side_data, int *nb_coded_side_data, + const HEIFItem *item) +{ + AVPacketSideData *sd = av_packet_side_data_new(coded_side_data, nb_coded_side_data, + AV_PKT_DATA_ICC_PROFILE, + item->icc_profile_size, 0); + if (!sd) + return AVERROR(ENOMEM); + + memcpy(sd->data, item->icc_profile, item->icc_profile_size); + + return 0; +} + static int set_display_matrix_from_item(AVPacketSideData **coded_side_data, int *nb_coded_side_data, const HEIFItem *item) { @@ -9914,6 +9947,13 @@ static int read_image_grid(AVFormatContext *s, const HEIFGrid *grid, tile_grid->width = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); tile_grid->height = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); + /* ICC profile */ + if (item->icc_profile_size) { + int ret = set_icc_profile_from_item(&tile_grid->coded_side_data, + &tile_grid->nb_coded_side_data, item); + if (ret < 0) + return ret; + } /* rotation */ if (item->rotation) { int ret = set_display_matrix_from_item(&tile_grid->coded_side_data, @@ -10021,6 +10061,14 @@ static int read_image_iovl(AVFormatContext *s, const HEIFGrid *grid, return ret; } + /* ICC profile */ + if (item->icc_profile_size) { + int ret = set_icc_profile_from_item(&tile_grid->coded_side_data, + &tile_grid->nb_coded_side_data, item); + if (ret < 0) + return ret; + } + av_log(c->fc, AV_LOG_TRACE, "iovl: output_width %d, output_height %d\n", tile_grid->width, tile_grid->height); From patchwork Mon Sep 30 21:12:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51945 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a303:0:b0:48e:c0f8:d0de with SMTP id v3csp3201vqm; Mon, 30 Sep 2024 14:36:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUt7FZMIcEKJ8RO6u8NfsZYj4lY3mKMBbAX3h9wisOTUqA+MhOltl3lIX8boRPgtxQIivw4/wX3Vhxa6YBMvYLb@gmail.com X-Google-Smtp-Source: AGHT+IEGO5iqrtOl2Z6IhV9uJ8i3ikgimBp4hSpLCW9JhewAgEkjZaud0kkFGU8WmnhDTOEI7HBh X-Received: by 2002:a05:6000:184b:b0:374:d258:90d1 with SMTP id ffacd0b85a97d-37cde3b85f1mr3077093f8f.2.1727732172266; Mon, 30 Sep 2024 14:36:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727732172; cv=none; d=google.com; s=arc-20240605; b=V27NC5hZh5WpVBUDb89ZzWodpuGG0dzzBmBvRyqst5e5y1hcM/KGt4JEk4TqVXjK44 9ZAla5/TqoqHRY9xdcNtOBszT2yAquXnvSbZ3g/DdPyYNXpgW59A1IZXEjVFlvPrmHyB 9tODMBu2nP+shoQ81l9Mpi78kPJZJsHGHnd++vwVV5F60UEzILn4/DHcmIdhl0OfRajY bgw9AJG5Y2Wo4hduMjEx48TGsN3GPO4oFIhknhw+hOOV4Rl261ZDOtMp6XGhbYPsOfBN uVvQBMETowwF0o7uZVUgjlT6hX7YH+oh/Z1XHZOGMUPHBMkUdUlN+h/sgpymfhkyJ1Qw K9BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=LBPeZgcYuUiZbZEXmYmCuU52+AaFL0yOb54LJ/ALSkw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ZOczjS7X11eVY9NQyy4o765rnKp+hAQLi5VSgnjDEZcwild3NOpL7y11QOHNAAMK2t bG6tG/2ujSkeL5LP5CKM2phlY5z+kaJZd84UEYD5rVpHdYd/RKj0HddPaTD1hgmHciu4 Nn4Pwm8SmDxxpXJSYPBUtj+DT6M7HrCnO4VlU8gVaqLVNFdKeppaf0loQty1REvAkEph oGgTqBB1Y6dyq5PUnIdMvo0zK3BAuu5LSoXlmK6zWXlLXkxMz9cRIDPeoj5xgkoigBcb cB9+69yCZvsJiRrBgKo+MzSukQCsPKdjBvMm1SjOYo3iZto3P1UAdZoI6bn0ZCiDHM1c T0tw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=YAnO8g0q; 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=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a93c2a2eaf0si633163566b.835.2024.09.30.14.36.11; Mon, 30 Sep 2024 14:36: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=@gmail.com header.s=20230601 header.b=YAnO8g0q; 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=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87F3D68DDB9; Tue, 1 Oct 2024 00:12:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 953A968CFBA for ; Tue, 1 Oct 2024 00:12:03 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7179069d029so3442030b3a.2 for ; Mon, 30 Sep 2024 14:12:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727730720; x=1728335520; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=m9/09dIroHbJjBDDRwzlh4kojd7LQmxlT8R6ul3Gdlc=; b=YAnO8g0qqduD/Y1GI3ZnSbgGA7Df6Yx06xzj31/RDG/uWKfUr0rFj1i3del39x7f95 C37Qss5+TYlUHuLjiBobRQ2G3NAfqrMgSTkThsNiMc/sG5YYVCupNEaucoV+MPlyXFbm AeyyVaD4QKFIug6M6NpmMHaRC+DNunP/VKG3dNxqGCHSKl/hTD0/pvQbFpFtjY0ZFeim l8dvgQjwnuMi18rTzAis/Jf3Fp46Rl20En5dhcIElBRuRydAT/3yNj4HQtpU2Yrz0XtU eJYPHhzqw6wA+VFZrxCJQmIC9HMYBquKTwbUp0xAT4VbZYNJLlQgdv4E6E0SZoj7D8CP 3mBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727730720; x=1728335520; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m9/09dIroHbJjBDDRwzlh4kojd7LQmxlT8R6ul3Gdlc=; b=PYRZTwwYxtYtJnGcLvECquVv0BBuroAVbXFKbb5xkCLeG1Ha0Zo0roARqhj5wsAhpM v835zM5ZVnF4ZYBlRxeImj22sj2SLzCsPvv0lzZNUXSAaJ/Y9eVMJWCbZMKbcPMzcJM3 rL09bj2f/k4BewOtZEHjSSaIKn/5fZHkJSx+7bZ47nevxGlySG/Wsz5Gc54+o6O9i1cV nTL/IaTnrgmbBYqtscqKJtlPYXPn7bB5UD9fcvCPVN4TWORpKmvXQXSdI5jatlexEbVw 8tJrUavt1MnX3PDDo6BXD8Cwg02TLNVfakRTHHEODKbjgtPdW3wxgXMk681dX6W0gBnP bNHg== X-Gm-Message-State: AOJu0Yynj6R6T85bg5sQoVN48zKjF3/0cVieB3RpFTskIymWLt1vvH2O RXJj2WGho0SRXVGKe2JWiZB4dm2hd7OE3e4yqvlOXJAVjib3iU1dmIWSlg== X-Received: by 2002:a05:6a20:4db0:b0:1d3:5208:1ea6 with SMTP id adf61e73a8af0-1d4fa806ebbmr15692275637.45.1727730720381; Mon, 30 Sep 2024 14:12:00 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7e6db2c8af2sm6993028a12.48.2024.09.30.14.11.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 14:11:59 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Sep 2024 18:12:37 -0300 Message-ID: <20240930211237.10761-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240930174119.6426-1-jamrial@gmail.com> References: <20240930174119.6426-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/mov: parse clap boxes that reference heif items 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: AQ8jRfa0TyZE Signed-off-by: James Almer --- libavformat/mov.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 33158ac4dd..fdf2238d47 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1234,14 +1234,26 @@ static int mov_read_wfex(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; + HEIFItem *item; AVPacketSideData *sd; + int width, height; AVRational aperture_width, aperture_height, horiz_off, vert_off; AVRational pc_x, pc_y; uint64_t top, bottom, left, right; - if (c->fc->nb_streams < 1) + item = heif_cur_item(c); + st = get_curr_st(c); + if (!st) return 0; - st = c->fc->streams[c->fc->nb_streams-1]; + + width = st->codecpar->width; + height = st->codecpar->height; + if ((!width || !height) && item) { + width = item->width; + height = item->height; + } + if (!width || !height) + return AVERROR_INVALIDDATA; aperture_width.num = avio_rb32(pb); aperture_width.den = avio_rb32(pb); @@ -1263,9 +1275,9 @@ static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom) aperture_width.num, aperture_width.den, aperture_height.num, aperture_height.den, horiz_off.num, horiz_off.den, vert_off.num, vert_off.den); - pc_x = av_mul_q((AVRational) { st->codecpar->width - 1, 1 }, (AVRational) { 1, 2 }); + pc_x = av_mul_q((AVRational) { width - 1, 1 }, (AVRational) { 1, 2 }); pc_x = av_add_q(pc_x, horiz_off); - pc_y = av_mul_q((AVRational) { st->codecpar->height - 1, 1 }, (AVRational) { 1, 2 }); + pc_y = av_mul_q((AVRational) { height - 1, 1 }, (AVRational) { 1, 2 }); pc_y = av_add_q(pc_y, vert_off); aperture_width = av_sub_q(aperture_width, (AVRational) { 1, 1 }); @@ -1278,18 +1290,18 @@ static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom) top = av_q2d(av_sub_q(pc_y, aperture_height)); bottom = av_q2d(av_add_q(pc_y, aperture_height)); - if (bottom > (st->codecpar->height - 1) || - right > (st->codecpar->width - 1)) + if (bottom > (height - 1) || + right > (width - 1)) return AVERROR_INVALIDDATA; - bottom = st->codecpar->height - 1 - bottom; - right = st->codecpar->width - 1 - right; + bottom = height - 1 - bottom; + right = width - 1 - right; if (!(left | right | top | bottom)) return 0; - if ((left + right) >= st->codecpar->width || - (top + bottom) >= st->codecpar->height) + if ((left + right) >= width || + (top + bottom) >= height) return AVERROR_INVALIDDATA; sd = av_packet_side_data_new(&st->codecpar->coded_side_data, From patchwork Mon Sep 30 21:28:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51944 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a303:0:b0:48e:c0f8:d0de with SMTP id v3csp95vqm; Mon, 30 Sep 2024 14:27:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXvdabIyd93hQmyCbC+fXarI9Ia+eWnB6mABGmGvRFxhU034kv7jGCFto5nySUQjsD51qAAM2y7Z0a4QTo7qCUj@gmail.com X-Google-Smtp-Source: AGHT+IHkLFa/xRT4Ho/9t4HCSpsY05FGTeD0kaLNcIw5ROpH/qg3WPC/VegqFPMe7orgMjTgMm3Z X-Received: by 2002:a17:906:f5a8:b0:a8d:439d:5c44 with SMTP id a640c23a62f3a-a93c48f2081mr1285110266b.1.1727731675029; Mon, 30 Sep 2024 14:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727731675; cv=none; d=google.com; s=arc-20240605; b=QfU3DDNnMkr4csyGf65psj2qxt0XidwEw5EeOvxS7FZ9tE19rd0xWMhOZ5sOyaZgVz 8WVrA4xdUsVGv2+qZl5Sb/SmT9Bb8GhYwzwUvqKazchswKuREGy9DXcOx/znZxAgyWna WeADgHX1mn6W7fWCwpeF16IQhR+nmw+npruQVlyLyOLkROnsq1gtXP57qVU1HX0lW4k/ 3qIdsjnmYemv/5+e0WS3W3hl8dd1pVkSkCZksDzpK1jn5562eCc50I/VWinVNCJfjR4V RZPmgBgGbXAan6JOozb/P8F/N0uWxIutaxUY/qvfDqGw06yRZYOVHjjnQ4SzAn3Wd9Qj XAgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=6rTkTAxt3w4kjp+Y6DkAn+PVkT/G6+MNzi7rkJcxGjI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=D9nhO8j1c3gGTyqM/WYhcAlOapMUDFG9K1kfCmfu1yFmPSlTr5B0T9vvH8tKvD0SVo I209MQLBw938u8rFJU9D79W5uVKz75T6PgJ4kj7Su0kzDvUzNxcp1xipY9p33RS5KEeR IT9VWWcTedzmbuF4JwWZkkOB/XlPjztcLW09NdajRhnbiNC/zVXs/vWeSEKHrt+BWJHA jVsPo4zS6p8IDlOPJMk8LXSbq/FItT70NQHOAhb727CnmVS53mUSwXTxg/JLzsOdB3Ye Sd5DeuOMYe+L1Pzf6O1ud5ruDnaejFU/Tg/qvCkVdOSlL6+/BzwGcoKc938rUOkxKQdQ gfHQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=mcLAMlB4; 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=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a93c29f11f9si661013166b.643.2024.09.30.14.27.49; Mon, 30 Sep 2024 14:27:55 -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=@gmail.com header.s=20230601 header.b=mcLAMlB4; 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=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46A6D68DC33; Tue, 1 Oct 2024 00:27:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F35F68DC33 for ; Tue, 1 Oct 2024 00:27:39 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-20b01da232aso34494465ad.1 for ; Mon, 30 Sep 2024 14:27:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727731656; x=1728336456; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2gZlAo5t1KhDQu0H24FbfJngdvg9sPwJp4/mvVNkaDk=; b=mcLAMlB4/unSRNz7g4YS0G8ZAs9y1ldGX8CapeoQH43kRqmvw0i7FjREeERW99BTkt lAkixDPeL67Zoq45qq7Y352XVsUqcw0Ye4/P+/ux7uY0sNkDdTSix/Sy+8GsopOzO7gI 3JwTqWjOs+K3UhKsg5YzXJC0SuRKev1sTK3mNLwm+LZ9ytWFGlmCX3Z7w+XbH6zN6cMI E3Wzc/AB62BbXwrSoF88UGeudUDfQRjOGyLRyVnTUMiJk/LHu0VbORePucVNTdOmSxYT jlUG6djOc0MVUk1pQ1MQ0PrSqNLlYAIfIWsacRPmivhf+4K70mOHgNZXERkdHWT2J36a VjqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727731656; x=1728336456; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2gZlAo5t1KhDQu0H24FbfJngdvg9sPwJp4/mvVNkaDk=; b=xVi8q1sYbI1Em7zGNEeO/jRuTFsawCy8f5EwCJCbs77+vfjAHnjlLRwbVqD0JUuanT m538dgHP2zkQjt1TliqQrtlRJp6aYpDPUIXpVry6BKKzJSQ+jiVUPlELcUJb9dPnyQ0s 5muUG2ZQMh7pmBwm2Yh4guPMj0G3mbD47o0Bj3brCPSFlBgety5XdygXEU/OclP3oXKf x61CgKbaa0O2HvZfRG+6lBLHfS7hkP43yjAi3oMBsrahOvscI4jZ3EKoV++6QR1SgWfe DCy+N7SOKS8CMbKuZCKXEVjpw078TJnDSgNq0oS6XFTVwRpG2z/0vhWAF7wf2Psk20p3 ZiFg== X-Gm-Message-State: AOJu0YxDodFJajkk1YM1Oa7MCyAH4S6+TCZLNT+LtMPQ0JhEWf0Bd0rD fH0Kd9Q6Bh2awr5JjScACO019TMEyX+W5yUkQr7ZzsdSkjl9uVR67EC7gQ== X-Received: by 2002:a17:903:244b:b0:20b:59ae:fe1d with SMTP id d9443c01a7336-20ba9f2d74cmr17087895ad.25.1727731656257; Mon, 30 Sep 2024 14:27:36 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7e6db2c4845sm6930567a12.43.2024.09.30.14.27.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 14:27:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Sep 2024 18:28:13 -0300 Message-ID: <20240930212813.10903-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240930174119.6426-1-jamrial@gmail.com> References: <20240930174119.6426-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/mov: get heif image mirroring from imir 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: NMwSje3ba0ln Complements 76eb3e5ff3a35eff01dd71aca82efcda50c4441f. Signed-off-by: James Almer --- libavformat/isom.h | 2 ++ libavformat/mov.c | 27 ++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index bc208772f9..49a4753fad 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -284,6 +284,8 @@ typedef struct HEIFItem { int width; int height; int rotation; + int hflip; + int vflip; int type; int is_idat_relative; uint8_t *icc_profile; diff --git a/libavformat/mov.c b/libavformat/mov.c index fdf2238d47..43444477e7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8994,6 +8994,25 @@ static int mov_read_irot(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_imir(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + HEIFItem *item; + int axis; + + axis = avio_r8(pb) & 0x1; + + av_log(c->fc, AV_LOG_TRACE, "imir: item_id %d, axis %u\n", + c->cur_item_id, axis); + + item = heif_cur_item(c); + if (item) { + item->hflip = axis; + item->vflip = !axis; + } + + return 0; +} + static int mov_read_iprp(MOVContext *c, AVIOContext *pb, MOVAtom atom) { typedef struct MOVAtoms { @@ -9218,6 +9237,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('p','i','t','m'), mov_read_pitm }, { MKTAG('e','v','c','C'), mov_read_glbl }, { MKTAG('i','d','a','t'), mov_read_idat }, +{ MKTAG('i','m','i','r'), mov_read_imir }, { MKTAG('i','r','e','f'), mov_read_iref }, { MKTAG('i','s','p','e'), mov_read_ispe }, { MKTAG('i','r','o','t'), mov_read_irot }, @@ -9922,6 +9942,7 @@ static int set_display_matrix_from_item(AVPacketSideData **coded_side_data, int * av_display_rotation_set() expects its argument to be * oriented clockwise, so we need to negate it. */ av_display_rotation_set(matrix, -item->rotation); + av_display_matrix_flip(matrix, item->hflip, item->vflip); return 0; } @@ -9967,7 +9988,7 @@ static int read_image_grid(AVFormatContext *s, const HEIFGrid *grid, return ret; } /* rotation */ - if (item->rotation) { + if (item->rotation || item->hflip || item->vflip) { int ret = set_display_matrix_from_item(&tile_grid->coded_side_data, &tile_grid->nb_coded_side_data, item); if (ret < 0) @@ -10066,7 +10087,7 @@ static int read_image_iovl(AVFormatContext *s, const HEIFGrid *grid, tile_grid->coded_height = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); /* rotation */ - if (item->rotation) { + if (item->rotation || item->hflip || item->vflip) { int ret = set_display_matrix_from_item(&tile_grid->coded_side_data, &tile_grid->nb_coded_side_data, item); if (ret < 0) @@ -10283,7 +10304,7 @@ static int mov_read_header(AVFormatContext *s) if (item->item_id == mov->primary_item_id) st->disposition |= AV_DISPOSITION_DEFAULT; - if (item->rotation) { + if (item->rotation || item->hflip || item->vflip) { int ret = set_display_matrix_from_item(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, item); if (ret < 0) From patchwork Tue Oct 1 12:51:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51972 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cb8a:0:b0:48e:c0f8:d0de with SMTP id d10csp283563vqv; Tue, 1 Oct 2024 06:41:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWh2YRZ3OO8pWqgsqnpctj8IwMLLz1Sxx0EAVY8dJxMdQTOUoJmSVw7bk+jvEf9SUME8pdAsXJgbRXIjPk8k7Lf@gmail.com X-Google-Smtp-Source: AGHT+IFat7ZUlzG5MVnHL059nWmcKZ/ML5B7SpJk+A5myhzmYACHsCLuWVXgoWtIVBD49ug6UJRX X-Received: by 2002:ac2:4f01:0:b0:533:71f:3a3d with SMTP id 2adb3069b0e04-5389fc4690amr12272010e87.24.1727790073573; Tue, 01 Oct 2024 06:41:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727790073; cv=none; d=google.com; s=arc-20240605; b=Zn0s9EBR/zI12SPRMfrlEI8ZUMszcItIFHL+k5UhQOvVAdNQ7OeUAGBo1z/E1ZC2Un TRd1PmgpbDzOWo0X9pJJxTYCcj+NjPDQxeNjTIhc3zdPMGItaSb6DPhwdFwpa2F8iH5g eqlY7bGyiHhUGmYO/W8vjMCXB9PA8hI2PyyZn2AMGQJh1g4Fq8/4YxSBptQUmE/T1roo 6Pxq7b2FW7jnuO9I7yAm5pVDj95a/7EfXr9nsJO6ueYZxk8fVx3UhBCYa3fWwNBl7IaV u4WQKm+BCDMXnfBlPBH+zXy4jzI7zSiyDFDDPjr6JpPVlB/tpCToe2HCEZFufGO8M+tC ICHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=nVthc+QW3XNrON/y89/WpWitUJgNT2VdMO/tFNRGAuk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=JUrMY18cQ/MqCCFQMhURhUwfwJAxKG/C+95M3yRPLBhbWiDANYkaufo96tWLc9+xky rWjD92vyFIbM3Xlax0rIoGuGjQVdm6TqK8N/MVAurra2KecY03kWQczF9lEh0H3+h+BH f/3UgsP5jk00Ef7y3T8611PAY2A/9Gqf9xaCLNfTV2A2G26yLgJ5veFNqJUikuU4nq+6 3dyhg8BEY5Je1aw+xGxi5KCmozlHDYgOq2ZSbIoq56mT1rRlF9ENEZ1jPB5g7NUFkkaG wGuCjrBDuQbIdCRuvGSHBzsDFfR3U7ruOBBOQbqjKfXr9TsLPdkCYPW+hm/zBjljcNJ0 L9MA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ZdybwiWq; 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=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a93c2aade13si724008566b.1050.2024.10.01.06.41.13; Tue, 01 Oct 2024 06:41:13 -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=@gmail.com header.s=20230601 header.b=ZdybwiWq; 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=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C95B668D2F7; Tue, 1 Oct 2024 15:51:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 388B468D1EA for ; Tue, 1 Oct 2024 15:51:25 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-20b7259be6fso26370655ad.0 for ; Tue, 01 Oct 2024 05:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727787083; x=1728391883; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2QPoZ+vtWVdy8l1ar02NAqAK2naCVxYS0GK/Jvd/AI4=; b=ZdybwiWqoh6CicadCiY9O+r+odL5RUZPyavvX8mEBEU+umzyQcbbQ1RRu/xL8/URgK wbZns4hsFwO0SPIrhxwjHVNhnkB3T2LrMaTeEHc2AV3DNGlHEyOgJEwwebvxLo28W4c0 ZXlGUPneHTvDI9uqGCGqNQjta6JCTigFf2ZkLykOk0fjOQEhpGTgJ3gKl8ZTiGVxidIO 1sUmc13VLFsQSUTZtdAFNYwS4YMvGySDLgEfoUnk21zPlaxIHqJaks0CFrFBoHE7b+p2 jA1VF5K0hBRHjEOQRNkH4Ird69Cq5Xpf+mS3NjVv1jPLsd+pZkLbI5YECVgDMZJddWZl Mm2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727787083; x=1728391883; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2QPoZ+vtWVdy8l1ar02NAqAK2naCVxYS0GK/Jvd/AI4=; b=gSZXaq4W1ftvQE8U71xj6+7Ybb/cDbDLM6ZiMLU+hpQLqA4DsPpPVfhgDQBCEZ1+27 wfH24MofS3bmx2YRSYElFmrZh32rnuKcMr52t2EPVtIUjyZEagfu9t1or0smommCIjxv FtJBG5xSTakaOj0GpoNKP253CQvTHARxo/y9+GQiQCis6LNVn4+u0m4Hp3wLCg/quScS D+8OpN7JrxH9cawo63vu9SrmzekViKsjMTDBBaCRlqlhoxAUG1DSJpnQDDD7/Z2QjZng azD3bptwtEegP/ef9JRdwV7ye9J6VNd+nabm2ZnEIVf4XTfhRqnL0+Aj8mBoIbw7jVQe n0gg== X-Gm-Message-State: AOJu0YzjqQVS30JazXVJm+LwYLCZqU71ufPYXolqpXXLHn3XZi/MwVBi e8mdCNS4dCc4MHrWZXJtUZ6UGrRFHTzFnExud9pKvCjTDj+u7gerWJCxKA== X-Received: by 2002:a17:902:e805:b0:20b:9680:d5b8 with SMTP id d9443c01a7336-20b9680d851mr73995305ad.3.1727787082797; Tue, 01 Oct 2024 05:51:22 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20b37e539ccsm69492905ad.255.2024.10.01.05.51.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 05:51:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Oct 2024 09:51:53 -0300 Message-ID: <20241001125154.714-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240930174119.6426-1-jamrial@gmail.com> References: <20240930174119.6426-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] avformat/mov: don't abort on invalid clap box data 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: HGBxjT6ZJfkD Unless explode is requested. Signed-off-by: James Almer --- libavformat/mov.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 43444477e7..bec834023c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1236,7 +1236,7 @@ static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom) AVStream *st; HEIFItem *item; AVPacketSideData *sd; - int width, height; + int width, height, err = 0; AVRational aperture_width, aperture_height, horiz_off, vert_off; AVRational pc_x, pc_y; uint64_t top, bottom, left, right; @@ -1252,8 +1252,10 @@ static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom) width = item->width; height = item->height; } - if (!width || !height) - return AVERROR_INVALIDDATA; + if (!width || !height) { + err = AVERROR_INVALIDDATA; + goto fail; + } aperture_width.num = avio_rb32(pb); aperture_width.den = avio_rb32(pb); @@ -1267,9 +1269,10 @@ static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (aperture_width.num < 0 || aperture_width.den < 0 || aperture_height.num < 0 || aperture_height.den < 0 || - horiz_off.den < 0 || vert_off.den < 0) - return AVERROR_INVALIDDATA; - + horiz_off.den < 0 || vert_off.den < 0) { + err = AVERROR_INVALIDDATA; + goto fail; + } av_log(c->fc, AV_LOG_TRACE, "clap: apertureWidth %d/%d, apertureHeight %d/%d " "horizOff %d/%d vertOff %d/%d\n", aperture_width.num, aperture_width.den, aperture_height.num, aperture_height.den, @@ -1291,8 +1294,10 @@ static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom) bottom = av_q2d(av_add_q(pc_y, aperture_height)); if (bottom > (height - 1) || - right > (width - 1)) - return AVERROR_INVALIDDATA; + right > (width - 1)) { + err = AVERROR_INVALIDDATA; + goto fail; + } bottom = height - 1 - bottom; right = width - 1 - right; @@ -1301,8 +1306,10 @@ static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; if ((left + right) >= width || - (top + bottom) >= height) - return AVERROR_INVALIDDATA; + (top + bottom) >= height) { + err = AVERROR_INVALIDDATA; + goto fail; + } sd = av_packet_side_data_new(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, @@ -1316,7 +1323,15 @@ static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom) AV_WL32A(sd->data + 8, left); AV_WL32A(sd->data + 12, right); - return 0; +fail: + if (err < 0) { + int explode = !!(c->fc->error_recognition & AV_EF_EXPLODE); + av_log(c->fc, explode ? AV_LOG_ERROR : AV_LOG_WARNING, "Invalid clap box\n"); + if (!explode) + err = 0; + } + + return err; } /* This atom overrides any previously set aspect ratio */ From patchwork Tue Oct 1 12:51:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51971 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cb8a:0:b0:48e:c0f8:d0de with SMTP id d10csp283559vqv; Tue, 1 Oct 2024 06:41:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWMob2AU8pdefXjxb/vJmn37+yh6ZJ7HNRCtNsUZGOaiXFMHAWBgaW16l5wlLnUMd2dALOw2qt4ey+UuJMKLVp8@gmail.com X-Google-Smtp-Source: AGHT+IHow4VHogcb7L+pH33Wq7XzPwl28l3ReqGy2pZlwC3XLnbKrA/Z/zidU0jqkXLsnETJjTNr X-Received: by 2002:a2e:be9a:0:b0:2fa:c55b:1af1 with SMTP id 38308e7fff4ca-2fad8541883mr13366071fa.0.1727790073199; Tue, 01 Oct 2024 06:41:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727790073; cv=none; d=google.com; s=arc-20240605; b=hK5G8oj/diVwlal0L+3GU4jkGSUsp3X4kCy4AT3fgrirMG4lIZlx2808OYsXNBB7H6 MXCXb/ma88r4tPW7kzAlbPu8VtfaisWa1PkpgpqoQNq5ruq6j91ZLNzxgxjfGO8r9mZp 23JmsWkhqBFkae+lhcZYMWxmuRdF5X0U9BY5IoPFDehuaZhOiEwx8DS3nF9J+hXep2mX mwSM8KLmR9KDaZcVumRuH7ygaOBbgDJ0lJkJRhCGurH0pdKxWKAItGgT8uiTzDbdIgJq mOwQ1V5CCi4bOb9L1wCt6+g3lkVrsW2F3LRnEqdnnArftkGUooXTKaJ3Om6z49+qEPDx wEDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Kce0+gP+2MRiYLeHXoHtDjrx/LfTqweeOhNZyvL1+rA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=gJMDk0ye0xglbkivtjFOhObdaTdY0gDfD5QqtBcK1n2liC7kvYjIFzvVxniw2OceqC DXBEKCBCLEimD1+EDAYns9eHsB4If/6YCv2OFx8ZWtg0kFRa7UJZ/ahelARLA1bdTw5z HBF4qscDDZiLmBdGcXydNIjYkCJ7GSJqXMOn0SKEXyy4zpG0gdhtNJsJeoZXm4P7bCTS 4onvkQXi2rWcx/lH8U2t8ECT5EG2+1YHlID9IJGXPd28mZi0wEsY9fg2yOukibAh5bto Ci7V8VYs+ldg+bY5Fro7fkOFc8B3YoXn7Cq4ZrHVRIj1r0QQkeMXQ1p2KTuUdwzQ6KyU Futg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ZL1WJZJP; 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=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f9d4603162si30801481fa.218.2024.10.01.06.41.12; Tue, 01 Oct 2024 06:41:13 -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=@gmail.com header.s=20230601 header.b=ZL1WJZJP; 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=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7C5C68DA33; Tue, 1 Oct 2024 15:51:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 687D368D2F7 for ; Tue, 1 Oct 2024 15:51:26 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-20b6c311f62so24243935ad.0 for ; Tue, 01 Oct 2024 05:51:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727787084; x=1728391884; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AR1/qm7mPyQbEIRJUOp/cnopPLffkAqL0Zz2Big4i9M=; b=ZL1WJZJPxn0IFKh6jtNOMnPzlcMOPFaJLTR/O71zbcdu+EEhEamNAt9Jd9cJtWeZFD +UM8QoyU/3ZNA8lmBZyylg7Tl/auFVsgHjXsVsOHMmALeQ+GSGTNjlQ3IMl/ey9aZR7P W1oyDXoDh9TySIa8lCsFBAeTa15gk5I8g32sZK5I9/qC6lWY1LYHljt8yKnXzFUtT6g2 LwKqZSpb6j6p+4Wl5x2pKY297e8zJrc6+BT4cLz3i3SydTvUGnjDXG0/fjjQKIB5Zd/a gHS+8Z/NunxSTxe09A6ftWQOLQWu4AoLn/lc/9tGDwImMQ4nwDaarE1lXXGZDmIdPd0m NOIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727787084; x=1728391884; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AR1/qm7mPyQbEIRJUOp/cnopPLffkAqL0Zz2Big4i9M=; b=QI5wzS7xyDXqNGYmErUL604gJ0mYq8XuNGnVT2i89TVkLmqGjy2NkcF6ot57l9NwLC Tn31CFzWHaWTB19gI1VeLSqWXcAoGAvzO8YZEE9yz5xAPd/UisrHX3+QF9AOnzz7GQ4B BWWJdePllBb4/5YI+Ny8f+mr6k0Bs0rGShMEDBlFHisbZ+igQq2bLJo4C8VB+vj02gh5 p1LmUo6OZJtcyv58UvdVWGqN/1JtkyRF3+Atq+JCtiCkvFvY5bxIVJI9zi0eAF3/+QOe dZAHWk2VdZ/vzfSEhqQQLchie0ClYS1vQauYoDT2+UBv7pHeBdL5fK2rbRbE2hUAA8QQ xn2g== X-Gm-Message-State: AOJu0YymwIoaL52YTxUCYF/Vb+1bmPffGbS5NC0KRWDrnV5X2VRnXp0J cw1mjVTb8Qs8/lgh2QUjYeuvFYoMRYIJigyJWBIkhVkBAcvpEn9EZWGh5A== X-Received: by 2002:a17:902:e551:b0:20b:65d6:d268 with SMTP id d9443c01a7336-20b65d6d4bcmr162588715ad.53.1727787084169; Tue, 01 Oct 2024 05:51:24 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20b37e539ccsm69492905ad.255.2024.10.01.05.51.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 05:51:23 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Oct 2024 09:51:54 -0300 Message-ID: <20241001125154.714-2-jamrial@gmail.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240930174119.6426-1-jamrial@gmail.com> References: <20240930174119.6426-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] fate/mov: add a test for heic images with cropping and rotation metadata 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: AGNdZR1iiRy7 Signed-off-by: James Almer --- tests/fate/mov.mak | 6 +++ tests/ref/fate/mov-heic-demux-clap-irot-imir | 47 ++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 tests/ref/fate/mov-heic-demux-clap-irot-imir diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 1200c77560..f498647a0d 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -164,6 +164,12 @@ FATE_MOV_FFMPEG_SAMPLES-$(call FRAMECRC, MOV, HEVC, HEVC_PARSER) \ += fate-mov-heic-demux-still-image-multiple-items fate-mov-heic-demux-still-image-multiple-items: CMD = framecrc -i $(TARGET_SAMPLES)/heif-conformance/C003.heic -c:v copy -map 0 +# heic demuxing - still image with multiple items. +FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call FRAMECRC, MOV, HEVC, HEVC_PARSER) \ + += fate-mov-heic-demux-clap-irot-imir +fate-mov-heic-demux-clap-irot-imir: CMD = stream_demux mov $(TARGET_SAMPLES)/heif-conformance/MIAF007.heic "" "-c:v copy -map 0" \ + "-show_entries stream=index,id:stream_side_data_list" + # heic demuxing - still image with multiple items in a grid. FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call DEMMUX, MOV, FRAMECRC, HEVC_DECODER HEVC_PARSER) \ += fate-mov-heic-demux-still-image-grid diff --git a/tests/ref/fate/mov-heic-demux-clap-irot-imir b/tests/ref/fate/mov-heic-demux-clap-irot-imir new file mode 100644 index 0000000000..30439c35fc --- /dev/null +++ b/tests/ref/fate/mov-heic-demux-clap-irot-imir @@ -0,0 +1,47 @@ +#extradata 0: 100, 0xee3e15e9 +#extradata 1: 99, 0xdaa315b8 +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: hevc +#dimensions 0: 1280x720 +#sar 0: 0/1 +#tb 1: 1/1 +#media_type 1: video +#codec_id 1: hevc +#dimensions 1: 128x72 +#sar 1: 0/1 +0, 0, 0, 1, 111554, 0xa0679859 +1, 0, 0, 1, 1667, 0xbe5c3b85 +[STREAM] +index=0 +id=0x3ea +[SIDE_DATA] +side_data_type=Frame Cropping +crop_top=180 +crop_bottom=180 +crop_left=320 +crop_right=320 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Display Matrix +displaymatrix= +00000000: 0 65536 0 +00000001: 65536 0 0 +00000002: 0 0 1073741824 + +rotation=-90 +[/SIDE_DATA] +[/STREAM] +[STREAM] +index=1 +id=0x3ed +[SIDE_DATA] +side_data_type=Display Matrix +displaymatrix= +00000000: 0 65536 0 +00000001: 65536 0 0 +00000002: 0 0 1073741824 + +rotation=-90 +[/SIDE_DATA] +[/STREAM]