From patchwork Mon Oct 7 21:40:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 15548 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 C6C67446E8F for ; Tue, 8 Oct 2019 00:48:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F4DD688036; Tue, 8 Oct 2019 00:48:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA201687F4F for ; Tue, 8 Oct 2019 00:48:35 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id x10so9019565pgi.5 for ; Mon, 07 Oct 2019 14:48:35 -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=D2I0ejf0VXvQubKLWy6uhAdhzDFsxmPob3wPEY/eCtg=; b=l+SPKWyiW0U/zxo9ix69GKTps4QFg+ztHPFpXXV0JjDSmkeRzt1Phutz3yc3ljIJ9H BsRPOv3RSo3Ugi8b1f8GF23vAHCQgTMV6pEitXOxygiAqJLYq+K0aVLVh4qnABYFnPbP 8CLzPYi5VRhS87/I/PqhUflLu//rVBSlVHsuvKZvGMBGaFtQXPzgH+xvHW3AZfsG2ldV R5JZ+f/sJs489FlUVoci8Lo3dc+eL8Na3xDA4rJS/s67kq/7Ed42HxuJZ6YnfMIjk0fj wy6cwOWZeDpkx8TVSYAFQ8N4kqPv4SJ/ZDpjwHxmT476OtQ15B1TZiQx2hehZVyOUQwo hgAw== 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=D2I0ejf0VXvQubKLWy6uhAdhzDFsxmPob3wPEY/eCtg=; b=tL6a5IgeaQpxMk1666zavzX9hqjlMOhKXP3r+Fy15MhLbR4UKPxJbvdKdAAmlxbdLy pv+iNZLAdxoB4km9QZBpSXLXdI4PDqfDHGFy4s4t9eWv5w/XYDM//72mugQon/Zz0KpW f5zV78BXmIXbqewxI0UiaMcUyNC6K0XOk4LysDuEPrUK6qL5d9qslVNSdrI2aOhpKOE/ XrqFYJtPdeKYfJUzw6jZCnzHdtwyVPr2CW1SBsVigzXPPK6iBJUhzfa8ge02uz2JMa/K 1j55LKtI54DnP2bBSahHFNb1f2QiMziuQK5po+xNWI8kfdfu7yv7fryw2SZLzDinJpKs hR8A== X-Gm-Message-State: APjAAAVs1GwvMbvqqkOC9cPguwJQNJibTl262tNcFujBgAGg45VaMp5d 0oMmxunAz7MlgsN21XF7toVvEiNUj6A= X-Google-Smtp-Source: APXvYqx4z2PMbmMDjhiCpTUIADFNgUQGf+QrPIbnnMsf3PjyzjonguswOwl5zJ+J+qYbKcu7fTtGGA== X-Received: by 2002:a62:ac13:: with SMTP id v19mr36359509pfe.202.1570484450164; Mon, 07 Oct 2019 14:40:50 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:f:d3ed:772c:132c:9591]) by smtp.googlemail.com with ESMTPSA id k65sm5320411pga.94.2019.10.07.14.40.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 14:40:49 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2019 14:40:44 -0700 Message-Id: <20191007214044.19604-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v1] avcodec/h264_parse: decode sps before pps Fix ticket #6422 The content put pps before sps, which is not a common case. The change just put decoding sps before pps, just for compability. 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" Signed-off-by: Jun Li --- libavcodec/h264_parse.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 352ffea948..26aaa751ad 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; } - for (i = 0; i < pkt.nb_nals; i++) { + /* 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; } }