highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/dashenc: Added proper logging when io_open fails for write

Browse Source
This commit is contained in:
Karthick J
2018-11-30 10:50:09 +05:30
parent 416dc9a5e8
commit 0a80b39780
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/dashenc.c
View File

@@ -209,6 +209,15 @@ static const char *get_format_str(SegmentType segment_type) {
return NULL; return NULL;
} }
static int handle_io_open_error(AVFormatContext *s, int err, char *url) {
DASHContext *c = s->priv_data;
char errbuf[AV_ERROR_MAX_STRING_SIZE];
av_strerror(err, errbuf, sizeof(errbuf));
av_log(s, c->ignore_io_errors ? AV_LOG_WARNING : AV_LOG_ERROR,
"Unable to open %s for writing: %s\n", url, errbuf);
return c->ignore_io_errors ? 0 : err;
}
static inline SegmentType select_segment_type(SegmentType segment_type, enum AVCodecID codec_id) static inline SegmentType select_segment_type(SegmentType segment_type, enum AVCodecID codec_id)
{ {
if (segment_type == SEGMENT_TYPE_AUTO) { if (segment_type == SEGMENT_TYPE_AUTO) {
@@ -538,7 +547,7 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, AVFormatCont
ret = dashenc_io_open(s, &c->m3u8_out, temp_filename_hls, &http_opts); ret = dashenc_io_open(s, &c->m3u8_out, temp_filename_hls, &http_opts);
av_dict_free(&http_opts); av_dict_free(&http_opts);
if (ret < 0) { if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename_hls); handle_io_open_error(s, ret, temp_filename_hls);
return; return;
} }
for (i = start_index; i < os->nb_segments; i++) { for (i = start_index; i < os->nb_segments; i++) {
@@ -853,8 +862,7 @@ static int write_manifest(AVFormatContext *s, int final)
ret = dashenc_io_open(s, &c->mpd_out, temp_filename, &opts); ret = dashenc_io_open(s, &c->mpd_out, temp_filename, &opts);
av_dict_free(&opts); av_dict_free(&opts);
if (ret < 0) { if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename); return handle_io_open_error(s, ret, temp_filename);
return c->ignore_io_errors ? 0 : ret;
} }
out = c->mpd_out; out = c->mpd_out;
avio_printf(out, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"); avio_printf(out, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
@@ -944,8 +952,7 @@ static int write_manifest(AVFormatContext *s, int final)
ret = dashenc_io_open(s, &c->m3u8_out, temp_filename, &opts); ret = dashenc_io_open(s, &c->m3u8_out, temp_filename, &opts);
av_dict_free(&opts); av_dict_free(&opts);
if (ret < 0) { if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename); return handle_io_open_error(s, ret, temp_filename);
return c->ignore_io_errors ? 0 : ret;
} }
ff_hls_write_playlist_version(c->m3u8_out, 7); ff_hls_write_playlist_version(c->m3u8_out, 7);
@@ -1578,7 +1585,7 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt)
ret = dashenc_io_open(s, &os->out, os->temp_path, &opts); ret = dashenc_io_open(s, &os->out, os->temp_path, &opts);
av_dict_free(&opts); av_dict_free(&opts);
if (ret < 0) { if (ret < 0) {
return c->ignore_io_errors ? 0 : ret; return handle_io_open_error(s, ret, os->temp_path);
} }
} }