vdpau: revert some left overs related to dropping from previous design

FernetMenta · Mar 26, 2012 · ea930ab · ea930ab
1 parent 18fa951
commit ea930ab
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 37 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
@@ -357,29 +357,15 @@ void CDVDVideoCodecFFmpeg::SetDropState(bool bDrop)
     //  2 seem to be to high.. it causes video to be ruined on following images
     if( bDrop )
     {
-      if (m_pHardware && m_pHardware->AllowFrameDropping())
-      {
-        m_pHardware->SetDropState(true);
-      }
-      else
-      {
-        // TODO: 'hurry_up' has been deprecated in favor of the skip_* variables
-        // Use those instead.
-
-        //m_pCodecContext->hurry_up = 1;
-        m_pCodecContext->skip_frame = AVDISCARD_NONREF;
-        m_pCodecContext->skip_idct = AVDISCARD_NONREF;
-        m_pCodecContext->skip_loop_filter = AVDISCARD_NONREF;
-      }
+      m_pCodecContext->skip_frame = AVDISCARD_NONREF;
+      m_pCodecContext->skip_idct = AVDISCARD_NONREF;
+      m_pCodecContext->skip_loop_filter = AVDISCARD_NONREF;
     }
     else
     {
       m_pCodecContext->skip_frame = AVDISCARD_DEFAULT;
       m_pCodecContext->skip_idct = AVDISCARD_DEFAULT;
       m_pCodecContext->skip_loop_filter = AVDISCARD_DEFAULT;
-
-      if (m_pHardware)
-         m_pHardware->SetDropState(false);
     }
   }
 }

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
@@ -46,11 +46,6 @@ class CDVDVideoCodecFFmpeg : public CDVDVideoCodec
     virtual void Reset     () {}
     virtual const std::string Name() = 0;
     virtual CCriticalSection* Section() { return NULL; }
-
-    // signal to vdpau (mixer) whether we run normal speed or not
-    // so it can switch off deinterlacing
-    virtual bool AllowFrameDropping() {return true;};
-    virtual void SetDropState(bool bDrop) {return;};
   };
 
   CDVDVideoCodecFFmpeg();

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
@@ -1035,24 +1035,11 @@ void CDecoder::Reset()
   }
 }
 
-bool CDecoder::AllowFrameDropping()
-{
-//  if (m_bVdpauDeinterlacing && m_dropCount < 5)
-//    return false;
-//  else
-//    return true;
-}
-
 void CDecoder::ReturnRenderPicture(CVdpauRenderPicture *renderPic)
 {
   m_vdpauOutput.m_dataPort.SendOutMessage(COutputDataProtocol::RETURNPIC, &renderPic, sizeof(renderPic));
 }
 
-void CDecoder::SetDropState(bool bDrop)
-{
-  m_dropState = bDrop;
-}
-
 bool CDecoder::CheckStatus(VdpStatus vdp_st, int line)
 {
   if (vdp_st != VDP_STATUS_OK)

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
@@ -527,8 +527,6 @@ class CDecoder
   virtual void Reset();
   virtual void Close();
   virtual long Release();
-  virtual bool AllowFrameDropping();
-  virtual void SetDropState(bool bDrop);
 
   virtual int  Check(AVCodecContext* avctx);
   virtual const std::string Name() { return "vdpau"; }