From patchwork Thu Aug 22 20:58:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 14660 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 46A2B449F2A for ; Thu, 22 Aug 2019 23:58:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EB7868ABEA; Thu, 22 Aug 2019 23:58:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5969968A324 for ; Thu, 22 Aug 2019 23:58:39 +0300 (EEST) Received: by mail-pg1-f173.google.com with SMTP id u17so4375455pgi.6 for ; Thu, 22 Aug 2019 13:58:39 -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=g7w7AkWpooaqymcP2g8Mwy4G5elwJL7ouHfqUpE/fPQ=; b=El7pUTbk0srrvjsVeSpuwEbfDipn69+txUxoK+twqkveYDRMIL+gZWNnyX3r7MKZ9X isBmqriqGnVfpTyL7Hyg8x4DOjU99tLvYDwYq2rPwgbWxnX9XP5DOiDMTJ2c7VIdeEre 14mAbJlKPW1cgNUXWgo4KBgW9KCGrGhJTVrp8Yws6suekQ5DwWyvq8CzowWRyJTz0rV0 50Yit4G1eY6copv6mtzqggQ8hzr4NGggpQyBihR13vW9r9hFY5NkdyZq+cfjchsHD+2g kVv4wi+cj8uFhrkbDjHGh8qpzSa7/jX50n+U8gbIq/OWEKHVPpHeBIhM62mb5iVtxTOf 3sIg== 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=g7w7AkWpooaqymcP2g8Mwy4G5elwJL7ouHfqUpE/fPQ=; b=sH2PNuFd0FPspeyKzWWybF7VdTRiRSfr/bXomV4vb0WZ2P2rpYbtDgsoDmFMBvSDi3 xje+rO+vDxc83aWcHWgO7x2i/Vqm9984rAjbYzKkcJkoOE45oDfdK8fLZBYVhCNheQRI NBqHPBU6myIGy31rfHd5vMSHvURA5yHbuQLpSiqKSg8ct72rD+kfScd0PiBNWPW1+1/G NnVgnLd6VnTYp5p6ukD2X3YhptI42Kc7HvWaGde6VygrAHEAWeniVwtk+D5WquKtyjDn wKUUP+EEt6agKJtQ2tNnPAk4Pk/qAmH34kyu7siQBpVBTi/x5YFpfowqIrEkZXvSoqNB JGQg== X-Gm-Message-State: APjAAAWpTu0RM1MW+Brsa7sh2C8rNLdjeDIKbZJcf43a3LxIaTaha3Fl R/EkGdpO2on0FPxJeFse+QAzK6tS X-Google-Smtp-Source: APXvYqxvJa09sq13qKqO7sCLiPrl4C/9gd+VmWQ8d6cjYzVVEZDqdaZ4IQ8mZOVYhXzMRi9NJBxp9A== X-Received: by 2002:a17:90a:ec12:: with SMTP id l18mr1647564pjy.6.1566507516671; Thu, 22 Aug 2019 13:58:36 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:a:57ef:410c:e784:4b84]) by smtp.googlemail.com with ESMTPSA id f72sm423140pjg.10.2019.08.22.13.58.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2019 13:58:36 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Aug 2019 13:58:30 -0700 Message-Id: <20190822205830.7067-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v3] avcodec/h264_parse: retry decoding SPS with complete NAL 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 #6591 The content has no rbsp_stop_one_bit for ending the SPS, that causes the decoding SPS failure, results decoding frame failure as well. The patch is just adding a retry with complete NALU, copied from the retry in decode_nal_unit() --- libavcodec/h264_parse.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index ac31f54e07..baf8246cdc 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -374,11 +374,23 @@ static int decode_extradata_ps(const uint8_t *data, int size, H264ParamSets *ps, for (i = 0; i < pkt.nb_nals; i++) { H2645NAL *nal = &pkt.nals[i]; switch (nal->type) { - case H264_NAL_SPS: - ret = ff_h264_decode_seq_parameter_set(&nal->gb, logctx, ps, 0); - if (ret < 0) - goto fail; + case H264_NAL_SPS: { + GetBitContext tmp_gb = nal->gb; + ret = ff_h264_decode_seq_parameter_set(&tmp_gb, logctx, ps, 0); + if (ret < 0) { + 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; + + ret = ff_h264_decode_seq_parameter_set(&nal->gb, logctx, ps, 1); + if (ret < 0) + goto fail; + } break; + } case H264_NAL_PPS: ret = ff_h264_decode_picture_parameter_set(&nal->gb, logctx, ps, nal->size_bits);