From patchwork Tue Apr 2 13:32:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Felix de Souza via ffmpeg-devel X-Patchwork-Id: 12581 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 9DF48447FF3 for ; Tue, 2 Apr 2019 16:35:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9112068ACAB; Tue, 2 Apr 2019 16:35:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C120A68ACAB for ; Tue, 2 Apr 2019 16:35:15 +0300 (EEST) Received: by mail-wm1-f45.google.com with SMTP id c1so3432244wml.4 for ; Tue, 02 Apr 2019 06:35:15 -0700 (PDT) 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=yUHGEAqpyUseIP+9KjqNlpqYbaBvdtdAUNBEhY7/7iw=; b=XHEqJqlwHg3cJg7nIVQMRisvfuHfkHgNBaV/qAKGg9Gk867E7f/W0pirjwaiT7X/RS bhrKn0QHI0lrYCatndkTyOnDNDoTbnXehOK7GnoMZY+rH3OMsyU6QZdA+Ol4TYEcPAYf cKAEk7bZNmYcAeR0YHRIn6a2banTVdelA2orhl/CWkkSqlYvC0lT3LyV34GTMXWHbH/5 BbsT+SflVUhG4HDMg9m9uYXhTpiZVUrDH1AbEE/xBZt1Sf/Zl0BDppVl1lTKZEAvWE/8 UVpnbRD9tK5aU3wn4aGL26OcTbhRtDofNwpIgtxCk1xemU1OzYwuBMtHHAJNVM5MOqlA ishg== X-Gm-Message-State: APjAAAXFpIs8x2gZPAyFqhC8hbku9tKgHSCrSWgL6YyGLrQd2kxFb8zi Gm45e1O39KRW+l2ahTA4dqdt7Lq1SuM= X-Google-Smtp-Source: APXvYqxf0zU4U3iWPUhI/BruWkQscIR3PPv+V0phD81gJq6dLbi+7NTto+IKiaf0VQISk7a9ZFmdIw== X-Received: by 2002:a1c:40d6:: with SMTP id n205mr3431932wma.140.1554212114868; Tue, 02 Apr 2019 06:35:14 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id t24sm15566886wmi.10.2019.04.02.06.35.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 06:35:14 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Apr 2019 15:32:57 +0200 Message-Id: <20190402133305.3328-8-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190402133305.3328-1-andreas.rheinhardt@googlemail.com> References: <20190402133305.3328-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/15] avformat/matroskaenc: Improve log message 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: , X-Patchwork-Original-From: Andreas Rheinhardt via ffmpeg-devel From: Diego Felix de Souza via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Since 4e3bdf729a80f868b014ceb02901d87198b545a5 there is no reason any more to treat the seekable and non-seekable cases separate with regards to the log message for a new cluster. This effectively reverts d41aeea8a64bab5d7aacd602f7214f95baad109f. Also improved the log message: "pts 80dts 0" -> "pts 80, dts 0". Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 220d090a48..06e9081638 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2263,15 +2263,10 @@ static void mkv_start_new_cluster(AVFormatContext *s, AVPacket *pkt) end_ebml_master_crc32(s->pb, &mkv->dyn_bc, mkv, mkv->cluster); mkv->cluster_pos = -1; - if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64 " bytes, " - "pts %" PRIu64 "dts %" PRIu64 "\n", + "pts %" PRIu64 ", dts %" PRIu64 "\n", avio_tell(s->pb), pkt->pts, pkt->dts); - else - av_log(s, AV_LOG_DEBUG, "Starting new cluster, " - "pts %" PRIu64 "dts %" PRIu64 "\n", - pkt->pts, pkt->dts); avio_flush(s->pb); } @@ -2548,12 +2543,9 @@ static int mkv_write_flush_packet(AVFormatContext *s, AVPacket *pkt) if (mkv->cluster_pos != -1) { end_ebml_master_crc32(s->pb, &mkv->dyn_bc, mkv, mkv->cluster); mkv->cluster_pos = -1; - if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) av_log(s, AV_LOG_DEBUG, "Flushing cluster at offset %" PRIu64 " bytes\n", avio_tell(s->pb)); - else - av_log(s, AV_LOG_DEBUG, "Flushing cluster\n"); avio_flush(s->pb); } return 1;