mplayer.hg: libmpcodecs/vf_scale.c comparison

comparison libmpcodecs/vf_scale.c @ 11700:272fc35fd8ee

interlaced scaling

author	michael
date	Mon, 29 Dec 2003 14:16:07 +0000
parents	93a76eee7657
children	21e5cb258a95

comparison

equal deleted inserted replaced

-:9165fbc7d89d
+:272fc35fd8ee
 int w,h;
 int v_chr_drop;
 int param;
 unsigned int fmt;
 struct SwsContext *ctx;
+struct SwsContext *ctx2; //for interlaced slices only
 unsigned char* palette;
+int interlaced;
 int query_format_cache[64];
 } vf_priv_dflt = {
 -1,-1,
 0,
 0,
 0,
+NULL,
 NULL,
 NULL
 };
 extern int opt_screen_size_x;
 	width,height,vo_format_name(outfmt),
 	vf->priv->w,vf->priv->h,vo_format_name(best));
 // free old ctx:
 if(vf->priv->ctx) sws_freeContext(vf->priv->ctx);
+if(vf->priv->ctx2)sws_freeContext(vf->priv->ctx2);
 // new swscaler:
 sws_getFlagsAndFilterFromCmdLine(&int_sws_flags, &srcFilter, &dstFilter);
 int_sws_flags|= vf->priv->v_chr_drop << SWS_SRC_V_CHR_DROP_SHIFT;
 int_sws_flags|= vf->priv->param      << SWS_PARAM_SHIFT;
-vf->priv->ctx=sws_getContext(width,height,
+vf->priv->ctx=sws_getContext(width, height >> vf->priv->interlaced,
 	    outfmt,
-		  vf->priv->w,vf->priv->h,
+		  vf->priv->w, vf->priv->h >> vf->priv->interlaced,
 	    best,
 	    int_sws_flags | get_sws_cpuflags(), srcFilter, dstFilter);
+if(vf->priv->interlaced){
+vf->priv->ctx2=sws_getContext(width, height >> 1,
+	    outfmt,
+		  vf->priv->w, vf->priv->h >> 1,
+	    best,
+	    int_sws_flags | get_sws_cpuflags(), srcFilter, dstFilter);
+}
 if(!vf->priv->ctx){
 	// error...
 	mp_msg(MSGT_VFILTER,MSGL_WARN,"Couldn't init SwScaler for this setup\n");
 	return 0;
 }
 //	mpi->type, mpi->flags & (~MP_IMGFLAG_DRAW_CALLBACK),
 	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
 	vf->priv->w, vf->priv->h);
 }
+static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src[3], int src_stride[3], int y, int h,
+uint8_t *dst[3], int dst_stride[3], int interlaced){
+if(interlaced){
+int i;
+uint8_t *src2[3]={src[0], src[1], src[2]};
+uint8_t *dst2[3]={dst[0], dst[1], dst[2]};
+int src_stride2[3]={2*src_stride[0], 2*src_stride[1], 2*src_stride[2]};
+int dst_stride2[3]={2*dst_stride[0], 2*dst_stride[1], 2*dst_stride[2]};
+sws_scale_ordered(sws1, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
+for(i=0; i<3; i++){
+src2[i] += src_stride[i];
+dst2[i] += dst_stride[i];
+}
+sws_scale_ordered(sws2, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
+}else{
+sws_scale_ordered(sws1, src, src_stride, y, h, dst, dst_stride);
+}
+}
 static void draw_slice(struct vf_instance_s* vf,
 unsigned char** src, int* stride, int w,int h, int x, int y){
 mp_image_t *dmpi=vf->dmpi;
 if(!dmpi){
 	mp_msg(MSGT_VFILTER,MSGL_FATAL,"vf_scale: draw_slice() called with dmpi=NULL (no get_image??)\n");
 	return;
 }
 //    printf("vf_scale::draw_slice() y=%d h=%d\n",y,h);
-sws_scale_ordered(vf->priv->ctx,src,stride,y,h,dmpi->planes,dmpi->stride);
+scale(vf->priv->ctx, vf->priv->ctx2, src, stride, y, h, dmpi->planes, dmpi->stride, vf->priv->interlaced);
 }
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
 mp_image_t *dmpi=mpi->priv;
 // hope we'll get DR buffer:
 dmpi=vf_get_image(vf->next,vf->priv->fmt,
 	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
 	vf->priv->w, vf->priv->h);
-sws_scale_ordered(vf->priv->ctx,mpi->planes,mpi->stride,0,mpi->h,dmpi->planes,dmpi->stride);
+scale(vf->priv->ctx, vf->priv->ctx, mpi->planes,mpi->stride,0,mpi->h,dmpi->planes,dmpi->stride, vf->priv->interlaced);
 }
 if(vf->priv->w==mpi->w && vf->priv->h==mpi->h){
 	// just conversion, no scaling -> keep postprocessing data
 	// this way we can apply pp filter to non-yv12 source using scaler
 	else
 		break;
 	r= sws_setColorspaceDetails(vf->priv->ctx, inv_table, srcRange, table, dstRange, brightness, contrast, saturation);
 	if(r<0) break;
+	if(vf->priv->ctx2){
+r= sws_setColorspaceDetails(vf->priv->ctx2, inv_table, srcRange, table, dstRange, brightness, contrast, saturation);
+if(r<0) break;
+}
 	return CONTROL_TRUE;
 default:
 	break;
 }
 return 0;	// nomatching in-fmt
 }
 static void uninit(struct vf_instance_s *vf){
 if(vf->priv->ctx) sws_freeContext(vf->priv->ctx);
+if(vf->priv->ctx2) sws_freeContext(vf->priv->ctx2);
 if(vf->priv->palette) free(vf->priv->palette);
 free(vf->priv);
 }
 static int open(vf_instance_t *vf, char* args){
 vf->uninit=uninit;
 if(!vf->priv) {
 vf->priv=malloc(sizeof(struct vf_priv_s));
 // TODO: parse args ->
 vf->priv->ctx=NULL;
+vf->priv->ctx2=NULL;
 vf->priv->w=
 vf->priv->h=-1;
 vf->priv->v_chr_drop=0;
 vf->priv->param=0;
 vf->priv->palette=NULL;
 &vf->priv->v_chr_drop,
 &vf->priv->param);
 mp_msg(MSGT_VFILTER,MSGL_V,"SwScale params: %d x %d (-1=no scaling)\n",
 vf->priv->w,
 vf->priv->h);
 return 1;
 }
 //global sws_flags from the command line
 int sws_flags=2;
 #undef ST_OFF
 #define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f)
 static m_option_t vf_opts_fields[] = {
 {"w", ST_OFF(w), CONF_TYPE_INT, M_OPT_MIN,-3 ,0, NULL},
 {"h", ST_OFF(h), CONF_TYPE_INT, M_OPT_MIN,-3 ,0, NULL},
+{"interlaced", ST_OFF(interlaced), CONF_TYPE_INT, M_OPT_RANGE, 0, 1, NULL},
 {"chr-drop", ST_OFF(v_chr_drop), CONF_TYPE_INT, M_OPT_RANGE, 0, 3, NULL},
 {"param", ST_OFF(param), CONF_TYPE_INT, M_OPT_RANGE, 0, 100, NULL},
 // Note that here the 2 field is NULL (ie 0)
 // As we want this option to act on the option struct itself
 {"presize", 0, CONF_TYPE_OBJ_PRESETS, 0, 0, 0, &size_preset},

Mercurial > mplayer.hg

comparison libmpcodecs/vf_scale.c @ 11700:272fc35fd8ee