From patchwork Tue Apr 16 02:02:03 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: 12762 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 745A44499BA for ; Tue, 16 Apr 2019 05:10:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A05C68A0C9; Tue, 16 Apr 2019 05:10:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59416689D19 for ; Tue, 16 Apr 2019 05:10:50 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id y7so24528490wrn.11 for ; Mon, 15 Apr 2019 19:10:50 -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=BniSZaY4Z7ebmc556lJ8PWFzjRnIjwYJrv2H4ZjbL4c=; b=NxfoTBI5jEtlL/9WOHVtDOhk36qWODIaBMsiCYdNgcTS8HBU62tqqV1nDzgwA9EU7C 5qqXxFsVTr8bKLhfEVA4dcRNmpYffThNjNCjtjwFNMXobtUlD3U3DBoOqsgK3191iQX5 GroqwwE5PM95UaPApbySPQHjTV/7e7GsoJzpLe7FUTvke8ezM2LnE+ekLJqGRbXnL+g/ wM2H3m+md3oNsB1znQshorLpN4IXvkxRh9i0CnfUSgWumYDj2QjBUFaB5/rjob6NMg2Z tDeNEE5qZpBX1udZRxlwXawrB71WWnmrLUeObGVPOdJr/90eQYE15BWr+rc35lXwX+16 Jgrg== X-Gm-Message-State: APjAAAXEjkgyyvcB2A+1/Utq5bIAOq3b+mFoNEzCWr9HkWFXlBjpX2Us NbIwjhPcaQkyZQdqLed7sOBuESD7 X-Google-Smtp-Source: APXvYqwlVGIuf5kdYuj4EHDUEvV3NgCuzcPEQFGrHT1gtLpx7WoiA7l7EFykXNKpYaIU4huwNkhrDw== X-Received: by 2002:a05:6000:1286:: with SMTP id f6mr16035607wrx.93.1555380165186; Mon, 15 Apr 2019 19:02:45 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id m6sm66335000wrr.53.2019.04.15.19.02.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 19:02:44 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Apr 2019 04:02:03 +0200 Message-Id: <20190416020204.30487-1-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190402133305.3328-15-andreas.rheinhardt@googlemail.com> References: <20190402133305.3328-15-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: Improve log messages for blocks 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" Up until now, a block's relative offset has been reported as the offset in the log messages output when writing blocks; given that it is impossible to know the real offset from the beginning of the file at this point due to the fact that it is not yet known how many bytes will be used for the containing cluster's length field both the relative offset in the cluster as well as the offset of the containing cluster will be reported from now on. Also, the log message for writing vtt blocks has been brought in line with the message for normal blocks. Signed-off-by: Andreas Rheinhardt --- Sorry for sending this a third time, but I just found out that my second attempt had an unnecessary space ("in cluster"), so here is the updated version. And I'd like to take this opportunity to ping the whole patchset. libavformat/matroskaenc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 441315e2d5..fc0e95440e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2124,10 +2124,10 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, ts += mkv->tracks[pkt->stream_index].ts_offset; - av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, " - "pts %" PRId64 ", dts %" PRId64 ", duration %" PRId64 ", keyframe %d\n", - avio_tell(pb), pkt->size, pkt->pts, pkt->dts, pkt->duration, - keyframe != 0); + av_log(s, AV_LOG_DEBUG, "Writing block at relative offset %" PRId64 " in " + "cluster at offset %" PRId64 "; size %d, pts %" PRId64 ", dts %" PRId64 + ", duration %" PRId64 ", keyframe %d\n", avio_tell(pb), mkv->cluster_pos, + pkt->size, pkt->pts, pkt->dts, pkt->duration, keyframe != 0); if (par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 && (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) ff_avc_parse_nal_units_buf(pkt->data, &data, &size); @@ -2231,9 +2231,10 @@ static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *p size = id_size + 1 + settings_size + 1 + pkt->size; - av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, " - "pts %" PRId64 ", dts %" PRId64 ", duration %" PRId64 ", flags %d\n", - avio_tell(pb), size, pkt->pts, pkt->dts, pkt->duration, flags); + av_log(s, AV_LOG_DEBUG, "Writing block at relative offset %" PRId64 " in " + "cluster at offset %" PRId64 "; size %d, pts %" PRId64 ", dts %" PRId64 + ", duration %" PRId64 ", keyframe %d\n", avio_tell(pb), mkv->cluster_pos, + size, pkt->pts, pkt->dts, pkt->duration, 1); blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(size));