diff options
| author | Steven Liu <lq@chinaffmpeg.org> | 2018-03-02 10:56:36 +0800 |
|---|---|---|
| committer | Steven Liu <lq@chinaffmpeg.org> | 2018-03-02 10:56:36 +0800 |
| commit | aa294ad00a497d07931914027267cd4964425ca3 (patch) | |
| tree | d6e6a855c885c627b376d1309cb052b02bc71e5f /libavformat/hlsenc.c | |
| parent | f5f2209d689cd17f4bce7ce5c4f0b1634befc785 (diff) | |
| download | ffmpeg-streaming-aa294ad00a497d07931914027267cd4964425ca3.zip ffmpeg-streaming-aa294ad00a497d07931914027267cd4964425ca3.tar.gz | |
avformat/hlsenc: add reference stream index for split segment
fix ticket: #7044
Get the first video stream to reference for split segment
when there have more than one video stream
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Reviewed-by: Karthick Jeyapal <kjeyapal@akamai.com>
Diffstat (limited to 'libavformat/hlsenc.c')
| -rw-r--r-- | libavformat/hlsenc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index ff06473..08fe0aa 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -129,6 +129,7 @@ typedef struct VariantStream { int nb_entries; int discontinuity_set; int discontinuity; + int reference_stream_index; HLSSegment *segments; HLSSegment *last_segment; @@ -2141,7 +2142,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) if (vs->has_video) { can_split = st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && ((pkt->flags & AV_PKT_FLAG_KEY) || (hls->flags & HLS_SPLIT_BY_TIME)); - is_ref_pkt = st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO; + is_ref_pkt = (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && (pkt->stream_index == vs->reference_stream_index); } if (pkt->pts == AV_NOPTS_VALUE) is_ref_pkt = can_split = 0; @@ -2497,6 +2498,11 @@ static int hls_init(AVFormatContext *s) for (j = 0; j < vs->nb_streams; j++) { vs->has_video += vs->streams[j]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO; + /* Get one video stream to reference for split segments + * so use the first video stream index. */ + if ((vs->has_video == 1) && (vs->streams[j]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)) { + vs->reference_stream_index = j; + } vs->has_subtitle += vs->streams[j]->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE; } |
