DScaler Deinterlacer/Scaler

Update of /cvsroot/deinterlace/DScaler/DScaler
In directory sc8-pr-cvs1:/tmp/cvs-serv23242

Modified Files:
	BT848Source.cpp CX2388xSource.cpp SAA7134Source.cpp 
Log Message:
no message

Index: BT848Source.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/BT848Source.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -r1.121 -r1.122
*** BT848Source.cpp	24 Mar 2003 23:24:48 -0000	1.121
--- BT848Source.cpp	29 May 2003 17:07:27 -0000	1.122
***************
*** 19,22 ****
--- 19,25 ----
  //
  // $Log$
+ // Revision 1.122  2003/05/29 17:07:27  laurentg
+ // no message
+ //
  // Revision 1.121  2003/03/24 23:24:48  laurentg
  // Temporary patch to bypass a probably bug in the code managing the source settings
***************
*** 1487,1492 ****
      if(OldFormat != m_VideoFormat->GetValue())
      {
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_PRECHANGE, OldValue, m_VideoFormat->GetValue());
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_CHANGE, OldValue, m_VideoFormat->GetValue());
      }
  
--- 1490,1495 ----
      if(OldFormat != m_VideoFormat->GetValue())
      {
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_PRECHANGE, OldFormat, m_VideoFormat->GetValue());
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_CHANGE, OldFormat, m_VideoFormat->GetValue());
      }
  

Index: CX2388xSource.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/CX2388xSource.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** CX2388xSource.cpp	9 Mar 2003 19:48:28 -0000	1.49
--- CX2388xSource.cpp	29 May 2003 17:07:27 -0000	1.50
***************
*** 24,27 ****
--- 24,30 ----
  //
  // $Log$
+ // Revision 1.50  2003/05/29 17:07:27  laurentg
+ // no message
+ //
  // Revision 1.49  2003/03/09 19:48:28  laurentg
  // Updated field statistics
***************
*** 1449,1454 ****
      if(OldFormat != m_VideoFormat->GetValue())
      {
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_PRECHANGE, OldValue, m_VideoFormat->GetValue());
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_CHANGE, OldValue, m_VideoFormat->GetValue());
      }
  
--- 1452,1457 ----
      if(OldFormat != m_VideoFormat->GetValue())
      {
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_PRECHANGE, OldFormat, m_VideoFormat->GetValue());
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_CHANGE, OldFormat, m_VideoFormat->GetValue());
      }
  

Index: SAA7134Source.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/SAA7134Source.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -r1.79 -r1.80
*** SAA7134Source.cpp	29 May 2003 15:55:25 -0000	1.79
--- SAA7134Source.cpp	29 May 2003 17:07:28 -0000	1.80
***************
*** 31,34 ****
--- 31,37 ----
  //
  // $Log$
+ // Revision 1.80  2003/05/29 17:07:28  laurentg
+ // no message
+ //
  // Revision 1.79  2003/05/29 15:55:25  laurentg
  // Settings management updated (saving of video format per video input deactivated)
***************
*** 620,624 ****
      m_pSAA7134Card->SetAudioLine1Voltage((eAudioLineVoltage)m_AudioLine1Voltage->GetValue());
      m_pSAA7134Card->SetAudioLine2Voltage((eAudioLineVoltage)m_AudioLine2Voltage->GetValue());
- //LOG(1, "CSAA7134Source::Reset 2 m_VideoSource %d m_VideoFormat %d", m_VideoSource->GetValue(), m_VideoFormat->GetValue());
  }
  
--- 623,626 ----
***************
*** 1566,1571 ****
      if(OldFormat != m_VideoFormat->GetValue())
      {
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_PRECHANGE, OldValue, m_VideoFormat->GetValue());
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_CHANGE, OldValue, m_VideoFormat->GetValue());
      }
  
--- 1568,1573 ----
      if(OldFormat != m_VideoFormat->GetValue())
      {
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_PRECHANGE, OldFormat, m_VideoFormat->GetValue());
!         EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_CHANGE, OldFormat, m_VideoFormat->GetValue());
      }

Update of /cvsroot/deinterlace/DScaler/DScaler
In directory sc8-pr-cvs1:/tmp/cvs-serv25368

Modified Files:
	SAA7134Source.cpp SAA7134Source_UI.cpp 
Log Message:
Settings management updated (saving of video format per video input deactivated)

Index: SAA7134Source.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/SAA7134Source.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -r1.78 -r1.79
*** SAA7134Source.cpp	26 May 2003 20:49:04 -0000	1.78
--- SAA7134Source.cpp	29 May 2003 15:55:25 -0000	1.79
***************
*** 31,34 ****
--- 31,37 ----
  //
  // $Log$
+ // Revision 1.79  2003/05/29 15:55:25  laurentg
+ // Settings management updated (saving of video format per video input deactivated)
+ //
  // Revision 1.78  2003/05/26 20:49:04  laurentg
  // Corrections for datacasting
***************
*** 388,391 ****
--- 391,396 ----
  void CSAA7134Source::SetSourceAsCurrent()
  {
+ //LOG(1, "CSAA7134Source::SetSourceAsCurrent m_VideoSource %d", m_VideoSource->GetValue());
+ //LOG(1, "CSAA7134Source::SetSourceAsCurrent m_VideoFormat %d", m_VideoFormat->GetValue());
      // need to call up to parent to run register settings functions
      CSource::SetSourceAsCurrent();
***************
*** 461,465 ****
      m_Settings.push_back(m_VideoSource);
  
!     m_VideoFormat = new CVideoFormatSetting(this, "Video Format", VIDEOFORMAT_NTSC_M, 0, VIDEOFORMAT_LASTONE - 1, IniSection, pVideoFormatGroup);
      m_Settings.push_back(m_VideoFormat);
  
--- 466,471 ----
      m_Settings.push_back(m_VideoSource);
  
! //    m_VideoFormat = new CVideoFormatSetting(this, "Video Format", VIDEOFORMAT_NTSC_M, 0, VIDEOFORMAT_LASTONE - 1, IniSection, pVideoFormatGroup);
!     m_VideoFormat = new CVideoFormatSetting(this, "Video Format", VIDEOFORMAT_NTSC_M, 0, VIDEOFORMAT_LASTONE - 1, IniSection);
      m_Settings.push_back(m_VideoFormat);
  
***************
*** 602,605 ****
--- 608,612 ----
  void CSAA7134Source::Reset()
  {
+ //LOG(1, "CSAA7134Source::Reset 1 m_VideoSource %d m_VideoFormat %d", m_VideoSource->GetValue(), m_VideoFormat->GetValue());
      m_pSAA7134Card->ResetHardware();
  
***************
*** 613,616 ****
--- 620,624 ----
      m_pSAA7134Card->SetAudioLine1Voltage((eAudioLineVoltage)m_AudioLine1Voltage->GetValue());
      m_pSAA7134Card->SetAudioLine2Voltage((eAudioLineVoltage)m_AudioLine2Voltage->GetValue());
+ //LOG(1, "CSAA7134Source::Reset 2 m_VideoSource %d m_VideoFormat %d", m_VideoSource->GetValue(), m_VideoFormat->GetValue());
  }
  
***************
*** 1529,1532 ****
--- 1537,1541 ----
  void CSAA7134Source::VideoSourceOnChange(long NewValue, long OldValue)
  {
+ //LOG(1, "CSAA7134Source::VideoSourceOnChange Old %d New %d", OldValue, NewValue);
      Audio_Mute(PreSwitchMuteDelay);
  
***************
*** 1568,1572 ****
  
      // reset here when we have all the settings
!     SetupVideoSource();
      
      Audio_Unmute(PostSwitchMuteDelay);
--- 1577,1581 ----
  
      // reset here when we have all the settings
!     Reset();
      
      Audio_Unmute(PostSwitchMuteDelay);
***************
*** 1577,1580 ****
--- 1586,1590 ----
  void CSAA7134Source::VideoFormatOnChange(long NewValue, long OldValue)
  {
+ //LOG(1, "CSAA7134Source::VideoFormatOnChange Old %d New %d", OldValue, NewValue);
      Stop_Capture();
  
***************
*** 1587,1592 ****
      EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_PRECHANGE, OldValue, NewValue);
  
-     SetupVideoSource();
-    
      EventCollector->RaiseEvent(this, EVENT_VIDEOFORMAT_CHANGE, OldValue, NewValue);
      
--- 1597,1600 ----
***************
*** 1596,1599 ****
--- 1604,1609 ----
  
      SettingsMaster->LoadSettings();
+ 
+     Reset();
  
      Start_Capture();

Index: SAA7134Source_UI.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/SAA7134Source_UI.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** SAA7134Source_UI.cpp	23 Mar 2003 10:42:21 -0000	1.40
--- SAA7134Source_UI.cpp	29 May 2003 15:55:26 -0000	1.41
***************
*** 31,34 ****
--- 31,37 ----
  //
  // $Log$
+ // Revision 1.41  2003/05/29 15:55:26  laurentg
+ // Settings management updated (saving of video format per video input deactivated)
+ //
  // Revision 1.40  2003/03/23 10:42:21  laurentg
  // Avoid to switch to an unknown video input when using 000...
***************
*** 1683,1687 ****
  
      m_AudioSource->ChangeDefault(m_pSAA7134Card->GetInputAudioLine(nInput), bDontSetValue);
!     m_VideoFormat->ChangeDefault(m_pSAA7134Card->GetTuner()->GetDefaultVideoFormat());
  }
  
--- 1686,1690 ----
  
      m_AudioSource->ChangeDefault(m_pSAA7134Card->GetInputAudioLine(nInput), bDontSetValue);
!     m_VideoFormat->ChangeDefault(m_pSAA7134Card->GetTuner()->GetDefaultVideoFormat(), bDontSetValue);
  }

Update of /cvsroot/deinterlace/DScaler/DScaler
In directory sc8-pr-cvs1:/tmp/cvs-serv9151

Modified Files:
	Calibration.cpp OSD.cpp 
Log Message:
Update of the OSD displayed when doing calibration

Index: Calibration.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/Calibration.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -r1.79 -r1.80
*** Calibration.cpp	30 Jan 2003 22:32:39 -0000	1.79
--- Calibration.cpp	26 May 2003 22:04:11 -0000	1.80
***************
*** 19,22 ****
--- 19,25 ----
  //
  // $Log$
+ // Revision 1.80  2003/05/26 22:04:11  laurentg
+ // Update of the OSD displayed when doing calibration
+ //
  // Revision 1.79  2003/01/30 22:32:39  laurentg
  // Restriction to maximum range for the settings deleted
***************
*** 1068,1072 ****
          initial_step = 12;
          nb_steps = 12;
!         if (m_Saturation_U != NULL && m_Hue != NULL)
          {
              OkToStart = TRUE;
--- 1071,1075 ----
          initial_step = 12;
          nb_steps = 12;
!         if (m_Saturation_U != NULL)
          {
              OkToStart = TRUE;
***************
*** 1076,1080 ****
  	            m_Saturation_V->AdjustDefault();
  			}
!             m_Hue->AdjustDefault();
          }
          break;
--- 1079,1086 ----
  	            m_Saturation_V->AdjustDefault();
  			}
! 			if (m_Hue != NULL)
! 			{
! 	            m_Hue->AdjustDefault();
! 			}
          }
          break;
***************
*** 1082,1086 ****
          initial_step = 1;
          nb_steps = 23;
!         if (m_Brightness != NULL && m_Contrast != NULL && m_Saturation_U != NULL && m_Hue != NULL)
          {
              OkToStart = TRUE;
--- 1088,1092 ----
          initial_step = 1;
          nb_steps = 23;
!         if (m_Brightness != NULL && m_Contrast != NULL && m_Saturation_U != NULL)
          {
              OkToStart = TRUE;
***************
*** 1092,1096 ****
  	            m_Saturation_V->AdjustDefault();
  			}
!             m_Hue->AdjustDefault();
          }
          break;
--- 1098,1105 ----
  	            m_Saturation_V->AdjustDefault();
  			}
! 			if (m_Hue != NULL)
! 			{
! 	            m_Hue->AdjustDefault();
! 			}
          }
          break;
***************
*** 1436,1439 ****
--- 1445,1453 ----
  
      case 18:
+         if (m_Saturation_V == NULL)
+         {
+             current_step += 2;
+             break;
+         }
          m_Saturation_V->SetFullRange();
          if (step_init(ADJ_SATURATION_V, m_Saturation_V, (CCalSetting* )NULL, (CCalSetting* )NULL))
***************
*** 1457,1460 ****
--- 1471,1479 ----
  
      case 20:
+         if (m_Hue == NULL)
+         {
+             current_step += 2;
+             break;
+         }
          m_Hue->SetRange(30);
          if (step_init(ADJ_HUE, m_Hue, (CCalSetting* )NULL, (CCalSetting* )NULL))
***************
*** 1505,1518 ****
  			nb2 = 1;
  		}
!         if (m_Hue->GetResult(&mask, &min, &max) > 0)
!         {
!             m_Hue->SetRange(mask);
!         }
!         else
!         {
!             m_Hue->SetRange(0);
!         }
! 		free(mask);
!         nb3 = m_Hue->GetRange(NULL, &min, &max);
          if ((nb1 == 1) && (nb2 == 1) && (nb3 == 1))
          {
--- 1524,1544 ----
  			nb2 = 1;
  		}
! 		if (m_Hue != NULL)
! 		{
! 			if (m_Hue->GetResult(&mask, &min, &max) > 0)
! 			{
! 				m_Hue->SetRange(mask);
! 			}
! 			else
! 			{
! 				m_Hue->SetRange(0);
! 			}
! 			free(mask);
! 			nb3 = m_Hue->GetRange(NULL, &min, &max);
! 		}
! 		else
! 		{
! 			nb3 = 1;
! 		}
          if ((nb1 == 1) && (nb2 == 1) && (nb3 == 1))
          {

Index: OSD.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/OSD.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** OSD.cpp	26 Apr 2003 19:39:10 -0000	1.83
--- OSD.cpp	26 May 2003 22:04:17 -0000	1.84
***************
*** 59,62 ****
--- 59,65 ----
  //
  // $Log$
+ // Revision 1.84  2003/05/26 22:04:17  laurentg
+ // Update of the OSD displayed when doing calibration
+ //
  // Revision 1.83  2003/04/26 19:39:10  laurentg
  // New character string settings
***************
*** 1871,1890 ****
                  OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (2, dfMargin, Size));
              }
!             pSetting = pSource->GetSaturationU();
              if(pSetting != NULL)
              {
!                 sprintf (szInfo, "Color U : %03u", pSetting->GetValue());
                  OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (1, dfMargin, Size));
              }
!             pSetting = pSource->GetSaturationV();
              if(pSetting != NULL)
              {
!                 sprintf (szInfo, "Color V : %03u", pSetting->GetValue());
                  OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (2, dfMargin, Size));
              }
!             pSetting = pSource->GetHue();
              if(pSetting != NULL)
              {
!                 sprintf (szInfo, "Hue : %+04d", pSetting->GetValue());
                  OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (3, dfMargin, Size));
              }
--- 1874,1899 ----
                  OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (2, dfMargin, Size));
              }
!             pSetting = pSource->GetHue();
              if(pSetting != NULL)
              {
!                 sprintf (szInfo, "Hue : %+04d", pSetting->GetValue());
!                 OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (3, dfMargin, Size));
!             }
!             pSetting = pSource->GetSaturation();
!             if(pSetting != NULL)
!             {
!                 sprintf (szInfo, "Color : %03u", pSetting->GetValue());
                  OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (1, dfMargin, Size));
              }
!             pSetting = pSource->GetSaturationU();
              if(pSetting != NULL)
              {
!                 sprintf (szInfo, "Color U : %03u", pSetting->GetValue());
                  OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (2, dfMargin, Size));
              }
!             pSetting = pSource->GetSaturationV();
              if(pSetting != NULL)
              {
!                 sprintf (szInfo, "Color V : %03u", pSetting->GetValue());
                  OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (3, dfMargin, Size));
              }
***************
*** 1892,1895 ****
--- 1901,1906 ----
          else
          {
+ 			nLine = 8;
+ 
              // do brightness
              pSetting = pSource->GetBrightness();
***************
*** 1912,1922 ****
                      Color = -1;
                  }
!             }
!             else
!             {
!                 strcpy(szInfo, "Not Supported on this Source");
              }
  
-             OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (8, dfMargin, Size));
  
              // do Contrast
--- 1923,1929 ----
                      Color = -1;
                  }
! 	            OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
              }
  
  
              // do Contrast
