From patchwork Mon Oct 3 23:37:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 854 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1859138vsd; Mon, 3 Oct 2016 16:40:18 -0700 (PDT) X-Received: by 10.194.173.100 with SMTP id bj4mr367906wjc.221.1475538017986; Mon, 03 Oct 2016 16:40:17 -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 an10si869992wjc.89.2016.10.03.16.40.17; Mon, 03 Oct 2016 16:40:17 -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 0F6CB689C48; 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 26A6A68993F for ; Tue, 4 Oct 2016 02:39:21 +0300 (EEST) Received: by mail-oi0-f65.google.com with SMTP id o93so816974oik.0 for ; Mon, 03 Oct 2016 16:39:35 -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=j4m81zeYYtH8qwSvvWve3mPpFpCdJVEBJBXTxFomKK4=; b=yWKATHDnZwOEGJvg7BRDNyFQzhgF8CyawZCo1kdpTX9DA6roUek28o7XZnnBXSgDDo dhJv8HB0v0DGgAyH6jI9Hac4grXRT10ssEjMELgbGZqF+1HaUp1olqBy21BcqCHd/Ykh IIm5I1iUyX7hE3jaRwVW/8i1lJE5ye9XVH2ZQ5OGqHRjqE+C38DWmkPxnvIJH+OY0hoa Q3A6LUpt211ZwegNY+Z3MXwoCzg89tZBNgFTVE+j4Q0qCGSHJFU74kiMARLXHaz338CX gK7mtH+nRqMs4yPW2j69bb7/o27eHYG7QGVAGxww5h6w+ol5uxl/Ne/n3YkTQCsNS3ev Hfcw== 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=j4m81zeYYtH8qwSvvWve3mPpFpCdJVEBJBXTxFomKK4=; b=FJdd2fvK4lFPg5rP9SnlcM/YT5DryXjoHzlK2sm2xt2mozegvC5o0qR5WDK49xiYF9 vIBDi15713RpuFVAWkRKbYpJPX8FPnBvAWQfm4HyS1MDK4wSTfbFKiiRjljPCvaMYJ99 CcE2PRqN/3o8QSfb8P/Mw8U37MRxTBIQkl3zuzZQvtqdz+BE/265igVBS4F0SgtlNnvL SR8EnD/RUBhyP/aZ15ZnYIb1QUMSyqT7G8+awsw+V1UERoP0pW6jNFzQZqxtSrYtxYfx gp/H0lu/o0Vv+OBkg1PnOiXLYFsYxr/PBnL+K13ykxS0Yd0eA7cLGtCeL14vIzeKjA+x mOBw== X-Gm-Message-State: AA6/9RlHUeg2eI0pyeYl3jPtgEOb4bKi0oo3HnQNbFE3jk9ZZzrgfMZyYZebFNAG2pyWLg== X-Received: by 10.157.40.66 with SMTP id h2mr358509otd.213.1475537974332; Mon, 03 Oct 2016 16:39:34 -0700 (PDT) Received: from localhost.localdomain ([181.22.58.118]) by smtp.gmail.com with ESMTPSA id m66sm183582oia.25.2016.10.03.16.39.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Oct 2016 16:39:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Oct 2016 20:37:05 -0300 Message-Id: <20161003233707.3624-10-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 09/11] avformat/matroskaenc: write a CRC32 element on Attachments 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 | 21 +++++++++++---------- tests/ref/lavf/mkv | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 9687833..c63ecdd 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1467,7 +1467,7 @@ static int mkv_write_tags(AVFormatContext *s) static int mkv_write_attachments(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; - AVIOContext *pb = s->pb; + AVIOContext *dyn_cp, *pb = s->pb; ebml_master attachments; AVLFG c; int i, ret; @@ -1480,7 +1480,8 @@ static int mkv_write_attachments(AVFormatContext *s) ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_ATTACHMENTS, avio_tell(pb)); if (ret < 0) return ret; - attachments = start_ebml_master(pb, MATROSKA_ID_ATTACHMENTS, 0); + ret = start_ebml_master_crc32(pb, &dyn_cp, &attachments, MATROSKA_ID_ATTACHMENTS, 0); + if (ret < 0) return ret; for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; @@ -1492,15 +1493,15 @@ static int mkv_write_attachments(AVFormatContext *s) if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT) continue; - attached_file = start_ebml_master(pb, MATROSKA_ID_ATTACHEDFILE, 0); + attached_file = start_ebml_master(dyn_cp, MATROSKA_ID_ATTACHEDFILE, 0); if (t = av_dict_get(st->metadata, "title", NULL, 0)) - put_ebml_string(pb, MATROSKA_ID_FILEDESC, t->value); + put_ebml_string(dyn_cp, MATROSKA_ID_FILEDESC, t->value); if (!(t = av_dict_get(st->metadata, "filename", NULL, 0))) { av_log(s, AV_LOG_ERROR, "Attachment stream %d has no filename tag.\n", i); return AVERROR(EINVAL); } - put_ebml_string(pb, MATROSKA_ID_FILENAME, t->value); + put_ebml_string(dyn_cp, MATROSKA_ID_FILENAME, t->value); if (t = av_dict_get(st->metadata, "mimetype", NULL, 0)) mimetype = t->value; else if (st->codecpar->codec_id != AV_CODEC_ID_NONE ) { @@ -1538,12 +1539,12 @@ static int mkv_write_attachments(AVFormatContext *s) av_log(s, AV_LOG_VERBOSE, "Using %.16"PRIx64" for attachment %d\n", fileuid, i); - put_ebml_string(pb, MATROSKA_ID_FILEMIMETYPE, mimetype); - put_ebml_binary(pb, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size); - put_ebml_uint(pb, MATROSKA_ID_FILEUID, fileuid); - end_ebml_master(pb, attached_file); + put_ebml_string(dyn_cp, MATROSKA_ID_FILEMIMETYPE, mimetype); + put_ebml_binary(dyn_cp, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size); + put_ebml_uint(dyn_cp, MATROSKA_ID_FILEUID, fileuid); + end_ebml_master(dyn_cp, attached_file); } - end_ebml_master(pb, attachments); + end_ebml_master_crc32(pb, &dyn_cp, mkv, attachments); return 0; } diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index a0ba445..951feac 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,5 +1,5 @@ -ef45f99b000001ec39e3a8e744fbde78 *./tests/data/lavf/lavf.mkv -472932 ./tests/data/lavf/lavf.mkv +b3599e3229821a84116b4f03f324a08b *./tests/data/lavf/lavf.mkv +472938 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 c56b90945e6e14a9b4b7f1ab94e3ad28 *./tests/data/lavf/lavf.mkv 320608 ./tests/data/lavf/lavf.mkv