[Mplayer-cvslog] CVS: main/loader/DirectShow BitmapInfo.h,1.3,1.4 DS_VideoDec.cpp,1.2,1.3

[GEREOFFY]

Update of /cvsroot/mplayer/main/loader/DirectShow
In directory usw-pr-cvs1:/tmp/cvs-serv19885

Modified Files:
	BitmapInfo.h DS_VideoDec.cpp 
Log Message:
other YUV formats support

Index: BitmapInfo.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/BitmapInfo.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** BitmapInfo.h	2001/04/07 16:59:36	1.3
--- BitmapInfo.h	2001/04/16 02:55:57	1.4
***************
*** 29,33 ****
  	    break;
  	default:
! 	    setSpace(bpp);
  	    break;
  	}
--- 29,34 ----
  	    break;
  	default:
!             printf("DShow: WARNING! invalid bpp in BitmapInfo constructor!\n");
! 	    setSpace(bpp,bpp);
  	    break;
  	}
***************
*** 95,104 ****
  	biSizeImage=abs(biWidth*biHeight)*((biBitCount+7)/8);
      }
!     void setSpace(int csp)
      {
  	biCompression=csp;
! 	biBitCount=16;
  //	biBitCount=BitCount(csp);
! 	biSizeImage=abs(biBitCount*biWidth*biHeight/8);
      }
      int bpp() const
--- 96,105 ----
  	biSizeImage=abs(biWidth*biHeight)*((biBitCount+7)/8);
      }
!     void setSpace(int csp,int bits)
      {
  	biCompression=csp;
! 	biBitCount=bits;
  //	biBitCount=BitCount(csp);
! 	biSizeImage=abs(biBitCount*biWidth*biHeight)>>3;
      }
      int bpp() const

Index: DS_VideoDec.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_VideoDec.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DS_VideoDec.cpp	2001/03/20 21:12:37	1.2
--- DS_VideoDec.cpp	2001/04/16 02:55:57	1.3
***************
*** 133,136 ****
--- 133,137 ----
  	dsf->Create(dllname, guid, &m_sOurType, &m_sDestType);
  
+ #if 0
  	m_sVhdr2->bmiHeader.biBitCount=16;
  	m_sVhdr2->bmiHeader.biCompression=fccYUY2;
***************
*** 138,141 ****
--- 139,143 ----
  	result=dsf->m_pOutputPin->vt->QueryAccept(dsf->m_pOutputPin, &m_sDestType);
  //	if(!result) caps=(CAPS)(caps | CAP_YUY2);
+ #endif
  
  	m_sVhdr2->bmiHeader.biBitCount=24;
***************
*** 276,296 ****
      else
      {
! 	m_obh.setSpace(csp);
  	switch(csp)
  	{
  	    case fccYUY2:
  		m_sDestType.subtype=MEDIASUBTYPE_YUY2;
  		break;
  	    case fccYV12:
  		m_sDestType.subtype=MEDIASUBTYPE_YV12;
  		break;
  	    case fccIYUV:
  		m_sDestType.subtype=MEDIASUBTYPE_IYUV;
  		break;
  	    case fccUYVY:
  		m_sDestType.subtype=MEDIASUBTYPE_UYVY;
  		break;
  	    case fccYVYU:
  		m_sDestType.subtype=MEDIASUBTYPE_YVYU;
  		break;
  	}
--- 278,303 ----
      else
      {
! 	m_obh.setSpace(csp,bits);
  	switch(csp)
  	{
  	    case fccYUY2:
  		m_sDestType.subtype=MEDIASUBTYPE_YUY2;
+                 printf("DShow: using YUY2 colorspace\n");
  		break;
  	    case fccYV12:
  		m_sDestType.subtype=MEDIASUBTYPE_YV12;
+                 printf("DShow: using YV12 colorspace\n");
  		break;
  	    case fccIYUV:
  		m_sDestType.subtype=MEDIASUBTYPE_IYUV;
+                 printf("DShow: using IYUV colorspace\n");
  		break;
  	    case fccUYVY:
  		m_sDestType.subtype=MEDIASUBTYPE_UYVY;
+                 printf("DShow: using UYVY colorspace\n");
  		break;
  	    case fccYVYU:
  		m_sDestType.subtype=MEDIASUBTYPE_YVYU;
+                 printf("DShow: using YVYU colorspace\n");
  		break;
  	}


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog