From patchwork Fri Aug 16 03:05:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14546 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 597EE448270 for ; Fri, 16 Aug 2019 06:20:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F28D68AD48; Fri, 16 Aug 2019 06:20:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CC3868AD1C for ; Fri, 16 Aug 2019 06:20:24 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id c3so164822wrd.7 for ; Thu, 15 Aug 2019 20:20:24 -0700 (PDT) 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=zBT20WwkFBbU7j/WfMKyFT16kBf2f8chZoa1Pl80u5s=; b=gNz25qpMCi/ld/1oZz3Y6u3x6R52NYPJMbSbbCtw0pFy/fVMmAcOP2WYi/+Ft7Xdod Sf7Z1H43eeRKReZ6kiO0O1mNdWux9FZCovrZn10cKTqyLLIzx7yeI0uiKIHjzELWzE91 cvGSxNks78NEdDJ9uN+n5z/5cEpC4e5ywHxrziAlwT8qSS0uXVeAKzKlGT+rmcLPtsAZ KWjQ9rMv5060nCC1ZmsKg+fYT/usWsU49Yr7jXyJcA+rJTetu2kSJlkbn1rfu8L7di0p HvZpuiZr4uHQiY3jtxgrSnUvEZs9ZnEYRoh79iPwqSoL7fi6WStnu5vdIIUqliJlocWk wx3g== 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=zBT20WwkFBbU7j/WfMKyFT16kBf2f8chZoa1Pl80u5s=; b=qfI+uKcSuIh97IFAw7oLjDaLSOJTC0TXeCU+3EOfOdxIjCRDs7OkPXB9DD4ixip0N3 61458udX6P59sPgP6YGyEDpOHyfXM8CQ0RV+t7uUGJD9gSxA2ZqXLV+C7dkniBQ9fOt6 EcaIGJ4mtUBQvwJHA8qm1EQx2ZHgVlSFQnWDwL2s14kJvmp+/L6W7h1LzX5Jibl7cuyc C04t7e56JiiQRP+3aPKpKaiiSFhb5gt2j1yRd76yzFyGLGstGwcs/SoaDP9qGTZZniET OQrvviGQtiDgV2xXggt049mmdALhzV06YqjrJDts024IbPtCz99OK371Q/3j9/Aq7bCb 3qeA== X-Gm-Message-State: APjAAAW7jdKlYHGw85E7DUvA3q9mInCaJ7XGk6GV+Pvgj9Z42gkDaxil 1jKNoN8IhtEVvZlPCSIRGqdOzGwl X-Google-Smtp-Source: APXvYqznybPfBiNQgnhbgeAo9POJZ8El4pYnKgzUGDpYhL5kS+eEVnZrkcuFiAJKsvkp6TgUkbxbzg== X-Received: by 2002:a5d:4ecb:: with SMTP id s11mr226729wrv.323.1565925231915; Thu, 15 Aug 2019 20:13:51 -0700 (PDT) Received: from localhost.localdomain (ipbcc08b69.dynamic.kabel-deutschland.de. [188.192.139.105]) by smtp.gmail.com with ESMTPSA id x20sm8501603wrg.10.2019.08.15.20.13.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 20:13:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Aug 2019 05:05:29 +0200 Message-Id: <20190816030531.4775-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190816030531.4775-1-andreas.rheinhardt@gmail.com> References: <20190816030531.4775-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/11] avcodec/h264_parser: Remove wrong comment 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From section 7.4.3.3 ("Decoded reference picture marking semantics") of the H.264 specifications: "The content of the decoded reference picture marking syntax structure shall be the same in all slice headers of the primary coded picture. When one or more redundant coded pictures are present, the content of the decoded reference picture marking syntax structure shall be the same in all slice headers of a redundant coded picture with a particular value of redundant_pic_cnt." And regarding redundant coded pictures: "[T]he content of the decoded reference picture marking syntax structure in a redundant coded picture is constrained in the way that the marking status of reference pictures and the value of frame_num after the decoded reference picture marking process in clause 8.2.5 must be identical regardless whether the primary coded picture or any redundant coded picture of the access unit would be decoded." So just looking at the first slice header is fine. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_parser.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 669a9a5ff7..604cddada5 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -468,10 +468,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, if (ret < 0) goto fail; - /* Continue parsing to check if MMCO_RESET is present. - * FIXME: MMCO_RESET could appear in non-first slice. - * Maybe, we should parse all undisposable non-IDR slice of this - * picture until encountering MMCO_RESET in a slice of it. */ + /* Continue parsing to check if MMCO_RESET is present. */ if (nal.ref_idc && nal.type != H264_NAL_IDR_SLICE) { got_reset = scan_mmco_reset(s, &nal.gb, avctx); if (got_reset < 0)