From patchwork Fri Jan 19 19:55:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7348 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp1243625jak; Fri, 19 Jan 2018 11:56:02 -0800 (PST) X-Google-Smtp-Source: AH8x226R5DUjeHuq9iV481+epBtePcSkKtfc/OrJDAsgsjsfIrQpYehfPIerGigtY9I1khqLBqXi X-Received: by 10.28.130.84 with SMTP id e81mr27865wmd.15.1516391762834; Fri, 19 Jan 2018 11:56:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516391762; cv=none; d=google.com; s=arc-20160816; b=H3SiouaeSWdUZY+PQtToxf1kkpYUZEn8oaNTIkPJGoYMSbnVAXaCUuH7FaEk9nUkMb SfC8NrBMm/HzO/tlD8Us0dEC6rP/T2aBFX7dUK/cVWwu11HfdwrqXtrEUTh0ztxHnnG2 Csa1OqdUGEbLnu+mlnsRT0BraqxziKfR5W/SPAIxodA7wOKpzwxtqQ1VNHUUIL7xTM1v M0wKNwBeWdia0/xBHsTp/0KTqR/aJUOa+LYlptAHpInbIUfAaQsvMfWxBZKhbeBEK6Zf 59HiGf1f74QegWnCzyLNq9tSGgukbBi0TZi2S7G+lqww5Cm3XrNxL22bg8SD+jDL1Hjj Wbig== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=auYQOEBu/FG77wxn5Qlm+m1GFY7TdLsE2PLE8mBAhdQ=; b=hn/XT4LxYb0qa9aehOtXYEkytB8dsdBGPmktCudrVtyRr2h2zeBXcGUwK3dpJJ87T4 7zvp4Fe0x/ew3Sx/y1r4lvi1z1pMJnZa6rq7sg0dU7NGiH/MKK0JaKdPqQRuLvPwg/nU DmmjeJWgQ9p+B07gBScs5Le0dUQ9Erg4El4DiCnobGMX5dxMOaW4xbaX51Dtw98jBLin z7HWR9E/PBHUXommZKht1BW18CWU0bJnCrrCIQBqocrPdSz6QORcZeZwqgVcmyfJExkG RB5j0piwtMQdogiez5Ng1Wr2EVUHDPX9CWyeZrrPmXV1BMuWnw43GEpOosXBEBRNlyYy eXRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=vGfvbu5J; 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 q5si9666925wrg.10.2018.01.19.11.56.02; Fri, 19 Jan 2018 11:56:02 -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=vGfvbu5J; 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 A70A8689EA6; Fri, 19 Jan 2018 21:56:00 +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 AAA85689E04 for ; Fri, 19 Jan 2018 21:55:53 +0200 (EET) Received: by mail-qt0-f193.google.com with SMTP id z10so6661106qti.5 for ; Fri, 19 Jan 2018 11:55:54 -0800 (PST) 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=YZTB/ET9rSxRTvjTZoeNWJsdAr/T96KqOEfhP3kef3A=; b=vGfvbu5J0k9DZY2OfsmhZpKCDrfIH9x2X5U77OQA2bHRfr+bwFf6Zg+FSvNml1YrXU F9RMgocgMpax7P1HJLNQWQlCsCXER01HMX1bXq9xHsFcVloaPZKDKOcaJkzlyK5U94IG IKw7A0Y37QO8g80ES40Aja+E2Ie4ELsivuhXbELQ+m+LQ48PfO++iCDYeSkpvWZqPjHc nznVHOcYnuzGuDDm/ZAXQ9UNhGNQHexPaUlw413fRZ4JeUUZF+IIrXmMzmDZwR81WkU9 ywxESm72NHgiXkcSZZ/Wh9RdZyCkuTSGmhspP9cl/65G+fcIP0vWZd0GH46CFoY3U3ES FI2g== 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=YZTB/ET9rSxRTvjTZoeNWJsdAr/T96KqOEfhP3kef3A=; b=YOItaLCNRoY1Ibi+KrAIORyVqqf2ngNUHr2jWhSCD8p5zv/ysR5XUVhRWLcMMmNf9P 4u+d2ykQ/l/1sRRsz9gm/hLMmqfuzvxxajXDdAuPViK+kpJdc6IjGuWU5v7X/wXraYbr Hzk+bEG/gBiHTa/fnK55oNoMiK+CTT2gtoiP+tCvsr+Sx0g0aFlfw0vx4TEYCpqAFKMv 8APte/1NYybzUfhSWgM70dSUhgm5r2KAe2VWzh1PHCVT4LKZQBnEou0I68RJLE8besGc dL0xdRTKan9qyX/ca/zB3/LJuqYOslHV2jzSnj8S4wHgZEiBsqLeroiVHk0jaVO+clvF duAw== X-Gm-Message-State: AKwxytd9K7UNRt82n3kiWD6bDkha5ZAPgT1lJCSodVd9+0nL1mPWDcqc gDFa8NJnvQMel+is+O6q8X0ieA== X-Received: by 10.237.54.231 with SMTP id f94mr68696283qtb.322.1516391753314; Fri, 19 Jan 2018 11:55:53 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id n3sm6600296qte.14.2018.01.19.11.55.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Jan 2018 11:55:52 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Jan 2018 16:55:38 -0300 Message-Id: <20180119195538.1660-1-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20180119195145.6192-1-jamrial@gmail.com> References: <20180119195145.6192-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/mlp_parser: reindent after last commit 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" Signed-off-by: James Almer --- libavcodec/mlp_parser.c | 92 ++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 4827354f18..185bd4d667 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -259,65 +259,65 @@ static int mlp_parse(AVCodecParserContext *s, if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { next = buf_size; } else { - if (!mp->in_sync) { - // Not in sync - find a major sync header - - for (i = 0; i < buf_size; i++) { - mp->pc.state = (mp->pc.state << 8) | buf[i]; - if ((mp->pc.state & 0xfffffffe) == 0xf8726fba && - // ignore if we do not have the data for the start of header - mp->pc.index + i >= 7) { - mp->in_sync = 1; - mp->bytes_left = 0; - break; + if (!mp->in_sync) { + // Not in sync - find a major sync header + + for (i = 0; i < buf_size; i++) { + mp->pc.state = (mp->pc.state << 8) | buf[i]; + if ((mp->pc.state & 0xfffffffe) == 0xf8726fba && + // ignore if we do not have the data for the start of header + mp->pc.index + i >= 7) { + mp->in_sync = 1; + mp->bytes_left = 0; + break; + } } - } - if (!mp->in_sync) { - if (ff_combine_frame(&mp->pc, END_NOT_FOUND, &buf, &buf_size) != -1) + if (!mp->in_sync) { + if (ff_combine_frame(&mp->pc, END_NOT_FOUND, &buf, &buf_size) != -1) + av_log(avctx, AV_LOG_WARNING, "ff_combine_frame failed\n"); + return buf_size; + } + + if ((ret = ff_combine_frame(&mp->pc, i - 7, &buf, &buf_size)) < 0) { av_log(avctx, AV_LOG_WARNING, "ff_combine_frame failed\n"); - return buf_size; - } + return ret; + } - if ((ret = ff_combine_frame(&mp->pc, i - 7, &buf, &buf_size)) < 0) { - av_log(avctx, AV_LOG_WARNING, "ff_combine_frame failed\n"); - return ret; + return i - 7; } - return i - 7; - } + if (mp->bytes_left == 0) { + // Find length of this packet - if (mp->bytes_left == 0) { - // Find length of this packet - - /* Copy overread bytes from last frame into buffer. */ - for(; mp->pc.overread>0; mp->pc.overread--) { - mp->pc.buffer[mp->pc.index++]= mp->pc.buffer[mp->pc.overread_index++]; - } + /* Copy overread bytes from last frame into buffer. */ + for(; mp->pc.overread>0; mp->pc.overread--) { + mp->pc.buffer[mp->pc.index++]= mp->pc.buffer[mp->pc.overread_index++]; + } - if (mp->pc.index + buf_size < 2) { - if (ff_combine_frame(&mp->pc, END_NOT_FOUND, &buf, &buf_size) != -1) - av_log(avctx, AV_LOG_WARNING, "ff_combine_frame failed\n"); - return buf_size; - } + if (mp->pc.index + buf_size < 2) { + if (ff_combine_frame(&mp->pc, END_NOT_FOUND, &buf, &buf_size) != -1) + av_log(avctx, AV_LOG_WARNING, "ff_combine_frame failed\n"); + return buf_size; + } - mp->bytes_left = ((mp->pc.index > 0 ? mp->pc.buffer[0] : buf[0]) << 8) - | (mp->pc.index > 1 ? mp->pc.buffer[1] : buf[1-mp->pc.index]); - mp->bytes_left = (mp->bytes_left & 0xfff) * 2; - if (mp->bytes_left <= 0) { // prevent infinite loop - goto lost_sync; + mp->bytes_left = ((mp->pc.index > 0 ? mp->pc.buffer[0] : buf[0]) << 8) + | (mp->pc.index > 1 ? mp->pc.buffer[1] : buf[1-mp->pc.index]); + mp->bytes_left = (mp->bytes_left & 0xfff) * 2; + if (mp->bytes_left <= 0) { // prevent infinite loop + goto lost_sync; + } + mp->bytes_left -= mp->pc.index; } - mp->bytes_left -= mp->pc.index; - } - next = (mp->bytes_left > buf_size) ? END_NOT_FOUND : mp->bytes_left; + next = (mp->bytes_left > buf_size) ? END_NOT_FOUND : mp->bytes_left; - if (ff_combine_frame(&mp->pc, next, &buf, &buf_size) < 0) { - mp->bytes_left -= buf_size; - return buf_size; - } + if (ff_combine_frame(&mp->pc, next, &buf, &buf_size) < 0) { + mp->bytes_left -= buf_size; + return buf_size; + } - mp->bytes_left = 0; + mp->bytes_left = 0; } sync_present = (AV_RB32(buf + 4) & 0xfffffffe) == 0xf8726fba;