From patchwork Mon Oct 7 21:42:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 15549 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 0515F446ECA for ; Tue, 8 Oct 2019 00:50:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D85F4688036; Tue, 8 Oct 2019 00:50:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D7936807F6 for ; Tue, 8 Oct 2019 00:50:05 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id i76so1861162pgc.0 for ; Mon, 07 Oct 2019 14:50:05 -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=RNA1aIGJM1T/lh0NCD5Ie7hoM3Y3M03KJEhPjZ6qn/o=; b=UJ75VT4EvrwvtelW2ekc+g0qgiR6Pl5Tmdv1iO9R7XYvU64dDHs5ph7b0TH50cQEw4 WqYsl1W7RcchaTjspJLcV+cMXvSdUoLhYn3V3VWQvIk7NyqT5Gp9w6ynL6dXBFy84Ifa pfzmqsTJfstm1kTsvUdog5LFMVZ2Wn6d+9o4n8fGzhNQY7xczkb8VN+9sXF8cf45uQ6H +hd1tBbJKXteexWsX8V1ZKYR/hfm2r7MzxuCrrTtkgRIbfkW3IjBGwmafHtFyh5FVijc 3cf6RRl8Q1XA7efw+nk9+SqrkPQ18IQ2cX1/RAtwbqQ4IFF687P0vQzCnNW1TeGay29U 7P3Q== 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=RNA1aIGJM1T/lh0NCD5Ie7hoM3Y3M03KJEhPjZ6qn/o=; b=aune3ui7Qu/ECSBYIDtfByuKh50dcQ2+JdZn1OitlbO4ICXQHx8hH5cqDV3/snQU3H MXRk5+iPlw14CcxfJEGVW65dcvpKgw+f6ooFJtHHZAgeRTWCeckz6L3/Et7Va6b1LGbR JX3ZC23DevX4z2F0m+UrAmShkWtvmaa4w/8q3YCxqikgxnY9Xn0yoxqyoyVCmtQJMHup 6uydozkU7sfCHf6oARPzyHFcntLqIFJnPbFZkNiAiPGdydkSQqV30+eZ4frGwDEqwSqf pb5mZLR10Ncz9rYixW16C4QojuLXTOA7/gOjPbNxAlSXWjQpBDD98Famk/hVMoWc04pR TdLg== X-Gm-Message-State: APjAAAXTqyFQHJMyqOpvFq/VMUOb8lByYKPbvNV7Fgi9Sb8pCkUGFBjk g2DsUYy92eEsZT2H+ITP3r7bsZg221Q= X-Google-Smtp-Source: APXvYqxl7VQRya8JwK3PWaqptCd1h3RuMzn919J9UPTL7Ej2kzyKSnxfJYZI1Sdq0V9YDhr1UFyWfg== X-Received: by 2002:a63:5d0e:: with SMTP id r14mr33081386pgb.15.1570484546393; Mon, 07 Oct 2019 14:42:26 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:f:d3ed:772c:132c:9591]) by smtp.googlemail.com with ESMTPSA id g12sm17695127pfb.97.2019.10.07.14.42.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 14:42:25 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2019 14:42:20 -0700 Message-Id: <20191007214220.20060-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v1] 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 just put decoding sps before pps, just for compability. 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; } }