comparison libmpcodecs/vf.c @ 30112:c26218c27e73

Deduplicate the mp_image planes allocation code. The code in vf.c and mp_image.c is almost the same, though the one in vf.c is more up-to-date/has more bug fixes and thus is used as the basis (which is why the diff is so big).

30111:ee5c7a825348

		      mpi->chroma_width=(w2 + (1<<mpi->chroma_x_shift) - 1)>>mpi->chroma_x_shift;
		  }
	      }
	  }

	  // IF09 - allocate space for 4. plane delta info - unused
	  if (mpi->imgfmt == IMGFMT_IF09)
	  {
	     mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8+
	    				mpi->chroma_width*mpi->chroma_height);
	     /* export delta table */
	     mpi->planes[3]=mpi->planes[0]+(mpi->width*mpi->height)+2*(mpi->chroma_width*mpi->chroma_height);
	  }
	  else
	     mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8);
	  if(mpi->flags&MP_IMGFLAG_PLANAR){
	      int bpp = IMGFMT_IS_YUVP16(mpi->imgfmt)? 2 : 1;
	      // YV12/I420/YVU9/IF09. feel free to add other planar formats here...
	      //if(!mpi->stride[0])
	      mpi->stride[0]=bpp*mpi->width;
	      //if(!mpi->stride[1])
	      if(mpi->num_planes > 2){
	      mpi->stride[1]=mpi->stride[2]=bpp*mpi->chroma_width;
	      if(mpi->flags&MP_IMGFLAG_SWAPPED){
	          // I420/IYUV  (Y,U,V)
	          mpi->planes[1]=mpi->planes[0]+mpi->stride[0]*mpi->height;
	          mpi->planes[2]=mpi->planes[1]+mpi->stride[1]*mpi->chroma_height;
	      } else {
	          // YV12,YVU9,IF09  (Y,V,U)
	          mpi->planes[2]=mpi->planes[0]+mpi->stride[0]*mpi->height;
	          mpi->planes[1]=mpi->planes[2]+mpi->stride[1]*mpi->chroma_height;
	      }
	      } else {
	          // NV12/NV21
	          mpi->stride[1]=mpi->chroma_width;
	          mpi->planes[1]=mpi->planes[0]+mpi->stride[0]*mpi->height;
	      }
	  } else {
	      //if(!mpi->stride[0])
	      mpi->stride[0]=mpi->width*mpi->bpp/8;
	      if (mpi->flags & MP_IMGFLAG_RGB_PALETTE)
	          mpi->planes[1] = memalign(64, 1024);
	  }
//	  printf("clearing img!\n");
	  vf_mpi_clear(mpi,0,0,mpi->width,mpi->height);
	  mpi->flags|=MP_IMGFLAG_ALLOCATED;
        }
    }
    if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)
	if(vf->start_slice) vf->start_slice(vf,mpi);
    if(!(mpi->flags&MP_IMGFLAG_TYPE_DISPLAYED)){

30112:c26218c27e73

		      mpi->chroma_width=(w2 + (1<<mpi->chroma_x_shift) - 1)>>mpi->chroma_x_shift;
		  }
	      }
	  }

	  mp_image_alloc_planes(mpi);
//	  printf("clearing img!\n");
	  vf_mpi_clear(mpi,0,0,mpi->width,mpi->height);
        }
    }
    if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)
	if(vf->start_slice) vf->start_slice(vf,mpi);
    if(!(mpi->flags&MP_IMGFLAG_TYPE_DISPLAYED)){