From patchwork Thu Jan 13 01:55:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33382 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp26411iog; Wed, 12 Jan 2022 18:14:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKgXFr/VwxB18P1+PizindZyeeM00LHUQjbroX1QQwakmqOPq+KrjvP42N+A+GOztyHZxJ X-Received: by 2002:a17:906:4317:: with SMTP id j23mr1897118ejm.748.1642040062838; Wed, 12 Jan 2022 18:14:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040062; cv=none; d=google.com; s=arc-20160816; b=Oy42WLQquOf7l4g0JwlbWe1RwBFYzxSrfhJuZ7iODg+W0Oz4gYGH9186yZZSrJWj8n 65axa2e+GEN1mfgssWQBLS8lRqxg0dBPmzkc4Fy61iLDBBf8ls6FfFjnb060cHL5rfK4 klFy5EEqXgPyfd6tLIOO+0BthJ3WXw9/P+JLpFPY8MEbvd3mPdoFRUti2IytxUvL5xFV Q4+n0BDTLqIW8W+fcACwgEThWSuhGVg2ZuWuzjEwJ4x5Yv0yI577c1mNfj+YH0PYR1TI Zzra4rTSIzHOqmC4pFAdt1v8vrh+MoGY/dke79A5GxlNeiQ3DtrUZt6/4f2UKJrm39cw ayvg== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=srPnmqp2Z7XfjqetWhlTso+3rlL2smI4l+w1SFyQ3O4=; b=cLg5+dZJfvp36GAdmoetnwIlzBE8aWZXoT+o2FNM2+1DvDsIZQzBKCLqHwfLipS5Hm OjRtp6rqXMud1/xssr7djFSvvj/T4NJNNLjhu3/ZGev1Q7U9O2RU1I3TPW1LlsW4GhRv oTrJMlbT/wGlPiAP+43OBgs58XKHMnNkrGiSzTktARpFLM8ShPWq1+8PqAQQuGwGPxuq fbik3VoH1x0HD2gl9c7mrIS4pGMDX7WbsaZyYesBIFSNWfFrUCXHEJAqg70KpQ/V85NS bX796BKYzz7SX2vF/h8hd7lmCk2S0THcqdWJaQJIkL2SBMYVMg7XZmdRQULPsZHvvyMs MjMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nc3Ag7ct; 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 y6si871964edp.344.2022.01.12.18.14.22; Wed, 12 Jan 2022 18:14:22 -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=@gmail.com header.s=20210112 header.b=nc3Ag7ct; 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 9EBE868B295; Thu, 13 Jan 2022 03:56:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC18F68B27F for ; Thu, 13 Jan 2022 03:56:43 +0200 (EET) Received: by mail-qk1-f181.google.com with SMTP id 193so4865424qkh.13 for ; Wed, 12 Jan 2022 17:56:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=k68loximJMwt+iptb5hjLkfOpj7YM51yjKhAe1hf88k=; b=nc3Ag7ctrHrvdvs/BGzch3kt2EJRVeN18CWklKzWuyhuKE9fjSxtE03ZFgxCjRR10l Bjn5Lj2Oy9u7awaVhuNmrABB4aRgeoh1wuhDYBpBpH7f3Owa5EEm6f8cMzzgFAW2H/6S tnUri4lMU9Sp+4wp65iW1bEQD2VDSBKkjd8OcO6etNZb+dtfFpcTCm48OdX6M9hXt7UX 7rlJFALWpW+H3ItHgLh2y0WKzz3YCYkx2Pep92sTXytx9orcayk5mOLHU0W3HQyWwk9x enK1I4LjS62rjTQ2lf8p5JywAUKFQ6DE4qFXSUWVj0aX1QDn9YlD9q6z4H09plo4mrm8 BwoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k68loximJMwt+iptb5hjLkfOpj7YM51yjKhAe1hf88k=; b=mGoCw21BQniWisLptvQPKAyNXaFsEVqa3dYysMqnVQFe5UJSJLMlx4Pzm++A8d/fH0 jvIgOovimnUEfilX865aPjS3+6mM38ymlz6t6lKjI52Xs3UHLrgBCxaII++tL0qyAdpA w5JL6Sud6mTq1waH4/f8mDSbF6tlN4Db6+3WYGAn5Je08rTMNgGrwD1JIE7+eYgvogSK f5vH3foH1ZfqSQzVpXRigmRCJmKQpNOyo5An4AVhNriJmgyHU2MkcXAx8Il+ZLC5N1v7 b7gzYqecHM+hIKHKOFKWhblWGZ9OeeT1928p51wRNtbs7Zf2NoYjjsY19Wn72k3+cXEt 8F+g== X-Gm-Message-State: AOAM5327sjKFWA19gaFg1sqwGogqOKx6fjoB1Il1VdQNxZxObJKMFK2h DkzrTcNc9X2+wggPdV4gF8ek+sPEZiI= X-Received: by 2002:a37:b702:: with SMTP id h2mr1863092qkf.135.1642039002228; Wed, 12 Jan 2022 17:56:42 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:55:56 -0300 Message-Id: <20220113015612.448-15-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 103/281] mpegtsenc: convert to new channel layout API 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: 2t9zWr0EQJMS From: Anton Khirnov Signed-off-by: James Almer --- libavformat/mpegtsenc.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 92b4cc8087..018baf5d1b 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -466,7 +466,7 @@ static int get_m2ts_stream_type(AVFormatContext *s, AVStream *st) stream_type = 0x81; break; case AV_CODEC_ID_DTS: - stream_type = (st->codecpar->channels > 6) ? 0x85 : 0x82; + stream_type = (st->codecpar->ch_layout.nb_channels > 6) ? 0x85 : 0x82; break; case AV_CODEC_ID_TRUEHD: stream_type = 0x83; @@ -592,6 +592,8 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) if (codec_id == AV_CODEC_ID_S302M) put_registration_descriptor(&q, MKTAG('B', 'S', 'S', 'D')); if (codec_id == AV_CODEC_ID_OPUS) { + int ch = st->codecpar->ch_layout.nb_channels; + /* 6 bytes registration descriptor, 4 bytes Opus audio descriptor */ if (q - data > SECTION_LENGTH - 6 - 4) { err = 1; @@ -605,11 +607,11 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) *q++ = 0x80; if (st->codecpar->extradata && st->codecpar->extradata_size >= 19) { - if (st->codecpar->extradata[18] == 0 && st->codecpar->channels <= 2) { + if (st->codecpar->extradata[18] == 0 && ch <= 2) { /* RTP mapping family */ - *q++ = st->codecpar->channels; - } else if (st->codecpar->extradata[18] == 1 && st->codecpar->channels <= 8 && - st->codecpar->extradata_size >= 21 + st->codecpar->channels) { + *q++ = ch; + } else if (st->codecpar->extradata[18] == 1 && ch <= 8 && + st->codecpar->extradata_size >= 21 + ch) { static const uint8_t coupled_stream_counts[9] = { 1, 0, 1, 1, 2, 2, 2, 3, 3 }; @@ -635,14 +637,14 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) }; /* Vorbis mapping family */ - if (st->codecpar->extradata[19] == st->codecpar->channels - coupled_stream_counts[st->codecpar->channels] && - st->codecpar->extradata[20] == coupled_stream_counts[st->codecpar->channels] && - memcmp(&st->codecpar->extradata[21], channel_map_a[st->codecpar->channels-1], st->codecpar->channels) == 0) { - *q++ = st->codecpar->channels; - } else if (st->codecpar->channels >= 2 && st->codecpar->extradata[19] == st->codecpar->channels && + if (st->codecpar->extradata[19] == ch - coupled_stream_counts[ch] && + st->codecpar->extradata[20] == coupled_stream_counts[ch] && + memcmp(&st->codecpar->extradata[21], channel_map_a[ch - 1], ch) == 0) { + *q++ = ch; + } else if (ch >= 2 && st->codecpar->extradata[19] == ch && st->codecpar->extradata[20] == 0 && - memcmp(&st->codecpar->extradata[21], channel_map_b[st->codecpar->channels-1], st->codecpar->channels) == 0) { - *q++ = st->codecpar->channels | 0x80; + memcmp(&st->codecpar->extradata[21], channel_map_b[ch - 1], ch) == 0) { + *q++ = ch | 0x80; } else { /* Unsupported, could write an extended descriptor here */ av_log(s, AV_LOG_ERROR, "Unsupported Opus Vorbis-style channel mapping"); @@ -653,9 +655,9 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) av_log(s, AV_LOG_ERROR, "Unsupported Opus channel mapping for family %d", st->codecpar->extradata[18]); *q++ = 0xff; } - } else if (st->codecpar->channels <= 2) { + } else if (ch <= 2) { /* Assume RTP mapping family */ - *q++ = st->codecpar->channels; + *q++ = ch; } else { /* Unsupported */ av_log(s, AV_LOG_ERROR, "Unsupported Opus channel mapping");