From patchwork Thu Oct 21 14:58:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shumsky X-Patchwork-Id: 31204 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp695744ioa; Thu, 21 Oct 2021 07:58:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfjetKQLDt6W4JbiGEd9+KNMEk8dvvhZE38s8YuDo7K5rv/cQno7KV3GqBfpmPYmZZsEvA X-Received: by 2002:a05:6402:40f:: with SMTP id q15mr8111603edv.333.1634828308280; Thu, 21 Oct 2021 07:58:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634828308; cv=none; d=google.com; s=arc-20160816; b=m1/dAgr6OI+eOEn3PY1xPart48DRn5Nrf3dX2frBM0mbapKnGBlvQYpbVnwNFLjV4c 6LBXEodnJSaAVMPfhIwu9OdOmtJOkGGfy4dAVaucdxPDZKvTtFSuUmvb9wC2WGd0p2z7 4OmBjUHKV7wQn3ope2z7zaK1gS6vN9LrYk0bU+WvZxcIwyXlmxwzDH42kUYWudhQ7ZJj Mh5uy00B/84BPwciKX4LqYlkE4v7iPzevNxS614QlEkdRAeq0euB18DspTlkvLNhoarg 366sqNmlztSsjNJ6jkXLMBEggfC1S/oqqyJm5lCYR+DrUvMnZP9XdkjG4I4Kpx8i1iAN /bkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=B+dQ1cqtVwn9fra1SNJAYw7XrlXqY3GVo8pW0dxppJI=; b=B+1Qv9np5zfbRiqnly6vA4F48wT1HvHPtmTz4G5IYZnzwoX9Hr2oHqElI7nsQa8joH D1ut9rPQlHiCN6vrexDv5grcX79tD4vgeoBMK1N+9Tfx3/ufll/l/dFxe7yYzsUQyzup j8RR3NzsZCjXCX4ciT5qpDw9CWQ2fRIJ7dI3xth37Sk3ePAGCUXdav1/A4OVkEAErwRW i90WAuhYHBDaE1k2Lc/EV+nzYGXIvrokvmc8qL6shN4WDEIAhPBYtxofxaAQ0ZlupfLM /4x0CiBlUYs1iqvIm3VlGltLeGslX8x3X+W5tSaA8AEu1G1D81hCfffwdhWkiCTpj10J dOBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VrbqGnf5; 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 e11si12806747edz.497.2021.10.21.07.58.22; Thu, 21 Oct 2021 07:58:28 -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=20210112 header.b=VrbqGnf5; 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 3BFC868A4D4; Thu, 21 Oct 2021 17:58:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8142689B8C for ; Thu, 21 Oct 2021 17:58:11 +0300 (EEST) Received: by mail-lj1-f182.google.com with SMTP id 145so455307ljj.1 for ; Thu, 21 Oct 2021 07:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J3ChWP7zlL5nTEtj9HVLdrd815PDflj2ZnFZ8lSWfmw=; b=VrbqGnf5XG4WMWfG4H2euiOar8zCPxv4MVS2L9rCRC6BNd9VzX9iSbD9VnvMj10G0K rwYOsrf5kuTk2voyk7TW6AEPzkW766r6QFg6h9vDZSBLmqfJVv2HWeHWBxACXPoVJyjW Z2IzWhYitkj7Z6MD1Rwi/E2qQoEVlOA3QzDoTvdZY/aSnoRKQr/v98PQhDGX2GN8MMX1 StN+IyzjyYZnBIsWAuHC7ECnpc2ni1MOgCSFrqHMGWLhOJPU1l+7PTx1s2ndVODiC8oz u1ZSlq1itX4+8hrEaCT0ZmAhqG+aTLG6ivD8t3TNFRpe2yRquJ9W3mWWV+5DR0sLgSXa FECw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J3ChWP7zlL5nTEtj9HVLdrd815PDflj2ZnFZ8lSWfmw=; b=pzvMnQ3jvoMyFaEgDAAqZFa5FsOCUbpZF3T9xiCnIsklSEoGZGfW7935tXxlLvdCOe bUQ+3bhdFhRa5Z7MHTD2nkzYXB5VLTh3sRA1bRB2bhiPvxie64B7rzWuSwxUf3flDwLD uliVFBRGPeLYqVd4YWq3Q99BYE01igL+llmqES/Gk3U9E8+8ja5DRtROkGaiX6DqD3o+ D/Et0GoP+vwCjFHtz/OxYEZOnn0Gilw3ptfyYBsaSbXktGt8nZiNIPF0jPcUmu2Mbn0y RpNsSv7Zs0vx4nQjZ5AXjZmIWZM21Lak6Z/oQS7gUdpDY4cBgud4WZo+Am71AL00Hhfm U5wQ== X-Gm-Message-State: AOAM533DXGBfAVA2m8cXimABnnPP6kKX1gzfsIFjUQHnosY2tHUQ2zHb r/Ig62Y9c4yWRwKbW6Kpa126jebQENkTsQ== X-Received: by 2002:a2e:b611:: with SMTP id r17mr6356257ljn.336.1634828290706; Thu, 21 Oct 2021 07:58:10 -0700 (PDT) Received: from alex3d.netup ([2a03:e140:1:0:ac50:6239:8816:4aa0]) by smtp.gmail.com with ESMTPSA id l27sm480591lfk.53.2021.10.21.07.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 07:58:10 -0700 (PDT) From: Alex Shumsky To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Oct 2021 17:58:02 +0300 Message-Id: <20211021145802.1258420-1-alexthreed@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mpegtsenc: Dont include adaptation field in teletext TS 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: Alex Shumsky Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZCQovLWVdPXs From ETSI EN 300 472 V1.3.1 (2003-05) Specification for conveying ITU-R System B Teletext in DVB bitstreams: 4.1 Transport Stream (TS) packet format The standard TS packet syntax and semantics are followed, noting the following constraint: - adaptation_field_control only the values "01" and "10" are permitted. Some set top boxes (Motorola, Arris, Zyxel) refuse non-conforming packets. Signed-off-by: Alex Shumsky --- libavformat/mpegtsenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 184bb52f75..3d630e2500 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1564,7 +1564,8 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, q = get_ts_payload_start(buf); ts_st->discontinuity = 0; } - if (key && is_start && pts != AV_NOPTS_VALUE) { + if (key && is_start && pts != AV_NOPTS_VALUE + && !is_dvb_teletext /* adaptation+payload forbidden for teletext (ETSI EN 300 472 V1.3.1 4.1) */ ) { // set Random Access for key frames if (ts_st->pcr_period) write_pcr = 1;