From patchwork Mon Oct 3 23:36:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 853 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1858954vsd; Mon, 3 Oct 2016 16:39:44 -0700 (PDT) X-Received: by 10.28.213.13 with SMTP id m13mr12157588wmg.68.1475537984158; Mon, 03 Oct 2016 16:39:44 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g6si826309wjw.186.2016.10.03.16.39.43; Mon, 03 Oct 2016 16:39:44 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 05285689983; Tue, 4 Oct 2016 02:39:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f66.google.com (mail-oi0-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9581689B92 for ; Tue, 4 Oct 2016 02:39:08 +0300 (EEST) Received: by mail-oi0-f66.google.com with SMTP id h186so8359105oia.3 for ; Mon, 03 Oct 2016 16:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=JRXOo2ZVOssk3KIIKX/97kSFjYspxF2aw3WbFoNXE1s=; b=Slbs6EEu9PF6lNPtJyEmwPmke4Favtf2q3kAz4wpQ48hRAihv/dszYnLQ3dAr0ty5Q CjSAXT9E4VBbrJKfoKo9uh740rU6IrA8KZ3acdSQ7rwV3s+tSTjgmT7rX7Qc3TCdaXYi xAzlRulOKosKHT8Z69NdZLcKyJvs5T6sJLDqFY5IYYL1Eb3wBNCm4XMoqCjqmvrqh5PV ZyzFiUmffxxnZfZXkYlbdSSEG/s8UmOA6XZoxaZ9haiVHQnf0qXd8jOf+xlB3Ue01ZYn xKQUHBUmHVTR3LUsQtG/7JqT55i/lHeZUUqLvUDjMJPYigpRi4ZKu0ztKyms5Ye9mQ+L Eolg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=JRXOo2ZVOssk3KIIKX/97kSFjYspxF2aw3WbFoNXE1s=; b=DvyQ5FYJiloESA9Wwy8HjSSTqmwSuDRVYiE65RnfUNCq6rlyhvvOqqSccPxT01d0ti oftlDGnwQBJWq6IJSWChFOTO8o9VBeapQHWtAuxb1xYyUNar0e4/2RGrmTiYqPSyFGyX Nt2gy4iq5yUAUMN09r9imnWs2AvSn9nmz9qWyV3YNZ1SQjX/NoCo/oHn0XiVXrkFiWQd ya1l5qDmeTdx7wVVksvqfsm16ba/a9BWFsbXEi+9JSBYPFgcICOv3f5h9IcdYOA5pG/O PqmYYEiKYG7fQ1LVnjKxZIi29g+ifMtK2I1xfblBPAf3VfaOUVDXFUbZ7yueG9VG0H3o Q5fA== X-Gm-Message-State: AA6/9RmCAxnuP8vEUqB/Fj6XbZ8QH0DCGNkus2wg+9LhGQdHuYh+FkVkZedv4/WztYOMVg== X-Received: by 10.157.54.117 with SMTP id w108mr381641otb.66.1475537961776; Mon, 03 Oct 2016 16:39:21 -0700 (PDT) Received: from localhost.localdomain ([181.22.58.118]) by smtp.gmail.com with ESMTPSA id m66sm183582oia.25.2016.10.03.16.39.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Oct 2016 16:39:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Oct 2016 20:36:58 -0300 Message-Id: <20161003233707.3624-3-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 In-Reply-To: <20161003233707.3624-1-jamrial@gmail.com> References: <20161003233707.3624-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 02/11] avformat/matroskaenc: print debug message with cluster offsets only if the output is seekable 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Printing the dynamic buffer offset is useless. Signed-off-by: James Almer --- libavformat/matroskaenc.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 32d5dcf..501bab2 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1934,10 +1934,15 @@ static void mkv_start_new_cluster(AVFormatContext *s, AVPacket *pkt) pb = mkv->dyn_bc; } - av_log(s, AV_LOG_DEBUG, - "Starting new cluster at offset %" PRIu64 " bytes, " - "pts %" PRIu64 "dts %" PRIu64 "\n", - avio_tell(pb), pkt->pts, pkt->dts); + if (s->pb->seekable) + av_log(s, AV_LOG_DEBUG, + "Starting new cluster at offset %" PRIu64 " bytes, " + "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); end_ebml_master(pb, mkv->cluster); mkv->cluster_pos = -1; if (mkv->dyn_bc) @@ -2120,9 +2125,12 @@ static int mkv_write_flush_packet(AVFormatContext *s, AVPacket *pkt) pb = mkv->dyn_bc; if (!pkt) { if (mkv->cluster_pos != -1) { - av_log(s, AV_LOG_DEBUG, - "Flushing cluster at offset %" PRIu64 " bytes\n", - avio_tell(pb)); + if (s->pb->seekable) + 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"); end_ebml_master(pb, mkv->cluster); mkv->cluster_pos = -1; if (mkv->dyn_bc)