From patchwork Tue Dec 20 22:23:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ronald S. Bultje" X-Patchwork-Id: 1872 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1944070vsa; Tue, 20 Dec 2016 14:29:07 -0800 (PST) X-Received: by 10.28.150.69 with SMTP id y66mr1914528wmd.107.1482272947396; Tue, 20 Dec 2016 14:29:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g2si21055865wmc.50.2016.12.20.14.29.05; Tue, 20 Dec 2016 14:29:07 -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; 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 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 00CB768A1FC; Wed, 21 Dec 2016 00:29:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 897DB689E75 for ; Wed, 21 Dec 2016 00:28:56 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id t184so6411681qkd.1 for ; Tue, 20 Dec 2016 14:28:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ScQAZXAiBRU4W/LyHIYfuFvsb887cJGwRjn7+g6Z6Qk=; b=vgP9i/NMzvs3j4FpGKXHhqdWWwq7LGR4VoKvvev0tb2JukUr5Mpa+gD5JElshyGV9M v2UCt5pxzT5K3qUSvpslMNoY9/5+puyUWOCvbngsCwj0yFQedyk6zT0+mmB12lgQHBVP WfS13tuqFnB1ljqcYDrZbG1okhEmjt3GlKJRXqJGz3d19C1avSmY3FqQi3tkJzSxq7hB 0qXwYJ4xGndoY+ftIL8BBa7T4MSYvWuP1fRs/GL9TPoU7T0/BIuaSvd2ZmFIiTl2NsRK DPJLoUvh9367uv4mbZeITBe/hsUNCy5ga4j91ttCR6mcfnKUEHPUQKvfaJ4I2scNgK2x 0VKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ScQAZXAiBRU4W/LyHIYfuFvsb887cJGwRjn7+g6Z6Qk=; b=P2Ng49UxgsJ/hkdQa4N+pL5QPb6ST2pgul95Zq6bJ3VUDuNXLmMGd+MvYEvacPjb1E Ij2+I0KKR31Wbaj32vPrwwkKSieZzIIF8LG15T7Je6sOhkjC6DAZJieOFEnLfcoJ4vBR of024PXZjpoFnE2wJbEseBx1E1hFZLOnq4td5qOCkBZ1MBf6nAawNZluCWKewUBpqRH/ pL2tFBR05uISBY36XV5fH5KQxtX5K848Z6XyzIYHvM1Tuxe73qUxkhp4FFzDNjNcw6ni H56lTuYQda26fD/vrPKpJlH/RvLXnGgUp53Z90P5gFhaXlHUGS6/gwl9nxTaOja1Tib/ fD5Q== X-Gm-Message-State: AIkVDXLxIG+YCRx6eruuiuNt0n8qz5FapUNvfa2JX7RLvRa4tC2C3r1KmcCu4GAG6WkI7A== X-Received: by 10.55.24.76 with SMTP id j73mr1711623qkh.267.1482272593680; Tue, 20 Dec 2016 14:23:13 -0800 (PST) Received: from localhost.localdomain ([65.206.95.146]) by smtp.gmail.com with ESMTPSA id q88sm3594813qkq.21.2016.12.20.14.23.13 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 20 Dec 2016 14:23:13 -0800 (PST) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Dec 2016 17:23:07 -0500 Message-Id: <1482272588-20810-3-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1482272588-20810-1-git-send-email-rsbultje@gmail.com> References: <1482272588-20810-1-git-send-email-rsbultje@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] wmavoice: reindent. 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 Cc: "Ronald S. Bultje" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/wmavoice.c | 72 +++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index ae100fb..f31c9d2 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1915,29 +1915,29 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data, /* If the packet header specifies a s->spillover_nbits, then we want * to push out all data of the previous packet (+ spillover) before * continuing to parse new superframes in the current packet. */ - if (s->sframe_cache_size > 0) { - int cnt = get_bits_count(gb); - copy_bits(&s->pb, avpkt->data, size, gb, s->spillover_nbits); - flush_put_bits(&s->pb); - s->sframe_cache_size += s->spillover_nbits; - if ((res = synth_superframe(ctx, data, got_frame_ptr)) == 0 && - *got_frame_ptr) { - cnt += s->spillover_nbits; - s->skip_bits_next = cnt & 7; - res = cnt >> 3; - if (res > avpkt->size) { - av_log(ctx, AV_LOG_ERROR, - "Trying to skip %d bytes in packet of size %d\n", - res, avpkt->size); - return AVERROR_INVALIDDATA; - } - return res; - } else - skip_bits_long (gb, s->spillover_nbits - cnt + - get_bits_count(gb)); // resync - } else if (s->spillover_nbits) { - skip_bits_long(gb, s->spillover_nbits); // resync - } + if (s->sframe_cache_size > 0) { + int cnt = get_bits_count(gb); + copy_bits(&s->pb, avpkt->data, size, gb, s->spillover_nbits); + flush_put_bits(&s->pb); + s->sframe_cache_size += s->spillover_nbits; + if ((res = synth_superframe(ctx, data, got_frame_ptr)) == 0 && + *got_frame_ptr) { + cnt += s->spillover_nbits; + s->skip_bits_next = cnt & 7; + res = cnt >> 3; + if (res > avpkt->size) { + av_log(ctx, AV_LOG_ERROR, + "Trying to skip %d bytes in packet of size %d\n", + res, avpkt->size); + return AVERROR_INVALIDDATA; + } + return res; + } else + skip_bits_long (gb, s->spillover_nbits - cnt + + get_bits_count(gb)); // resync + } else if (s->spillover_nbits) { + skip_bits_long(gb, s->spillover_nbits); // resync + } } else if (s->skip_bits_next) skip_bits(gb, s->skip_bits_next); @@ -1949,20 +1949,20 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data, *got_frame_ptr = 0; return size; } else if (s->nb_superframes > 0) { - if ((res = synth_superframe(ctx, data, got_frame_ptr)) < 0) { - return res; - } else if (*got_frame_ptr) { - int cnt = get_bits_count(gb); - s->skip_bits_next = cnt & 7; - res = cnt >> 3; - if (res > avpkt->size) { - av_log(ctx, AV_LOG_ERROR, - "Trying to skip %d bytes in packet of size %d\n", - res, avpkt->size); - return AVERROR_INVALIDDATA; + if ((res = synth_superframe(ctx, data, got_frame_ptr)) < 0) { + return res; + } else if (*got_frame_ptr) { + int cnt = get_bits_count(gb); + s->skip_bits_next = cnt & 7; + res = cnt >> 3; + if (res > avpkt->size) { + av_log(ctx, AV_LOG_ERROR, + "Trying to skip %d bytes in packet of size %d\n", + res, avpkt->size); + return AVERROR_INVALIDDATA; + } + return res; } - return res; - } } else if ((s->sframe_cache_size = pos) > 0) { /* ... cache it for spillover in next packet */ init_put_bits(&s->pb, s->sframe_cache, SFRAME_CACHE_MAXSIZE);