From 675ac56b7ee0f204963fde55295197c5df80aa91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 25 Nov 2014 10:51:23 +0200 Subject: [PATCH] Revert "lavf: Don't try to update files atomically with renames on windows" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b9d08c77a44390b0848c06f20bc0e9e951ba6a3c. After taking MoveFileEx into use, we can replace files with renames on windows as well. Signed-off-by: Martin Storsjö --- libavformat/dashenc.c | 14 +++++--------- libavformat/hdsenc.c | 16 ++++++---------- libavformat/internal.h | 6 ------ libavformat/smoothstreamingenc.c | 8 +++----- 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 57ce85fb71..065466169e 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -296,15 +296,13 @@ static int write_manifest(AVFormatContext *s, int final) DASHContext *c = s->priv_data; AVIOContext *out; char temp_filename[1024]; - const char *write_filename; int ret, i; AVDictionaryEntry *title = av_dict_get(s->metadata, "title", NULL, 0); snprintf(temp_filename, sizeof(temp_filename), "%s.tmp", s->filename); - write_filename = USE_RENAME_REPLACE ? temp_filename : s->filename; - ret = avio_open2(&out, write_filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); + ret = avio_open2(&out, temp_filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); if (ret < 0) { - av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", write_filename); + av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename); return ret; } avio_printf(out, "\n"); @@ -394,7 +392,7 @@ static int write_manifest(AVFormatContext *s, int final) avio_printf(out, "\n"); avio_flush(out); avio_close(out); - return USE_RENAME_REPLACE ? ff_rename(temp_filename, s->filename) : 0; + return ff_rename(temp_filename, s->filename); } static int dash_write_header(AVFormatContext *s) @@ -607,7 +605,6 @@ static int dash_flush(AVFormatContext *s, int final, int stream) for (i = 0; i < s->nb_streams; i++) { OutputStream *os = &c->streams[i]; char filename[1024] = "", full_path[1024], temp_path[1024]; - const char *write_path; int64_t start_pos = avio_tell(os->ctx->pb); int range_length, index_length = 0; @@ -630,8 +627,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) snprintf(filename, sizeof(filename), "chunk-stream%d-%05d.m4s", i, os->segment_index); snprintf(full_path, sizeof(full_path), "%s%s", c->dirname, filename); snprintf(temp_path, sizeof(temp_path), "%s.tmp", full_path); - write_path = USE_RENAME_REPLACE ? temp_path : full_path; - ret = ffurl_open(&os->out, write_path, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); + ret = ffurl_open(&os->out, temp_path, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); if (ret < 0) break; write_styp(os->ctx->pb); @@ -646,7 +642,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) } else { ffurl_close(os->out); os->out = NULL; - ret = USE_RENAME_REPLACE ? ff_rename(temp_path, full_path) : 0; + ret = ff_rename(temp_path, full_path); if (ret < 0) break; } diff --git a/libavformat/hdsenc.c b/libavformat/hdsenc.c index 326f8860ca..d96a3d5599 100644 --- a/libavformat/hdsenc.c +++ b/libavformat/hdsenc.c @@ -163,7 +163,6 @@ static int write_manifest(AVFormatContext *s, int final) HDSContext *c = s->priv_data; AVIOContext *out; char filename[1024], temp_filename[1024]; - const char *write_filename; int ret, i; float duration = 0; @@ -172,11 +171,10 @@ static int write_manifest(AVFormatContext *s, int final) snprintf(filename, sizeof(filename), "%s/index.f4m", s->filename); snprintf(temp_filename, sizeof(temp_filename), "%s/index.f4m.tmp", s->filename); - write_filename = USE_RENAME_REPLACE ? temp_filename : filename; - ret = avio_open2(&out, write_filename, AVIO_FLAG_WRITE, + ret = avio_open2(&out, temp_filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); if (ret < 0) { - av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", write_filename); + av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename); return ret; } avio_printf(out, "\n"); @@ -206,7 +204,7 @@ static int write_manifest(AVFormatContext *s, int final) avio_printf(out, "\n"); avio_flush(out); avio_close(out); - return USE_RENAME_REPLACE ? ff_rename(temp_filename, filename) : 0; + return ff_rename(temp_filename, filename); } static void update_size(AVIOContext *out, int64_t pos) @@ -225,7 +223,6 @@ static int write_abst(AVFormatContext *s, OutputStream *os, int final) HDSContext *c = s->priv_data; AVIOContext *out; char filename[1024], temp_filename[1024]; - const char *write_filename; int i, ret; int64_t asrt_pos, afrt_pos; int start = 0, fragments; @@ -243,11 +240,10 @@ static int write_abst(AVFormatContext *s, OutputStream *os, int final) "%s/stream%d.abst", s->filename, index); snprintf(temp_filename, sizeof(temp_filename), "%s/stream%d.abst.tmp", s->filename, index); - write_filename = USE_RENAME_REPLACE ? temp_filename : filename; - ret = avio_open2(&out, write_filename, AVIO_FLAG_WRITE, + ret = avio_open2(&out, temp_filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); if (ret < 0) { - av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", write_filename); + av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename); return ret; } avio_wb32(out, 0); // abst size @@ -289,7 +285,7 @@ static int write_abst(AVFormatContext *s, OutputStream *os, int final) update_size(out, afrt_pos); update_size(out, 0); avio_close(out); - return USE_RENAME_REPLACE ? ff_rename(temp_filename, filename) : 0; + return ff_rename(temp_filename, filename); } static int init_file(AVFormatContext *s, OutputStream *os, int64_t start_ts) diff --git a/libavformat/internal.h b/libavformat/internal.h index d69ce492fa..d10c5433d0 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -366,10 +366,4 @@ static inline int ff_rename(const char *oldpath, const char *newpath) return 0; } -#ifndef _WIN32 -#define USE_RENAME_REPLACE 1 -#else -#define USE_RENAME_REPLACE 0 -#endif - #endif /* AVFORMAT_INTERNAL_H */ diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index c0161b99b8..ddd8da7469 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -215,16 +215,14 @@ static int write_manifest(AVFormatContext *s, int final) SmoothStreamingContext *c = s->priv_data; AVIOContext *out; char filename[1024], temp_filename[1024]; - const char *write_filename; int ret, i, video_chunks = 0, audio_chunks = 0, video_streams = 0, audio_streams = 0; int64_t duration = 0; snprintf(filename, sizeof(filename), "%s/Manifest", s->filename); snprintf(temp_filename, sizeof(temp_filename), "%s/Manifest.tmp", s->filename); - write_filename = USE_RENAME_REPLACE ? temp_filename : filename; - ret = avio_open2(&out, write_filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); + ret = avio_open2(&out, temp_filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); if (ret < 0) { - av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", write_filename); + av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename); return ret; } avio_printf(out, "\n"); @@ -285,7 +283,7 @@ static int write_manifest(AVFormatContext *s, int final) avio_printf(out, "\n"); avio_flush(out); avio_close(out); - return USE_RENAME_REPLACE ? ff_rename(temp_filename, filename) : 0; + return ff_rename(temp_filename, filename); } static int ism_write_header(AVFormatContext *s)