This fixes bug which prevents from proper muxing-in KLV stream into mpeg-ts.
mpegtsenc.c:1526
char *side_data = NULL;
int stream_id = -1;
side_data = av_packet_get_side_data(pkt,
AV_PKT_DATA_MPEGTS_STREAM_ID,
&side_data_size);
if (side_data)
stream_id = side_data[0];
One-byte stream ID is read from "char *" array to integer making it to
sign-extend which is not correct. Although it writes it correctly to
stream, since it is treated as one byte again, but it fails with some
condition checks, e.g. in mpegtsenc.c:1278:
if (stream_id == 0xbd) /* asynchronous KLV */
pts = dts = AV_NOPTS_VALUE;
stream_id value in such case is 0xffffffbd.
Fix should be changing side_data type from "char *" to "uint8_t *".
>From d063568a1765f40a79c6dcf44a444e83e0eb0bed Mon Sep 17 00:00:00 2001
From: <vagran....@gmail.com>
Date: Fri, 7 Dec 2018 11:48:28 +0200
Subject: [PATCH] Fix bug in mpegts muxer which affects KLV async stream
generation.
---
libavformat/mpegtsenc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 3339e26..4470b71 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1523,7 +1523,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
int64_t dts = pkt->dts, pts = pkt->pts;
int opus_samples = 0;
int side_data_size;
- char *side_data = NULL;
+ uint8_t *side_data = NULL;
int stream_id = -1;
side_data = av_packet_get_side_data(pkt,
--
2.7.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
