slideshow/source/engine/shapes/viewmediashape.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
New commits: commit 358d6006f1d9652aaf01661ea8dba4d7ec46d508 Author: Zolnai Tamás <[email protected]> Date: Mon Jun 30 16:59:42 2014 +0200 Optimize media rendering during slideshow: save one grabFrame() call 'FallbackGraphic' property introduced in: b862a216f769d10e726ad759762b5e6a412acdaf contains the previously called grabFrame's result, so we can use that instead of render the media frame again (it affects glTF models too). Change-Id: Ia93e771e92cc7630480c665dea66fbf571dfa2a0 diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index c11aaf5..9ebc014 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -196,16 +196,14 @@ namespace slideshow if( !mpMediaWindow.get() && !mxPlayerWindow.is() ) { - OUString sURL; - OUString sMimeType; + uno::Reference< graphic::XGraphic > xGraphic; uno::Reference< beans::XPropertySet > xPropSet( mxShape, uno::UNO_QUERY ); if (xPropSet.is()) { - xPropSet->getPropertyValue("PrivateTempFileURL") >>= sURL; - xPropSet->getPropertyValue("MediaMimeType") >>= sMimeType; + xPropSet->getPropertyValue("FallbackGraphic") >>= xGraphic; } - const Graphic aGraphic(avmedia::MediaWindow::grabFrame(sURL,"",sMimeType)); + Graphic aGraphic(xGraphic); const BitmapEx aBmp = aGraphic.GetBitmapEx(); uno::Reference< rendering::XBitmap > xBitmap(vcl::unotools::xBitmapFromBitmapEx(
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
