From patchwork Wed Jul 3 21:26:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50311 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp3359609vqv; Wed, 3 Jul 2024 15:04:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWonhwsM3MMCX+0NA/SD2PCTGgNk36IUXz06wbzOOmze5zWXSoGKoDTA81fb+ppzPhvoG2eLogUBIPTlSjMJ7gdnMRbki6d5X1z6Q== X-Google-Smtp-Source: AGHT+IGtXdHq7L/S73Ok0m8OFWSjaGFwY0VukBa/KwacYbDDQcyqsDWOrnLK0B448/qPsNuQs+ul X-Received: by 2002:a05:6512:ba3:b0:52c:884a:96c7 with SMTP id 2adb3069b0e04-52e9806f02emr1092617e87.17.1720044254395; Wed, 03 Jul 2024 15:04:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720044254; cv=none; d=google.com; s=arc-20160816; b=whC20o9p3hmKVXM7/CkdtuVwACtjZyS/lfm1roEx8RUT3JWQQiLA29J1GVVcTfwTzf PyFDCOV//0kdSOXCnBqIY9Ipdh1IJ9UpKZgAh+aEZnsfCkA9Nhm6mXbj3Iz2cz1u1Syn oIEvjchnEd/nXLhPeFckAtyUS8dRpeZrmvQJJpOyIcNOliLfoK9CYJUQqbKP3zDuCmEC XgC/jwFl7wGnc+9B9TBgx8CI2Rf9eLMV/dVbpXQ98BZ3j+4K9FL2TCbnrV9Vt7yeM9ae 5z4u1x6wLLQqpbH9HWi6+JljWmrZ0GcuvdjhtoO7l4nhizU2csXCxbBGMbarRbi64Rov wyJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=k8glWCWBm60R/Dl/gsY+QJfQms2oYsEJMGWToDIWUks=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=eoyWtDcZnPJNxbNSmvLySxEEGZU8N4I7d4cNe6nH7G0An14zFIAz1jT9tTSbFj4S0v I0xSzWIeNQJMxgJ6nxu0GTvIjZ9sqnslYMAI+mQvvkDRAhHLDsioySJbH5tkFhASnAJw VVMlQyj1klmGsVTsSJltnJAtOpHp7GLuOPQUad2wYfKYDnC7aFsCrql5E/3YJqsh1zC2 z/xptqPp0zyHf1fX1VMRvFOvyoAfvUnyBRS5YnpCFnifroLO27ayJ/6ptvT3QS9ZgAgc j3OAWoCxTkFcpo4wzIf118fI5MNxnhVs2RWe+WGGKHn8xvALmckLAAdwb8luh0ufZs/k q0Cg==; 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=aSI97UMq; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-52e99fde613si514265e87.489.2024.07.03.15.04.13; Wed, 03 Jul 2024 15:04: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=aSI97UMq; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E6DB68D9F9; Thu, 4 Jul 2024 00:26:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03BC268D9D9 for ; Thu, 4 Jul 2024 00:26:44 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2c98a97d1ccso486199a91.0 for ; Wed, 03 Jul 2024 14:26:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720042002; x=1720646802; 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=gvV8Gj+m+J+xMhyM7QmloZA8svS0YYcW5QZNqcudWfw=; b=aSI97UMqMNtEvhTXQXx/sXVThvHeT69bIOWIY2UCbZouQ8vaM34noYcsFWsazDMdFF FtA+POBEHpyLXZ8ZvszhiQca6wxXW0MtaYp/XtwIHFhT2Z+w1cBXFbbMV+ckQRO+RC3P 4dmUzVe7GCAR9nZn5HSmSni4TJmmUDSBUxZQAQE1z2nYKKIgoLUN5a1DPOt4pz+eo2Et lM0zsgZLnbAwQP8Yf1XIIJyHfwhCP9LUhKaBraPX0jfWToiewWU9aItikWntSsN0HSzj VSudTr+IS7I6hQkqsAbeQe+XcABFFDa1TpHVPomWFBWqAYchRMtSmEpNa8X3xY6myYwu zvXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720042002; x=1720646802; 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=gvV8Gj+m+J+xMhyM7QmloZA8svS0YYcW5QZNqcudWfw=; b=FvPdzcuWAlD+Y2yblfS0vdbjJmGyrjghechTo7I5P/6usncuMjIG8zbq+oP7ls0Z2G h95ItxYnDRc1I5qktgh3tJJpK2OKt8iWFk+xUJcdjNOKBSa6aVCtv2wM2eGrtMD+JEC0 q6gyCVYwQEwQAsVVdA4C6yiyNtU9yXmXl6kRW9nKO5IfwyHV/p3jYJXeFv8hs0M0nGvJ 8E5/SGNKlmKpuqXJE5RkkdxI2OdKZg1wZlh2ttQTh0m1Qjb1k/RylBNTqRkgnfuesau4 z4YwRq6qid34f8eW6SLtpBNqZFjsgg/7OaGJreQDJ7X8HQIDWX/ZMlDCKeQ7PnShgjnF o38g== X-Gm-Message-State: AOJu0YxhM8/J8XauWmVCGo0geEdkPSEg5ZrLK02QWe5zhgt5DHjMd6hi CkYDE2YbH3Cf6M4CzYi0LsATVW4/ghnExNOQFx1hfO0gjyHNNS5O94nu7Q== X-Received: by 2002:a17:90b:3616:b0:2c9:7343:71f1 with SMTP id 98e67ed59e1d1-2c97ad175cbmr4440422a91.14.1720042001856; Wed, 03 Jul 2024 14:26:41 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c91ce58877sm11370560a91.24.2024.07.03.14.26.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 14:26:41 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Jul 2024 18:26:42 -0300 Message-ID: <20240703212648.48483-7-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240703212648.48483-1-jamrial@gmail.com> References: <20240703212648.48483-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/11] avformat/hevc: store parameter set and layer IDs in HVCCNALUnit 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: qLldv0vnF7pi Signed-off-by: James Almer --- libavformat/hevc.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/libavformat/hevc.c b/libavformat/hevc.c index 6fe701032b..f3e5542699 100644 --- a/libavformat/hevc.c +++ b/libavformat/hevc.c @@ -45,6 +45,8 @@ enum { #define FLAG_IS_NALFF (1 << 1) typedef struct HVCCNALUnit { + uint8_t nuh_layer_id; + uint8_t parameter_set_id; uint16_t nalUnitLength; const uint8_t *nalUnit; } HVCCNALUnit; @@ -378,17 +380,17 @@ static void skip_sub_layer_ordering_info(GetBitContext *gb) get_ue_golomb_long(gb); // max_latency_increase_plus1 } -static int hvcc_parse_vps(GetBitContext *gb, +static int hvcc_parse_vps(GetBitContext *gb, HVCCNALUnit *nal, HEVCDecoderConfigurationRecord *hvcc) { unsigned int vps_max_sub_layers_minus1; + nal->parameter_set_id = get_bits(gb, 4); /* - * vps_video_parameter_set_id u(4) * vps_reserved_three_2bits u(2) * vps_max_layers_minus1 u(6) */ - skip_bits(gb, 12); + skip_bits(gb, 8); vps_max_sub_layers_minus1 = get_bits(gb, 3); @@ -501,7 +503,7 @@ static int parse_rps(GetBitContext *gb, unsigned int rps_idx, return 0; } -static int hvcc_parse_sps(GetBitContext *gb, +static int hvcc_parse_sps(GetBitContext *gb, HVCCNALUnit *nal, HEVCDecoderConfigurationRecord *hvcc) { unsigned int i, sps_max_sub_layers_minus1, log2_max_pic_order_cnt_lsb_minus4; @@ -526,7 +528,7 @@ static int hvcc_parse_sps(GetBitContext *gb, hvcc_parse_ptl(gb, hvcc, sps_max_sub_layers_minus1); - get_ue_golomb_long(gb); // sps_seq_parameter_set_id + nal->parameter_set_id = get_ue_golomb_long(gb); hvcc->chromaFormat = get_ue_golomb_long(gb); @@ -605,12 +607,12 @@ static int hvcc_parse_sps(GetBitContext *gb, return 0; } -static int hvcc_parse_pps(GetBitContext *gb, +static int hvcc_parse_pps(GetBitContext *gb, HVCCNALUnit *nal, HEVCDecoderConfigurationRecord *hvcc) { uint8_t tiles_enabled_flag, entropy_coding_sync_enabled_flag; - get_ue_golomb_long(gb); // pps_pic_parameter_set_id + nal->parameter_set_id = get_ue_golomb_long(gb); // pps_pic_parameter_set_id get_ue_golomb_long(gb); // pps_seq_parameter_set_id /* @@ -703,6 +705,7 @@ static int hvcc_add_nal_unit(const uint8_t *nal_buf, uint32_t nal_size, int is_nalff = !!(flags & FLAG_IS_NALFF); int ps_array_completeness = !!(flags & FLAG_ARRAY_COMPLETENESS); HVCCNALUnitArray *const array = &hvcc->arrays[array_idx]; + HVCCNALUnit *nal; GetBitContext gbc; uint8_t nal_type, nuh_layer_id; uint8_t *rbsp_buf; @@ -745,16 +748,19 @@ static int hvcc_add_nal_unit(const uint8_t *nal_buf, uint32_t nal_size, array->array_completeness = ps_array_completeness; } + nal = &array->nal[array->numNalus-1]; + nal->nuh_layer_id = nuh_layer_id; + /* Don't parse parameter sets. We already have the needed information*/ if (is_nalff) goto end; if (nal_type == HEVC_NAL_VPS) - ret = hvcc_parse_vps(&gbc, hvcc); + ret = hvcc_parse_vps(&gbc, nal, hvcc); else if (nal_type == HEVC_NAL_SPS) - ret = hvcc_parse_sps(&gbc, hvcc); + ret = hvcc_parse_sps(&gbc, nal, hvcc); else if (nal_type == HEVC_NAL_PPS) - ret = hvcc_parse_pps(&gbc, hvcc); + ret = hvcc_parse_pps(&gbc, nal, hvcc); if (ret < 0) goto end;