From patchwork Sun Nov 8 19:50:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 23434 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C4EBA44A382 for ; Sun, 8 Nov 2020 21:56:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9FD8568BB9F; Sun, 8 Nov 2020 21:56:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD65668BB07 for ; Sun, 8 Nov 2020 21:56:45 +0200 (EET) Received: by mail-qk1-f193.google.com with SMTP id q5so1957763qkc.12 for ; Sun, 08 Nov 2020 11:56:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6imjq5hpgXA6aDTImcPLbwhtsBkG2/CD7dY2OE2S/ZA=; b=sHFseJPqpYPYO3mD0/vSffqF27ff0GhPMnctw6FZ6NaF8251b+qQn4J6b+Fo1iqiRp b7lH0tTS4HfqM4BBQS0Mv+piLN4/WD0v9bqb85kjhQoAwmWS8MBVZIrVUzxTDEXI0d5d BmjNlWnp/I/vRC7uJ5hjTeBjUuABYDI4hQCmLx2BIq/wbusKHkK+bJTnyF6G9LW8l0Vs DC43zI7kw72wtDxSHs6G28EI87yi1LeziiNrMnflDQIAR1H66N12tZV3PYYt72OlHzF8 b8g9EYgp8z7yWTGfJM8Rsza35jAJ93/wv9A2vyKEax3VJ7qyemXJbRVnKJbRFRV80xPX WNpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6imjq5hpgXA6aDTImcPLbwhtsBkG2/CD7dY2OE2S/ZA=; b=UvolqQPi3Rx24H+ZWhoEDxUmt8UjvqcVfZtyX9MEo9tdlq9ZwZXCKR0tgDtb8ku68O eRtk5i+1dBdl9hJkvzzfe5I8uTCVIMDOmwnguYtdKjiBPvScK0C/ZeJU/8PqgACLizCi Fs13PW+aXO8aYZZArcwwPnIQxRjlCHSW8DLmgDxg5qaqyF5O3wigye3mBZ+7MAtJUz4U WTf+mkAJkhUqKPdPesfohtMxlvA1EcuOdPsycED3ldliKy+1zsN0xz8BSQEcpTWOKfP7 rfda1QKHJf4wm4c++7o2O5vImDr91+sQNiayR3MmwutoBwfTn1ernVh2Rhs9Je2v3I+m QRnQ== X-Gm-Message-State: AOAM533IUdhehPQrPlJcasjvd/uDcGMwaM26dt7Uc/APW8MLCr/5hcPI WeUG6Hd9xhz8dTz0l02ybPZJZmHQExg= X-Google-Smtp-Source: ABdhPJwsnL8PB/pZfuIIZ/XvKfOrjmvH+PuEkG1MhdbZgZwpR+Y4OSIWMmJZuaaR+6POFyzbFVzqxg== X-Received: by 2002:ae9:ef04:: with SMTP id d4mr1350948qkg.171.1604865051911; Sun, 08 Nov 2020 11:50:51 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id i15sm447001qke.16.2020.11.08.11.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 11:50:51 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Nov 2020 14:50:40 -0500 Message-Id: <20201108195043.210799-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/nutenc: don't use header_count to store different variables 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Currently, header_count is used to store both the elision header count and the header repetition count (number of times headers have been written to output). Fix this by using a separate variable to store repetition count. Signed-off-by: Andriy Gelman --- libavformat/nut.h | 3 ++- libavformat/nutenc.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/nut.h b/libavformat/nut.h index a4409ee23d..a990d3832e 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -103,7 +103,8 @@ typedef struct NUTContext { unsigned int time_base_count; int64_t last_syncpoint_pos; int64_t last_resync_pos; - int header_count; + int header_count; // elision header count + int header_rep_count; // number of times headers written AVRational *time_base; struct AVTreeNode *syncpoints; int sp_count; diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 1dcb2be1b1..87adef6f7e 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -684,7 +684,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc) } nut->last_syncpoint_pos = INT_MIN; - nut->header_count++; + nut->header_rep_count++; ret = 0; fail: @@ -988,7 +988,7 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) data_size += sm_size; } - if (1LL << (20 + 3 * nut->header_count) <= avio_tell(bc)) + if (1LL << (20 + 3 * nut->header_rep_count) <= avio_tell(bc)) write_headers(s, bc); if (key_frame && !(nus->last_flags & FLAG_KEY)) From patchwork Sun Nov 8 19:50:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 23436 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 066AB44AD42 for ; Sun, 8 Nov 2020 21:59:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DA37468BC0D; Sun, 8 Nov 2020 21:59:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58B6A68BB8F for ; Sun, 8 Nov 2020 21:59:11 +0200 (EET) Received: by mail-qt1-f195.google.com with SMTP id t5so4660588qtp.2 for ; Sun, 08 Nov 2020 11:59:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9Uv50d965Jx5T1EMmZc+baEwIu5QrOR1coGL+xUm3fo=; b=UTY3MiZqHfoCDVtAlaRjxjFzaiIuDhc+NnUPrl7sZ761PqbkUmYOuJgNzNmC188WXk HbGigz2cEr2nxDCyigcK3cMUBqhX8Ry3OweeKK6KcUElCFnlBDZQa/J10TSd2uF7Abtz Dxo0XhGfmpv3oHxoaA7Pyv9rFDb0aw5ksmPaVUufNzKg/Jix6a8w3OedSQv0U4knJG9m Uvpckb/kl+kRze9EgtcBpYxanIS+/O5DccnebFtZAWPz1ua3f386TsLDwHUrngJWhmyW LAdLyO9PPQYBQbI2AS/kaLjn18vKEDbKPivQUlbPxfjLrgqaadeo3D+xMy/0OmUyDgba Cimg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9Uv50d965Jx5T1EMmZc+baEwIu5QrOR1coGL+xUm3fo=; b=ZHYz2ZHDAhsZVVS5q5GvmG2BPp231c99V95cBM04BD8gMcr/MaWHQvzQJebUG3tGL4 g0JWCP6IxJalijLOkZytlgT6KKT7oF0IqbT/qsyoNANui/kZ8xM7N/tu2brzn2o8GHpy dFQGuqkyZA1uT3KeylYSylTpJ26H2pl8nWsS+2M5e0TszyecW9FGDkywNq5V+HEO/vV5 jkI2OHGrN7/QmP0hPyXnRpLz9LPgFJDLEaf1EBRqR/FfnAa88RmwG+KkoCzW78AKr9L/ QCLFB1TFSeXR+1qXfFM1yiIqgJAp9PWuPeMetZixflNK4uoh2fhLlRfAe3WrcB9/6zYo ufqQ== X-Gm-Message-State: AOAM532ugpLPorazvOoVGjpZ3SaqFQHI2gNxP0myAeYWrqPVTRHohlll NoEyEHfTKXU6Fr/4pYLkpl8YRklSXrA= X-Google-Smtp-Source: ABdhPJx4FF425MJCykq2UdyrHdc8bCsBHm4l44dnLWi0cS24tGY8p+UToJvsRq5jyuxO73oUkCvbMg== X-Received: by 2002:a37:7b44:: with SMTP id w65mr11203555qkc.350.1604865054727; Sun, 08 Nov 2020 11:50:54 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id i15sm447001qke.16.2020.11.08.11.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 11:50:54 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Nov 2020 14:50:41 -0500 Message-Id: <20201108195043.210799-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201108195043.210799-1-andriy.gelman@gmail.com> References: <20201108195043.210799-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/nutenc: check return of write_headers() 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Signed-off-by: Andriy Gelman --- libavformat/nutenc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 87adef6f7e..0646f72af2 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -988,8 +988,11 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) data_size += sm_size; } - if (1LL << (20 + 3 * nut->header_rep_count) <= avio_tell(bc)) - write_headers(s, bc); + if (1LL << (20 + 3 * nut->header_rep_count) <= avio_tell(bc)) { + ret = write_headers(s, bc); + if (ret < 0) + goto fail; + } if (key_frame && !(nus->last_flags & FLAG_KEY)) store_sp = 1; From patchwork Sun Nov 8 19:50:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 23435 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 055F544AB13 for ; Sun, 8 Nov 2020 21:57:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE10968BBEC; Sun, 8 Nov 2020 21:57:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A550868BBD2 for ; Sun, 8 Nov 2020 21:57:08 +0200 (EET) Received: by mail-qk1-f193.google.com with SMTP id u4so3416253qkk.10 for ; Sun, 08 Nov 2020 11:57:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bAVeY9w6+wKOH36KK4hllSUkG+vTCib4AOjVKVGpiX0=; b=vUbA6Tbbd5FU/bWNsSoIq9tspX1A4h8Va1g7QueX6IIHmzHRnXB16yXzAjH4wQdZ5k k5GGYXik3JhiK5QNMFzcKY+oZvaO8jiF1+hEVb8aLOV3L1wcI9kOoUXn6GdHplA0tYVq EP+W7Ix7MoGOtCuS0vwgJuuH4hitxpH3bpMSSiIKpR5QVLJQ6SKfJFB97dkTtcJpAGdU W4/c/xL8MuP7YKCjlpOJKdVLe/TsIkqPEaUxmW0j5by2sWQN3cNMFwJm5FyPTkrCpP5y xvuznU40dowgQE1aZozDod7oZWrmUucfItEpbG0112AYBdVgg2lMpuLevmRApzVczX67 cX/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bAVeY9w6+wKOH36KK4hllSUkG+vTCib4AOjVKVGpiX0=; b=faW9/rkdaU0hyu6LgdvuIMqMBOgaLyYGPaWLAA6A4QT0hu/O+ZBWRAjjrTNQHkqXEl D5ji14oc5Fcij3BiYbUtB67LT+hMAlsy0ECR6AJOSQ+IsSd78DxQ48+5r5x4QZ9icHNF xJ2r8H+3o9WxSB9Zfpd8RDdmaaANcAqEoH4YldS7iiTknHy8cxziNLWoahWhZb2zf9/D eU/IikCw0VSTJ9CNWJPeswlVgvB5lTukmauUcDB9gQf4iysqvC5JB6JgkPiryagRcEEf 5ugqtQyroxXA2VoZHnGcf3ikeRDGRA/1XZkuYrx2qnE3uJimB9RhsoSWxdNfkPRyYOjH 4KPg== X-Gm-Message-State: AOAM5332ZOriN4M7ZgVDBfxt39sWL8srhhhDGPUUBAwCXKtI2wVQeGFD z76TWEDxSpIHawEv0M1pUkhZ3iebjKo= X-Google-Smtp-Source: ABdhPJyNUw5EZXammNCzNQUtPHaEfCYIoeqZkQdpEfhgVr9hvukWTPb2a0SCwgYucWD6Yjf2DL0fDg== X-Received: by 2002:ac8:6c6:: with SMTP id j6mr8640819qth.123.1604865056587; Sun, 08 Nov 2020 11:50:56 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id i15sm447001qke.16.2020.11.08.11.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 11:50:56 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Nov 2020 14:50:42 -0500 Message-Id: <20201108195043.210799-3-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201108195043.210799-1-andriy.gelman@gmail.com> References: <20201108195043.210799-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/nutenc: add option to periodically insert global headers 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Signed-off-by: Andriy Gelman --- doc/muxers.texi | 6 ++++++ libavformat/nut.h | 3 ++- libavformat/nutenc.c | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 813b4678f4..ace236fca6 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1822,6 +1822,12 @@ Change the syncpoint usage in nut: The @var{none} and @var{timestamped} flags are experimental. @item -write_index @var{bool} Write index at the end, the default is to write an index. +@item -header_period @var{value} +Sets how often global headers are re-inserted into the bytestream. +Default value is -1. This inserts headers at exponentially increasing locations +@math{2^23, 2^26, 2^29,...} etc. +Setting parameter in the range @math{[0,62]}, will insert headers periodically +after each @math{2^header_period} bytes at the next possible location. @end table @example diff --git a/libavformat/nut.h b/libavformat/nut.h index a990d3832e..c0928306c1 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -104,7 +104,8 @@ typedef struct NUTContext { int64_t last_syncpoint_pos; int64_t last_resync_pos; int header_count; // elision header count - int header_rep_count; // number of times headers written + int64_t header_rep_count; // number of times headers written + int header_period; // header insertion option AVRational *time_base; struct AVTreeNode *syncpoints; int sp_count; diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 0646f72af2..5a775a92fe 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -988,11 +988,20 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) data_size += sm_size; } + if (nut->header_period >= 0) { + if (avio_tell(bc) >> nut->header_period > nut->header_rep_count) { + ret = write_headers(s, bc); + nut->header_rep_count = avio_tell(bc) >> nut->header_period; + if (ret < 0) + goto fail; + } + } else { if (1LL << (20 + 3 * nut->header_rep_count) <= avio_tell(bc)) { ret = write_headers(s, bc); if (ret < 0) goto fail; } + } if (key_frame && !(nus->last_flags & FLAG_KEY)) store_sp = 1; @@ -1221,6 +1230,7 @@ static const AVOption options[] = { { "none", "Disable syncpoints, low overhead and unseekable", 0, AV_OPT_TYPE_CONST, {.i64 = NUT_PIPE}, INT_MIN, INT_MAX, E, "syncpoints" }, { "timestamped", "Extend syncpoints with a wallclock timestamp", 0, AV_OPT_TYPE_CONST, {.i64 = NUT_BROADCAST}, INT_MIN, INT_MAX, E, "syncpoints" }, { "write_index", "Write index", OFFSET(write_index), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, E, }, + { "header_period", "Header insertion parameter", OFFSET(header_period), AV_OPT_TYPE_INT, {.i64 =-1}, -1, 62, E, }, { NULL }, }; From patchwork Sun Nov 8 19:50:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 23433 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CADE944AA31 for ; Sun, 8 Nov 2020 21:51:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A2B8568BBA1; Sun, 8 Nov 2020 21:51:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A852168BB94 for ; Sun, 8 Nov 2020 21:50:59 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id v143so1599709qkb.2 for ; Sun, 08 Nov 2020 11:50:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wZxSSEo2pfv/T2Twv/deF4TPOCAN7x1fHGBgEXOTGKA=; b=ekuvFj5d/RHuHVxV4T4YccYYb+C8NCoZPeOf59ijbWyUFZSPSUox4qZ1CyCCPKWExz Z39QzXIETd2dEPR0mEtW5mT3x/YZMSY/WbJbPQuBC3RrlNFS0W/vC3HTFBK51O/qVL1L zZhvkG5aSQgcbZteCigU1bED7zveeysofSr4kqmpQ7hocIVAcYofMRd8nGBuXM6YZRfT rbpfO2muYFbCn17EA/dkl67XrYyol8m1LNDZcE1B8En6iB/0tOVE90siayyGx6V8FRlR wUYEBoQuBFqaVPsOF4MBDHR7MRV8+OD60ehmhCt66cwG7kfmu47rueXIEmUkjIqauH5+ kjpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wZxSSEo2pfv/T2Twv/deF4TPOCAN7x1fHGBgEXOTGKA=; b=ExQZx5Y9CvtbxXfGL6EUj8hBn0tu1dPnx6rAjs056NHJHXN54vhCcUqBUW69vft0wO n7fHwl6i10K72B0PFGmw8osZISFcqBiB/2wDNA/zxRrAuogOx9Mq4VVdN+OvmWa90xRW HcXTMo2KtgimIcviYrejOuDq/Kxu2lO6nTGbk/f151K++E4+bkyO6SeR9eHNRNWFj33S QEOx3Mq7Otja2ESA/iTnOjgm+OPIiOSOLUhMM9N025mOfadCZFB2ta/PUM0IAl9hv4oi ea3KvwkdyNnZkIeG3Wfk9yq79rhnCfnLkhdQd4zUYvMOB0k6Fp5UZxIwUzkf1pplLY1L o8UA== X-Gm-Message-State: AOAM532xncSc3MJunLZFQZlOeGI8v4eR0FQj9EU2c0E4XN8UzVlv8v47 EmurYWVSc6d6EK4pPwlshxW34jcPOAI= X-Google-Smtp-Source: ABdhPJxvnNj3p7GyTjNj2x9OYhjbF+bGuRY6h+NKtS05uc/3hVazHn6xbYqyuPFn6LzZ/PUhbXkoZg== X-Received: by 2002:a37:99c2:: with SMTP id b185mr10715059qke.81.1604865058190; Sun, 08 Nov 2020 11:50:58 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id i15sm447001qke.16.2020.11.08.11.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 11:50:57 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Nov 2020 14:50:43 -0500 Message-Id: <20201108195043.210799-4-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201108195043.210799-1-andriy.gelman@gmail.com> References: <20201108195043.210799-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/nutenc: cosmetics 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Realign from previous commit and fix typo in comment. --- libavformat/nutenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 5a775a92fe..0323984556 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -506,7 +506,7 @@ static int write_globalinfo(NUTContext *nut, AVIOContext *bc) while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) count += add_info(dyn_bc, t->key, t->value); - put_v(bc, 0); //stream_if_plus1 + put_v(bc, 0); //stream_id_plus1 put_v(bc, 0); //chapter_id put_v(bc, 0); //timestamp_start put_v(bc, 0); //length @@ -996,11 +996,11 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) goto fail; } } else { - if (1LL << (20 + 3 * nut->header_rep_count) <= avio_tell(bc)) { - ret = write_headers(s, bc); - if (ret < 0) - goto fail; - } + if (1LL << (20 + 3 * nut->header_rep_count) <= avio_tell(bc)) { + ret = write_headers(s, bc); + if (ret < 0) + goto fail; + } } if (key_frame && !(nus->last_flags & FLAG_KEY))