diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-20 18:00:33 +0200 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-20 18:00:48 +0200 |
commit | d8920e6d1de0698f7c132d74cc34e2f1021c6fb3 (patch) | |
tree | 83a8b9101fa46c9e3a7bd3ba32b6cab5b91b4a2e /avmedia/source/viewer | |
parent | 78609b36e0d61bd5535cfdc1ab2f1e0e59505042 (diff) |
Make OGLFrameGrabber work
Steps of grabFrame
- Init opengl context
- Call libgltf to render
- Get a RGB buffer from libgltf
- Create a Bitmap from this RGB buffer
Additionally:
- Using mimetype is neccessary to decide which player to create.
- bAllowToCreateReplacementGraphic is unneeded.
Change-Id: I7fef043a3341771389144a4f4cac71b0862ef8a7
Diffstat (limited to 'avmedia/source/viewer')
-rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 12 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.hxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 992bb40a3460..e586a587e2ef 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -385,19 +385,19 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bo -uno::Reference< media::XPlayer > MediaWindow::createPlayer( const OUString& rURL, const OUString& rReferer ) +uno::Reference< media::XPlayer > MediaWindow::createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType ) { - return priv::MediaWindowImpl::createPlayer( rURL, rReferer ); + return priv::MediaWindowImpl::createPlayer( rURL, rReferer, pMimeType ); } uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL, const OUString& rReferer, - bool bAllowToCreateReplacementGraphic, + const OUString& sMimeType, double fMediaTime ) { - uno::Reference< media::XPlayer > xPlayer( createPlayer( rURL, rReferer ) ); + uno::Reference< media::XPlayer > xPlayer( createPlayer( rURL, rReferer, &sMimeType ) ); uno::Reference< graphic::XGraphic > xRet; boost::scoped_ptr< Graphic > apGraphic; @@ -416,7 +416,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL xRet = xGrabber->grabFrame( fMediaTime ); } - if( !xRet.is() && bAllowToCreateReplacementGraphic ) + if( !xRet.is() ) { awt::Size aPrefSize( xPlayer->getPreferredPlayerWindowSize() ); @@ -428,7 +428,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL } } - if( !xRet.is() && !apGraphic.get() && bAllowToCreateReplacementGraphic ) + if( !xRet.is() && !apGraphic.get() ) { const BitmapEx aBmpEx( getEmptyLogo() ); apGraphic.reset( new Graphic( aBmpEx ) ); diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index f24c6e18c214..515580c65df3 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -205,7 +205,7 @@ MediaWindowImpl::~MediaWindowImpl() delete mpMediaWindowControl; } -uno::Reference< media::XPlayer > MediaWindowImpl::createPlayer( const OUString& rURL, const OUString& rReferer, OUString* pMimeType ) +uno::Reference< media::XPlayer > MediaWindowImpl::createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType ) { uno::Reference< media::XPlayer > xPlayer; diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index e0018639fc96..317cea8ef7d1 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -94,7 +94,7 @@ namespace avmedia MediaWindowImpl( Window* parent, MediaWindow* pMediaWindow, bool bInternalMediaControl ); virtual ~MediaWindowImpl(); - static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, OUString* pMimeType = 0 ); + static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 ); void setURL( const OUString& rURL, OUString const& rTempURL, OUString const& rReferer ); |