Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include "libavutil/avassert.h" | 22 | #include "libavutil/avassert.h" |
| 23 | #include "libavutil/avstring.h" | 23 | #include "libavutil/avstring.h" |
| 24 | #include "libavutil/bprint.h" | ||
| 24 | #include "libavutil/buffer.h" | 25 | #include "libavutil/buffer.h" |
| 25 | #include "libavutil/channel_layout.h" | 26 | #include "libavutil/channel_layout.h" |
| 26 | #include "libavutil/common.h" | 27 | #include "libavutil/common.h" |
| @@ -45,6 +46,7 @@ · 18 unmodified lines | |||
| 45 | 46 | ||
| 46 | static void tlog_ref(void *ctx, AVFrame *ref, int end) | 47 | static void tlog_ref(void *ctx, AVFrame *ref, int end) |
| 47 | { | 48 | { |
| 49 | #ifdef TRACE | ||
| 48 | ff_tlog(ctx, | 50 | ff_tlog(ctx, |
| 49 | "ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64, | 51 | "ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64, |
| 50 | ref, ref->buf, ref->data[0], | 52 | ref, ref->buf, ref->data[0], |
| @@ -61,13 +63,19 @@ static void tlog_ref(void *ctx, AVFrame *ref, int end) · 10 unmodified lines | |||
| 61 | av_get_picture_type_char(ref->pict_type)); | 63 | av_get_picture_type_char(ref->pict_type)); |
| 62 | } | 64 | } |
| 63 | if (ref->nb_samples) { | 65 | if (ref->nb_samples) { |
| 64 | ff_tlog(ctx, " cl:%"PRId64"d n:%d r:%d", | 66 | AVBPrint bprint; |
| 65 | ref->channel_layout, | 67 | |
| 68 | av_bprint_init(&bprint, 1, AV_BPRINT_SIZE_UNLIMITED); | ||
| 69 | av_channel_layout_describe_bprint(&ref->ch_layout, &bprint); | ||
| 70 | ff_tlog(ctx, " cl:%s n:%d r:%d", | ||
| 71 | bprint.str, | ||
| 66 | ref->nb_samples, | 72 | ref->nb_samples, |
| 67 | ref->sample_rate); | 73 | ref->sample_rate); |
| 74 | av_bprint_finalize(&bprint, NULL); | ||
| 68 | } | 75 | } |
| 69 | 76 | ||
| 70 | ff_tlog(ctx, "]%s", end ? "\n" : ""); | 77 | ff_tlog(ctx, "]%s", end ? "\n" : ""); |
| 78 | #endif | ||
| 71 | } | 79 | } |
| 72 | 80 | ||
| 73 | void ff_command_queue_pop(AVFilterContext *filter) | 81 | void ff_command_queue_pop(AVFilterContext *filter) |