Commit e684d07a authored by Steven Liu's avatar Steven Liu

avformat/hlsenc: move number out of hls_start

Signed-off-by: 's avatarSteven Liu <liuqi05@kuaishou.com>
parent ffae62d9
...@@ -1675,7 +1675,6 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) ...@@ -1675,7 +1675,6 @@ static int hls_start(AVFormatContext *s, VariantStream *vs)
ff_format_set_url(vtt_oc, filename); ff_format_set_url(vtt_oc, filename);
} }
} }
vs->number++;
proto = avio_find_protocol_name(oc->url); proto = avio_find_protocol_name(oc->url);
use_temp_file = proto && !strcmp(proto, "file") && (c->flags & HLS_TEMP_FILE); use_temp_file = proto && !strcmp(proto, "file") && (c->flags & HLS_TEMP_FILE);
...@@ -2509,7 +2508,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -2509,7 +2508,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
} }
if (hls->flags & HLS_SINGLE_FILE) { if (hls->flags & HLS_SINGLE_FILE) {
vs->number++;
vs->start_pos += vs->size; vs->start_pos += vs->size;
} else if (hls->max_seg_size > 0) { } else if (hls->max_seg_size > 0) {
vs->start_pos = new_start_pos; vs->start_pos = new_start_pos;
...@@ -2520,14 +2518,13 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -2520,14 +2518,13 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
vs->start_pos = 0; vs->start_pos = 0;
/* When split segment by byte, the duration is short than hls_time, /* When split segment by byte, the duration is short than hls_time,
* so it is not enough one segment duration as hls_time, */ * so it is not enough one segment duration as hls_time, */
vs->number--;
} }
vs->number++;
} else { } else {
vs->start_pos = new_start_pos; vs->start_pos = new_start_pos;
sls_flag_file_rename(hls, vs, old_filename); sls_flag_file_rename(hls, vs, old_filename);
ret = hls_start(s, vs); ret = hls_start(s, vs);
} }
vs->number++;
av_freep(&old_filename); av_freep(&old_filename);
if (ret < 0) { if (ret < 0) {
...@@ -2975,6 +2972,7 @@ static int hls_init(AVFormatContext *s) ...@@ -2975,6 +2972,7 @@ static int hls_init(AVFormatContext *s)
if ((ret = hls_start(s, vs)) < 0) if ((ret = hls_start(s, vs)) < 0)
return ret; return ret;
vs->number++;
} }
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment