From patchwork Thu Aug 23 22:17:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 10114 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp2652714jap; Thu, 23 Aug 2018 15:18:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYmm8+ycCKT4dPc+DM3Kujypx9+I7lBM+yoy7FNU3DqH5CwOdQSpVBPgwIRUrx0Gt1aGok+ X-Received: by 2002:adf:aa06:: with SMTP id p6-v6mr6469075wrd.56.1535062688172; Thu, 23 Aug 2018 15:18:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535062688; cv=none; d=google.com; s=arc-20160816; b=RWzb2iUGt9UvLauaQXm44pClimKTW3Ionh7BjY6Ek0Nx/HaK0wSeE6EhcTKB2x1ojX JU2MFcO0sBZ1idxWW20wnaPpzu1Qrw45Ki5gXJkQdTpPvUDqvfeF5EcXJkEMyzXaJ9el frzcESfUHPeeMJuIP4yysj3wKXrlM8pKYI2Krdc/TLAEeIGjbyG0KbUbFNoC7fnwC99s 6xn4oR+mdXoz7LPIxSbtRbH+9ZHp2aUOIguaixkGvAqKS4OBHK13mpA80fPtZaieD/5y sx1Z4TD4gngtVjfY/6Mjwv9hKjjxlTWYtf01D8Lm5xYi6Mmm1ziZMNYyF2eAzHAxxAaP ut2Q== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=IPxVZv7aAX7k/zpCXvA4w+YPNOdEwQk/++SvBg6/KE4=; b=t9bVSMcWn+rHAz+bz5Fj7mXAnp8Eu20ktqViYrP2v8B8w2QKfJ5r0Qnh3PBRqxPg2+ PQL1gVn3yQAmZKEEhMX2jVB/Fwv455PgOcqa9O3lx0YFD9kCbwz3NOAJbnq9Fhc9LDEt IywvQonuS1Ow4yVUUIc8mqvZdWjcbRjgZnRJeIT93zoj8gP3Glos8oFCL6v8WPaDPD4X E74741mj58gSisFt9Is+1C/j9xsIVwp2XPCNY6n608gGTtTAQi+JNOCupBTs+5DDmkRk x3W6Pmmns+EEGO9jVE1xpyKsUSi7WDoktGOkAOXXeLtqRllN1oewIYAK3D604VSreoFl d1fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=X5DnoTJa; 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 y124-v6si4360720wmy.141.2018.08.23.15.18.07; Thu, 23 Aug 2018 15:18:08 -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=X5DnoTJa; 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 11C8F689EE6; Fri, 24 Aug 2018 01:18:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEB3C689B10 for ; Fri, 24 Aug 2018 01:17:58 +0300 (EEST) Received: by mail-qk0-f195.google.com with SMTP id 130-v6so4684317qkd.10 for ; Thu, 23 Aug 2018 15:18:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Sf6PZpcCyyKA1Q9kjTp7YZ+N08nISS2CyStA/1a/2tA=; b=X5DnoTJa9N9zdLIMNmcCPEJibvWY7ctNuj65yqFm/g53QsVGiIKyh5JwbgsbMxHwbu CJHXAnpYfEamA0vfSNBPaS0NPz/tPlvvVWbDweHWDKlOvaTqbd66zQx6qMcXlaUHnC94 8rvTDcaGDWP0cCNAs9peKGDQGk7bLFScjn4wf44+hROEBOmVCUF6BQqYIf69j3/1AM5c 00vpjeKPTAWxm7EKEimVdLDHv9ciBKywjD6jvZqK8y1XzUn8MTiUPpeojBhrvuhqo+i/ ouBot2EK7e4HLN+KY+mcp0URBXiJHngPa7ho9+YymCRaZvPrR4UjSq9ygBQjrS8hj2jG 95LA== 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; bh=Sf6PZpcCyyKA1Q9kjTp7YZ+N08nISS2CyStA/1a/2tA=; b=pP1/ENqevntE0sDrPVc/wRMHKODfQ/auZhanvlm7i0/zeds4RnKGnZEfl/1Kw4kxGc TSpKpRxJ5KUHq6w+LikUYE1ibEqcnufCUkg/18/bg9ou98tXpwgS8OZjLwRmiIvfu9BT XKhm9sZ0RL/e15v8P96pqYBBNyH7Qh2v3/vb3jZOmFqg3PudD9qdw7DYVzWQxPsWYGvs twnU6+EWPZzdwDeoOgMTiINM4PO1nMIVVxbNf0+YxPOuZ4E7EqZQ4rKkfTxLaAE6YJBc 8JzrleXxKEt0BPCH6lxOIODMmyYX2R2/ltpJh7Gafjmc5zr4ZFS44nLyo+mRbkDlQbNS eRdg== X-Gm-Message-State: AOUpUlFpYqC+qjVMwE8caZdw0m5hMr/oaBG8PhnHNPJIYX0UvWayWQI9 mJDwxS3WnOMNNJ/ozjj2l4MkcP1J X-Received: by 2002:a37:6ac3:: with SMTP id f186-v6mr59892400qkc.224.1535062679420; Thu, 23 Aug 2018 15:17:59 -0700 (PDT) Received: from localhost.localdomain ([181.231.186.237]) by smtp.gmail.com with ESMTPSA id x40-v6sm3895762qtj.97.2018.08.23.15.17.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Aug 2018 15:17:59 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 19:17:41 -0300 Message-Id: <20180823221742.8236-1-jamrial@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libopusenc: support encoding packets of sizes bigger than 60ms 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" Packets of sizes 80ms, 100ms and 120ms can be encoded since libopus 1.2 Signed-off-by: James Almer --- libavcodec/libopusenc.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 4ae81b0bb2..7c025a66d7 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -271,12 +271,22 @@ static av_cold int libopus_encode_init(AVCodecContext *avctx) case 960: case 1920: case 2880: +#ifdef OPUS_FRAMESIZE_120_MS + case 3840: + case 4800: + case 5760: +#endif opus->opts.packet_size = avctx->frame_size = frame_size * avctx->sample_rate / 48000; break; default: av_log(avctx, AV_LOG_ERROR, "Invalid frame duration: %g.\n" - "Frame duration must be exactly one of: 2.5, 5, 10, 20, 40 or 60.\n", + "Frame duration must be exactly one of: 2.5, 5, 10, 20, 40" +#ifdef OPUS_FRAMESIZE_120_MS + ", 60, 80, 100 or 120.\n", +#else + " or 60.\n", +#endif opus->opts.frame_duration); return AVERROR(EINVAL); } @@ -463,10 +473,10 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt, memset(audio, 0, opus->opts.packet_size * sample_size); } - /* Maximum packet size taken from opusenc in opus-tools. 60ms packets - * consist of 3 frames in one packet. The maximum frame size is 1275 + /* Maximum packet size taken from opusenc in opus-tools. 120ms packets + * consist of 6 frames in one packet. The maximum frame size is 1275 * bytes along with the largest possible packet header of 7 bytes. */ - if ((ret = ff_alloc_packet2(avctx, avpkt, (1275 * 3 + 7) * opus->stream_count, 0)) < 0) + if ((ret = ff_alloc_packet2(avctx, avpkt, (1275 * 6 + 7) * opus->stream_count, 0)) < 0) return ret; if (avctx->sample_fmt == AV_SAMPLE_FMT_FLT) @@ -534,7 +544,7 @@ static const AVOption libopus_options[] = { { "voip", "Favor improved speech intelligibility", 0, AV_OPT_TYPE_CONST, { .i64 = OPUS_APPLICATION_VOIP }, 0, 0, FLAGS, "application" }, { "audio", "Favor faithfulness to the input", 0, AV_OPT_TYPE_CONST, { .i64 = OPUS_APPLICATION_AUDIO }, 0, 0, FLAGS, "application" }, { "lowdelay", "Restrict to only the lowest delay modes", 0, AV_OPT_TYPE_CONST, { .i64 = OPUS_APPLICATION_RESTRICTED_LOWDELAY }, 0, 0, FLAGS, "application" }, - { "frame_duration", "Duration of a frame in milliseconds", OFFSET(frame_duration), AV_OPT_TYPE_FLOAT, { .dbl = 20.0 }, 2.5, 60.0, FLAGS }, + { "frame_duration", "Duration of a frame in milliseconds", OFFSET(frame_duration), AV_OPT_TYPE_FLOAT, { .dbl = 20.0 }, 2.5, 120.0, FLAGS }, { "packet_loss", "Expected packet loss percentage", OFFSET(packet_loss), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 100, FLAGS }, { "vbr", "Variable bit rate mode", OFFSET(vbr), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 2, FLAGS, "vbr" }, { "off", "Use constant bit rate", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FLAGS, "vbr" },