From patchwork Tue Oct 15 11:17:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15763 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 CBC9F446F15 for ; Tue, 15 Oct 2019 14:31:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ACAC968A1C3; Tue, 15 Oct 2019 14:31:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C298D68A119 for ; Tue, 15 Oct 2019 14:31:34 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id m18so19903707wmc.1 for ; Tue, 15 Oct 2019 04:31:34 -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=r2SMSgYL7MqDFu+fdg2VOn6rQsipFAaBpbUp1/wODl0=; b=Wpq3vKlJyp32qbhZMfAwmawicbEijrkENbAmejg0dnl4xDyP0yr2+hWWP5EWPmaEI0 Z27IOZFr/ulZ+CpfpBGpkgdRDPOIRcUGd3D9oY1F2qHoDuxPPWsWWmC7m2SBkNmASgOq OavehDZA7JXA1N+JDq4qSNSF7fAqN+z+unzckqyoHtm4H+nvobkbkjj/rOn+00VdPSiT mmUUR+6Elxnmel7vy962bHuimypAZLvkHvNyZ7PEnJGWK7bFJytxfuhUktC4hxa1fAPT Pxsd9g8gnM+TkUaO53jNeDeIz5aCJlN/55k/xqH2xKmhUk1232BxuTGd8IjvE8Q3MU12 l14A== 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=r2SMSgYL7MqDFu+fdg2VOn6rQsipFAaBpbUp1/wODl0=; b=QZTGkQjTSpESLgGNQmLobTdFeb0xRkM5IdDZx3NjC2RRaqADGNup7McYobzNEBsJvv cCqppz1M3NQxopi7RzEGkIR9VID4ef6Jx5Rye3ziCzbA5akrnnfDMg1921gpkkBJ0427 SUDPm4Pp9pqC38Npt6Tx1+N7r6A3ikvlLW2Jid/9AtNEan5+0E3LXoMUP5gmBfvwh4r2 /x6Srw4Z11VTHTVBL4ieneOB2+/mk99mTFIF4PHnxaV4Sl+cHzbQ+mcHT1HfUCMRfYkP 4uC38ZmGt0uR7KwMLI+fE1XG8PokUk2g1NKmkfwsMhzOCzmVESTJxEI2zxd/5keLhaI1 ZGEA== X-Gm-Message-State: APjAAAUGBHh2tdq1kqHA031x1jqJ6i/0OVXCP1usz2IBXRsQW6sFD4J/ OiocJBzzLRsb0MKSXD14xoCKrLKE X-Google-Smtp-Source: APXvYqyl1On8SDEZ0A5O2Ix00oesnacnlPeFuorbwr7YKbBTGZW7y5SRZtCbDTUxZA9yFnNTnMT/3g== X-Received: by 2002:a1c:ed04:: with SMTP id l4mr19849062wmh.116.1571138738073; Tue, 15 Oct 2019 04:25:38 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id y3sm4364637wmg.2.2019.10.15.04.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 04:25:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Oct 2019 13:17:33 +0200 Message-Id: <20191015111737.14246-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191015111737.14246-1-andreas.rheinhardt@gmail.com> References: <20191015111737.14246-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/9] avformat/matroskaenc: Use more appropriate function name 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" mkv_start_new_cluster() actually didn't start a new cluster, but ended the old one instead and emitted a debug message that it had started a new cluster. This has been changed: The debug message has been moved to the place that really starts a new cluster and the function has been renamed to mkv_end_cluster(). Furthermore, without this debug message the function can be used for flushing. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index eb8977ff9c..0d21ab055a 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2244,16 +2244,12 @@ static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *p return pkt->duration; } -static void mkv_start_new_cluster(AVFormatContext *s, AVPacket *pkt) +static void mkv_end_cluster(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; end_ebml_master_crc32(s->pb, &mkv->cluster_bc, mkv); mkv->cluster_pos = -1; - 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); avio_flush(s->pb); } @@ -2387,8 +2383,8 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_ if (mkv->cluster_pos != -1) { int64_t cluster_time = ts - mkv->cluster_pts; if ((int16_t)cluster_time != cluster_time) { + mkv_end_cluster(s); av_log(s, AV_LOG_WARNING, "Starting new cluster due to timestamp\n"); - mkv_start_new_cluster(s, pkt); } } @@ -2399,6 +2395,10 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_ return ret; put_ebml_uint(mkv->cluster_bc, MATROSKA_ID_CLUSTERTIMECODE, FFMAX(0, ts)); mkv->cluster_pts = FFMAX(0, ts); + av_log(s, AV_LOG_DEBUG, + "Starting new cluster with timestamp " + "%" PRId64 " at offset %" PRId64 " bytes\n", + mkv->cluster_pts, mkv->cluster_pos); } pb = mkv->cluster_bc; @@ -2491,7 +2491,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) } if (mkv->cluster_pos != -1 && start_new_cluster) { - mkv_start_new_cluster(s, pkt); + mkv_end_cluster(s); } if (!mkv->cluster_pos) @@ -2528,12 +2528,10 @@ static int mkv_write_flush_packet(AVFormatContext *s, AVPacket *pkt) if (!pkt) { if (mkv->cluster_pos != -1) { - end_ebml_master_crc32(s->pb, &mkv->cluster_bc, mkv); - mkv->cluster_pos = -1; + mkv_end_cluster(s); av_log(s, AV_LOG_DEBUG, "Flushing cluster at offset %" PRIu64 " bytes\n", avio_tell(s->pb)); - avio_flush(s->pb); } return 1; }