> On 14 Dec 2017, at 16:07, Karthick Jeyapal <kjeya...@akamai.com> wrote:
>
>
>
>> On Nov 30, 2017, at 2:36 PM, Karthick J <kjeya...@akamai.com> wrote:
>>
>>
>> From: Karthick Jeyapal <kjeya...@akamai.com>
>>
>>
>> Before this patch persistent http connections would work only for media
>> segments.
>> The playlists were still opening a new connection everytime.
>> This patch extends persistent http connections to playlists as well.
>> ---
>> libavformat/hlsenc.c | 46 ++++++++++++++++++++++------------------------
>> 1 file changed, 22 insertions(+), 24 deletions(-)
>>
>>
>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>> index ff982c5..350836d 100644
>> --- a/libavformat/hlsenc.c
>> +++ b/libavformat/hlsenc.c
>> @@ -201,6 +201,8 @@ typedef struct HLSContext {
>> char *master_pl_name;
>> unsigned int master_publish_rate;
>> int http_persistent;
>> + AVIOContext *m3u8_out;
>> + AVIOContext *sub_m3u8_out;
>> } HLSContext;
>>
>>
>> static int mkdir_p(const char *path) {
>> @@ -1081,7 +1083,6 @@ static int create_master_playlist(AVFormatContext *s,
>> HLSContext *hls = s->priv_data;
>> VariantStream *vs;
>> AVStream *vid_st, *aud_st;
>> - AVIOContext *master_pb = 0;
>> AVDictionary *options = NULL;
>> unsigned int i, j;
>> int m3u8_name_size, ret, bandwidth;
>> @@ -1102,8 +1103,7 @@ static int create_master_playlist(AVFormatContext *s,
>>
>>
>> set_http_options(s, &options, hls);
>>
>>
>> - ret = s->io_open(s, &master_pb, hls->master_m3u8_url, AVIO_FLAG_WRITE,\
>> - &options);
>> + ret = hlsenc_io_open(s, &hls->m3u8_out, hls->master_m3u8_url, &options);
>> av_dict_free(&options);
>> if (ret < 0) {
>> av_log(NULL, AV_LOG_ERROR, "Failed to open master play list file '%s'\n",
>> @@ -1111,7 +1111,7 @@ static int create_master_playlist(AVFormatContext *s,
>> goto fail;
>> }
>>
>>
>> - ff_hls_write_playlist_version(master_pb, hls->version);
>> + ff_hls_write_playlist_version(hls->m3u8_out, hls->version);
>>
>>
>> /* For variant streams with video add #EXT-X-STREAM-INF tag with attributes*/
>> for (i = 0; i < hls->nb_varstreams; i++) {
>> @@ -1152,7 +1152,7 @@ static int create_master_playlist(AVFormatContext *s,
>> bandwidth += aud_st->codecpar->bit_rate;
>> bandwidth += bandwidth / 10;
>>
>>
>> - ff_hls_write_stream_info(vid_st, master_pb, bandwidth, m3u8_rel_name);
>> + ff_hls_write_stream_info(vid_st, hls->m3u8_out, bandwidth, m3u8_rel_name);
>>
>>
>> av_freep(&m3u8_rel_name);
>> }
>> @@ -1160,7 +1160,7 @@ fail:
>> if(ret >=0)
>> hls->master_m3u8_created = 1;
>> av_freep(&m3u8_rel_name);
>> - ff_format_io_close(s, &master_pb);
>> + hlsenc_io_close(s, &hls->m3u8_out, hls->master_m3u8_url);
>> return ret;
>> }
>>
>>
>> @@ -1170,8 +1170,6 @@ static int hls_window(AVFormatContext *s, int last,
>> VariantStream *vs)
>> HLSSegment *en;
>> int target_duration = 0;
>> int ret = 0;
>> - AVIOContext *out = NULL;
>> - AVIOContext *sub_out = NULL;
>> char temp_filename[1024];
>> int64_t sequence = FFMAX(hls->start_sequence, vs->sequence - vs->nb_entries);
>> const char *proto = avio_find_protocol_name(s->filename);
>> @@ -1203,7 +1201,7 @@ static int hls_window(AVFormatContext *s, int last,
>> VariantStream *vs)
>>
>>
>> set_http_options(s, &options, hls);
>> snprintf(temp_filename, sizeof(temp_filename), use_rename ? "%s.tmp" : "%s",
>> vs->m3u8_name);
>> - if ((ret = s->io_open(s, &out, temp_filename, AVIO_FLAG_WRITE, &options))
>> < 0)
>> + if ((ret = hlsenc_io_open(s, &hls->m3u8_out, temp_filename, &options)) < 0)
>> goto fail;
>>
>>
>> for (en = vs->segments; en; en = en->next) {
>> @@ -1212,33 +1210,33 @@ static int hls_window(AVFormatContext *s, int last,
>> VariantStream *vs)
>> }
>>
>>
>> vs->discontinuity_set = 0;
>> - ff_hls_write_playlist_header(out, hls->version, hls->allowcache,
>> + ff_hls_write_playlist_header(hls->m3u8_out, hls->version, hls->allowcache,
>> target_duration, sequence, hls->pl_type);
>>
>>
>> if((hls->flags & HLS_DISCONT_START) && sequence==hls->start_sequence &&
>> vs->discontinuity_set==0 ){
>> - avio_printf(out, "#EXT-X-DISCONTINUITY\n");
>> + avio_printf(hls->m3u8_out, "#EXT-X-DISCONTINUITY\n");
>> vs->discontinuity_set = 1;
>> }
>> if (vs->has_video && (hls->flags & HLS_INDEPENDENT_SEGMENTS)) {
>> - avio_printf(out, "#EXT-X-INDEPENDENT-SEGMENTS\n");
>> + avio_printf(hls->m3u8_out, "#EXT-X-INDEPENDENT-SEGMENTS\n");
>> }
>> for (en = vs->segments; en; en = en->next) {
>> if ((hls->encrypt || hls->key_info_file) && (!key_uri || strcmp(en->key_uri,
>> key_uri) ||
>> av_strcasecmp(en->iv_string, iv_string))) {
>> - avio_printf(out, "#EXT-X-KEY:METHOD=AES-128,URI=\"%s\"", en->key_uri);
>> + avio_printf(hls->m3u8_out, "#EXT-X-KEY:METHOD=AES-128,URI=\"%s\"",
>> en->key_uri);
>> if (*en->iv_string)
>> - avio_printf(out, ",IV=0x%s", en->iv_string);
>> - avio_printf(out, "\n");
>> + avio_printf(hls->m3u8_out, ",IV=0x%s", en->iv_string);
>> + avio_printf(hls->m3u8_out, "\n");
>> key_uri = en->key_uri;
>> iv_string = en->iv_string;
>> }
>>
>>
>> if ((hls->segment_type == SEGMENT_TYPE_FMP4) && (en == vs->segments)) {
>> - ff_hls_write_init_file(out, vs->fmp4_init_filename,
>> + ff_hls_write_init_file(hls->m3u8_out, vs->fmp4_init_filename,
>> hls->flags & HLS_SINGLE_FILE, en->size, en->pos);
>> }
>>
>>
>> - ff_hls_write_file_entry(out, en->discont, byterange_mode,
>> + ff_hls_write_file_entry(hls->m3u8_out, en->discont, byterange_mode,
>> en->duration, hls->flags & HLS_ROUND_DURATIONS,
>> en->size, en->pos, vs->baseurl,
>> en->filename, prog_date_time_p);
>> @@ -1246,29 +1244,29 @@ static int hls_window(AVFormatContext *s, int last,
>> VariantStream *vs)
>> }
>>
>>
>> if (last && (hls->flags & HLS_OMIT_ENDLIST)==0)
>> - ff_hls_write_end_list(out);
>> + ff_hls_write_end_list(hls->m3u8_out);
>>
>>
>> if( vs->vtt_m3u8_name ) {
>> - if ((ret = s->io_open(s, &sub_out, vs->vtt_m3u8_name, AVIO_FLAG_WRITE,
>> &options)) < 0)
>> + if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out, vs->vtt_m3u8_name,
>> &options)) < 0)
>> goto fail;
>> - ff_hls_write_playlist_header(sub_out, hls->version, hls->allowcache,
>> + ff_hls_write_playlist_header(hls->sub_m3u8_out, hls->version,
>> hls->allowcache,
>> target_duration, sequence, PLAYLIST_TYPE_NONE);
>>
>>
>> for (en = vs->segments; en; en = en->next) {
>> - ff_hls_write_file_entry(sub_out, 0, byterange_mode,
>> + ff_hls_write_file_entry(hls->sub_m3u8_out, 0, byterange_mode,
>> en->duration, 0, en->size, en->pos,
>> vs->baseurl, en->sub_filename, NULL);
>> }
>>
>>
>> if (last)
>> - ff_hls_write_end_list(sub_out);
>> + ff_hls_write_end_list(hls->sub_m3u8_out);
>>
>>
>> }
>>
>>
>> fail:
>> av_dict_free(&options);
>> - ff_format_io_close(s, &out);
>> - ff_format_io_close(s, &sub_out);
>> + hlsenc_io_close(s, &hls->m3u8_out, temp_filename);
>> + hlsenc_io_close(s, &hls->sub_m3u8_out, vs->vtt_m3u8_name);
>> if (ret >= 0 && use_rename)
>> ff_rename(temp_filename, vs->m3u8_name, s);
>>
>>
>> --
>> 1.9.1
>>
>
> Looks like there are no objections to this patch set. Could this be pushed
> please.
Patchset LGTM, i will push it after 24 hours if there are no objections.
>
>
> Thanks,
> Karthick
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
