From patchwork Sat Apr 17 12:38:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mao Hata X-Patchwork-Id: 26970 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c04b:0:0:0:0:0 with SMTP id c72csp1170974ybf; Sat, 17 Apr 2021 07:42:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQ5/AyzabQJwX6pTJCVEiIHbD0HX3yyVx72um8n27sU29XzqZR5FqNFExmrbK1B4k8gGVU X-Received: by 2002:a17:906:7d82:: with SMTP id v2mr13569120ejo.524.1618670527803; Sat, 17 Apr 2021 07:42:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618670527; cv=none; d=google.com; s=arc-20160816; b=z9gm5x2IyEdSOgyMmBUUJyBDfEXLPXa7cEoOHnlPJmIlC/x/0hcC+gTiIAOvRLXRF6 oxNQbBd7B3aAe8zLW/RTME78sHxwKigmxVd49CB2qaKrBgezoXQsS/FdO4xuR0A40JsE duuWQa8YGBLD3RFie++KVbWJs1O7cw7R2zabQCnJy/nYvG3rxZR975eHVUEnjakOIR1t gUvZjkRCGWpT2hMTUkKRCDeqYeZXp8X6wKFGqDLxmOA0DtQyLUqvM1JLwjb7xplHUrZ0 z1NtgIpa2Y/WOaITdKrhlLxTTx7KvOS1jcHAoTkz/mNGkjwIDJd85XY30k4lScaAq5em ZcDw== 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:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to; bh=G+1ZbVsNzh34L5D2PGlwkCvlBoW5r9aVfYuDbM6I0EA=; b=T8H1NGMq5006NnRFII2c0/nMXp6EWOq5fhfqLoQotR4Mm+KbhMsh62BZUzEK0sYbsT IGf+1j8amTmjn7aT+OQWNuHUtgMvAuisjDQvAOm1ao/kW6IL3N9NnLGC92FlXggIFJiv +fiGw1GGZjqXQq/u5v35/KZpjNb1HfLgUpZroI7v6dCL3vZHrtNyFDiIFuLD90M4bE4p LveM6mdZBbYM3y69Zd4hJoa+pBIkn3IiYUy6RWYVhBBp9YZzWt1rkGBtBtJ88eqmrhh0 ulGyQh6cX4ZWteCNsx+wWNYX6u9HYeSov9oxUDKcvodgv3Yb377o8R+ampGRggwjvldu 9zFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=leCMlN5y; 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 rn15si7382366ejb.207.2021.04.17.07.42.07; Sat, 17 Apr 2021 07:42:07 -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=leCMlN5y; 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 E64B96807F7; Sat, 17 Apr 2021 17:42:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 860D06800BE for ; Sat, 17 Apr 2021 17:41:59 +0300 (EEST) Received: by mail-oi1-f177.google.com with SMTP id n184so4914218oia.12 for ; Sat, 17 Apr 2021 07:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=p0gxeaL50r7TR8IY8/znWAW7vLbFSdJdXOaQaAXSbjU=; b=leCMlN5yi4+zpvSHQClmXJ7et2TgkQpqAJqDsewhu5/97XBsvJ6+3IKBP2/8B0Ayg5 eiCmi00HngRZV99XStMcI6CynVtP/EcOmF7KKMX96R+akd9nTzEP993+AHuxbsnxnwNW pURYI2OGRh7hQli1gucdnFEAVe7NyTAs5kd/xpTufIluvdjYCLjr61jir+g+bwQIKMfd u/7hPCo5iukL6wA4VXePvlHQ/7zHJ5KiTvUEB86rP0GiHjIAYlQLuhvyEo3NSwrixVP7 1746DVFz4BEKLJSnYKom/2H3Myx/tulXyuxaQcuB93vuzLoH6+sQOx8oE0ga49iNYMWp nBtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=p0gxeaL50r7TR8IY8/znWAW7vLbFSdJdXOaQaAXSbjU=; b=hZ28PFsjBuRpLx04BxOo4bKsJuYLNyF3AmmRIN/P48tadYMRTQDULRp0YsSfD7ZCFg SJ+NEK5ThgYZ6Eifb8y+mwA/yu/yL6OiCOr1LtWN+RCqrHN/bEkkhoIXEd35cydtM6io VVIqBT6gWFF+8kMPv+m9bT2I3mvv9ZjQeWWl2T3DRX79i0Qt4MV4RJXvxeknazg06PYJ HMvV/8bve2LwPMqadlTIT73bPc81jaY7hM4bfeVuhmA5oy/XQz62vbbWt8H+gZ+YL9qc HShPlL5j9ku9B+bggk8ls/wRtIGXEDyA9vNhH6PqCKpSQaH41SRSLHUI3tgAClhHevzV DDzw== X-Gm-Message-State: AOAM530yjcBCYBjelz0qwbV7FnYCrpFG9PV6toAiOUAOEszPhawembi3 qwkcQsAbqdRKLSPcDgO3XcI4HiVFnek= X-Received: by 2002:a17:90b:285:: with SMTP id az5mr14575666pjb.0.1618663136328; Sat, 17 Apr 2021 05:38:56 -0700 (PDT) Received: from [192.168.0.11] (zaq3d2e98ee.rev.zaq.ne.jp. [61.46.152.238]) by smtp.gmail.com with ESMTPSA id h22sm7561801pfn.55.2021.04.17.05.38.55 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 17 Apr 2021 05:38:55 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Mao Hata Message-ID: <68e74195-0397-1a11-cc6e-53519fcd8d87@gmail.com> Date: Sat, 17 Apr 2021 21:38:50 +0900 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] avformat/mpegtsenc: private_stream_1 is not asynchronous KLV 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: Tq3Gwi7Xdz7x Content-Length: 3152 According to ISO/IEC 13818-1, private_stream_1 is a synchronous (has PTS/DTS) stream. Asynchronous one is private_stream_2. From c1663cbdbbd2178cb199e079ec9bb712d1d757d8 Mon Sep 17 00:00:00 2001 From: Mao Hata Date: Sat, 17 Apr 2021 19:55:22 +0900 Subject: [PATCH] avformat/mpegtsenc: private_stream_1 is not asynchronous KLV This fixes inappropriately removing PTS/DTS from "bin_data" output. Signed-off-by: Mao Hata --- libavformat/mpegts.h | 1 + libavformat/mpegtsenc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index 04874e0f42..ed640733e3 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -139,6 +139,7 @@ /* ISO/IEC 13818-1 Table 2-22 */ #define STREAM_ID_PRIVATE_STREAM_1 0xbd +#define STREAM_ID_PRIVATE_STREAM_2 0xbf #define STREAM_ID_AUDIO_STREAM_0 0xc0 #define STREAM_ID_VIDEO_STREAM_0 0xe0 #define STREAM_ID_METADATA_STREAM 0xfc diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index a357f3a6aa..9982089d0f 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1434,7 +1434,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, } else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) { *q++ = stream_id != -1 ? stream_id : STREAM_ID_METADATA_STREAM; - if (stream_id == STREAM_ID_PRIVATE_STREAM_1) /* asynchronous KLV */ + if (stream_id == STREAM_ID_PRIVATE_STREAM_2) /* asynchronous KLV */ pts = dts = AV_NOPTS_VALUE; } else { *q++ = STREAM_ID_PRIVATE_STREAM_1;