summaryrefslogtreecommitdiff
path: root/avmedia
AgeCommit message (Collapse)AuthorFilesLines
2014-08-07Handle collada libraries seperately: --disable-colladaZolnai Tamás2-7/+7
Depends on gltf support. Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
2014-08-05implement --with-system-gltfRene Engelhard3-0/+12
Change-Id: Ic842006b28f8043bcbbaa81ab5a20e15aa52ac82
2014-08-05Upload first official libgltf release: libgltf-0.0.0Zolnai Tamás6-49/+47
News relative to previous draft version: - Memory management improvements (fdo#81180) - Reduced OpenGL requirements (version 3.3 -> version 3.0) - Cleaned up API Change-Id: Ie3caf8684a9f5e6a872a1ac35beafb94df03bcf5 Reviewed-on: https://gerrit.libreoffice.org/10744 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2014-08-03avmedia/gstreamer: use GST_SECONDSimon Danner2-4/+4
use GST_SECOND instead of magic value Change-Id: I992ecbab458f113a75658b1ff69df60068324509 Reviewed-on: https://gerrit.libreoffice.org/10705 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-07-29simplify return argument of SfxPoolItem::GetPresentationNoel Grandin1-2/+2
since all two of the actual call-sites only care about whether it is a valid presentation or not, not what kind of presentation it is. Change-Id: I75717c88878d37b2897741b0c833ff283b3fee59
2014-07-21fdo#81055: Crash due to inadequate checks for GL version / capabilitiesZolnai Tamás1-0/+31
Base line is OpenGL 2.1 + extensions: GL_ARB_framebuffer_object (part of OpenGL 3.0) for glGenFramebuffers, glGenRenderbuffers... GL_ARB_vertex_array_object (part of OpenGL 3.0) for glGenVertexArrays, glBindVertexArray... GL_ARB_sampler_objects (part of OpenGL 3.3) for glGenSamplers, glBindSampler... Change-Id: Ib8acf41ab85cd1677d0341719b3a5b4f743ed756
2014-07-20Avoid a warning, return early on empty URL.Zolnai Tamás1-0/+4
Change-Id: Ie4eb55fa52ee97eb98a5269658ce5183a287618b
2014-07-17glTF: allow to move camera also by keyboard in orbit mode.Zolnai Tamás1-2/+29
Change-Id: Ibf16b9651988358c30d649dd937813329d0f64ec
2014-07-16fdo#81182: Resizing glTF window affects camera positionZolnai Tamás1-2/+3
Camera moves by click and drag, with checking the last mouse position we can make sure click was done inside the window before drag. Resizing can trigger drag event, but not click event. Change-Id: I9e8b70fcb4a0abf26e76e03cafd026f940eceb10
2014-07-14glTF: More rendering related error handlingZolnai Tamás2-2/+12
If any error occurs related to glTF rendering, a question mark is displayed at the place of the OpenGL window (Question mark is a general concept of media objects). Change-Id: Id7df5a47a4dd6832e640b3a7cb3c7712ebfb4408
2014-07-11glTF: crash after starting a model without an OpenGL windowZolnai Tamás1-0/+3
Change-Id: I726f4d62ab062fbd41376183f60c26d8e6cfe33e
2014-07-11glTF: Removing one model breaks an other modelZolnai Tamás1-0/+1
Reproduce: - Insert two models - Play first model - Delete second model Result: crash (windows) or first model disappear from the opengl window (linux). Change-Id: I940960754f42a2e4faf5b9f37c0d4a3c155e4650
2014-07-07fix build errors related to AVFoundation @ OS X <10.7Douglas Mencken1-0/+2
AVFoundation framework is available in OS X v10.7 and later related commits: 7822b5535cccc68e5b454d04a66a6b4f27675ec6 0b49cc5b03b39aa1dfddf924c6eaf8cb42e791a8 Change-Id: If771fca79c41d70e51eab533faec7bb9997803b7 Reviewed-on: https://gerrit.libreoffice.org/9769 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2014-07-04glTF: camera movement constraint: use distance from the boundary boxZolnai Tamás1-2/+2
... instead of distance from model center position. Change-Id: I379ab5e32cc5009d0eb751c4808fecf0109d1e5a
2014-07-03glTF: improve camera movement constraintZolnai Tamás1-1/+2
Stop moving only on the wrong direction. Change-Id: Ic9e7f2e7814d9adcbcf707e7fb786bf17fac3125
2014-07-03glTF: constraine camera move in orbit modeZolnai Tamás2-0/+19
Not to get too close to / too far from the model. Too close means move into the model. Change-Id: Ie25d87c88093d4baaf98f13ab8239263b5e1bf66
2014-07-03Remove obsolete commentZolnai Tamás1-1/+0
Change-Id: I0cc592b245871187dd41e85be8c86e6e7878181b
2014-07-01avmedia: sal_Bool -> boolStephan Bergmann3-4/+4
Change-Id: Ief9b2cc517e9c0666e656737cee9a953c676a1d9
2014-07-01Activate the "suspicious cast to sal_Bool" parts of loplugin:salboolStephan Bergmann1-1/+1
Change-Id: I78a368ef2899b2462251b45a327fc7b1f31fe764
2014-06-25glTF rendering: moving in walktrough mode is to fastZolnai Tamás1-4/+4
Change-Id: I2b7869c6c14b69732db864a03a2d9b6638424cf7
2014-06-25Update libgltf: new build system and various fixesZolnai Tamás6-38/+69
Building: - The new tarball has reasonable build system so build libgltf as external package instead of compiling source files directly. - Freetype dependancy is removed Improvements comes with the new libgltf - Can rotate the models too (orbit mode) - Two camera handling mode: walkthrough and orbit (press M to change). - gltf_animation_set_time() works - FPS can be displayed without freetype (press F) Additional notes: - There were some bugs/regressions which are fixed during the integration (see patches). - License files are uddated now. - libgltf building is enabled only on those platforms on which gltf support actually works (windows and linux) Change-Id: Ia6c9c4da53a9b4fedba0d73aa5791489f8ad424b Reviewed-on: https://gerrit.libreoffice.org/9895 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2014-06-16glTF export: Use plural folder namesZolnai Tamás1-1/+1
Change-Id: If17628395ede512c00b666efc5511d9711edfb5a
2014-06-13kmz2gltf: Use LO's ZipFileAccess to unzip kmzZolnai Tamás1-13/+30
Instead of this hacky collada2gltf patch. Change-Id: I9f15c4ee1c9ea1a1a64116691b12b696c1d63ac5
2014-06-13glTF: Avoid segmentation fault when one of the input files can't be loadedZolnai Tamás1-1/+1
libgltf: Parser releases the glTFHandle, but it was not connected to the corresponding handle by RenderScene::initScene. So when rendering stopped during file loading because of missing file, Parser's handle member was an uninitialized pointer so it crashed by calling release method. Change-Id: I80099195341766f474143014d5949703d47a6fd8
2014-06-13Extract kmz and collada converter code to a seperate functionZolnai Tamás1-60/+80
Plus fix some problems related to temp files. e.g. kmz converter was creating temp files next to the input file. Change-Id: Ib3f367fe1c4ef3cb25f5ca1c3d06b2dde78c5e45
2014-06-12Change glTF mime type: {application -> model}/vnd.gltf+jsonZolnai Tamás1-1/+1
There is no an accepted mime type for glTF models yet, so follow collada's mime type: model/vnd.collada+xml. Change-Id: I1e23a95dbb0caea781dade819f8e08235cb5c1dc
2014-06-12Introduce HAVE_FEATURE_GLTF to enable/disable gltf related codeZolnai Tamás3-1/+20
When it is a release build then enable it only on Windows and Linux. Change-Id: I7c462aeb75e6ab60eeaa0fa42ca7853a6369b742
2014-05-30fdo#68849: Add header guards to all include filesJens Carl1-1/+9
Added header guards to files in directories avmedia/, basegfx/, chart2/, and connectivity/ Change-Id: I94ec438ec918ccef1c518edfd9ab4944e9e2961b Reviewed-on: https://gerrit.libreoffice.org/9555 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-05-29OGLFrameGrabber: use reference instead of pointerZolnai Tamás3-8/+9
Change-Id: Id21138ce2a5d8e764407f42afa2b21464da70e45
2014-05-29OGLWindow: no need to call update after changes, timer takes care of itZolnai Tamás1-7/+0
Change-Id: Ifc5ecf4ec3e385293889c82a3b678a8dbcd3edbb
2014-05-29OGLWindow: remove unused zoom levelZolnai Tamás2-17/+3
Zooming is solved on a more sophisticated way. Change-Id: I0386ace8a3751d708ac86ff0ddf0836c79ae603f
2014-05-29Remove accidently committed lineZolnai Tamás1-1/+0
Change-Id: Iace701d7473e874cc8df64349b71faa4a5493d5e
2014-05-29OGLWindow: use reference instead of pointerZolnai Tamás3-44/+46
Change-Id: I72ef9570ac9e7b4cb4afc2319725743098722d31
2014-05-29OGLPlayer: use more assertionsZolnai Tamás1-0/+20
Change-Id: I0a224a90a3e99d12809d40612b1e66d7c023aebc
2014-05-27First stop the timer, then the animation.Jan Holesovsky1-1/+1
Change-Id: Icd5f9f4b8e1c48176fdb73c954e1c4b7d0811516
2014-05-27Use AutoTimer instead of Timer, and add some more locking.Jan Holesovsky2-2/+5
Change-Id: I83a99e333a6c62bf7779e3fbbcc3e5af38bb2ca5
2014-05-29OGLPlayer: handle json parsing errorZolnai Tamás1-2/+16
Change-Id: I86aea12318d4e21ccadd97ad2820e31bd4580c99
2014-05-29OGLPlayer: check before dereferenceZolnai Tamás1-4/+7
Change-Id: I4bbaf97fe8c5def441ca106c26ad312281ed352f
2014-05-28glTF rendering: workaround for camera movementsZolnai Tamás1-6/+21
If the glTF contains camera movement in it moving camera by keyboard didn't work very well. Change-Id: I9300a257858d4f35c2d622654a0c2fd85eedc5ed (cherry picked from commit 968b7f807561339d0083fe0aa6e893983ca60456)
2014-05-28libgltf: solve this memory leak problem on a better way 2Zolnai Tamás1-1/+19
Handle those cases when file loading failes. Release *.json file on a different way since it is allocated by libgltf (inside the glTFHandle). (cherry picked from commit fafc1e29c1f060c1a44361a0445300f9786ad6f4) Change-Id: Idf6c6971a8ac1b342d89dc4f61a62624183e01d0
2014-05-27glTF rendering: fix texture problemsZolnai Tamás1-1/+2
It seems we need mirroring. Change-Id: Id9ad7041eb09ec773e4174cb68d34a65a2c473fe
2014-05-25cppcheck: unusedFunctionThomas Arnhold2-10/+0
Change-Id: I81f2a4be65bbc9359e51accccb746f1e8ea48c4f
2014-05-25avmedia: call resize before player window is createdZolnai Tamás1-0/+1
Since b5529c8c457f442bfc43305becc0c02d6a09ee80 MediaChildWindow is depend on the media URL so it is constructed later and so one resizing is missed before creating the player window which causes to display nothing in the media player (Tools -> Media Player) Change-Id: I548e6bb73193fccd1735e8343e9c06428ee686bc
2014-05-25Partly revert 4ec3554a80f065c2d9c957d6ce7f577fb195be02Zolnai Tamás2-3/+2
mpEvents is freed by other object so using scoped_ptr lead to crash. Change-Id: I28c9d322b5ee5da6edf5022da18b42f59b608dec
2014-05-24libgltf: Another new version.Jan Holesovsky1-9/+9
Change-Id: I784579717674f1caf68ad489d1a931936f6f9651
2014-05-23avmedia: remove unused code related to fast-forwardZolnai Tamás15-111/+3
One part of that was removed by: 55d52165df003d253d813f3ea7085f4d89fdb3ce e.g. setRate() Change-Id: Ia5def0150029c1597cd505bbaf740a42819a7c73
2014-05-23avmedia: avoid segmentation fault during destruction of media windowZolnai Tamás2-3/+5
mpEvents is not initialized in the destructor any more: b5529c8c457f442bfc43305becc0c02d6a09ee80 Plus use scoped_ptr to stop memory leak. Change-Id: Idaaa274e39c1ac34270ae5b0acdd237ee5aec1c3
2014-05-23coverity#1210188 Uninitialized pointer fieldCaolán McNamara1-0/+1
Change-Id: Ifbf29a8601d0527695951acea57b75f25a85ed89
2014-05-22Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part19Julien Nabet2-9/+9
Change-Id: Iab50c52a132c90389992ef68c2d31df95a193ab9
2014-05-22glTF: download *.dae and *.kmz files to the temp folder before conversionZolnai Tamás1-8/+33
Copy them to the same folder where the conversion output is written. Change-Id: I38b93bf3fc427974cff7d6975151451a253b1cce
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-06 09:05:01 +0000