From patchwork Mon Oct 3 23:37:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 858 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1859173vsd; Mon, 3 Oct 2016 16:40:27 -0700 (PDT) X-Received: by 10.28.47.87 with SMTP id v84mr11019311wmv.50.1475538027226; Mon, 03 Oct 2016 16:40:27 -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 a185si1534117wmc.55.2016.10.03.16.40.26; Mon, 03 Oct 2016 16:40:27 -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 9BE4A689CCB; Tue, 4 Oct 2016 02:39:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f65.google.com (mail-oi0-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8792C68993F for ; Tue, 4 Oct 2016 02:39:16 +0300 (EEST) Received: by mail-oi0-f65.google.com with SMTP id n202so12656530oig.2 for ; Mon, 03 Oct 2016 16:39:30 -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=FyrXddj4UoHIMH6SwFRdRGJa6uYH5QJfQgt35xqiVG4=; b=kZarnb14/ySZQkZjoH7IWcu9dGEiDIZ840vprNuxdQvVKyYMMabkrKNlNbENUQVpRk JL/C7xJxZDAzTt8vzrWCXQDaTaepaglncA11bA5dqzyaGN41S7x603ztNkRmNcjPhWTB dKz6Sn+2zQl8Ea3gls/vMx5JwnrXJhF1lFD3IYhumFxbZwOPWC+wDaXzW4aluWq0JXbJ uHGWiaTc6bkBK2ecJCcAg/9do65mXL98HwDS//yCr6NQyG98wiZZXaFQn9OJGJbGH5GF F86JtuOvlz4trTw7iz1F2v5kvkfADCGHcsjAQ6MIqNX6mReqQuO+6ktDT+l44cyw6N6/ 3nKQ== 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=FyrXddj4UoHIMH6SwFRdRGJa6uYH5QJfQgt35xqiVG4=; b=RQ56u1PjWR+GTb5QwgDxi1bJw7MAhfeOVTVTjzPZpmxaL8YW3gDek8mvsoMOwLVMNW p0BxNg8H0RoCK6kuSz5QZmLD2ZhI7P+28NsNr4pYct/iHsKX0x/p9eDGKJoFVjBP3V0f A1RDxWv+57JWwYsHUF/74HA7vH7MfZwGTgVDqt3hPSyFuLE/tqSxgHgyBp4Lppd5Q5Ua TmQ+aenZkUZDCEpggEUGpHah+bExi7DEGRzYJeC5W7r9eF9sM5zscryy+/mBpnbI+/OL iQyk5pv2JS/eqkIEo2yC6PRBYCaWDg7AsWPpzNPI2re5owovqy64qoIkfbs9lh/Actix 2szQ== X-Gm-Message-State: AA6/9RkdzD6YwrsiKeIE+c1JtjxnRju4nR6EPv4fm+Vs1sZTBcuYc8fvGn0XGUpj6giVpA== X-Received: by 10.202.8.11 with SMTP id 11mr511814oii.19.1475537969597; Mon, 03 Oct 2016 16:39:29 -0700 (PDT) Received: from localhost.localdomain ([181.22.58.118]) by smtp.gmail.com with ESMTPSA id m66sm183582oia.25.2016.10.03.16.39.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Oct 2016 16:39:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Oct 2016 20:37:02 -0300 Message-Id: <20161003233707.3624-7-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 06/11] avformat/matroskaenc: write a CRC32 element on Cues 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" Implements part of ticket #4347 Signed-off-by: James Almer --- libavformat/matroskaenc.c | 29 ++++++++++++++++------------- tests/ref/fate/rgb24-mkv | 4 ++-- tests/ref/lavf/mkv | 8 ++++---- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index da45f7c..56ee1ec 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -514,13 +514,16 @@ static int mkv_add_cuepoint(mkv_cues *cues, int stream, int tracknum, int64_t ts static int64_t mkv_write_cues(AVFormatContext *s, mkv_cues *cues, mkv_track *tracks, int num_tracks) { - AVIOContext *pb = s->pb; + MatroskaMuxContext *mkv = s->priv_data; + AVIOContext *dyn_cp, *pb = s->pb; ebml_master cues_element; int64_t currentpos; - int i, j; + int i, j, ret; currentpos = avio_tell(pb); - cues_element = start_ebml_master(pb, MATROSKA_ID_CUES, 0); + ret = start_ebml_master_crc32(pb, &dyn_cp, &cues_element, MATROSKA_ID_CUES, 0); + if (ret < 0) + return ret; for (i = 0; i < cues->num_entries; i++) { ebml_master cuepoint, track_positions; @@ -540,8 +543,8 @@ static int64_t mkv_write_cues(AVFormatContext *s, mkv_cues *cues, mkv_track *tra ctp_nb ++; } - cuepoint = start_ebml_master(pb, MATROSKA_ID_POINTENTRY, MAX_CUEPOINT_SIZE(ctp_nb)); - put_ebml_uint(pb, MATROSKA_ID_CUETIME, pts); + cuepoint = start_ebml_master(dyn_cp, MATROSKA_ID_POINTENTRY, MAX_CUEPOINT_SIZE(ctp_nb)); + put_ebml_uint(dyn_cp, MATROSKA_ID_CUETIME, pts); // put all the entries from different tracks that have the exact same // timestamp into the same CuePoint @@ -553,18 +556,18 @@ static int64_t mkv_write_cues(AVFormatContext *s, mkv_cues *cues, mkv_track *tra if (tracks[tracknum].has_cue && s->streams[tracknum]->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) continue; tracks[tracknum].has_cue = 1; - track_positions = start_ebml_master(pb, MATROSKA_ID_CUETRACKPOSITION, MAX_CUETRACKPOS_SIZE); - put_ebml_uint(pb, MATROSKA_ID_CUETRACK , entry[j].tracknum ); - put_ebml_uint(pb, MATROSKA_ID_CUECLUSTERPOSITION , entry[j].cluster_pos); - put_ebml_uint(pb, MATROSKA_ID_CUERELATIVEPOSITION, entry[j].relative_pos); + track_positions = start_ebml_master(dyn_cp, MATROSKA_ID_CUETRACKPOSITION, MAX_CUETRACKPOS_SIZE); + put_ebml_uint(dyn_cp, MATROSKA_ID_CUETRACK , entry[j].tracknum ); + put_ebml_uint(dyn_cp, MATROSKA_ID_CUECLUSTERPOSITION , entry[j].cluster_pos); + put_ebml_uint(dyn_cp, MATROSKA_ID_CUERELATIVEPOSITION, entry[j].relative_pos); if (entry[j].duration != -1) - put_ebml_uint(pb, MATROSKA_ID_CUEDURATION , entry[j].duration); - end_ebml_master(pb, track_positions); + put_ebml_uint(dyn_cp, MATROSKA_ID_CUEDURATION , entry[j].duration); + end_ebml_master(dyn_cp, track_positions); } i += j - 1; - end_ebml_master(pb, cuepoint); + end_ebml_master(dyn_cp, cuepoint); } - end_ebml_master(pb, cues_element); + end_ebml_master_crc32(pb, &dyn_cp, mkv, cues_element); return currentpos; } diff --git a/tests/ref/fate/rgb24-mkv b/tests/ref/fate/rgb24-mkv index 6bcffa1..d1a9b6d 100644 --- a/tests/ref/fate/rgb24-mkv +++ b/tests/ref/fate/rgb24-mkv @@ -1,5 +1,5 @@ -c368e77c46109ac20e279ff83f9649b3 *tests/data/fate/rgb24-mkv.matroska -58340 tests/data/fate/rgb24-mkv.matroska +7f800fb3147ca8441f6b4d8cdfeec6d5 *tests/data/fate/rgb24-mkv.matroska +58346 tests/data/fate/rgb24-mkv.matroska #tb 0: 1/10 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 9c9394f..664a84d 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,6 +1,6 @@ -161e0ed817bd65194fd4001c0d5380f0 *./tests/data/lavf/lavf.mkv -472920 ./tests/data/lavf/lavf.mkv +d0376acc0f57613e193192a685d9a4d6 *./tests/data/lavf/lavf.mkv +472926 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 -7afba147b92da5115095fa52e214cfee *./tests/data/lavf/lavf.mkv -320596 ./tests/data/lavf/lavf.mkv +a08252617efbd7de6c8262e13ca7f3e4 *./tests/data/lavf/lavf.mkv +320602 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68