fix: fmp4_writer_write return with file write error

ireader · Aug 28, 2021 · 2a28db2 · 2a28db2
1 parent b12546b
commit 2a28db2
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 21 deletions.
diff --git a/libdash/src/dash-mpd.c b/libdash/src/dash-mpd.c
@@ -138,9 +138,9 @@ static int mov_buffer_seek(void* param, int64_t offset)
 	return 0;
 }
 
-static uint64_t mov_buffer_tell(void* param)
+static int64_t mov_buffer_tell(void* param)
 {
-	return ((struct dash_adaptation_set_t*)param)->offset;
+	return (int64_t)((struct dash_adaptation_set_t*)param)->offset;
 }
 
 static struct mov_buffer_t s_io = {

diff --git a/libhls/source/hls-fmp4.c b/libhls/source/hls-fmp4.c
@@ -80,9 +80,9 @@ static int mov_buffer_seek(void* param, int64_t offset)
 	return 0;
 }
 
-static uint64_t mov_buffer_tell(void* param)
+static int64_t mov_buffer_tell(void* param)
 {
-	return ((struct hls_fmp4_t*)param)->offset;
+	return (int64_t)((struct hls_fmp4_t*)param)->offset;
 }
 
 static struct mov_buffer_t s_io = {

diff --git a/libmkv/include/mkv-buffer.h b/libmkv/include/mkv-buffer.h
@@ -31,8 +31,8 @@ struct mkv_buffer_t
 	int (*seek)(void* param, int64_t offset);
 
 	/// get buffer read/write position
-	/// @return >=0-current read/write position
-	uint64_t (*tell)(void* param);
+	/// @return <0-error, other-current read/write position
+	int64_t (*tell)(void* param);
 };
 
 struct mkv_file_cache_t

diff --git a/libmkv/src/mkv-ioutil.h b/libmkv/src/mkv-ioutil.h
@@ -20,7 +20,11 @@ static inline int mkv_buffer_error(const struct mkv_ioutil_t* io)
 
 static inline uint64_t mkv_buffer_tell(const struct mkv_ioutil_t* io)
 {
-	return io->io.tell(io->param);
+	int64_t v;
+	v = io->io.tell(io->param);
+	if (v < 0)
+		((struct mkv_ioutil_t*)io)->error = -1;
+	return v;
 }
 
 static inline void mkv_buffer_seek(const struct mkv_ioutil_t* io, uint64_t offset)

diff --git a/libmkv/test/mkv-file-buffer.c b/libmkv/test/mkv-file-buffer.c
@@ -31,7 +31,7 @@ static int mkv_file_seek(void* fp, int64_t offset)
 	return fseek64((FILE*)fp, offset, offset >= 0 ? SEEK_SET : SEEK_END);
 }
 
-static uint64_t mkv_file_tell(void* fp)
+static int64_t mkv_file_tell(void* fp)
 {
 	return ftell64((FILE*)fp);
 }
@@ -124,11 +124,12 @@ static int mkv_file_cache_seek(void* fp, int64_t offset)
 	return 0;
 }
 
-static uint64_t mkv_file_cache_tell(void* fp)
+static int64_t mkv_file_cache_tell(void* fp)
 {
 	struct mkv_file_cache_t* file = (struct mkv_file_cache_t*)fp;
-	assert(ftell64(file->fp) == file->tell + (int)(file->len - file->off));
-	return file->tell;
+	if (ftell64(file->fp) != file->tell + (int)(file->len - file->off))
+		return -1;
+	return (int64_t)file->tell;
 	//return ftell64(file->fp);
 }
 

diff --git a/libmov/include/mov-buffer.h b/libmov/include/mov-buffer.h
@@ -26,8 +26,8 @@ struct mov_buffer_t
 	int (*seek)(void* param, int64_t offset);
 
 	/// get buffer read/write position
-	/// @return current read/write position
-	uint64_t (*tell)(void* param);
+	/// @return <0-error, other-current read/write position
+	int64_t (*tell)(void* param);
 };
 
 #endif /* !_mov_buffer_h_ */
diff --git a/libmov/include/mov-memory-buffer.h b/libmov/include/mov-memory-buffer.h
@@ -48,11 +48,11 @@ static int mov_memory_seek(void* param, int64_t offset)
 	return 0;
 }
 
-static uint64_t mov_memory_tell(void* param)
+static int64_t mov_memory_tell(void* param)
 {
 	struct mov_memory_buffer_t* ptr;
 	ptr = (struct mov_memory_buffer_t*)param;
-	return ptr->off;
+	return (int64_t)ptr->off;
 }
 
 static inline const struct mov_buffer_t* mov_memory_buffer(void)

diff --git a/libmov/source/fmp4-writer.c b/libmov/source/fmp4-writer.c
@@ -439,7 +439,7 @@ int fmp4_writer_write(struct fmp4_writer_t* writer, int idx, const void* data, s
 	writer->mdat_size += bytes; // update media data size
 	track->sample_count += 1;
     track->last_dts = sample->dts;
-	return 0;
+	return mov_buffer_error(&writer->mov.io);
 }
 
 int fmp4_writer_add_audio(struct fmp4_writer_t* writer, uint8_t object, int channel_count, int bits_per_sample, int sample_rate, const void* extra_data, size_t extra_data_size)

diff --git a/libmov/source/mov-ioutil.h b/libmov/source/mov-ioutil.h
@@ -17,7 +17,11 @@ static inline int mov_buffer_error(const struct mov_ioutil_t* io)
 
 static inline uint64_t mov_buffer_tell(const struct mov_ioutil_t* io)
 {
-	return io->io.tell(io->param);
+	int64_t v;
+	v = io->io.tell(io->param);
+	if (v < 0)
+		((struct mov_ioutil_t*)io)->error = -1;
+	return v;
 }
 
 static inline void mov_buffer_seek(const struct mov_ioutil_t* io, int64_t offset)

diff --git a/libmov/test/mov-file-buffer.c b/libmov/test/mov-file-buffer.c
@@ -33,7 +33,7 @@ static int mov_file_seek(void* fp, int64_t offset)
 	return fseek64((FILE*)fp, offset, offset >= 0 ? SEEK_SET : SEEK_END);
 }
 
-static uint64_t mov_file_tell(void* fp)
+static int64_t mov_file_tell(void* fp)
 {
 	return ftell64((FILE*)fp);
 }
@@ -126,11 +126,12 @@ static int mov_file_cache_seek(void* fp, int64_t offset)
 	return 0;
 }
 
-static uint64_t mov_file_cache_tell(void* fp)
+static int64_t mov_file_cache_tell(void* fp)
 {
 	struct mov_file_cache_t* file = (struct mov_file_cache_t*)fp;
-	assert(ftell64(file->fp) == file->tell + (int)(file->len - file->off));
-	return file->tell;
+	if (ftell64(file->fp) != file->tell + (int)(file->len - file->off))
+		return -1;
+	return (int64_t)file->tell;
 	//return ftell64(file->fp);
 }