From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C3E2E455FE for ; Thu, 9 Mar 2023 17:04:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B25B868BD07; Thu, 9 Mar 2023 19:04:15 +0200 (EET) Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D07CA68B99F for ; Thu, 9 Mar 2023 19:04:09 +0200 (EET) Received: by mail-qv1-f51.google.com with SMTP id nv15so1848760qvb.7 for ; Thu, 09 Mar 2023 09:04:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20210112.gappssmtp.com; s=20210112; t=1678381448; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tX+G228XSggtSMIKGrO2P2d9bzXl/VPPEIbJDxwUt1Y=; b=QfwI/kcFWVBgePDiS77lnyv3DoJBhwJTCj/6ry7DqLU1uZJ1ybG8F3X1+dQYSYrg2T RJ1rPfR0LrLDyqBL95meAwYq767TBzelJ8UlUXxNy9FM4sq5d25AgimKH4Ym1/SRrGKE tEBDe0BbtxLRdgUq/XsckA80XTDfRLzVQ3mMzyryTsqxnwkgPjqGh5TPS3djZaGyNdUY HVuWZ5HhDwMatIg7pKry1/8z0IwQQtEBKNhObP2DO5nbDxoWjtE4YQVr/qTj7IVvQTE0 dpZnwx/tv6JG0WUVKgbW2ruC7mkgmjBnovEE/jO0OQP50N/PFatttfMwEvqUFK6od7xW TXFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678381448; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tX+G228XSggtSMIKGrO2P2d9bzXl/VPPEIbJDxwUt1Y=; b=s8udnq3jD96Kh8qlwHQVj2ZGPIeL/mHJWbjLyChiybunCjFcirE6+hk4Ni1K0JBdrG sCa4HhRI4lnsxFlTg2FDppMrx6TJUYG0TILHDmsLrXQyPYqsIi4P/MryFxFQRujefZaW XsVTi8NqFY0xlqgCgaXBVPV5ktPyJr4WwNt4QLVRRFt77G9ktKOPg3fly+BzIsUB5kf8 2NmKlTeE+nLJQ+gOhgMzniPCNJ2+w6FzUWhITUpJRyMY7enKYSwmydU3iqHU2vZIPU9N 5zQa5PwDNvuyiKmCH0dadYx/8M1ta75UUW18ihD9qxGuCAFTq1H+1xcYwUiAJE1LaNUf FX2w== X-Gm-Message-State: AO0yUKWp1Emfgp2qfEPK0iA7jj4pTQsR7xDe9JZ6aZnxEDj8ahyAIBnK 4f0cZxKTy0VkdTfjDNdC3f3Udsngjv8g+agjSLM= X-Google-Smtp-Source: AK7set8Msei/U1OivGZfi0n4hbnUi53onwlmMd7BvXf+5STBAj113rmGRTTPyibGXmmzC5p48ghHbg== X-Received: by 2002:a05:6214:400c:b0:56e:aeb3:52b7 with SMTP id kd12-20020a056214400c00b0056eaeb352b7mr3232768qvb.4.1678381448151; Thu, 09 Mar 2023 09:04:08 -0800 (PST) Received: from klab-nyc-kernellabs2.localdomain (pool-71-105-132-214.nycmny.fios.verizon.net. [71.105.132.214]) by smtp.gmail.com with ESMTPSA id q23-20020a374317000000b007426e664cdcsm13558543qka.133.2023.03.09.09.04.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2023 09:04:07 -0800 (PST) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Mar 2023 12:04:04 -0500 Message-Id: <20230309170405.25457-1-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.35.1.655.ga68dfadae5 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] mpegtsenc: Restrict "async" behavior to KLV async packets 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: Devin Heitmueller Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The original code would strip off the PTS/DTS of any packets which had a stream ID of STREAM_ID_PRIVATE_STREAM_1. While the intent was to apply this to asynchronous KLV packets, it was being applied to any codec that had that same stream ID (including types such as SMPTE 2038). Add a clause to the if() statement to ensure it only gets applied if the codec actually is KLV. Signed-off-by: Devin Heitmueller --- libavformat/mpegtsenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index ceed089587..3f201cce1d 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1455,7 +1455,8 @@ static int get_pes_stream_id(AVFormatContext *s, AVStream *st, int stream_id, in st->codecpar->codec_id == AV_CODEC_ID_TIMED_ID3) { return STREAM_ID_PRIVATE_STREAM_1; } else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) { - if (stream_id == STREAM_ID_PRIVATE_STREAM_1) /* asynchronous KLV */ + if (st->codecpar->codec_id == AV_CODEC_ID_SMPTE_KLV && + stream_id == STREAM_ID_PRIVATE_STREAM_1) /* asynchronous KLV */ *async = 1; return stream_id != -1 ? stream_id : STREAM_ID_METADATA_STREAM; } else { -- 2.35.1.655.ga68dfadae5 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".