***************
*** 1940,1949 ****
                      Color = -1;
                  }
              }
!             else
              {
!                 strcpy(szInfo, "Not Supported on this Source");
              }
-             OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (9, dfMargin, Size));
  
  
--- 1947,1979 ----
                      Color = -1;
                  }
+ 	            OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
              }
! 
! 
!             // do Color
!             pSetting = pSource->GetSaturation();
!             if(pSetting != NULL)
              {
!                 sprintf (szInfo, "Color : %03u", pSetting->GetValue());
!                 if ( pCalibration->IsRunning()
!                   && ( (pCalibration->GetCurrentStep() == 12)
!                     || (pCalibration->GetCurrentStep() == 13)
!                     || (pCalibration->GetCurrentStep() == 14)
!                     || (pCalibration->GetCurrentStep() == 15)
!                     || (pCalibration->GetCurrentStep() == 16)
!                     || (pCalibration->GetCurrentStep() == 17)
!                     || (pCalibration->GetCurrentStep() == 18)
!                     || (pCalibration->GetCurrentStep() == 19)
!                     || (pCalibration->GetCurrentStep() == 22)
!                     || (pCalibration->GetCurrentStep() == 23) ) )
!                 {
!                     Color = OSD_COLOR_CURRENT;
!                 }
!                 else
!                 {
!                     Color = -1;
!                 }
! 	            OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
              }
  
  
***************
*** 1967,1976 ****
                      Color = -1;
                  }
              }
-             else
-             {
-                 strcpy(szInfo, "Not Supported on this Source");
-             }
-             OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (10, dfMargin, Size));
  
  
--- 1997,2002 ----
                      Color = -1;
                  }
+ 	            OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
              }
  
  
***************
*** 1994,2003 ****
                      Color = -1;
                  }
              }
-             else
-             {
-                 strcpy(szInfo, "Not Supported on this Source");
-             }
-             OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (11, dfMargin, Size));
  
              // do Hue
--- 2020,2025 ----
                      Color = -1;
                  }
+ 	            OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
              }
  
              // do Hue
***************
*** 2018,2027 ****
                      Color = -1;
                  }
              }
-             else
-             {
-                 strcpy(szInfo, "Not Supported on this Source");
-             }
-             OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (12, dfMargin, Size));
          }
      }
--- 2040,2045 ----
                      Color = -1;
                  }
+ 	            OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
              }
          }
      }
***************
*** 2064,2076 ****
              case 14:
              case 15:
-                 strcpy(szInfo, "Adjusting Saturation U ...");
-                 break;
              case 16:
              case 17:
              case 18:
              case 19:
!                 strcpy(szInfo, "Adjusting Saturation V ...");
                  break;
!             case 20:
              case 21:
                  strcpy(szInfo, "Adjusting Hue ...");
--- 2082,2092 ----
              case 14:
              case 15:
              case 16:
              case 17:
              case 18:
              case 19:
!                 strcpy(szInfo, "Adjusting Color ...");
                  break;
!               case 20:
              case 21:
                  strcpy(szInfo, "Adjusting Hue ...");

Update of /cvsroot/deinterlace/DScaler/DScaler
In directory sc8-pr-cvs1:/tmp/cvs-serv12507

Modified Files:
	SAA7134Common.cpp SAA7134Source.cpp 
Log Message:
Corrections for datacasting
Enable the Cancel button in the setup card dialog box

Index: SAA7134Common.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/SAA7134Common.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** SAA7134Common.cpp	10 Nov 2002 09:30:57 -0000	1.11
--- SAA7134Common.cpp	26 May 2003 20:49:03 -0000	1.12
***************
*** 26,29 ****
--- 26,33 ----
  //
  // $Log$
+ // Revision 1.12  2003/05/26 20:49:03  laurentg
+ // Corrections for datacasting
+ // Enable the Cancel button in the setup card dialog box
+ //
  // Revision 1.11  2002/11/10 09:30:57  atnak
  // Added Chroma only comb filter mode for SECAM
***************
*** 74,118 ****
      // VIDEOSTANDARD_AUTODETECT
      {
!         720, 288, 0, 20, TRUE, 0, 18, 0x0,
      },
      // VIDEOSTANDARD_PAL_BGDHI
      {
!         720, 288, 0, 19, TRUE, 0, 18, 0x0,
      },
      // VIDEOSTANDARD_PAL_N_COMBO
      {
!         720, 288, 0, 19, TRUE, 0, 18, 0x2,
      },
      // VIDEOSTANDARD_PAL_60
      {
!         720, 240, 0, 19, FALSE, 0, 18, 0x1,
      },
      // VIDEOSTANDARD_PAL_M
      {
!         720, 240, 0, 19, FALSE, 0, 18, 0x3,
      },
      // VIDEOSTANDARD_SECAM
      {
!         720, 288, 0, 20, TRUE, 0, 18, 0x5,
      },
      // VIDEOSTANDARD_NTSC_M
      {
!         720, 240, 0, 20, FALSE, 0, 18, 0x0,
      },
      // VIDEOSTANDARD_NTSC_60 (NTSC 4.43)
      {
!         720, 240, 0, 20, FALSE, 0, 18, 0x2,
      },
      // VIDEOSTANDARD_NTSC_Japan
      {
!         720, 240, 0, 20, FALSE, 0, 18, 0x4,
      },
      // VIDEOSTANDARD_NTSC_50
      {
!         720, 288, 0, 20, TRUE, 0, 18, 0x1,
      },
      // VIDEOSTANDARD_NTSC_N
      {
!         720, 288, 0, 20, TRUE, 0, 18, 0x3,
      },
  };
--- 78,122 ----
      // VIDEOSTANDARD_AUTODETECT
      {
!         720, 288, 0, 20, TRUE, 1, 19, 0x0,
      },
      // VIDEOSTANDARD_PAL_BGDHI
      {
!         720, 288, 0, 19, TRUE, 1, 19, 0x0,
      },
      // VIDEOSTANDARD_PAL_N_COMBO
      {
!         720, 288, 0, 19, TRUE, 1, 19, 0x2,
      },
      // VIDEOSTANDARD_PAL_60
      {
!         720, 240, 0, 19, FALSE, 1, 19, 0x1,
      },
      // VIDEOSTANDARD_PAL_M
      {
!         720, 240, 0, 19, FALSE, 1, 19, 0x3,
      },
      // VIDEOSTANDARD_SECAM
      {
!         720, 288, 0, 20, TRUE, 1, 19, 0x5,
      },
      // VIDEOSTANDARD_NTSC_M
      {
!         720, 240, 0, 20, FALSE, 1, 19, 0x0,
      },
      // VIDEOSTANDARD_NTSC_60 (NTSC 4.43)
      {
!         720, 240, 0, 20, FALSE, 1, 19, 0x2,
      },
      // VIDEOSTANDARD_NTSC_Japan
      {
!         720, 240, 0, 20, FALSE, 1, 19, 0x4,
      },
      // VIDEOSTANDARD_NTSC_50
      {
!         720, 288, 0, 20, TRUE, 1, 19, 0x1,
      },
      // VIDEOSTANDARD_NTSC_N
      {
!         720, 288, 0, 20, TRUE, 1, 19, 0x3,
      },
  };

Index: SAA7134Source.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/SAA7134Source.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** SAA7134Source.cpp	17 Apr 2003 09:48:36 -0000	1.77
--- SAA7134Source.cpp	26 May 2003 20:49:04 -0000	1.78
***************
*** 31,34 ****
--- 31,38 ----
  //
  // $Log$
+ // Revision 1.78  2003/05/26 20:49:04  laurentg
+ // Corrections for datacasting
+ // Enable the Cancel button in the setup card dialog box
+ //
  // Revision 1.77  2003/04/17 09:48:36  atnak
  // Changed the default for White Peak to be off.
***************
*** 322,326 ****
      m_ProcessingFieldID(-1),
      m_hSAA7134ResourceInst(NULL),
!     m_DetectedAudioChannel((eAudioChannel)-1)
  {
      CreateSettings(IniSection);
--- 326,331 ----
      m_ProcessingFieldID(-1),
      m_hSAA7134ResourceInst(NULL),
!     m_DetectedAudioChannel((eAudioChannel)-1),
!     m_bSelectCardCancelButton(TRUE)
  {
      CreateSettings(IniSection);
***************
*** 1216,1220 ****
      for (nLineTarget = 0; nLineTarget < m_CurrentVBILines; nLineTarget++)
      {
!         VBI_DecodeLine(pVBI + nLineTarget * 2048, nLineTarget, bIsFieldOdd);
      }
  }
--- 1221,1225 ----
      for (nLineTarget = 0; nLineTarget < m_CurrentVBILines; nLineTarget++)
      {
!         VBI_DecodeLine(pVBI + nLineTarget * 2048, nLineTarget - 2, bIsFieldOdd);
      }
  }

Update of /cvsroot/deinterlace/DScaler/Plugins/DI_TomsMoComp
In directory sc8-pr-cvs1:/tmp/cvs-serv25483

Modified Files:
	SearchLoopBottom.inc 
Log Message:
Fixed bug with pBobP

Index: SearchLoopBottom.inc
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/Plugins/DI_TomsMoComp/SearchLoopBottom.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** SearchLoopBottom.inc	15 Dec 2002 16:51:14 -0000	1.5
--- SearchLoopBottom.inc	26 May 2003 15:54:00 -0000	1.6
***************
*** 83,86 ****
--- 83,87 ----
          pDest += dst_pitch2;
          pBob += src_pitch2;
+         pBobP += src_pitch2;
      }

Update of /cvsroot/deinterlace/DScaler/Plugins/DI_MoComp2
In directory sc8-pr-cvs1:/tmp/cvs-serv25659

Modified Files:
	MoComp2.h SearchLoopBottom.inc SimpleWeave.inc StrangeBob.inc 
Log Message:
Improved Performance of motion detection
Fixed bug with pBobP

Index: MoComp2.h
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/Plugins/DI_MoComp2/MoComp2.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MoComp2.h	11 Feb 2003 15:40:50 -0000	1.2
--- MoComp2.h	26 May 2003 15:54:36 -0000	1.3
***************
*** 26,29 ****
--- 26,33 ----
  //
  // $Log$
+ // Revision 1.3  2003/05/26 15:54:36  adcockj
+ // Improved Performance of motion detection
+ // Fixed bug with pBobP
+ //
  // Revision 1.2  2003/02/11 15:40:50  adcockj
  // New implementation of StrangeBob based off paper
***************
*** 56,60 ****
  static __int64 Save2; 
  
! static __int64 MOVE  = 0x0806080608060806; 
  
  static const __int64 YMask = 0x00ff00ff00ff00ff; // keeps only luma
--- 60,64 ----
  static __int64 Save2; 
  
! static __int64 MOVE  = 0x0f0f0f0f0f0f0f0f; 
  
  static const __int64 YMask = 0x00ff00ff00ff00ff; // keeps only luma

Index: SearchLoopBottom.inc
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/Plugins/DI_MoComp2/SearchLoopBottom.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SearchLoopBottom.inc	11 Feb 2003 15:40:54 -0000	1.2
--- SearchLoopBottom.inc	26 May 2003 15:54:36 -0000	1.3
***************
*** 1,3 ****
! /////////////////////////////////////////////////////////////////////////////
  // $Id$
  /////////////////////////////////////////////////////////////////////////////
--- 1,3 ----
!     /////////////////////////////////////////////////////////////////////////////
  // $Id$
  /////////////////////////////////////////////////////////////////////////////
***************
*** 26,29 ****
--- 26,33 ----
  //
  // $Log$
+ // Revision 1.3  2003/05/26 15:54:36  adcockj
+ // Improved Performance of motion detection
+ // Fixed bug with pBobP
+ //
  // Revision 1.2  2003/02/11 15:40:54  adcockj
  // New implementation of StrangeBob based off paper
***************
*** 42,46 ****
      // mm3 = "movement" in the centre
      // mm6 = Bob pixels          
!     // Save1 = Real Weave 
  
      movq	mm2, qword ptr[ebx]
--- 46,52 ----
      // mm3 = "movement" in the centre
      // mm6 = Bob pixels          
! 
!     // operate only on luma as we will always bob the chroma
!     pand    mm3, YMask
  
      movq	mm2, qword ptr[ebx]
***************
*** 48,51 ****
--- 54,58 ----
  
      PABS(mm2, mm4, mm5)
+     pand    mm2, YMask
  
      movq	mm4, qword ptr[ebx + ecx]
***************
*** 53,56 ****
--- 60,64 ----
  
      PABS(mm4, mm7, mm5)
+     pand    mm4, YMask
      
      // mm0 = 0
***************
*** 62,94 ****
  
      psubusb mm2, MOVE           // non-zero where mm2 > TENS i.e. Movement
!     movq    mm7, mm2
!     pand    mm7, UVMask
!     pand    mm2, YMask
!     pcmpeqw mm2, mm0            // FFFF where the luma has no movement
!     pcmpeqd mm7, mm0            // FFFFFFFF where the Chroma has no movement
!     pand    mm2, mm7            // FF where there is no luma or chroma movement
!     pcmpeqb mm2, mm0            // all ff where movement by byte
  
      psubusb mm3, MOVE           // non-zero where mm3 > TENS i.e. Movement
!     movq    mm7, mm3
!     pand    mm7, UVMask
!     pand    mm3, YMask
!     pcmpeqw mm3, mm0            // FFFF where the luma has no movement 
!     pcmpeqd mm7, mm0            // FFFFFFFF where the Chroma has no movement
!     pand    mm3, mm7            // FF where there is no luma or chroma movement
!     pcmpeqb mm3, mm0            // all ff where movement by byte
  
      psubusb mm4, MOVE           // non-zero where mm4 > TENS i.e. Movement
!     movq    mm7, mm4
!     pand    mm7, UVMask
!     pand    mm4, YMask
!     pcmpeqw mm4, mm0            // FFFF where the luma has no movement
!     pcmpeqd mm7, mm0            // FFFFFFFF where the Chroma has no movement
!     pand    mm4, mm7            // FF where there is no luma or chroma movement
!     pcmpeqb mm4, mm0            // all ff where movement by byte
  
      pand  mm2, mm4              // top and bottom moving
      por  mm3, mm2               // where we should bob
  
  
      COMBINE(mm6, mm1, mm3)
--- 70,88 ----
  
      psubusb mm2, MOVE           // non-zero where mm2 > TENS i.e. Movement
!     pcmpeqd mm2, mm0            // FFFF where the luma has no movement
!     pcmpeqd mm2, mm0            // all ff where movement by byte
  
      psubusb mm3, MOVE           // non-zero where mm3 > TENS i.e. Movement
!     pcmpeqd mm3, mm0            // FFFF where the luma has no movement 
!     pcmpeqd mm3, mm0            // all ff where movement by byte
  
      psubusb mm4, MOVE           // non-zero where mm4 > TENS i.e. Movement
!     pcmpeqd mm4, mm0            // FFFF where the luma has no movement
!     pcmpeqd mm4, mm0            // all ff where movement by byte
  
      pand  mm2, mm4              // top and bottom moving
      por  mm3, mm2               // where we should bob
  
+     por mm3, UVMask
  
      COMBINE(mm6, mm1, mm3)
***************
*** 109,111 ****
--- 103,106 ----
      pDest += dst_pitch2;
      pBob += src_pitch2;
+     pBobP += src_pitch2;
  }

Index: SimpleWeave.inc
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/Plugins/DI_MoComp2/SimpleWeave.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SimpleWeave.inc	11 Feb 2003 15:41:04 -0000	1.1
--- SimpleWeave.inc	26 May 2003 15:54:36 -0000	1.2
***************
*** 26,29 ****
--- 26,33 ----
  //
  // $Log$
+ // Revision 1.2  2003/05/26 15:54:36  adcockj
+ // Improved Performance of motion detection
+ // Fixed bug with pBobP
+ //
  // Revision 1.1  2003/02/11 15:41:04  adcockj
  // New implementation of StrangeBob based off paper
***************
*** 48,52 ****
      movq mm2, qword ptr[esi+ecx]
      movq mm3, mm1			/* another copy of our pixel1 value */ 
!     movq mm4, mm2			/* another copy of our pixel1 value */ 
  
      PABS(mm3, mm4, mm5)
--- 52,56 ----
      movq mm2, qword ptr[esi+ecx]
      movq mm3, mm1			/* another copy of our pixel1 value */ 
!     movq mm4, mm2			/* another copy of our pixel2 value */ 
  
      PABS(mm3, mm4, mm5)

