From patchwork Thu Jul 29 21:06:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29117 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp6132185ios; Thu, 29 Jul 2021 14:07:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygE4SkC+SG4NFTc15u4OB92JUkSTqTQX1pEEYxoc+0PAGhqKolNhPCIFBZlVoKX+pH7hQb X-Received: by 2002:a17:906:c836:: with SMTP id dd22mr6356820ejb.3.1627592860275; Thu, 29 Jul 2021 14:07:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627592860; cv=none; d=google.com; s=arc-20160816; b=axwEj1JsEpb+7fp9iFBvfvRThXYNtoaLwyg+nwk+28wwcfKLGyliCra0sReAkcfUAW 16ms4024TmL2K4si7em6qMtG9ldG3XRO3MsxiWRwaf98Ufnq/ECnsriYyrE9XM4G3l3Z sJvSo9/XTVq1WBZXrsXL5+56IxDgZWpe1NrXIzM4nMoF9Z0GAVSpoK7Hkl3Q+53Liuco ph6GkgaVHZFkI/R7dKLSuo3Dw60OIiJOwC22B1/AkEt+Ko7z99L2ktCmilAa0SpuKT7I v0+Aai2lAZqewEXgQkaE+VKG7z7MeUMilqJOxn3681JDhsvrJGQhb8xdDosi8Z6hQIlT KAAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=K1y82aqsVwKPaopLCRqJpufyHKgbEOJublwpbN2NwWg=; b=g/5jn5+q2ZJDJHipWrz2A+AEhLyAgMNd/11GjeyKc9qRdnIGA98wFT0+67q4XZHWOR t9S6gjl4Y8QVDhTPe0UIHqhg44hbxdRsNi8AqJk7ryrLui9tX7mOp0U8LUPhnXLpmcJS pA3ObiPCvTGN21stkMrApLXTkZGr7ayC6FywBVAXwel+yQ01H8yhKLjWVbth0Q8qTgr6 d1+LpgwpQVdjMOrhWVubiEU/7mmAF0okRc0KqxqveZHrN8WR2AT6KYZu+368RmcWgexr I2azbMCAVSApkPNfVAOkrLQiJ/ydafUVqnLVFOAOh0uRzpDFS6gOgv7Zn43H2IhpZQ4s 0F9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cue7VbCl; 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 gq8si3799817ejb.704.2021.07.29.14.07.39; Thu, 29 Jul 2021 14:07:40 -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=cue7VbCl; 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 6C289689D48; Fri, 30 Jul 2021 00:07:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AB5D687F7D for ; Fri, 30 Jul 2021 00:07:28 +0300 (EEST) Received: by mail-pj1-f41.google.com with SMTP id pf12-20020a17090b1d8cb0290175c085e7a5so17635028pjb.0 for ; Thu, 29 Jul 2021 14:07:27 -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:mime-version :content-transfer-encoding; bh=1qQLTaiXDcpeykFbXX48VOlhUf65tyaiVyAIPX7mXXY=; b=cue7VbClthHUHDcSo52JxAnGw6jTnHOQ1BonY4sqMaLoQMINc1/NuVRre3XlnUSYsf 5HpkcLPmpIMYvWiMLIDzP1YalY4OUpoQb34CmzSqS7bdLlrFotN54ux4WmE/wqjrSWux wA05vjejZDQRoe1XTG5TqcxX7I0GTk8dD343P0CID9QFLZgdk5AthIFJZ1TVfmvlpUK6 DTKH6PsXBeKOcRaX1TtzLo8EtBMR/dsMU6jNyHr0YqxhYR4gne4xiBJZKq0L0jYyJzcD m5YuH15A9W/o/ieYR6xpd7AHYvK9DbRJdORy74mf2dieZj+4mG4tzTdtQK5bAj9gAFqI +dUA== 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:mime-version:content-transfer-encoding; bh=1qQLTaiXDcpeykFbXX48VOlhUf65tyaiVyAIPX7mXXY=; b=KGQYowgjn0LrglvaS2Bd1CHTKSn+riwC2cxcSCEfDT+S5XJKX3w/0zqbbMYjtO00ho YMvayshKCPzgjRXnhLRRIV/4M6LquSdSu2zP85HilF0mK+UgilHD98S4gN7b5xtdDDsO KyJd7iv4MOsVkl2/JHUaLPbNtlADNmJrv1Djq348+yVVUp6lNJxZ+ELTUcOTHIIpyGIw eDZcES9M+FAzRto/rtbH0XYVbohh8XNGkyjt570ht2K7RYMmOG5q9+vIOBRcajxR5y7S kRi3zvVHWvSuelRM88QuSXuUFLCzE9W2kD36SpVQ4VkOEHYH5oG+kMJDwDggOlSk8HET djSA== X-Gm-Message-State: AOAM532MsVsNnlyGXFzyp+9n2uUiKPIg2xlIf562T75+OP6p3OuNb9t1 30/x8KaPKX5SMdMaCXajcJpCiAE/F/U= X-Received: by 2002:a17:902:ed82:b029:ef:48c8:128e with SMTP id e2-20020a170902ed82b02900ef48c8128emr6321161plj.72.1627592846342; Thu, 29 Jul 2021 14:07:26 -0700 (PDT) Received: from localhost.localdomain ([191.84.244.212]) by smtp.gmail.com with ESMTPSA id c17sm4563122pfv.68.2021.07.29.14.07.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 14:07:25 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Jul 2021 18:06:50 -0300 Message-Id: <20210729210651.25168-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/movenc: don't negate roll_distance when writing it X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 5hkJPt30PeYq Ensure instead that it's the correct value. Signed-off-by: James Almer --- libavformat/movenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 57062f45c5..fedc9c0e18 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2545,7 +2545,7 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track) int distance = 0; for (j = i - 1; j >= 0; j--) { roll_samples_remaining -= get_cluster_duration(track, j); - distance++; + distance--; if (roll_samples_remaining <= 0) break; } @@ -2555,7 +2555,7 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track) if (roll_samples_remaining > 0) distance = 0; /* Verify distance is a maximum of 32 (2.5ms) packets. */ - if (distance > 32) + if (distance < 32) return AVERROR_INVALIDDATA; if (i && distance == sgpd_entries[entries].roll_distance) { sgpd_entries[entries].count++; @@ -2569,7 +2569,7 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track) } else { entries++; sgpd_entries[entries].count = track->sample_count; - sgpd_entries[entries].roll_distance = 1; + sgpd_entries[entries].roll_distance = -1; sgpd_entries[entries].group_description_index = ++group; } entries++; @@ -2588,7 +2588,7 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track) avio_wb32(pb, group); /* entry_count */ for (i = 0; i < entries; i++) { if (sgpd_entries[i].group_description_index) { - avio_wb16(pb, -sgpd_entries[i].roll_distance); /* roll_distance */ + avio_wb16(pb, sgpd_entries[i].roll_distance); /* roll_distance */ } }