RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/mpegtsenc: Restrict "async" behavior to KLV async packets 

The original code would strip off the PTS/DTS of any packets
which had a stream ID of STREAM_ID_PRIVATE_STREAM_1.  While the
intent was to apply this to asynchronous KLV packets, it was
being applied to any codec that had that same stream ID (including
types such as SMPTE 2038).

Add a clause to the if() statement to ensure it only gets applied
if the codec actually is KLV.

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Devin Heitmueller 2023-03-09 12:04:04 -05:00 committed by Marton Balint
parent 14719b7939
commit 6273fb36cc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/mpegtsenc.c
View File

@ -1455,7 +1455,8 @@ static int get_pes_stream_id(AVFormatContext *s, AVStream *st, int stream_id, in
st->codecpar->codec_id == AV_CODEC_ID_TIMED_ID3) { st->codecpar->codec_id == AV_CODEC_ID_TIMED_ID3) {
return STREAM_ID_PRIVATE_STREAM_1; return STREAM_ID_PRIVATE_STREAM_1;
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) { } else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) {
if (stream_id == STREAM_ID_PRIVATE_STREAM_1) /* asynchronous KLV */ if (st->codecpar->codec_id == AV_CODEC_ID_SMPTE_KLV &&
stream_id == STREAM_ID_PRIVATE_STREAM_1) /* asynchronous KLV */
*async = 1; *async = 1;
return stream_id != -1 ? stream_id : STREAM_ID_METADATA_STREAM; return stream_id != -1 ? stream_id : STREAM_ID_METADATA_STREAM;
} else { } else {