From patchwork Mon Nov 7 02:14:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 1323 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp908325vsb; Sun, 6 Nov 2016 18:27:44 -0800 (PST) X-Received: by 10.28.66.7 with SMTP id p7mr4165059wma.64.1478485664801; Sun, 06 Nov 2016 18:27:44 -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 h194si8036224wmd.115.2016.11.06.18.27.44; Sun, 06 Nov 2016 18:27:44 -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 6E854689748; Mon, 7 Nov 2016 04:27:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C4EA689221 for ; Mon, 7 Nov 2016 04:27:31 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id p190so14130612wmp.1 for ; Sun, 06 Nov 2016 18:27:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=KRZTTdONJWXPqmN006kPBq38GrYXPcUzXSv5tiivem0=; b=YA7e4/Md9TNaS98+4jbhaZ1xENF//Ui4y1lcZ18UUJnrtoMdAUbGtkb2YvnsyENToX rIpXpOMhq+6lwzHxyUgCPgeufmEpYJuUxyKKkI8b5OxKNqXTizQam25n35jWHtMZGbfp Cv9bTLY1TyDa3LIplxkmbhSUX/TiOvd2ICdosfL8JV0NMEON9FUSjTzNuNS1BrBmLpAJ 233kO4lnkM94dUJbZc+73PjBTP8ZLuxzTNIaGqsh9daDV0sj4nJmdOOREiY80ctLMD8G l/nWfOYVZV51vSGFE5sLmen5u3DU1KZ8k2TGefdCok3aKau8480iPdTU2t2p2VJgnXYr FRWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KRZTTdONJWXPqmN006kPBq38GrYXPcUzXSv5tiivem0=; b=dCL5gWr7utsbw5cM6AFZNRCNKy/r73f03RhLOZCLwesCSt7pY4mm+Yyy/YQm2ImX6Y vmPMaTHM0PJfz33ny8CPcbeFDjoqG/AVIZKc/zX+a9j1dfdMlnC8RyIZCNIPQmNbHPcF VFk5sshBAZBxqGrDNMDQHVvwOiYczPYebw+VqqbZD3HACJLo16OgZDHaiUlsg1plOaUw uIBcjaYVVWdvMSAEEd3BpMNBS3vOXNZHz9T+ApKu9xeHM/54zwYuQZLYjVmEHbM+2UeY 0UClVsVdQRxt22O0ba+Is7iUeW5TIZVwQuXn1YgDJAgQB6zsm1+KbQB8OZldyTqCshtk 1uIg== X-Gm-Message-State: ABUngvfT9w6wwzaYT9x7ftsngVbe3mZ3b090YaxP/4a+0wlUgRwTODflMmiBc4AZc1PjLw== X-Received: by 10.194.80.99 with SMTP id q3mr4554868wjx.13.1478484844568; Sun, 06 Nov 2016 18:14:04 -0800 (PST) Received: from moonbase.lan (host86-146-197-23.range86-146.btcentralplus.com. [86.146.197.23]) by smtp.gmail.com with ESMTPSA id m1sm9104539wjk.22.2016.11.06.18.14.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Nov 2016 18:14:03 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Nov 2016 02:14:02 +0000 Message-Id: <20161107021402.24755-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.10.2 Subject: [FFmpeg-devel] [PATCH] aacenc: quit when the audio queue reaches 0 rather than keeping track of empty frames 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: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The libopus encoder does the same thing and its better than keeping track of when the empty flush frames appear. Signed-off-by: Rostislav Pehlivanov --- libavcodec/aacenc.c | 9 +++------ libavcodec/aacenc.h | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 363ed05..956e974 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -520,13 +520,13 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, int chan_el_counter[4]; FFPsyWindowInfo windows[AAC_MAX_CHANNELS]; - if (s->last_frame == 2) - return 0; - /* add current frame to queue */ if (frame) { if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) return ret; + } else { + if (!s->afq.remaining_samples || (!s->afq.frame_alloc && !s->afq.frame_count)) + return 0; } copy_input_samples(s, frame); @@ -841,9 +841,6 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, s->lambda_sum += s->lambda; s->lambda_count++; - if (!frame) - s->last_frame++; - ff_af_queue_remove(&s->afq, avctx->frame_size, &avpkt->pts, &avpkt->duration); diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index 38a9734..9d244fd 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -112,7 +112,6 @@ typedef struct AACEncContext { struct FFPsyPreprocessContext* psypp; AACCoefficientsEncoder *coder; int cur_channel; ///< current channel for coder context - int last_frame; int random_state; float lambda; int last_frame_pb_count; ///< number of bits for the previous frame