From patchwork Fri Apr 19 23:41:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12826 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 4D0D04494CF for ; Sat, 20 Apr 2019 02:51:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 38FC068AB07; Sat, 20 Apr 2019 02:51:00 +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 0070468AAAA for ; Sat, 20 Apr 2019 02:50:49 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id c6so2819031wrm.1 for ; Fri, 19 Apr 2019 16:50:49 -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=cgzwc1JsjJXCkj6PHLH+T2f3vJ23jCzEpZIWon9n3jk=; b=TqoxE45zxLmPW23wvId5gI+HkSAVw58WUDMwmi7NZ7Xf/i3YR6WyERPeIZ8qAg7ItV 3nBb3S1RHOECSNHpb5i+ro48TwPh2RfrwwEeL+T012x+isj6pVfic0yilT3inEbykTBC YbZwwy4LOiT2xIbJ2WFcebnYRrItd8eBkBkiucIKnC5aDrsKgPHUq20Rg9b6yZfkdvH7 Pdls77vj2MtjHMn1XYoY3dvyFVWjuHPA7kT6QDbS2zp4Uohu/h8kkXsfB8uNWXZ1xqdM i747sNvFQYVrMIMqSpqk+bOEpeHr40wnFWntYulhKySlJjXOsM0iqJD3yCV8ufxA50+f ui3A== 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=cgzwc1JsjJXCkj6PHLH+T2f3vJ23jCzEpZIWon9n3jk=; b=IQrKwhCYhDwNTTSqNYWmtoSEhkynP+Arslza82WpaOzUBmCXQx/U9BxQ+ilw3UCAls oZnA1xPwo8PX13ZVB6cF0LxO8MduTJ0YUFmUd2Y0PMSFoPWmxSRiEq4MHnEUWTmZ4UVW 75acFIgp7pzAZHZOrIVJV16aP268l17M+R3iJPj7umi+bszbJlxyR9hZpQtZ9ULHksJZ hOaobFdi1yLeMRPT8cEghtxMgKxqX5Ckf5DIRVdHHfCftogDhQM8fJB5P8InE+dibaQ5 7RTPttmm+wqaPYk+r2+3r1VR79+FurrtXYWZB90NdYf+jzdvsIcVxHmVNap7hbVhltRO uW2Q== X-Gm-Message-State: APjAAAVrEqaydgqPx0Tx0/Y5uzvkgRIZIngTRn6hANs6u/HSIQaeudGm MzY53ssHox3LSkpAZ9i/hPIwn0Cy X-Google-Smtp-Source: APXvYqwIyUJjyDrJcollimCnMEyjPdrrBe+C+4aixABcQDJFAl//2RZOcuAoKnS7V2CUa9ePjZKt8w== X-Received: by 2002:a5d:458f:: with SMTP id p15mr4881484wrq.188.1555717849310; Fri, 19 Apr 2019 16:50:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 16:50:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Apr 2019 01:41:09 +0200 Message-Id: <20190419234110.32980-14-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 14/15] 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: , 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 --- 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));