From patchwork Fri Dec 6 03:15:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 16609 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 25B36446BD3 for ; Fri, 6 Dec 2019 05:48:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0620F68B5DD; Fri, 6 Dec 2019 05:48:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7C6268B5D3 for ; Fri, 6 Dec 2019 05:48:37 +0200 (EET) Received: by mail-qk1-f196.google.com with SMTP id k6so5392926qki.5 for ; Thu, 05 Dec 2019 19:48:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=L7Sr73pysIHR5DNbY2QrY/9HCCnpjR5WBEWmPCI5Oz4=; b=onJSRBMarZqtML/sTLvOPvDhxuy6FeNX67Z2n9xCebKO88KXq8MJU4YfFAzLVZp6C5 3RlWLOXbf/0WEPKdbvypiZpTFaNjvZTpSuuW5pyPJv2MAUs2UThwYIpTUoELka86Yob2 dD3vQyxfXkxKfpbEAxXfZf1DkULC4lf8yulL+SgvgKg2s/iSvCa68HFtBEzPPuom0Nie A2TsOYwAGFUU7nX+cwWubpXN56wuQDd65NxxLFYax4ir+CeeevXZo/bXiUs6y86FFBfw SfqNWr/0HpCmazvKzd02n45tLAMSVBtIJfUCNWESJb51F6r2QwkKJdhs/k4HGgeu4oSo LBFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=L7Sr73pysIHR5DNbY2QrY/9HCCnpjR5WBEWmPCI5Oz4=; b=h6QKNNWRBaXd1a0XON4+jxhJi+ukqSuwFQdUCTPVG9sBskLZ1SXaj0qpUS7euFaJ5L K6bcZuDvYV0UQ1xznOVD0P3y1rZySgt6GqNNTPdC6w7HjbY4RPTSbrtyt6mOKhIMoEMU 8NEB4nimtKiyA9ZyznAmAmHYg+O8pMIZOunUSS/tkRIHaYrBvW/UUIwiaHgFZJYg9MzI d3O+Wj0SR51g9aHORRBVy7SaUdlyYzGSxe7R59qg5APk32im9j7kSukrFJSVulD05hUl XLeh8IKAIj/CXCIeq0HGiOe1YlbufHu82F5ylhZtunddUZuqNAfnM5fLl0SiiJtWF9kb q+Gw== X-Gm-Message-State: APjAAAUqs0gRzBuH/pfhBR8K5aNh/njwa5jzqOIzAW/ELMAX/ndT7oJF 3+IdwyuWmbTx11fZxbAOI/iYsBu0XPI= X-Google-Smtp-Source: APXvYqyPYzRpn01m3a3YEt+CuCIn540t0/i8ATT0k3l3DR+Vs1pAfz4mm61kw6UO8XcWLQHs5Bgsgw== X-Received: by 2002:a37:a20d:: with SMTP id l13mr11564828qke.423.1575602154338; Thu, 05 Dec 2019 19:15:54 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id f26sm5969476qtv.77.2019.12.05.19.15.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Dec 2019 19:15:53 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Dec 2019 22:15:41 -0500 Message-Id: <20191206031542.20853-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] lavc/h2645_parse: Don't automatically remove nuh_layer_id > 0 packets X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andriy Gelman , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman HEVC standard supports multi-layer streams (ITU-T H.265 02/2018 Annex F). Each NAL unit belongs to a particular layer defined by nuh_layer_id in the header. Currently, all NAL units that do not belong to a base layer are automatically removed in ff_h2645_packet_split(). Some data may therefore be lost when future filters/decoders are designed to support multi-layer streams. A better approach is to forward nuh_layer_id > 0 packets and let blocks down the chain decide how to process them. The condition to remove packets has been moved to hevcdec and cbs. Found-by: Andreas Rheinhardt Signed-off-by: Andriy Gelman --- libavcodec/cbs_h2645.c | 3 +++ libavcodec/h2645_parse.c | 7 +++---- libavcodec/h2645_parse.h | 5 +++++ libavcodec/hevc_parse.c | 2 ++ libavcodec/hevc_parser.c | 3 +++ libavcodec/hevcdec.c | 2 +- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 88fa0029cd6..ae32078f246 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -565,6 +565,9 @@ static int cbs_h2645_fragment_add_nals(CodedBitstreamContext *ctx, AVBufferRef *ref; size_t size = nal->size; + if (nal->nuh_layer_id > 0) + continue; + // Remove trailing zeroes. while (size > 0 && nal->data[size - 1] == 0) --size; diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 4808f79a67f..0f3343004f9 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -292,23 +292,22 @@ static int get_bit_length(H2645NAL *nal, int skip_trailing_zeros) static int hevc_parse_nal_header(H2645NAL *nal, void *logctx) { GetBitContext *gb = &nal->gb; - int nuh_layer_id; if (get_bits1(gb) != 0) return AVERROR_INVALIDDATA; nal->type = get_bits(gb, 6); - nuh_layer_id = get_bits(gb, 6); + nal->nuh_layer_id = get_bits(gb, 6); nal->temporal_id = get_bits(gb, 3) - 1; if (nal->temporal_id < 0) return AVERROR_INVALIDDATA; av_log(logctx, AV_LOG_DEBUG, "nal_unit_type: %d(%s), nuh_layer_id: %d, temporal_id: %d\n", - nal->type, hevc_nal_unit_name(nal->type), nuh_layer_id, nal->temporal_id); + nal->type, hevc_nal_unit_name(nal->type), nal->nuh_layer_id, nal->temporal_id); - return nuh_layer_id == 0; + return 1; } static int h264_parse_nal_header(H2645NAL *nal, void *logctx) diff --git a/libavcodec/h2645_parse.h b/libavcodec/h2645_parse.h index 2acf882d3da..3e47f86c53b 100644 --- a/libavcodec/h2645_parse.h +++ b/libavcodec/h2645_parse.h @@ -56,6 +56,11 @@ typedef struct H2645NAL { */ int temporal_id; + /* + * HEVC only, identifier of layer to which nal unit belongs + */ + int nuh_layer_id; + int skipped_bytes; int skipped_bytes_pos_size; int *skipped_bytes_pos; diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c index dddb293df64..29dfd479f38 100644 --- a/libavcodec/hevc_parse.c +++ b/libavcodec/hevc_parse.c @@ -37,6 +37,8 @@ static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets for (i = 0; i < pkt.nb_nals; i++) { H2645NAL *nal = &pkt.nals[i]; + if (nal->nuh_layer_id > 0) + continue; /* ignore everything except parameter sets and VCL NALUs */ switch (nal->type) { diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index b444b999550..87d5dba4f5e 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -202,6 +202,9 @@ static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, H2645NAL *nal = &ctx->pkt.nals[i]; GetBitContext *gb = &nal->gb; + if (nal->nuh_layer_id > 0) + continue; + switch (nal->type) { case HEVC_NAL_VPS: ff_hevc_decode_nal_vps(gb, avctx, ps); diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 8f1c162acee..bcd8e67944a 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3077,7 +3077,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) if (s->avctx->skip_frame >= AVDISCARD_ALL || (s->avctx->skip_frame >= AVDISCARD_NONREF - && ff_hevc_nal_is_nonref(nal->type))) + && ff_hevc_nal_is_nonref(nal->type)) || nal->nuh_layer_id > 0) continue; ret = decode_nal_unit(s, nal);