From patchwork Mon Aug 23 14:31:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 29742 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2135374iov; Mon, 23 Aug 2021 07:31:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwyXPfvPi45RjGSr40VpNSCrhCLGyGtTsTxxyRERowctnCshgMiyda6cZcg2w+r8KHpz2M X-Received: by 2002:aa7:c6c3:: with SMTP id b3mr37009951eds.217.1629729093785; Mon, 23 Aug 2021 07:31:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629729093; cv=none; d=google.com; s=arc-20160816; b=JzikS9rNyqYLJSh32yseC6+DNt4CW9DXoN7VBICPCAxbrxAWHVtb1qXskSM0nHqs10 GkXLw9P/V+m92jXGFQnXmei4Hdl3CHV/iywuovO+tEIBhmeaMxbuM3H7TXXWxwWoTC5x OwSwFRUQBZjR82HPY6f3WXtiGdVEMegWWTdd0z1Yd/wkdSEOBAaf7MZAoTlyQOfKMXHi eRULEOJtyRuOrR0QmJ71GSaNPy6cgYZBkPkgAT/Ijbdbrn1b6zTL8psq2h0vTDCnb9u8 eqcILU3n9kl6/feed3LC4/vBx6/Wo9PBLcgNguW6AnUFZYSuJyHN5X2g17ZLCYmjmYHX fIZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=NCPPyQYuRQ/2SZ/d77boVvAR8xuh6DjdQrSUuU87j5o=; b=fZpHcJf47TtkHT6abuy+LqhBuT7pOCoxlUR9wYi8BYvQtxb/cdlT3vEWFEwCmEyhaz FVlbssORVLss3dqs3AMme+Z5jObQ4QCH5YJS3KWo7iQLWqKVLsQlvH2fVMAnFSe/WtUz H3B3WrMcPC4WEBjhyGINEZM/8Xd6c/1fBQA9+3UTNYxOLj+R0PMbCt+GNFxfr5psJvBA YD9FQYbq9hB6lnAuStNDArHzhpMb2xYfWomrCb/fwUSdiqOrkQvhc6Y2KHbD4VZK3vSz GhadwGGXWnknzoU4LJhuETet76Sl+CHo+x8StSvuVMmmYWWo3czhYtQSA7dwJAjRbsPg 0JIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=N3SzdcKK; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i17si15172565ejw.666.2021.08.23.07.31.33; Mon, 23 Aug 2021 07:31:33 -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 header.s=20161025 header.b=N3SzdcKK; 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 sp=QUARANTINE 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 26E2968A33F; Mon, 23 Aug 2021 17:31:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C5496801A9 for ; Mon, 23 Aug 2021 17:31:23 +0300 (EEST) Received: by mail-lf1-f52.google.com with SMTP id g13so38269631lfj.12 for ; Mon, 23 Aug 2021 07:31:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=X7e2HMhg3u695VWYDaYsC0cGQDdfUVRZrIReBadBwQQ=; b=N3SzdcKKOwJed2VlfOPkoJn45bBFKrZmQ4yn1NE7RJERCsUP1j1+eU6FONKyU+b2/R +PmU09b/eoDUgdeSzMO6BRr8xs/OLOCfa4vtrpOom1c4D13x8x/fEctYtSIp/ffgGVq9 lTZB7+5QFpxJ/jMInubiAGJI61bpDl2HahlqsWsPu/XN5V8zZRr5Xr7qECbewEFlRiQb lm9MjaRh752xy8sWmUly+nDcecI151Ee8Ozj5j+/li/qkb4NQwWuLzsK2dM8Vu+MpgA2 rMsL4thm9v4ZYsA2b8N03sN3rYYYYEebzv+gF2jajmEBMjoONICXgePVmHsN4onKgeX8 S6mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=X7e2HMhg3u695VWYDaYsC0cGQDdfUVRZrIReBadBwQQ=; b=psAsnl+BQXnDC7cyDXPajF+bXmbL6fJ/Bh5HAMK5+yNVaajbrZpQLBDM7SKeWfjcbs 16Ug8/hgkDBKtaDY1jVG/deqvysB6vR+rVNTzOB1StugqGe4FsLzgsd0DUDDJbTY4Id/ RMMAdSLRyrZpX111v0TW2kD4SsASna7nvf3D4E/BoGttMtBYXIT16AlZOAtHNpiVQO3a bk9IJbSJcJFG9z/FztOFcPbqWTLVr5MUet9q0+uEPzNhemEXJhVl09C00rbe1fwgpQmB gryXjEDK9vfzMZwpHJL/6OrCHJD/nGGVxy/FrmKOSWYBTzZDJT4vpVHpf5qNl04chAtP LShw== X-Gm-Message-State: AOAM533FU8W6KbgfPLWc9k9sp/IO2YF7+y0HWaX44Lw+E77QDnXhY2qV YJuLntchdDouzznnmN/PAbKPlXvn0ag= X-Received: by 2002:a05:6512:b93:: with SMTP id b19mr21264119lfv.453.1629729082744; Mon, 23 Aug 2021 07:31:22 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id v16sm1495683ljc.138.2021.08.23.07.31.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 07:31:22 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Aug 2021 17:31:16 +0300 Message-Id: <20210823143116.23048-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/{isom, mov, movenc}: add support for CMAF DASH roles X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: boUBRKI4MT3q From: Jan Ekström This information is coded in a standard MP4 KindBox and utilizes the scheme and values as per the DASH role scheme defined in MPEG-DASH. Other schemes are technically allowed, but where multiple schemes define the same concepts, the DASH scheme should be utilized. Such flagging is additionally utilized by the DASH-IF CMAF ingest specification, enabling an encoder to inform the following component of the roles of the incoming media streams. A test is added for this functionality in a similar manner to the matroska test. Signed-off-by: Jan Ekström --- libavformat/isom.c | 19 +++++ libavformat/isom.h | 12 +++ libavformat/mov.c | 68 ++++++++++++++++ libavformat/movenc.c | 51 ++++++++++++ tests/fate/mov.mak | 8 ++ .../ref/fate/mov-mp4-disposition-mpegts-remux | 81 +++++++++++++++++++ 6 files changed, 239 insertions(+) create mode 100644 tests/ref/fate/mov-mp4-disposition-mpegts-remux diff --git a/libavformat/isom.c b/libavformat/isom.c index 4df5440023..300ba927c2 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -430,3 +430,22 @@ void ff_mov_write_chan(AVIOContext *pb, int64_t channel_layout) } avio_wb32(pb, 0); // mNumberChannelDescriptions } + +static const struct MP4TrackKindValueMapping dash_role_map[] = { + { AV_DISPOSITION_HEARING_IMPAIRED|AV_DISPOSITION_CAPTIONS, + "caption" }, + { AV_DISPOSITION_COMMENT, + "commentary" }, + { AV_DISPOSITION_VISUAL_IMPAIRED|AV_DISPOSITION_DESCRIPTIONS, + "description" }, + { AV_DISPOSITION_DUB, + "dub" }, + { AV_DISPOSITION_FORCED, + "forced-subtitle" }, + { 0, NULL } +}; + +const struct MP4TrackKindMapping ff_mov_track_kind_table[] = { + { "urn:mpeg:dash:role:2011", dash_role_map }, + { 0, NULL } +}; diff --git a/libavformat/isom.h b/libavformat/isom.h index ac1b3f3d56..e8e3aa3444 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -387,4 +387,16 @@ static inline enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags) return ff_get_pcm_codec_id(bps, flags & 1, flags & 2, flags & 4 ? -1 : 0); } +struct MP4TrackKindValueMapping { + int disposition; + const char *value; +}; + +struct MP4TrackKindMapping { + const char *scheme_uri; + const struct MP4TrackKindValueMapping *value_maps; +}; + +extern const struct MP4TrackKindMapping ff_mov_track_kind_table[]; + #endif /* AVFORMAT_ISOM_H */ diff --git a/libavformat/mov.c b/libavformat/mov.c index c556390525..f34150d326 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -28,6 +28,7 @@ #include #include "libavutil/attributes.h" +#include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" @@ -6834,6 +6835,72 @@ static int mov_read_dvcc_dvvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_kind(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + AVFormatContext *ctx = c->fc; + AVStream *st = NULL; + char scheme_str[1024] = { 0 }, value_str[1024] = { 0 }; + int scheme_str_len = 0, value_str_len = 0; + int version, flags; + char *scheme = NULL, *value = NULL; + int64_t size = atom.size; + + if (atom.size < 6) + // 4 bytes for version + flags, 2x 1 byte for null + return AVERROR_INVALIDDATA; + + if (c->fc->nb_streams < 1) + return 0; + st = c->fc->streams[c->fc->nb_streams-1]; + + version = avio_r8(pb); + flags = avio_rb24(pb); + size -= 4; + + if (version != 0 || flags != 0) { + av_log(ctx, AV_LOG_ERROR, + "Unsupported 'kind' box with version %d, flags: %x", + version, flags); + return AVERROR_INVALIDDATA; + } + + scheme_str_len = avio_get_str(pb, size, scheme_str, sizeof(scheme_str)); + if (scheme_str_len < 0) + return AVERROR_INVALIDDATA; + + if (scheme_str_len == size) + // we need to have another string, even if nullptr + return AVERROR_INVALIDDATA; + + size -= scheme_str_len; + + value_str_len = avio_get_str(pb, size, value_str, sizeof(value_str)); + if (value_str_len < 0) + return AVERROR_INVALIDDATA; + + av_log(ctx, AV_LOG_TRACE, + "%s stream %d KindBox(scheme: %s, value: %s)\n", + av_get_media_type_string(st->codecpar->codec_type), + st->index, + scheme_str, value_str); + + for (int i = 0; ff_mov_track_kind_table[i].scheme_uri; i++) { + const struct MP4TrackKindMapping map = ff_mov_track_kind_table[i]; + if (!av_strstart(scheme_str, map.scheme_uri, NULL)) + continue; + + for (int j = 0; map.value_maps[j].disposition; j++) { + const struct MP4TrackKindValueMapping value_map = map.value_maps[j]; + if (!av_strstart(value_str, value_map.value, NULL)) + continue; + + st->disposition |= value_map.disposition; + } + } + + return 0; +} + static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('A','C','L','R'), mov_read_aclr }, { MKTAG('A','P','R','G'), mov_read_avid }, @@ -6931,6 +6998,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('c','l','l','i'), mov_read_clli }, { MKTAG('d','v','c','C'), mov_read_dvcc_dvvc }, { MKTAG('d','v','v','C'), mov_read_dvcc_dvvc }, +{ MKTAG('k','i','n','d'), mov_read_kind }, { 0, NULL } }; diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 18410c70fa..5a9612811e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3290,6 +3290,52 @@ static int mov_write_track_metadata(AVIOContext *pb, AVStream *st, return update_size(pb, pos); } +static int mov_write_track_kind(AVIOContext *pb, const char *scheme_uri, + const char *value) +{ + int64_t pos = avio_tell(pb); + + /* Box|FullBox basics */ + avio_wb32(pb, 0); /* size placeholder */ + ffio_wfourcc(pb, (const unsigned char *)"kind"); + avio_w8(pb, 0); /* version = 0 */ + avio_wb24(pb, 0); /* flags = 0 */ + + /* Required null-terminated scheme URI */ + avio_write(pb, (const unsigned char *)scheme_uri, + strlen(scheme_uri)); + avio_w8(pb, 0); + + /* Optional value string */ + if (value && value[0]) + avio_write(pb, (const unsigned char *)value, + strlen(value)); + + avio_w8(pb, 0); + + return update_size(pb, pos); +} + +static int mov_write_track_kinds(AVIOContext *pb, AVStream *st) +{ + int ret = AVERROR_BUG; + + for (int i = 0; ff_mov_track_kind_table[i].scheme_uri; i++) { + const struct MP4TrackKindMapping map = ff_mov_track_kind_table[i]; + + for (int j = 0; map.value_maps[j].disposition; j++) { + const struct MP4TrackKindValueMapping value_map = map.value_maps[j]; + if (!(st->disposition & value_map.disposition)) + continue; + + if ((ret = mov_write_track_kind(pb, map.scheme_uri, value_map.value)) < 0) + return ret; + } + } + + return 0; +} + static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov, AVStream *st) { @@ -3307,6 +3353,11 @@ static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov, if (mov->mode & (MODE_MP4|MODE_MOV)) mov_write_track_metadata(pb_buf, st, "name", "title"); + if (mov->mode & MODE_MP4) { + if ((ret = mov_write_track_kinds(pb_buf, st)) < 0) + return ret; + } + if ((size = avio_get_dyn_buf(pb_buf, &buf)) > 0) { avio_wb32(pb, size + 8); ffio_wfourcc(pb, "udta"); diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 4c1014be92..b668fc8529 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -132,6 +132,14 @@ FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER MJPEG_DECODER \ += fate-mov-cover-image fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png" "-map 0 -t 0.1 -c copy" "" "-show_entries stream_disposition=attached_pic:stream=index,codec_name" +# Resulting remux should have: +# 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED +# 2. second audio stream with AV_DISPOSITION_VISUAL_IMPAIRED | DESCRIPTIONS +FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL \ + MPEGTS_DEMUXER MOV_DEMUXER AC3_DECODER \ + MP4_MUXER FRAMECRC_MUXER ) \ + += fate-mov-mp4-disposition-mpegts-remux +fate-mov-mp4-disposition-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts mp4 "-map 0:1 -map 0:2 -c copy -disposition:a:0 +hearing_impaired" "-map 0 -c copy" "" "-of json -show_entries stream_disposition:stream=index" FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes) fate-mov: $(FATE_MOV) $(FATE_MOV_FFPROBE) $(FATE_MOV_FASTSTART) $(FATE_MOV_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/mov-mp4-disposition-mpegts-remux b/tests/ref/fate/mov-mp4-disposition-mpegts-remux new file mode 100644 index 0000000000..2df48a0b0d --- /dev/null +++ b/tests/ref/fate/mov-mp4-disposition-mpegts-remux @@ -0,0 +1,81 @@ +e9a12470bc7645cebca985a9f3762c6c *tests/data/fate/mov-mp4-disposition-mpegts-remux.mp4 +5705 tests/data/fate/mov-mp4-disposition-mpegts-remux.mp4 +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: ac3 +#sample_rate 0: 48000 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +#tb 1: 1/48000 +#media_type 1: audio +#codec_id 1: ac3 +#sample_rate 1: 48000 +#channel_layout 1: 3 +#channel_layout_name 1: stereo +1, 0, 0, 1536, 768, 0xa63778d4, S=1, 4 +1, 1536, 1536, 1536, 768, 0x7d577f3f +0, 3072, 3072, 1536, 768, 0xc2867884, S=1, 4 +1, 3072, 3072, 1536, 768, 0xd86b7c8f +0, 4608, 4608, 1536, 690, 0xa2714bf3 +1, 4608, 4608, 1536, 626, 0x09f4382f +{ + "programs": [ + + ], + "streams": [ + { + "index": 0, + "disposition": { + "default": 1, + "dub": 0, + "original": 0, + "comment": 0, + "lyrics": 0, + "karaoke": 0, + "forced": 0, + "hearing_impaired": 1, + "visual_impaired": 0, + "clean_effects": 0, + "attached_pic": 0, + "timed_thumbnails": 0, + "captions": 1, + "descriptions": 0, + "metadata": 0, + "dependent": 0, + "still_image": 0 + }, + "side_data_list": [ + { + + } + ] + }, + { + "index": 1, + "disposition": { + "default": 0, + "dub": 0, + "original": 0, + "comment": 0, + "lyrics": 0, + "karaoke": 0, + "forced": 0, + "hearing_impaired": 0, + "visual_impaired": 1, + "clean_effects": 0, + "attached_pic": 0, + "timed_thumbnails": 0, + "captions": 0, + "descriptions": 1, + "metadata": 0, + "dependent": 0, + "still_image": 0 + }, + "side_data_list": [ + { + + } + ] + } + ] +}