From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 222444E089 for ; Sun, 27 Apr 2025 17:53:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A6AE0687DE8; Sun, 27 Apr 2025 20:53:24 +0300 (EEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CF3B687D4B for ; Sun, 27 Apr 2025 20:53:18 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-73712952e1cso4234718b3a.1 for ; Sun, 27 Apr 2025 10:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745776395; x=1746381195; 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=SR1bh4VpWZxqS7rMX/krHPO9kC5KcnuXkR3UeFzUk+U=; b=AkNbX/AvjnFuHCM8wOjFxpJr8TU8rlu9ipRUnmosWsnoveUp5aCrfaiC5Iz5HUzGrE 8zv16uDwiq2PCKq1V9iF7yTqJZQNOG2EOsbuRse/7gEPJEGzYXThXT0wZAFXBLqK3Wh2 SOcNU2YrSSxdrdBOR0i0YBSkHZy5xVqEQxiw6NzDP5RwlTXFOEmhNYtjtS9LSY+jseES tmNTdht1nU2ySs5EoLQz2o5l+WqyBHNsAsFACIHySe+CpsghjCodYdUmy3YBFl8isRlU sCoea5uyEb4QuRv/NxFk3oD8vo1/SivOcv8x6jlS78nFSyslNXjrxUd2C0ftLTjaoA++ iopQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745776395; x=1746381195; 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=SR1bh4VpWZxqS7rMX/krHPO9kC5KcnuXkR3UeFzUk+U=; b=SBnIXolOaIBuusgeBz7x3mxOYeB3mfMLrh46thfC/NpfGOnNrxlrLdzEWAgEncqUd1 4G7Js2Ckjj/jypabiXzFmRbDAMjudjTzTjDiymwMNmCiPmpkj2fHG1+B+uayU9gPOutN ZDysF7cYWXz9H+Btf6McbCIF5tciulLkMmKeGz6Iadq/cdNZPf49bB4l1gXTzBYy0de8 Vlah0GYAIq8UvjKNp1u09lhLXZmRXVsLzyrslClp9tzjCeFI7zQSzD2i7IT7q5NRG2vb Nz3GBCJAkoVhgB6gePw5ltHxypcG6cV0Rxmr3O/LTjYidZmXNZ4ZIr/ksTWoxkNlxpcX /q8g== X-Gm-Message-State: AOJu0Yz9J6VPrENhZTpLxtuUP1V7FbaeC4SM3rJ5GBP+HNroW3wz/ras 5UV4qWaHaqNFeh0MyKr0QZGAZA2zDtiqBr6cH2iksiSKukBFfATTwz/zZQ== X-Gm-Gg: ASbGncuvBr2cZgJHGrW7joxLneXPC6KA/tpaQo5TJ2rj2fIbc8P9l6vJ0MmcHSHBZ5H bKsdxp3/JmVrxa5yxQgbsKthP3OvXh0jibwB/n9XNMtDyxksafT5AdLpiFuoPu8oOtYi9sFHJwU 2Z7hjEFkQHpnEMpz5rdZHmok95jfWdQ0PzbNWtBfN7MSWGFFUdMKfyvphmSatD/swFHRYIGfTAY l5VNIlmhoBI36x7xuhtFiN+WkSt66po2L3hXK5cwRg9omNbGaTTqX128gGw0lhd5mtauClD93RR D3dI8BzGUmTslNE67oZgztbA0H23yG83iPaW89q9TWKiTbyC1r16EONLlic= X-Google-Smtp-Source: AGHT+IHlTM8HuDt87NAhTtRhOW4/LorwARf1SdrMYYlCRmwENaA5gxwNMnp5tw22Su8OC7+yZUFJiw== X-Received: by 2002:a05:6a00:2450:b0:73e:2340:4b07 with SMTP id d2e1a72fcca58-73ff7395cebmr8160074b3a.18.1745776395042; Sun, 27 Apr 2025 10:53:15 -0700 (PDT) Received: from localhost.localdomain ([2800:2121:b000:82e:c1aa:b2fa:e6cb:56a1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a6a17csm6424614b3a.111.2025.04.27.10.53.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Apr 2025 10:53:14 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Apr 2025 14:53:02 -0300 Message-ID: <20250427175302.8777-1-jamrial@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/apvdec: export color information 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: apv_read_header() reads enough information that the generic demux code doesn't attempt to read a frame to fill missing fields in codecpar, so make sure it's set here. Signed-off-by: James Almer --- libavformat/apvdec.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/libavformat/apvdec.c b/libavformat/apvdec.c index e1ac34b003..94d2ce9965 100644 --- a/libavformat/apvdec.c +++ b/libavformat/apvdec.c @@ -39,6 +39,11 @@ typedef struct APVHeaderInfo { uint8_t chroma_format_idc; uint8_t bit_depth_minus8; + int color_primaries; + int transfer_characteristics; + int matrix_coefficients; + int full_range_flag; + enum AVPixelFormat pixel_format; } APVHeaderInfo; @@ -55,6 +60,8 @@ static int apv_extract_header_info(APVHeaderInfo *info, { int zero, byte, bit_depth_index; + memset(info, 0, sizeof(*info)); + info->pbu_type = bytestream2_get_byte(gbc); info->group_id = bytestream2_get_be16(gbc); @@ -107,10 +114,24 @@ static int apv_extract_header_info(APVHeaderInfo *info, // Ignore capture_time_distance. bytestream2_skip(gbc, 1); - zero = bytestream2_get_byte(gbc); - if (zero != 0) + // two reserved_zero_8bits + if (bytestream2_get_be16(gbc) != 0) return AVERROR_INVALIDDATA; + // color_description_present_flag + if (bytestream2_peek_byte(gbc) >> 7) { + // We can read 32 bits as tile info is guaranteed to be present after this. + unsigned color_description = bytestream2_get_be32(gbc); + + if (bytestream2_get_bytes_left(gbc) <= 0) + return AVERROR_INVALIDDATA; + + info->color_primaries = (color_description >> 23) & 0xff; + info->transfer_characteristics = (color_description >> 15) & 0xff; + info->matrix_coefficients = (color_description >> 7) & 0xff; + info->full_range_flag = (color_description >> 6) & 1; + } + return 1; } @@ -157,7 +178,7 @@ static int apv_read_header(AVFormatContext *s) AVStream *st; GetByteContext gbc; APVHeaderInfo header; - uint8_t buffer[28]; + uint8_t buffer[64]; uint32_t au_size, signature, pbu_size; int err, size; @@ -201,6 +222,11 @@ static int apv_read_header(AVFormatContext *s) st->codecpar->level = header.level_idc; st->codecpar->width = header.frame_width; st->codecpar->height = header.frame_height; + st->codecpar->color_primaries = header.color_primaries; + st->codecpar->color_trc = header.transfer_characteristics; + st->codecpar->color_space = header.matrix_coefficients; + st->codecpar->color_range = header.full_range_flag ? AVCOL_RANGE_JPEG + : AVCOL_RANGE_MPEG; st->avg_frame_rate = (AVRational){ 30, 1 }; avpriv_set_pts_info(st, 64, 1, 30); -- 2.49.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".