xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-12-02 16:46:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avformat/hlsenc: Fix initial setting for start_pts

Browse Source 
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>
This commit is contained in:
Hongcheng Zhong 2020-03-06 11:58:22 +08:00 committed by Steven Liu
parent 1812352d76
commit 5c72bb62a9
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/hlsenc.c
View File

@ -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) {