From patchwork Tue Oct 13 09:10:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22916 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:3414:0:0:0:0:0 with SMTP id b20csp1645132yba; Tue, 13 Oct 2020 02:11:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzU3nhvzRfE5b30mmjrSnmUrli14nKB7yBBEyurE67qp5c/Wz4qzOpjfP+O5+dlQ/6gcAiA X-Received: by 2002:adf:9e05:: with SMTP id u5mr34301723wre.78.1602580291679; Tue, 13 Oct 2020 02:11:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602580291; cv=none; d=google.com; s=arc-20160816; b=pYkiBboovP8jd2LZBQm/cKmfxoMYXomQrNlK3YqQPreg49ZFFefc2kKhG9IgjR0RR+ hXL1WEd9ES6z80xYDR3J1Qmk90OkinpEHSL3v4oETGxD1r4RxkACD5HvOqVQyuLJSwGK GcG/bcF+hXWAj9Ekyxn74KpoQRXViW42RoMub6nJJqSjXmQvaaO7kgbTxzL5KxW511CD W8wJvV556Bay6IufkMcS+bhYOdsXTpFKVcSJUWXtbZ1obObftUBMnfC372chMcVi+lvD mhO6l3M6kRCBnoDbbbpJ6gcqU0JZUGJopC2TicvIQmH/W+MHT9CJivxUcWocml9ulyun KBJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=qJdGXY4DBmUD18ZzM++fMQ1+VT34WZQAx60vHnnKdXY=; b=B2e5E49KLQieQoQwldC54SLX/4UYsNXhO3N5oTC/DoVjAWVUGC8GRdLqFCENdQtthe mSAiovb4HphwfP7mdtUKAsXsxOtDqSt/n26ngau3FsGfJ59Z5cO41rhODbpfg8FdlLPs TwNvHZ0KNj0tcxVzHYLLLMVpV05r6nMCc8v0Djb0HCdkrf/9L0axSvA2V12rfCPQjrUC AOVdLgIkWqkE2HdCMOFmmAF5k8xWodGASUJ9qZoc2oKqG6lj0HEIiXRpaWeY30sYxOww JaLQaVwhhbJGlrpF965F9Ykg923zBRJU2GXoSnJR/bIaAWg93zP55Id3KZi6UFmwRGi7 40Hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UP8nsExB; 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=QUARANTINE 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 r2si18442911wrw.175.2020.10.13.02.11.30; Tue, 13 Oct 2020 02:11:31 -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 header.s=20161025 header.b=UP8nsExB; 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=QUARANTINE 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 D1B2A68BB72; Tue, 13 Oct 2020 12:11:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27F7C68BB54 for ; Tue, 13 Oct 2020 12:10:55 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id i1so16947019wro.1 for ; Tue, 13 Oct 2020 02:10:55 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=Q/Imau7xZsh+Yna8ZnAJuIjnxpUcnoeWg1EzfNnSc98=; b=UP8nsExB24+Ctbkw1eWxHOyv+/pJEK40PVRhkONY5sQmUmbHaQOcxWrCp/izhvN7xI fC0JQkXdPGkXLrmC7mACqp2gTTW6S62w0Ripa0BY4PG0EriVFPclq38qRpkEi6XYDgdP 7l+esy4jtQ7HbPYzH7DpI7iqp2mlwM+hPpOSGbWrUupnOzP49qnJ5JQkUh05XE5Aqwq+ gbAa+h3LJ+WtcYRH/67BoadtShSQN+NMn6QcKJj6BtPAMbC0NUqRK0GPaCFCrDOvhx+z bk19hwnLZD1Pga9DUR99uq2hzfyGSoF8gVPS2WY+GR4oVmq+KKntbag9fSArukt1+EvD MfJw== 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:mime-version:content-transfer-encoding; bh=Q/Imau7xZsh+Yna8ZnAJuIjnxpUcnoeWg1EzfNnSc98=; b=Me3s3hD8OHrRug7CZCIcgYdSpQHk4kshj+98k/+hWjc3e7OiK8VFPx5WweYBq1wQwq pU8U/JPAlmKBIyKTTid2ecYrF+ZeKGAdH7Dm/8QRgDCumSe74wLyo5sLDv6Dk7Itdrkz HJTRiBFKpZ9OjNZyy+PU/ONkbH0gF4G9jSAbO2vTsd6feKVWfiAJNJ6CNMl/CNrmjy6R YsRyHJDXsxJG8r9HESho+TQQ1R0z8WKOGYrnnIIPHr4kjdMh/UW9RZndIa1jYh8VvTCe 1AqELywi0bgPZtzysiO9TKsgRspUCBPYgN5BLsDB/IcWFuErkZByv42jXNG0ZjmrTXC5 YEUg== X-Gm-Message-State: AOAM530AkvveNzDMjBJ0jaeJOUzaODOAR4D0XvpkqwBzlRna71b916xj Tjoy095WTfMpIPpPdl0kYd3TiiY1HEc= X-Received: by 2002:adf:e8cb:: with SMTP id k11mr25527103wrn.91.1602580253967; Tue, 13 Oct 2020 02:10:53 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g83sm25913159wmf.15.2020.10.13.02.10.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 02:10:52 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Oct 2020 11:10:13 +0200 Message-Id: <20201013091017.1899676-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201013091017.1899676-1-andreas.rheinhardt@gmail.com> References: <20201013091017.1899676-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/9] avcodec/asvenc: Simplify flushing and padding packet 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qtEXoGRE1JBh Content-Length: 1399 Signed-off-by: Andreas Rheinhardt --- libavcodec/asvenc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 054ec8ee65..49df3ffbe1 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -291,12 +291,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, } emms_c(); - avpriv_align_put_bits(&a->pb); - while (put_bits_count(&a->pb) & 31) - put_bits(&a->pb, 8, 0); - flush_put_bits(&a->pb); - size = put_bits_count(&a->pb) / 32; + AV_WN32(put_bits_ptr(&a->pb), 0); + size = (put_bits_count(&a->pb) + 31) / 32; if (avctx->codec_id == AV_CODEC_ID_ASV1) { a->bbdsp.bswap_buf((uint32_t *) pkt->data,