From patchwork Mon May 4 18:22:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19495 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 DB05F44AD26 for ; Mon, 4 May 2020 21:23:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA7C268BE5B; Mon, 4 May 2020 21:23:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 736F768BB24 for ; Mon, 4 May 2020 21:23:00 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id x4so580083wmj.1 for ; Mon, 04 May 2020 11:23:00 -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:mime-version :content-transfer-encoding; bh=wdkI2evN0wc+O/WSI4I6WMqbG/6AF31ZpbDtAQ/LWEc=; b=bYMw/gT8Vh8utQpxqon7b3yjqBuAEj59lyksRlu2wrvzLnPNSxzcTIKWh8wKsBgHN/ 8z5GEtfQ5zyiJfq7UD1bPzcGGlhxlh/GAOGbyYoT4GMdY1iEAcnpXQpQeIek1JGdONea D8V9Wz3KDh/J1Uh0QFbW4A07BLN99fpCMN0W72ZWo1iwKNQ1hx3S7yZP3xGZLYYvYqC3 YXLBIZwP+/RhSd9tJl8jDLrfC9+sJyTJmYcNAdbydJkfaVjel3Fe7/7IkRoYthuzmsaa OJNP8nCozHwU875JhzOMFcAlcgmZwvfrOP3+jghM9NxjDRyLVJIS/BTJ+4HMOoybHx4A IbSQ== 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=wdkI2evN0wc+O/WSI4I6WMqbG/6AF31ZpbDtAQ/LWEc=; b=hlcqeS0c0hFrBcYk0MAEBy2KewWzmBjrwRagAtSbaWATMqlM63+EKAPt9XqPhEHCRb Kb1rlsqc9QyrUXugeh6i4jqjz7Shy0ZTzgMIEXT0nDz9H9ufYWiABGNAwBj5n1VrFv/T Td9VBDS+gCOkzf7gYpxghpd2CHwkLLMYprvuz1GVhHlQaB+BsJlQqhZeKr2dEuKRzTOn eLsKq4NnMGfezwZClSde4+bfp7bcZubzkojdhjuuBm8D5AtWs3UjEj+9NPjMr9O+vN2R 9LSBdezpZa3T8GFSxnLuO0je1Eue35tvycLMOjNyBeJxnKYKGFO3AW8ri1Dc++8fBSDM TAyA== X-Gm-Message-State: AGi0Pua6d8lMex4N3LtKfJFd/s95cB3wUKbfWE+4RLUmUm+5gC0MlCno JIDLn/ZWrzfT6zNfe71vq/K3jLVB X-Google-Smtp-Source: APiQypIOr2SXfZUmuH84lPi6Rtnpb5TTGDlSJFCis6/MKR+Auv5kG+o6M0iHsArR5mUHcUfJUbf4SQ== X-Received: by 2002:a1c:2e07:: with SMTP id u7mr15949339wmu.74.1588616579363; Mon, 04 May 2020 11:22:59 -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.22.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 11:22:58 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 May 2020 20:22:41 +0200 Message-Id: <20200504182250.26141-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/10] libavformat/nutenc: Remove redundant function parameter 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" calculate_checksum in put_packet() is always 1. Signed-off-by: Andreas Rheinhardt --- libavformat/nutenc.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 1d48625815..44ee5d810a 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -299,13 +299,12 @@ static void put_s(AVIOContext *bc, int64_t val) ff_put_v(bc, 2 * FFABS(val) - (val > 0)); } -//FIXME remove calculate_checksum static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, - int calculate_checksum, uint64_t startcode) + uint64_t startcode) { uint8_t *dyn_buf = NULL; int dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf); - int forw_ptr = dyn_size + 4 * calculate_checksum; + int forw_ptr = dyn_size + 4; if (forw_ptr > 4096) ffio_init_checksum(bc, ff_crc04C11DB7_update, 0); @@ -314,11 +313,9 @@ static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, if (forw_ptr > 4096) avio_wl32(bc, ffio_get_checksum(bc)); - if (calculate_checksum) - ffio_init_checksum(bc, ff_crc04C11DB7_update, 0); + ffio_init_checksum(bc, ff_crc04C11DB7_update, 0); avio_write(bc, dyn_buf, dyn_size); - if (calculate_checksum) - avio_wl32(bc, ffio_get_checksum(bc)); + avio_wl32(bc, ffio_get_checksum(bc)); av_free(dyn_buf); } @@ -630,7 +627,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc) if (ret < 0) return ret; write_mainheader(nut, dyn_bc); - put_packet(nut, bc, dyn_bc, 1, MAIN_STARTCODE); + put_packet(nut, bc, dyn_bc, MAIN_STARTCODE); for (i = 0; i < nut->avf->nb_streams; i++) { ret = avio_open_dyn_buf(&dyn_bc); @@ -641,14 +638,14 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc) ffio_free_dyn_buf(&dyn_bc); return ret; } - put_packet(nut, bc, dyn_bc, 1, STREAM_STARTCODE); + put_packet(nut, bc, dyn_bc, STREAM_STARTCODE); } ret = avio_open_dyn_buf(&dyn_bc); if (ret < 0) return ret; write_globalinfo(nut, dyn_bc); - put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE); + put_packet(nut, bc, dyn_bc, INFO_STARTCODE); for (i = 0; i < nut->avf->nb_streams; i++) { ret = avio_open_dyn_buf(&dyn_bc); @@ -656,7 +653,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc) return ret; ret = write_streaminfo(nut, dyn_bc, i); if (ret > 0) - put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE); + put_packet(nut, bc, dyn_bc, INFO_STARTCODE); else { ffio_free_dyn_buf(&dyn_bc); if (ret < 0) @@ -673,7 +670,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc) ffio_free_dyn_buf(&dyn_bc); return ret; } - put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE); + put_packet(nut, bc, dyn_bc, INFO_STARTCODE); } nut->last_syncpoint_pos = INT_MIN; @@ -1022,7 +1019,7 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) put_tt(nut, nus->time_base, dyn_bc, av_rescale_q(av_gettime(), AV_TIME_BASE_Q, *nus->time_base)); } - put_packet(nut, bc, dyn_bc, 1, SYNCPOINT_STARTCODE); + put_packet(nut, bc, dyn_bc, SYNCPOINT_STARTCODE); if (nut->write_index) { if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0) @@ -1175,7 +1172,7 @@ static int nut_write_trailer(AVFormatContext *s) if (ret >= 0) { av_assert1(nut->write_index); // sp_count should be 0 if no index is going to be written write_index(nut, dyn_bc); - put_packet(nut, bc, dyn_bc, 1, INDEX_STARTCODE); + put_packet(nut, bc, dyn_bc, INDEX_STARTCODE); } return 0;