From patchwork Fri Jan 19 19:51:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7347 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp1240498jak; Fri, 19 Jan 2018 11:52:16 -0800 (PST) X-Google-Smtp-Source: AH8x227a9pwhATxMzbyfcWlBZ5xc2bdOGVS90fxn7XHdz+jKKvV1oAqLgh1J0TGqKahQFQc4Y3kC X-Received: by 10.28.239.19 with SMTP id n19mr37393wmh.20.1516391536690; Fri, 19 Jan 2018 11:52:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516391536; cv=none; d=google.com; s=arc-20160816; b=VUY1vCR2z8WmaxYszm39HcHg/5tKCxB4u/VNNpZIwPTI243bxyXZc5dvTpV8VpIExh p+pO2ZyewEe2MIj4BmytLMOuSf5zBrCFvrwavtLDsUIdimeveoAbyHtELzj0qgGMqvWZ txBiMFXWIzbYyyJi6w/w4BA6YFPczt8BeTUsdCDgrjFSfDbBiWVDXo8jQ1PK8BJu9KQG Jl33bGqq3/mtNZjhGQ2tgbyiXp+Mc+gTYayE65w0ez6gvIp3uPFzXkFgfvsXQAGXQr5e gTP7unlA+0bd+Fjc05zPA+RIzl1UUBl5W8tUIinKcY+F4HuZdM75G+zkZQlJpI83NATk bunQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=vauAfvIqLoHfPZCr2BA8dW8NRml64ZEvOh9UMm73SyA=; b=KReE4YBo1BXdJIERCsKMYfk3j0f3MA/BzgDVLL3AwhwY4sTJQbcVdAQ7XF4zEh98eC UabtiOyaJ//sk0VthauUZoEN7/RWo3U1LJTI4gvB012GAhCNsQUI1knHj2D2mZqfFVDN a2zKNLkjEuEHO59bt80D30622vluDHnvgeH9a+pU/wW6EI6xdOyHieVH8rE5MQmljoib vkUqDz9do1nNAUkRC/PQbUwafy0BKmIjhCz/aiG03SV94QFGJy7GP0bAf56r1Jfms917 WVvEGWhKdV85YBHYLJP0uTFi1ij92Oro7NfQ3pTzDPLc+2gavO9wzlYVlgwVlrrsO3EM 3cIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mJri1U/a; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v52si8404053wrc.83.2018.01.19.11.52.13; Fri, 19 Jan 2018 11:52:16 -0800 (PST) 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 header.s=20161025 header.b=mJri1U/a; 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 8754A689E04; Fri, 19 Jan 2018 21:52:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9018689DE7 for ; Fri, 19 Jan 2018 21:52:04 +0200 (EET) Received: by mail-qt0-f193.google.com with SMTP id f4so6640736qtj.6 for ; Fri, 19 Jan 2018 11:52:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=7ALnsnE3Osvukjvc61K3p2xPI5ZxBqdP+nfrEEekb9c=; b=mJri1U/anx97yLHpv5jdWYkUeXpT87rrVKjboZYGZgGGLXan1YnQuwvY82aFccs3hZ aLAzFleaw7JtSDUwvM0flWxpT11DBw5UtQSt1Ha3JWuQIb0eElCnUsEOA2BvilhRIWp4 96mw5czi+dzoRZ3AwAnX3g2PUsS5VL5vbksa6W9KpTdvPyOLGM5KlbnzA4JmExwvL6uC Mi3A+kZ7Ks6c+ib3Lk4GCq9ip7u+nvZ5bsikjP699C9kdZ1OHLHIqVBhLcGAFATMOLek eww6PakVcYNe37WeyVXj6lSf6hVEGX7mIVD0dY4Mbypc9JsJIh4raB5Y2VULpJFbVHAQ dkyg== 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=7ALnsnE3Osvukjvc61K3p2xPI5ZxBqdP+nfrEEekb9c=; b=fAzHqEXqGKmLntIFT8z/WVq/+oJM2GpQmhdCqG4923/zw/F17JzeFQGBl3dqKD4n6g 6R4u3cZta8CoFVqA78n8tnT3VGDJxZFlnmYl1ooOtIRrPCoCIfc8P/ri+2raYzCyd2P5 qN/qQSJgsDjAdQ0b6hSBxjsPiKYe78/zBsCycChgmUt0JeEFeUdInk8WAt6spMaW84gt 7TVjEEhSm3CP7zpHpJOpF0f5uvKU+YqKmx8SClmMawG1N43wA7vc8D09hQCUVu71lgNn BaxOJbhzVe4S2dCemkQ2NjNiWgXxGszftvb4wkW55AwSdKgxr6WHcMvLpey5/vMMwqvd fvKw== X-Gm-Message-State: AKwxytcN0/9gaOwzVhBvDd5OtX+KfEDqR85B9Bupq0ggDY2N4RC3JD8P lCYhQhehv/6hSb9tseXOvavpQg== X-Received: by 10.55.183.1 with SMTP id h1mr6489228qkf.119.1516391524274; Fri, 19 Jan 2018 11:52:04 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id i145sm6551764qke.86.2018.01.19.11.52.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Jan 2018 11:52:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Jan 2018 16:51:45 -0300 Message-Id: <20180119195145.6192-1-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/mlp_parser: don't try to combine frames when full frames are provided 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" Attempting full frame reconstruction is unnecessary for containers like Matroska, so just skip it altogether. Signed-off-by: James Almer --- libavcodec/mlp_parser.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 3c0330f777..4827354f18 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -256,6 +256,9 @@ static int mlp_parse(AVCodecParserContext *s, if (buf_size == 0) return 0; + if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { + next = buf_size; + } else { if (!mp->in_sync) { // Not in sync - find a major sync header @@ -315,6 +318,7 @@ static int mlp_parse(AVCodecParserContext *s, } mp->bytes_left = 0; + } sync_present = (AV_RB32(buf + 4) & 0xfffffffe) == 0xf8726fba;