From patchwork Thu Aug 23 22:17:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 10115 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp2652806jap; Thu, 23 Aug 2018 15:18:15 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ19JW59gtD65puwZMlvX2UvMA9TVc6ci8J5Qj5Oza1VwsygOttLVVxTlGqHIr7fKeXOvrw X-Received: by 2002:adf:d20a:: with SMTP id g10-v6mr5864708wri.66.1535062694939; Thu, 23 Aug 2018 15:18:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535062694; cv=none; d=google.com; s=arc-20160816; b=X6QfggZH1VCkfuOgvt1uCSo0zwfYPrAyQGjfoBSUhg0ea33XcLY+qCe42XqIk9nrd/ XtGy4ZyZ6eFe8DVoKQrUVnmetXJv2oJndVRTrZNbgnrQOLFbxKFqFJWtCjiaS6E1G0KZ 4rWUqwMvc/wS0uZo5tGZIrAeJvryBtKCmxy+6AdG2qkFoFmJ7ul7ddeVOWNWp+p8sd7o atMDm/p8G6fPdhtoF8R53jx+hWzqGWGBopvORW7xUWgTFq8gI+cICTIL7RLm86Uj5k7h +8PsUxtajImWzckTkp81fTBfJiVLgLrp3TIJX4STEaWTiota3AqFOpW0EUlZeV9oFj42 PRTw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=h8hMvXH9b78irztQs5ttpqyew68EfdWClSqz+we4kEw=; b=g0XbaGCanqg7/XT/xnXnG/+Sp4/DV3fIHshyVhfVGEsde79SKjbX5VL812t0VP6O0P WlVgKYzRdc1/6QBUx5C1w61B+kCwxQEfPzg9G8JspYRhq7A/fu9Hz+cMGgMDdtShxyxn dWmXapO7LVgtLXhWqUge1ldkZ/LcYIMxLM74lZmGUzLFAkCnuWQuv/lRBVbHu4Jb/E5e av9RXKeCe0q5/NAoeAxHLp/M+p5i9jlMjNf+1NJ6St46GbMh10m99NcrJm/etVPou1Wf qgQsjvRM89IT9YR7ZKay3vcNyQtUiH+5yWEatuUdI/ojCQc0NpAqxla0l7uYYZSGgpoR 0hKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TOH83RL1; 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 w81-v6si4632307wma.11.2018.08.23.15.18.14; Thu, 23 Aug 2018 15:18:14 -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=TOH83RL1; 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 C3E09689EE8; 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-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2AA2689CB7 for ; Fri, 24 Aug 2018 01:17:59 +0300 (EEST) Received: by mail-qt0-f193.google.com with SMTP id r37-v6so8163119qtc.0 for ; Thu, 23 Aug 2018 15:18:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=2xO8NRqGszGdw5H5gjh1vOawzbE7ScsD79GLjTLHhvk=; b=TOH83RL16jDWbln6mWF9/inEdCFN44Zacd+2QnW5I5OGDhio71djrgEg6w66Dk18og dH5UObXfgzRf+MFk6y4tGbFXs6PY96VTYtqZGUddGD+2OgPigyp4YNR93/89KALN+MQN /6oytNXM0fOKZwflJf1PMAITvOP5Big93CkT1mgTiWeDwz6qzwtsMU0dpzvDwSP6q46C ohJ65sdW5iMN8oj/774fz7e0PtNSpFRca1ytrYRKRIwHVIYP3b90V6jwAdx8I1k5ahj+ 80ZxI5byiDxJcYARHmxS7tWmlC90ca2OwWf4M+LHnhCOrPxih7REqLV3CJJNxeAFBDXR u94g== 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:in-reply-to :references; bh=2xO8NRqGszGdw5H5gjh1vOawzbE7ScsD79GLjTLHhvk=; b=fRUDLDZiut7rq1kaC5gLjKCbsusuIbzwRa/GgGHVlQD8y0tsb04RFh0YnpukfTtsUc xpYjWDKUNAa+XW96B2bMJkxHhIj/5cYyH7avxnApBWUVTcsY0NQd+7LkReXT2ZrmXQ10 MtjLiDWqEs9Nn6E38Mhu5jDOpCOjG7CGQyFaoB6wTRlD17BbEuJeBhx7Xz29QA1/nWuu n9NDYsoO12cxyzFBVbxGyCgSM87FlpBTPP94Jju9CuvEx9okOeLs3GyUMHOEY7JKoo0H UAhxF9ZV5Hwu7hi0b2iTSblHmz3h4XMdRE6MEDW9+V/wchQqLlcQFnkIYyk4UQfS0zz5 YeQg== X-Gm-Message-State: APzg51DkfmgpWcArWGYEdKiAHo9Yudn1ZH6iBMrjV1xJQgIEhFOKu5K+ nfDGmHmwcUYJGbpsey0GwznbZdyU X-Received: by 2002:ac8:18f1:: with SMTP id o46-v6mr32076505qtk.256.1535062680436; Thu, 23 Aug 2018 15:18:00 -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.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Aug 2018 15:18:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 19:17:42 -0300 Message-Id: <20180823221742.8236-2-jamrial@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180823221742.8236-1-jamrial@gmail.com> References: <20180823221742.8236-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/movenc: support Opus packets with more than 60ms of audio when writing the Sample Group Description Box 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" Fixes assertion failures when trying to mux such streams. Signed-off-by: James Almer --- libavformat/movenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8ad7026741..1b1d765f7d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2365,9 +2365,8 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track) decoded. */ if (roll_samples_remaining > 0) distance = 0; - /* Verify distance is a minimum of 2 (60ms) packets and a maximum of - 32 (2.5ms) packets. */ - av_assert0(distance == 0 || (distance >= 2 && distance <= 32)); + /* Verify distance is a maximum of 32 (2.5ms) packets. */ + av_assert0(distance <= 32); if (i && distance == sgpd_entries[entries].roll_distance) { sgpd_entries[entries].count++; } else {