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);