[Mplayer-cvslog] CVS: main/libmpcodecs dec_video.c,1.149,1.150 ve_divx4.c,1.7,1.8 ve_lavc.c,1.27,1.28 ve_libdv.c,1.3,1.4 ve_rawrgb.c,1.6,1.7 ve_vfw.c,1.8,1.9 vf.c,1.47,1.48 vf.h,1.14,1.15 vf_crop.c,1.5,1.6 vf_cropdetect.c,1.4,1.5 vf_eq.c,1.4,1.5 vf_expand.c,1.15,1.16 vf_fame.c,1.7,1.8 vf_flip.c,1.7,1.8 vf_halfpack.c,1.2,1.3 vf_lavc.c,1.5,1.6 vf_lavcdeint.c,1.3,1.4 vf_mirror.c,1.3,1.4 vf_noise.c,1.9,1.10 vf_palette.c,1.7,1.8 vf_pp.c,1.9,1.10 vf_rectangle.c,1.3,1.4 vf_rgb2bgr.c,1.4,1.5 vf_rotate.c,1.2,1.3 vf_scale.c,1.23,1.24 vf_test.c,1.3,1.4 vf_vo.c,1.17,1.18 vf_yuy2.c,1.4,1.5 vf_yvu9.c,1.3,1.4
Arpi of Ize
arpi at mplayerhq.hu
Wed Sep 11 00:18:36 CEST 2002
Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv19613
Modified Files:
dec_video.c ve_divx4.c ve_lavc.c ve_libdv.c ve_rawrgb.c
ve_vfw.c vf.c vf.h vf_crop.c vf_cropdetect.c vf_eq.c
vf_expand.c vf_fame.c vf_flip.c vf_halfpack.c vf_lavc.c
vf_lavcdeint.c vf_mirror.c vf_noise.c vf_palette.c vf_pp.c
vf_rectangle.c vf_rgb2bgr.c vf_rotate.c vf_scale.c vf_test.c
vf_vo.c vf_yuy2.c vf_yvu9.c
Log Message:
changing return type of put_image void->int
Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- dec_video.c 31 Aug 2002 21:03:03 -0000 1.149
+++ dec_video.c 10 Sep 2002 22:18:32 -0000 1.150
@@ -212,6 +212,7 @@
unsigned int t=GetTimer();
unsigned int t2;
double tt;
+int ret;
//if(!(sh_video->ds->flags&1) || sh_video->ds->pack_no<5)
mpi=mpvdec->decode(sh_video, start, in_size, drop_frame);
@@ -237,12 +238,12 @@
//vo_draw_image(video_out,mpi);
vf=sh_video->vfilter;
-vf->put_image(vf,mpi);
-vf->control(vf,VFCTRL_DRAW_OSD,NULL);
+ret = vf->put_image(vf,mpi); // apply video filters and call the leaf vo/ve
+if(ret>0) vf->control(vf,VFCTRL_DRAW_OSD,NULL);
t2=GetTimer()-t2;
tt=t2*0.000001f;
vout_time_usage+=tt;
- return 1;
+return ret;
}
Index: ve_divx4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_divx4.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ve_divx4.c 9 Sep 2002 12:12:30 -0000 1.7
+++ ve_divx4.c 10 Sep 2002 22:18:32 -0000 1.8
@@ -223,7 +223,7 @@
return 0;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
ENC_RESULT enc_result;
vf->priv->enc_frame.image=mpi->planes[0];
vf->priv->enc_frame.bitstream=mux_v->buffer;
@@ -273,6 +273,7 @@
}
}
mencoder_write_chunk(mux_v,vf->priv->enc_frame.length,enc_result.is_key_frame?0x10:0);
+ return 1;
}
//===========================================================================//
Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ve_lavc.c 30 Aug 2002 00:38:42 -0000 1.27
+++ ve_lavc.c 10 Sep 2002 22:18:32 -0000 1.28
@@ -387,7 +387,7 @@
return 0;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
int out_size;
AVPicture lavc_venc_picture;
@@ -431,6 +431,7 @@
if(lavc_venc_context.stats_out && stats_file)
fprintf(stats_file, "%s", lavc_venc_context.stats_out);
#endif
+ return 1;
}
static void uninit(struct vf_instance_s* vf){
Index: ve_libdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_libdv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ve_libdv.c 28 Aug 2002 22:45:44 -0000 1.3
+++ ve_libdv.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -72,13 +72,14 @@
return 0;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
dv_encode_full_frame(vf->priv->enc, mpi->planes,
(mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb,
mux_v->buffer);
mencoder_write_chunk(mux_v, 480 * (vf->priv->enc->isPAL ? 300 : 250) , 0x10);
+ return 1;
}
//===========================================================================//
Index: ve_rawrgb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_rawrgb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ve_rawrgb.c 28 Aug 2002 22:45:44 -0000 1.6
+++ ve_rawrgb.c 10 Sep 2002 22:18:32 -0000 1.7
@@ -46,9 +46,10 @@
return 0;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mux_v->buffer=mpi->planes[0];
mencoder_write_chunk(mux_v, mpi->width*mpi->height*3, 0x10);
+ return 1;
}
//===========================================================================//
Index: ve_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_vfw.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ve_vfw.c 1 Sep 2002 23:06:15 -0000 1.8
+++ ve_vfw.c 10 Sep 2002 22:18:32 -0000 1.9
@@ -238,12 +238,13 @@
return 0;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
long flags=0;
int ret;
// flip_upside_down(vo_image_ptr,vo_image_ptr,3*vo_w,vo_h); // dirty hack
ret=vfw_encode_frame(mux_v->bih, mux_v->buffer, vfw_bih, mpi->planes[0], &flags, 10000);
mencoder_write_chunk(mux_v,mux_v->bih->biSizeImage,flags);
+ return 1;
}
//===========================================================================//
Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- vf.c 30 Aug 2002 06:16:40 -0000 1.47
+++ vf.c 10 Sep 2002 22:18:32 -0000 1.48
@@ -347,8 +347,8 @@
return flags;
}
-void vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi){
- vf->next->put_image(vf->next,mpi);
+int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi){
+ return vf->next->put_image(vf->next,mpi);
}
//============================================================================
Index: vf.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vf.h 1 Sep 2002 14:30:54 -0000 1.14
+++ vf.h 10 Sep 2002 22:18:32 -0000 1.15
@@ -29,7 +29,7 @@
unsigned int fmt);
void (*get_image)(struct vf_instance_s* vf,
mp_image_t *mpi);
- void (*put_image)(struct vf_instance_s* vf,
+ int (*put_image)(struct vf_instance_s* vf,
mp_image_t *mpi);
void (*draw_slice)(struct vf_instance_s* vf,
unsigned char** src, int* stride, int w,int h, int x, int y);
@@ -77,7 +77,7 @@
unsigned int flags, unsigned int outfmt);
int vf_next_control(struct vf_instance_s* vf, int request, void* data);
int vf_next_query_format(struct vf_instance_s* vf, unsigned int fmt);
-void vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi);
+int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi);
vf_instance_t* append_filters(vf_instance_t* last);
Index: vf_crop.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_crop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vf_crop.c 12 May 2002 19:06:15 -0000 1.5
+++ vf_crop.c 10 Sep 2002 22:18:32 -0000 1.6
@@ -39,7 +39,7 @@
return vf_next_config(vf,vf->priv->crop_w,vf->priv->crop_h,d_width,d_height,flags,outfmt);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt,
MP_IMGTYPE_EXPORT, 0,
vf->priv->crop_w, vf->priv->crop_h);
@@ -59,7 +59,7 @@
}
dmpi->stride[0]=mpi->stride[0];
dmpi->width=mpi->width;
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_cropdetect.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_cropdetect.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_cropdetect.c 29 Jun 2002 22:12:07 -0000 1.4
+++ vf_cropdetect.c 10 Sep 2002 22:18:32 -0000 1.5
@@ -55,7 +55,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
int bpp=mpi->bpp/8;
int x,y;
@@ -115,7 +115,7 @@
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_eq.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_eq.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_eq.c 28 Aug 2002 00:24:27 -0000 1.4
+++ vf_eq.c 10 Sep 2002 22:18:32 -0000 1.5
@@ -109,7 +109,7 @@
/* FIXME: add packed yuv version of process */
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi)
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi)
{
mp_image_t *dmpi;
@@ -135,7 +135,7 @@
vf->priv->contrast);
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
static int control(struct vf_instance_s* vf, int request, void* data)
Index: vf_expand.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_expand.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vf_expand.c 21 Aug 2002 19:12:13 -0000 1.15
+++ vf_expand.c 10 Sep 2002 22:18:32 -0000 1.16
@@ -221,14 +221,14 @@
}
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
if(mpi->flags&MP_IMGFLAG_DIRECT){
vf->priv->dmpi=mpi->priv;
#ifdef OSD_SUPPORT
if(vf->priv->osd) draw_osd(vf,mpi->w,mpi->h);
#endif
- vf_next_put_image(vf,vf->priv->dmpi);
- return; // we've used DR, so we're ready...
+ // we've used DR, so we're ready...
+ return vf_next_put_image(vf,vf->priv->dmpi);
}
// hope we'll get DR buffer:
@@ -259,7 +259,7 @@
#ifdef OSD_SUPPORT
if(vf->priv->osd) draw_osd(vf,mpi->w,mpi->h);
#endif
- vf_next_put_image(vf,vf->priv->dmpi);
+ return vf_next_put_image(vf,vf->priv->dmpi);
}
//===========================================================================//
Index: vf_fame.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_fame.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_fame.c 1 Jun 2002 20:57:26 -0000 1.7
+++ vf_fame.c 10 Sep 2002 22:18:32 -0000 1.8
@@ -45,7 +45,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
fame_yuv_t yuv;
mp_image_t *dmpi;
int out_size;
@@ -62,7 +62,7 @@
out_size = fame_encode_slice(vf->priv->ctx);
fame_end_frame(vf->priv->ctx, NULL);
- if(out_size<=0) return;
+ if(out_size<=0) return 1;
dmpi=vf_get_image(vf->next,IMGFMT_MPEGPES,
MP_IMGTYPE_EXPORT, 0,
@@ -75,7 +75,7 @@
dmpi->planes[0]=&vf->priv->pes;
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_flip.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_flip.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_flip.c 3 Sep 2002 20:26:32 -0000 1.7
+++ vf_flip.c 10 Sep 2002 22:18:32 -0000 1.8
@@ -44,10 +44,10 @@
}
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
if(mpi->flags&MP_IMGFLAG_DIRECT){
- vf_next_put_image(vf,vf->priv->dmpi);
- return; // we've used DR, so we're ready...
+ // we've used DR, so we're ready...
+ return vf_next_put_image(vf,vf->priv->dmpi);
}
vf->priv->dmpi=vf_get_image(vf->next,mpi->imgfmt,
@@ -68,7 +68,7 @@
} else
vf->priv->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!!
- vf_next_put_image(vf,vf->priv->dmpi);
+ return vf_next_put_image(vf,vf->priv->dmpi);
}
//===========================================================================//
Index: vf_halfpack.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_halfpack.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vf_halfpack.c 30 Aug 2002 14:32:47 -0000 1.2
+++ vf_halfpack.c 10 Sep 2002 22:18:32 -0000 1.3
@@ -140,7 +140,7 @@
unsigned int dststride, unsigned int srcstride[3], int w, int h);
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi)
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi)
{
mp_image_t *dmpi;
@@ -153,7 +153,7 @@
dmpi->stride[0], mpi->stride,
mpi->w, mpi->h);
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
static int config(struct vf_instance_s* vf,
Index: vf_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_lavc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vf_lavc.c 28 Aug 2002 22:45:44 -0000 1.5
+++ vf_lavc.c 10 Sep 2002 22:18:32 -0000 1.6
@@ -78,7 +78,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t* dmpi;
int out_size;
AVPicture lavc_venc_picture;
@@ -93,7 +93,7 @@
out_size = avcodec_encode_video(&lavc_venc_context,
vf->priv->outbuf, vf->priv->outbuf_size, &lavc_venc_picture);
- if(out_size<=0) return;
+ if(out_size<=0) return 1;
dmpi=vf_get_image(vf->next,IMGFMT_MPEGPES,
MP_IMGTYPE_EXPORT, 0,
@@ -106,7 +106,7 @@
dmpi->planes[0]=(unsigned char*)&vf->priv->pes;
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_lavcdeint.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_lavcdeint.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_lavcdeint.c 14 Aug 2002 21:43:49 -0000 1.3
+++ vf_lavcdeint.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -107,7 +107,7 @@
flags, outfmt);
}
-static void
+static int
put_image (struct vf_instance_s* vf, mp_image_t *mpi)
{
struct vf_priv_s *priv = vf->priv;
@@ -137,10 +137,10 @@
priv->pix_fmt, priv->width, priv->height) < 0)
{
/* This should not happen -- see config() */
- return;
+ return 0;
}
- vf_next_put_image(vf, dmpi);
+ return vf_next_put_image(vf, dmpi);
}
Index: vf_mirror.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_mirror.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_mirror.c 23 Jun 2002 21:08:31 -0000 1.3
+++ vf_mirror.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -42,7 +42,7 @@
//===========================================================================//
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -66,7 +66,7 @@
dmpi->w,dmpi->h,dmpi->bpp>>3);
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_noise.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_noise.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vf_noise.c 13 Aug 2002 17:53:32 -0000 1.9
+++ vf_noise.c 10 Sep 2002 22:18:32 -0000 1.10
@@ -334,7 +334,7 @@
mpi->flags|=MP_IMGFLAG_DIRECT;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
@@ -361,7 +361,7 @@
if(gCpuCaps.hasMMX2) asm volatile ("sfence\n\t");
#endif
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
static void uninit(struct vf_instance_s* vf){
Index: vf_palette.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_palette.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_palette.c 9 Sep 2002 16:13:51 -0000 1.7
+++ vf_palette.c 10 Sep 2002 22:18:32 -0000 1.8
@@ -68,7 +68,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -144,7 +144,7 @@
}
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_pp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vf_pp.c 28 Aug 2002 22:45:44 -0000 1.9
+++ vf_pp.c 10 Sep 2002 22:18:32 -0000 1.10
@@ -67,7 +67,7 @@
mpi->flags|=MP_IMGFLAG_DIRECT;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
// no DR, so get a new image! hope we'll get DR buffer:
vf->priv->dmpi=vf_get_image(vf->next,vf->priv->outfmt,
@@ -87,7 +87,7 @@
vf->priv->pp);
}
- vf_next_put_image(vf,vf->priv->dmpi);
+ return vf_next_put_image(vf,vf->priv->dmpi);
}
//===========================================================================//
Index: vf_rectangle.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_rectangle.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_rectangle.c 28 Aug 2002 22:45:44 -0000 1.3
+++ vf_rectangle.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -62,7 +62,7 @@
return vf_next_control(vf, request, data);
return 0;
}
-static void
+static int
put_image(struct vf_instance_s* vf, mp_image_t* mpi){
mp_image_t* dmpi;
unsigned int bpp;
@@ -136,7 +136,7 @@
p += dmpi->stride[0];
}
}
- vf_next_put_image(vf, dmpi);
+ return vf_next_put_image(vf, dmpi);
}
static int
Index: vf_rgb2bgr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_rgb2bgr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_rgb2bgr.c 13 Apr 2002 19:14:31 -0000 1.4
+++ vf_rgb2bgr.c 10 Sep 2002 22:18:32 -0000 1.5
@@ -44,7 +44,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -72,7 +72,7 @@
rgb24tobgr24(mpi->planes[0],dmpi->planes[0],mpi->w*mpi->h*3);
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_rotate.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_rotate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vf_rotate.c 23 Jun 2002 21:08:31 -0000 1.2
+++ vf_rotate.c 10 Sep 2002 22:18:32 -0000 1.3
@@ -60,7 +60,7 @@
return vf_next_config(vf,height,width,d_height,d_width,flags,outfmt);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -84,7 +84,7 @@
dmpi->w,dmpi->h,dmpi->bpp>>3,vf->priv->direction);
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_scale.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_scale.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vf_scale.c 18 Aug 2002 22:46:03 -0000 1.23
+++ vf_scale.c 10 Sep 2002 22:18:32 -0000 1.24
@@ -166,7 +166,7 @@
return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,best);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -182,7 +182,7 @@
dmpi->qstride=mpi->qstride;
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_test.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_test.c 23 Jun 2002 21:08:31 -0000 1.3
+++ vf_test.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -268,7 +268,7 @@
}
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
int frame= vf->priv->frame_num;
@@ -299,9 +299,9 @@
}
}
- vf_next_put_image(vf,dmpi);
frame++;
vf->priv->frame_num= frame;
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_vo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_vo.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vf_vo.c 1 Sep 2002 14:30:54 -0000 1.17
+++ vf_vo.c 10 Sep 2002 22:18:32 -0000 1.18
@@ -87,11 +87,11 @@
video_out->control(VOCTRL_GET_IMAGE,mpi);
}
-static void put_image(struct vf_instance_s* vf,
+static int put_image(struct vf_instance_s* vf,
mp_image_t *mpi){
- if(!vo_config_count) return; // vo not configured?
+ if(!vo_config_count) return 0; // vo not configured?
// first check, maybe the vo/vf plugin implements draw_image using mpi:
- if(video_out->control(VOCTRL_DRAW_IMAGE,mpi)==VO_TRUE) return; // done.
+ if(video_out->control(VOCTRL_DRAW_IMAGE,mpi)==VO_TRUE) return 1; // done.
// nope, fallback to old draw_frame/draw_slice:
if(!(mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK))){
// blit frame:
@@ -100,6 +100,7 @@
else
video_out->draw_frame(mpi->planes);
}
+ return 1;
}
static void draw_slice(struct vf_instance_s* vf,
Index: vf_yuy2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_yuy2.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_yuy2.c 9 Sep 2002 20:55:57 -0000 1.4
+++ vf_yuy2.c 10 Sep 2002 22:18:32 -0000 1.5
@@ -27,7 +27,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YUY2);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -45,7 +45,7 @@
dmpi->qscale=mpi->qscale;
dmpi->qstride=mpi->qstride;
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_yvu9.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_yvu9.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_yvu9.c 23 Jun 2002 15:03:54 -0000 1.3
+++ vf_yvu9.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -27,7 +27,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YV12);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
int y,w,h;
@@ -58,7 +58,7 @@
dmpi->qscale=mpi->qscale;
dmpi->qstride=mpi->qstride;
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
More information about the MPlayer-cvslog
mailing list