Commit e8f71ef3 authored by Karthick Jeyapal's avatar Karthick Jeyapal Committed by Steven Liu

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

Reviewed-by: 's avatarAman Gupta <aman@tmm1.net>
Reviewed-by: 's avatarSteven Liu <lq@onvideo.cn>
parent 5297ae96
...@@ -241,15 +241,10 @@ static int mkdir_p(const char *path) { ...@@ -241,15 +241,10 @@ static int mkdir_p(const char *path) {
return ret; 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, static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename,
AVDictionary **options) { AVDictionary **options) {
HLSContext *hls = s->priv_data; 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; int err = AVERROR_MUXER_NOT_FOUND;
if (!*pb || !http_base_proto || !hls->http_persistent) { if (!*pb || !http_base_proto || !hls->http_persistent) {
err = s->io_open(s, pb, filename, AVIO_FLAG_WRITE, options); 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, ...@@ -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) { static void hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename) {
HLSContext *hls = s->priv_data; 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) { if (!http_base_proto || !hls->http_persistent || hls->key_info_file || hls->encrypt) {
ff_format_io_close(s, pb); ff_format_io_close(s, pb);
#if CONFIG_HTTP_PROTOCOL #if CONFIG_HTTP_PROTOCOL
...@@ -281,7 +275,7 @@ static void hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename ...@@ -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) 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) { if (c->method) {
av_dict_set(options, "method", c->method, 0); av_dict_set(options, "method", c->method, 0);
......
...@@ -621,6 +621,14 @@ int ff_format_output_open(AVFormatContext *s, const char *url, AVDictionary **op ...@@ -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); 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 * Parse creation_time in AVFormatContext metadata if exists and warn if the
* parsing fails. * parsing fails.
......
...@@ -5472,6 +5472,11 @@ void ff_format_io_close(AVFormatContext *s, AVIOContext **pb) ...@@ -5472,6 +5472,11 @@ void ff_format_io_close(AVFormatContext *s, AVIOContext **pb)
*pb = NULL; *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) int ff_parse_creation_time_metadata(AVFormatContext *s, int64_t *timestamp, int return_seconds)
{ {
AVDictionaryEntry *entry; AVDictionaryEntry *entry;
......
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