diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-10 01:30:30 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-10 01:40:35 +0100 |
commit | a05a44e205d6ae13d5eb1cd8d4ad2dba6ec940b3 (patch) | |
tree | 450d7173e72748db59d6cfb7107c688bc825fc9a /libavfilter/af_atempo.c | |
parent | 586ae70ba78e023d16c0c812b05a26c7d423833b (diff) | |
parent | 7e350379f87e7f74420b4813170fe808e2313911 (diff) |
Merge commit '7e350379f87e7f74420b4813170fe808e2313911'
* commit '7e350379f87e7f74420b4813170fe808e2313911':
lavfi: switch to AVFrame.
Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
* Main merge operation, notably avfilter.c and video.c
* Switch to AVFrame:
- afade
- anullsrc
- apad
- aresample
- blackframe
- deshake
- idet
- il
- mandelbrot
- mptestsrc
- noise
- setfield
- smartblur
- tinterlace
* various merge changes and fixes in:
- ashowinfo
- blackdetect
- field
- fps
- select
- testsrc
- yadif
Nicolas George:
* Switch to AVFrame:
- make rawdec work with refcounted frames. Adapted from commit
759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
- make buffer sink and src, audio and video work all together
Clément Bœsch:
* Switch to AVFrame:
- aevalsrc
- alphaextract
- blend
- cellauto
- colormatrix
- concat
- earwax
- ebur128
- edgedetect
- geq
- histeq
- histogram
- hue
- kerndeint
- life
- movie
- mp (with the help of Michael)
- overlay
- pad
- pan
- pp
- pp
- removelogo
- sendcmd
- showspectrum
- showwaves
- silencedetect
- stereo3d
- subtitles
- super2xsai
- swapuv
- thumbnail
- tile
Hendrik Leppkes:
* Switch to AVFrame:
- aconvert
- amerge
- asetnsamples
- atempo
- biquads
Matthieu Bouron:
* Switch to AVFrame
- alphamerge
- decimate
- volumedetect
Stefano Sabatini:
* Switch to AVFrame:
- astreamsync
- flite
- framestep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_atempo.c')
-rw-r--r-- | libavfilter/af_atempo.c | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index d186aafe9c..53bf9e26bf 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -140,7 +140,7 @@ typedef struct { // for managing AVFilterPad.request_frame and AVFilterPad.filter_frame int request_fulfilled; - AVFilterBufferRef *dst_buffer; + AVFrame *dst_buffer; uint8_t *dst; uint8_t *dst_end; uint64_t nsamples_in; @@ -177,7 +177,7 @@ static void yae_clear(ATempoContext *atempo) atempo->frag[0].position[0] = -(int64_t)(atempo->window / 2); atempo->frag[0].position[1] = -(int64_t)(atempo->window / 2); - avfilter_unref_bufferp(&atempo->dst_buffer); + av_frame_free(&atempo->dst_buffer); atempo->dst = NULL; atempo->dst_end = NULL; @@ -1024,8 +1024,8 @@ static void push_samples(ATempoContext *atempo, AVFilterLink *outlink, int n_out) { - atempo->dst_buffer->audio->sample_rate = outlink->sample_rate; - atempo->dst_buffer->audio->nb_samples = n_out; + atempo->dst_buffer->sample_rate = outlink->sample_rate; + atempo->dst_buffer->nb_samples = n_out; // adjust the PTS: atempo->dst_buffer->pts = @@ -1041,14 +1041,13 @@ static void push_samples(ATempoContext *atempo, atempo->nsamples_out += n_out; } -static int filter_frame(AVFilterLink *inlink, - AVFilterBufferRef *src_buffer) +static int filter_frame(AVFilterLink *inlink, AVFrame *src_buffer) { AVFilterContext *ctx = inlink->dst; ATempoContext *atempo = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; - int n_in = src_buffer->audio->nb_samples; + int n_in = src_buffer->nb_samples; int n_out = (int)(0.5 + ((double)n_in) / atempo->tempo); const uint8_t *src = src_buffer->data[0]; @@ -1056,10 +1055,8 @@ static int filter_frame(AVFilterLink *inlink, while (src < src_end) { if (!atempo->dst_buffer) { - atempo->dst_buffer = ff_get_audio_buffer(outlink, - AV_PERM_WRITE, - n_out); - avfilter_copy_buffer_ref_props(atempo->dst_buffer, src_buffer); + atempo->dst_buffer = ff_get_audio_buffer(outlink, n_out); + av_frame_copy_props(atempo->dst_buffer, src_buffer); atempo->dst = atempo->dst_buffer->data[0]; atempo->dst_end = atempo->dst + n_out * atempo->stride; @@ -1074,7 +1071,7 @@ static int filter_frame(AVFilterLink *inlink, } atempo->nsamples_in += n_in; - avfilter_unref_bufferp(&src_buffer); + av_frame_free(&src_buffer); return 0; } @@ -1098,9 +1095,7 @@ static int request_frame(AVFilterLink *outlink) while (err == AVERROR(EAGAIN)) { if (!atempo->dst_buffer) { - atempo->dst_buffer = ff_get_audio_buffer(outlink, - AV_PERM_WRITE, - n_max); + atempo->dst_buffer = ff_get_audio_buffer(outlink, n_max); atempo->dst = atempo->dst_buffer->data[0]; atempo->dst_end = atempo->dst + n_max * atempo->stride; @@ -1116,7 +1111,7 @@ static int request_frame(AVFilterLink *outlink) } } - avfilter_unref_bufferp(&atempo->dst_buffer); + av_frame_free(&atempo->dst_buffer); atempo->dst = NULL; atempo->dst_end = NULL; @@ -1142,7 +1137,6 @@ static const AVFilterPad atempo_inputs[] = { .type = AVMEDIA_TYPE_AUDIO, .filter_frame = filter_frame, .config_props = config_props, - .min_perms = AV_PERM_READ, }, { NULL } }; |