This commit is contained in:
Glenn Maynard
2005-10-21 01:39:07 +00:00
parent 073d9e5290
commit f77dd38f0f
2 changed files with 7 additions and 16 deletions
@@ -1,3 +1,5 @@
/* MovieTexture_DShow - DirectShow movie renderer. */
#ifndef RAGE_MOVIE_TEXTURE_DSHOW_H #ifndef RAGE_MOVIE_TEXTURE_DSHOW_H
#define RAGE_MOVIE_TEXTURE_DSHOW_H #define RAGE_MOVIE_TEXTURE_DSHOW_H
@@ -27,9 +29,6 @@ typedef char TCHAR, *PTCHAR;
#include "RageTexture.h" #include "RageTexture.h"
#include "RageThreads.h" #include "RageThreads.h"
//-----------------------------------------------------------------------------
// RageMovieTexture Class Declarations
//-----------------------------------------------------------------------------
class MovieTexture_DShow : public RageMovieTexture class MovieTexture_DShow : public RageMovieTexture
{ {
public: public:
@@ -1,12 +1,6 @@
#ifndef RAGEMOVIETEXTURE_HELPER_H #ifndef RAGE_MOVIE_TEXTURE_DSHOW_HELPER_H
#define RAGEMOVIETEXTURE_HELPER_H #define RAGE_MOVIE_TEXTURE_DSHOW_HELPER_H
// #include <windows.h>
// #include <atlbase.h>
//#include "baseclasses/streams.h"
//#include "baseclasses/streams.h"
#include "MovieTexture_DShow.h" #include "MovieTexture_DShow.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -24,13 +18,11 @@ public:
CTextureRenderer(); CTextureRenderer();
~CTextureRenderer(); ~CTextureRenderer();
// overridden methods HRESULT CheckMediaType( const CMediaType *pmt ); // Format acceptable?
HRESULT CheckMediaType(const CMediaType *pmt ); // Format acceptable? HRESULT SetMediaType( const CMediaType *pmt ); // Video format notification
HRESULT SetMediaType(const CMediaType *pmt ); // Video format notification HRESULT DoRenderSample( IMediaSample *pMediaSample ); // New video sample
HRESULT DoRenderSample(IMediaSample *pMediaSample); // New video sample
void OnReceiveFirstSample( IMediaSample * pSample ); void OnReceiveFirstSample( IMediaSample * pSample );
// new methods
long GetVidWidth() const { return m_lVidWidth; } long GetVidWidth() const { return m_lVidWidth; }
long GetVidHeight() const { return m_lVidHeight; } long GetVidHeight() const { return m_lVidHeight; }
void SetRenderTarget( MovieTexture_DShow* pTexture ); void SetRenderTarget( MovieTexture_DShow* pTexture );