Index: StrangeBob.inc
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/Plugins/DI_MoComp2/StrangeBob.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StrangeBob.inc	11 Feb 2003 15:41:05 -0000	1.2
--- StrangeBob.inc	26 May 2003 15:54:36 -0000	1.3
***************
*** 26,29 ****
--- 26,33 ----
  //
  // $Log$
+ // Revision 1.3  2003/05/26 15:54:36  adcockj
+ // Improved Performance of motion detection
+ // Fixed bug with pBobP
+ //
  // Revision 1.2  2003/02/11 15:41:05  adcockj
  // New implementation of StrangeBob based off paper
***************
*** 127,129 ****
      por mm6, mm5
  }
- 
--- 131,132 ----

Update of /cvsroot/deinterlace/DScaler5/DScalerFilter
In directory sc8-pr-cvs1:/tmp/cvs-serv21996/DScalerFilter

Modified Files:
	DScalerFilter.dsw 
Log Message:
Minor Fixes to Major bugs


Index: DScalerFilter.dsw
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DScalerFilter/DScalerFilter.dsw,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** DScalerFilter.dsw	21 May 2003 13:41:12 -0000	1.5
--- DScalerFilter.dsw	22 May 2003 06:43:48 -0000	1.6
***************
*** 42,45 ****
--- 42,48 ----
      Project_Dep_Name Deint_Weave
      End Project Dependency
+     Begin Project Dependency
+     Project_Dep_Name Video_Gamma
+     End Project Dependency
  }}}
  
***************
*** 108,111 ****
--- 111,132 ----
  Package=<4>
  {{{
+ }}}
+ 
+ ###############################################################################
+ 
+ Project: "Video_Gamma"=..\DMO\Video\Video_Gamma\Video_Gamma.dsp - Package Owner=<4>
+ 
+ Package=<5>
+ {{{
+ }}}
+ 
+ Package=<4>
+ {{{
+     Begin Project Dependency
+     Project_Dep_Name DMO_Lib
+     End Project Dependency
+     Begin Project Dependency
+     Project_Dep_Name GenDMOProp
+     End Project Dependency
  }}}

Update of /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv21996/DMO/DMO_Lib

Modified Files:
	CInPlaceDMO.cpp CInPlaceDMO.h DMO_Lib.cpp 
Log Message:
Minor Fixes to Major bugs


Index: CInPlaceDMO.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CInPlaceDMO.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CInPlaceDMO.cpp	21 May 2003 17:05:59 -0000	1.2
--- CInPlaceDMO.cpp	22 May 2003 06:43:48 -0000	1.3
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.3  2003/05/22 06:43:48  adcockj
+ // Minor Fixes to Major bugs
+ //
  // Revision 1.2  2003/05/21 17:05:59  adcockj
  // Added new filter
***************
*** 37,41 ****
  CSimpleInPlaceVideoDMO::CSimpleInPlaceVideoDMO(eVideoFilterPosition Position) :
      m_Position(Position),
!     m_bValidTime(FALSE)
  {
  }
--- 40,45 ----
  CSimpleInPlaceVideoDMO::CSimpleInPlaceVideoDMO(eVideoFilterPosition Position) :
      m_Position(Position),
!     m_bValidTime(FALSE),
!     m_bSync(FALSE)
  {
  }
***************
*** 485,488 ****
--- 489,493 ----
          m_bValidTime = false;
      }
+     m_bSync = ((dwFlags & DMO_INPUT_DATA_BUFFERF_SYNCPOINT) == DMO_INPUT_DATA_BUFFERF_SYNCPOINT);
      return hr;
  }
***************
*** 588,600 ****
      {
          DoProcess(&pOutputBuffers[0]);
!     }
!     else
!     {
!         // only discard data if we're asked to
!         if(dwFlags & DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER)
          {
!             m_Buffer.Release();
          }
      }
      return hr;
  }
--- 593,609 ----
      {
          DoProcess(&pOutputBuffers[0]);
!         if(m_bValidTime)
          {
!             pOutputBuffers[0].dwStatus |= DMO_OUTPUT_DATA_BUFFERF_TIME;
!             pOutputBuffers[0].dwStatus |= DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH;
!             pOutputBuffers[0].rtTimestamp = m_StartTime;
!             pOutputBuffers[0].rtTimelength = m_Length;
!         }
!         if(m_bSync)
!         {
!             pOutputBuffers[0].dwStatus |= DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT;
          }
      }
+     m_Buffer.Release();
      return hr;
  }
***************
*** 998,1017 ****
--- 1007,1031 ----
  void CSimpleInPlaceVideoDMO::DoProcessOnLineYUY2(const BYTE* pInput, BYTE* pOutput, int Bytes)
  {
+     memcpy(pOutput, pInput, Bytes);
  }
  
  void CSimpleInPlaceVideoDMO::DoProcessOnLumaLine(const BYTE* pInput, BYTE* pOutput, int Bytes)
  {
+     memcpy(pOutput, pInput, Bytes);
  }
  
  void CSimpleInPlaceVideoDMO::DoProcessOnUVLine(const BYTE* pInput, BYTE* pOutput, int Bytes)
  {
+     memcpy(pOutput, pInput, Bytes);
  }
  
  void CSimpleInPlaceVideoDMO::DoProcessOnULine(const BYTE* pInput, BYTE* pOutput, int Bytes)
  {
+     memcpy(pOutput, pInput, Bytes);
  }
  
  void CSimpleInPlaceVideoDMO::DoProcessOnVLine(const BYTE* pInput, BYTE* pOutput, int Bytes)
  {
+     memcpy(pOutput, pInput, Bytes);
  }
  
***************
*** 1076,1099 ****
  void CSimpleInPlaceVideoDMO::DoInPlaceProcessOnLineYUY2(BYTE* pData, int Bytes)
  {
-     DoProcessOnLineYUY2(pData, pData, Bytes);
  }
  
  void CSimpleInPlaceVideoDMO::DoInPlaceProcessOnLumaLine(BYTE* pData, int Bytes)
  {
-     DoProcessOnLumaLine(pData, pData, Bytes);
  }
  
  void CSimpleInPlaceVideoDMO::DoInPlaceProcessOnUVLine(BYTE* pData, int Bytes)
  {
-     DoProcessOnUVLine(pData, pData, Bytes);
  }
  
  void CSimpleInPlaceVideoDMO::DoInPlaceProcessOnULine(BYTE* pData, int Bytes)
  {
-     DoProcessOnULine(pData, pData, Bytes);
  }
  
  void CSimpleInPlaceVideoDMO::DoInPlaceProcessOnVLine(BYTE* pData, int Bytes)
  {
-     CSimpleInPlaceVideoDMO::DoProcessOnVLine(pData, pData, Bytes);
  }
--- 1090,1108 ----

Index: CInPlaceDMO.h
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CInPlaceDMO.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CInPlaceDMO.h	21 May 2003 17:05:59 -0000	1.2
--- CInPlaceDMO.h	22 May 2003 06:43:48 -0000	1.3
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.3  2003/05/22 06:43:48  adcockj
+ // Minor Fixes to Major bugs
+ //
  // Revision 1.2  2003/05/21 17:05:59  adcockj
  // Added new filter
***************
*** 94,194 ****
      eVideoFilterPosition m_Position;
      BOOL m_bValidTime;
      REFERENCE_TIME m_StartTime;
      REFERENCE_TIME m_Length;
  };
- 
- template<class T> void Clone( T* ObjToBeCloned, IMediaObjectInPlace **ppMediaObject)
- {
- 	// Check the input pointer
- 	if (!ppMediaObject)
- 	{
- 		return E_POINTER;
- 	}
- 
-     // This will be cleaned up when client releases the newly created object
-     // or if there's some error along the way
- 	T * pNewInPlace = new CComObject<T>;
- 	if( !pNewInPlace )
- 	{
- 		return E_OUTOFMEMORY;
- 	}
- 
- 	HRESULT hr = S_OK;
- 
- 	hr = pNewInPlace->UpdateStatesInternal();
- 
- 	IMediaObject* pCloned = NULL;
- 	if(SUCCEEDED(hr))
- 	{
- 		IUnknown *pUnk;
- 		hr = pNewInPlace->QueryInterface( IID_IUnknown, (void **) &pUnk );
- 		if( SUCCEEDED( hr ) )
- 		{
- 			hr = pUnk->QueryInterface( IID_IMediaObject, (void **) &pCloned );
- 			pUnk->Release();
- 		}
- 	}
- 
- 	// Copy parameter control information
-     // \todo make sure this function also copies the values
- 	if (SUCCEEDED(hr))
- 	{
- 		hr = pNewInPlace->CopyParamsFromSource((CParamsManager *)ObjToBeCloned);
- 	}
- 
- 
- 	// Copy the input and output types
- 	if (SUCCEEDED(hr))
- 	{
- 		DMO_MEDIA_TYPE mt;
- 		DWORD cInputStreams = 0;
- 		DWORD cOutputStreams = 0;
- 		ObjToBeCloned->GetStreamCount(&cInputStreams, &cOutputStreams);
- 
- 		for (DWORD i = 0; i < ObjToBeCloned->cInputStreams && SUCCEEDED(hr); ++i)
- 		{
- 			hr = ObjToBeCloned->GetInputCurrentType(i, &mt);
- 			if (hr == DMO_E_TYPE_NOT_SET)
- 			{
- 				hr = S_OK; // great, don't need to set the cloned DMO
- 			}
- 			else if (SUCCEEDED(hr))
- 			{
- 				hr = pCloned->SetInputType(i, &mt, 0);
- 				MoFreeMediaType( &mt );
- 			}
- 		}
- 
- 		for (i = 0; i < ObjToBeCloned->cOutputStreams && SUCCEEDED(hr); ++i)
- 		{
- 			hr = ObjToBeCloned->GetOutputCurrentType(i, &mt);
- 			if (hr == DMO_E_TYPE_NOT_SET)
- 			{
- 				hr = S_OK; // great, don't need to set the cloned DMO
- 			}
- 			else if (SUCCEEDED(hr))
- 			{
- 				hr = pCloned->SetOutputType(i, &mt, 0);
- 				MoFreeMediaType( &mt );
- 			}
- 		}
- 
- 		if (SUCCEEDED(hr))
- 		{
- 			hr = pCloned->QueryInterface(IID_IMediaObjectInPlace, (void**)ppMediaObject);
- 		}
- 
- 		// Release the object's original ref.  If clone succeeded (made it through QI) then returned pointer
- 		// has one ref.  If we failed, refs drop to zero, freeing the object.
- 		pCloned->Release();
- 	}
- 
-     // Something went wrong, clean up for client
-     if (FAILED(hr))
-     {
-         delete pNewInPlace;
-     }
- 
- 	return hr;
- }
  
--- 97,103 ----
      eVideoFilterPosition m_Position;
      BOOL m_bValidTime;
+     BOOL m_bSync;
      REFERENCE_TIME m_StartTime;
      REFERENCE_TIME m_Length;
  };
  

Index: DMO_Lib.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/DMO_Lib.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DMO_Lib.cpp	16 May 2003 16:19:12 -0000	1.1
--- DMO_Lib.cpp	22 May 2003 06:43:48 -0000	1.2
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.2  2003/05/22 06:43:48  adcockj
+ // Minor Fixes to Major bugs
+ //
  // Revision 1.1  2003/05/16 16:19:12  adcockj
  // Added new files into DMO framework
