From patchwork Tue May 30 17:28:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Jones X-Patchwork-Id: 3766 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp1991824vsk; Tue, 30 May 2017 10:28:19 -0700 (PDT) X-Received: by 10.28.145.73 with SMTP id t70mr2417741wmd.88.1496165299627; Tue, 30 May 2017 10:28:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496165299; cv=none; d=google.com; s=arc-20160816; b=gFI5e9QhZrwM8MrXWIbGrkba/xFmgrKuJihxjoaI6RVmb2qpM7mJ1MndOT4NFcCwKu B9HsWRrGLOHMWi3tdy1XckrvkjZ98l0aGVfQSWprH3oOf0L9SQRJ1P1K78F4baXsPGuw TLQeei4/g9n0tyB0LugCP7BQkn/bslE0nWVopKJi6cYt+uXce6zCnmYoCc7srYs1EsnV PEgQgwVaI1pahNEcOsLYCdx1kypUpsjsnWd+vsW3+URG62oDoihYkFOznNXoy33HkbQc xQt62GcQavSvgQ8UrOZzHPi1gPjjKnp4qo/f34wgdYJfadzcwHzV8NO8woxy/UkfXw4j WMnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:to:from:date:dkim-signature:delivered-to :arc-authentication-results; bh=PJarWsfxJiNrwwWmzR3fOJMaBu8WAo+wnxB5BMEWGV8=; b=a+FCLRTF4OOUL2FRcpWEpOf6V5x6ApSl64ah3trIGtDgXKv07oVUJjzNPwYNlcoC2e tUHqy5Ci3VQruRHM728jLNdYHBq9UcLtzwS5d0MimfGT8qtq2aKrKhSKDHviG8Az5Ghh d/D+XKQxM41+hE0GriCjZ0UPDEym9NSb15hhUVKUQlk/jFv2rF8tmzMb+daSJAI3AidD F6YVUqs0QPb1DVFr/JwI4bseMsttcN/rVAHnolp7rEFbpamtljnphsWi2o+Es3DEctLh jJzGbyXtflx8VMZeXxzrqYc9ZWLTJBAyPCljFKieKPO6k5Akvgxf4DzPtYc4uld1mBPc rFDw== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o40si15608690wrc.80.2017.05.30.10.28.18; Tue, 30 May 2017 10:28:19 -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 2FCCD6883B7; Tue, 30 May 2017 20:28:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4FB976882CF for ; Tue, 30 May 2017 20:28:05 +0300 (EEST) Received: by mail-pf0-f180.google.com with SMTP id m17so78175298pfg.3 for ; Tue, 30 May 2017 10:28:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=hntjewftmqTBpZaaSYjRDxPykZ6VKHY2GvQg+KchFF0=; b=BhnWGzL3vdfZ3VtD+zkIEL+OWXoM5ZATX+uJY98hlTpt4oRcJvrSz/PhZvJ46wB+p4 cg6JQu6bHgLdZlwi+xWbV9paX47ADIp2/tKbCQXhUvyhPGLqXVmKTs63GvpZudSNRNcu Nnmsr4sLkrX1nFZqPQARx/GbxusuxBYElMAfBCZ9T+0Fwxvt84XvhNNAmXdkRpUXRnL1 +j3bxSw4mWIewmVIOuzIoXKwgOneCAlpDJvZSLRJIqEbXGoTZWzCXgUVsJzUa7Q1m2To OsrfMliIrM7gvDJQgRWtZFzNn6vDGXTM5467KNhcg958b1oyJhEUPbEpUs3HNJpFcZ31 rvjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=hntjewftmqTBpZaaSYjRDxPykZ6VKHY2GvQg+KchFF0=; b=LszfeBpapA2EqJwwSzAar0MvY0vFoiLd6vYWhfeADWcXoT84PAHkcsRclVFOobOq5V VB/jH3uSJegMA/S4GjiC8AFZuya+tctwP+/z+CiFUOsnabAFkX3GBtl8RtU/vzmbkbPj PLX3jKGsHlNmpsRjdFuOqF0XjujCEDKoKNfZp2TG061aIcLrrd8UqylRk3fUn/NvixnO DxWVfp3J/6usIrE0FWDSCA10nSVoifsMppazPfst/tL1mATVOIDYeEy+pxsMljG0Camj +/3gm5LC/KhaAHsdqjEhQok3LGr9InUS3lOWd8Ahh1E7tmcSoXf7UcuM6oHM0UjQdxjb jRdg== X-Gm-Message-State: AODbwcA1Qs/EWSYdXI8q/H5LWtZCgx+QtKg3lPF9ByXC2ybMeVTsKg2j FzxA+osEne569VAp X-Received: by 10.98.212.18 with SMTP id a18mr25369732pfh.28.1496165287865; Tue, 30 May 2017 10:28:07 -0700 (PDT) Received: from tdjones879 (host-184-167-177-46.csp-wy.client.bresnan.net. [184.167.177.46]) by smtp.gmail.com with ESMTPSA id r64sm21610761pfr.38.2017.05.30.10.28.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 May 2017 10:28:06 -0700 (PDT) Date: Tue, 30 May 2017 11:28:04 -0600 From: Tyler Jones To: ffmpeg-devel@ffmpeg.org Message-ID: <20170530172804.GA20204@tdjones879> MIME-Version: 1.0 User-Agent: Mutt/1.5.24 (2015-08-30) Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/vorbisenc: Include bufqueue and afqueue 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/vorbisenc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 2974ca2..fdce864 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -33,6 +33,9 @@ #include "vorbis.h" #include "vorbis_enc_data.h" +#include "audio_frame_queue.h" +#include "libavfilter/bufferqueue.h" + #define BITSTREAM_WRITER_LE #include "put_bits.h" @@ -110,6 +113,9 @@ typedef struct vorbis_enc_context { float *coeffs; // also used for residue after floor float quality; + AudioFrameQueue afq; + struct FFBufQueue bufqueue; + int ncodebooks; vorbis_enc_codebook *codebooks; @@ -1158,6 +1164,8 @@ static av_cold int vorbis_encode_close(AVCodecContext *avctx) ff_mdct_end(&venc->mdct[0]); ff_mdct_end(&venc->mdct[1]); + ff_af_queue_close(&venc->afq); + ff_bufqueue_discard_all(&venc->bufqueue); av_freep(&avctx->extradata); @@ -1190,6 +1198,8 @@ static av_cold int vorbis_encode_init(AVCodecContext *avctx) avctx->frame_size = 1 << (venc->log2_blocksize[0] - 1); + ff_af_queue_init(avctx, &venc->afq); + return 0; error: vorbis_encode_close(avctx);