From patchwork Fri Mar 24 22:31:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3090 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp293466vsy; Fri, 24 Mar 2017 15:33:16 -0700 (PDT) X-Received: by 10.28.135.149 with SMTP id j143mr5004317wmd.19.1490394796050; Fri, 24 Mar 2017 15:33:16 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h9si5215160wrc.243.2017.03.24.15.33.15; Fri, 24 Mar 2017 15:33:16 -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=@gmail.com; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 750C7689742; Sat, 25 Mar 2017 00:32:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0C436891DA for ; Sat, 25 Mar 2017 00:32:14 +0200 (EET) Received: by mail-qt0-f195.google.com with SMTP id n37so512963qtb.3 for ; Fri, 24 Mar 2017 15:32: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:in-reply-to:references; bh=mjuf07v91yUWABgqLSHvLr48C0B37Bbl/IR4grdzfew=; b=i6xw+w89X7ZJbgybylaBE9GOZCPay8LT/nUYWfEWrc4D2DomWC8jKKQCHLt+QePcPF xxnzvdUNRP7XDe1zfKYW847/A0ra7e5+660ybA9gcWKyvm3ia5aEuBGBVgTICPSNCG7i xAo7CpQrzWg3bqqYcx64itRe0eMCKiCvpeW7+uGoSOKrlaJlo08xe3SGWvp4X9KDGbd4 2XYx+SnV3/3paB3EFqYbv6JUnP5457/YpdPximLpCLLDEUS5RiF9Ktik5/NrDn1I/t/j sgApWDSsdHQQCgrbYZrVmoUKIVUzDvh3S/F9uh2hyZojfbK0H7Vdb3ABcdGJt5T5/kTY dzQg== 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:in-reply-to :references; bh=mjuf07v91yUWABgqLSHvLr48C0B37Bbl/IR4grdzfew=; b=Ae9lNZJ1Y0kcEI1HVbpHePTfbG1/uWvZUHpcqM2c6hopAvZ/EoBgks9Q3UbqaSRx1G Q+/cMgG1AlVc8uOu6FOdAt+R+EFb2cAKB/+oZ7kLyeVPFBZlh5EixuY/ljx+WpIRL0xH eM9gQuLrwjWO3loGIqrPj9Koz0gDuFq6NA7Rhp5wkehMDr6i80bSIFQIP9evOquJYRCh RqUfBk33+Yc280XL4WgeWWEGoCpBRWdpCccen3V+uaaOyxE1G9RP8gPG2NY5J1qRWh7c MbcFK3fZxXkN4srzQB12ILYmL0jxFMjVzFMUQsXKkfNhUzb/N2gnRbGyZR51uYFVLRI7 Hyjg== X-Gm-Message-State: AFeK/H2I6mz4kH7go+2V7jr/wacc5a+6rgzjxBQD7Sb+/d8g7Wmd2NZkpViWhfOknuXthg== X-Received: by 10.200.51.252 with SMTP id d57mr9842882qtb.96.1490394754175; Fri, 24 Mar 2017 15:32:34 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id e19sm2414824qta.68.2017.03.24.15.32.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Mar 2017 15:32:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Mar 2017 19:31:45 -0300 Message-Id: <20170324223147.2692-5-jamrial@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170324223147.2692-1-jamrial@gmail.com> References: <20170324223147.2692-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/extract_extradata_bsf: use the parsing code from vc1_split() 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" It's a simplifaction of the same code, originally commited as b4b9a64bdb6. Signed-off-by: James Almer --- libavcodec/extract_extradata_bsf.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 89981996f2..57a3d51bef 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -139,19 +139,15 @@ static int extract_extradata_vc1(AVBSFContext *ctx, AVPacket *pkt, { ExtractExtradataContext *s = ctx->priv_data; uint32_t state = UINT32_MAX; + const uint8_t *ptr = pkt->data, *end = pkt->data + pkt->size; int has_extradata = 0, extradata_size = 0; - int i; - for (i = 0; i < pkt->size; i++) { - state = (state << 8) | pkt->data[i]; - if (IS_MARKER(state)) { - if (state == VC1_CODE_SEQHDR || state == VC1_CODE_ENTRYPOINT) { - has_extradata = 1; - } else if (has_extradata) { - extradata_size = i - 3; - break; - } - } + while (ptr < end) { + ptr = avpriv_find_start_code(ptr, end, &state); + if (state == VC1_CODE_SEQHDR || state == VC1_CODE_ENTRYPOINT) { + has_extradata = 1; + } else if (has_extradata && IS_MARKER(state)) + extradata_size = ptr - 4 - pkt->data; } if (extradata_size) {