From patchwork Sun Apr 25 02:52:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zheng qian X-Patchwork-Id: 27361 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp2528884yba; Sat, 24 Apr 2021 19:59:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztGyjimVSHwAfNwQmZECIWxuWqWRzmXqnwo5XV+oQ9Qq0mmmnpWCJwQI3TSEaBIJdhySmR X-Received: by 2002:a05:6402:1a:: with SMTP id d26mr13250930edu.99.1619319584039; Sat, 24 Apr 2021 19:59:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619319584; cv=none; d=google.com; s=arc-20160816; b=HGF9KpGN18r06ISeIMOXJ/sojsjSXEorUqyFCPdlXK5ecHdki2GoyreHQuk6Bnu/k9 IvKV6ukMFJpZTQyTLK8qealmF7YR51LuF1WxYv8R+ClBEXVibOKT9wACVPs0N1LtxyWT LB95kOB9pTg4QTVuxGKWxDfXarre7qM0LWZyJKMyZXcHq5mXFO7+jIRDgvf9JtkLbF/E 2RV1RnhJQelK/7Xj7Xiuc7litu+9V7VdNwVs5dDqXzjCD2DD9hPy5lbGJHbkcbsgPdso VLuT269YgB7pjGnKQjIUSTFKTtBX0Pqn/dFPJDqFR42oL2pdRUwL6bKUuoDQiiV/ivsq 7Dnw== 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=nGdejEqHyV6PVLl97arJyF0s08APxVB1I6HTW1wJeuQ=; b=bTPvEBWVmWC69bmwcMRSzpFXiEJI+y57nEz7aGhWCfyX8TJifQLRKk9TsICAJurrml edhdSBEs32aEx7d7jJc8Iol/4sMAmH0Z7+wO7wbee1OdOweyWLOF5YRowVeqjthHHT8w jbO1ERkO7IH3G22OfqxWJvQv8O6h/Yaz6hYpKR2kIjG2NdHKVJPNxt9DMkZSrP/Z9g2Q l8J2e9KYBcErOEJkp4G0hb7nETn7m59WYIJ2Ig1kTcHlxZf9s1CuCfqDhs+HU56Os+wF Ox2yZYa03ZSEjEFFdHoKvNcwvsRZOyd9BI8ZU4Kka1TutbedfRuWTu4vmBf6rvzqRCbn murw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=t8EKNbXZ; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z5si3018854ede.44.2021.04.24.19.59.43; Sat, 24 Apr 2021 19:59:44 -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=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=t8EKNbXZ; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16B86680CF4; Sun, 25 Apr 2021 05:59:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C791B680CED for ; Sun, 25 Apr 2021 05:59:36 +0300 (EEST) Received: by mail-io1-f49.google.com with SMTP id k25so9605752iob.6 for ; Sat, 24 Apr 2021 19:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xqq-im.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RvS8+NHlASMFuBQolszuHtRjjW9iNpkmhw9kh3QUDBU=; b=t8EKNbXZrCL6t9S2Wj91YfwHqMWlXfZl2jmaCLXHA10DGsTvAMKPyqK6MtN7CNTnSf jLRwgKmU+/mCcl5j+AoglUTxrn0qb+wca7d33BZNYDZtp5xxj0AC5U+huZQuz9iHCc62 CCF2kHVaXWX+3YGnDJqTbOSEjeijuu8GMXI6gKJyyG3vpc5u7t9GtDt00RBZ6DJHJ9Kw CxyA3/QcDMBFGNW8Zu01l0x+df3sHj/R+1KKc1DNQDTKA8o0vM5mdN2hbqPBSY7e1MEV BrMRGuld2LH2G4e41u+P+875PEADEsk8Ht0nv06VL1VnG/C1P+uMogF/QneAU50ZG8KO xOLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RvS8+NHlASMFuBQolszuHtRjjW9iNpkmhw9kh3QUDBU=; b=M0TFq1MbncsrBuF4rIZmBa7OkOWqHQOztK8/3VbHw3M+tdx3VPkihWyJXCBPCnts1f iNnW/1X5cMZeZjhtXbVNwpDFI9Xjp3MZh9oxHZpxaiRPLcJ/Pwc+gxIm8TqCNeUxDsqv zWqArAKhvGNGBWxDV1ohtxHD4VaiV6l47wzTgepqeq7u2423f01r1SFMbzdle/AT7Y6/ xbsTDU/xrnE5wxVE3tw0JGWcqCHK6Km1t6kAuZ7SiGIbPV29onef0hAahM4mYiNeiW5f OFaUjImR7k2IgPy3o9yr5uffbQTtHqWlpoiTWoEKok7YsxEvlqrKVVOJJRhSHJ84Dze5 0tZQ== X-Gm-Message-State: AOAM533bTLkR0QlGls/SjQc54mjyhqI7sEkGocBOoZbRTH8r1Jsia30D wRq/D4fTERst/7WhCuGpC3yHxz+n2Meajj5R X-Received: by 2002:a65:5089:: with SMTP id r9mr10919373pgp.38.1619319159098; Sat, 24 Apr 2021 19:52:39 -0700 (PDT) Received: from zhengqian-xps.lan (ngn-nat1.v4.open.ad.jp. [202.222.12.138]) by smtp.gmail.com with ESMTPSA id m188sm8305300pga.23.2021.04.24.19.52.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Apr 2021 19:52:38 -0700 (PDT) From: zheng qian To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 11:52:18 +0900 Message-Id: <20210425025221.35696-1-xqq@xqq.im> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/4] avformat/mpegts: Add missing constants for MPEG-TS stream_id definitions 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: zheng qian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5Phh8mC597Ga Content-Length: 1267 Signed-off-by: zheng qian --- libavformat/mpegts.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index 04874e0f42..224282b3ed 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -138,11 +138,19 @@ #define STREAM_TYPE_AUDIO_EAC3 0x87 /* ISO/IEC 13818-1 Table 2-22 */ +#define STREAM_ID_PROGRAM_STREAM_MAP 0xbc #define STREAM_ID_PRIVATE_STREAM_1 0xbd +#define STREAM_ID_PADDING_STREAM 0xbe +#define STREAM_ID_PRIVATE_STREAM_2 0xbf #define STREAM_ID_AUDIO_STREAM_0 0xc0 #define STREAM_ID_VIDEO_STREAM_0 0xe0 +#define STREAM_ID_ECM_STREAM 0xf0 +#define STREAM_ID_EMM_STREAM 0xf1 +#define STREAM_ID_DSMCC_STREAM 0xf2 +#define STREAM_ID_TYPE_E_STREAM 0xf8 #define STREAM_ID_METADATA_STREAM 0xfc #define STREAM_ID_EXTENDED_STREAM_ID 0xfd +#define STREAM_ID_PROGRAM_STREAM_DIRECTORY 0xff /* ISO/IEC 13818-1 Table 2-45 */ #define VIDEO_STREAM_DESCRIPTOR 0x02 From patchwork Sun Apr 25 02:52:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zheng qian X-Patchwork-Id: 27358 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp2528751yba; Sat, 24 Apr 2021 19:59:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJCcSkiWRW+j2oIW9mdTo3QpGOyObfMU0/tMD8t9FvTSThDcZ8FezNKcfX+Yt8qe9rqIwa X-Received: by 2002:a05:6402:1a47:: with SMTP id bf7mr13342468edb.173.1619319567817; Sat, 24 Apr 2021 19:59:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619319567; cv=none; d=google.com; s=arc-20160816; b=z0b0yNxTnC9FsZTx9BNZD5EphwzL703ffDk9jBbkhQLFlgKi1KOYbFWfW+wybdvcmS VvtFE4SNzbief3DqX8MG48Q67XpYKnfk+G3LZCNqJ0k9AeEftT2GQIuMlNBuMU03C7Hz HoGbDtSwJpMJKOVtFImXWc9VFyum2z7sXN6FxBDSJT00cVsOA0J+ZaPXDMm2s0HYrfmk F0iD032DpjYS4yyU5IfdiCs7QliSRXhc/BpBlOZ4GT9muHff5enfngixe959zHqZFvLI alhPtJ2AdqpOXjxyA5hTzSNPyJlykGl24JkDNwmaTZ6Sw8CkinoWF125S1EytQTlwU+4 6aXw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=USRqMkNd55qwBvaSAbkwXUuXfLPWBZ4uDz4e7PNCvBM=; b=HuemPw6Yi7RjR3AgNyqBjQWfelrnAWon0hG6Uk3jZDFeYuH/psGmnW1LFCnSTKc8Fx ckvc+UsizU1heOctD1+Op7cRrEFYXiJP/uVQEpG7uFzGW3sWSLH279QcRDAHSsjIBPzw ewokmn0a+tjX16ZhMAZv887e06nGBP5XEU2ndE8wv/OeuX8smYgRyvRjTYfbcn2KdD6l Ouw2l7p83G7899NkKmKwoYCbJxUiw5kgJ1aI+mOjwYB37vlgc4rHX6q+ENR+TyjCGovd kslEx7GQr76+ETCXIw+fbjbNwzGd+tmTiGxrBNuuYGpsctaJShlEHAyu2aLlfcKBCHbI LiEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=JO+E3dyG; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p16si9143630edu.606.2021.04.24.19.59.27; Sat, 24 Apr 2021 19:59:27 -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=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=JO+E3dyG; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12827680CEF; Sun, 25 Apr 2021 05:59:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f176.google.com (mail-il1-f176.google.com [209.85.166.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28213680C82 for ; Sun, 25 Apr 2021 05:59:20 +0300 (EEST) Received: by mail-il1-f176.google.com with SMTP id c18so43826272iln.7 for ; Sat, 24 Apr 2021 19:59:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xqq-im.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6ffUQHln/RhbHOSIokGyHo30Nz9jQPVKQrI4GriaUOo=; b=JO+E3dyG+K8YRaTaLOWS6cuVorQ4YgTuK0SV7QUjpqG043qA0aJewSIOgehaXTJ2r7 iVvS9Mj9dM9pby/96lyMiReN2t4jiqV37l0TmzsmwqtJog9o1Z069ZDiVcJ9ALHvCDnC i/ze257kh9xZfkIw0cY9BB20Y+I3bvIYEe+ElcEu59fxL0LmMmtmRBJYyGTBMUhFMDfH ahsveAJKQwQeXrck5aoPOdFrfR18FAKedHaOMWxChvHNg1NXvKFKXEbxWiorQU/lbj0e DF72rLEXn0WQdcNSobR5HyL2zlTYvF/2u0y5UNHQQ1s5SBX4Vm53WstPXwCHZveyhhLI f7gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6ffUQHln/RhbHOSIokGyHo30Nz9jQPVKQrI4GriaUOo=; b=dOzKgY7616kq7xTZWuwkeNqSaXoA0nxKJpXcxyTnihS0ukaunicEm7wZyuY1kt+FZA khNgD5o1r0n6rwrEyDAS8fzO00hrCWWiXtVPE22a8poQ9rmvakbpxH3XsppRExSEerGB SJBBMRb4x2OuAikNrG5eOvY+n/QDLJ9WvaiqDepW3uNxXN+1Vqb371av+nYqZPQc6NMp UzeIsU4RS7/rlGRQW7MYQkxgOpbfQ38/NzW3lYUOfhs2jjZv+1wWSnOvCjKXqUhjBOVX kPTmsDM8+Xd9W7JrY1oiVLFcR85B3MIRMvUGHxdrgIbAiupWvKMYKBTSe3D2amAbxjdu 47Zw== X-Gm-Message-State: AOAM530pZ2cRSKAQ/wkRQVxXGww3JW3S9V7RsLXR+E809tGRn43ZECvA acoq0ggL7BpAopo6PR6GaBzvsw7aAEec53jd X-Received: by 2002:a63:7c17:: with SMTP id x23mr10527161pgc.121.1619319162920; Sat, 24 Apr 2021 19:52:42 -0700 (PDT) Received: from zhengqian-xps.lan (ngn-nat1.v4.open.ad.jp. [202.222.12.138]) by smtp.gmail.com with ESMTPSA id m188sm8305300pga.23.2021.04.24.19.52.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Apr 2021 19:52:42 -0700 (PDT) From: zheng qian To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 11:52:19 +0900 Message-Id: <20210425025221.35696-2-xqq@xqq.im> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210425025221.35696-1-xqq@xqq.im> References: <20210425025221.35696-1-xqq@xqq.im> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/4] avformat/mpegts: Fix indentation for stream_id constants 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: zheng qian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Nz0XfYfdv3js Content-Length: 1859 Signed-off-by: zheng qian --- libavformat/mpegts.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index 224282b3ed..c75ba08f29 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -138,18 +138,18 @@ #define STREAM_TYPE_AUDIO_EAC3 0x87 /* ISO/IEC 13818-1 Table 2-22 */ -#define STREAM_ID_PROGRAM_STREAM_MAP 0xbc -#define STREAM_ID_PRIVATE_STREAM_1 0xbd -#define STREAM_ID_PADDING_STREAM 0xbe -#define STREAM_ID_PRIVATE_STREAM_2 0xbf -#define STREAM_ID_AUDIO_STREAM_0 0xc0 -#define STREAM_ID_VIDEO_STREAM_0 0xe0 -#define STREAM_ID_ECM_STREAM 0xf0 -#define STREAM_ID_EMM_STREAM 0xf1 -#define STREAM_ID_DSMCC_STREAM 0xf2 -#define STREAM_ID_TYPE_E_STREAM 0xf8 -#define STREAM_ID_METADATA_STREAM 0xfc -#define STREAM_ID_EXTENDED_STREAM_ID 0xfd +#define STREAM_ID_PROGRAM_STREAM_MAP 0xbc +#define STREAM_ID_PRIVATE_STREAM_1 0xbd +#define STREAM_ID_PADDING_STREAM 0xbe +#define STREAM_ID_PRIVATE_STREAM_2 0xbf +#define STREAM_ID_AUDIO_STREAM_0 0xc0 +#define STREAM_ID_VIDEO_STREAM_0 0xe0 +#define STREAM_ID_ECM_STREAM 0xf0 +#define STREAM_ID_EMM_STREAM 0xf1 +#define STREAM_ID_DSMCC_STREAM 0xf2 +#define STREAM_ID_TYPE_E_STREAM 0xf8 +#define STREAM_ID_METADATA_STREAM 0xfc +#define STREAM_ID_EXTENDED_STREAM_ID 0xfd #define STREAM_ID_PROGRAM_STREAM_DIRECTORY 0xff /* ISO/IEC 13818-1 Table 2-45 */ From patchwork Sun Apr 25 02:52:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zheng qian X-Patchwork-Id: 27360 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp2541638yba; Sat, 24 Apr 2021 20:25:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygPEqlaGLg37A6OrDG1wgYurQkQfp05nEjDWggfgIZibrM4DarQnG3y/xpyGGHq5rxIeek X-Received: by 2002:a17:906:b2cd:: with SMTP id cf13mr11911673ejb.419.1619321155586; Sat, 24 Apr 2021 20:25:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619321155; cv=none; d=google.com; s=arc-20160816; b=CPdlYab7zSYCeuqjOz6bdU2hffEyEJjMmEt05kxeoziwKDnYsug8fPvrypdIZ+2pgC 3T9N4EouDr5eYg6H5WoSo57jhA1oNBWdwKbBamWbYx63qKQr8W6LnFbtqkUh9J60Fy3U 5mmBJBVg2om+jKZvu6LUouATHBr+lDlosoh9+tXqffX7Mm4RxC1tpOY3TO3XulfHLgw6 jXaDn7cZm7XTBtvZiJbeg2NV3t1zZmPASqZ8Wl4UNJXhwFW9+sKJkLlex2FILmz7fY/h xudJh5da51JLkQO6dkz+gkoi3ns1ceioVwiXm2KKrCY4RDfEbACN7p3h45iqlW9s+GBx YLWA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=w0L3ZNP5zzJy1nf0iPqmfWcTypdJl634OaSOwJAvuEU=; b=F696CZuKv+eIoVDFi+3e6Bing7txLZWkG5OjQkUBvkW1kojbcjX6WivHIXdQgtZx+z fUe58eac85WkXr6Pjnw4gYApfnwqaKXvtsVYFZyUUdAGOj8qwk22+MU1wTeyPVJlfm8p aZ2iPQPVOsTvQALvtaiTp24wmtGtwkItiWWFqwKRYeiV9zQ6lZgXiUT5Nc9eAmCrv/QP QzjX8XyXgn+SI9TdKATHAci+NgpqKPMRJggs63v9EEknVbRwKL491xV60wH3qy5kO1TA +MXdbYMIdpkT1bzuIdW9SrT6zzmNyWXmSMQqErh2RyR/EH7Olctsdt5Gscs76QpxlqkC EEPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=Y0Qg0C69; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e23si1376304edq.97.2021.04.24.20.25.55; Sat, 24 Apr 2021 20:25:55 -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=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=Y0Qg0C69; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50225680CED; Sun, 25 Apr 2021 06:25:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F1F5680CED for ; Sun, 25 Apr 2021 06:25:45 +0300 (EEST) Received: by mail-pg1-f179.google.com with SMTP id f29so755008pgm.8 for ; Sat, 24 Apr 2021 20:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xqq-im.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Posrmi9zOiKmcOiopf1pf7y8TwsKEDh71rY3WbD6lJk=; b=Y0Qg0C698jh/H2XBU270N0uGB9S9S81JzlKYeVXKbn3soqZgHlFvVuaB3gvfAOK8YJ IJtnvt9EEZJY1jFcqiKbq7Hnvn6j4j8ImBhfXQ0qTpfCpPbvNLnmQ7IlFhiY33fniQRm 2+k85mUnNC2I0w4rYhkZ7/zatVMpEcGgpDSPmrnNWIMH+0GJ+fGzdf305GzZYHOXjsKg LN9PStH1SqGKyczm0GfLsu4aId/K0ap31WFTGDnHiBry+hJf7A5dv/Kwtjd7bdcJcd1K LEAMGNi6ND+SFT4Y2faGFx5D8MzufRbrvz/UOwCq1BtA2E476XDh0caV19mbR2YGH92N tT2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Posrmi9zOiKmcOiopf1pf7y8TwsKEDh71rY3WbD6lJk=; b=swPYjrmlOVQ7Pe+VvG1IHBDKrBhxAOAihtJV4QCbKcnSEqsXFuHAN1Xeb9E6bx+5vg TlV0ohwtND4TIbmBMY34FbuKNQm6z7zvAaFwiq56GI5y/AwFXljZTUq+jqTVYAwWyjm9 PR1UbOA8h5Vo/ydleZpSrbg2XQD1VGIv7bj2CNDauj0o39wVE9y3n7+bV/bXxAyHynY4 wjzgShPop0pkCH6FgtDY08+F2n5Ny5c+R+schqtVvrZocJgAnkH60go5p3mluLPc4z/d YgnkwuOmY9bSFFr12cdxPeXNGaf6EIPOOt8h7S7oxNlzzzRiYKUg0PyVUiQbCHqPgbT/ pTtw== X-Gm-Message-State: AOAM530dgVVHMld6Au7B+EPWKu/5klpRgKZW16PaYoNTsLUtxb4L/QWM 3ON+8zkaUVJaGqsEOWxse9SGS9DQDgAGZ7V0 X-Received: by 2002:a17:902:8a8a:b029:ec:857a:4d51 with SMTP id p10-20020a1709028a8ab02900ec857a4d51mr11421197plo.68.1619319167864; Sat, 24 Apr 2021 19:52:47 -0700 (PDT) Received: from zhengqian-xps.lan (ngn-nat1.v4.open.ad.jp. [202.222.12.138]) by smtp.gmail.com with ESMTPSA id m188sm8305300pga.23.2021.04.24.19.52.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Apr 2021 19:52:47 -0700 (PDT) From: zheng qian To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 11:52:20 +0900 Message-Id: <20210425025221.35696-3-xqq@xqq.im> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210425025221.35696-1-xqq@xqq.im> References: <20210425025221.35696-1-xqq@xqq.im> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 3/4] avformat/mpegtsenc: Fix mpegts_write_pes() for private_stream_2 and other types 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: zheng qian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WNFKotFFG274 Content-Length: 2220 Changes since v3: Use STREAM_ID_* constants in mpegts.h for stream_id judgement Current implementation skipped the judgement of stream_id causing some kind of stream like private_stream_2 to be incorrectly written with actually a private_stream_1-like PES header with PTS/DTS field. For example, Japan DTV transmits news and alerts through ARIB superimpose that utilizes private_stream_2 still could not be remuxed correctly for now. This patch set fixes the remuxing for private_stream_2 and other stream_id types. Signed-off-by: zheng qian --- libavformat/mpegtsenc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 48d724d646..e6fcecbaca 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1479,6 +1479,16 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, pts = dts = AV_NOPTS_VALUE; header_len = 0; + + if (stream_id != STREAM_ID_PROGRAM_STREAM_MAP && + stream_id != STREAM_ID_PADDING_STREAM && + stream_id != STREAM_ID_PRIVATE_STREAM_2 && + stream_id != STREAM_ID_ECM_STREAM && + stream_id != STREAM_ID_EMM_STREAM && + stream_id != STREAM_ID_PROGRAM_STREAM_DIRECTORY && + stream_id != STREAM_ID_DSMCC_STREAM && + stream_id != STREAM_ID_TYPE_E_STREAM) { + flags = 0; if (pts != AV_NOPTS_VALUE) { header_len += 5; @@ -1572,6 +1582,11 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, memset(q, 0xff, pes_header_stuffing_bytes); q += pes_header_stuffing_bytes; } + } else { + len = payload_size; + *q++ = len >> 8; + *q++ = len; + } is_start = 0; } /* header size */ From patchwork Sun Apr 25 02:52:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zheng qian X-Patchwork-Id: 27359 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp2528522yba; Sat, 24 Apr 2021 19:58:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgxq1bGZh9Hl/5ghFFzLjfDbHX0p1gPh0UoSkbMTNpsz9hidKYGd2cpkhlAJGHOMuqubjA X-Received: by 2002:a17:907:766d:: with SMTP id kk13mr5299393ejc.417.1619319529534; Sat, 24 Apr 2021 19:58:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619319529; cv=none; d=google.com; s=arc-20160816; b=vTSq+tCjtGz12o+KkXxLE/DE1gAzvIRbb6FLvDizSaXfVMKg9j6d6VIap0Z38ErSXT HYXC48YBd64dZDcUil6/aPtYMU5tvgftxQU1IBRXxMK4BxYXO/38b/zS5uGhmIQUkss4 N9WDY9AzCSeUmmQ/4SQDSm5j9928Mw22kbSLQBx9N0rHP2XNvy92bmu45YT3wraVy0xk Ml0DQBrgUC+iRG382Uua9RmMXLV6QbM6HISIWgoaIujwJRSRJfcN/T9nbLzYnp0OwMZo /Bes22jorvClzYelE5SEC6O4xk2yQgGPCJGEjdA9XoWEDmwBdKmAhPQplpmOOdMdfEcE nJkQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=5MXc42eh2V1dIYcfVWB6dYIVWCMMSjkuPVP1UqGqmBI=; b=dTz6+m7WYxEP6zI2pMBhvWyUK59vPlPsX5IYNUpvngH194VpPt3CFWat4pL1rFSIVU pAvJ136ydKjGJ+B1GDlVkLQE1Qux/XZiMl88taC10ng+TtFIpZxNQuwB1v6ZquMjzrfW 9YWXCPFt/WmAwUvudVtJFB59k/vY/QdnRkhbUqZGmFuh3574akxDGMYjyAiQgH7nGbLl UPeQLXuxpWru9ndCmcvIsxU99qBs+b8tArJaQu4xAYgXzykrgIn+xSH7fQHInZrP9ZMB Ek/uz96h0JbIjIHHZ881bB7eze28MsJBFwaOY+pFKjy0XCKA4fz5yzTah+4d36ys03KB JNpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=UTLztpmb; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m9si9969930ejj.645.2021.04.24.19.58.48; Sat, 24 Apr 2021 19:58:49 -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=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=UTLztpmb; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68EB7680CDF; Sun, 25 Apr 2021 05:58:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3EF96802A3 for ; Sun, 25 Apr 2021 05:58:36 +0300 (EEST) Received: by mail-pg1-f172.google.com with SMTP id s22so16747024pgk.6 for ; Sat, 24 Apr 2021 19:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xqq-im.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ha1FPu7Cm5/gaIliE4vw4TagVIgmGqMiVUsCMQcE5cY=; b=UTLztpmb9w95HrrFt9iZt9pyCxKkh7IAMEF29qsrdclrnNeY79JbHd+kPDqR7CH3pK LjW2k5mktYwJIRijCt0H3BQYO78jodX1fAtJpIVrV0Lr39ypbS8NEtYF4D1mrANePcil xMeJtstnQ0nOEBYimrfm9XPZF9T6ovLeMLMwO6+RcrL8yehXNYtNFojFlT+zq8Kgf3L4 xcCNIOFKGjwPJ+cfTL+emwNRcapdHo0/5DidXPtrEwxAKsz3+DvZegZxbe1DvMO1QQDK f0nrYIxp/dvv64C5p63yQqS/ptz6N4MNvtVAgMXMI7JUbuqjMaAf6GLWsW3P8EguRg1K xbcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ha1FPu7Cm5/gaIliE4vw4TagVIgmGqMiVUsCMQcE5cY=; b=mAL3LTeWiZkQFldacfvVuqLc6BlyjK51WzBh7xAr0HCYBFcuVKhPEy1VIjK2nwMSP+ AszIVwESpQ4Cxt9gDFiqxpssP1NTQ5RKJqHaW2mn53zajd9JsXK1ujyLJ/fNhSy7zLbs 5Fvvaz8CJlYPwQqLBbaf+uTmRAX0/M9C68MEzNnoBg6CEmh6v/kMzhxMG8miVrGmuNAT 1pDtPIsGfDsNrAtoP+uvUGss5ScKtWz//sGznD89LM5x/f+9Emp+dvF2rUBcpqxoe37C ZcncsmNCW0Al0cQjqWl+HnDk9F4W6Eg2ZTqPEaBTYcHSb/Ks7WHi41f2fl2aB52GyQeE zRSw== X-Gm-Message-State: AOAM5307aV3j3ECn9JCefa2gj3K8pXK7cB44O16dm2TnDI1Js+3dTOkq 4vBSKSBo8UlIRr14mFqPrUdOxVx/uhvd9KtK X-Received: by 2002:a65:6255:: with SMTP id q21mr10636223pgv.382.1619319172148; Sat, 24 Apr 2021 19:52:52 -0700 (PDT) Received: from zhengqian-xps.lan (ngn-nat1.v4.open.ad.jp. [202.222.12.138]) by smtp.gmail.com with ESMTPSA id m188sm8305300pga.23.2021.04.24.19.52.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Apr 2021 19:52:51 -0700 (PDT) From: zheng qian To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 11:52:21 +0900 Message-Id: <20210425025221.35696-4-xqq@xqq.im> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210425025221.35696-1-xqq@xqq.im> References: <20210425025221.35696-1-xqq@xqq.im> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 4/4] avformat/mpegtsenc: Fix indentation inside if-clause in mpegts_write_pes() 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: zheng qian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xloDxrI1Oi1j Content-Length: 9272 Fix indentation caused by the added stream_id judgement Signed-off-by: zheng qian --- libavformat/mpegtsenc.c | 180 ++++++++++++++++++++-------------------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index e6fcecbaca..d055e5bc15 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1489,99 +1489,99 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, stream_id != STREAM_ID_DSMCC_STREAM && stream_id != STREAM_ID_TYPE_E_STREAM) { - flags = 0; - if (pts != AV_NOPTS_VALUE) { - header_len += 5; - flags |= 0x80; - } - if (dts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE && dts != pts) { - header_len += 5; - flags |= 0x40; - } - if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && - st->codecpar->codec_id == AV_CODEC_ID_DIRAC) { - /* set PES_extension_flag */ - pes_extension = 1; - flags |= 0x01; - - /* One byte for PES2 extension flag + - * one byte for extension length + - * one byte for extension id */ - header_len += 3; - } - /* for Blu-ray AC3 Audio the PES Extension flag should be as follow - * otherwise it will not play sound on blu-ray - */ - if (ts->m2ts_mode && - st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && - st->codecpar->codec_id == AV_CODEC_ID_AC3) { - /* set PES_extension_flag */ - pes_extension = 1; - flags |= 0x01; - header_len += 3; - } - if (is_dvb_teletext) { - pes_header_stuffing_bytes = 0x24 - header_len; - header_len = 0x24; - } - len = payload_size + header_len + 3; - /* 3 extra bytes should be added to DVB subtitle payload: 0x20 0x00 at the beginning and trailing 0xff */ - if (is_dvb_subtitle) { - len += 3; - payload_size++; - } - if (len > 0xffff) - len = 0; - if (ts->omit_video_pes_length && st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { - len = 0; - } - *q++ = len >> 8; - *q++ = len; - val = 0x80; - /* data alignment indicator is required for subtitle and data streams */ - if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE || st->codecpar->codec_type == AVMEDIA_TYPE_DATA) - val |= 0x04; - *q++ = val; - *q++ = flags; - *q++ = header_len; - if (pts != AV_NOPTS_VALUE) { - write_pts(q, flags >> 6, pts); - q += 5; - } - if (dts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE && dts != pts) { - write_pts(q, 1, dts); - q += 5; - } - if (pes_extension && st->codecpar->codec_id == AV_CODEC_ID_DIRAC) { - flags = 0x01; /* set PES_extension_flag_2 */ - *q++ = flags; - *q++ = 0x80 | 0x01; /* marker bit + extension length */ - /* Set the stream ID extension flag bit to 0 and - * write the extended stream ID. */ - *q++ = 0x00 | 0x60; - } - /* For Blu-ray AC3 Audio Setting extended flags */ - if (ts->m2ts_mode && - pes_extension && - st->codecpar->codec_id == AV_CODEC_ID_AC3) { - flags = 0x01; /* set PES_extension_flag_2 */ + flags = 0; + if (pts != AV_NOPTS_VALUE) { + header_len += 5; + flags |= 0x80; + } + if (dts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE && dts != pts) { + header_len += 5; + flags |= 0x40; + } + if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && + st->codecpar->codec_id == AV_CODEC_ID_DIRAC) { + /* set PES_extension_flag */ + pes_extension = 1; + flags |= 0x01; + + /* One byte for PES2 extension flag + + * one byte for extension length + + * one byte for extension id */ + header_len += 3; + } + /* for Blu-ray AC3 Audio the PES Extension flag should be as follow + * otherwise it will not play sound on blu-ray + */ + if (ts->m2ts_mode && + st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && + st->codecpar->codec_id == AV_CODEC_ID_AC3) { + /* set PES_extension_flag */ + pes_extension = 1; + flags |= 0x01; + header_len += 3; + } + if (is_dvb_teletext) { + pes_header_stuffing_bytes = 0x24 - header_len; + header_len = 0x24; + } + len = payload_size + header_len + 3; + /* 3 extra bytes should be added to DVB subtitle payload: 0x20 0x00 at the beginning and trailing 0xff */ + if (is_dvb_subtitle) { + len += 3; + payload_size++; + } + if (len > 0xffff) + len = 0; + if (ts->omit_video_pes_length && st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { + len = 0; + } + *q++ = len >> 8; + *q++ = len; + val = 0x80; + /* data alignment indicator is required for subtitle and data streams */ + if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE || st->codecpar->codec_type == AVMEDIA_TYPE_DATA) + val |= 0x04; + *q++ = val; *q++ = flags; - *q++ = 0x80 | 0x01; /* marker bit + extension length */ - *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */ - } + *q++ = header_len; + if (pts != AV_NOPTS_VALUE) { + write_pts(q, flags >> 6, pts); + q += 5; + } + if (dts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE && dts != pts) { + write_pts(q, 1, dts); + q += 5; + } + if (pes_extension && st->codecpar->codec_id == AV_CODEC_ID_DIRAC) { + flags = 0x01; /* set PES_extension_flag_2 */ + *q++ = flags; + *q++ = 0x80 | 0x01; /* marker bit + extension length */ + /* Set the stream ID extension flag bit to 0 and + * write the extended stream ID. */ + *q++ = 0x00 | 0x60; + } + /* For Blu-ray AC3 Audio Setting extended flags */ + if (ts->m2ts_mode && + pes_extension && + st->codecpar->codec_id == AV_CODEC_ID_AC3) { + flags = 0x01; /* set PES_extension_flag_2 */ + *q++ = flags; + *q++ = 0x80 | 0x01; /* marker bit + extension length */ + *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */ + } - if (is_dvb_subtitle) { - /* First two fields of DVB subtitles PES data: - * data_identifier: for DVB subtitle streams shall be coded with the value 0x20 - * subtitle_stream_id: for DVB subtitle stream shall be identified by the value 0x00 */ - *q++ = 0x20; - *q++ = 0x00; - } - if (is_dvb_teletext) { - memset(q, 0xff, pes_header_stuffing_bytes); - q += pes_header_stuffing_bytes; - } + if (is_dvb_subtitle) { + /* First two fields of DVB subtitles PES data: + * data_identifier: for DVB subtitle streams shall be coded with the value 0x20 + * subtitle_stream_id: for DVB subtitle stream shall be identified by the value 0x00 */ + *q++ = 0x20; + *q++ = 0x00; + } + if (is_dvb_teletext) { + memset(q, 0xff, pes_header_stuffing_bytes); + q += pes_header_stuffing_bytes; + } } else { len = payload_size; *q++ = len >> 8;