avformat/avio: remove 4k limit from avio_printf

We do this by switching to AVBPrint. v2: Also set IO context error flag in case of ENOMEM.

Marton Balint committed 7 years ago

Commit 95fa73a1 parent 61b4daf4 files · +19 −7Browse files

Unified · Split

4 files

@@ -15,6 +15,9 @@ libavutil: 2017-10-21 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2019-08-xx - xxxxxxxxxx - lavf 58.31.101 - avio.h
		19	4K limit removed from avio_printf.
		20
18	2019-08-xx - xxxxxxxxxx - lavf 58.31.100 - avio.h	21	2019-08-xx - xxxxxxxxxx - lavf 58.31.100 - avio.h
19	Add avio_print_string_array and avio_print.	22	Add avio_print_string_array and avio_print.
20		23

  */
 int avio_feof(AVIOContext *s);
-/** @warning Writes up to 4 KiB per call */
+/**
+ * Writes a formatted string to the context.
+ * @return number of bytes written, < 0 on error.
+ */
 int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
 /**

 int avio_printf(AVIOContext *s, const char *fmt, ...)
 {
     va_list ap;
-    char buf[4096]; /* update doc entry in avio.h if changed */
+    AVBPrint bp;
-    int ret;
+    av_bprint_init(&bp, 0, INT_MAX);
     va_start(ap, fmt);
-    ret = vsnprintf(buf, sizeof(buf), fmt, ap);
+    av_vbprintf(&bp, fmt, ap);
     va_end(ap);
-    avio_write(s, buf, strlen(buf));
+    if (!av_bprint_is_complete(&bp)) {
-    return ret;
+        av_bprint_finalize(&bp, NULL);
+        s->error = AVERROR(ENOMEM);
+        return AVERROR(ENOMEM);
+    }
+    avio_write(s, bp.str, bp.len);
+    av_bprint_finalize(&bp, NULL);
+    return bp.len;
 }
 void avio_print_string_array(AVIOContext *s, const char *strings[])

@@ -33,7 +33,7 @@ · 32 unmodified lines
33	// Also please add any ticket numbers that you believe might be affected here	33	// Also please add any ticket numbers that you believe might be affected here
34	#define LIBAVFORMAT_VERSION_MAJOR 58	34	#define LIBAVFORMAT_VERSION_MAJOR 58
35	#define LIBAVFORMAT_VERSION_MINOR 31	35	#define LIBAVFORMAT_VERSION_MINOR 31
36	#define LIBAVFORMAT_VERSION_MICRO 100	36	#define LIBAVFORMAT_VERSION_MICRO 101
37		37
38	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \	38	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
39	LIBAVFORMAT_VERSION_MINOR, \	39	LIBAVFORMAT_VERSION_MINOR, \

Keyboard shortcuts