[Deinterlace-checkins] CVS: DScaler5/Filters/Decoders/MpegVideo MpegDecoder.cpp,1.34,1.35 MpegDecoder_SubPic.cpp,1.10,1.11

[John A. <ad...@us...>]

Update of /cvsroot/deinterlace/DScaler5/Filters/Decoders/MpegVideo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10290/Filters/Decoders/MpegVideo

Modified Files:
	MpegDecoder.cpp MpegDecoder_SubPic.cpp 
Log Message:
Fixes Blight's problems from the forum


Index: MpegDecoder.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/Filters/Decoders/MpegVideo/MpegDecoder.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** MpegDecoder.cpp	23 Jul 2004 21:00:12 -0000	1.34
--- MpegDecoder.cpp	28 Jul 2004 16:32:34 -0000	1.35
***************
*** 45,48 ****
--- 45,51 ----
  //
  // $Log$
+ // Revision 1.35  2004/07/28 16:32:34  adcockj
+ // Fixes Blight's problems from the forum
+ //
  // Revision 1.34  2004/07/23 21:00:12  adcockj
  // Fixed compilation problem in VS6
***************
*** 897,901 ****
              if(mvih->dwFlags & AMMPEG2_SourceIsLetterboxed)
              {
!                 LOG(DBGLOG_FLOW, ("L Sent\n"));
                  m_LetterBoxed = true;
              }
--- 900,904 ----
              if(mvih->dwFlags & AMMPEG2_SourceIsLetterboxed)
              {
!                 LOG(DBGLOG_FLOW, ("Letterboxed Sent\n"));
                  m_LetterBoxed = true;
              }
***************
*** 1301,1305 ****
          }
          Props.tStart = rtStart;
-         //Props.tStop = rtStop;
  
          if(m_IsDiscontinuity || fRepeatLast || m_NeedToAttachFormat)
--- 1304,1307 ----
***************
*** 1316,1333 ****
          }
          Props.dwSampleFlags |= AM_SAMPLE_TIMEVALID;
-         //Props.dwSampleFlags |= AM_SAMPLE_STOPVALID;
          Props.dwSampleFlags |= AM_SAMPLE_SPLICEPOINT;
  
!         if(m_CurrentPicture->m_NumFields == 3)
!             if(m_CurrentPicture->m_Flags&PIC_FLAG_TOP_FIELD_FIRST)
!                 Props.dwTypeSpecificFlags = AM_VIDEO_FLAG_FIELD1FIRST | AM_VIDEO_FLAG_REPEAT_FIELD;
              else
!                 Props.dwTypeSpecificFlags = AM_VIDEO_FLAG_REPEAT_FIELD;
          else
!             if(m_CurrentPicture->m_Flags&PIC_FLAG_TOP_FIELD_FIRST)
!                 Props.dwTypeSpecificFlags = AM_VIDEO_FLAG_FIELD1FIRST;
!             else
!                 Props.dwTypeSpecificFlags = 0;
! 
  
          // tell the next filter that this is film
--- 1318,1342 ----
          }
          Props.dwSampleFlags |= AM_SAMPLE_TIMEVALID;
          Props.dwSampleFlags |= AM_SAMPLE_SPLICEPOINT;
  
!         // send video flags to VMR only
!         // causes wierd strobing effect on film otherwise
!         if(m_ConnectedToOut == VMR7_OUTFILTER || m_ConnectedToOut == VMR9_OUTFILTER)
!         {
!             if(m_CurrentPicture->m_NumFields == 3)
!                 if(m_CurrentPicture->m_Flags&PIC_FLAG_TOP_FIELD_FIRST)
!                     Props.dwTypeSpecificFlags = AM_VIDEO_FLAG_FIELD1FIRST | AM_VIDEO_FLAG_REPEAT_FIELD;
!                 else
!                     Props.dwTypeSpecificFlags = AM_VIDEO_FLAG_REPEAT_FIELD;
              else
!                 if(m_CurrentPicture->m_Flags&PIC_FLAG_TOP_FIELD_FIRST)
!                     Props.dwTypeSpecificFlags = AM_VIDEO_FLAG_FIELD1FIRST;
!                 else
!                     Props.dwTypeSpecificFlags = 0;
!         }
          else
!         {
!             Props.dwTypeSpecificFlags = 0;
!         }
  
          // tell the next filter that this is film

Index: MpegDecoder_SubPic.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler5/Filters/Decoders/MpegVideo/MpegDecoder_SubPic.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** MpegDecoder_SubPic.cpp	7 Jul 2004 14:07:07 -0000	1.10
--- MpegDecoder_SubPic.cpp	28 Jul 2004 16:32:34 -0000	1.11
***************
*** 40,43 ****
--- 40,46 ----
  //
  // $Log$
+ // Revision 1.11  2004/07/28 16:32:34  adcockj
+ // Fixes Blight's problems from the forum
+ //
  // Revision 1.10  2004/07/07 14:07:07  adcockj
  // Added ATSC subtitle support
***************
*** 296,302 ****
          if(!DecodeSubpic(m_SubPicureList.back(), sphli, offset1, offset2))
          {
-             LOG(DBGLOG_ALL,("Refresh Image\n"));
              CProtectCode WhileVarInScope(&m_DeliverLock);
!             Deliver(true);
          }
      }
--- 299,308 ----
          if(!DecodeSubpic(m_SubPicureList.back(), sphli, offset1, offset2))
          {
              CProtectCode WhileVarInScope(&m_DeliverLock);
!             if(m_CurrentPicture && HasSubpicsToRender(m_CurrentPicture->m_rtStart))
!             {
!                 LOG(DBGLOG_ALL,("Refresh Image\n"));
!                 Deliver(true);
!             }
          }
      }