diff options
| author | Hongcheng Zhong <sj.hc_Zhong@sjtu.edu.cn> | 2020-03-06 11:58:22 +0800 |
|---|---|---|
| committer | Steven Liu <lq@chinaffmpeg.org> | 2020-03-12 13:00:29 +0800 |
| commit | 5c72bb62a97fa6ae407ca55184fc0519e641f727 (patch) | |
| tree | 997e213410eb655008364736078df34d6628d47c /libavformat/hlsenc.c | |
| parent | 1812352d767ccf5431aa440123e2e260a4db2726 (diff) | |
| download | ffmpeg-5c72bb62a97fa6ae407ca55184fc0519e641f727.tar.gz | |
avformat/hlsenc: Fix initial setting for start_pts
This patch fixes Bug #8469
If x264 baseline profile is used with other profiles,
start_pts will be initialized to audio stream's first pts,
while the duration is calculated based on video stream's pts.
In this patch the start_pts is initialized with the correct stream's first pts.
Signed-off-by: Hongcheng Zhong <sj.hc_Zhong@sjtu.edu.cn>
Reviewed-by: Steven Liu <liuqi05@kuaishou.com>
Diffstat (limited to 'libavformat/hlsenc.c')
| -rw-r--r-- | libavformat/hlsenc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f6dd894343..19aa2b1208 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -126,6 +126,7 @@ typedef struct VariantStream { int has_video; int has_subtitle; int new_start; + int start_pts_from_audio; double dpp; // duration per packet int64_t start_pts; int64_t end_pts; @@ -2274,6 +2275,12 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) if (vs->start_pts == AV_NOPTS_VALUE) { vs->start_pts = pkt->pts; + if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) + vs->start_pts_from_audio = 1; + } + if (vs->start_pts_from_audio && st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && vs->start_pts > pkt->pts) { + vs->start_pts = pkt->pts; + vs->start_pts_from_audio = 0; } if (vs->has_video) { |