From patchwork Tue Oct 8 03:33:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 15551 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 7B88C4463F9 for ; Tue, 8 Oct 2019 06:33:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 52AD8688157; Tue, 8 Oct 2019 06:33:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5982687F22 for ; Tue, 8 Oct 2019 06:33:26 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id x127so9959652pfb.7 for ; Mon, 07 Oct 2019 20:33:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=oZcYAUbT/fQAwJm1NsRtKzJ2sXm7pwLi11FvdjB2MKg=; b=Tr5nv8bAHmnevHIQI2lU99LjJAy7oXTPIA7XJtKCamJe7P4l+sAPdWKLiaNZCpPTcd oPZpkyzzLZwvEuRzdRMWQUS5/ezjCCjZsTyYp9RWD7weEAz88rbNrSIcG+FpFz/FIwaW uVh1MedS3/1eimfwcbSl0CA+RMivS8WvHpRjHZcIFJQtDPzuQqVwjztmtB+1XbHO3eEd el+T6tG/4qsWU5aXhJjPWWilH0Aa8FDlL836Z6FXc9kw3cpFWXb/wKxHGr2/QSjVkqg0 Ys8eK13HN02LOY+VDenZLNVivFR3F3ijb5RYHzcnRShFc3+knCOls6y0v7j9geSTA5+c bJnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=oZcYAUbT/fQAwJm1NsRtKzJ2sXm7pwLi11FvdjB2MKg=; b=KjFDuLoOiaMzUP7eI4NWZZAkVzMeiBWSaIUKyNF/O6vnulr5NGDW9gygjy3UvmvkJn biF8SBJvfHnGnYoJz3H1pScJhj03KuQpFJY88URpjZjQ8LUf7xxYZSh0iX2zqn8RYUJo 3USiMIggG+Xi//dPZutyuI+V6ku511nBp2PyyljkA4oSVuUJI3IckFDU2fLkyhbop2JU ngR2rni1XiRJisyVWCQTzep3PXqkjfngqhGjN9cu3GvCWW9waFSXL1s878OwKPOXBgIR 8ndBgfXKFngdEvCm64nUJU6R1lhJ6kNLd/+1+gcc+gCLWDbXra7nRUzwkdkO6IWjjPJT 2bxA== X-Gm-Message-State: APjAAAWMc8Rv0SDlk6J4+eCmxZnRUt/cRLQU9VJqBRSc8L73t4u0vC9y Q18ywayn9rCIL1idqp4z85gBIJCl4/Y= X-Google-Smtp-Source: APXvYqwFJyQqHKem1y2GdQbpY7V3RrBPzZBFdwTmWn5mYdqHgIMMzAbimH8T0CiCqBuYhUBwc1Tpcg== X-Received: by 2002:a17:90a:bd01:: with SMTP id y1mr3085100pjr.108.1570505604072; Mon, 07 Oct 2019 20:33:24 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:1:d3fb:772c:132c:9591]) by smtp.googlemail.com with ESMTPSA id b14sm16972963pfi.95.2019.10.07.20.33.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 20:33:23 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2019 20:33:15 -0700 Message-Id: <20191008033315.29946-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2] avcodec/h264_parse: decode sps before pps 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fix ticket #6422 The content put pps before sps, which is not a common case. The change put decoding sps before pps, just for compability. Signed-off-by: Jun Li --- libavcodec/h264_parse.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 352ffea948..eeda5a76e5 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -373,35 +373,36 @@ static int decode_extradata_ps(const uint8_t *data, int size, H264ParamSets *ps, goto fail; } + /* decode sps before pps, just in case some bitstream put pps before sps. */ for (i = 0; i < pkt.nb_nals; i++) { H2645NAL *nal = &pkt.nals[i]; - switch (nal->type) { - case H264_NAL_SPS: { + if (nal->type == H264_NAL_SPS) { GetBitContext tmp_gb = nal->gb; ret = ff_h264_decode_seq_parameter_set(&tmp_gb, logctx, ps, 0); if (ret >= 0) - break; + continue; av_log(logctx, AV_LOG_DEBUG, "SPS decoding failure, trying again with the complete NAL\n"); init_get_bits8(&tmp_gb, nal->raw_data + 1, nal->raw_size - 1); ret = ff_h264_decode_seq_parameter_set(&tmp_gb, logctx, ps, 0); if (ret >= 0) - break; + continue; ret = ff_h264_decode_seq_parameter_set(&nal->gb, logctx, ps, 1); if (ret < 0) goto fail; - break; } - case H264_NAL_PPS: + } + + for (i = 0; i < pkt.nb_nals; i++) { + H2645NAL *nal = &pkt.nals[i]; + if (nal->type == H264_NAL_PPS) { ret = ff_h264_decode_picture_parameter_set(&nal->gb, logctx, ps, nal->size_bits); if (ret < 0) goto fail; - break; - default: + } else if (nal->type != H264_NAL_SPS) { av_log(logctx, AV_LOG_VERBOSE, "Ignoring NAL type %d in extradata\n", nal->type); - break; } }