From patchwork Mon Dec 7 12:55:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 24418 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c00a:0:0:0:0:0 with SMTP id c10csp2578919ybf; Mon, 7 Dec 2020 05:02:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxcWzLeAlEyqLIiZd1syizAXb9JiUTeJbTQtUV1f0/VKMFbwvtEYNSFmYSvCKl4DwhP/4ET X-Received: by 2002:adf:e788:: with SMTP id n8mr19540355wrm.84.1607346150107; Mon, 07 Dec 2020 05:02:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607346150; cv=none; d=google.com; s=arc-20160816; b=JNu0SCyvQR5q/wjUVFTiAY5pHuyRFGB+DlfYLXY8tUlH9gQ41N/FjuEhRYylX1ZrIm W4iIaqtBm6hdxyZlRL5vAzDnDUJga5RNI5bNTKSzgbX4hEKZSTlrbBNOKC8GmoF/kfVK K//5wZeU6fMbZZIE+dPMZxrfHEkdGGfe8IFmNcIfXncD3YMekmLW8Y64ZknEx64kJMyO HQc8Zhra/nF7o7ICyBq/Ra2QvuIQTiquT0qMqy76bfEswSX5+Y3McxHdKmv8uCDLx7Y9 xXx/Kj6UKodKz2RNHxsip51QzPBOi6UtglwyIFyLRc+5VPjiLa5owOMQ3LeHfvpeiilZ O7Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=ZG7/FJUA88d/gIpuZb6cyd1ZhqZeSJx4EPMXx8ddzNA=; b=0/B1WQUKDaWRDOU++QP7GUEVfjR5R7wKZ9UH0Hi4QmzHs/YhP+JzLzYL6aT5od9a5n JC8fdmJ3Q/utKWH1vC3RlGeHxQ2tnDVhS8jULex/IRXRiSuog95vt87UDqUBYBQZ6mKE 2+e7+3+OtoeM6LlfFGgVmrCwN6tlejcr3gNylbWYVSqdBJoDa7WT5hCxXwA6wyNN1cjG tOmP03VccuuxkTpB5CTLCHvOHmz6UbqMMccH+n9IH6u9KA1iAqBFPlEVqSQHcxpVZUSx 3Al8yY/MCmo5q9LwaQyWEQYTGHpE03sC/RFSCLUBxl/w8nNY4gU+URigzDAZBQHzo43f mB6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nw9hMbiC; 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 v12si12105950wrc.23.2020.12.07.05.02.27; Mon, 07 Dec 2020 05:02:30 -0800 (PST) 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=20161025 header.b=nw9hMbiC; 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 A9A9168A276; Mon, 7 Dec 2020 15:02:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5DCB689A5E for ; Mon, 7 Dec 2020 15:02:19 +0200 (EET) Received: by mail-qk1-f193.google.com with SMTP id y18so12298998qki.11 for ; Mon, 07 Dec 2020 05:02:19 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=sqCQWuqXaqnhER534/PYGqg9zM42ac4uOUZ4NSlH05k=; b=nw9hMbiCOvVZUHPzJl5r6oHCIi7OXxeD5F5ieRuKPapgyPko9KhAwfW37TiIu+4oGG 6ORPVef52Nytlhii1oBaGIDdh8b3C4ZDloqynJa34U+eSjcU1crzieCDFmU7kFHe7GoM 7w2I1s2+mCVAfvWW9gypUN6ZHsFE7/F2eJQtFwT9Is81LqnDyorI0BhmKvYFMh7oYbUn ED2zMW1zmQS4n6AQXozBniqGLZMHFBP6mX5VcrWmpi0yHjn8A9PaDEy5WIhYYC83GaIh bDhw5O5XWRsr1lFzRlGW8ugMat2r04myO3D4hAMtnMO3LFkd/eQnX3WBdb8ZZx6W9je3 3iww== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=sqCQWuqXaqnhER534/PYGqg9zM42ac4uOUZ4NSlH05k=; b=JHKqKCeIMIxVM5fS3mOq4+vhjtevoFPbsc6u9v+sRmzMez0xrzPNsrwC8c3Svud7dJ e4lxKXXFhrdB6oPxQVWr2p3s/AFowG5hPOSNGaJKRQYN7UoYzxbH1F3aLhBKk6IMyYfh gIEaOb5vwfV/y/5mr5Q0Y8etv7buyVJBdEyr0JGwExabuevfbfBvdCV5RxTlFtNHaI2P hunLD2G1o5dWAR5av5c3Q64jS9IA1zKf6+CcdviG75mpZaYfjY+A06LfY6/PcTHxfG6C Dachm/kyl/G3ATeqU49/DMUBLPMRVpLtCi31ApGIMBDval67qVCObF288QmVeAtWHc04 3bVw== X-Gm-Message-State: AOAM532S6iR8OWVO8G6FVc2ERqAzjbLdvdwl57gkjAYon8a9NK8wVo7g E5ZWWV9M+6v606gk+BQZqHL2dKggKpSJNQ== X-Received: by 2002:ac8:7501:: with SMTP id u1mr9815033qtq.346.1607345793604; Mon, 07 Dec 2020 04:56:33 -0800 (PST) Received: from ip-172-31-39-116.us-east-2.compute.internal (ec2-52-14-134-25.us-east-2.compute.amazonaws.com. [52.14.134.25]) by smtp.gmail.com with ESMTPSA id w15sm1638489qta.95.2020.12.07.04.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 04:56:33 -0800 (PST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Dec 2020 12:55:45 +0000 Message-Id: <20201207125545.621159-9-linjie.justin.fu@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201207125545.621159-1-linjie.justin.fu@gmail.com> References: <20201207125545.621159-1-linjie.justin.fu@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 8/8] lavc/hevcdec: Prompt detailed logs for invalid PPS id 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: Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6Jf/P0oxZ73u Content-Length: 2878 There are 3 functions reporting the same log, which is not straight forward enough for users: - hevc_parse_slice_header() - ff_hevc_decode_nal_pps() - hls_slice_header() Provide detailed logs to distinguish from "out of range PPS id" and "empty pps_list[pps_id]". Before: PPS id out of range: 0 After: PPS id out of range or empty pps_list[0]: 0 Since 0 is within the range of pps_id, it's more clear that there is an invalid pps_list. Signed-off-by: Linjie Fu --- libavcodec/hevc_parser.c | 2 +- libavcodec/hevcdec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index 463d352055..0c6b50c0b9 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -75,7 +75,7 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal, pps_id = get_ue_golomb(gb); if (pps_id >= HEVC_MAX_PPS_COUNT || !ps->pps_list[pps_id]) { - av_log(avctx, AV_LOG_ERROR, "PPS id out of range: %d\n", pps_id); + av_log(avctx, AV_LOG_ERROR, "PPS id out of range or empty pps_list[%d]: %d\n", pps_id, pps_id); return AVERROR_INVALIDDATA; } ps->pps = (HEVCPPS*)ps->pps_list[pps_id]->data; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index e1d469658c..02c489e1f9 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -554,7 +554,7 @@ static int hls_slice_header(HEVCContext *s) sh->pps_id = get_ue_golomb_long(gb); if (sh->pps_id >= HEVC_MAX_PPS_COUNT || !s->ps.pps_list[sh->pps_id]) { - av_log(s->avctx, AV_LOG_ERROR, "PPS id out of range: %d\n", sh->pps_id); + av_log(s->avctx, AV_LOG_ERROR, "PPS id out of range or empty pps_list[%d]: %d\n", sh->pps_id, sh->pps_id); return AVERROR_INVALIDDATA; } if (!sh->first_slice_in_pic_flag &&