From patchwork Sun Oct 29 22:11:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pkv.stream" X-Patchwork-Id: 5750 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1982545jah; Sun, 29 Oct 2017 15:11:59 -0700 (PDT) X-Google-Smtp-Source: ABhQp+S+r+pF8BSQTnxawpf/gRKZFAdevtXmOFYahn//RFg8HJ+ZmyXw8oIsyGZjNw+pPw+W+O88 X-Received: by 10.28.54.22 with SMTP id d22mr1976519wma.120.1509315118999; Sun, 29 Oct 2017 15:11:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509315118; cv=none; d=google.com; s=arc-20160816; b=iHBOgmgMw6fRvWLLhKjCAtE5mxxyZgBZtQudYSqSwJA3wKI98pB8P8A3G0TImoMuKj l2qWKhqF6fw3mg54IDTHin74upppl3Uq1Y/J4pcSGIkPYwR7BTkqQSf5LDt/nbFR+7we Yb0XzKfHPi7QoSV8aWo4wT6fQlSqiS29xPntw1p89XLSwAFi8+eGGwql1WnrGEgwj/u3 1RmKUOAXzt6XD8GPxo1Sls+tbEo+NC083SbdBLTG5C2vXtX65pJ/MvD2CBcM4yT6Ufes 6rXAMt5QR+WLPx9h5fW3nYiv32OD63C+fcgD8qG4sI3DbbqGU5CUDO/cuqTtMOgOfntf +vGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:dkim-signature:delivered-to :arc-authentication-results; bh=q798LRY/8d4kawobK6ALj4x9RVzfYCjOxvlPv7odCAU=; b=w1eGbs03g8nhwUQHZrP5QFlla2NfuA5TUhCmUemPZoIhhzObH+vGq/yohKDfUi6s2h nx90l9ZqRhqM1iD6DHE/0XeZaLv15nMGUPefY/OTz1pSGXeRbhLxogrfNa0nYIeSPJH/ elLCLekVMwa8ZnAqj5r/xBdcM0dci88fScHlykpFVOYzQz6ygJaPycwTS+6JKuhEhRXc KpIR6k2H+ru/YClITFUSQ4/0y9u3OFSwgREVSDyGUFR9gkf6OwJOklhkVoDxKdXkTtnx 5LdsTeEdYraYOU/Y8nrRwFAbesZSSD+LxCas6r1ANqJLws1gHeEQobIrDM9PWVVbUb+H ALbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hy1qTjNa; 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=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 g206si1825621wmg.269.2017.10.29.15.11.58; Sun, 29 Oct 2017 15:11:58 -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=hy1qTjNa; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4591068A339; Mon, 30 Oct 2017 00:11:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC81B6897A3 for ; Mon, 30 Oct 2017 00:11:36 +0200 (EET) Received: by mail-wm0-f50.google.com with SMTP id y83so12730417wmc.4 for ; Sun, 29 Oct 2017 15:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=n5Apcu2mrQhjkTCgXuXyeTR3FMfx/PsPlGeBijeo5ok=; b=hy1qTjNaSd4FIy25XnbFljWvyeU5GIJ13onlPWK0MvsrH4USu6H0raPUz9tlacrQmJ oRjyXwbTfOPLKab1BprENqacPK25EUoUEb+pwNSR/I3m++z8GP3CtUj3wLJnBjfoMeRS K9D47dwu5aBZyOf31cuaNISQEcv4t5svZxA3zEoua/7cZXHmwjax2XPFZ5n5J+7VzBsu FSCUO+b6ccQc09VkC7Vl/32q1+yel2Gkl/h29ECbWuM+FAQiaWitmUyrXzyl68HMB2bq jBtJChk7/wwnuexxQLUne8PA0sY+aK6ZelZap5+KQRyZ+V1qV2MkdBUKGBwl1ACnDzik VLmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=n5Apcu2mrQhjkTCgXuXyeTR3FMfx/PsPlGeBijeo5ok=; b=D1hXmzhyGxC5q6wYq4e6WZkUWEZdckcqHIsF0c6A16cnKDcFvyfguihm4+GqyEeuh8 dPwyPS0LGQCEOAwEXN5JYohliYIIR8Fd6aFLHmwEf62dQViMkg/YdLLjQM8/CbtDDnZk et4mhSYiSiIyMp37UyTQbH7wfJcOsc8Nvi19hImJKDVGZCbjaLoo9MC4mkzyC4H0yE/v 8eWRW3j67ZBsnKwiFZGh/hLszWe4js8TyFq6wIDsQKxlwENdFhIvVG5qnu77ELRtgvKS bIGz7nkor3sHfoI/PfSKBHO4hpKbYOtwo60/wcYZepwLJXeVGC8VHi3eQCG4IQ2yxpIC vBcw== X-Gm-Message-State: AMCzsaU2UPVWQFbH7tbJJrK4C5gm33fljMXI7CDJJYr05KKRDQkN/Mb1 Sz6ivQ8gttcA22SuJF6B0sOdTg== X-Received: by 10.28.224.87 with SMTP id x84mr1972775wmg.118.1509315105588; Sun, 29 Oct 2017 15:11:45 -0700 (PDT) Received: from [192.168.0.2] ([176.159.7.188]) by smtp.googlemail.com with ESMTPSA id t131sm2361551wmd.12.2017.10.29.15.11.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Oct 2017 15:11:45 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org References: <103114c7-8ba7-d798-6353-83d346990995@gmail.com> <20170914154635.GD7726@sunshine.barsnick.net> <20171025014520.GP6009@nb4> <2461eb3e-d3ba-7d7f-e02c-69d704deb187@gmail.com> <20171029154450.GQ6009@nb4> From: "pkv.stream" Message-ID: <0c33b65c-295a-01e2-1463-f4444613abb4@gmail.com> Date: Sun, 29 Oct 2017 23:11:43 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171029154450.GQ6009@nb4> Content-Language: fr Subject: [FFmpeg-devel] [PATCH v5 2/2 ] avformat/mpegts: opus demuxing for mapping family 255 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" minor change, adding a test for number of channels for mapping_family 1 when channel_config_code is > 0x82 Passes fate + patcheck. Regards pkv From 2e0504728b81e0f35ba856c24cff14fa70680d8b Mon Sep 17 00:00:00 2001 From: pkviet Date: Sun, 29 Oct 2017 22:57:25 +0100 Subject: [PATCH 2/2] libavf/mpegts: opus demuxing for mapping family 255 Adds to mpegts muxer the capability to demux libopus with mapping family 255, following the provisional spec for opus in mepg-ts (https://people.xiph.org/~tterribe/opus/ETSI_TS_opus-v0.1.3-draft.doc). Signed-off-by: pkviet --- libavformat/mpegts.c | 84 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 70 insertions(+), 14 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 53cbcfb..3aa06f0 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -37,6 +37,7 @@ #include "avio_internal.h" #include "mpeg.h" #include "isom.h" +#include "math.h" /* maximum size in which we look for synchronization if * synchronization is lost */ @@ -1633,7 +1634,7 @@ static const uint8_t opus_stream_cnt[9] = { 1, 1, 1, 2, 2, 3, 4, 4, 5, }; -static const uint8_t opus_channel_map[8][8] = { +static const uint8_t opus_channel_map_a[8][8] = { { 0 }, { 0,1 }, { 0,2,1 }, @@ -1644,13 +1645,25 @@ static const uint8_t opus_channel_map[8][8] = { { 0,6,1,2,3,4,5,7 }, }; +static const uint8_t opus_channel_map_b[8][8] = { + { 0 }, + { 0,1 }, + { 0,1,2 }, + { 0,1,2,3 }, + { 0,1,2,3,4 }, + { 0,1,2,3,4,5 }, + { 0,1,2,3,4,5,6 }, + { 0,1,2,3,4,5,6,7 }, +}; + int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type, const uint8_t **pp, const uint8_t *desc_list_end, Mp4Descr *mp4_descr, int mp4_descr_count, int pid, MpegTSContext *ts) { const uint8_t *desc_end; - int desc_len, desc_tag, desc_es_id, ext_desc_tag, channels, channel_config_code; + int desc_len, desc_tag, desc_es_id, ext_desc_tag, channels, channel_config_code, channel_count, mapping_family, stream_count, coupled_stream_count; + GetBitContext gb; char language[252]; int i; @@ -1660,6 +1673,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type desc_len = get8(pp, desc_list_end); if (desc_len < 0) return AVERROR_INVALIDDATA; + desc_end = *pp + desc_len; if (desc_end > desc_list_end) return AVERROR_INVALIDDATA; @@ -1871,26 +1885,68 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type if (st->codecpar->codec_id == AV_CODEC_ID_OPUS && ext_desc_tag == 0x80) { /* User defined (provisional Opus) */ if (!st->codecpar->extradata) { - st->codecpar->extradata = av_mallocz(sizeof(opus_default_extradata) + - AV_INPUT_BUFFER_PADDING_SIZE); - if (!st->codecpar->extradata) - return AVERROR(ENOMEM); - - st->codecpar->extradata_size = sizeof(opus_default_extradata); - memcpy(st->codecpar->extradata, opus_default_extradata, sizeof(opus_default_extradata)); - channel_config_code = get8(pp, desc_end); if (channel_config_code < 0) return AVERROR_INVALIDDATA; + + if (channel_config_code != 0x81) { + st->codecpar->extradata = av_mallocz(sizeof(opus_default_extradata) + + AV_INPUT_BUFFER_PADDING_SIZE); + if (!st->codecpar->extradata) + return AVERROR(ENOMEM); + st->codecpar->extradata_size = sizeof(opus_default_extradata); + memcpy(st->codecpar->extradata, opus_default_extradata, sizeof(opus_default_extradata)); + } + if (channel_config_code <= 0x8) { st->codecpar->extradata[9] = channels = channel_config_code ? channel_config_code : 2; st->codecpar->extradata[18] = channel_config_code ? (channels > 2) : /* Dual Mono */ 255; st->codecpar->extradata[19] = opus_stream_cnt[channel_config_code]; st->codecpar->extradata[20] = opus_coupled_stream_cnt[channel_config_code]; - memcpy(&st->codecpar->extradata[21], opus_channel_map[channels - 1], channels); - } else { - avpriv_request_sample(fc, "Opus in MPEG-TS - channel_config_code > 0x8"); - } + memcpy(&st->codecpar->extradata[21], opus_channel_map_a[channels - 1], channels); + } else if (channel_config_code == 0x81) { + channel_count = get8(pp, desc_end); + mapping_family = get8(pp, desc_end); + if (channel_count < 0 || channel_count > 255) + return AVERROR_INVALIDDATA; + if (mapping_family < 0 || mapping_family > 255) + return AVERROR_INVALIDDATA; + st->codecpar->extradata_size = 22 + channel_count; + st->codecpar->extradata = av_mallocz(st->codecpar->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!st->codecpar->extradata) + return AVERROR(ENOMEM); + for (i = 0; i < 9; i++) { + st->codecpar->extradata[i] = opus_default_extradata[i]; + } + st->codecpar->extradata[9] = channel_count; + st->codecpar->extradata[18] = mapping_family; + init_get_bits(&gb, *pp, (channel_count + 2 + AV_INPUT_BUFFER_PADDING_SIZE) * 8); + stream_count = get_bits(&gb, av_ceil_log2_c(channel_count)) + 1; + coupled_stream_count = get_bits(&gb, av_ceil_log2_c(stream_count + 1)); + if (stream_count < 0 || stream_count > channel_count) + return AVERROR_INVALIDDATA; + if (coupled_stream_count < 0 || coupled_stream_count > stream_count) + return AVERROR_INVALIDDATA; + st->codecpar->extradata[19] = stream_count; + st->codecpar->extradata[20] = coupled_stream_count; + for (i = 0; i < channel_count; i++) { + st->codecpar->extradata[21 + i] = get_bits(&gb, av_ceil_log2_c(stream_count + coupled_stream_count + 1)); + if (st->codecpar->extradata[21 + i] > stream_count + coupled_stream_count + || st->codecpar->extradata[21 + i] > (int)(pow(2, stream_count + coupled_stream_count + 1) -1)) + return AVERROR_INVALIDDATA; + } + } else if ((channel_config_code >= 0x82) && (channel_config_code <= 0x88)) { + channels = get8(pp, desc_end); + if (channels < 0 || channels > 8) + return AVERROR_INVALIDDATA; + st->codecpar->extradata[9] = channels; + st->codecpar->extradata[18] = 1; + st->codecpar->extradata[19] = channels; + st->codecpar->extradata[20] = 0; + memcpy(&st->codecpar->extradata[21], opus_channel_map_b[channels - 1], channels); + } else { + avpriv_request_sample(fc, "Opus in MPEG-TS - channel_config_code %i", channel_config_code); + } st->need_parsing = AVSTREAM_PARSE_FULL; st->internal->need_context_update = 1; }