mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 23:32:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

sparsefile: Fix sparsefile on Win32

Browse source 
When switching between read/write a fseek() or fflush() is required.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/821>
This commit is contained in:
Doug Nazar 2021-05-06 23:02:35 -04:00 committed by Tim-Philipp Müller
parent 20d4184a69
commit ab4ec53d56
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/elements/gstsparsefile.c
View file

@ -28,8 +28,8 @@
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <io.h> /* lseek, open, close, read */ #include <io.h> /* lseek, open, close, read */
#undef lseek #undef fseek
#define lseek _lseeki64 #define fseek _fseeki64
#undef off_t #undef off_t
#define off_t guint64 #define off_t guint64
#else #else
@ -38,7 +38,7 @@
#ifdef HAVE_FSEEKO #ifdef HAVE_FSEEKO
#define FSEEK_FILE(file,offset) (fseeko (file, (off_t) offset, SEEK_SET) != 0) #define FSEEK_FILE(file,offset) (fseeko (file, (off_t) offset, SEEK_SET) != 0)
#elif defined (G_OS_UNIX) || defined (G_OS_WIN32) #elif defined (G_OS_UNIX)
#define FSEEK_FILE(file,offset) (lseek (fileno (file), (off_t) offset, SEEK_SET) == (off_t) -1) #define FSEEK_FILE(file,offset) (lseek (fileno (file), (off_t) offset, SEEK_SET) == (off_t) -1)
#else #else
#define FSEEK_FILE(file,offset) (fseek (file, offset, SEEK_SET) != 0) #define FSEEK_FILE(file,offset) (fseek (file, offset, SEEK_SET) != 0)
@ -67,6 +67,7 @@ struct _GstSparseFile
gint fd; gint fd;
FILE *file; FILE *file;
gsize current_pos; gsize current_pos;
gboolean was_writing;
GstSparseRange *ranges; GstSparseRange *ranges;
guint n_ranges; guint n_ranges;
@ -195,6 +196,7 @@ gst_sparse_file_clear (GstSparseFile * file)
file->current_pos = 0; file->current_pos = 0;
file->ranges = NULL; file->ranges = NULL;
file->n_ranges = 0; file->n_ranges = 0;
file->was_writing = FALSE;
} }
/** /**
@ -251,7 +253,10 @@ gst_sparse_file_write (GstSparseFile * file, gsize offset, gconstpointer data,
GST_DEBUG ("seeking to %" G_GSIZE_FORMAT, offset); GST_DEBUG ("seeking to %" G_GSIZE_FORMAT, offset);
if (FSEEK_FILE (file->file, offset)) if (FSEEK_FILE (file->file, offset))
goto error; goto error;
} else if (!file->was_writing) {
fflush (file->file);
} }
file->was_writing = TRUE;
if (fwrite (data, count, 1, file->file) != 1) if (fwrite (data, count, 1, file->file) != 1)
goto error; goto error;
} }
@ -337,7 +342,10 @@ gst_sparse_file_read (GstSparseFile * file, gsize offset, gpointer data,
file->current_pos, offset); file->current_pos, offset);
if (FSEEK_FILE (file->file, offset)) if (FSEEK_FILE (file->file, offset))
goto error; goto error;
} else if (file->was_writing) {
fflush (file->file);
} }
file->was_writing = FALSE;
res = fread (data, 1, count, file->file); res = fread (data, 1, count, file->file);
if (G_UNLIKELY (res < count)) if (G_UNLIKELY (res < count))
goto error; goto error;