From patchwork Fri Apr 19 23:41:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12828 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 27D0C4494CF for ; Sat, 20 Apr 2019 02:50:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 129BD68AB0A; Sat, 20 Apr 2019 02:50:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8912368AAE8 for ; Sat, 20 Apr 2019 02:50:26 +0300 (EEST) Received: by mail-wm1-f46.google.com with SMTP id y197so7770840wmd.0 for ; Fri, 19 Apr 2019 16:50:26 -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=BAk9sWm/4jxFuyZfWdU+Nv4oBttrvdTFwNqbT6I5NWQ=; b=UbWFXsMBziyFpVgKScwTcHdlA4sY0bomEcC/x0ImQb4EwVaO/nF8ha5rwx/7JCqJdH 6pxtuuv/WXDPv6gEPxIw0zPA4Pz2oJky0xoW5mTpGkorOUlVSKdN4wZWxTpwgPB30G6Z eQ/OFNWeb4aAxl+I6bg1L3IiwBHRtwLKElMrUPekT6RcHk817oALcOhPj8BECtlmBnL0 K1ahyG33ev62CB2K9pX7hTZiSv9gL/+8eTpZcslus8lHlyQ/lUI6TW9EgKcXmh2AAIxK oJg4WdHzNiF5qdMsPJnCLlxIbjneFRUS8VCuWDfEoxH0JXsxErXbWWhWVtDoUkvFo+3I 5J0Q== 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=BAk9sWm/4jxFuyZfWdU+Nv4oBttrvdTFwNqbT6I5NWQ=; b=g47gHSE7+G/hElLvopoJKgEWKYB0xY/lZ/uHk+TA99fz6qxMT8hNgVDidH4sQpAIqr qDa+3c+h3Wu/TAgI+V+XjyQ1VtOUFCHYYhEhssLxTtRQXoSPulWbbDhcUBQKtLsGnykj wMhdyIgC7h53YoO7slaONTlFjwXjPwN2xrbtJPVy77ahy4AYkRXGO/wzbyer1Qo1CJ8X e29g2oH7BoAHDVPHtw6lVx+KsAP6oNRKN8X0mYA/YqVLdK0f7rXv4IeRqQ/RYv4piPaC M3xmmSd6DYFfMp3V/bx/UBQqW6dTSB+slV5WATsPVqeN5iHQOaATDEGWosnF+AshDUHs FD4g== X-Gm-Message-State: APjAAAXT3fz4d3XlUL29WA37wWZWjU4/++6co3LgEdOd3ufO2nNRthU0 wCod3uq1SRV1P0PSB5lHZ2PVzPp9 X-Google-Smtp-Source: APXvYqy/pf6UNYwKISqXiJJwxfY7PeIuU0oXJfRl8s00WzFDhbmf0iCktxfzcmZC5+Hf78bA5Q+Gtg== X-Received: by 2002:a05:600c:d4:: with SMTP id u20mr4365656wmm.88.1555717825688; Fri, 19 Apr 2019 16:50:25 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.gmail.com with ESMTPSA id t14sm6002395wmi.16.2019.04.19.16.50.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 16:50:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Apr 2019 01:41:02 +0200 Message-Id: <20190419234110.32980-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190419234110.32980-1-andreas.rheinhardt@gmail.com> References: <20190402133305.3328-1-andreas.rheinhardt@googlemail.com> <20190419234110.32980-1-andreas.rheinhardt@gmail.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: , 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 e62346963e..b300b23938 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2265,15 +2265,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); } @@ -2551,12 +2546,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;