From patchwork Fri Feb 24 12:25:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40480 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp945245pzk; Thu, 23 Feb 2023 20:25:52 -0800 (PST) X-Google-Smtp-Source: AK7set9EACcUaP8YoTRasQo0vwpVPR1ayZA6xvWdei1KhkZFtm6BMN+Md7AHgy/2pHP/n/39CijP X-Received: by 2002:a17:906:d0c7:b0:8b1:2f0e:e3a4 with SMTP id bq7-20020a170906d0c700b008b12f0ee3a4mr19261219ejb.26.1677212752389; Thu, 23 Feb 2023 20:25:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677212752; cv=none; d=google.com; s=arc-20160816; b=zvkfunxGGX9K94VfOHQQTU6bTQt8nRqPYKIHCbE//HwiTYpE27pGmsVWM0Kn7zq9+Z Ellk5X2ndjaJtlD11uDmmvLjGeFvAjTDRuTN602JsWeEZlgqT+c8gSbPmlJogyTPmmG5 9gVsgcRQc0Vts7I2XMVkbb44/PBISh8a28n+sCGy+BNli4nhY3d1xo6QUAEbZ4U216wk IFFZhrm3MlusTrR0+UYvXCU7QU7DLfV39ng9JlCVn/nVHXPo51OKrB7Y4M8xjGM9+9yI T7vndCJVFjkz4sDJhTNwhOgRbG0aSBNg7UMaksfmn3dehxucAdk7xMFplq3Y10OCkTyH Dbig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=t+GfoCuEAslx2gmkc9BZtnonwNATHqcFVLrPFqvS7o8=; b=m7hXFq0eXP5peFf25d3cgWoar2j8sdNLVwQzdnWzeCXwBjGuqcH/tIueQKq/p4H+4v voVx/DS61D6ZgHq1aa6GXXL8MjgQ58ee1YErYGxZ+Bc69W/iCJ1rK52CrLoOQf4gDOgM jCTudXxbCkm+5JeIFDBFQ1POcuNuxy6QvTcq99LuyYb40yTEYG96n1r2mJctnfMlpqU7 9cxoG4AvfOOdk2C39v4ypMmNNYA3K1JVKAcvid1lrbcQGPfzNV6P+Thla9Yg3cojwXKZ GS17y4HtfXRUIFI69ibKXKwG/qnwseSJQ3jH0migpS8RmEiafqo3BRI7e+VABF2rqo+n XdDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=MXxetmQR; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fi23-20020a1709073ad700b008cec55af409si16051338ejc.411.2023.02.23.20.25.52; Thu, 23 Feb 2023 20:25:52 -0800 (PST) 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=@foxmail.com header.s=s201512 header.b=MXxetmQR; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85E0368C0D0; Fri, 24 Feb 2023 06:25:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-87.mail.qq.com (out162-62-57-87.mail.qq.com [162.62.57.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D05F68C0CC for ; Fri, 24 Feb 2023 06:25:30 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677212728; bh=5r9pioSkMoR6y95AycZ4ZHuSHaHwU+WyyfDrYIjxYsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MXxetmQRrxd9KoK64/TB1qNKBL5T8+FH+lWGtLdZhlkAObqI5AXrF+63/yPPE4ICf omFKWruMj3LCe5fFwQqGqTCullvC5eETkLOaRbFn6kBlFFJJi7IblCbJKzoQHaEtU0 TAUW4X4ur5zAgCsEdOjFd5Hb8P4gBi0osf1djSGc= Received: from localhost.localdomain ([119.147.10.197]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 6588BCBD; Fri, 24 Feb 2023 12:25:24 +0800 X-QQ-mid: xmsmtpt1677212727t2psrnjow Message-ID: X-QQ-XMAILINFO: MN/qhr2Qwf5HkDtfxo3Ds36SJfmtOJGoxt2P7MWSg+pflljOjfLueGijU8A+7T +9hGp7cMWer3c56UUKrwvK4yejQ9J4lg4qD8rJ5kEQZv10u9aRJPG0vT1gkAWQ9KAa/ktRZQ4VLt /IiyaC/3kLyzKDKeW6wiQV88SewXDYyTq74KpikX2UwJO9rTiCeJsQu8+08Ng7d750u7vcV21O9b K7Xl25K8IdYH2DAphHuneHK8BjBDfiHeGfNL9TI4F4Fy4wbhHOKhrANXnPb8E0mMR591Rra+9SlV CrLamhWtyOwHRrZ12JEOxjFPC2jHYmXp+pB3yNa4KIRaY/2IE6Ovtj9kkxt1thLubjPfMOcBbLCr X/CFaYX+SQHElpRO+Z/U3fv38DFU24iO+xnglxu12mQw0ZmSekAl7VcPKKjudFuh8x0c3L7LgKeu x2nJIVsHSrnqgY3w2EC8bPf+gHcrQJm2hUmckJ66tsZ+AI7/HMgr2RbTi/GVSNFW/FUcVl0cK7j8 ybhV2FmaG/qbqllGMmV/M3Ub2lcNlbD6h4+2a3Z2TtnJLm+GSfzvO1gQcArI/pfAFvT2+/u6wOQQ 87hq8lkwOSTGjIierKZPtylRhenK7MNn35KUOWMGDm779e2HYD2WTbr3Sdv73kh5mxk5dVoSJsv5 oVExiNQ+zjUM81TQEXxdSdEnN3iE33EjcGcnjY9f3DHzqs1Jjo8qg+sckBtOAxcjKZzTWPklx7cP WbOYvhU5U+iLQ5qPLRdYseFmyJ5CgNf0Vv5WE11zqhliSNsUs4DA6g1UyGwJ9HYjgbBSqyQGa1gK RHUakUujhODVEgBxD0W2xOCKwVyYNk7ZahI94aZZ+Px/XuhJw56X+g4wj1wFbhU99VAnFfDg/ZgO +HqinSMY8QZSsXNc4zK5WGuB1gYnV2ehbuKH6HI9wf4rVt+RPk7clt3JsC/9QigNncFgHQCegatZ U/R57Ilcwj9WY2EK8SY8v4c2Y4tHghaZOh8he/n8b4zlOWK13uODLKnc8tJL+HwXdKckts0NE= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 20:25:21 +0800 X-OQ-MSGID: <20230224122523.143571-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224122523.143571-1-quinkblack@foxmail.com> References: <20230224122523.143571-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avformat/mov: parse ISO-14496-12 ChannelLayout 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RTfhN/dBFnlQ From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavformat/mov.c | 79 +++++++++++- libavformat/mov_chan.c | 265 +++++++++++++++++++++++++++++++++++++++++ libavformat/mov_chan.h | 26 ++++ 3 files changed, 369 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index b125343f84..1db869aa2e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -940,6 +940,82 @@ static int mov_read_chan(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_chnl(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + int64_t end = av_sat_add64(avio_tell(pb), atom.size); + int stream_structure; + int ret = 0; + AVStream *st; + + if (c->fc->nb_streams < 1) + return 0; + st = c->fc->streams[c->fc->nb_streams-1]; + + /* skip version and flags */ + avio_skip(pb, 4); + + stream_structure = avio_r8(pb); + + // stream carries channels + if (stream_structure & 1) { + int layout = avio_r8(pb); + + av_log(c->fc, AV_LOG_TRACE, "'chnl' layout %d\n", layout); + if (!layout) { + uint8_t positions[64] = {}; + int enable = 1; + + for (int i = 0; i < st->codecpar->ch_layout.nb_channels; i++) { + int speaker_pos = avio_r8(pb); + + av_log(c->fc, AV_LOG_TRACE, "speaker_position %d\n", speaker_pos); + if (speaker_pos == 126) { // explicit position + int16_t azimuth = avio_rb16(pb); + int8_t elevation = avio_r8(pb); + + av_log(c->fc, AV_LOG_TRACE, "azimuth %d, elevation %d\n", + azimuth, elevation); + // Don't support explicit position + enable = 0; + } else if (i < FF_ARRAY_ELEMS(positions)) { + positions[i] = speaker_pos; + } else { + // number of channel out of our supported range + enable = 0; + } + } + + if (enable) { + ret = ff_mov_get_layout_from_channel_positions(positions, + st->codecpar->ch_layout.nb_channels, + &st->codecpar->ch_layout); + if (ret) { + av_log(c->fc, AV_LOG_WARNING, "unsupported speaker positions\n"); + ret = 0; + } + } + } else { + uint64_t omitted_channel_map = avio_rb64(pb); + + if (omitted_channel_map) { + avpriv_request_sample(c->fc, "omitted_channel_map 0x%" PRIx64 " != 0", + omitted_channel_map); + return AVERROR_PATCHWELCOME; + } + ff_mov_get_channel_layout_from_config(layout, &st->codecpar->ch_layout); + } + } + + // stream carries objects + if (stream_structure & 2) { + int obj_count = avio_r8(pb); + av_log(c->fc, AV_LOG_TRACE, "'chnl' with object_count %d\n", obj_count); + } + + avio_seek(pb, end, SEEK_SET); + return ret; +} + static int mov_read_wfex(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; @@ -7784,7 +7860,8 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('w','i','d','e'), mov_read_wide }, /* place holder */ { MKTAG('w','f','e','x'), mov_read_wfex }, { MKTAG('c','m','o','v'), mov_read_cmov }, -{ MKTAG('c','h','a','n'), mov_read_chan }, /* channel layout */ +{ MKTAG('c','h','a','n'), mov_read_chan }, /* channel layout from quicktime */ +{ MKTAG('c','h','n','l'), mov_read_chnl }, /* channel layout from ISO-14496-12 */ { MKTAG('d','v','c','1'), mov_read_dvc1 }, { MKTAG('s','g','p','d'), mov_read_sgpd }, { MKTAG('s','b','g','p'), mov_read_sbgp }, diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index f66bf0df7f..10ebcdc08f 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -551,3 +551,268 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, return 0; } + +/* ISO/IEC 23001-8, 8.2 */ +static const AVChannelLayout iso_channel_configuration[] = { + // 0: any setup + {}, + + // 1: centre front + AV_CHANNEL_LAYOUT_MONO, + + // 2: left front, right front + AV_CHANNEL_LAYOUT_STEREO, + + // 3: centre front, left front, right front + AV_CHANNEL_LAYOUT_SURROUND, + + // 4: centre front, left front, right front, rear centre + AV_CHANNEL_LAYOUT_4POINT0, + + // 5: centre front, left front, right front, left surround, right surround + AV_CHANNEL_LAYOUT_5POINT0, + + // 6: 5 + LFE + AV_CHANNEL_LAYOUT_5POINT1, + + // 7: centre front, left front centre, right front centre, + // left front, right front, left surround, right surround, LFE + AV_CHANNEL_LAYOUT_7POINT1_WIDE, + + // 8: channel1, channel2 + AV_CHANNEL_LAYOUT_STEREO_DOWNMIX, + + // 9: left front, right front, rear centre + AV_CHANNEL_LAYOUT_2_1, + + // 10: left front, right front, left surround, right surround + AV_CHANNEL_LAYOUT_2_2, + + // 11: centre front, left front, right front, left surround, right surround, rear centre, LFE + AV_CHANNEL_LAYOUT_6POINT1, + + // 12: centre front, left front, right front + // left surround, right surround + // rear surround left, rear surround right + // LFE + AV_CHANNEL_LAYOUT_7POINT1, + + // 13: + AV_CHANNEL_LAYOUT_22POINT2, + + // 14: + AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK, + + // TODO: 15 - 20 +}; + +/* ISO/IEC 23001-8, table 8 */ +static const enum AVChannel iso_channel_position[] = { + // 0: left front + AV_CHAN_FRONT_LEFT, + + // 1: right front + AV_CHAN_FRONT_RIGHT, + + // 2: centre front + AV_CHAN_FRONT_CENTER, + + // 3: low frequence enhancement + AV_CHAN_LOW_FREQUENCY, + + // 4: left surround + // TODO + AV_CHAN_NONE, + + // 5: right surround + // TODO + AV_CHAN_NONE, + + // 6: left front centre + AV_CHAN_FRONT_LEFT_OF_CENTER, + + // 7: right front centre + AV_CHAN_FRONT_RIGHT_OF_CENTER, + + // 8: rear surround left + AV_CHAN_BACK_LEFT, + + // 9: rear surround right + AV_CHAN_BACK_RIGHT, + + // 10: rear centre + AV_CHAN_BACK_CENTER, + + // 11: left surround direct + AV_CHAN_SURROUND_DIRECT_LEFT, + + // 12: right surround direct + AV_CHAN_SURROUND_DIRECT_RIGHT, + + // 13: left side surround + AV_CHAN_SIDE_LEFT, + + // 14: right side surround + AV_CHAN_SIDE_RIGHT, + + // 15: left wide front + AV_CHAN_WIDE_LEFT, + + // 16: right wide front + AV_CHAN_WIDE_RIGHT, + + // 17: left front vertical height + AV_CHAN_TOP_FRONT_LEFT, + + // 18: right front vertical height + AV_CHAN_TOP_FRONT_RIGHT, + + // 19: centre front vertical height + AV_CHAN_TOP_FRONT_CENTER, + + // 20: left surround vertical height rear + AV_CHAN_TOP_BACK_LEFT, + + // 21: right surround vertical height rear + AV_CHAN_TOP_BACK_RIGHT, + + // 22: centre vertical height rear + AV_CHAN_TOP_BACK_CENTER, + + // 23: left vertical height side surround + AV_CHAN_TOP_SIDE_LEFT, + + // 24: right vertical height side surround + AV_CHAN_TOP_SIDE_RIGHT, + + // 25: top centre surround + AV_CHAN_TOP_CENTER, + + // 26: low frequency enhancement 2 + AV_CHAN_LOW_FREQUENCY_2, + + // 27: left front vertical bottom + AV_CHAN_BOTTOM_FRONT_LEFT, + + // 28: right front vertical bottom + AV_CHAN_BOTTOM_FRONT_RIGHT, + + // 29: centre front vertical bottom + AV_CHAN_BOTTOM_FRONT_CENTER, + + // 30: left vertical height surround + // TODO + AV_CHAN_NONE, + + // 31: right vertical height surround + // TODO + AV_CHAN_NONE, + + // 32, 33, 34, 35, reserved + AV_CHAN_NONE, + AV_CHAN_NONE, + AV_CHAN_NONE, + AV_CHAN_NONE, + + // 36: low frequency enhancement 3 + AV_CHAN_NONE, + + // 37: left edge of screen + AV_CHAN_NONE, + // 38: right edge of screen + AV_CHAN_NONE, + // 39: half-way between centre of screen and left edge of screen + AV_CHAN_NONE, + // 40: half-way between centre of screen and right edge of screen + AV_CHAN_NONE, + + // 41: left back surround + AV_CHAN_NONE, + + // 42: right back surround + AV_CHAN_NONE, + + // 43 - 125: reserved + // 126: explicit position + // 127: unknown /undefined +}; + +int ff_mov_get_channel_config_from_layout(const AVChannelLayout *layout, int *config) +{ + // Set default value which means any setup in 23001-8 + *config = 0; + for (int i = 0; i < FF_ARRAY_ELEMS(iso_channel_configuration); i++) { + if (!av_channel_layout_compare(layout, iso_channel_configuration + i)) { + *config = i; + break; + } + } + + return 0; +} + +int ff_mov_get_channel_layout_from_config(int config, AVChannelLayout *layout) +{ + if (config > 0 && config < FF_ARRAY_ELEMS(iso_channel_configuration)) { + *layout = iso_channel_configuration[config]; + return 0; + } + + return -1; +} + +int ff_mov_get_channel_positions_from_layout(const AVChannelLayout *layout, + uint8_t *position, int position_num) +{ + enum AVChannel channel; + + if (position_num < layout->nb_channels) + return AVERROR(EINVAL); + + if (layout->order != AV_CHANNEL_ORDER_NATIVE) + return AVERROR_PATCHWELCOME; + + for (int i = 0; i < layout->nb_channels; i++) { + position[i] = 127; + channel = av_channel_layout_channel_from_index(layout, i); + if (channel == AV_CHAN_NONE) + return AVERROR(EINVAL); + + for (int j = 0; j < FF_ARRAY_ELEMS(iso_channel_position); j++) { + if (iso_channel_position[j] == channel) { + position[i] = j; + break; + } + } + if (position[i] == 127) + return AVERROR(EINVAL); + } + + return 0; +} + +int ff_mov_get_layout_from_channel_positions(const uint8_t *position, int position_num, + AVChannelLayout *layout) +{ + AVChannelLayout tmp = { + .order = AV_CHANNEL_ORDER_NATIVE, + .nb_channels = position_num, + }; + enum AVChannel channel; + + for (int i = 0; i < position_num; i++) { + if (position[i] >= FF_ARRAY_ELEMS(iso_channel_position)) + return AVERROR_PATCHWELCOME; + + channel = iso_channel_position[position[i]]; + // unsupported layout + if (channel == AV_CHAN_NONE) + return AVERROR_PATCHWELCOME; + + tmp.u.mask |= 1ULL << channel; + } + + *layout = tmp; + + return 0; +} diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h index 93d9878798..8c807798ab 100644 --- a/libavformat/mov_chan.h +++ b/libavformat/mov_chan.h @@ -163,4 +163,30 @@ int ff_mov_get_channel_layout_tag(const AVCodecParameters *par, int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, int64_t size); +/** + * Get ISO/IEC 23001-8 ChannelConfiguration from AVChannelLayout. + * + */ +int ff_mov_get_channel_config_from_layout(const AVChannelLayout *layout, int *config); + +/** + * Get AVChannelLayout from ISO/IEC 23001-8 ChannelConfiguration. + * + * @return 0 for success, -1 for doesn't match, layout is untouched on failure + */ + +int ff_mov_get_channel_layout_from_config(int config, AVChannelLayout *layout); + +/** + * Get ISO/IEC 23001-8 OutputChannelPosition from AVChannelLayout. + */ +int ff_mov_get_channel_positions_from_layout(const AVChannelLayout *layout, + uint8_t *position, int position_num); + +/** + * Get AVChannelLayout from ISO/IEC 23001-8 OutputChannelPosition. + */ +int ff_mov_get_layout_from_channel_positions(const uint8_t *position, int position_num, + AVChannelLayout *layout); + #endif /* AVFORMAT_MOV_CHAN_H */