Commit 22f4d9c3 authored by Luca Barbato's avatar Luca Barbato

img2enc: Make sure the images are atomically written

Users that want to generate a live-preview and serve it
would otherwise get partial images.
parent 1ec72c6c
...@@ -33,6 +33,7 @@ typedef struct VideoMuxData { ...@@ -33,6 +33,7 @@ typedef struct VideoMuxData {
int img_number; int img_number;
int is_pipe; int is_pipe;
char path[1024]; char path[1024];
char tmp[1024];
int update; int update;
} VideoMuxData; } VideoMuxData;
...@@ -41,6 +42,7 @@ static int write_header(AVFormatContext *s) ...@@ -41,6 +42,7 @@ static int write_header(AVFormatContext *s)
VideoMuxData *img = s->priv_data; VideoMuxData *img = s->priv_data;
av_strlcpy(img->path, s->filename, sizeof(img->path)); av_strlcpy(img->path, s->filename, sizeof(img->path));
snprintf(img->tmp, sizeof(img->tmp), "%s.tmp", s->filename);
/* find format */ /* find format */
if (s->oformat->flags & AVFMT_NOFILE) if (s->oformat->flags & AVFMT_NOFILE)
...@@ -70,9 +72,9 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -70,9 +72,9 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR(EIO); return AVERROR(EIO);
} }
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (avio_open2(&pb[i], filename, AVIO_FLAG_WRITE, if (avio_open2(&pb[i], img->tmp, AVIO_FLAG_WRITE,
&s->interrupt_callback, NULL) < 0) { &s->interrupt_callback, NULL) < 0) {
av_log(s, AV_LOG_ERROR, "Could not open file : %s\n", filename); av_log(s, AV_LOG_ERROR, "Could not open file : %s\n", img->tmp);
return AVERROR(EIO); return AVERROR(EIO);
} }
...@@ -121,6 +123,7 @@ error: ...@@ -121,6 +123,7 @@ error:
avio_flush(pb[0]); avio_flush(pb[0]);
if (!img->is_pipe) { if (!img->is_pipe) {
avio_close(pb[0]); avio_close(pb[0]);
ff_rename(img->tmp, filename);
} }
img->img_number++; img->img_number++;
......
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