You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-11-29 05:57:37 +02:00
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
759001c534 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>
This commit is contained in:
Michael Niedermayer
@@ -536,45 +536,38 @@ mp_image_t* ff_vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgty
|
||||
return mpi;
|
||||
}
|
||||
|
||||
static void dummy_free(void *opaque, uint8_t *data){}
|
||||
|
||||
int ff_vf_next_put_image(struct vf_instance *vf,mp_image_t *mpi, double pts){
|
||||
MPContext *m= (void*)vf;
|
||||
AVFilterLink *outlink = m->avfctx->outputs[0];
|
||||
AVFilterBuffer *pic = av_mallocz(sizeof(AVFilterBuffer));
|
||||
AVFilterBufferRef *picref = av_mallocz(sizeof(AVFilterBufferRef));
|
||||
AVFrame *picref = av_frame_alloc();
|
||||
int i;
|
||||
|
||||
av_assert0(vf->next);
|
||||
|
||||
av_log(m->avfctx, AV_LOG_DEBUG, "ff_vf_next_put_image\n");
|
||||
|
||||
if (!pic || !picref)
|
||||
if (!picref)
|
||||
goto fail;
|
||||
|
||||
picref->buf = pic;
|
||||
picref->buf->free= (void*)av_free;
|
||||
if (!(picref->video = av_mallocz(sizeof(AVFilterBufferRefVideoProps))))
|
||||
goto fail;
|
||||
picref->width = mpi->w;
|
||||
picref->height = mpi->h;
|
||||
|
||||
pic->w = picref->video->w = mpi->w;
|
||||
pic->h = picref->video->h = mpi->h;
|
||||
|
||||
/* make sure the buffer gets read permission or it's useless for output */
|
||||
picref->perms = AV_PERM_READ | AV_PERM_REUSE2;
|
||||
// av_assert0(mpi->flags&MP_IMGFLAG_READABLE);
|
||||
if(!(mpi->flags&MP_IMGFLAG_PRESERVE))
|
||||
picref->perms |= AV_PERM_WRITE;
|
||||
|
||||
pic->refcount = 1;
|
||||
picref->type = AVMEDIA_TYPE_VIDEO;
|
||||
|
||||
for(i=0; conversion_map[i].fmt && mpi->imgfmt != conversion_map[i].fmt; i++);
|
||||
pic->format = picref->format = conversion_map[i].pix_fmt;
|
||||
picref->format = conversion_map[i].pix_fmt;
|
||||
|
||||
memcpy(pic->data, mpi->planes, FFMIN(sizeof(pic->data) , sizeof(mpi->planes)));
|
||||
memcpy(pic->linesize, mpi->stride, FFMIN(sizeof(pic->linesize), sizeof(mpi->stride)));
|
||||
memcpy(picref->data, pic->data, sizeof(picref->data));
|
||||
memcpy(picref->linesize, pic->linesize, sizeof(picref->linesize));
|
||||
memcpy(picref->linesize, mpi->stride, FFMIN(sizeof(picref->linesize), sizeof(mpi->stride)));
|
||||
|
||||
for(i=0; i<4 && mpi->stride[i]; i++){
|
||||
picref->buf[i] = av_buffer_create(mpi->planes[i], mpi->stride[i], dummy_free, NULL,
|
||||
(mpi->flags & MP_IMGFLAG_PRESERVE) ? AV_BUFFER_FLAG_READONLY : 0);
|
||||
if (!picref->buf[i])
|
||||
goto fail;
|
||||
picref->data[i] = picref->buf[i]->data;
|
||||
}
|
||||
|
||||
if(pts != MP_NOPTS_VALUE)
|
||||
picref->pts= pts * av_q2d(outlink->time_base);
|
||||
@@ -584,10 +577,7 @@ int ff_vf_next_put_image(struct vf_instance *vf,mp_image_t *mpi, double pts){
|
||||
|
||||
return 1;
|
||||
fail:
|
||||
if (picref && picref->video)
|
||||
av_free(picref->video);
|
||||
av_free(picref);
|
||||
av_free(pic);
|
||||
av_frame_free(&picref);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -793,12 +783,12 @@ static int request_frame(AVFilterLink *outlink)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *inpic)
|
||||
static int filter_frame(AVFilterLink *inlink, AVFrame *inpic)
|
||||
{
|
||||
MPContext *m = inlink->dst->priv;
|
||||
int i;
|
||||
double pts= MP_NOPTS_VALUE;
|
||||
mp_image_t* mpi = ff_new_mp_image(inpic->video->w, inpic->video->h);
|
||||
mp_image_t* mpi = ff_new_mp_image(inpic->width, inpic->height);
|
||||
|
||||
if(inpic->pts != AV_NOPTS_VALUE)
|
||||
pts= inpic->pts / av_q2d(inlink->time_base);
|
||||
@@ -813,12 +803,12 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *inpic)
|
||||
|
||||
// mpi->flags|=MP_IMGFLAG_ALLOCATED; ?
|
||||
mpi->flags |= MP_IMGFLAG_READABLE;
|
||||
if(!(inpic->perms & AV_PERM_WRITE))
|
||||
if(!av_frame_is_writable(inpic))
|
||||
mpi->flags |= MP_IMGFLAG_PRESERVE;
|
||||
if(m->vf.put_image(&m->vf, mpi, pts) == 0){
|
||||
av_log(m->avfctx, AV_LOG_DEBUG, "put_image() says skip\n");
|
||||
}else{
|
||||
avfilter_unref_buffer(inpic);
|
||||
av_frame_free(&inpic);
|
||||
}
|
||||
ff_free_mp_image(mpi);
|
||||
return 0;
|
||||
@@ -830,7 +820,6 @@ static const AVFilterPad mp_inputs[] = {
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
.filter_frame = filter_frame,
|
||||
.config_props = config_inprops,
|
||||
.min_perms = AV_PERM_READ,
|
||||
},
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user