From patchwork Thu Apr 15 04:02:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26922 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 73F39448E18 for ; Thu, 15 Apr 2021 07:03:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F7C468A3AF; Thu, 15 Apr 2021 07:03:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 391A668A1EF for ; Thu, 15 Apr 2021 07:03:25 +0300 (EEST) Received: by mail-qv1-f44.google.com with SMTP id er3so2563595qvb.6 for ; Wed, 14 Apr 2021 21:03:25 -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=9VSNMpOV5ZehDv6UdyqnqaFOlGkmU+3/RuE26WmNrQE=; b=bkn53wQ2/bp22YLE/6eQxQdXDwisL8WZuguq53FS3ATw9NtW4tn3t6QBAb3MHMT41u d+ZDlxhLpOQVb13WDc5T2+YQQufsu7VIAbzQdih4TsafAS6911NEbWaBxRByene0vMUY CR8+I93CIR5GU12mok7HMagmjW6SJGH3w200IU1AWeNLpwlghs+aOWtLqwVATZMdMwkp smWvLPp94tEbNVz/8CUro/t9003yPGZo3QXWNixYyQI4vULFEZAK1sBOH1QPBSpnfwrx zY2cHOrb06Wwct7SfPPF2TInBGx1xjAYa0l60gqXcM7meE2AsTU/3wym+mPIjHijMxme k69g== 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=9VSNMpOV5ZehDv6UdyqnqaFOlGkmU+3/RuE26WmNrQE=; b=TSpHrr+G5i5cwXZlg/XwVX4kgA5h3ZxEIaE+KI6pYhrMsttqZjI9WRvrXOMu/ntbtm +HwGPWsilsGg33pZGh2tIESloOABmIZQlyGImaKW5u1cI0WO1SCw61YjxfocdkYWTooC eggIIpJXYQUf9ph+gH7jmdCnCSBBOAl5MtKeM13/72DvEm0GpXLiapjyOL2ZCcNXHf26 qXP4oEJCFCx4zhNm1aXypDJGVW0mJsrem04HAJTzEmAo++XQa6eyLg2jJjLIB0WoRKAs 150raVumJlITma6hmpBZQKLFyRszAdLaThtFekD2gC033p4hHb9y4eUeM7/EoJIzqkBK BEBg== X-Gm-Message-State: AOAM5329AfF3HgqFcF0WO+X0icY/Ktx+jBWkHK0OURBNb10aDD69VHLR GI9K+ZBPF8FR+Aark1sYRVUZAheLpOo= X-Google-Smtp-Source: ABdhPJwLX1seFZQ8fmhrovMad8/NAl88tfz7RHfbK4fY3Jqz+CSyKC3XEbhFgNQeCUhFXaRdkT/JYw== X-Received: by 2002:a05:6214:a8d:: with SMTP id ev13mr1309450qvb.28.1618459403624; Wed, 14 Apr 2021 21:03:23 -0700 (PDT) Received: from localhost.localdomain ([191.84.237.33]) by smtp.gmail.com with ESMTPSA id k126sm1100802qkb.4.2021.04.14.21.03.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Apr 2021 21:03:23 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 01:02:23 -0300 Message-Id: <20210415040223.4917-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mpegts: set correct extradata size for Opus streams 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" map_type 0 is always 19 bytes, whereas map_type 1 and 255 are 21 + channel count bytes. Should fix ticket #9190. Signed-off-by: James Almer --- libavformat/mpegts.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 6e0d9d7496..5343a14e38 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2030,6 +2030,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type 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); + st->codecpar->extradata_size = 19 + (st->codecpar->extradata[18] ? 2 + channels : 0); } else { avpriv_request_sample(fc, "Opus in MPEG-TS - channel_config_code > 0x8"); } From patchwork Thu Apr 15 13:07:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26926 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 EFDB844A69D for ; Thu, 15 Apr 2021 16:08:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C80CC689D16; Thu, 15 Apr 2021 16:08:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3379689992 for ; Thu, 15 Apr 2021 16:07:56 +0300 (EEST) Received: by mail-qv1-f54.google.com with SMTP id i3so6066944qvj.7 for ; Thu, 15 Apr 2021 06:07:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vxF2N+P1Q0PM0w+m0zazpjDGQSTfQJgPoS4Ut2hhNSA=; b=cd0QFiI1n8TP0ZqPSEUNm3mCjvqRFS/J2fQfxTB0gupkO4WdKj1zojby8+x48dKKiV /Lp+cM8rhQjWP/qF03UkShVXLe5jVcR9MmN2W+O9HSaCZ3UXLdcsYyMLpUSNjBOB3Cvj vnYOkWZREWwzUr3OJ/Q2GNr2hwmda1p1KzwRJQFzAAXtzPGyuBDkU9/HqGNGTvY3fkDt Hoykq4kmkY0bB8VnZsGSGdUcVuhXHMcL1gFbkJLH5o4lDMI3HB4JQroKpWAwpJHDUo9/ 3nQXUeYjE5EVVXJ+4laZXq0oAfiHKhHJbRVc8W5uG6lJQU44SENkxZzFnXV7sUARZn5e vzkA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=vxF2N+P1Q0PM0w+m0zazpjDGQSTfQJgPoS4Ut2hhNSA=; b=TsiUaOs7RVWCrKdCDx24tUvBJ/Ir+1TKgohKV+RWsgkJH1wW4d9i/ct0mHa4h8dHi1 AeqgdtHyzTcEihEeDeREZ4w9tdWlGVYzncUCCeNW1dai0H4yfBGU+xid6vBO4rxz/Mmf FXWU/KRx/bTYe9oB0kcS/feiFtIArkvPd1dCLLhUoOaQi4lewwa6JE6jZ6UixXrCoXk3 BX3coA755G8htMJ1OwcNZCXm7pCa/jIwueo8Fj/hydLMqIc1EmCxxDbmSuFzgNi1T527 g+ePfrSywLugbfhjh3sjf9xcpA/ga2uaXBRCtMGug5ZLTVjSz/rbNs5nxLLNP1njXh/H E4fQ== X-Gm-Message-State: AOAM530xTToG3/rMNplmeyrMeDmTiBuLXnNlI95o909jtCwNpYLoBkfm 6Ehcd8ob/FdAZ5rKbaeYOeIMmhppcio= X-Google-Smtp-Source: ABdhPJz+0MxSIjRAwAogOq4+gZbZeRgibZwj7ryT9JcIdPNu8kd26A8E1vrjXUaAsktIFaDKhAxshA== X-Received: by 2002:a05:6214:1866:: with SMTP id eh6mr2940219qvb.29.1618492075074; Thu, 15 Apr 2021 06:07:55 -0700 (PDT) Received: from localhost.localdomain ([191.84.237.33]) by smtp.gmail.com with ESMTPSA id k15sm1776582qtg.68.2021.04.15.06.07.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Apr 2021 06:07:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 10:07:34 -0300 Message-Id: <20210415130734.117-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210415040223.4917-1-jamrial@gmail.com> References: <20210415040223.4917-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mpegts: add missing sample_rate value to Opus extradata 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" Signed-off-by: James Almer --- libavformat/mpegts.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 5343a14e38..1a2a9f8cd0 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2026,6 +2026,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type return AVERROR_INVALIDDATA; if (channel_config_code <= 0x8) { st->codecpar->extradata[9] = channels = channel_config_code ? channel_config_code : 2; + AV_WL32(&st->codecpar->extradata[12], 48000); 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];