Implement ff_get_ref_perms_string() and use it for tracing.

Originally committed as revision 24900 to svn://svn.ffmpeg.org/ffmpeg/trunk

Stefano Sabatini committed 16 years ago

Commit eedca991 parent 668338c3 files · +20 −4Browse files

Unified · Split

3 files

libavfilter/avfilter.c +17 −3
libavfilter/avfilter.h +1 −1
libavfilter/internal.h +2 −0

     return 0;
 }
+char *ff_get_ref_perms_string(char *buf, size_t buf_size, int perms)
+{
+    snprintf(buf, buf_size, "%s%s%s%s%s",
+             perms & AV_PERM_READ      ? "r" : "",
+             perms & AV_PERM_WRITE     ? "w" : "",
+             perms & AV_PERM_PRESERVE  ? "p" : "",
+             perms & AV_PERM_REUSE     ? "r" : "",
+             perms & AV_PERM_REUSE2    ? "R" : "");
+    return buf;
+}
 void ff_dprintf_ref(void *ctx, AVFilterBufferRef *ref, int end)
 {
+    av_unused char buf[16];
     dprintf(ctx,
-            "ref[%p buf:%p refcount:%d perms:0x%x data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64,
+            "ref[%p buf:%p refcount:%d perms:%s data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64,
-            ref, ref->buf, ref->buf->refcount, ref->perms, ref->data[0],
+            ref, ref->buf, ref->buf->refcount, ff_get_ref_perms_string(buf, sizeof(buf), ref->perms), ref->data[0],
             ref->linesize[0], ref->linesize[1], ref->linesize[2], ref->linesize[3],
             ref->pts, ref->pos);
 {
     AVFilterBufferRef *ret = NULL;
-    FF_DPRINTF_START(NULL, get_video_buffer); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " perms:%d w:%d h:%d\n", perms, w, h);
+    av_unused char buf[16];
+    FF_DPRINTF_START(NULL, get_video_buffer); ff_dprintf_link(NULL, link, 0);
+    dprintf(NULL, " perms:%s w:%d h:%d\n", ff_get_ref_perms_string(buf, sizeof(buf), perms), w, h);
     if (link_dpad(link).get_video_buffer)
         ret = link_dpad(link).get_video_buffer(link, perms, w, h);

libavfilter/avfilter.h+1−1

@@ -26,7 +26,7 @@ · 25 unmodified lines
26		26
27	#define LIBAVFILTER_VERSION_MAJOR 1	27	#define LIBAVFILTER_VERSION_MAJOR 1
28	#define LIBAVFILTER_VERSION_MINOR 38	28	#define LIBAVFILTER_VERSION_MINOR 38
29	#define LIBAVFILTER_VERSION_MICRO 0	29	#define LIBAVFILTER_VERSION_MICRO 1
30		30
31	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \	31	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
32	LIBAVFILTER_VERSION_MINOR, \	32	LIBAVFILTER_VERSION_MINOR, \

libavfilter/internal.h+2−0

@@ -28,6 +28,8 @@ · 27 unmodified lines
28		28
29	void ff_dprintf_ref(void ctx, AVFilterBufferRef ref, int end);	29	void ff_dprintf_ref(void ctx, AVFilterBufferRef ref, int end);
30		30
		31	char ff_get_ref_perms_string(char buf, size_t buf_size, int perms);
		32
31	void ff_dprintf_link(void ctx, AVFilterLink link, int end);	33	void ff_dprintf_link(void ctx, AVFilterLink link, int end);
32		34
33	#define FF_DPRINTF_START(ctx, func) dprintf(NULL, "%-16s: ", #func)	35	#define FF_DPRINTF_START(ctx, func) dprintf(NULL, "%-16s: ", #func)

Implement ff_get_ref_perms_string() and use it for tracing.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code