From patchwork Fri Mar 24 22:31:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3089 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp293504vsy; Fri, 24 Mar 2017 15:33:24 -0700 (PDT) X-Received: by 10.28.98.135 with SMTP id w129mr5249966wmb.68.1490394804453; Fri, 24 Mar 2017 15:33:24 -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 k62si4891259wmb.93.2017.03.24.15.33.24; Fri, 24 Mar 2017 15:33:24 -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 EEC7E689753; 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-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1AF368832B for ; Sat, 25 Mar 2017 00:32:15 +0200 (EET) Received: by mail-qt0-f196.google.com with SMTP id r45so526653qte.0 for ; Fri, 24 Mar 2017 15:32:36 -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=AKurrywHSf/W75LLgYdIB6PeHeRPvrx6R2e/Sp7+UTg=; b=pxTshnXW1soB9tmGaWkMjOcQmSOCeopQIkehjIprejo2QJ1ZN/YuKDes0Ef42jCGpm nlLqIcjcNBwugxBpQAeD7Q16bNfpi897iDZgnBnNtUgs/Z4PHF5uodXdOiyvUPeD3Pa8 +ug3qsFLctBevy9HHiau9FLli9KZokYCXABj0KmzHPSSP3RZBPFGVIRUYmjCWKo+P27u rvsGIJuoJyEGiapNucGeok5Awpb7LG38iQoWncn/2nb3El7yGR1oyn5wUGi/th+C/uzn 9PkHA0ZtrLst/iZUvT2fhPRvR4EZ6+HJ/S2ezxP0mxc3pkbe+AYeeFu1DTlJr2L9Aonu zAoA== 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=AKurrywHSf/W75LLgYdIB6PeHeRPvrx6R2e/Sp7+UTg=; b=GtX8lkKON+nAlrEOlgTyYc2mHWUbuv7MSs0yhgetBvpLFlHt1tPJ284bHgvTW36xa4 kcvjEy9CoWI0JwCaVA5EMLSjA7uiTxJMQMxBFlz9GWmpckxDSDd+U8HIsxp21hT5rUAj PqGtjpBWvrt0g/YDekkkPz7ppO954vwClfxCQZk1Qy8wOQVmosGqEDR0Sg0eowVjsy/l WX5lrHoXxmSduFRSwq+0VAysl25RGXfV68xk7LkG8XEdF+XYzd64KFxWIDcJNOv94Vh2 ncUaGLpC6fttXrHBk6k6ZKcntV02CLi1kl3IcHt9sEq0465zZv/Tx/HYYIf/sZMk13Gs Q+Ow== X-Gm-Message-State: AFeK/H1Aekl75MAEvjY3CT959Odvlz20WtmjiQHDyxPtu6R/6jVEJYi3hHZ0/hYVAqZCpg== X-Received: by 10.200.3.230 with SMTP id z38mr10809216qtg.181.1490394755374; Fri, 24 Mar 2017 15:32:35 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id e19sm2414824qta.68.2017.03.24.15.32.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Mar 2017 15:32:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Mar 2017 19:31:46 -0300 Message-Id: <20170324223147.2692-6-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 5/6] avcodec/extract_extradata_bsf: use the parsing code from mpeg4video_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 3b5ad8fbf77. Signed-off-by: James Almer --- libavcodec/extract_extradata_bsf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 57a3d51bef..12f02f6a5a 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -203,13 +203,13 @@ static int extract_extradata_mpeg4(AVBSFContext *ctx, AVPacket *pkt, { ExtractExtradataContext *s = ctx->priv_data; uint32_t state = UINT32_MAX; - int i; + const uint8_t *ptr = pkt->data, *end = pkt->data + pkt->size; - for (i = 0; i < pkt->size; i++) { - state = (state << 8) | pkt->data[i]; - if ((state == 0x1B3 || state == 0x1B6)) { - if (i > 3) { - *size = i - 3; + while (ptr < end) { + ptr = avpriv_find_start_code(ptr, end, &state); + if (state == 0x1B3 || state == 0x1B6) { + if (ptr - pkt->data > 4) { + *size = ptr - 4 - pkt->data; *data = av_malloc(*size + AV_INPUT_BUFFER_PADDING_SIZE); if (!*data) return AVERROR(ENOMEM);