RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/hlsenc, utils: Moved is_http_proto from hlsenc to utils for re-use 

Reviewed-by: Aman Gupta <aman@tmm1.net>
Reviewed-by: Steven Liu <lq@onvideo.cn>
This commit is contained in:
Karthick Jeyapal 2017-12-29 18:11:09 +08:00 committed by Steven Liu
parent 5297ae96a1
commit e8f71ef338
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/hlsenc.c
View File

@ -241,15 +241,10 @@ static int mkdir_p(const char *path) {
return ret;
}
static int is_http_proto(char *filename) {
const char *proto = avio_find_protocol_name(filename);
return proto ? (!av_strcasecmp(proto, "http") || !av_strcasecmp(proto, "https")) : 0;
}
static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename,
AVDictionary **options) {
HLSContext *hls = s->priv_data;
int http_base_proto = filename ? is_http_proto(filename) : 0;
int http_base_proto = filename ? ff_is_http_proto(filename) : 0;
int err = AVERROR_MUXER_NOT_FOUND;
if (!*pb || !http_base_proto || !hls->http_persistent) {
err = s->io_open(s, pb, filename, AVIO_FLAG_WRITE, options);
@ -265,8 +260,7 @@ static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename,
static void hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename) {
HLSContext *hls = s->priv_data;
int http_base_proto = filename ? is_http_proto(filename) : 0;
int http_base_proto = filename ? ff_is_http_proto(filename) : 0;
if (!http_base_proto || !hls->http_persistent || hls->key_info_file || hls->encrypt) {
ff_format_io_close(s, pb);
#if CONFIG_HTTP_PROTOCOL
@ -281,7 +275,7 @@ static void hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename
static void set_http_options(AVFormatContext *s, AVDictionary **options, HLSContext *c)
{
int http_base_proto = is_http_proto(s->filename);
int http_base_proto = ff_is_http_proto(s->filename);
if (c->method) {
av_dict_set(options, "method", c->method, 0);

8
libavformat/internal.h
View File

@ -621,6 +621,14 @@ int ff_format_output_open(AVFormatContext *s, const char *url, AVDictionary **op
*/
void ff_format_io_close(AVFormatContext *s, AVIOContext **pb);
/**
* Utility function to check if the file uses http or https protocol
*
* @param s AVFormatContext
* @param filename URL or file name to open for writing
*/
int ff_is_http_proto(char *filename);
/**
* Parse creation_time in AVFormatContext metadata if exists and warn if the
* parsing fails.

5
libavformat/utils.c
View File

@ -5472,6 +5472,11 @@ void ff_format_io_close(AVFormatContext *s, AVIOContext **pb)
*pb = NULL;
}
int ff_is_http_proto(char *filename) {
const char *proto = avio_find_protocol_name(filename);
return proto ? (!av_strcasecmp(proto, "http") || !av_strcasecmp(proto, "https")) : 0;
}
int ff_parse_creation_time_metadata(AVFormatContext *s, int64_t *timestamp, int return_seconds)
{
AVDictionaryEntry *entry;