From patchwork Thu May 28 04:10:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 19913 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 15E7244B9ED for ; Thu, 28 May 2020 07:10:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBCD768A7B8; Thu, 28 May 2020 07:10:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from so254-54.mailgun.net (so254-54.mailgun.net [198.61.254.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE3F46880CC for ; Thu, 28 May 2020 07:10:48 +0300 (EEST) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=rcombs.me; q=dns/txt; s=mx; t=1590639052; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-Id: Date: Subject: To: From: Sender; bh=Y7D1yJCVhz97xVE2mfBzC1NeyTce1hyY9iLrd/jXcGg=; b=paihzDK8GOGgZNWBA+jLgLF/46Q+kxFQTINnPUVfD9WIxWXP5MEhNQlBwzxA6KzS34HOTBvT sj5Jd14V0BjDF7H4ywIVK+RubAo27ALjTS33HQYjYNHaJclrJr7LmQm6tFfaBC0i30Z6Rk+w rg66iaBYVK8N+TH8HkypzRJWXPg= X-Mailgun-Sending-Ip: 198.61.254.54 X-Mailgun-Sid: WyJiZDU1MSIsICJmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZyIsICJiMGJhIl0= Received: from rcombs-mbp.localdomain ( [24.14.135.13]) by smtp-out-n03.prod.us-east-1.postgun.com with SMTP id 5ecf39ad2dd9e15ae3a25a81 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Thu, 28 May 2020 04:10:21 GMT From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 May 2020 23:10:16 -0500 Message-Id: <20200528041016.73393-4-rcombs@rcombs.me> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200528041016.73393-1-rcombs@rcombs.me> References: <20200528041016.73393-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavf/matroskaenc: mux WebVTT using standard (non-WebM) formatting 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/matroskaenc.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1f7a9528de..d34a47e646 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1351,7 +1351,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, return AVERROR(ENOSYS); } - if (mkv->mode != MODE_WEBM || par->codec_id != AV_CODEC_ID_WEBVTT) + if (mkv->mode != MODE_WEBM) native_id = MATROSKA_TRACK_TYPE_SUBTITLE; put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, native_id); @@ -1361,7 +1361,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, return AVERROR(EINVAL); } - if (mkv->mode != MODE_WEBM || par->codec_id != AV_CODEC_ID_WEBVTT) { + if (mkv->mode != MODE_WEBM) { track->codecpriv_offset = avio_tell(pb); ret = mkv_write_codecprivate(s, pb, par, native_id, qt_id); if (ret < 0) @@ -2117,20 +2117,22 @@ static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, const AVPac MatroskaMuxContext *mkv = s->priv_data; mkv_track *track = &mkv->tracks[pkt->stream_index]; ebml_master blockgroup; - int id_size, settings_size, size; - uint8_t *id, *settings; + int id_size = 0, settings_size = 0, comment_size = 0, size = pkt->size; + uint8_t *id, *settings, *comment; int64_t ts = track->write_dts ? pkt->dts : pkt->pts; const int flags = 0; - id_size = 0; id = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size); - settings_size = 0; settings = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size); - size = id_size + 1 + settings_size + 1 + pkt->size; + comment = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_COMMENT, + &comment_size); + + if (mkv->mode == MODE_WEBM) + size += id_size + 1 + settings_size + 1; /* The following string is identical to the one in mkv_write_block so that * only one copy needs to exist in binaries. */ @@ -2149,7 +2151,22 @@ static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, const AVPac put_ebml_num(pb, track->track_num, track->track_num_size); avio_wb16(pb, ts - mkv->cluster_pts); avio_w8(pb, flags); - avio_printf(pb, "%.*s\n%.*s\n%.*s", id_size, id, settings_size, settings, pkt->size, pkt->data); + if (mkv->mode == MODE_WEBM) + avio_printf(pb, "%.*s\n%.*s\n", id_size, id, settings_size, settings); + avio_write(pb, pkt->data, pkt->size); + + if (mkv->mode != MODE_WEBM && (id_size || settings_size || comment_size)) { + ebml_master block_additions = start_ebml_master(pb, MATROSKA_ID_BLOCKADDITIONS, 0); + ebml_master block_more = start_ebml_master(pb, MATROSKA_ID_BLOCKMORE, 0); + /* Until dbc50f8a our demuxer used a wrong default value + * of BlockAddID, so we write it unconditionally. */ + put_ebml_uint (pb, MATROSKA_ID_BLOCKADDID, 1); + put_ebml_id(pb, MATROSKA_ID_BLOCKADDITIONAL); + put_ebml_length(pb, id_size + 1 + settings_size + 1 + comment_size, 0); + avio_printf(pb, "%.*s\n%.*s\n%.*s", id_size, id, settings_size, settings, comment_size, comment); + end_ebml_master(pb, block_more); + end_ebml_master(pb, block_additions); + } put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, pkt->duration); end_ebml_master(pb, blockgroup);