From patchwork Sat Apr 11 21:19:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18880 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 C72EF44A8DB for ; Sun, 12 Apr 2020 00:20:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BAC0768B8AD; Sun, 12 Apr 2020 00:20:43 +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 0D5E568B4AC for ; Sun, 12 Apr 2020 00:20:35 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id j2so6102859wrs.9 for ; Sat, 11 Apr 2020 14:20:35 -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=ni4vTJHrM4Odu2ZlUR1YqGROgtVW3wP/th9pCwQVG2Y=; b=kKIh/VsydM9U+5om5AT/k4BywtC7N83g9lyyRJNAgOXEkJGhAyNjZNHiuq2jn4w51R A7CoHuuVadF7cHh+joQ3cnHoAjvUi6NZJ6wB5n/I118k1EGZoMV3w4mMpEiJrhoY7U40 MukcPMlN4ye9sGIDnTe4sjlvlA51L8YrRzUL64J8Js05d1BYUZB31HJAzPWlbkgQpsVu nmnYUCSjWfrWHE9yyK49uesBI4jVtrUvU3tWQei0b2XIYnUbYVATSZag+FzbdCuLwW1q InQS5oX6OhPtcPpZl12/xy0DElsm49HsI/bqbq9ODNNPZ0KIwrwoQ2rSqCXJkBNEhzCt nvGw== 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=ni4vTJHrM4Odu2ZlUR1YqGROgtVW3wP/th9pCwQVG2Y=; b=t3uLvTYfGTK5UZ0jeMAKtwJkKKiG/ScuMBwC4dZ6lMUYry3kM1mmCQeC9ACOw4wlkv OTbeHLLrQmbQevV1FfWwSb0udAY5/xynaALyplwHCCT4GMV6yHFxCxQdykD5b8jqzbUv 1egwOI6jp60cweHqWOdykPTxrFTjgvYxS9oSuCW2MJwBqobwdcHa3ynEikdhhdx7HyG5 nP6Kg4GZHX1s/y2vtK6i4UgcS+ptfuBcQFG4WX4tLFqNQDFEhTSW2IK3eeMR0DAkEnaq lasXleabHKACD/U57VliiSFefcikJssD0RAVQU6sgn/rXB4nZDqI9y8roJb3086NYZH7 +Dag== X-Gm-Message-State: AGi0PuYfpk4/pLwW96XPWANzGGCqZnAQIxyZ6dzYjMKFigvXK/o3BNDT b6BFA70MQXqdOQzV6UUuBbCM5eq+ X-Google-Smtp-Source: APiQypJJbUTklnHrPvPlYzvGMOSjXPXVscMtQUXtw2X0Xgv1XqL0VbHnT8yhTNwxMAjdlTbP9yszlA== X-Received: by 2002:a5d:6a10:: with SMTP id m16mr12195099wru.371.1586640034311; Sat, 11 Apr 2020 14:20:34 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id h2sm7820650wmb.16.2020.04.11.14.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2020 14:20:33 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Apr 2020 23:19:55 +0200 Message-Id: <20200411211955.20843-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411211955.20843-1-andreas.rheinhardt@gmail.com> References: <20200411211955.20843-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avformat/mux: Remove pointless timestamp backups 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" write_packet() currently saves the original timestamps of the packet it got and restores them in case writing fails. This is unnecessary as we are no longer working directly with the user-supplied AVPacket here; and it is also pointless because the timestamps may already have been altered before write_packet(). So remove this and add a general comment to the function that timestamps may be modified; also remove a long outdated comment about side data. Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 48c0d4cd5f..1135e52f71 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -664,8 +664,7 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif /** - * Make timestamps non negative, move side data from payload to internal struct, call muxer, and restore - * sidedata. + * Shift timestamps and call muxer; the original pts/dts are not kept. * * FIXME: this function should NEVER get undefined pts/dts beside when the * AVFMT_NOTIMESTAMPS is set. @@ -675,10 +674,6 @@ FF_ENABLE_DEPRECATION_WARNINGS static int write_packet(AVFormatContext *s, AVPacket *pkt) { int ret; - int64_t pts_backup, dts_backup; - - pts_backup = pkt->pts; - dts_backup = pkt->dts; // If the timestamp offsetting below is adjusted, adjust // ff_interleaved_peek similarly. @@ -754,10 +749,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) ret = s->pb->error; } - if (ret < 0) { - pkt->pts = pts_backup; - pkt->dts = dts_backup; - } else + if (ret >= 0) s->streams[pkt->stream_index]->nb_frames++; return ret;