***************
*** 58,65 ****
  STDAPI DMODllRegisterVideoDMO(LPCWSTR Name, const CLSID& Clsid)
  {
! 	// Register ourself as a PCM audio effect DMO
! 	DMO_PARTIAL_MEDIATYPE mt;
! 	mt.type    = MEDIATYPE_Video;
! 	mt.subtype = MEDIASUBTYPE_YUY2;
  
  	HRESULT hr = DMORegister(Name,
--- 61,72 ----
  STDAPI DMODllRegisterVideoDMO(LPCWSTR Name, const CLSID& Clsid)
  {
! 	// Register ourself as a Video effect DMO
! 	DMO_PARTIAL_MEDIATYPE mt[3];
! 	mt[0].type    = MEDIATYPE_Video;
! 	mt[0].subtype = MEDIASUBTYPE_YUY2;
! 	mt[1].type    = MEDIATYPE_Video;
! 	mt[1].subtype = MEDIASUBTYPE_YV12;
! 	mt[2].type    = MEDIATYPE_Video;
! 	mt[2].subtype = MEDIASUBTYPE_NV12;
  
  	HRESULT hr = DMORegister(Name,
***************
*** 67,74 ****
  							 DMOCATEGORY_VIDEO_EFFECT,
  							 0,
! 							 1,
! 							 &mt,
! 							 1,
! 							 &mt);
  
  	return _Module.RegisterServer();
--- 74,81 ----
  							 DMOCATEGORY_VIDEO_EFFECT,
  							 0,
! 							 3,
! 							 &mt[0],
! 							 3,
! 							 &mt[0]);
  
  	return _Module.RegisterServer();

Update of /cvsroot/deinterlace/DScaler5/DMO/Video/Video_Gamma
In directory sc8-pr-cvs1:/tmp/cvs-serv16366/Video/Video_Gamma

Added Files:
	.cvsignore StdAfx.CPP StdAfx.h Video_Gamma.cpp Video_Gamma.def 
	Video_Gamma.dsp Video_Gamma.h Video_Gamma.rc resource.h 
Log Message:
Added new filter


--- NEW FILE ---
Debug
Release
Video_Gamma.ncb
Video_Gamma.plg
Video_Gamma.aps
Video_Gamma.opt

***** Error reading new file: [Errno 2] No such file or directory: 'StdAfx.CPP'
***** Error reading new file: [Errno 2] No such file or directory: 'StdAfx.h'
***** Error reading new file: [Errno 2] No such file or directory: 'Video_Gamma.cpp'
--- NEW FILE ---
EXPORTS
    DllCanUnloadNow     PRIVATE
    DllGetClassObject   PRIVATE
    DllRegisterServer   PRIVATE
    DllUnregisterServer PRIVATE

--- NEW FILE ---
# Microsoft Developer Studio Project File - Name="Video_Gamma" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **

# TARGTYPE "Win32 (x86) Application" 0x0101

CFG=Video_Gamma - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE 
!MESSAGE NMAKE /f "Video_Gamma.mak".
!MESSAGE 
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE 
!MESSAGE NMAKE /f "Video_Gamma.mak" CFG="Video_Gamma - Win32 Debug"
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
!MESSAGE "Video_Gamma - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "Video_Gamma - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE 

# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe

!IF  "$(CFG)" == "Video_Gamma - Win32 Release"

# PROP BASE Use_MFC 2
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 2
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL"
# ADD RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dmoguids.lib msdmo.lib strmiids.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Release/Video_Gamma.dll"
# Begin Custom Build - Performing Registration
OutDir=.\Release
TargetPath=\Source\deinterlace\DScaler5\Release\Video_Gamma.dll
InputPath=\Source\deinterlace\DScaler5\Release\Video_Gamma.dll
SOURCE="$(InputPath)"

"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
	regsvr32 /s /c "$(TargetPath)" 
	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
	
# End Custom Build

!ELSEIF  "$(CFG)" == "Video_Gamma - Win32 Debug"

# PROP BASE Use_MFC 2
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 2
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL"
# ADD RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dmoguids.lib msdmo.lib strmiids.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\Debug/Video_Gamma.dll" /pdbtype:sept
# Begin Custom Build - Performing Registration
OutDir=.\Debug
TargetPath=\Source\deinterlace\DScaler5\Debug\Video_Gamma.dll
InputPath=\Source\deinterlace\DScaler5\Debug\Video_Gamma.dll
SOURCE="$(InputPath)"

"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
	regsvr32 /s /c "$(TargetPath)" 
	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
	
# End Custom Build

!ENDIF 

# Begin Target

# Name "Video_Gamma - Win32 Release"
# Name "Video_Gamma - Win32 Debug"
# Begin Group "Source Files"

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File

SOURCE=.\Video_Gamma.cpp
# End Source File
# Begin Source File

SOURCE=.\Video_Gamma.def
# End Source File
# Begin Source File

SOURCE=.\Video_Gamma.rc
# End Source File
# Begin Source File

SOURCE=.\StdAfx.CPP
# ADD CPP /Yc"stdafx.h"
# End Source File
# End Group
# Begin Group "Header Files"

# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File

SOURCE=.\Video_Gamma.h
# End Source File
# Begin Source File

SOURCE=.\StdAfx.h
# End Source File
# End Group
# Begin Group "Resource Files"

# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

***** Error reading new file: [Errno 2] No such file or directory: 'Video_Gamma.h'
--- NEW FILE ---
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// English (U.K.) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
#pragma code_page(1252)
#endif //_WIN32

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE DISCARDABLE 
BEGIN
    "resource.h\0"
END

2 TEXTINCLUDE DISCARDABLE 
BEGIN
    "#include ""afxres.h""\r\n"
    "\0"
END

3 TEXTINCLUDE DISCARDABLE 
BEGIN
    "\r\n"
    "\0"
END

#endif    // APSTUDIO_INVOKED


#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
 FILEVERSION 1,0,0,1
 PRODUCTVERSION 1,0,0,1
 FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
 FILEFLAGS 0x1L
#else
 FILEFLAGS 0x0L
#endif
 FILEOS 0x40004L
 FILETYPE 0x1L
 FILESUBTYPE 0x0L
BEGIN
    BLOCK "StringFileInfo"
    BEGIN
        BLOCK "080904b0"
        BEGIN
            VALUE "Comments", "\0"
            VALUE "CompanyName", "DScaler Team\0"
            VALUE "FileDescription", "Video_Gamma\0"
            VALUE "FileVersion", "1, 0, 0, 1\0"
            VALUE "InternalName", "Video_Gamma\0"
            VALUE "LegalCopyright", "Copyright © 2003\0"
            VALUE "LegalTrademarks", "\0"
            VALUE "OriginalFilename", "Video_Gamma.dll\0"
            VALUE "PrivateBuild", "\0"
            VALUE "ProductName", "Video_Gamma\0"
            VALUE "ProductVersion", "1, 0, 0, 1\0"
            VALUE "SpecialBuild", "\0"
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
        VALUE "Translation", 0x809, 1200
    END
END

#endif    // !_MAC


/////////////////////////////////////////////////////////////////////////////
//
// String Table
//

STRINGTABLE DISCARDABLE 
BEGIN
    IDS_DESCRIPTION         "A Gamma adjustment video DMO"
    IDS_AUTHORS             "John Adcock"
    IDS_NAME                "Gamma"
END

#endif    // English (U.K.) resources
/////////////////////////////////////////////////////////////////////////////



#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//


/////////////////////////////////////////////////////////////////////////////
#endif    // not APSTUDIO_INVOKED


--- NEW FILE ---
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by Video_Gamma.rc
//
#define IDS_DESCRIPTION                 1
#define IDS_AUTHORS                     2
#define IDS_NAME                        3

// Next default values for new objects
// 
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE        101
#define _APS_NEXT_COMMAND_VALUE         40001
#define _APS_NEXT_CONTROL_VALUE         1000
#define _APS_NEXT_SYMED_VALUE           101
#endif
#endif

Update of /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv16366/DMO_Lib

Modified Files:
	CDeintDMO.cpp CInPlaceDMO.cpp CInPlaceDMO.h CVideoDMO.cpp 
	CVideoDMO.h 
Log Message:
Added new filter


Index: CDeintDMO.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CDeintDMO.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** CDeintDMO.cpp	21 May 2003 13:41:11 -0000	1.5
--- CDeintDMO.cpp	21 May 2003 17:05:57 -0000	1.6
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.6  2003/05/21 17:05:57  adcockj
+ // Added new filter
+ //
  // Revision 1.5  2003/05/21 13:41:11  adcockj
  // Added new deinterlace methods
***************
*** 660,669 ****
      if(FAILED(hr)) return;
  
!     hr = pOutputBuffer[0].pBuffer->GetBufferAndLength(&pOutputData, &OutputLength);
      if(FAILED(hr)) return;
  
      if(OutputLength < OutputInfo->bmiHeader.biSizeImage)
      {
!         hr = pOutputBuffer[0].pBuffer->SetLength(OutputInfo->bmiHeader.biSizeImage);
          if(FAILED(hr)) return;
      }
--- 663,672 ----
      if(FAILED(hr)) return;
  
!     hr = pOutputBuffer->pBuffer->GetBufferAndLength(&pOutputData, &OutputLength);
      if(FAILED(hr)) return;
  
      if(OutputLength < OutputInfo->bmiHeader.biSizeImage)
      {
!         hr = pOutputBuffer->pBuffer->SetLength(OutputInfo->bmiHeader.biSizeImage);
          if(FAILED(hr)) return;
      }

Index: CInPlaceDMO.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CInPlaceDMO.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CInPlaceDMO.cpp	16 May 2003 16:19:12 -0000	1.1
--- CInPlaceDMO.cpp	21 May 2003 17:05:59 -0000	1.2
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.2  2003/05/21 17:05:59  adcockj
+ // Added new filter
+ //
  // Revision 1.1  2003/05/16 16:19:12  adcockj
  // Added new files into DMO framework
***************
*** 32,153 ****
[...1168 lines suppressed...]
+ 
+ void CSimpleInPlaceVideoDMO::DoInPlaceProcessOnLumaLine(BYTE* pData, int Bytes)
+ {
+     DoProcessOnLumaLine(pData, pData, Bytes);
+ }
+ 
+ void CSimpleInPlaceVideoDMO::DoInPlaceProcessOnUVLine(BYTE* pData, int Bytes)
+ {
+     DoProcessOnUVLine(pData, pData, Bytes);
+ }
+ 
+ void CSimpleInPlaceVideoDMO::DoInPlaceProcessOnULine(BYTE* pData, int Bytes)
+ {
+     DoProcessOnULine(pData, pData, Bytes);
+ }
+ 
+ void CSimpleInPlaceVideoDMO::DoInPlaceProcessOnVLine(BYTE* pData, int Bytes)
+ {
+     CSimpleInPlaceVideoDMO::DoProcessOnVLine(pData, pData, Bytes);
+ }

Index: CInPlaceDMO.h
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CInPlaceDMO.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CInPlaceDMO.h	16 May 2003 16:19:12 -0000	1.1
--- CInPlaceDMO.h	21 May 2003 17:05:59 -0000	1.2
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.2  2003/05/21 17:05:59  adcockj
+ // Added new filter
+ //
  // Revision 1.1  2003/05/16 16:19:12  adcockj
  // Added new files into DMO framework
***************
*** 33,49 ****
  /////////////////////////////////////////////////////////////////////////////
  // CInPlaceDMO
! class ATL_NO_VTABLE CInPlaceDMO : 
      public CDMO,
! 	public IMediaObjectInPlace
  {
- friend class IMediaObjectImpl<CInPlaceDMO,1,1>;
- friend class LockIt;
- 
  public:
!     CInPlaceDMO();	// Constructor
! 	~CInPlaceDMO();	// Destructor
  
! BEGIN_COM_MAP(CInPlaceDMO)
  	COM_INTERFACE_ENTRY(IMediaObjectInPlace)
      COM_INTERFACE_ENTRY_CHAIN(CDMO)
  END_COM_MAP()
--- 36,51 ----
  /////////////////////////////////////////////////////////////////////////////
  // CInPlaceDMO
! class ATL_NO_VTABLE CSimpleInPlaceVideoDMO : 
      public CDMO,
! 	public IMediaObjectInPlace,
!     IDScalerVideoFilterPlugin
  {
  public:
!     CSimpleInPlaceVideoDMO(eVideoFilterPosition Position);
! 	virtual ~CSimpleInPlaceVideoDMO();
  
! BEGIN_COM_MAP(CSimpleInPlaceVideoDMO)
  	COM_INTERFACE_ENTRY(IMediaObjectInPlace)
+     COM_INTERFACE_ENTRY(IDScalerVideoFilterPlugin)
      COM_INTERFACE_ENTRY_CHAIN(CDMO)
  END_COM_MAP()
***************
*** 51,59 ****
  public:
  	// IMediaObjectInPlace Methods
! 	STDMETHODIMP STDMETHODCALLTYPE Process(ULONG ulSize, BYTE *pData, REFERENCE_TIME refTimeStart,DWORD dwFlags);
  
-     
  protected:
!     virtual HRESULT DoProcess(BYTE *pbData) = 0;
  };
  
--- 53,99 ----
  public:
  	// IMediaObjectInPlace Methods
! 	STDMETHOD(Process)(ULONG ulSize, BYTE *pData, REFERENCE_TIME refTimeStart,DWORD dwFlags);
! 	STDMETHOD(Clone)(IMediaObjectInPlace **ppMediaObject);
! 	STDMETHOD(GetLatency)(REFERENCE_TIME *pLatencyTime);
! 
! 	//IMediaObjectImpl Methods   
! 	STDMETHOD(InternalProcessInput)(DWORD dwInputStreamIndex, IMediaBuffer *pBuffer, DWORD dwFlags, REFERENCE_TIME rtTimestamp, REFERENCE_TIME rtTimelength);
! 	STDMETHOD(InternalProcessOutput)(DWORD dwFlags, DWORD cOutputBufferCount, DMO_OUTPUT_DATA_BUFFER *pOutputBuffers, DWORD *pdwStatus);
!     HRESULT InternalGetInputType(DWORD dwInputStreamIndex, DWORD dwTypeIndex, DMO_MEDIA_TYPE *pmt);
! 	HRESULT InternalGetOutputType(DWORD dwOutputStreamIndex, DWORD dwTypeIndex, DMO_MEDIA_TYPE *pmt);
!     HRESULT InternalCheckInputType(DWORD dwInputStreamIndex, const DMO_MEDIA_TYPE *pmt);
!     HRESULT InternalCheckOutputType(DWORD dwInputStreamIndex, const DMO_MEDIA_TYPE *pmt);
! 	STDMETHOD(InternalDiscontinuity)(DWORD dwInputStreamIndex);
!     STDMETHOD(InternalFlush)(void);
! 	STDMETHOD(InternalFreeStreamingResources)(void);
!     STDMETHOD(InternalGetInputSizeInfo)(DWORD dwInputStreamIndex, DWORD *pcbSize, DWORD *pcbMaxLookahead, DWORD *pcbAlignment);
! 	STDMETHOD(InternalGetOutputSizeInfo)(DWORD dwOutputStreamIndex, DWORD *pcbSize, DWORD *pcbAlignment);
!     STDMETHOD(InternalGetInputStreamInfo)(DWORD dwInputStreamIndex, DWORD *pdwFlags);
!     STDMETHOD(InternalGetOutputStreamInfo)(DWORD dwInputStreamIndex, DWORD *pdwFlags);
! 	STDMETHOD(InternalAcceptingInput)(DWORD dwInputStreamIndex);
! 
!     // IDScalerVideoFilterPlugin
!     STDMETHOD(get_Position)(eVideoFilterPosition* pPosition);
!     STDMETHOD(get_NumFieldsDelay)(long* pFieldsDelay);
!     STDMETHOD(get_NumFieldsBuffered)(long* pFieldsBuffered);
  
  protected:
!     virtual void DoProcess(DMO_OUTPUT_DATA_BUFFER *pOutputBuffer);
!     virtual void DoProcessOnLineYUY2(const BYTE* pInput, BYTE* pOutput, int Bytes);
!     virtual void DoProcessOnLumaLine(const BYTE* pInput, BYTE* pOutput, int Bytes);
!     virtual void DoProcessOnUVLine(const BYTE* pInput, BYTE* pOutput, int Bytes);
!     virtual void DoProcessOnULine(const BYTE* pInput, BYTE* pOutput, int Bytes);
!     virtual void DoProcessOnVLine(const BYTE* pInput, BYTE* pOutput, int Bytes);
!     virtual void DoInPlaceProcessOnLineYUY2(BYTE* pData, int Bytes);
!     virtual void DoInPlaceProcessOnLumaLine(BYTE* pData, int Bytes);
!     virtual void DoInPlaceProcessOnUVLine(BYTE* pData, int Bytes);
!     virtual void DoInPlaceProcessOnULine(BYTE* pData, int Bytes);
!     virtual void DoInPlaceProcessOnVLine(BYTE* pData, int Bytes);
! protected:
!     CComPtr<IMediaBuffer> m_Buffer;
!     eVideoFilterPosition m_Position;
!     BOOL m_bValidTime;
!     REFERENCE_TIME m_StartTime;
!     REFERENCE_TIME m_Length;
  };
  

Index: CVideoDMO.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CVideoDMO.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CVideoDMO.cpp	20 May 2003 16:52:56 -0000	1.1
--- CVideoDMO.cpp	21 May 2003 17:06:00 -0000	1.2
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.2  2003/05/21 17:06:00  adcockj
+ // Added new filter
+ //
  // Revision 1.1  2003/05/20 16:52:56  adcockj
  // Added new files
***************
*** 463,464 ****
--- 466,468 ----
      --m_FieldsInBuffer;
  }
+ 

Index: CVideoDMO.h
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CVideoDMO.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CVideoDMO.h	20 May 2003 16:52:56 -0000	1.1
--- CVideoDMO.h	21 May 2003 17:06:00 -0000	1.2
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.2  2003/05/21 17:06:00  adcockj
+ // Added new filter
+ //
  // Revision 1.1  2003/05/20 16:52:56  adcockj
  // Added new files
***************
*** 57,62 ****
      STDMETHOD(InternalGetInputStreamInfo)(DWORD dwInputStreamIndex, DWORD *pdwFlags);
      STDMETHOD(InternalGetOutputStreamInfo)(DWORD dwInputStreamIndex, DWORD *pdwFlags);
- 
- 	// IMediaObjectImpl Required overides
  	STDMETHOD(InternalAcceptingInput)(DWORD dwInputStreamIndex);
  
--- 60,63 ----

Update of /cvsroot/deinterlace/DScaler5/DMO/Video/Video_Gamma
In directory sc8-pr-cvs1:/tmp/cvs-serv13041/Video_Gamma

Log Message:
Directory /cvsroot/deinterlace/DScaler5/DMO/Video/Video_Gamma added to the repository

Update of /cvsroot/deinterlace/DScaler5/GenDMOProp
In directory sc8-pr-cvs1:/tmp/cvs-serv16930/GenDMOProp

Modified Files:
	.cvsignore 
Log Message:
Added new deinterlace methods


Index: .cvsignore
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/GenDMOProp/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .cvsignore	30 Apr 2003 13:12:26 -0000	1.1
--- .cvsignore	21 May 2003 13:41:12 -0000	1.2
***************
*** 6,8 ****
--- 6,9 ----
  GenDMOProp.plg
  GenDMOProp.tlb
+ GenDMOProp.aps
  GenDMOProp_i.c

Update of /cvsroot/deinterlace/DScaler5/DScalerFilter
In directory sc8-pr-cvs1:/tmp/cvs-serv16930/DScalerFilter

Modified Files:
	DScalerFilter.dsw 
Log Message:
Added new deinterlace methods


Index: DScalerFilter.dsw
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DScalerFilter/DScalerFilter.dsw,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DScalerFilter.dsw	17 May 2003 11:29:35 -0000	1.4
--- DScalerFilter.dsw	21 May 2003 13:41:12 -0000	1.5
***************
*** 36,39 ****
--- 36,45 ----
      Project_Dep_Name DMO_Lib
      End Project Dependency
+     Begin Project Dependency
+     Project_Dep_Name Deint_Diag
+     End Project Dependency
+     Begin Project Dependency
+     Project_Dep_Name Deint_Weave
+     End Project Dependency
  }}}
  
***************
*** 41,44 ****
--- 47,86 ----
  
  Project: "Deint_Bob"=..\DMO\Deinterlace\Deint_Bob\Deint_Bob.dsp - Package Owner=<4>
+ 
+ Package=<5>
+ {{{
+ }}}
+ 
+ Package=<4>
+ {{{
+     Begin Project Dependency
+     Project_Dep_Name DMO_Lib
+     End Project Dependency
+     Begin Project Dependency
+     Project_Dep_Name GenDMOProp
+     End Project Dependency
+ }}}
+ 
+ ###############################################################################
+ 
+ Project: "Deint_Diag"=..\DMO\Deinterlace\Deint_Diag\Deint_Diag.dsp - Package Owner=<4>
+ 
+ Package=<5>
+ {{{
+ }}}
+ 
+ Package=<4>
+ {{{
+     Begin Project Dependency
+     Project_Dep_Name DMO_Lib
+     End Project Dependency
+     Begin Project Dependency
+     Project_Dep_Name GenDMOProp
+     End Project Dependency
+ }}}
+ 
+ ###############################################################################
+ 
+ Project: "Deint_Weave"=..\DMO\Deinterlace\Deint_Weave\Deint_Weave.dsp - Package Owner=<4>
  
  Package=<5>

Update of /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv16930/DMO/DMO_Lib

Modified Files:
	CDeintDMO.cpp CDeintDMO.h DMO_Lib.dsp 
