From patchwork Fri Dec 3 05:06:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 31899 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp211616iog; Thu, 2 Dec 2021 21:08:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJykSj4jDhjp+kR99NY5IOfZye9I/4EMWVNqrWhs7p/x8XUiqQ0D5OwukNRaIGNOsBXgADDR X-Received: by 2002:a17:906:cd18:: with SMTP id oz24mr20729763ejb.166.1638508090999; Thu, 02 Dec 2021 21:08:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638508090; cv=none; d=google.com; s=arc-20160816; b=dD8WtYNEHfGiLhx4EeaOqIakVcvqkUWNhBg7+J+DB8WatP4QakLShPZSdfR/kS82ow aeKAnb5S5AeNME2yYZx7v4Z8YrpYxQQpJ9wzp3qxmqv6HzKjVQ++lYXMFJG1pJpvXTnb 2w5raEO+EmN+LC6STIVMTvYT2rQY5o4nzNUoqCsxGL+zINIiChVEBlJve1/XW4LWxRBO iOIeMQ6WTUv67cnL9O1HpEji3vSxn1jOOVSayB7rpCN+0XNv+uE964hqBcTTfo9ay+vw Zapv12ZK1eAfazp/takpcpd57s9tsTw5VTER+7+SSnwx3JawSSgUdMEJHvo4bztIwv2s IWGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=KgSMgp5XJkehrl2Wb5veYpMlEAIxUIwJ26cygFABmmU=; b=LezzE3VtHdKc13T20V639M9qGoT2JnS8q1h/scZVhx7tzMxevmbfsjUzpJxIkXW++f qBDzn96fWI1/kWJRY/CZi0kGpY2sK0Km0pJqTwS+NuILdxTu8LlITbzK2hTUVLfj/uTQ CQS5jq1ACkLmHse4en+xP9Fh8ktoKyEx9vuxLox0m6JdaWc7/XPfAeat80dMhfMoIV3r t6XO5ZyN/y7SMdH7rbeknS9P9PtxE4/DT4tzskjLzWZRkRCKs4KU3QqPzRqCHpijAWIa gAQFU0uQ6mYL/zT+hbeH/jLcNiZ+bp+xn6ktcGLk3/fdjv+L1GNfhACu7r5l8WT4GTpK RdQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=arZeVJiQ; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nd17si2330956ejc.722.2021.12.02.21.08.10; Thu, 02 Dec 2021 21:08:10 -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=@foxmail.com header.s=s201512 header.b=arZeVJiQ; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4D8C68AE9D; Fri, 3 Dec 2021 07:07:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-239.mail.qq.com (out203-205-221-239.mail.qq.com [203.205.221.239]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4935468ACC3 for ; Fri, 3 Dec 2021 07:07:15 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1638508032; bh=oSRdmobONfEwaJFLwHF+YkRiQd/5J7cyJttI8zFvtXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=arZeVJiQaNU47Aa6svW8ZC2K72Nbew+9GDdpiD4V+kOm97ypW34yS3iaAUJJy8az8 yAOk7wdQqa7Zy3hXwDvWVsRf5fGyoZj7xYOwHq9+rP+74JUKtEbv9fsoraP9/PMbVE SFu5bWuLQ6e+xzq/eLK1lkSRiSFmfnEwV6Ff7cV8= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.56]) by newxmesmtplogicsvrszb6.qq.com (NewEsmtp) with SMTP id 1C926A18; Fri, 03 Dec 2021 13:07:09 +0800 X-QQ-mid: xmsmtpt1638508032tocsay95y Message-ID: X-QQ-XMAILINFO: NM+HyBNiu6fqdh7AKW0DEb7gQGE6ROFKR0fLwNKHCuX++26Dg3/GOG5aeV66gH ehvay/SlMwcYwHYv2olKPq/fMibHkfoxeZsayFnpZqbw4NZl8MHbdRhLN3mxskV4SZJ45RMX3McH sn95PZHcNPvB5n0Q2BNXKiIeOe6GPd22qoeawQimd8/Gdmd0DWq9B62kOCOOZu2a43oNJLau72J4 sYxGY3cazsah7n5Sb0XgNw0Mp4fHRU+tOvi84eaFKpMK13t7EU3jWGJjJFlBHVKN5i25HFW+osXe aWMBeSokHSQEeCMzg5DJVA0TMbXx2ZMRessMel9WtLlte3yCgAUZP5RObAyRv/se4kraKKQ3rKoo Mqb9pwEkVx8ULVW8T1hn7w/rukEaAAd6hBr1/bkSLm7e6kEajUAnGOuLUN4G4f1gMMm1mrezGM07 KNtqffi903Wj+uCvnpPZVRrBsKWPCuGsUTZkRVm2UqeNZIZUcKoLIUSzPhqVj5fvscpoOT2XbSkf 3p49BlHupy8b/ZbXkdTw7GD+5+TMhh9C+KbEKtJNa4xA/NkCJO52RIfr1i+CBzmSVk4vkzhP08CA N46TrReH5TO86Mn9TzvOSsH9SL/GbfqBkHh1ebeknrmKS2veN01+PRoj0/rPpRvh5Vd3nPPrWZAK lF20Ro9M+G3n50rKTjR8Pd1vjvQxPJeUhcZCDkpPZZGx+IJM9meOvkJjaB2XVGlml/LfpYQolofz Fk6Rsqr1O6ib/3KnNmD5JuP3R4FCY06GkCt0PmjjIcEUslnlI2YY4VXAhImJF+Jwy02IFGRmoswZ jQ9GCld1n+tVCki0sBILyRgcd4FJ2ijoZ5EDtVxNj1h1ce8b/P0hd1aaPm/8dZdkQ= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Dec 2021 13:06:57 +0800 X-OQ-MSGID: <20211203050657.72755-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211203050657.72755-1-quinkblack@foxmail.com> References: <20211203050657.72755-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/movenc: reindent after last commit 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Ln3viHt6V9J5 --- libavformat/movenc.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 01dfd21a43..3c7c951c7d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4939,16 +4939,16 @@ static int mov_write_tfra_tag(AVIOContext *pb, MOVTrack *track) int i; if (!track->every_sample_keyframe) { - /* We can't write and then update number_of_entry, because we cannot fix - * the case when number_of_entry is zero, since zero indicates that every - * sample is a sync sample. So get number_of_entry first. - */ - for (i = 0; i < track->nb_frag_info; i++) { - if (track->frag_info[i].first_sample_flags & MOV_SYNC_SAMPLE) - number_of_entry++; - } - if (!number_of_entry) - return 0; + /* We can't write and then update number_of_entry, because we cannot fix + * the case when number_of_entry is zero, since zero indicates that every + * sample is a sync sample. So get number_of_entry first. + */ + for (i = 0; i < track->nb_frag_info; i++) { + if (track->frag_info[i].first_sample_flags & MOV_SYNC_SAMPLE) + number_of_entry++; + } + if (!number_of_entry) + return 0; } avio_wb32(pb, 0); /* size placeholder */ @@ -4959,18 +4959,18 @@ static int mov_write_tfra_tag(AVIOContext *pb, MOVTrack *track) avio_wb32(pb, track->track_id); avio_wb32(pb, 0); /* length of traf/trun/sample num */ if (track->every_sample_keyframe) { - avio_wb32(pb, 0); + avio_wb32(pb, 0); } else { - avio_wb32(pb, number_of_entry); - for (i = 0; i < track->nb_frag_info; i++) { - if (!(track->frag_info[i].first_sample_flags & MOV_SYNC_SAMPLE)) - continue; - avio_wb64(pb, track->frag_info[i].time); - avio_wb64(pb, track->frag_info[i].offset + track->data_offset); - avio_w8(pb, track->frag_info[i].traf_index); /* traf number */ - avio_w8(pb, 1); /* trun number */ - avio_w8(pb, 1); /* sample number */ - } + avio_wb32(pb, number_of_entry); + for (i = 0; i < track->nb_frag_info; i++) { + if (!(track->frag_info[i].first_sample_flags & MOV_SYNC_SAMPLE)) + continue; + avio_wb64(pb, track->frag_info[i].time); + avio_wb64(pb, track->frag_info[i].offset + track->data_offset); + avio_w8(pb, track->frag_info[i].traf_index); /* traf number */ + avio_w8(pb, 1); /* trun number */ + avio_w8(pb, 1); /* sample number */ + } } return update_size(pb, pos);