From patchwork Thu May 12 16:22:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lingjiang Fang X-Patchwork-Id: 35750 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp531060pzb; Thu, 12 May 2022 09:22:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEPnbckgnW0SSqNj9dy11uxMmH5DBwDMOhIUM7qffKU+sBBI5+ifQrXPRZH4fVsBMFkhYq X-Received: by 2002:a17:907:7f91:b0:6f3:d6bc:cd5b with SMTP id qk17-20020a1709077f9100b006f3d6bccd5bmr652042ejc.460.1652372541387; Thu, 12 May 2022 09:22:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652372541; cv=none; d=google.com; s=arc-20160816; b=HrGwlZ5jR40klOcv6TwdAlQQXHREmX36n2VIiivkqbntFxsn1o6xfUaGFjYPyv7pwS /2TssNtLcmZbrXw4uJLRHA5X/f9dhW5NVN4ruAa+sK792sTDB6G6uRjqgvPT9/8V6CjO POoG9KmUReAHC5x/b9B75802bWWu0bxxKS01GH0+rclbkHFowxQl3U6JkJrLuei05Dtl Z3Lym/GoQTssgnVa6ZNDBARbJ5zaFXrXWr/dagsyzXCL7A+PMIBrmNX1+3c8jhE3tXP5 cL8JoPSC1eH91h3JwfPQd/PO5uXnrE5Oa8Cy7jP9cqF/+CTrDD+B+w/DHMAkyXyG4Hrp x/pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=JwEXb4eQdltCRSe6qywlVyXnhV8ETcBND33M8QQ33Js=; b=BGLpX/W/SHL2po8Nh/fxD6KaLL6KW4Bbgb9kEzGgPJPKFFGt/N7R0o0MJNXXaCUSfF tIOjxVeKbiu5jkxrNDU4JKXFW+0hxwwrMgi7DjnUpQW0Uk0kgV+bISnjieAZtDZq9OCQ d8ldUX+6wUoE2r4hulB9YoYGax427fdrGrKpZvXrd2JWkLjpQiBWcXFWw8vo+C/wrWDr blobPFBqIY+gf9KEw/ph0MrVZJOpxHANSTvKZZacXvz2i7RycNb6mF+Y/RAPBFY7jRqF Ct5rdhypaaKwcgWwlgRDKlDyrsefGTwdhusggspVPppTbWNb+tyCfk/O5vI3UchhQWFV cH5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=YtNvRoHR; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j15-20020a05640211cf00b00425f70d0b48si5462767edw.211.2022.05.12.09.22.20; Thu, 12 May 2022 09:22:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=YtNvRoHR; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 289F068A10D; Thu, 12 May 2022 19:22:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B52D68B1CD for ; Thu, 12 May 2022 19:22:08 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1652372525; bh=tWb2o2JToSR+pMzaX+V4jWOSCx2kScsX8ubaSg2UsbI=; h=From:To:Cc:Subject:Date; b=YtNvRoHREz+SwwhkwWQULO/bP5qMNWPt2fXTJfhspxjOVl3QcsfoIoBLCz9SIH/Xd acyScqTqD5OzxGCmV7S8atVdyZ1MghyaZdNf9Ne6OUMJ9SciYkfNeIvnjWUFOo/2Iv WebmGOtmBQ8qDl9HYDDGcGyFA6DYU+zsyX9ocWXg= Received: from localhost.localdomain ([106.52.131.116]) by newxmesmtplogicsvrszc9.qq.com (NewEsmtp) with SMTP id 58401244; Fri, 13 May 2022 00:22:04 +0800 X-QQ-mid: xmsmtpt1652372524ty6pn1un7 Message-ID: X-QQ-XMAILINFO: NyTsQ4JOu2J2wHX0n4jVtuUQw9uKPhJ/pG32OfYuJpaCvy8YiPhiae7ciPl4w0 A3GBn4ae6XEcnYq8gV1TUYfkT4Ei8ePLaePQVpmNcMfTxVImJG6u23+U6kvpwzEMSbGyQCm4Tbmw DUvzxaZ5lO4UUuiFAiRZ+PeeBqMXIh/Y67rv+oIxJZMhsbNqTS+t+vU9WIuSLE/jcNPL6wjZgFBi W41gilPAoV6chQtlnrYgHXyfbjVP6V1XIkn84PVm7sqfanzN+rQfn53JK1Wx4OL+DCKWZNL2Lb7a xKNISswuBoH5AHxnpqjBwixAKO5qE2O7yD3ixWetL2E3hdY2CGX0rNyXla/nn1JuxcOST0Mcv/va 1g9y0dAF3yuDll81T4O8eEIqHiYEfT2gGZXQVWwdHLWd200iZaY35s1p8dInCOJrFOMsuZNzJAna lbw2s2oQ+hT0GMSKVhO8MozaEEWagRvE2uCQqmsHIhfK4FwzT1V1Ud4WwRXWpdyKIaeEX8Up7773 KdMMBj9rePG0VBFi5RQhveH2G7xWNekU2MEcfQVXzwsaE2IQf1IGxO2zH8ADqq3zHUIjFcipPfxd IuTclXKNck+1ltvkCkhzaZ8jL2dW2/CETTIRA/5Hhv9g+88p18BhHsN/b304EjrJc+qKw8G+fj4G Pra433eabgMHNk8IjIuSbSpxJHTV4y8aCJhPTzvJuhkI/HKttYn64vmS/51j5QJWg+89pdXfC9ka tzOse12iuKcMqzpSWsq8ThmUqV8GR+lBbyTyTYZZDWhoQa/0/8DDOVjYwCuIFvWpjGQf6DsTsk7W 4AgLkHiItojcKBD/NIxl7T5c1gvxTeC4tCsXNk8MIGorQYFC5z3vZg/Ibw1c93XVev3oeDn/PfBQ azxQX7pdKo5/pmKeBYxzQF8WDYNB2T+8STZFMvUav4Gq7y3p3N68fIo8lX9C8VCqt5TgBAMU8Qi2 GNUdmV6hkBAR40PVIkX8tyjPpiZsIk4NR6qG7PCYk= From: Lingjiang Fang To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 May 2022 00:22:02 +0800 X-OQ-MSGID: <20220512162202.23872-1-vacingfang@foxmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc: fix h264 parser bug X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Lingjiang Fang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QcUIifi4/TWf will give a wrong nalu length(+1) when next nalu start with 00000001 this bug will lead to an padding zero to pps in AVC Sequence header(flv) or in avc1(mpr) --- libavcodec/h2645_parse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 03780680c6..2e941a2bd0 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -134,6 +134,10 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length, dst[di++] = src[si++]; nsc: + if (src[si-1] == 0) { + --di; + --si; + } memset(dst + di, 0, AV_INPUT_BUFFER_PADDING_SIZE); nal->data = dst;