Log Message:
Added new deinterlace methods


Index: CDeintDMO.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CDeintDMO.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** CDeintDMO.cpp	20 May 2003 16:50:57 -0000	1.4
--- CDeintDMO.cpp	21 May 2003 13:41:11 -0000	1.5
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.5  2003/05/21 13:41:11  adcockj
+ // Added new deinterlace methods
+ //
  // Revision 1.4  2003/05/20 16:50:57  adcockj
  // Interim checkin, preparation for DMO processing path
***************
*** 669,694 ****
      if(InputInfo->bmiHeader.biCompression == MAKEFOURCC('Y','U','Y','2'))
      {
!         if(m_IncomingFields[m_FieldsInBuffer - 1].IsTopLine == TRUE)
          {
!             for(int i(0); i < InputInfo->bmiHeader.biHeight/2; ++i)
              {
!                 memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
!                 pOutputData += OutputInfo->bmiHeader.biWidth * 2;
!                 memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
!                 pOutputData += OutputInfo->bmiHeader.biWidth * 2;
!                 pInputData += InputInfo->bmiHeader.biWidth * 4;
!             }
  
          }
          else
          {
!             pInputData += InputInfo->bmiHeader.biWidth * 2;
!             for(int i(0); i < InputInfo->bmiHeader.biHeight/2; ++i)
              {
!                 memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
!                 pOutputData += OutputInfo->bmiHeader.biWidth * 2;
!                 memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
!                 pOutputData += OutputInfo->bmiHeader.biWidth * 2;
!                 pInputData += InputInfo->bmiHeader.biWidth * 4;
              }
          }
--- 672,740 ----
      if(InputInfo->bmiHeader.biCompression == MAKEFOURCC('Y','U','Y','2'))
      {
!         if(InputInfo->bmiHeader.biWidth != 704)
          {
!             if(m_IncomingFields[m_FieldsInBuffer - 1].IsTopLine == TRUE)
              {
!                 for(int i(0); i < InputInfo->bmiHeader.biHeight/2; ++i)
!                 {
!                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
!                     pOutputData += OutputInfo->bmiHeader.biWidth * 2;
!                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
!                     pOutputData += OutputInfo->bmiHeader.biWidth * 2;
!                     pInputData += InputInfo->bmiHeader.biWidth * 4;
!                 }
  
+             }
+             else
+             {
+                 pInputData += InputInfo->bmiHeader.biWidth * 2;
+                 for(int i(0); i < InputInfo->bmiHeader.biHeight/2; ++i)
+                 {
+                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
+                     pOutputData += OutputInfo->bmiHeader.biWidth * 2;
+                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
+                     pOutputData += OutputInfo->bmiHeader.biWidth * 2;
+                     pInputData += InputInfo->bmiHeader.biWidth * 4;
+                 }
+             }
          }
          else
          {
!             pOutputData += 16;
!             if(m_IncomingFields[m_FieldsInBuffer - 1].IsTopLine == TRUE)
!             {
!                 for(int i(0); i < InputInfo->bmiHeader.biHeight/2; ++i)
!                 {
!                     BlackYUY2For8(pOutputData - 16);
!                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
!                     BlackYUY2For8(pOutputData + (704*2));
!                     pOutputData += OutputInfo->bmiHeader.biWidth * 2;
! 
!                     BlackYUY2For8(pOutputData - 16);
!                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
!                     BlackYUY2For8(pOutputData + (704*2));
! 
!                     pOutputData += OutputInfo->bmiHeader.biWidth * 2;
!                     pInputData += InputInfo->bmiHeader.biWidth * 4;
!                 }
! 
!             }
!             else
              {
!                 pInputData += InputInfo->bmiHeader.biWidth * 2;
!                 for(int i(0); i < InputInfo->bmiHeader.biHeight/2; ++i)
!                 {
!                     BlackYUY2For8(pOutputData - 16);
!                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
!                     BlackYUY2For8(pOutputData - 16);
!                     pOutputData += OutputInfo->bmiHeader.biWidth * 2;
! 
!                     BlackYUY2For8(pOutputData - 16);
!                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth * 2);
!                     BlackYUY2For8(pOutputData - 16);
!                     pOutputData += OutputInfo->bmiHeader.biWidth * 2;
! 
!                     pInputData += InputInfo->bmiHeader.biWidth * 4;
!                 }
              }
          }
***************
*** 698,707 ****
      else
      {
!         if(m_IncomingFields[m_FieldsInBuffer - 1].IsTopLine == TRUE)
          {
          }
          else
          {
          }
      }
  }
--- 744,911 ----
      else
      {
!         if(InputInfo->bmiHeader.biWidth != 704)
          {
+             // process luma
+             if(m_IncomingFields[m_FieldsInBuffer - 1].IsTopLine == TRUE)
+             {
+                 for(int i(0); i < InputInfo->bmiHeader.biHeight/2; ++i)
+                 {
+                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth);
+                     pOutputData += OutputInfo->bmiHeader.biWidth;
+                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth);
+                     pOutputData += OutputInfo->bmiHeader.biWidth;
+                     pInputData += InputInfo->bmiHeader.biWidth * 2;
+                 }
+ 
+             }
+             else
+             {
+                 pInputData += InputInfo->bmiHeader.biWidth;
+                 for(int i(0); i < InputInfo->bmiHeader.biHeight/2; ++i)
+                 {
+                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth);
+                     pOutputData += OutputInfo->bmiHeader.biWidth;
+                     memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth);
+                     pOutputData += OutputInfo->bmiHeader.biWidth;
+                     pInputData += InputInfo->bmiHeader.biWidth * 2;
+                 }
+                 pInputData -= InputInfo->bmiHeader.biWidth;
+             }
+             ProcessPlanarChroma(pInputData, pOutputData, InputInfo, OutputInfo);
          }
          else
          {
+             // process luma
+             pOutputData += 8;
+             if(m_IncomingFields[m_FieldsInBuffer - 1].IsTopLine == TRUE)
+             {
+                 for(int i(0); i < InputInfo->bmiHeader.biHeight/2; ++i)
+                 {
+                     memset(pOutputData - 8, 0, 8);
+                     memcpy(pOutputData, pInputData, 704);
+                     memset(pOutputData + 704 + 8, 0, 8);
+                     pOutputData += OutputInfo->bmiHeader.biWidth;
+ 
+                     memset(pOutputData - 8, 0, 8);
+                     memcpy(pOutputData, pInputData, 704);
+                     memset(pOutputData + 704 + 8, 0, 8);
+                     pOutputData += OutputInfo->bmiHeader.biWidth;
+ 
+                     pInputData += 1408;
+                 }
+ 
+             }
+             else
+             {
+                 pInputData += 704;
+                 for(int i(0); i < InputInfo->bmiHeader.biHeight/2; ++i)
+                 {
+                     memset(pOutputData - 8, 0, 8);
+                     memcpy(pOutputData, pInputData, 704);
+                     memset(pOutputData + 704 + 8, 0, 8);
+                     pOutputData += OutputInfo->bmiHeader.biWidth;
+ 
+                     memset(pOutputData - 8, 0, 8);
+                     memcpy(pOutputData, pInputData, 704);
+                     memset(pOutputData + 704 + 8, 0, 8);
+                     pOutputData += OutputInfo->bmiHeader.biWidth;
+ 
+                     pInputData += 1408;
+                 }
+                 pInputData -= 704;
+             }
+             pOutputData -= 8;
+             ProcessPlanarChroma704(pInputData, pOutputData, InputInfo, OutputInfo);
          }
      }
+ }
+ 
+ void CDeintDMO::ProcessPlanarChroma(BYTE* pInputData, BYTE* pOutputData, VIDEOINFOHEADER2* InputInfo, VIDEOINFOHEADER2* OutputInfo)
+ {
+     // copy chroma over
+     // the formats for YV12 and NV12 are different
+     // but the both 
+     if(InputInfo->bmiHeader.biCompression == MAKEFOURCC('Y','V','1','2'))
+     {
+         // copy V then U
+         // there are biWidth / 2 x biHeight/2 of V 
+         // followed by biWidth / 2 x biHeight/2 of U
+         for(int i(0); i < InputInfo->bmiHeader.biHeight; ++i)
+         {
+             memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth / 2);
+             pOutputData += OutputInfo->bmiHeader.biWidth / 2;
+             pInputData += InputInfo->bmiHeader.biWidth / 2;
+         }
+     }
+     else if(InputInfo->bmiHeader.biCompression == MAKEFOURCC('N','V','1','2'))
+     {
+         // copy U & V - there are biWidth / 2 x biHeight/2 of UV samples
+         for(int i(0); i < InputInfo->bmiHeader.biHeight / 2; ++i)
+         {
+             memcpy(pOutputData, pInputData, InputInfo->bmiHeader.biWidth);
+             pOutputData += OutputInfo->bmiHeader.biWidth;
+             pInputData += InputInfo->bmiHeader.biWidth;
+         }
+     }
+     else
+     {
+         ; // very unexpected
+     }
+ }
+ 
+ void CDeintDMO::ProcessPlanarChroma704(BYTE* pInputData, BYTE* pOutputData, VIDEOINFOHEADER2* InputInfo, VIDEOINFOHEADER2* OutputInfo)
+ {
+     // copy chroma over
+     // the formats for YV12 and NV12 are different
+     // but the both 
+     if(InputInfo->bmiHeader.biCompression == MAKEFOURCC('Y','V','1','2'))
+     {
+         // copy V then U
+         // there are 352 x biHeight/2 of V 
+         // followed by 352 x biHeight/2 of U
+         for(int i(0); i < InputInfo->bmiHeader.biHeight; ++i)
+         {
+             memset(pOutputData, 128, 4);
+             memcpy(pOutputData + 4, pInputData, 352);
+             memset(pOutputData + 352 + 4, 128, 4);
+             pOutputData += OutputInfo->bmiHeader.biWidth / 2;
+             pInputData += 352;
+         }
+     }
+     else if(InputInfo->bmiHeader.biCompression == MAKEFOURCC('N','V','1','2'))
+     {
+         // copy U & V - there are 352 x biHeight/2 of UV samples
+         for(int i(0); i < InputInfo->bmiHeader.biHeight / 2; ++i)
+         {
+             memset(pOutputData, 128, 8);
+             memcpy(pOutputData + 8, pInputData, 704);
+             memset(pOutputData + 704 + 8, 128, 8);
+             pOutputData += OutputInfo->bmiHeader.biWidth;
+             pInputData += 704;
+         }
+     }
+     else
+     {
+         ; // very unexpected
+     }
+ }
+ 
+ void CDeintDMO::BlackYUY2For8(BYTE* pOutputData)
+ {
+     *(pOutputData++) = 0;
+     *(pOutputData++) = 128;
+     *(pOutputData++) = 0;
+     *(pOutputData++) = 128;
+     *(pOutputData++) = 0;
+     *(pOutputData++) = 128;
+     *(pOutputData++) = 0;
+     *(pOutputData++) = 128;
+     *(pOutputData++) = 0;
+     *(pOutputData++) = 128;
+     *(pOutputData++) = 0;
+     *(pOutputData++) = 128;
+     *(pOutputData++) = 0;
+     *(pOutputData++) = 128;
+     *(pOutputData++) = 0;
+     *pOutputData = 128;
  }

Index: CDeintDMO.h
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CDeintDMO.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CDeintDMO.h	20 May 2003 16:50:57 -0000	1.2
--- CDeintDMO.h	21 May 2003 13:41:11 -0000	1.3
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.3  2003/05/21 13:41:11  adcockj
+ // Added new deinterlace methods
+ //
  // Revision 1.2  2003/05/20 16:50:57  adcockj
  // Interim checkin, preparation for DMO processing path
***************
*** 65,68 ****
--- 68,74 ----
      virtual void ProcessSingleFrame(DMO_OUTPUT_DATA_BUFFER *pOutputBuffer);
      virtual void DoDeinterlacingMethod(DMO_OUTPUT_DATA_BUFFER *pOutputBuffer) = 0;
+     void ProcessPlanarChroma(BYTE* pInputData, BYTE* pOutputData, VIDEOINFOHEADER2* InputInfo, VIDEOINFOHEADER2* OutputInfo);
+     void ProcessPlanarChroma704(BYTE* pInputData, BYTE* pOutputData, VIDEOINFOHEADER2* InputInfo, VIDEOINFOHEADER2* OutputInfo);
+     void BlackYUY2For8(BYTE* pOutputData);
  
  protected:

Index: DMO_Lib.dsp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/DMO_Lib.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DMO_Lib.dsp	20 May 2003 18:40:37 -0000	1.2
--- DMO_Lib.dsp	21 May 2003 13:41:11 -0000	1.3
***************
*** 166,173 ****
  # End Source File
  # End Group
- # Begin Source File
- 
- SOURCE=.\Readme.txt
- # End Source File
  # End Target
  # End Project
--- 166,169 ----

Update of /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Diag
In directory sc8-pr-cvs1:/tmp/cvs-serv16930/DMO/Deinterlace/Deint_Diag

Added Files:
	.cvsignore Deint_Diag.cpp Deint_Diag.def Deint_Diag.dsp 
	Deint_Diag.h Deint_Diag.rc StdAfx.CPP StdAfx.h resource.h 
Log Message:
Added new deinterlace methods


--- NEW FILE ---
Debug
Release
Deint_Diag.ncb
Deint_Diag.plg
Deint_Diag.aps
Deint_Diag.opt

***** Error reading new file: [Errno 2] No such file or directory: 'Deint_Diag.cpp'
--- NEW FILE ---
EXPORTS
    DllCanUnloadNow     PRIVATE
    DllGetClassObject   PRIVATE
    DllRegisterServer   PRIVATE
    DllUnregisterServer PRIVATE

--- NEW FILE ---
# Microsoft Developer Studio Project File - Name="Deint_Diag" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **

# TARGTYPE "Win32 (x86) Application" 0x0101

CFG=Deint_Diag - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE 
!MESSAGE NMAKE /f "Deint_Diag.mak".
!MESSAGE 
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE 
!MESSAGE NMAKE /f "Deint_Diag.mak" CFG="Deint_Diag - Win32 Debug"
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
!MESSAGE "Deint_Diag - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "Deint_Diag - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE 

# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe

!IF  "$(CFG)" == "Deint_Diag - Win32 Release"

# PROP BASE Use_MFC 2
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 2
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL"
# ADD RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dmoguids.lib msdmo.lib strmiids.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Release/Deint_Diag.dll"
# Begin Custom Build - Performing Registration
OutDir=.\Release
TargetPath=\Source\deinterlace\DScaler5\Release\Deint_Diag.dll
InputPath=\Source\deinterlace\DScaler5\Release\Deint_Diag.dll
SOURCE="$(InputPath)"

"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
	regsvr32 /s /c "$(TargetPath)" 
	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
	
# End Custom Build

!ELSEIF  "$(CFG)" == "Deint_Diag - Win32 Debug"

# PROP BASE Use_MFC 2
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 2
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL"
# ADD RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dmoguids.lib msdmo.lib strmiids.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\Debug/Deint_Diag.dll" /pdbtype:sept
# Begin Custom Build - Performing Registration
OutDir=.\Debug
TargetPath=\Source\deinterlace\DScaler5\Debug\Deint_Diag.dll
InputPath=\Source\deinterlace\DScaler5\Debug\Deint_Diag.dll
SOURCE="$(InputPath)"

"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
	regsvr32 /s /c "$(TargetPath)" 
	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
	
# End Custom Build

!ENDIF 

# Begin Target

# Name "Deint_Diag - Win32 Release"
# Name "Deint_Diag - Win32 Debug"
# Begin Group "Source Files"

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File

SOURCE=.\Deint_Diag.cpp
# End Source File
# Begin Source File

SOURCE=.\Deint_Diag.def
# End Source File
# Begin Source File

SOURCE=.\Deint_Diag.rc
# End Source File
# Begin Source File

SOURCE=.\StdAfx.CPP
# ADD CPP /Yc"stdafx.h"
# End Source File
# End Group
# Begin Group "Header Files"

# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File

SOURCE=.\Deint_Diag.h
# End Source File
# Begin Source File

SOURCE=.\StdAfx.h
# End Source File
# End Group
# Begin Group "Resource Files"

# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

***** Error reading new file: [Errno 2] No such file or directory: 'Deint_Diag.h'
--- NEW FILE ---
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// English (U.K.) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
#pragma code_page(1252)
#endif //_WIN32

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE DISCARDABLE 
BEGIN
    "resource.h\0"
