RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-17 13:17:13 +00:00
Code Issues Releases Wiki Activity

3*100l (backported from g2)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10425 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2003-07-13 22:51:20 +00:00
parent 02fb82572a
commit f0e8780594
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libmpcodecs/vf.c
View File

@ -219,6 +219,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
} }
if(mpi){ if(mpi){
mpi->type=mp_imgtype; mpi->type=mp_imgtype;
mpi->w=w; mpi->h=h;
// keep buffer allocation status & color flags only: // keep buffer allocation status & color flags only:
// mpi->flags&=~(MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE|MP_IMGFLAG_DIRECT); // mpi->flags&=~(MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE|MP_IMGFLAG_DIRECT);
mpi->flags&=MP_IMGFLAG_ALLOCATED|MP_IMGFLAG_TYPE_DISPLAYED|MP_IMGFLAGMASK_COLORS; mpi->flags&=MP_IMGFLAG_ALLOCATED|MP_IMGFLAG_TYPE_DISPLAYED|MP_IMGFLAGMASK_COLORS;
@ -234,7 +235,8 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
mpi->flags&=~MP_IMGFLAG_ALLOCATED; mpi->flags&=~MP_IMGFLAG_ALLOCATED;
printf("vf.c: have to REALLOCATE buffer memory :(\n"); printf("vf.c: have to REALLOCATE buffer memory :(\n");
} }
} else { // } else {
} {
mpi->width=w2; mpi->chroma_width=(w2 + (1<<mpi->chroma_x_shift) - 1)>>mpi->chroma_x_shift; mpi->width=w2; mpi->chroma_width=(w2 + (1<<mpi->chroma_x_shift) - 1)>>mpi->chroma_x_shift;
mpi->height=h; mpi->chroma_height=(h + (1<<mpi->chroma_y_shift) - 1)>>mpi->chroma_y_shift; mpi->height=h; mpi->chroma_height=(h + (1<<mpi->chroma_y_shift) - 1)>>mpi->chroma_y_shift;
} }
@ -278,8 +280,10 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8); mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8);
if(mpi->flags&MP_IMGFLAG_PLANAR){ if(mpi->flags&MP_IMGFLAG_PLANAR){
// YV12/I420/YVU9/IF09. feel free to add other planar formats here... // YV12/I420/YVU9/IF09. feel free to add other planar formats here...
if(!mpi->stride[0]) mpi->stride[0]=mpi->width; //if(!mpi->stride[0])
if(!mpi->stride[1]) mpi->stride[1]=mpi->stride[2]=mpi->chroma_width; mpi->stride[0]=mpi->width;
//if(!mpi->stride[1])
mpi->stride[1]=mpi->stride[2]=mpi->chroma_width;
if(mpi->flags&MP_IMGFLAG_SWAPPED){ if(mpi->flags&MP_IMGFLAG_SWAPPED){
// I420/IYUV (Y,U,V) // I420/IYUV (Y,U,V)
mpi->planes[1]=mpi->planes[0]+mpi->width*mpi->height; mpi->planes[1]=mpi->planes[0]+mpi->width*mpi->height;
@ -290,7 +294,8 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
mpi->planes[1]=mpi->planes[2]+mpi->chroma_width*mpi->chroma_height; mpi->planes[1]=mpi->planes[2]+mpi->chroma_width*mpi->chroma_height;
} }
} else { } else {
if(!mpi->stride[0]) mpi->stride[0]=mpi->width*mpi->bpp/8; //if(!mpi->stride[0])
mpi->stride[0]=mpi->width*mpi->bpp/8;
} }
// printf("clearing img!\n"); // printf("clearing img!\n");
vf_mpi_clear(mpi,0,0,mpi->width,mpi->height); vf_mpi_clear(mpi,0,0,mpi->width,mpi->height);