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 9E6BB4E0D9 for ; Sun, 27 Apr 2025 19:36:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 951CA68B407; Sun, 27 Apr 2025 22:36:22 +0300 (EEST) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4140F68AF2E for ; Sun, 27 Apr 2025 22:36:16 +0300 (EEST) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-227a8cdd241so56242565ad.3 for ; Sun, 27 Apr 2025 12:36:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745782574; x=1746387374; 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=T30nIyiIrrHyDgbMhLm6Jmh3fee2EHWR4gl/flYONbQ=; b=TmspyKvQ0WYeHb7fluD5fw9roGkRlzjq2LfAISrflBGdvt6gP+aLjgPClyGAc84LJM KjJFAqw0fyI/6E+Gcc/gul2bmdoRgDmctxgaTaakMtX2RsPV3WwF+7KcjfO8aR7bPlwZ Za3JFKt8IoK30mRFra0EYB9wukn0hREVFV2f1SIWZTW7fglEaOVg7g7irZLGKb3x3AI9 EdiSiYQ9PMGbFMHNBgLUdrG/TBdl21DKH9TAp6EY0bi4MkXZQYP+s1N2x+aVuTebQzEJ vFTzQK3N1eIed/4V4uiC+j6nMzi2Tq2VeU64GYAAKoLYiM71a4gw6Xgi+5ZTHjMrzX8e a67A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745782574; x=1746387374; 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=T30nIyiIrrHyDgbMhLm6Jmh3fee2EHWR4gl/flYONbQ=; b=qI7GYZHnrMux36HORQYXrDrSnKOEuMlur29CAnpnYuC7ww3Egi7otPyYvk7NxMPnT1 lTWCfk3a0WD77NU+aD05PM87rMTags9TUzass+nnosXpNEhzmbCpV1PkvidP8mEe+PyW NDyYxWtmocjdqIv1AlBxD4GubgafH5g1odXcu2XeoKMOlwS7w3EfRrQft646PGC5pOY8 B3nCNexWpTw4BX8Y9D+WnSUWZGptOkpvdt81UHg3jbUfCBRjH5NQ+4/gCcUxPmvqY/sT y4s6Q+ZCzrmIAMEjHQlx+BvwDN5ZDZuqNtDEnE+xWXhOLQnSNOcOImUJzyAenpgN49OL +k7Q== X-Gm-Message-State: AOJu0YyU4mRGcDiMN5fwpE1VhqkzSm8zxMBQCgbbYW+fEdFSeveVkCCt x3DEWWHdiTLfp+E3Ho0cgB6ZI10h7n2KwhZQGpuo53aH4pG/POIR4fsJlA== X-Gm-Gg: ASbGncvjfWiXSF316z5S/I2pSjTavdxBVuItcnacr5picW3hCuzBzo09Z5ZYtqzFoPs EJmkRXWbwFYmnx6MLjc722q59QzG6GEcElrYW6Sum9dqi3diJ78zSr51tBF534r2I6ZQJo0wAj5 AT2G/90EsWjcLtgWPpcWJaUnteAFkYjxF0HJlGb09evozEjmoIsdqwbVw5ABTXaikA4NYrUwF6/ Dh6s7XmV3FdrXhFqlkywbFfDDutUqNfLV1mRX9vpTPwVv8YwHOxbdNKYFgBs6VIB1TpLRx+G3NL Y6lun+2Ev3pfm81iHOJqo1scjoVSmyOPQCx1A3vrfJ1BMXsHOeuC4olNDnE= X-Google-Smtp-Source: AGHT+IFDDhc5xXxHY5EHxD2RpYviPonOWWE/lFzIAaJve2pgmzeQlB+IPpEukFXGqRq1GxoONRbvww== X-Received: by 2002:a17:903:1b64:b0:223:6455:8752 with SMTP id d9443c01a7336-22dbf6330efmr163207575ad.43.1745782573376; Sun, 27 Apr 2025 12:36:13 -0700 (PDT) Received: from localhost.localdomain ([2800:2121:b000:82e:c1aa:b2fa:e6cb:56a1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dc70efsm67484475ad.95.2025.04.27.12.36.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Apr 2025 12:36:12 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Apr 2025 16:35:56 -0300 Message-ID: <20250427193556.9151-1-jamrial@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <4c8f0045-58ac-4c18-8d33-6044ff9233a9@jkqxz.net> References: <4c8f0045-58ac-4c18-8d33-6044ff9233a9@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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 | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/libavformat/apvdec.c b/libavformat/apvdec.c index e1ac34b003..6a769e51cb 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; + uint8_t color_primaries; + uint8_t transfer_characteristics; + uint8_t matrix_coefficients; + uint8_t full_range_flag; + enum AVPixelFormat pixel_format; } APVHeaderInfo; @@ -111,6 +116,31 @@ static int apv_extract_header_info(APVHeaderInfo *info, if (zero != 0) return AVERROR_INVALIDDATA; + // Return if this function was called by apv_probe() + if (bytestream2_get_bytes_left(gbc) == 0) + return 1; + + zero = bytestream2_get_byte(gbc); + if (zero != 0) + return AVERROR_INVALIDDATA; + + // color_description_present_flag + if (bytestream2_peek_byte(gbc) >> 7) { + unsigned color_description; + + // We can read 32 bits as tile info is guaranteed to be present after this. + color_description = bytestream2_get_be32(gbc); + 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; + } else { + info->color_primaries = AVCOL_PRI_UNSPECIFIED; + info->transfer_characteristics = AVCOL_TRC_UNSPECIFIED; + info->matrix_coefficients = AVCOL_SPC_UNSPECIFIED; + info->full_range_flag = 0; + } + return 1; } @@ -157,7 +187,7 @@ static int apv_read_header(AVFormatContext *s) AVStream *st; GetByteContext gbc; APVHeaderInfo header; - uint8_t buffer[28]; + uint8_t buffer[33]; uint32_t au_size, signature, pbu_size; int err, size; @@ -201,6 +231,12 @@ 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->chroma_location = AVCHROMA_LOC_TOPLEFT; + 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".