END

2 TEXTINCLUDE DISCARDABLE 
BEGIN
    "#include ""afxres.h""\r\n"
    "\0"
END

3 TEXTINCLUDE DISCARDABLE 
BEGIN
    "\r\n"
    "\0"
END

#endif    // APSTUDIO_INVOKED


#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
 FILEVERSION 1,0,0,1
 PRODUCTVERSION 1,0,0,1
 FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
 FILEFLAGS 0x1L
#else
 FILEFLAGS 0x0L
#endif
 FILEOS 0x40004L
 FILETYPE 0x1L
 FILESUBTYPE 0x0L
BEGIN
    BLOCK "StringFileInfo"
    BEGIN
        BLOCK "080904b0"
        BEGIN
            VALUE "Comments", "\0"
            VALUE "CompanyName", "DScaler Team\0"
            VALUE "FileDescription", "Deint_Diag\0"
            VALUE "FileVersion", "1, 0, 0, 1\0"
            VALUE "InternalName", "Deint_Diag\0"
            VALUE "LegalCopyright", "Copyright © 2003\0"
            VALUE "LegalTrademarks", "\0"
            VALUE "OriginalFilename", "Deint_Diag.dll\0"
            VALUE "PrivateBuild", "\0"
            VALUE "ProductName", "Deint_Diag\0"
            VALUE "ProductVersion", "1, 0, 0, 1\0"
            VALUE "SpecialBuild", "\0"
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
        VALUE "Translation", 0x809, 1200
    END
END

#endif    // !_MAC


/////////////////////////////////////////////////////////////////////////////
//
// String Table
//

STRINGTABLE DISCARDABLE 
BEGIN
    IDS_DESCRIPTION         "A diagonal motion adaptive deinterlacing DMO"
    IDS_AUTHORS             "John Adcock"
    IDS_NAME                "Diag"
END

#endif    // English (U.K.) resources
/////////////////////////////////////////////////////////////////////////////



#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//


/////////////////////////////////////////////////////////////////////////////
#endif    // not APSTUDIO_INVOKED


***** Error reading new file: [Errno 2] No such file or directory: 'StdAfx.CPP'
***** Error reading new file: [Errno 2] No such file or directory: 'StdAfx.h'
--- NEW FILE ---
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by Deint_Diag.rc
//
#define IDS_DESCRIPTION                 1
#define IDS_AUTHORS                     2
#define IDS_NAME                        3

// Next default values for new objects
// 
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE        101
#define _APS_NEXT_COMMAND_VALUE         40001
#define _APS_NEXT_CONTROL_VALUE         1000
#define _APS_NEXT_SYMED_VALUE           101
#endif
#endif

Update of /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Weave
In directory sc8-pr-cvs1:/tmp/cvs-serv16930/DMO/Deinterlace/Deint_Weave

Added Files:
	.cvsignore Deint_Weave.cpp Deint_Weave.def Deint_Weave.dsp 
	Deint_Weave.h Deint_Weave.rc StdAfx.CPP StdAfx.h resource.h 
Log Message:
Added new deinterlace methods


--- NEW FILE ---
Debug
Release
Deint_Weave.ncb
Deint_Weave.plg
Deint_Weave.aps
Deint_Weave.opt

***** Error reading new file: [Errno 2] No such file or directory: 'Deint_Weave.cpp'
--- NEW FILE ---
EXPORTS
    DllCanUnloadNow     PRIVATE
    DllGetClassObject   PRIVATE
    DllRegisterServer   PRIVATE
    DllUnregisterServer PRIVATE

--- NEW FILE ---
# Microsoft Developer Studio Project File - Name="Deint_Weave" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **

# TARGTYPE "Win32 (x86) Application" 0x0101

CFG=Deint_Weave - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE 
!MESSAGE NMAKE /f "Deint_Weave.mak".
!MESSAGE 
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE 
!MESSAGE NMAKE /f "Deint_Weave.mak" CFG="Deint_Weave - Win32 Debug"
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
!MESSAGE "Deint_Weave - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "Deint_Weave - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE 

# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe

!IF  "$(CFG)" == "Deint_Weave - Win32 Release"

# PROP BASE Use_MFC 2
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 2
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL"
# ADD RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dmoguids.lib msdmo.lib strmiids.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Release/Deint_Weave.dll"
# Begin Custom Build - Performing Registration
OutDir=.\Release
TargetPath=\Source\deinterlace\DScaler5\Release\Deint_Weave.dll
InputPath=\Source\deinterlace\DScaler5\Release\Deint_Weave.dll
SOURCE="$(InputPath)"

"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
	regsvr32 /s /c "$(TargetPath)" 
	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
	
# End Custom Build

!ELSEIF  "$(CFG)" == "Deint_Weave - Win32 Debug"

# PROP BASE Use_MFC 2
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 2
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL"
# ADD RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dmoguids.lib msdmo.lib strmiids.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\Debug/Deint_Weave.dll" /pdbtype:sept
# Begin Custom Build - Performing Registration
OutDir=.\Debug
TargetPath=\Source\deinterlace\DScaler5\Debug\Deint_Weave.dll
InputPath=\Source\deinterlace\DScaler5\Debug\Deint_Weave.dll
SOURCE="$(InputPath)"

"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
	regsvr32 /s /c "$(TargetPath)" 
	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
	
# End Custom Build

!ENDIF 

# Begin Target

# Name "Deint_Weave - Win32 Release"
# Name "Deint_Weave - Win32 Debug"
# Begin Group "Source Files"

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File

SOURCE=.\Deint_Weave.cpp
# End Source File
# Begin Source File

SOURCE=.\Deint_Weave.def
# End Source File
# Begin Source File

SOURCE=.\Deint_Weave.rc
# End Source File
# Begin Source File

SOURCE=.\StdAfx.CPP
# ADD CPP /Yc"stdafx.h"
# End Source File
# End Group
# Begin Group "Header Files"

# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File

SOURCE=.\Deint_Weave.h
# End Source File
# Begin Source File

SOURCE=.\StdAfx.h
# End Source File
# End Group
# Begin Group "Resource Files"

# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

***** Error reading new file: [Errno 2] No such file or directory: 'Deint_Weave.h'
--- NEW FILE ---
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// English (U.K.) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
#pragma code_page(1252)
#endif //_WIN32

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE DISCARDABLE 
BEGIN
    "resource.h\0"
END

2 TEXTINCLUDE DISCARDABLE 
BEGIN
    "#include ""afxres.h""\r\n"
    "\0"
END

3 TEXTINCLUDE DISCARDABLE 
BEGIN
    "\r\n"
    "\0"
END

#endif    // APSTUDIO_INVOKED


#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
 FILEVERSION 1,0,0,1
 PRODUCTVERSION 1,0,0,1
 FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
 FILEFLAGS 0x1L
#else
 FILEFLAGS 0x0L
#endif
 FILEOS 0x40004L
 FILETYPE 0x1L
 FILESUBTYPE 0x0L
BEGIN
    BLOCK "StringFileInfo"
    BEGIN
        BLOCK "080904b0"
        BEGIN
            VALUE "Comments", "\0"
            VALUE "CompanyName", "DScaler Team\0"
            VALUE "FileDescription", "Deint_Weave\0"
            VALUE "FileVersion", "1, 0, 0, 1\0"
            VALUE "InternalName", "Deint_Weave\0"
            VALUE "LegalCopyright", "Copyright © 2003\0"
            VALUE "LegalTrademarks", "\0"
            VALUE "OriginalFilename", "Deint_Weave.dll\0"
            VALUE "PrivateBuild", "\0"
            VALUE "ProductName", "Deint_Weave\0"
            VALUE "ProductVersion", "1, 0, 0, 1\0"
            VALUE "SpecialBuild", "\0"
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
        VALUE "Translation", 0x809, 1200
    END
END

#endif    // !_MAC


/////////////////////////////////////////////////////////////////////////////
//
// String Table
//

STRINGTABLE DISCARDABLE 
BEGIN
    IDS_DESCRIPTION         "A simple Weave deinterlacing DMO"
    IDS_AUTHORS             "John Adcock"
    IDS_NAME                "Weave"
END

#endif    // English (U.K.) resources
/////////////////////////////////////////////////////////////////////////////



#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//


/////////////////////////////////////////////////////////////////////////////
#endif    // not APSTUDIO_INVOKED


***** Error reading new file: [Errno 2] No such file or directory: 'StdAfx.CPP'
***** Error reading new file: [Errno 2] No such file or directory: 'StdAfx.h'
--- NEW FILE ---
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by Deint_Weave.rc
//
#define IDS_DESCRIPTION                 1
#define IDS_AUTHORS                     2
#define IDS_NAME                        3

// Next default values for new objects
// 
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE        101
#define _APS_NEXT_COMMAND_VALUE         40001
#define _APS_NEXT_CONTROL_VALUE         1000
#define _APS_NEXT_SYMED_VALUE           101
#endif
#endif

Update of /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Bob
In directory sc8-pr-cvs1:/tmp/cvs-serv16930/DMO/Deinterlace/Deint_Bob

Modified Files:
	Deint_Bob.cpp StdAfx.CPP StdAfx.h 
Log Message:
Added new deinterlace methods


Index: Deint_Bob.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Bob/Deint_Bob.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Deint_Bob.cpp	20 May 2003 16:50:58 -0000	1.2
--- Deint_Bob.cpp	21 May 2003 13:41:11 -0000	1.3
***************
*** 1,2 ****
--- 1,34 ----
+ ////////////////////////////////////////////////////////////////////////////
+ // $Id$
+ /////////////////////////////////////////////////////////////////////////////
+ // Copyright (c) 2003 John Adcock.  All rights reserved.
+ // This software was based on sample code generated by the 
+ // DMO project wizard.  That code is (c) Microsoft Corporation
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // This file is free software; you can redistribute it and/or modify it
+ // under the terms of the GNU Library General Public License as published by
+ // the Free Software Foundation; either version 2 of the License, or (at your
+ // option) any later version.
+ //
+ // This software is distributed in the hope that it will be useful,
+ // but WITHOUT ANY WARRANTY; without even the implied warranty of
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ // GNU Library General Public License for more details
+ //
+ /////////////////////////////////////////////////////////////////////////////
+ // CVS Log
+ //
+ // $Log$
+ // Revision 1.3  2003/05/21 13:41:11  adcockj
+ // Added new deinterlace methods
+ //
+ // Revision 1.2  2003/05/20 16:50:58  adcockj
+ // Interim checkin, preparation for DMO processing path
+ //
+ // Revision 1.1  2003/05/16 16:19:12  adcockj
+ // Added new files into DMO framework
+ //
+ /////////////////////////////////////////////////////////////////////////////
  #include "stdafx.h"
  #include "Deint_Bob.h"

Index: StdAfx.CPP
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Bob/StdAfx.CPP,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** StdAfx.CPP	16 May 2003 16:19:12 -0000	1.1
--- StdAfx.CPP	21 May 2003 13:41:11 -0000	1.2
***************
*** 1,14 ****
! //------------------------------------------------------------------------------
! // File: stdafx.cpp
  //
! // Desc: Standard include file.
  //
! // Copyright (c) Microsoft Corporation.  All rights reserved.
! //------------------------------------------------------------------------------
! 
! 
! // stdafx.cpp : source file that includes just the standard includes
! //  stdafx.pch will be the pre-compiled header
! //  stdafx.obj will contain the pre-compiled type information
  
  #include "stdafx.h"
--- 1,28 ----
! ////////////////////////////////////////////////////////////////////////////
! // $Id$
! /////////////////////////////////////////////////////////////////////////////
! // Copyright (c) 2003 John Adcock.  All rights reserved.
! // This software was based on sample code generated by the 
! // DMO project wizard.  That code is (c) Microsoft Corporation
! /////////////////////////////////////////////////////////////////////////////
  //
! // This file is free software; you can redistribute it and/or modify it
! // under the terms of the GNU Library General Public License as published by
! // the Free Software Foundation; either version 2 of the License, or (at your
! // option) any later version.
  //
! // This software is distributed in the hope that it will be useful,
! // but WITHOUT ANY WARRANTY; without even the implied warranty of
! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! // GNU Library General Public License for more details
! //
! /////////////////////////////////////////////////////////////////////////////
! // CVS Log
! //
! // $Log$
! // Revision 1.2  2003/05/21 13:41:11  adcockj
! // Added new deinterlace methods
! //
! /////////////////////////////////////////////////////////////////////////////
  
  #include "stdafx.h"

Index: StdAfx.h
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Bob/StdAfx.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** StdAfx.h	16 May 2003 16:19:12 -0000	1.1
--- StdAfx.h	21 May 2003 13:41:11 -0000	1.2
***************
*** 1,20 ****
! //------------------------------------------------------------------------------
! // File: stdafx.h
  //
! // Desc: Standard include file.
  //
! // Copyright (c) Microsoft Corporation.  All rights reserved.
! //------------------------------------------------------------------------------
! 
! // stdafx.h : include file for standard system include files,
! //      or project specific include files that are used frequently,
! //      but are changed infrequently
! 
! #if !defined(AFX_STDAFX_H__537C8F51_48A5_4215_98BB_E2DE3E9FCEDE__INCLUDED_)
! #define AFX_STDAFX_H__537C8F51_48A5_4215_98BB_E2DE3E9FCEDE__INCLUDED_
  
- #if _MSC_VER > 1000
  #pragma once
- #endif // _MSC_VER > 1000
  
  #define STRICT
--- 1,30 ----
! ////////////////////////////////////////////////////////////////////////////
! // $Id$
! /////////////////////////////////////////////////////////////////////////////
! // Copyright (c) 2003 John Adcock.  All rights reserved.
! // This software was based on sample code generated by the 
! // DMO project wizard.  That code is (c) Microsoft Corporation
! /////////////////////////////////////////////////////////////////////////////
  //
! // This file is free software; you can redistribute it and/or modify it
! // under the terms of the GNU Library General Public License as published by
! // the Free Software Foundation; either version 2 of the License, or (at your
! // option) any later version.
  //
! // This software is distributed in the hope that it will be useful,
! // but WITHOUT ANY WARRANTY; without even the implied warranty of
! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! // GNU Library General Public License for more details
! //
! /////////////////////////////////////////////////////////////////////////////
! // CVS Log
! //
! // $Log$
! // Revision 1.2  2003/05/21 13:41:11  adcockj
! // Added new deinterlace methods
! //
! /////////////////////////////////////////////////////////////////////////////
  
  #pragma once
  
  #define STRICT
***************
*** 51,54 ****
  #include <amvideo.h>
  #include <medparam.h>
- 
- #endif // !defined(AFX_STDAFX_H__537C8F51_48A5_4215_98BB_E2DE3E9FCEDE__INCLUDED)
--- 61,62 ----

Update of /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Weave
In directory sc8-pr-cvs1:/tmp/cvs-serv14814/Deint_Weave

Log Message:
Directory /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Weave added to the repository

Update of /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Diag
In directory sc8-pr-cvs1:/tmp/cvs-serv14693/Deint_Diag

Log Message:
Directory /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Diag added to the repository

Update of /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv2625/DMO/DMO_Lib

Modified Files:
	DMO_Lib.dsp 
Log Message:
Fixed projects so that cvs builds properly


Index: DMO_Lib.dsp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/DMO_Lib.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DMO_Lib.dsp	16 May 2003 16:19:12 -0000	1.1
--- DMO_Lib.dsp	20 May 2003 18:40:37 -0000	1.2
***************
*** 106,109 ****
--- 106,113 ----
  # Begin Source File
  
+ SOURCE=.\CVideoDMO.cpp
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\DMO_Lib.cpp
  # End Source File
***************
*** 140,143 ****
--- 144,151 ----
  
  SOURCE=.\CInPlaceDMO.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\CVideoDMO.h
  # End Source File
  # Begin Source File

Update of /cvsroot/deinterlace/DScaler5/DScalerFilter
In directory sc8-pr-cvs1:/tmp/cvs-serv2625/DScalerFilter

Modified Files:
	DScalerFilter.dsp 
Log Message:
Fixed projects so that cvs builds properly


Index: DScalerFilter.dsp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DScalerFilter/DScalerFilter.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** DScalerFilter.dsp	19 May 2003 07:02:24 -0000	1.6
--- DScalerFilter.dsp	20 May 2003 18:40:38 -0000	1.7
***************
*** 44,48 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c
  # ADD BASE RSC /l 0x809 /d "_DEBUG"
  # ADD RSC /l 0x809 /d "_DEBUG"
