diff mbox series

[FFmpeg-devel] avformat/hlsenc: Fix initial setting for start_pts

Message ID 1583415712-6396-1-git-send-email-sj.hc_Zhong@sjtu.edu.cn
State Superseded
Headers show
Series [FFmpeg-devel] avformat/hlsenc: Fix initial setting for start_pts
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Hongcheng Zhong March 5, 2020, 1:41 p.m. UTC
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>
---
 libavformat/hlsenc.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

Steven Liu March 5, 2020, 3:38 p.m. UTC | #1
> 2020年3月5日 下午9:41,Hongcheng Zhong <sj.hc_zhong@sjtu.edu.cn> 写道:
> 
> 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>
> ---
> libavformat/hlsenc.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index f6dd894..3b2434f 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,9 +2275,15 @@ 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) {
> +    if (vs->has_video) {
What’s happen with this line?
>         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) && (pkt->stream_index == vs->reference_stream_index);
> @@ -2751,6 +2758,7 @@ static int hls_init(AVFormatContext *s)
>         vs->sequence       = hls->start_sequence;
>         vs->start_pts      = AV_NOPTS_VALUE;
>         vs->end_pts      = AV_NOPTS_VALUE;
> +        vs->start_pts_from_audio = 0;
>         vs->current_segment_final_filename_fmt[0] = '\0';
> 
>         if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) {
> -- 
> 2.7.4
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Hongcheng Zhong March 5, 2020, 4:48 p.m. UTC | #2
----- On Mar 5, 2020, at 11:38 PM, lq lq@chinaffmpeg.org wrote:

>> 2020年3月5日 下午9:41,Hongcheng Zhong <sj.hc_zhong@sjtu.edu.cn> 写道:
>> 
>> 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>
>> ---
>> libavformat/hlsenc.c | 10 +++++++++-
>> 1 file changed, 9 insertions(+), 1 deletion(-)
>> 
>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>> index f6dd894..3b2434f 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,9 +2275,15 @@ 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) {
>> +    if (vs->has_video) {
> What’s happen with this line?
>>         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) &&
>>         (pkt->stream_index == vs->reference_stream_index);
>> @@ -2751,6 +2758,7 @@ static int hls_init(AVFormatContext *s)
>>         vs->sequence       = hls->start_sequence;
>>         vs->start_pts      = AV_NOPTS_VALUE;
>>         vs->end_pts      = AV_NOPTS_VALUE;
>> +        vs->start_pts_from_audio = 0;
>>         vs->current_segment_final_filename_fmt[0] = '\0';
>> 
>>         if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) {
>> --
>> 2.7.4
>> 
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>> 
>> To unsubscribe, visit link above, or email
> > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Actually, this line is useless because that vs is initialized as all zero.
Should I remove this line and submit this patch as v2 again? Thanks for your reply.
Andreas Rheinhardt March 5, 2020, 4:55 p.m. UTC | #3
Hongcheng Zhong:
> ----- On Mar 5, 2020, at 11:38 PM, lq lq@chinaffmpeg.org wrote:
> 
>>> 2020年3月5日 下午9:41,Hongcheng Zhong <sj.hc_zhong@sjtu.edu.cn> 写道:
>>>
>>> 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>
>>> ---
>>> libavformat/hlsenc.c | 10 +++++++++-
>>> 1 file changed, 9 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>>> index f6dd894..3b2434f 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,9 +2275,15 @@ 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) {
>>> +    if (vs->has_video) {
>> What’s happen with this line?
>>>         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) &&
>>>         (pkt->stream_index == vs->reference_stream_index);
>>> @@ -2751,6 +2758,7 @@ static int hls_init(AVFormatContext *s)
>>>         vs->sequence       = hls->start_sequence;
>>>         vs->start_pts      = AV_NOPTS_VALUE;
>>>         vs->end_pts      = AV_NOPTS_VALUE;
>>> +        vs->start_pts_from_audio = 0;
>>>         vs->current_segment_final_filename_fmt[0] = '\0';
>>>
>>>         if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) {
>>> --
>>> 2.7.4
>>>
>>> _______________________________________________
>>> ffmpeg-devel mailing list
>>> ffmpeg-devel@ffmpeg.org
>>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>>
>>> To unsubscribe, visit link above, or email
>>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> 
> Actually, this line is useless because that vs is initialized as all zero.
> Should I remove this line and submit this patch as v2 again? Thanks for your reply.

But vs->has_video is initialized to a potentially nonzero value in
hls_init().

- Andreas
Hongcheng Zhong March 5, 2020, 5:27 p.m. UTC | #4
----- On Mar 6, 2020, at 12:55 AM, Andreas Rheinhardt andreas.rheinhardt@gmail.com wrote:

> Hongcheng Zhong:
>> ----- On Mar 5, 2020, at 11:38 PM, lq lq@chinaffmpeg.org wrote:
>> 
>>>> 2020年3月5日 下午9:41,Hongcheng Zhong <sj.hc_zhong@sjtu.edu.cn> 写道:
>>>>
>>>> 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>
>>>> ---
>>>> libavformat/hlsenc.c | 10 +++++++++-
>>>> 1 file changed, 9 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>>>> index f6dd894..3b2434f 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,9 +2275,15 @@ 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) {
>>>> +    if (vs->has_video) {
>>> What’s happen with this line?
>>>>         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) &&
>>>>         (pkt->stream_index == vs->reference_stream_index);
>>>> @@ -2751,6 +2758,7 @@ static int hls_init(AVFormatContext *s)
>>>>         vs->sequence       = hls->start_sequence;
>>>>         vs->start_pts      = AV_NOPTS_VALUE;
>>>>         vs->end_pts      = AV_NOPTS_VALUE;
>>>> +        vs->start_pts_from_audio = 0;
>>>>         vs->current_segment_final_filename_fmt[0] = '\0';
>>>>
>>>>         if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) {
>>>> --
>>>> 2.7.4
>>>>
>>>> _______________________________________________
>>>> ffmpeg-devel mailing list
>>>> ffmpeg-devel@ffmpeg.org
>>>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>>>
>>>> To unsubscribe, visit link above, or email
>>>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>> 
>> Actually, this line is useless because that vs is initialized as all zero.
>> Should I remove this line and submit this patch as v2 again? Thanks for your
>> reply.
> 
> But vs->has_video is initialized to a potentially nonzero value in
> hls_init().
> 
> - Andreas
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

I write that line to make sure that vs->start_pts_from_audio is initialized as 0.
Since `hls->var_streams = av_mallocz(sizeof(*hls->var_streams) * nb_varstreams);`
in hlsenc.c: 1897, var_streams is allocated with av_mallocz(), that line is not 
necessary.
Andreas Rheinhardt March 6, 2020, 3:08 a.m. UTC | #5
Hongcheng Zhong:
> ----- On Mar 6, 2020, at 12:55 AM, Andreas Rheinhardt andreas.rheinhardt@gmail.com wrote:
> 
>> Hongcheng Zhong:
>>> ----- On Mar 5, 2020, at 11:38 PM, lq lq@chinaffmpeg.org wrote:
>>>
>>>>> 2020年3月5日 下午9:41,Hongcheng Zhong <sj.hc_zhong@sjtu.edu.cn> 写道:
>>>>>
>>>>> 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>
>>>>> ---
>>>>> libavformat/hlsenc.c | 10 +++++++++-
>>>>> 1 file changed, 9 insertions(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>>>>> index f6dd894..3b2434f 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,9 +2275,15 @@ 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) {
>>>>> +    if (vs->has_video) {
>>>> What’s happen with this line?
>>>>>         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) &&
>>>>>         (pkt->stream_index == vs->reference_stream_index);
>>>>> @@ -2751,6 +2758,7 @@ static int hls_init(AVFormatContext *s)
>>>>>         vs->sequence       = hls->start_sequence;
>>>>>         vs->start_pts      = AV_NOPTS_VALUE;
>>>>>         vs->end_pts      = AV_NOPTS_VALUE;
>>>>> +        vs->start_pts_from_audio = 0;
>>>>>         vs->current_segment_final_filename_fmt[0] = '\0';
>>>>>
>>>>>         if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) {
>>>>> --
>>>>> 2.7.4
>>>>>
>>>>> _______________________________________________
>>>>> ffmpeg-devel mailing list
>>>>> ffmpeg-devel@ffmpeg.org
>>>>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>>>>
>>>>> To unsubscribe, visit link above, or email
>>>>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>>>
>>> Actually, this line is useless because that vs is initialized as all zero.
>>> Should I remove this line and submit this patch as v2 again? Thanks for your
>>> reply.
>>
>> But vs->has_video is initialized to a potentially nonzero value in
>> hls_init().
>>
>> - Andreas
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> 
> I write that line to make sure that vs->start_pts_from_audio is initialized as 0.
> Since `hls->var_streams = av_mallocz(sizeof(*hls->var_streams) * nb_varstreams);`
> in hlsenc.c: 1897, var_streams is allocated with av_mallocz(), that line is not 
> necessary.

There seems to be a misunderstanding: The line that Steven asked about
is "if (vs->has_video) {". By changing it you mixed cosmetic changes
and functional ones; this should not be done.
Steven did not ask about "vs->start_pts_from_audio = 0;". But you are
right: It is redundant.

- Andreas
Hongcheng Zhong March 6, 2020, 3:45 a.m. UTC | #6
----- On Mar 6, 2020, at 11:08 AM, Andreas Rheinhardt andreas.rheinhardt@gmail.com wrote:

> Hongcheng Zhong:
>> ----- On Mar 6, 2020, at 12:55 AM, Andreas Rheinhardt
>> andreas.rheinhardt@gmail.com wrote:
>> 
>>> Hongcheng Zhong:
>>>> ----- On Mar 5, 2020, at 11:38 PM, lq lq@chinaffmpeg.org wrote:
>>>>
>>>>>> 2020年3月5日 下午9:41,Hongcheng Zhong <sj.hc_zhong@sjtu.edu.cn> 写道:
>>>>>>
>>>>>> 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>
>>>>>> ---
>>>>>> libavformat/hlsenc.c | 10 +++++++++-
>>>>>> 1 file changed, 9 insertions(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>>>>>> index f6dd894..3b2434f 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,9 +2275,15 @@ 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) {
>>>>>> +    if (vs->has_video) {
>>>>> What’s happen with this line?
>>>>>>         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) &&
>>>>>>         (pkt->stream_index == vs->reference_stream_index);
>>>>>> @@ -2751,6 +2758,7 @@ static int hls_init(AVFormatContext *s)
>>>>>>         vs->sequence       = hls->start_sequence;
>>>>>>         vs->start_pts      = AV_NOPTS_VALUE;
>>>>>>         vs->end_pts      = AV_NOPTS_VALUE;
>>>>>> +        vs->start_pts_from_audio = 0;
>>>>>>         vs->current_segment_final_filename_fmt[0] = '\0';
>>>>>>
>>>>>>         if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) {
>>>>>> --
>>>>>> 2.7.4
>>>>>>
>>>>>> _______________________________________________
>>>>>> ffmpeg-devel mailing list
>>>>>> ffmpeg-devel@ffmpeg.org
>>>>>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>>>>>
>>>>>> To unsubscribe, visit link above, or email
>>>>>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>>>>
>>>> Actually, this line is useless because that vs is initialized as all zero.
>>>> Should I remove this line and submit this patch as v2 again? Thanks for your
>>>> reply.
>>>
>>> But vs->has_video is initialized to a potentially nonzero value in
>>> hls_init().
>>>
>>> - Andreas
>>> _______________________________________________
>>> ffmpeg-devel mailing list
>>> ffmpeg-devel@ffmpeg.org
>>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>>
>>> To unsubscribe, visit link above, or email
>>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>> 
>> I write that line to make sure that vs->start_pts_from_audio is initialized as
>> 0.
>> Since `hls->var_streams = av_mallocz(sizeof(*hls->var_streams) *
>> nb_varstreams);`
>> in hlsenc.c: 1897, var_streams is allocated with av_mallocz(), that line is not
>> necessary.
> 
> There seems to be a misunderstanding: The line that Steven asked about
> is "if (vs->has_video) {". By changing it you mixed cosmetic changes
> and functional ones; this should not be done.
> Steven did not ask about "vs->start_pts_from_audio = 0;". But you are
> right: It is redundant.
> 
> - Andreas
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Sorry, my mistake. "Cosmetic changes should be kept in separate patches."
Thanks a lot for pointing this out.
diff mbox series

Patch

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index f6dd894..3b2434f 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,9 +2275,15 @@  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) {
+    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) && (pkt->stream_index == vs->reference_stream_index);
@@ -2751,6 +2758,7 @@  static int hls_init(AVFormatContext *s)
         vs->sequence       = hls->start_sequence;
         vs->start_pts      = AV_NOPTS_VALUE;
         vs->end_pts      = AV_NOPTS_VALUE;
+        vs->start_pts_from_audio = 0;
         vs->current_segment_final_filename_fmt[0] = '\0';
 
         if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) {