From patchwork Sat Apr 6 10:02:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Felix de Souza via ffmpeg-devel X-Patchwork-Id: 12624 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 D9F1F44981E for ; Sat, 6 Apr 2019 13:03:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C50FD68AB9D; Sat, 6 Apr 2019 13:03: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 D4D9B68A9EC for ; Sat, 6 Apr 2019 13:03:35 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id n25so9566475wmk.4 for ; Sat, 06 Apr 2019 03:03:35 -0700 (PDT) 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=7wSwxpOsOw2yO3vMRYX1AOpH2/LIYR3uNe0Tq7ey6eo=; b=rBpWw3xFMAEmlPnNSEYIeLPkSxSxqwMSeKmVJkpQywc3turADOHRuYE13y3qPr6Po2 ygiM3fDf/oTEtdV76wkAYw8umegPBrBQFIg+efegXTg1xABXwi43UOxhOWTk7lISiSGr IQbCGLBaKpmml2fWnSM6Z6BZmFmn3pv2mcKcYMlv9URzIkDb+Ga/bJ2KK1v0E6F/xsBB tbTcKs/HStT3KsU8IKp6VSZ6+TgXqBHIxbA7vbRaROGRo3QVcK1nqwTxhCbYq/CoIpyW 5BgiNvQjD6/7u8hmicrPlGx96hjaKqC9sNIbE+thL9N7dqhocIwljm4shxOYg/yrzanw Jhmw== X-Gm-Message-State: APjAAAV2/EuqUnT40xN6tP439w7gLhD0OFhAzj5CQCX5J8eISjMBc59t JleGcRnIiiw1lrR7rghypOfAOMsM X-Google-Smtp-Source: APXvYqwaUMLVv0JOXRRyVhF5Zt7e/U3e+vQFhnGKBWAxKtNa3j1cCKH1I5W08HudSKcwxT/QHvhd8w== X-Received: by 2002:a1c:230e:: with SMTP id j14mr11373974wmj.120.1554545014955; Sat, 06 Apr 2019 03:03:34 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id o12sm25007545wrx.92.2019.04.06.03.03.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Apr 2019 03:03:34 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Apr 2019 12:02:49 +0200 Message-Id: <20190406100249.4540-3-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190406100249.4540-1-andreas.rheinhardt@googlemail.com> References: <20190406100249.4540-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/matroskaenc: Write attached_pic as attachment 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: , X-Patchwork-Original-From: Andreas Rheinhardt via ffmpeg-devel From: Diego Felix de Souza via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This commit changes the way video streams with disposition AV_DISPOSITION_ATTACHED_PIC and that actually contain an attached_pic are handled: From now on, they will be written as attachment, not as a Matroska Track. The restriction to tracks that actually contain an attached_pic is important. E.g. simply setting the disposition via FFmpeg does not populate the attached_pic field. Such tracks are treated as video tracks just as now. If the stream originated from a non-Matroska container, then the user must likely also populate the filename metadata key for this stream. This fixes tickets #2270 and #4591 and partially fixes #7717. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index b9f99c4463..8730062f81 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -179,6 +179,12 @@ typedef struct MatroskaMuxContext { /** Seek preroll value for opus */ #define OPUS_SEEK_PREROLL 80000000 +/** To unify handling of attachments and attached pics */ +#define DISPOSITION_ATTACHED_PIC(st) ((st)->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && \ + (st)->disposition & AV_DISPOSITION_ATTACHED_PIC) +#define IS_ATTACHMENT(st) ((st)->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT || \ + DISPOSITION_ATTACHED_PIC(st) && (st)->attached_pic.data) + static int ebml_id_size(unsigned int id) { return (av_log2(id + 1) - 1) / 7 + 1; @@ -1191,10 +1197,12 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, int j, ret; AVDictionaryEntry *tag; - if (par->codec_type == AVMEDIA_TYPE_ATTACHMENT) { + if (IS_ATTACHMENT(st)) { mkv->have_attachments = 1; return 0; - } + } else if (DISPOSITION_ATTACHED_PIC(st) && !st->attached_pic.data) + av_log(s, AV_LOG_ERROR, "Stream with attached pic disposition doesn't " + "contain an attached pic. Treating as video track\n"); if (par->codec_type == AVMEDIA_TYPE_AUDIO) { if (!bit_depth && par->codec_id != AV_CODEC_ID_ADPCM_G726) { @@ -1660,7 +1668,7 @@ 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) + if (IS_ATTACHMENT(st)) continue; if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID)) @@ -1677,7 +1685,7 @@ static int mkv_write_tags(AVFormatContext *s) ebml_master tag_target; ebml_master tag; - if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) + if (IS_ATTACHMENT(st)) continue; mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1, &mkv->tags, &tag_target); @@ -1762,7 +1770,7 @@ static int mkv_write_attachments(AVFormatContext *s) const char *mimetype = NULL; uint32_t fileuid; - if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT) + if (!IS_ATTACHMENT(st)) continue; attachment = av_realloc_array(attachment, mkv->attachments->num_entries + 1, sizeof(mkv_attachment)); @@ -1817,7 +1825,10 @@ static int mkv_write_attachments(AVFormatContext *s) 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); + if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) + put_ebml_binary(dyn_cp, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size); + else + put_ebml_binary(dyn_cp, MATROSKA_ID_FILEDATA, st->attached_pic.data, st->attached_pic.size); put_ebml_uint(dyn_cp, MATROSKA_ID_FILEUID, fileuid); end_ebml_master(dyn_cp, attached_file); @@ -2557,6 +2568,10 @@ static int mkv_write_flush_packet(AVFormatContext *s, AVPacket *pkt) avio_flush(s->pb); } return 1; + } else { + AVStream *st = s->streams[pkt->stream_index]; + if (DISPOSITION_ATTACHED_PIC(st) && st->attached_pic.data) + return 0; } return mkv_write_packet(s, pkt); }