--- 44,48 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c
  # ADD BASE RSC /l 0x809 /d "_DEBUG"
  # ADD RSC /l 0x809 /d "_DEBUG"
***************
*** 52,60 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Rpcrt4.lib dxerr9.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\Debug/DScalerFilter.dll" /pdbtype:sept
  # Begin Custom Build - Performing registration
  OutDir=.\Debug
! TargetPath=\Programering\prj\deinterlace\DScaler5\Debug\DScalerFilter.dll
! InputPath=\Programering\prj\deinterlace\DScaler5\Debug\DScalerFilter.dll
  SOURCE="$(InputPath)"
  
--- 52,60 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Rpcrt4.lib dxerr9.lib dmoguids.lib msdmo.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\Debug/DScalerFilter.dll" /pdbtype:sept
  # Begin Custom Build - Performing registration
  OutDir=.\Debug
! TargetPath=\Source\deinterlace\DScaler5\Debug\DScalerFilter.dll
! InputPath=\Source\deinterlace\DScaler5\Debug\DScalerFilter.dll
  SOURCE="$(InputPath)"
  
***************
*** 79,83 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "NOLOGGING" /Yu"stdafx.h" /FD /c
  # ADD BASE RSC /l 0x809 /d "NDEBUG"
  # ADD RSC /l 0x809 /d "NDEBUG"
--- 79,83 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "NOLOGGING" /Yu"stdafx.h" /FD /c
  # ADD BASE RSC /l 0x809 /d "NDEBUG"
  # ADD RSC /l 0x809 /d "NDEBUG"
***************
*** 87,95 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Rpcrt4.lib dxerr9.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\Release/DScalerFilter.dll"
  # Begin Custom Build - Performing registration
  OutDir=.\Release
! TargetPath=\Programering\prj\deinterlace\DScaler5\Release\DScalerFilter.dll
! InputPath=\Programering\prj\deinterlace\DScaler5\Release\DScalerFilter.dll
  SOURCE="$(InputPath)"
  
--- 87,95 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Rpcrt4.lib dxerr9.lib dmoguids.lib msdmo.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\Release/DScalerFilter.dll"
  # Begin Custom Build - Performing registration
  OutDir=.\Release
! TargetPath=\Source\deinterlace\DScaler5\Release\DScalerFilter.dll
! InputPath=\Source\deinterlace\DScaler5\Release\DScalerFilter.dll
  SOURCE="$(InputPath)"

Update of /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv6284

Added Files:
	CVideoDMO.cpp CVideoDMO.h 
Log Message:
Added new files


***** Error reading new file: [Errno 2] No such file or directory: 'CVideoDMO.cpp'
***** Error reading new file: [Errno 2] No such file or directory: 'CVideoDMO.h'

Update of /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Bob
In directory sc8-pr-cvs1:/tmp/cvs-serv4817/DMO/Deinterlace/Deint_Bob

Modified Files:
	Deint_Bob.cpp Deint_Bob.h 
Log Message:
Interim checkin, preparation for DMO processing path


Index: Deint_Bob.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Bob/Deint_Bob.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Deint_Bob.cpp	16 May 2003 16:19:12 -0000	1.1
--- Deint_Bob.cpp	20 May 2003 16:50:58 -0000	1.2
***************
*** 44,48 ****
  } // GetClassID
  
! STDMETHODIMP CDeint_Bob::GetName(BSTR* Name)
  {
      if(Name == NULL)
--- 44,48 ----
  } // GetClassID
  
! STDMETHODIMP CDeint_Bob::get_Name(BSTR* Name)
  {
      if(Name == NULL)
***************
*** 61,65 ****
  }
  
! STDMETHODIMP CDeint_Bob::GetLicense(eFreeLicense* License)
  {
      if(License == NULL)
--- 61,65 ----
  }
  
! STDMETHODIMP CDeint_Bob::get_License(eFreeLicense* License)
  {
      if(License == NULL)
***************
*** 71,75 ****
  }
  
! STDMETHODIMP CDeint_Bob::GetAuthors(BSTR* Authors)
  {
      if(Authors == NULL)
--- 71,75 ----
  }
  
! STDMETHODIMP CDeint_Bob::get_Authors(BSTR* Authors)
  {
      if(Authors == NULL)

Index: Deint_Bob.h
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/Deinterlace/Deint_Bob/Deint_Bob.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Deint_Bob.h	16 May 2003 16:19:12 -0000	1.1
--- Deint_Bob.h	20 May 2003 16:50:58 -0000	1.2
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.2  2003/05/20 16:50:58  adcockj
+ // Interim checkin, preparation for DMO processing path
+ //
  // Revision 1.1  2003/05/16 16:19:12  adcockj
  // Added new files into DMO framework
***************
*** 55,61 ****
  // IAmFreeSoftwareLicensed
  public:
! 	STDMETHOD(GetName)(BSTR* Name);
! 	STDMETHOD(GetLicense)(eFreeLicense* License);
! 	STDMETHOD(GetAuthors)(BSTR* Authors);
  
  protected:
--- 58,64 ----
  // IAmFreeSoftwareLicensed
  public:
! 	STDMETHOD(get_Name)(BSTR* Name);
! 	STDMETHOD(get_License)(eFreeLicense* License);
! 	STDMETHOD(get_Authors)(BSTR* Authors);
  
  protected:

Update of /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv4817/DMO/DMO_Lib

Modified Files:
	CDMO.h CDeintDMO.cpp CDeintDMO.h 
Log Message:
Interim checkin, preparation for DMO processing path


Index: CDMO.h
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CDMO.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CDMO.h	16 May 2003 16:19:12 -0000	1.1
--- CDMO.h	20 May 2003 16:50:57 -0000	1.2
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.2  2003/05/20 16:50:57  adcockj
+ // Interim checkin, preparation for DMO processing path
+ //
  // Revision 1.1  2003/05/16 16:19:12  adcockj
  // Added new files into DMO framework
***************
*** 46,51 ****
  
  public:
!     CDMO();	// Constructor
! 	~CDMO();	// Destructor
  
  DECLARE_GET_CONTROLLING_UNKNOWN()
--- 49,54 ----
  
  public:
!     CDMO();
! 	virtual ~CDMO();
  
  DECLARE_GET_CONTROLLING_UNKNOWN()
***************
*** 97,101 ****
  
      // IDScalerFilterPlugin
- 
  	STDMETHOD(Attach)(IUnknown* pFilter);
  	STDMETHOD(Detach)();
--- 100,103 ----

Index: CDeintDMO.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CDeintDMO.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** CDeintDMO.cpp	19 May 2003 07:02:47 -0000	1.3
--- CDeintDMO.cpp	20 May 2003 16:50:57 -0000	1.4
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.4  2003/05/20 16:50:57  adcockj
+ // Interim checkin, preparation for DMO processing path
+ //
  // Revision 1.3  2003/05/19 07:02:47  adcockj
  // Fixes suggested by Torbjorn to media types
***************
*** 46,52 ****
  //
  CDeintDMO::CDeintDMO(long FieldsToBuffer, long FieldsDelay, long Complexity):
!     m_NumFieldsToBuffer(FieldsToBuffer),
!     m_FieldsDelay(FieldsDelay),
!     m_ComplexityIndex(Complexity)
  
  {
--- 49,54 ----
  //
  CDeintDMO::CDeintDMO(long FieldsToBuffer, long FieldsDelay, long Complexity):
!     m_ComplexityIndex(Complexity),
!     CVideoDMO(FieldsToBuffer, FieldsDelay, IS_DEINT)
  
  {
***************
*** 69,310 ****
  }
  
- 
- ////////////////////////////////
- //
- // IMediaObjectImpl::InternalDiscontinuity
- //
- //  *** Called by Discontinuity, description below ***
- //
- // The Discontinuity method signals a discontinuity on the specified input
- // stream.
- //
- // Possible Return Values:
- //  S_OK                        Success
- //  DMO_E_INVALIDSTREAMINDEX    Invalid streamindex
- //
- // A discontinuity represents a break in the input. A discontinuity might
- // occur because no more data is expected, the format is changing, or there
- // is a gap in the data. After a discontinuity, the DMO does not accept further
- // input on that stream until all pending data has been processed. The
- // application should call the ProcessOutput method until none of the streams
- // returns the DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE flag.
- //
- HRESULT CDeintDMO::InternalDiscontinuity(DWORD dwInputStreamIndex)
- {
-     if(dwInputStreamIndex != 0)
-     {
-         return DMO_E_INVALIDSTREAMINDEX;
-     }
-     // move to finishing state if we have any buffers stored
-     // otherwise we can happily accept new stuff
-     if(m_FieldsInBuffer > 0)
-     {
-         m_InternalState = STATE_FINISHING;
-     }
-     else
-     {
-         m_InternalState = STATE_START;
-     }
- 
- 	return S_OK;
- }
- 
- /////////////////////////
- //
- //  IMediaObjectImpl::InternalFlush
- //
- //  *** Called by Flush, description below ***
- //
- //  The Flush method flushes all internally buffered data.
- //
- // Return Value:
- // Returns S_OK if successful. Otherwise, returns an HRESULT value indicating
- // the cause of the error.
- //
- //  The DMO performs the following actions when this method is called:
- //  *  Releases any IMediaBuffer references it holds.
- //
- //  *  Discards any values that specify the time stamp or sample length for a
- //     media buffer.
- //
- //  *  Reinitializes any internal states that depend on the contents of a
- //     media sample.
- //
- //  Media types, maximum latency, and locked state do not change.
- //
- //  When the method returns, every input stream accepts data. Output streams
- //  cannot produce any data until the application calls the ProcessInput method
- //  on at least one input stream.
- //
- //  Note:
- //
- //  The template keeps a private flag that indicates the object's flushed
- //  state. The Flush method sets the flag to TRUE, and the ProcessInput method
- //  resets it to FALSE. If Flush is called when the flag is already TRUE, the
- //  method returns S_OK without calling the InternalFlush method.
- //
- STDMETHODIMP CDeintDMO::InternalFlush(void)
- {
-     // Just clear out the buffers
-     for(int i(0); i < m_FieldsInBuffer; ++i)
-     {
-         m_IncomingFields[i].m_Buffer.Release();
-     }
-     ZeroMemory(m_IncomingFields, sizeof(m_IncomingFields));
-     m_FieldsInBuffer = 0;
-     m_InternalState = STATE_START;
-     m_StartFieldsDone = 0;
- 	return S_OK;
- }
- 
- ////////////////////////////////////
- //
- //  IMediaObjectImpl::InternalGetInputSizeInfo
- //
- //  *** Called by GetInputSizeInfo, description below ***
- //
- //  The GetInputSizeInfo method retrieves the buffer requirements for a
- //  specified input stream.
- //
- //  Parameters
- //
- //  dwInputStreamIndex:     Zero-based index of an input stream on the DMO.
- //
- //  pcbSize:                [out] Pointer to a variable that receives
- //      the minimum size of an input buffer for this stream, in bytes.
- //
- //  pulSizeMaxLookahead:        [out] Pointer to a variable that receives the
- //      maximum amount of data that the DMO will hold for lookahead, in bytes.
- //      If the DMO does not perform lookahead on the stream, the value is zero.
- //
- //  pulSizeAlignment            [out] Pointer to a variable that receives the
- //      required buffer alignment, in bytes. If the input stream has no
- //      alignment requirement, the value is 1.
- //
- //  Return Value
- //      S_OK Success
- //      DMO_E_INVALIDSTREAMINDEX Invalid stream index
- //      DMO_E_TYPE_NOT_SET Media type was not set
- //
- //  The buffer requirements may depend on the media types of the various
- //  streams. Before calling this method, set the media type of each stream
- //  by calling the SetInputType and SetOutputType methods. If the media types
- //  have not been set, this method might return an error.
- //
- //  If the DMO performs lookahead on the input stream, it returns the
- //  DMO_INPUT_STREAMF_HOLDS_BUFFERS flag in the GetInputStreamInfo method.
- //  During processing, the DMO holds up to the number of bytes indicated by the
- //  pulSizeMaxLookahead parameter. The application must allocate enough buffers for
- //  the DMO to hold this much data.
- //
- //  A buffer is aligned if the buffer's start address is a multiple of
- //  *pulSizeAlignment. The alignment must be a power of two. Depending on the
- //  microprocessor, reads and writes to an aligned buffer might be faster than
- //  to an unaligned buffer. Also, some microprocessors do not support unaligned
- //  reads and writes.
- //
- //  Note:
- //
- //  GetInputSizeInfo returns DMO_E_TYPE_NOT_SET unless all of the non-optional
- //  streams have media types. Therefore, in the derived class, the internal
- //  methods can assume that all of the non-optional streams have media types.
- //
- STDMETHODIMP CDeintDMO::InternalGetInputSizeInfo(DWORD dwInputStreamIndex, DWORD *pcbSize, DWORD *pulSizeMaxLookahead, DWORD *pulSizeAlignment)
- {
- 	// We don't have to do any validation, because it is all done in the base class
- 
- 	HRESULT hr = S_OK;
- 	const DMO_MEDIA_TYPE* pmt;
- 	pmt = InputType(0);
-     
-     if(pmt->majortype == MEDIATYPE_Video)
-     {
- 	    *pcbSize = pmt->lSampleSize;
-         // work out a sensible look ahead amount
-         // this is the number of frames we need ahead
- 	    *pulSizeMaxLookahead = pmt->lSampleSize * (m_FieldsDelay * 2 + 1) / 2;	
- 	    *pulSizeAlignment = 1;		// no alignment requirement
-     }
-     else
-     {
-         // what's going on
-         hr = E_FAIL;
-     }
- 
- 	return hr;
- }
- 
- 
- //////////////////////////////////////
- //
- //  IMediaObjectImpl::InternalGetOutputSizeInfo
- //
- //  *** Called by GetOutputSizeInfo, description below ***
- //
- //  The GetOutputSizeInfo method retrieves the buffer requirements for a
- //  specified output stream.
- //
- //  Parameters
- //
- //      dwOutputStreamIndex
- //          Zero-based index of an output stream on the DMO.
- //
- //      pcbSize
- //          [out] Pointer to a variable that receives the minimum size of an
- //          output buffer for this stream, in bytes.
- //
- //      pulSizeAlignment
- //          [out] Pointer to a variable that receives the required buffer
- //          alignment, in bytes. If the output stream has no alignment
- //          requirement, the value is 1.
- //
- //  Return Value
- //      S_OK Success
- //      DMO_E_INVALIDSTREAMINDEX Invalid stream index
- //      DMO_E_TYPE_NOT_SET Media type was not set
- //
- //  The buffer requirements may depend on the media types set for each of the
- //  streams.
- //
- //  Before calling this method, set the media type of each stream by calling
- //  the SetInputType and SetOutputType methods. If the media types have not
- //  been set, this method might return an error. However, if a stream is
- //  optional, and the application will not use the stream, you do not have to
- //  set the media type for the stream.
- //
- //  A buffer is aligned if the buffer's start address is a multiple of
- //  *pulSizeAlignment. Depending on the architecture of the microprocessor, it is
- //  faster to read and write to an aligned buffer than to an unaligned buffer.
- //  On some microprocessors, reading and writing to an unaligned buffer is not
- //  supported and can cause the program to crash. Zero is not a valid alignment.
- //
- //  Note:
- //
- //  GetOutputSizeInfo returns DMO_E_TYPE_NOT_SET unless all of the non-optional
- //  streams have media types. Therefore, in the derived class, the internal
- //  methods can assume that all of the non-optional streams have media types.
- //
- STDMETHODIMP CDeintDMO::InternalGetOutputSizeInfo(DWORD dwOutputStreamIndex, DWORD *pcbSize, DWORD *pulSizeAlignment)
- {
-     // We don't have to do any validation, because it is all done in the base class
- 	HRESULT hr = S_OK;
- 	const DMO_MEDIA_TYPE* pmt;
- 	pmt = OutputType(0);
- 
-     if(pmt->majortype == MEDIATYPE_Video)
-     {
- 	    *pcbSize = pmt->lSampleSize;
- 	    *pulSizeAlignment = 1;
-     }
-     else
-     {
-         // what's going on
-         hr = E_FAIL;
-     }
- 
-     return hr;
- }
- 
- 
  ///////////////////////////////////////
  //
--- 71,74 ----
***************
*** 604,749 ****
  }
  
- ////////////////////////////////////////
- //
- //  IMediaObjectImpl::InternalAcceptingInput
- //
- //  Queries whether an input stream can accept more input. The derived class
- //  must declare and implement this method.
- //
- //  Parameters
- //
- //      dwInputStreamIndex
- //          Index of an input stream.
- //
- //  Return Value
- //
- //      Returns S_OK if the input stream can accept input, or S_FALSE otherwise.
- //
- //  Note:
- //
- //  Called by IMediaObject::GetInputStatus
- //
- STDMETHODIMP CDeintDMO::InternalAcceptingInput(DWORD dwInputStreamIndex)
- {
-     switch(m_InternalState)
-     {
-     case STATE_START:
-         // go straight to running if we only need a single buffer
-         if(m_NumFieldsToBuffer == 1)
-         {
-             m_InternalState = STATE_RUNNING;
-         }
-         // deliberate drop down
-     case STATE_RUNNING:
-         if(m_FieldsInBuffer >= m_NumFieldsToBuffer)
-         {
-             return S_FALSE;
-         }
-         break;
-     case STATE_FINISHING:
-         // If we've still got data to process so tell
-         // caller to go away
-         if(m_FieldsInBuffer > 0)
-         {
-             return S_FALSE;
-         }
-         m_InternalState = STATE_START;
-         break;
-     }
- 
-     return S_OK;
- }
- 
- STDMETHODIMP CDeintDMO::InternalFreeStreamingResources(void)
- {
- 	return S_OK;
- }
- ////////////////////////////////////////
- //
- //  IMediaObjectImpl::InternalGetInputStreamInfo
- //
- //  *** Called by GetInputStreamInfo, description below ***
- //
- //  The GetInputStreamInfo method retrieves information about an input stream,
- //  such as any restrictions on the number of samples per buffer, and whether
- //  the stream performs lookahead on the input data. This information never
- //  changes.
- //
- //  Parameters
- //      dwInputStreamIndex:
- //          Zero-based index of an input stream on the DMO.
- //
- //      pdwFlags:
- //          [out] Pointer to a variable that receives a bitwise combination of
- //          zero or more DMO_INPUT_STREAM_INFO_FLAGS flags.
- //
- //  Return Value
- //      S_OK Success
- //      DMO_E_INVALIDSTREAMINDEX Invalid stream index
- //      E_POINTER NULL pointer argument
- //
- //  The DMO_INPUT_STREAMF_HOLDS_BUFFERS flag indicates that the DMO performs
- //  lookahead on the incoming data.
- //
- //  The application must be sure to allocate sufficient buffers for the DMO
- //  to process the input. Call the GetInputSizeInfo method to determine the
- //  buffer requirements.
- //
- HRESULT CDeintDMO::InternalGetInputStreamInfo(DWORD dwInputStreamIndex, DWORD *pdwFlags)
- {
-     if(pdwFlags == NULL)
-     {
-         return E_POINTER;
-     }
- 	*pdwFlags = DMO_INPUT_STREAMF_WHOLE_SAMPLES;
- 	*pdwFlags |= DMO_INPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER;
- 	*pdwFlags |= DMO_INPUT_STREAMF_FIXED_SAMPLE_SIZE;
-     if(m_NumFieldsToBuffer > 1)
-     {
-     	*pdwFlags |= DMO_INPUT_STREAMF_HOLDS_BUFFERS;
-     }
-     return S_OK;
- }
- 
- 
- //////////////////////////////////////////
- //
- //  IMediaObjectImpl::InternalGetOutputStreamInfo
- //
- //  *** Called by GetOutputStreamInfo, description below ***
- //
- //  The GetOutputStreamInfo method retrieves information about an output
- //  stream; for example, whether the stream is discardable, and whether
- //  it uses a fixed sample size. This information never changes.
- //
- //  Parameters
- //      dwOutputStreamIndex
- //          Zero-based index of an output stream on the DMO.
- //
- //      pdwFlags
- //          [out] Pointer to a variable that receives a bitwise combination
- //          of zero or more DMO_OUTPUT_STREAM_INFO_FLAGS flags.
- //
- //  Return Value
- //
- //      S_OK Success
- //      DMO_E_INVALIDSTREAMINDEX Invalid stream index
- //      E_POINTER NULL pointer argument
- //
- HRESULT CDeintDMO::InternalGetOutputStreamInfo(DWORD dwOutputStreamIndex, DWORD *pdwFlags)
- {
-     if(pdwFlags == NULL)
-     {
-         return E_POINTER;
-     }
- 	*pdwFlags = DMO_OUTPUT_STREAMF_WHOLE_SAMPLES;
-     *pdwFlags |= DMO_OUTPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER;
-     *pdwFlags |= DMO_OUTPUT_STREAMF_FIXED_SAMPLE_SIZE;
-     *pdwFlags |= DMO_OUTPUT_STREAMF_DISCARDABLE;
- 	return S_OK;
- }
  
  
! STDMETHODIMP CDeintDMO::GetComplexityIndex(long* pComplexity)
  {
      if(pComplexity == NULL)
--- 368,374 ----
  }
  
  
  
! STDMETHODIMP CDeintDMO::get_ComplexityIndex(long* pComplexity)
  {
      if(pComplexity == NULL)
***************
*** 755,778 ****
  }
  
- STDMETHODIMP CDeintDMO::GetNumFieldsDelay(long* pFieldsDelay)
- {
-     if(pFieldsDelay == NULL)
-     {
-         return E_POINTER;
-     }
-     *pFieldsDelay = m_FieldsDelay;
-     return S_OK;
- }
- 
- STDMETHODIMP CDeintDMO::GetNumFieldsBuffered(long* pFieldsBuffered)
- {
-     if(pFieldsBuffered == NULL)
-     {
-         return E_POINTER;
-     }
-     *pFieldsBuffered = m_NumFieldsToBuffer;
-     return S_OK;
- }
- 
  HRESULT CDeintDMO::InternalCheckInputType(DWORD dwInputStreamIndex, const DMO_MEDIA_TYPE *pmt)
  {
--- 380,383 ----
***************
*** 1100,1109 ****
          }
      }
