[FFmpeg-devel] [PATCH] avformat/mpegtsenc: Implement muxing SCTE-35 and EPG packets

[Maksym Veremeyenko]

Hi,

Attached patch implement muxing SCTE-35 and EPG packets into mpegts stream.


-- 
Maksym Veremeyenko
-------------- next part --------------
From dc1b87f5e34c688bb3691767f8026a2815aab03e Mon Sep 17 00:00:00 2001
From: Maksym Veremeyenko <verem at m1.tv>
Date: Mon, 8 Nov 2021 08:10:59 +0200
Subject: [PATCH] avformat/mpegtsenc: Implement muxing SCTE-35 and EPG packets

---
 libavformat/mpegtsenc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index e3fba54..1fe3f55 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -429,6 +429,12 @@ static int get_dvb_stream_type(AVFormatContext *s, AVStream *st)
             stream_type = STREAM_TYPE_PRIVATE_DATA;
         }
         break;
+    case AV_CODEC_ID_SCTE_35:
+        stream_type = 0x86;
+        break;
+    case AV_CODEC_ID_EPG:
+        stream_type = 0;
+        break;
     default:
         av_log_once(s, AV_LOG_WARNING, AV_LOG_DEBUG, &ts_st->data_st_warning,
                     "Stream %d, codec %s, is muxed as a private data stream "
@@ -514,6 +520,16 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
         *q++ = 0xfc;        // private_data_byte
     }
 
+    /* put scte-35 registration tag */
+    for (i = 0; i < s->nb_streams; i++) {
+        AVStream *st = s->streams[i];
+
+        if (st->codecpar->codec_id == AV_CODEC_ID_SCTE_35) {
+            put_registration_descriptor(&q, MKTAG('C', 'U', 'E', 'I'));
+            break;
+        }
+    }
+
     val = 0xf000 | (q - program_info_length_ptr - 2);
     program_info_length_ptr[0] = val >> 8;
     program_info_length_ptr[1] = val;
@@ -547,6 +563,9 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
 
         stream_type = ts->m2ts_mode ? get_m2ts_stream_type(s, st) : get_dvb_stream_type(s, st);
 
+        if (!stream_type)
+            continue;
+
         *q++ = stream_type;
         put16(&q, 0xe000 | ts_st->pid);
         desc_length_ptr = q;
@@ -2099,6 +2118,34 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
             ts_st->dvb_ac3_desc = dvb_ac3_desc;
         }
         av_free(hdr);
+    } else if (st->codecpar->codec_id == AV_CODEC_ID_SCTE_35) {
+        MpegTSSection sec;
+
+        sec.pid = ts_st->pid;
+        sec.cc = ts_st->payload_size;
+        sec.discontinuity= ts->flags & MPEGTS_FLAG_DISCONT;
+        sec.write_packet = section_write_packet;
+        sec.opaque       = s;
+
+        mpegts_write_section(&sec, pkt->data, pkt->size);
+
+        ts_st->payload_size = sec.cc;
+
+        return 0;
+    } else if (st->codecpar->codec_id == AV_CODEC_ID_EPG) {
+        MpegTSSection sec;
+
+        sec.pid = EIT_PID;
+        sec.cc = ts_st->payload_size;
+        sec.discontinuity= ts->flags & MPEGTS_FLAG_DISCONT;
+        sec.write_packet = section_write_packet;
+        sec.opaque       = s;
+
+        mpegts_write_section(&sec, pkt->data, pkt->size);
+
+        ts_st->payload_size = sec.cc;
+
+        return 0;
     }
 
     if (ts_st->payload_size && (ts_st->payload_size + size > ts->pes_payload_size ||
-- 
1.8.3.1