From patchwork Fri Oct 7 06:05:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 903 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1260683vsd; Thu, 6 Oct 2016 23:19:41 -0700 (PDT) X-Received: by 10.194.115.38 with SMTP id jl6mr15266092wjb.28.1475821181123; Thu, 06 Oct 2016 23:19:41 -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 cc10si20926218wjc.34.2016.10.06.23.19.40; Thu, 06 Oct 2016 23:19:41 -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 676426897F8; Fri, 7 Oct 2016 09:19:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 928B668060B for ; Fri, 7 Oct 2016 09:19:14 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id n189so2173718qke.1 for ; Thu, 06 Oct 2016 23:19: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=rgQBHZgFGIPgAXKCvHzVu/mvDB19fU+kqGySq6cMLh8=; b=GH1RvaI2O4uBEMV9mjJEtdqUZdAuq2lvv51hFNRlSNwqKovLtPj1fq/HCqv9DFA2gB lkfHIrfD9/DCYhv30UjgoDBfzlFjAl2LEWhUt1ftPMrARd8hOsRpfRltnoQI7vWTQm/i tA9TSmTYS5E3sJ1o6EpeXrbwTGS/n2oZmoDnSG6mhnWvGWhyqszPdE8ovQS2Amajmoyn NUomISm99/wMmQZNlwZkGKG8SCvbFsUv84wDvI3QbU8KV80s3cR5NkHQz/HQ9HYo3UVW 2RkXjzF314LZKP6skoHgNXr8pwet4iY66jW+I2rpQ7KylK10Tp3pIGOkp2Snn3v7ngUV TC7g== 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=rgQBHZgFGIPgAXKCvHzVu/mvDB19fU+kqGySq6cMLh8=; b=YqxQ/9j+Uszsr+A/F0t3ux/RzZfr31KPxeGUCr+e0e+5j+K//LX1K+QExd2TJr9D7Y bIZ/93dld+QRQTZaK7uYzpD8FcecLMsodairg5h7ORgANtZ7TOwQyc7fIIcJrVL9pW2C eu/B5fgstMh9BYdonADVBKTU/ru6hFxKfMk+HYve7SsfOTdtMYjK/FOugBq5zTorC/bJ iKSbGBRX10JHC+wrEV6a7QWQ4BogRY6EkY35dMKkeQZEai+fDpX1QrY0/wQVC80bk+kM cvEZIjLToYt4N3B5BWVyr1j2k912RM4W9oHIJuXjFKMeEG5zeT8jcW2Tm/jc5FlOS2Co qfZg== X-Gm-Message-State: AA6/9RnvkiJKitVLj38zL27EcPUy0T7k9oNkWU2o6Kke0IiCkiKQTMaMa+UYM0Hdzx9Z6w== X-Received: by 10.55.149.3 with SMTP id x3mr86856qkd.152.1475820401753; Thu, 06 Oct 2016 23:06:41 -0700 (PDT) Received: from localhost.localdomain ([181.22.68.3]) by smtp.gmail.com with ESMTPSA id p22sm736358qka.43.2016.10.06.23.06.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Oct 2016 23:06:41 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Oct 2016 03:05:36 -0300 Message-Id: <20161007060536.8136-2-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 In-Reply-To: <20161007060536.8136-1-jamrial@gmail.com> References: <20161007060536.8136-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2 v2] avformat/matroskaenc: fix targets for attachment tags 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" Attachment tags were being written targetting non-existent streams in the output file. Also filter filename and mimetype entries, as they are standard elements in the Attachment master. Signed-off-by: James Almer --- Now rebased after the CRC32 patchset. The fileuid is changed to be four bytes long instead of eight, because the mkv_write_tag*() functions pass that value as unsigned int. If preferred i can change them to pass uint64_t and keep the current huge fileuids. libavformat/matroskaenc.c | 66 ++++++++++++++++++++++++++++++++++++++++++----- tests/ref/lavf/mkv | 4 +-- 2 files changed, 61 insertions(+), 9 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 286b8b4..61baeb2 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -96,6 +96,16 @@ typedef struct mkv_track { int64_t ts_offset; } mkv_track; +typedef struct mkv_attachment { + int stream_idx; + uint32_t fileuid; +} mkv_attachment; + +typedef struct mkv_attachments { + mkv_attachment *entries; + int num_entries; +} mkv_attachments; + #define MODE_MATROSKAv2 0x01 #define MODE_WEBM 0x02 @@ -121,6 +131,7 @@ typedef struct MatroskaMuxContext { mkv_seekhead *main_seekhead; mkv_cues *cues; mkv_track *tracks; + mkv_attachments *attachments; AVPacket cur_audio_pkt; @@ -368,6 +379,10 @@ static void mkv_free(MatroskaMuxContext *mkv) { av_freep(&mkv->cues->entries); av_freep(&mkv->cues); } + if (mkv->attachments) { + av_freep(&mkv->attachments->entries); + av_freep(&mkv->attachments); + } av_freep(&mkv->tracks); av_freep(&mkv->stream_durations); av_freep(&mkv->stream_duration_offsets); @@ -1393,7 +1408,10 @@ static int mkv_check_tag_name(const char *name, unsigned int elementid) av_strcasecmp(name, "encoding_tool") && av_strcasecmp(name, "duration") && (elementid != MATROSKA_ID_TAGTARGETS_TRACKUID || - av_strcasecmp(name, "language")); + av_strcasecmp(name, "language")) && + (elementid != MATROSKA_ID_TAGTARGETS_ATTACHUID || + (av_strcasecmp(name, "filename") && + av_strcasecmp(name, "mimetype"))); } static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int elementid, @@ -1446,6 +1464,9 @@ static int mkv_write_tags(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; + if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) + continue; + if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID)) continue; @@ -1456,9 +1477,13 @@ static int mkv_write_tags(AVFormatContext *s) if (s->pb->seekable && !mkv->is_live) { for (i = 0; i < s->nb_streams; i++) { AVIOContext *pb; + AVStream *st = s->streams[i]; ebml_master tag_target; ebml_master tag; + if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) + continue; + mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1, &mkv->tags, &tag_target); pb = mkv->tags_bc; @@ -1484,6 +1509,20 @@ static int mkv_write_tags(AVFormatContext *s) if (ret < 0) return ret; } + if (mkv->have_attachments) { + for (i = 0; i < mkv->attachments->num_entries; i++) { + mkv_attachment *attachment = &mkv->attachments->entries[i]; + AVStream *st = s->streams[attachment->stream_idx]; + + if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID)) + continue; + + ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID, attachment->fileuid, &mkv->tags); + if (ret < 0) + return ret; + } + } + if (mkv->tags.pos) { if (s->pb->seekable && !mkv->is_live) put_ebml_void(s->pb, avio_tell(mkv->tags_bc) + ((mkv->write_crc && mkv->mode != MODE_WEBM) ? 2 /* ebml id + data size */ + 4 /* CRC32 */ : 0)); @@ -1504,6 +1543,10 @@ static int mkv_write_attachments(AVFormatContext *s) if (!mkv->have_attachments) return 0; + mkv->attachments = av_mallocz(sizeof(*mkv->attachments)); + if (!mkv->attachments) + return ret; + av_lfg_init(&c, av_get_random_seed()); ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_ATTACHMENTS, avio_tell(pb)); @@ -1515,13 +1558,19 @@ static int mkv_write_attachments(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; ebml_master attached_file; + mkv_attachment *attachment = mkv->attachments->entries; AVDictionaryEntry *t; const char *mimetype = NULL; - uint64_t fileuid; + uint32_t fileuid; if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT) continue; + attachment = av_realloc_array(attachment, mkv->attachments->num_entries + 1, sizeof(mkv_attachment)); + if (!attachment) + return AVERROR(ENOMEM); + mkv->attachments->entries = attachment; + attached_file = start_ebml_master(dyn_cp, MATROSKA_ID_ATTACHEDFILE, 0); if (t = av_dict_get(st->metadata, "title", NULL, 0)) @@ -1561,17 +1610,20 @@ static int mkv_write_attachments(AVFormatContext *s) av_sha_update(sha, st->codecpar->extradata, st->codecpar->extradata_size); av_sha_final(sha, digest); av_free(sha); - fileuid = AV_RL64(digest); + fileuid = AV_RL32(digest); } else { fileuid = av_lfg_get(&c); } - av_log(s, AV_LOG_VERBOSE, "Using %.16"PRIx64" for attachment %d\n", - fileuid, i); + av_log(s, AV_LOG_VERBOSE, "Using %.8"PRIx32" for attachment %d\n", + fileuid, mkv->attachments->num_entries); 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); + + mkv->attachments->entries[mkv->attachments->num_entries].stream_idx = i; + mkv->attachments->entries[mkv->attachments->num_entries++].fileuid = fileuid; } end_ebml_master_crc32(pb, &dyn_cp, mkv, attachments); @@ -1751,11 +1803,11 @@ static int mkv_write_header(AVFormatContext *s) if (ret < 0) goto fail; - ret = mkv_write_tags(s); + ret = mkv_write_attachments(s); if (ret < 0) goto fail; - ret = mkv_write_attachments(s); + ret = mkv_write_tags(s); if (ret < 0) goto fail; } diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 0fc5bec..5f57083 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,5 +1,5 @@ -591d55099c938bd7560585da13874a4c *./tests/data/lavf/lavf.mkv -472929 ./tests/data/lavf/lavf.mkv +a06683a6eb4af6fe8ffe5603c1942a97 *./tests/data/lavf/lavf.mkv +472755 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 c1009a6b9b4ef7e0eb0775d227131415 *./tests/data/lavf/lavf.mkv 320599 ./tests/data/lavf/lavf.mkv