History

lavfi: remove some audio-related function from public API.

Those functions are only useful inside filters. It is better to not support user filters until the API is more stable. This breaks audio filtering API and ABI in theory, but since it's unusable right now this shouldn't be a problem.

Anton Khirnov committed 14 years ago

Commit 472fb3b1 parent f20ab495 files · +86 −57Browse files

Showing the changes to libavfilter/avfilter.c (1 of 5 files). Show all

Unified · Split

libavfilter/avfilter.c+9−7
@@ -26,6 +26,8 @@ · 25 unmodified lines
2626 #include "libavutil/audioconvert.h"
2727 #include "libavutil/imgutils.h"
2828 #include "libavcodec/avcodec.h"
29+
30+#include "audio.h"
2931 #include "avfilter.h"
3032 #include "internal.h"
3133
@@ -366,8 +368,8 @@ fail: · 334 unmodified lines
366368 return NULL;
367369 }
368370
369−AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, int perms,
370− int nb_samples)
371+AVFilterBufferRef *ff_get_audio_buffer(AVFilterLink *link, int perms,
372+ int nb_samples)
371373 {
372374 AVFilterBufferRef *ret = NULL;
373375
@@ -375,7 +377,7 @@ AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, int perms, · 1 unmodified line
375377 ret = link->dstpad->get_audio_buffer(link, perms, nb_samples);
376378
377379 if (!ret)
378− ret = avfilter_default_get_audio_buffer(link, perms, nb_samples);
380+ ret = ff_default_get_audio_buffer(link, perms, nb_samples);
379381
380382 if (ret)
381383 ret->type = AVMEDIA_TYPE_AUDIO;
@@ -570,7 +572,7 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) · 188 unmodified lines
570572 draw_slice(link, y, h, slice_dir);
571573 }
572574
573−void avfilter_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
575+void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
574576 {
575577 void (*filter_samples)(AVFilterLink *, AVFilterBufferRef *);
576578 AVFilterPad *dst = link->dstpad;
@@ -578,7 +580,7 @@ void avfilter_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref) · 1 unmodified line
578580 FF_DPRINTF_START(NULL, filter_samples); ff_dlog_link(NULL, link, 1);
579581
580582 if (!(filter_samples = dst->filter_samples))
581− filter_samples = avfilter_default_filter_samples;
583+ filter_samples = ff_default_filter_samples;
582584
583585 /* prepare to copy the samples if the buffer has insufficient permissions */
584586 if ((dst->min_perms & samplesref->perms) != dst->min_perms ||
@@ -591,8 +593,8 @@ void avfilter_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref) · 6 unmodified lines
591593 "Copying audio data in avfilter (have perms %x, need %x, reject %x)\n",
592594 samplesref->perms, link->dstpad->min_perms, link->dstpad->rej_perms);
593595
594− link->cur_buf = avfilter_default_get_audio_buffer(link, dst->min_perms,
595− samplesref->audio->nb_samples);
596+ link->cur_buf = ff_default_get_audio_buffer(link, dst->min_perms,
597+ samplesref->audio->nb_samples);
596598 link->cur_buf->pts = samplesref->pts;
597599 link->cur_buf->audio->sample_rate = samplesref->audio->sample_rate;
598600

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t