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 6C5534E0CA for ; Sun, 27 Apr 2025 19:42:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B54C768B522; Sun, 27 Apr 2025 22:42:55 +0300 (EEST) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6795C68B144 for ; Sun, 27 Apr 2025 22:42:49 +0300 (EEST) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-224100e9a5cso47499285ad.2 for ; Sun, 27 Apr 2025 12:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745782967; x=1746387767; 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=8qhQziautnUVGydMWSkXFsi8rZMi4y71THlVHl/p5LQ=; b=EMad5Tx6zAS9usLE7BRLTyEuQ/DcaK2sBjopS/H3axqsQBS9KlhUBpsoAr58qMcJda E5omPjXi29TVBZmwhjYZmFQjcg/s0Rdn4tYi2o+zovsviemwQAWiKN+Y+Arz/UJ+VrYZ /MKKTdvTCqIMQDL54VbXCkru3zqe4UDvn0mmzd4jC1vPFGLjEHlADcFnICnsE9wFrcAN p9c/BrZw9qc/P+gWvlccc0MrGc6XvW8dz8QvT1+M3LRsarRGUA7CScPyRAgxv8uosb9n yFib4sRQAKshoef7eCrOyfZre7NztAP/ys/TRy7xPi5XL+B46b5fKrA9FPAAdkVkzHnT OrBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745782967; x=1746387767; 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=8qhQziautnUVGydMWSkXFsi8rZMi4y71THlVHl/p5LQ=; b=IKjrLyzOxBUOOvbOAMZbChJ0C5fQBqdmqLtAwWv6wNz1qClpELD4Lb5FP5QhdLIucD ea/I0YOsd/wqcjV8TSSY3z8xvTIawHPciIf7yc8HVd7MjQQLAEx+hJcd43Y+jdkhedaS Ejb16tr7M/ipXX3dxB8A3KHsTdbY73Zc/NnmbdVCQjTPGSk4/MbzsfCqBnu6wMGSfndE Ahx9vAB72Bp48Bk16ggRnMYGkbHIqQOwT2QwJx55DHd6ZZoABFN7oLstV4/ybq3mzWcr OZHmcgKYC4ll2PZ8ktgQPgFMl+kdBhtPxiE+awkV+AN6lMeEUs6k+qUuFfUDc1fI1C2A 9uPg== X-Gm-Message-State: AOJu0YzWTabXFQpFaRz9XPJBN4apeB5goXFTPetaOyveJAd+bDwNzBIK bud011JVvHVfpvHCkF0l0h/LyC5WR/gfkGca2Ohf/qrnZqn0AxehP90VwA== X-Gm-Gg: ASbGncuIYDxrAkbB9WhqYZDCVcb6PdehMMBRJVgVft47cVLG/UwLZ0Q61byKjZtGATA R4rJ3Q4V/4CKtlt5daFMYTocR6o+alsjE0U/aXWHXm38X/utz2WoXuAqZv6ndCdxboKKEfX5SFL HOhKzByeEcWp9W5K1xLRE2/98qmBkNUhddmJZ4TnPzHhCtQgNwpmxfrfL2L7Gqypu5xTUTMQ7gs quLBojt2RVdxwzWwrFT7dFGsDntz3FSsJ5fRJyuHatpj/ak/p9h/vEUig8W5rvVkAvwd5bAqNg+ R+jZO6iMkoVC+sDujktAPPCWTNCAh+mSqEzJhA4/8ALBcKZ1cO0azoHQ63Y= X-Google-Smtp-Source: AGHT+IHwW7XtQ70h6eGOVKsGN+fnL2nZOpj1LhaftpxKJI6pKsCqeMGWOyGhjnSRMKLOsJDIKnERSA== X-Received: by 2002:a17:903:3d04:b0:223:4816:3e9e with SMTP id d9443c01a7336-22dbf5eb6f6mr123694845ad.13.1745782966863; Sun, 27 Apr 2025 12:42:46 -0700 (PDT) Received: from localhost.localdomain ([2800:2121:b000:82e:c1aa:b2fa:e6cb:56a1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db5100c4esm67746555ad.173.2025.04.27.12.42.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Apr 2025 12:42:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Apr 2025 16:42:34 -0300 Message-ID: <20250427194234.9292-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 v3] 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 | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/libavformat/apvdec.c b/libavformat/apvdec.c index e1ac34b003..9f8af35567 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; } @@ -126,7 +156,7 @@ static int apv_probe(const AVProbeData *p) return 0; } - bytestream2_init(&gbc, p->buf, p->buf_size); + bytestream2_init(&gbc, p->buf, 28); au_size = bytestream2_get_be32(&gbc); if (au_size < 24) { @@ -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".