Mercurial > mplayer.hg

comparison libmpcodecs/vf_spp.c @ 12631:6cbccc0c7d7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix memory corruption, noticable at reallocate image
author iive
date Thu, 24 Jun 2004 12:01:53 +0000
parents 012b55951076
children 9e90b90a8d7c
comparison
equal deleted inserted replaced
12630:47dbe356085c 12631:6cbccc0c7d7b
470 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ 470 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
471 mp_image_t *dmpi; 471 mp_image_t *dmpi;
472 472
473 if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ 473 if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
474 // no DR, so get a new image! hope we'll get DR buffer: 474 // no DR, so get a new image! hope we'll get DR buffer:
475 vf->dmpi=vf_get_image(vf->next,vf->priv->outfmt, 475 dmpi=vf_get_image(vf->next,vf->priv->outfmt,
476 MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, 476 MP_IMGTYPE_TEMP,
477 mpi->w,mpi->h); 477 MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
478 } 478 mpi->w,mpi->h);
479 479 vf_clone_mpi_attributes(dmpi, mpi);
480 dmpi= vf->dmpi; 480 }else{
481 481 dmpi=mpi;
482 }
483
482 vf->priv->mpeg2= mpi->qscale_type; 484 vf->priv->mpeg2= mpi->qscale_type;
483 if(vf->priv->log2_count || !(mpi->flags&MP_IMGFLAG_DIRECT)){ 485 if(vf->priv->log2_count || !(mpi->flags&MP_IMGFLAG_DIRECT)){
484 if(mpi->qscale || vf->priv->qp){ 486 if(mpi->qscale || vf->priv->qp){
485 filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, mpi->qscale, mpi->qstride, 1); 487 filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, mpi->qscale, mpi->qstride, 1);
486 filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, mpi->qscale, mpi->qstride, 0); 488 filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, mpi->qscale, mpi->qstride, 0);
489 memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h, dmpi->stride[0], mpi->stride[0]); 491 memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h, dmpi->stride[0], mpi->stride[0]);
490 memcpy_pic(dmpi->planes[1], mpi->planes[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[1], mpi->stride[1]); 492 memcpy_pic(dmpi->planes[1], mpi->planes[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[1], mpi->stride[1]);
491 memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[2], mpi->stride[2]); 493 memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[2], mpi->stride[2]);
492 } 494 }
493 } 495 }
494 vf_clone_mpi_attributes(dmpi, mpi);
495 496
496 #ifdef HAVE_MMX 497 #ifdef HAVE_MMX
497 if(gCpuCaps.hasMMX) asm volatile ("emms\n\t"); 498 if(gCpuCaps.hasMMX) asm volatile ("emms\n\t");
498 #endif 499 #endif
499 #ifdef HAVE_MMX2 500 #ifdef HAVE_MMX2
564 return vf_next_control(vf,request,data); 565 return vf_next_control(vf,request,data);
565 } 566 }
566 567
567 static int open(vf_instance_t *vf, char* args){ 568 static int open(vf_instance_t *vf, char* args){
568 569
569 int log2c; 570 int log2c=0;
570 571
571 vf->config=config; 572 vf->config=config;
572 vf->put_image=put_image; 573 vf->put_image=put_image;
573 vf->get_image=get_image; 574 vf->get_image=get_image;
574 vf->query_format=query_format; 575 vf->query_format=query_format;