highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/avfilter: Don't use AVFrame.channel_layout

Browse Source 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-09-02 16:06:08 +02:00
parent 8357d4790f
commit f4af504a1f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/avfilter.c
View File

@ -21,6 +21,7 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/bprint.h"
#include "libavutil/buffer.h" #include "libavutil/buffer.h"
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/common.h" #include "libavutil/common.h"
@ -45,6 +46,7 @@
static void tlog_ref(void *ctx, AVFrame *ref, int end) static void tlog_ref(void *ctx, AVFrame *ref, int end)
{ {
#ifdef TRACE
ff_tlog(ctx, ff_tlog(ctx,
"ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64, "ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64,
ref, ref->buf, ref->data[0], ref, ref->buf, ref->data[0],
@ -61,13 +63,19 @@ static void tlog_ref(void *ctx, AVFrame *ref, int end)
av_get_picture_type_char(ref->pict_type)); av_get_picture_type_char(ref->pict_type));
} }
if (ref->nb_samples) { if (ref->nb_samples) {
ff_tlog(ctx, " cl:%"PRId64"d n:%d r:%d", AVBPrint bprint;
ref->channel_layout,
av_bprint_init(&bprint, 1, AV_BPRINT_SIZE_UNLIMITED);
av_channel_layout_describe_bprint(&ref->ch_layout, &bprint);
ff_tlog(ctx, " cl:%s n:%d r:%d",
bprint.str,
ref->nb_samples, ref->nb_samples,
ref->sample_rate); ref->sample_rate);
av_bprint_finalize(&bprint, NULL);
} }
ff_tlog(ctx, "]%s", end ? "\n" : ""); ff_tlog(ctx, "]%s", end ? "\n" : "");
#endif
} }
void ff_command_queue_pop(AVFilterContext *filter) void ff_command_queue_pop(AVFilterContext *filter)