- }
- 
- void CDeintDMO::RemoveOneFieldFromBuffer()
- {
-     ATLASSERT(m_FieldsInBuffer > 0);
-     m_IncomingFields[m_FieldsInBuffer - 1].m_Buffer.Release();
-     --m_FieldsInBuffer;
  }
--- 705,707 ----

Index: CDeintDMO.h
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/DMO/DMO_Lib/CDeintDMO.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CDeintDMO.h	16 May 2003 16:19:12 -0000	1.1
--- CDeintDMO.h	20 May 2003 16:50:57 -0000	1.2
***************
*** 21,24 ****
--- 21,27 ----
  //
  // $Log$
+ // Revision 1.2  2003/05/20 16:50:57  adcockj
+ // Interim checkin, preparation for DMO processing path
+ //
  // Revision 1.1  2003/05/16 16:19:12  adcockj
  // Added new files into DMO framework
***************
*** 28,39 ****
  #pragma once 
  
! #include "CDMO.h"
! 
! #define MAX_FIELDS_IN_BUFFER 6
  
  /////////////////////////////////////////////////////////////////////////////
  // CInPlaceDMO
  class ATL_NO_VTABLE CDeintDMO : 
!     public CDMO,
      public IDeinterlace
  {
--- 31,40 ----
  #pragma once 
  
! #include "CVideoDMO.h"
  
  /////////////////////////////////////////////////////////////////////////////
  // CInPlaceDMO
  class ATL_NO_VTABLE CDeintDMO : 
!     public CVideoDMO,
      public IDeinterlace
  {
***************
*** 45,49 ****
  BEGIN_COM_MAP(CDeintDMO)
  	COM_INTERFACE_ENTRY(IDeinterlace)
!     COM_INTERFACE_ENTRY_CHAIN(CDMO)
  END_COM_MAP()
  
--- 46,50 ----
  BEGIN_COM_MAP(CDeintDMO)
  	COM_INTERFACE_ENTRY(IDeinterlace)
!     COM_INTERFACE_ENTRY_CHAIN(CVideoDMO)
  END_COM_MAP()
  
***************
*** 51,59 ****
  protected:
  	//IMediaObjectImpl Methods   
- 	STDMETHOD(InternalDiscontinuity)(DWORD dwInputStreamIndex);
-     STDMETHOD(InternalFlush)(void);
- 	STDMETHOD(InternalFreeStreamingResources)(void);
-     STDMETHOD(InternalGetInputSizeInfo)(DWORD dwInputStreamIndex, DWORD *pcbSize, DWORD *pcbMaxLookahead, DWORD *pcbAlignment);
- 	STDMETHOD(InternalGetOutputSizeInfo)(DWORD dwOutputStreamIndex, DWORD *pcbSize, DWORD *pcbAlignment);
  	STDMETHOD(InternalProcessInput)(DWORD dwInputStreamIndex, IMediaBuffer *pBuffer, DWORD dwFlags, REFERENCE_TIME rtTimestamp, REFERENCE_TIME rtTimelength);
  	STDMETHOD(InternalProcessOutput)(DWORD dwFlags, DWORD cOutputBufferCount, DMO_OUTPUT_DATA_BUFFER *pOutputBuffers, DWORD *pdwStatus);
--- 52,55 ----
***************
*** 63,115 ****
      HRESULT InternalCheckOutputType(DWORD dwInputStreamIndex, const DMO_MEDIA_TYPE *pmt);
  
- 	// IMediaObjectImpl Required overides
- 	STDMETHOD(InternalAcceptingInput)(DWORD dwInputStreamIndex);
- 
      // IDeinterlace methods
!     STDMETHOD(GetComplexityIndex)(long* pComplexity);
!     STDMETHOD(GetNumFieldsDelay)(long* pFieldsDelay);
!     STDMETHOD(GetNumFieldsBuffered)(long* pFieldsBuffered);
! 
! 
!     STDMETHOD(InternalGetInputStreamInfo)(DWORD dwInputStreamIndex, DWORD *pdwFlags);
!     STDMETHOD(InternalGetOutputStreamInfo)(DWORD dwInputStreamIndex, DWORD *pdwFlags);
! 
! 	// Private functions
!     /** UpdateStatesInternal
!         Override this function if you need to do maintain
!         any information based on the parameters
!     */
!     HRESULT DoProcess(BYTE *pbData, const BYTE *pbInputData, DWORD BytesToProcess);
  
  protected:
      virtual void ProcessSingleFrame(DMO_OUTPUT_DATA_BUFFER *pOutputBuffer);
      virtual void DoDeinterlacingMethod(DMO_OUTPUT_DATA_BUFFER *pOutputBuffer) = 0;
-     virtual void RemoveOneFieldFromBuffer();
  
  protected:
-     typedef struct
-     {
-         BYTE* pLumaStart;
-         BYTE* pChromaStart;
-         BOOL IsTopLine;
-         REFERENCE_TIME StartTime;
-         REFERENCE_TIME Length;
-         CComPtr<IMediaBuffer> m_Buffer;
-     } TField;
- 
-     enum eState
-     {
-         STATE_START,
-         STATE_RUNNING,
-         STATE_FINISHING
-     };
-     
-     TField m_IncomingFields[MAX_FIELDS_IN_BUFFER];
-     long m_FieldsInBuffer;
-     long m_NumFieldsToBuffer;
      long m_ComplexityIndex;
-     long m_FieldsDelay;
-     long m_StartFieldsDone;
- 
-     eState m_InternalState;
  };
--- 59,70 ----
      HRESULT InternalCheckOutputType(DWORD dwInputStreamIndex, const DMO_MEDIA_TYPE *pmt);
  
      // IDeinterlace methods
!     STDMETHOD(get_ComplexityIndex)(long* pComplexity);
  
  protected:
      virtual void ProcessSingleFrame(DMO_OUTPUT_DATA_BUFFER *pOutputBuffer);
      virtual void DoDeinterlacingMethod(DMO_OUTPUT_DATA_BUFFER *pOutputBuffer) = 0;
  
  protected:
      long m_ComplexityIndex;
  };

Update of /cvsroot/deinterlace/DScaler5/GenDMOProp
In directory sc8-pr-cvs1:/tmp/cvs-serv4817/GenDMOProp

Modified Files:
	GenDMOProp.idl LicensePropPage.cpp 
Log Message:
Interim checkin, preparation for DMO processing path


Index: GenDMOProp.idl
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/GenDMOProp/GenDMOProp.idl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** GenDMOProp.idl	16 May 2003 15:18:37 -0000	1.4
--- GenDMOProp.idl	20 May 2003 16:51:01 -0000	1.5
***************
*** 22,25 ****
--- 22,28 ----
  //
  // $Log$
+ // Revision 1.5  2003/05/20 16:51:01  adcockj
+ // Interim checkin, preparation for DMO processing path
+ //
  // Revision 1.4  2003/05/16 15:18:37  adcockj
  // Interim check inas we move to supporting DMO plug-ins
***************
*** 52,55 ****
--- 55,72 ----
      } eFreeLicense;
  
+     typedef enum
+     {
+         PRE_FILMDETECT_1,
+         PRE_FILMDETECT_2,
+         PRE_FILMDETECT_3,
+         IS_FILMDETECT,
+         POST_FD_PRE_DEINT_1,
+         POST_FD_PRE_DEINT_2,
+         POST_FD_PRE_DEINT_3,
+         IS_DEINT,
+         POST_DEINT_1,
+         POST_DEINT_2,
+         POST_DEINT_3,
+     } eVideoFilterPosition;
  
  	[
***************
*** 61,67 ****
  	interface IAmFreeSoftwareLicensed : IUnknown
  	{
!         HRESULT GetName(BSTR* Name);
! 		HRESULT GetLicense(eFreeLicense* License);
!         HRESULT GetAuthors(BSTR* Authors);
  	};
  
--- 78,84 ----
  	interface IAmFreeSoftwareLicensed : IUnknown
  	{
!         [propget] HRESULT Name([out, retval] BSTR* Name);
! 		[propget] HRESULT License([out, retval] eFreeLicense* License);
!         [propget] HRESULT Authors([out, retval] BSTR* Authors);
  	};
  
***************
*** 74,80 ****
  	interface IDeinterlace : IUnknown
  	{
!         HRESULT GetComplexityIndex(long* pComplexity);
!         HRESULT GetNumFieldsDelay(long* pFieldsDelay);
!         HRESULT GetNumFieldsBuffered(long* pFieldsBuffered);
      }
  
--- 91,95 ----
  	interface IDeinterlace : IUnknown
  	{
!         [propget] HRESULT ComplexityIndex([out, retval] long* pComplexity);
      }
  
***************
*** 87,92 ****
  	interface IDScalerFilterPlugin : IUnknown
  	{
!         HRESULT Attach(IUnknown* m_DScalerFilter);
          HRESULT Detach();
      }
      
--- 102,120 ----
  	interface IDScalerFilterPlugin : IUnknown
  	{
!         HRESULT Attach([in] IUnknown* m_DScalerFilter);
          HRESULT Detach();
+     }
+ 
+ 	[
+         object,
+ 		uuid(D2C9AF19-8AC4-11d7-B851-0002A5623377),
+ 		helpstring("IDScalerVideoFilterPlugin Interface"),
+ 		pointer_default(unique)
+ 	]
+ 	interface IDScalerVideoFilterPlugin : IUnknown
+ 	{
+         [propget] HRESULT Position([out, retval] eVideoFilterPosition* pPosition);
+         [propget] HRESULT NumFieldsDelay([out, retval] long* pFieldsDelay);
+         [propget] HRESULT NumFieldsBuffered([out, retval] long* pFieldsBuffered);
      }
      

Index: LicensePropPage.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/GenDMOProp/LicensePropPage.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** LicensePropPage.cpp	6 May 2003 16:36:27 -0000	1.2
--- LicensePropPage.cpp	20 May 2003 16:51:02 -0000	1.3
***************
*** 22,25 ****
--- 22,28 ----
  //
  // $Log$
+ // Revision 1.3  2003/05/20 16:51:02  adcockj
+ // Interim checkin, preparation for DMO processing path
+ //
  // Revision 1.2  2003/05/06 16:36:27  adcockj
  // Prelimuianry support for license page
***************
*** 87,95 ****
      }
  
!     hr = m_License->GetName(&Name);
      if(FAILED(hr)) return hr;
! 	hr = m_License->GetLicense(&LicenceType);
      if(FAILED(hr)) return hr;
!     hr = m_License->GetAuthors(&Authors);
      if(FAILED(hr)) return hr;
      
--- 90,98 ----
      }
  
!     hr = m_License->get_Name(&Name);
      if(FAILED(hr)) return hr;
! 	hr = m_License->get_License(&LicenceType);
      if(FAILED(hr)) return hr;
!     hr = m_License->get_Authors(&Authors);
      if(FAILED(hr)) return hr;