From patchwork Mon May 4 18:22:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19503 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 A1AEC44AD26 for ; Mon, 4 May 2020 21:23:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B60A68BECA; Mon, 4 May 2020 21:23:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 401B068BEBD for ; Mon, 4 May 2020 21:23:28 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id k1so269455wrx.4 for ; Mon, 04 May 2020 11:23:28 -0700 (PDT) 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=fCJJUEwcum5O6ueNbxVlxlLhddUjHVMSl32u2KH7nQg=; b=EQvOAlAQeCoh5hbpmK/71HVjFHSa85wBc+WU/mUfjMcgx8/WijA1SajE0C8UNcm/Hx 1t+luUv/vgnpxzqWXyPUeIw5TSf4/07IzovMYkJm5qsqp4dyaS3UxVNKCVTk+ZxkGlav 8vB33P2i9MXj5/koFYQi2WvHxMi+CiFFFlHncWhsj9oUrelP8E7ja8HxjvNZXVU7Ls0Q VQJLHVAxCQ32Lq6vtPw0wfVsNJa1lefe5Vbos1OQIZD4IGkfiTr9ZAqDZMvaSQgfYcfH tBsC3bL+wsvRLH/+E9Q4ow6qPsATBqSEEucw3Qx3dj88R9TIQFRKsRWJ6OMeHkxWtOSX FFPw== 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=fCJJUEwcum5O6ueNbxVlxlLhddUjHVMSl32u2KH7nQg=; b=IuaTdxL+vghmpb6prrYwnEM+9+H/NUHcbVE3VnE2THkgQWJaI8ll73ZX36QUhwiJvo bnMwkw53xUSO5jUBDa3EAN2LkBFUNauSyniSO44QefuyOOzFSERUeQ1CGOv2c9K+jDE3 s8UyM4GCKNuE4HE1yFXCu0Ml36JjVZtaGDwloMRXBAzH5olTbiIvLG6+tzCMv3K0+URT MjKaXg8pHUqnJx7UTyjmsOyLhreyUUMhG77xqJhiqhBQHSG3vQX06laRPyvGyzX+HwxY 2N+cafvEF9yoGZ2f8YbHEO87Z3lGpWcJbGrnzmKONFmsQMKjRvTykC97ZrrwSKXB6+xs C1og== X-Gm-Message-State: AGi0PubWiKlkXoYIU6tMNPoq3y9uQZwZubCYRx7DpQr5U7apFiyjBodw y5+NFptLBI1fBjjjLgvQIQ8ObZqN X-Google-Smtp-Source: APiQypJ4ZoKHBff5vj5GcJa2I9aL09V954ky2o5JaRRdK0QTzb2SuoRmoxVNtPVjyVsLtOInp3f7Fw== X-Received: by 2002:adf:f508:: with SMTP id q8mr650413wro.117.1588616607219; Mon, 04 May 2020 11:23:27 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id u188sm358595wmg.37.2020.05.04.11.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 11:23:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 May 2020 20:22:48 +0200 Message-Id: <20200504182250.26141-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200504182250.26141-1-andreas.rheinhardt@gmail.com> References: <20200504182250.26141-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/10] 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Mainly reindentation. Signed-off-by: Andreas Rheinhardt --- libavformat/nutenc.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index ab44214efd..5735055d19 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -332,7 +332,7 @@ static void put_str(AVIOContext *bc, const char *string) } static int put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, - const uint8_t *prelude, int prelude_size, uint64_t startcode) + const uint8_t *prelude, int prelude_size, uint64_t startcode) { uint8_t *dyn_buf = NULL; int dyn_size = dyn_bc ? avio_get_dyn_buf(dyn_bc, &dyn_buf) : 0; @@ -583,7 +583,8 @@ static void write_chapter(NUTContext *nut, AVIOContext *bc, int id, *prelude_size = ptr - prelude; } -static int write_index(NUTContext *nut, AVIOContext *bc) { +static int write_index(NUTContext *nut, AVIOContext *bc) +{ int i; Syncpoint dummy= { .pos= 0 }; Syncpoint *next_node[2] = { NULL }; @@ -654,9 +655,8 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc) for (i = 0; i < nut->avf->nb_streams; i++) { ret = write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i); - if (ret < 0) { + if (ret < 0) goto fail; - } ret = put_packet(nut, bc, dyn_bc, NULL, 0, STREAM_STARTCODE); if (ret < 0) goto fail; @@ -668,8 +668,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc) goto fail; for (i = 0; i < nut->avf->nb_streams; i++) { - ret = write_streaminfo(nut, dyn_bc, i, prelude, &prelude_size); - if (!ret) + if (!write_streaminfo(nut, dyn_bc, i, prelude, &prelude_size)) continue; ret = put_packet(nut, bc, dyn_bc, prelude, prelude_size, INFO_STARTCODE); if (ret < 0) @@ -1035,21 +1034,24 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) put_packet(nut, bc, NULL, syncpoint, ptr - syncpoint, SYNCPOINT_STARTCODE); if (nut->write_index) { - if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0) - goto fail; - - if ((1ll<<60) % nut->sp_count == 0) - for (i=0; inb_streams; i++) { - int j; - StreamContext *nus = &nut->stream[i]; - av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, sizeof(*nus->keyframe_pts)); - if (!nus->keyframe_pts) { - ret = AVERROR(ENOMEM); - goto fail; + if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, + 0 /*unused*/, pkt->dts)) < 0) + goto fail; + + if ((1ll << 60) % nut->sp_count == 0) + for (i = 0; i < s->nb_streams; i++) { + int j; + StreamContext *nus = &nut->stream[i]; + av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, + sizeof(*nus->keyframe_pts)); + if (!nus->keyframe_pts) { + ret = AVERROR(ENOMEM); + goto fail; + } + for (j = nut->sp_count == 1 ? 0 : nut->sp_count; + j < 2 * nut->sp_count; j++) + nus->keyframe_pts[j] = AV_NOPTS_VALUE; } - for (j=nut->sp_count == 1 ? 0 : nut->sp_count; j<2*nut->sp_count; j++) - nus->keyframe_pts[j] = AV_NOPTS_VALUE; - } } } av_assert0(nus->last_pts != AV_NOPTS_VALUE);