summaryrefslogtreecommitdiff
path: root/libavfilter/vf_mp.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavfilter/vf_mp.c')
-rw-r--r--libavfilter/vf_mp.c266
1 files changed, 133 insertions, 133 deletions
diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c
index a18c342756..0f2136ac75 100644
--- a/libavfilter/vf_mp.c
+++ b/libavfilter/vf_mp.c
@@ -123,95 +123,95 @@ static const struct {
};
//copied from vf.c
-extern const vf_info_t vf_info_1bpp;
-extern const vf_info_t vf_info_ass;
-extern const vf_info_t vf_info_bmovl;
-extern const vf_info_t vf_info_crop;
-extern const vf_info_t vf_info_denoise3d;
-extern const vf_info_t vf_info_detc;
-extern const vf_info_t vf_info_dint;
-extern const vf_info_t vf_info_divtc;
-extern const vf_info_t vf_info_down3dright;
-extern const vf_info_t vf_info_dsize;
-extern const vf_info_t vf_info_dvbscale;
-extern const vf_info_t vf_info_eq2;
-extern const vf_info_t vf_info_eq;
-extern const vf_info_t vf_info_expand;
-extern const vf_info_t vf_info_fil;
-extern const vf_info_t vf_info_filmdint;
-extern const vf_info_t vf_info_flip;
-extern const vf_info_t vf_info_format;
-extern const vf_info_t vf_info_fspp;
-extern const vf_info_t vf_info_halfpack;
-extern const vf_info_t vf_info_harddup;
-extern const vf_info_t vf_info_il;
-extern const vf_info_t vf_info_ilpack;
-extern const vf_info_t vf_info_ivtc;
-extern const vf_info_t vf_info_kerndeint;
-extern const vf_info_t vf_info_lavc;
-extern const vf_info_t vf_info_lavcdeint;
-extern const vf_info_t vf_info_mcdeint;
-extern const vf_info_t vf_info_noformat;
-extern const vf_info_t vf_info_noise;
-extern const vf_info_t vf_info_ow;
-extern const vf_info_t vf_info_perspective;
-extern const vf_info_t vf_info_phase;
-extern const vf_info_t vf_info_pp7;
-extern const vf_info_t vf_info_pp;
-extern const vf_info_t vf_info_pullup;
-extern const vf_info_t vf_info_qp;
-extern const vf_info_t vf_info_sab;
-extern const vf_info_t vf_info_scale;
-extern const vf_info_t vf_info_softpulldown;
-extern const vf_info_t vf_info_softskip;
-extern const vf_info_t vf_info_spp;
-extern const vf_info_t vf_info_stereo3d;
-extern const vf_info_t vf_info_telecine;
-extern const vf_info_t vf_info_test;
-extern const vf_info_t vf_info_tfields;
-extern const vf_info_t vf_info_tinterlace;
-extern const vf_info_t vf_info_unsharp;
-extern const vf_info_t vf_info_uspp;
-extern const vf_info_t vf_info_vo;
-extern const vf_info_t vf_info_yadif;
-extern const vf_info_t vf_info_zrmjpeg;
+extern const vf_info_t ff_vf_info_1bpp;
+extern const vf_info_t ff_vf_info_ass;
+extern const vf_info_t ff_vf_info_bmovl;
+extern const vf_info_t ff_vf_info_crop;
+extern const vf_info_t ff_vf_info_denoise3d;
+extern const vf_info_t ff_vf_info_detc;
+extern const vf_info_t ff_vf_info_dint;
+extern const vf_info_t ff_vf_info_divtc;
+extern const vf_info_t ff_vf_info_down3dright;
+extern const vf_info_t ff_vf_info_dsize;
+extern const vf_info_t ff_vf_info_dvbscale;
+extern const vf_info_t ff_vf_info_eq2;
+extern const vf_info_t ff_vf_info_eq;
+extern const vf_info_t ff_vf_info_expand;
+extern const vf_info_t ff_vf_info_fil;
+extern const vf_info_t ff_vf_info_filmdint;
+extern const vf_info_t ff_vf_info_flip;
+extern const vf_info_t ff_vf_info_format;
+extern const vf_info_t ff_vf_info_fspp;
+extern const vf_info_t ff_vf_info_halfpack;
+extern const vf_info_t ff_vf_info_harddup;
+extern const vf_info_t ff_vf_info_il;
+extern const vf_info_t ff_vf_info_ilpack;
+extern const vf_info_t ff_vf_info_ivtc;
+extern const vf_info_t ff_vf_info_kerndeint;
+extern const vf_info_t ff_vf_info_lavc;
+extern const vf_info_t ff_vf_info_lavcdeint;
+extern const vf_info_t ff_vf_info_mcdeint;
+extern const vf_info_t ff_vf_info_noformat;
+extern const vf_info_t ff_vf_info_noise;
+extern const vf_info_t ff_vf_info_ow;
+extern const vf_info_t ff_vf_info_perspective;
+extern const vf_info_t ff_vf_info_phase;
+extern const vf_info_t ff_vf_info_pp7;
+extern const vf_info_t ff_vf_info_pp;
+extern const vf_info_t ff_vf_info_pullup;
+extern const vf_info_t ff_vf_info_qp;
+extern const vf_info_t ff_vf_info_sab;
+extern const vf_info_t ff_vf_info_scale;
+extern const vf_info_t ff_vf_info_softpulldown;
+extern const vf_info_t ff_vf_info_softskip;
+extern const vf_info_t ff_vf_info_spp;
+extern const vf_info_t ff_vf_info_stereo3d;
+extern const vf_info_t ff_vf_info_telecine;
+extern const vf_info_t ff_vf_info_test;
+extern const vf_info_t ff_vf_info_tfields;
+extern const vf_info_t ff_vf_info_tinterlace;
+extern const vf_info_t ff_vf_info_unsharp;
+extern const vf_info_t ff_vf_info_uspp;
+extern const vf_info_t ff_vf_info_vo;
+extern const vf_info_t ff_vf_info_yadif;
+extern const vf_info_t ff_vf_info_zrmjpeg;
static const vf_info_t* const filters[]={
- &vf_info_denoise3d,
- &vf_info_detc,
- &vf_info_dint,
- &vf_info_divtc,
- &vf_info_down3dright,
- &vf_info_dsize,
- &vf_info_eq2,
- &vf_info_eq,
- &vf_info_fil,
-// &vf_info_filmdint, cmmx.h vd.h ‘opt_screen_size_x’
- &vf_info_fspp,
- &vf_info_harddup,
- &vf_info_il,
- &vf_info_ilpack,
- &vf_info_ivtc,
- &vf_info_kerndeint,
- &vf_info_mcdeint,
- &vf_info_noise,
- &vf_info_ow,
- &vf_info_perspective,
- &vf_info_phase,
- &vf_info_pp,
- &vf_info_pp7,
- &vf_info_pullup,
- &vf_info_qp,
- &vf_info_sab,
- &vf_info_softpulldown,
- &vf_info_softskip,
- &vf_info_spp,
- &vf_info_stereo3d,
- &vf_info_telecine,
- &vf_info_tinterlace,
- &vf_info_unsharp,
- &vf_info_uspp,
+ &ff_vf_info_denoise3d,
+ &ff_vf_info_detc,
+ &ff_vf_info_dint,
+ &ff_vf_info_divtc,
+ &ff_vf_info_down3dright,
+ &ff_vf_info_dsize,
+ &ff_vf_info_eq2,
+ &ff_vf_info_eq,
+ &ff_vf_info_fil,
+// &ff_vf_info_filmdint, cmmx.h vd.h ‘opt_screen_size_x’
+ &ff_vf_info_fspp,
+ &ff_vf_info_harddup,
+ &ff_vf_info_il,
+ &ff_vf_info_ilpack,
+ &ff_vf_info_ivtc,
+ &ff_vf_info_kerndeint,
+ &ff_vf_info_mcdeint,
+ &ff_vf_info_noise,
+ &ff_vf_info_ow,
+ &ff_vf_info_perspective,
+ &ff_vf_info_phase,
+ &ff_vf_info_pp,
+ &ff_vf_info_pp7,
+ &ff_vf_info_pullup,
+ &ff_vf_info_qp,
+ &ff_vf_info_sab,
+ &ff_vf_info_softpulldown,
+ &ff_vf_info_softskip,
+ &ff_vf_info_spp,
+ &ff_vf_info_stereo3d,
+ &ff_vf_info_telecine,
+ &ff_vf_info_tinterlace,
+ &ff_vf_info_unsharp,
+ &ff_vf_info_uspp,
NULL
};
@@ -238,16 +238,16 @@ yadif
zrmjpeg
*/
-CpuCaps gCpuCaps; //FIXME initialize this so optims work
+CpuCaps ff_gCpuCaps; //FIXME initialize this so optims work
-static void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam)
+static void ff_sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam)
{
static int firstTime=1;
*flags=0;
#if ARCH_X86
- if(gCpuCaps.hasMMX)
+ if(ff_gCpuCaps.hasMMX)
__asm__ volatile("emms\n\t"::: "memory"); //FIXME this should not be required but it IS (even for non-MMX versions)
#endif
if(firstTime)
@@ -255,7 +255,7 @@ static void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterPa
firstTime=0;
*flags= SWS_PRINT_INFO;
}
- else if( mp_msg_test(MSGT_VFILTER,MSGL_DBG2) ) *flags= SWS_PRINT_INFO;
+ else if( ff_mp_msg_test(MSGT_VFILTER,MSGL_DBG2) ) *flags= SWS_PRINT_INFO;
switch(SWS_BILINEAR)
{
@@ -279,7 +279,7 @@ static void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterPa
//exact copy from vf_scale.c
// will use sws_flags & src_filter (from cmd line)
-struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat)
+struct SwsContext *ff_sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat)
{
int flags, i;
SwsFilter *dstFilterParam, *srcFilterParam;
@@ -291,7 +291,7 @@ struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat,
sfmt= conversion_map[i].pix_fmt;
if (srcFormat == IMGFMT_RGB8 || srcFormat == IMGFMT_BGR8) sfmt = AV_PIX_FMT_PAL8;
- sws_getFlagsAndFilterFromCmdLine(&flags, &srcFilterParam, &dstFilterParam);
+ ff_sws_getFlagsAndFilterFromCmdLine(&flags, &srcFilterParam, &dstFilterParam);
return sws_getContext(srcW, srcH, sfmt, dstW, dstH, dfmt, flags , srcFilterParam, dstFilterParam, NULL);
}
@@ -303,7 +303,7 @@ typedef struct {
int frame_returned;
} MPContext;
-void mp_msg(int mod, int lev, const char *format, ... ){
+void ff_mp_msg(int mod, int lev, const char *format, ... ){
va_list va;
va_start(va, format);
//FIXME convert lev/mod
@@ -311,17 +311,17 @@ void mp_msg(int mod, int lev, const char *format, ... ){
va_end(va);
}
-int mp_msg_test(int mod, int lev){
+int ff_mp_msg_test(int mod, int lev){
return 123;
}
-void init_avcodec(void)
+void ff_init_avcodec(void)
{
//we maybe should init but its kinda 1. unneeded 2. a bit inpolite from here
}
//Exact copy of vf.c
-void vf_clone_mpi_attributes(mp_image_t* dst, mp_image_t* src){
+void ff_vf_clone_mpi_attributes(mp_image_t* dst, mp_image_t* src){
dst->pict_type= src->pict_type;
dst->fields = src->fields;
dst->qscale_type= src->qscale_type;
@@ -332,13 +332,13 @@ void vf_clone_mpi_attributes(mp_image_t* dst, mp_image_t* src){
}
//Exact copy of vf.c
-void vf_next_draw_slice(struct vf_instance *vf,unsigned char** src, int * stride,int w, int h, int x, int y){
+void ff_vf_next_draw_slice(struct vf_instance *vf,unsigned char** src, int * stride,int w, int h, int x, int y){
if (vf->next->draw_slice) {
vf->next->draw_slice(vf->next,src,stride,w,h,x,y);
return;
}
if (!vf->dmpi) {
- mp_msg(MSGT_VFILTER,MSGL_ERR,"draw_slice: dmpi not stored by vf_%s\n", vf->info->name);
+ ff_mp_msg(MSGT_VFILTER,MSGL_ERR,"draw_slice: dmpi not stored by vf_%s\n", vf->info->name);
return;
}
if (!(vf->dmpi->flags & MP_IMGFLAG_PLANAR)) {
@@ -355,7 +355,7 @@ void vf_next_draw_slice(struct vf_instance *vf,unsigned char** src, int * stride
}
//Exact copy of vf.c
-void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h){
+void ff_vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h){
int y;
if(mpi->flags&MP_IMGFLAG_PLANAR){
y0&=~1;h+=h&1;
@@ -399,16 +399,16 @@ void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h){
}
}
-int vf_next_query_format(struct vf_instance *vf, unsigned int fmt){
+int ff_vf_next_query_format(struct vf_instance *vf, unsigned int fmt){
return 1;
}
//used by delogo
-unsigned int vf_match_csp(vf_instance_t** vfp,const unsigned int* list,unsigned int preferred){
+unsigned int ff_vf_match_csp(vf_instance_t** vfp,const unsigned int* list,unsigned int preferred){
return preferred;
}
-mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, int mp_imgflag, int w, int h){
+mp_image_t* ff_vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, int mp_imgflag, int w, int h){
MPContext *m= (MPContext*)(((uint8_t*)vf) - offsetof(MPContext, next_vf));
mp_image_t* mpi=NULL;
int w2;
@@ -416,7 +416,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
av_assert0(vf->next == NULL); // all existing filters call this just on next
- //vf_dint needs these as it calls vf_get_image() before configuring the output
+ //vf_dint needs these as it calls ff_vf_get_image() before configuring the output
if(vf->w==0 && w>0) vf->w=w;
if(vf->h==0 && h>0) vf->h=h;
@@ -436,25 +436,25 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
// and if not, then fallback to software buffers:
switch(mp_imgtype & 0xff){
case MP_IMGTYPE_EXPORT:
- if(!vf->imgctx.export_images[0]) vf->imgctx.export_images[0]=new_mp_image(w2,h);
+ if(!vf->imgctx.export_images[0]) vf->imgctx.export_images[0]=ff_new_mp_image(w2,h);
mpi=vf->imgctx.export_images[0];
break;
case MP_IMGTYPE_STATIC:
- if(!vf->imgctx.static_images[0]) vf->imgctx.static_images[0]=new_mp_image(w2,h);
+ if(!vf->imgctx.static_images[0]) vf->imgctx.static_images[0]=ff_new_mp_image(w2,h);
mpi=vf->imgctx.static_images[0];
break;
case MP_IMGTYPE_TEMP:
- if(!vf->imgctx.temp_images[0]) vf->imgctx.temp_images[0]=new_mp_image(w2,h);
+ if(!vf->imgctx.temp_images[0]) vf->imgctx.temp_images[0]=ff_new_mp_image(w2,h);
mpi=vf->imgctx.temp_images[0];
break;
case MP_IMGTYPE_IPB:
if(!(mp_imgflag&MP_IMGFLAG_READABLE)){ // B frame:
- if(!vf->imgctx.temp_images[0]) vf->imgctx.temp_images[0]=new_mp_image(w2,h);
+ if(!vf->imgctx.temp_images[0]) vf->imgctx.temp_images[0]=ff_new_mp_image(w2,h);
mpi=vf->imgctx.temp_images[0];
break;
}
case MP_IMGTYPE_IP:
- if(!vf->imgctx.static_images[vf->imgctx.static_idx]) vf->imgctx.static_images[vf->imgctx.static_idx]=new_mp_image(w2,h);
+ if(!vf->imgctx.static_images[vf->imgctx.static_idx]) vf->imgctx.static_images[vf->imgctx.static_idx]=ff_new_mp_image(w2,h);
mpi=vf->imgctx.static_images[vf->imgctx.static_idx];
vf->imgctx.static_idx^=1;
break;
@@ -467,7 +467,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
number = i;
}
if (number < 0 || number >= NUM_NUMBERED_MPI) return NULL;
- if (!vf->imgctx.numbered_images[number]) vf->imgctx.numbered_images[number] = new_mp_image(w2,h);
+ if (!vf->imgctx.numbered_images[number]) vf->imgctx.numbered_images[number] = ff_new_mp_image(w2,h);
mpi = vf->imgctx.numbered_images[number];
mpi->number = number;
break;
@@ -488,7 +488,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
// need to re-allocate buffer memory:
av_free(mpi->planes[0]);
mpi->flags&=~MP_IMGFLAG_ALLOCATED;
- mp_msg(MSGT_VFILTER,MSGL_V,"vf.c: have to REALLOCATE buffer memory :(\n");
+ ff_mp_msg(MSGT_VFILTER,MSGL_V,"vf.c: have to REALLOCATE buffer memory :(\n");
}
// } else {
} {
@@ -496,7 +496,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
mpi->height=h; mpi->chroma_height=(h + (1<<mpi->chroma_y_shift) - 1)>>mpi->chroma_y_shift;
}
}
- if(!mpi->bpp) mp_image_setfmt(mpi,outfmt);
+ if(!mpi->bpp) ff_mp_image_setfmt(mpi,outfmt);
if(!(mpi->flags&MP_IMGFLAG_ALLOCATED) && mpi->type>MP_IMGTYPE_EXPORT){
av_assert0(!vf->get_image);
@@ -506,8 +506,8 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
// non-direct and not yet allocated image. allocate it!
if (!mpi->bpp) { // no way we can allocate this
- mp_msg(MSGT_DECVIDEO, MSGL_FATAL,
- "vf_get_image: Tried to allocate a format that can not be allocated!\n");
+ ff_mp_msg(MSGT_DECVIDEO, MSGL_FATAL,
+ "ff_vf_get_image: Tried to allocate a format that can not be allocated!\n");
return NULL;
}
@@ -521,7 +521,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
#if 0
// we have to change width... check if we CAN co it:
int flags=vf->query_format(vf,outfmt); // should not fail
- if(!(flags&3)) mp_msg(MSGT_DECVIDEO,MSGL_WARN,"??? vf_get_image{vf->query_format(outfmt)} failed!\n");
+ if(!(flags&3)) ff_mp_msg(MSGT_DECVIDEO,MSGL_WARN,"??? ff_vf_get_image{vf->query_format(outfmt)} failed!\n");
// printf("query -> 0x%X \n",flags);
if(flags&VFCAP_ACCEPT_STRIDE){
#endif
@@ -531,16 +531,16 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
}
}
- mp_image_alloc_planes(mpi);
+ ff_mp_image_alloc_planes(mpi);
// printf("clearing img!\n");
- vf_mpi_clear(mpi,0,0,mpi->width,mpi->height);
+ ff_vf_mpi_clear(mpi,0,0,mpi->width,mpi->height);
}
}
av_assert0(!vf->start_slice);
if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)
if(vf->start_slice) vf->start_slice(vf,mpi);
if(!(mpi->flags&MP_IMGFLAG_TYPE_DISPLAYED)){
- mp_msg(MSGT_DECVIDEO,MSGL_V,"*** [%s] %s%s mp_image_t, %dx%dx%dbpp %s %s, %d bytes\n",
+ ff_mp_msg(MSGT_DECVIDEO,MSGL_V,"*** [%s] %s%s mp_image_t, %dx%dx%dbpp %s %s, %d bytes\n",
"NULL"/*vf->info->name*/,
(mpi->type==MP_IMGTYPE_EXPORT)?"Exporting":
((mpi->flags&MP_IMGFLAG_DIRECT)?"Direct Rendering":"Allocating"),
@@ -549,7 +549,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
(mpi->flags&MP_IMGFLAG_YUV)?"YUV":((mpi->flags&MP_IMGFLAG_SWAPPED)?"BGR":"RGB"),
(mpi->flags&MP_IMGFLAG_PLANAR)?"planar":"packed",
mpi->bpp*mpi->width*mpi->height/8);
- mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"(imgfmt: %x, planes: %p,%p,%p strides: %d,%d,%d, chroma: %dx%d, shift: h:%d,v:%d)\n",
+ ff_mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"(imgfmt: %x, planes: %p,%p,%p strides: %d,%d,%d, chroma: %dx%d, shift: h:%d,v:%d)\n",
mpi->imgfmt, mpi->planes[0], mpi->planes[1], mpi->planes[2],
mpi->stride[0], mpi->stride[1], mpi->stride[2],
mpi->chroma_width, mpi->chroma_height, mpi->chroma_x_shift, mpi->chroma_y_shift);
@@ -566,7 +566,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
}
-int vf_next_put_image(struct vf_instance *vf,mp_image_t *mpi, double pts){
+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));
@@ -575,7 +575,7 @@ int vf_next_put_image(struct vf_instance *vf,mp_image_t *mpi, double pts){
av_assert0(vf->next);
- av_log(m->avfctx, AV_LOG_DEBUG, "vf_next_put_image\n");
+ av_log(m->avfctx, AV_LOG_DEBUG, "ff_vf_next_put_image\n");
if (!pic || !picref)
goto fail;
@@ -623,7 +623,7 @@ fail:
return 0;
}
-int vf_next_config(struct vf_instance *vf,
+int ff_vf_next_config(struct vf_instance *vf,
int width, int height, int d_width, int d_height,
unsigned int voflags, unsigned int outfmt){
@@ -638,7 +638,7 @@ int vf_next_config(struct vf_instance *vf,
//this is fatal for us ATM
return 0;
}
- mp_msg(MSGT_VFILTER,MSGL_V,"REQ: flags=0x%X req=0x%X \n",flags,vf->default_reqs);
+ ff_mp_msg(MSGT_VFILTER,MSGL_V,"REQ: flags=0x%X req=0x%X \n",flags,vf->default_reqs);
miss=vf->default_reqs - (flags&vf->default_reqs);
if(miss&VFCAP_ACCEPT_STRIDE){
// vf requires stride support but vf->next doesn't support it!
@@ -652,7 +652,7 @@ int vf_next_config(struct vf_instance *vf,
#endif
}
-int vf_next_control(struct vf_instance *vf, int request, void* data){
+int ff_vf_next_control(struct vf_instance *vf, int request, void* data){
MPContext *m= (void*)vf;
av_log(m->avfctx, AV_LOG_DEBUG, "Received control %d\n", request);
return 0;
@@ -705,10 +705,10 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
m->vf.info= filters[i];
m->vf.next = &m->next_vf;
- m->vf.put_image = vf_next_put_image;
- m->vf.config = vf_next_config;
+ m->vf.put_image = ff_vf_next_put_image;
+ m->vf.config = ff_vf_next_config;
m->vf.query_format= vf_default_query_format;
- m->vf.control = vf_next_control;
+ m->vf.control = ff_vf_next_control;
m->vf.default_caps=VFCAP_ACCEPT_STRIDE;
m->vf.default_reqs=0;
if(m->vf.info->opts)
@@ -745,10 +745,10 @@ static av_cold void uninit(AVFilterContext *ctx)
vf_instance_t *next = vf->next;
if(vf->uninit)
vf->uninit(vf);
- free_mp_image(vf->imgctx.static_images[0]);
- free_mp_image(vf->imgctx.static_images[1]);
- free_mp_image(vf->imgctx.temp_images[0]);
- free_mp_image(vf->imgctx.export_images[0]);
+ ff_free_mp_image(vf->imgctx.static_images[0]);
+ ff_free_mp_image(vf->imgctx.static_images[1]);
+ ff_free_mp_image(vf->imgctx.temp_images[0]);
+ ff_free_mp_image(vf->imgctx.export_images[0]);
vf = next;
}
}
@@ -841,13 +841,13 @@ static int end_frame(AVFilterLink *inlink)
AVFilterBufferRef *inpic = inlink->cur_buf;
int i;
double pts= MP_NOPTS_VALUE;
- mp_image_t* mpi = new_mp_image(inpic->video->w, inpic->video->h);
+ mp_image_t* mpi = ff_new_mp_image(inpic->video->w, inpic->video->h);
if(inpic->pts != AV_NOPTS_VALUE)
pts= inpic->pts / av_q2d(inlink->time_base);
for(i=0; conversion_map[i].fmt && conversion_map[i].pix_fmt != inlink->format; i++);
- mp_image_setfmt(mpi,conversion_map[i].fmt);
+ ff_mp_image_setfmt(mpi,conversion_map[i].fmt);
memcpy(mpi->planes, inpic->data, FFMIN(sizeof(inpic->data) , sizeof(mpi->planes)));
memcpy(mpi->stride, inpic->linesize, FFMIN(sizeof(inpic->linesize), sizeof(mpi->stride)));
@@ -861,7 +861,7 @@ static int end_frame(AVFilterLink *inlink)
if(m->vf.put_image(&m->vf, mpi, pts) == 0){
av_log(m->avfctx, AV_LOG_DEBUG, "put_image() says skip\n");
}
- free_mp_image(mpi);
+ ff_free_mp_image(mpi);
return 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 13:07:44 +0000