summaryrefslogtreecommitdiff
path: root/avmedia
AgeCommit message (Collapse)AuthorFilesLines
2014-10-14fdo#84008: kill c++11 code from collada2gltfZolnai Tamás1-1/+2
... so older compliers can deal with it. Change-Id: I7ecfa37601cae2979a5285436596175d2ebe1fe4 Reviewed-on: https://gerrit.libreoffice.org/11706 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-09-12fdo#82994 Added some more audio formatsDaniel Sikeler1-2/+2
(cherry-picked from commit 380a4618dd8205c56a5c6622e01e88ae8911fe5e) Change-Id: I0acd880dc1886f46e1fe146941f1027c9b6ab265 Reviewed-on: https://gerrit.libreoffice.org/11388 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/11403 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-09-12fdo#82994: Changed filterlabel of .ac3-filesDaniel Sikeler1-1/+1
(cherry-picked from commit 62c0ff126a97df0601054fa15498ccccf96077f7) Change-Id: I7820656211e341e4d1e51821240a9319570fcffd Reviewed-on: https://gerrit.libreoffice.org/11351 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/11402 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-09-12fdo#82994: added missing media extensionsDaniel Sikeler1-1/+6
(cherry-picked from commit f43d50d1e470dbfbadb4e90135069f0ca89d65c7) Change-Id: Ibbce02b43192fd3afb4984f5f38251a518d7be06 Reviewed-on: https://gerrit.libreoffice.org/11172 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/11401 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-09-04Upgrade libgltf to 0.0.1Zolnai Tamás5-32/+36
News in this version: - Solve some limitations of walkthrough mode (fdo#81425) - Multisampling (better rendering quality, mainly at the edges) - Better error handling (no crash in case of invalid input file) Reviewed-on: https://gerrit.libreoffice.org/11179 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> Conflicts: download.lst external/libgltf/UnpackedTarball_libgltf.mk external/libgltf/pathces/append_shader_version.patch external/libgltf/pathces/missing_include.patch vcl/source/opengl/OpenGLContext.cxx Change-Id: I46fdf56b00476614487fbcc04178e43e33a01794 Reviewed-on: https://gerrit.libreoffice.org/11194 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-08-29Handle collada libraries seperately: --disable-colladaZolnai Tamás2-7/+7
Depends on gltf support. (cherry picked from commit 191f0944fd8fc30493eda58c7adfdfa0b538f507) Conflicts: config_host.mk.in sd/source/ui/func/fuinsert.cxx Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca Reviewed-on: https://gerrit.libreoffice.org/11193 Tested-by: Rene Engelhard <rene@debian.org> Reviewed-by: Rene Engelhard <rene@debian.org>
2014-08-29implement --with-system-gltfRene Engelhard3-0/+12
Change-Id: Ic842006b28f8043bcbbaa81ab5a20e15aa52ac82 (cherry picked from commit 97bda8e081fd746e9ef743b165b5bf621fc21fbb)
2014-08-17libgltf: Append shader language version to the shader filesZolnai Tamás1-12/+1
In general glTF shader files does not contain version directives and in some case it make shader compiler using GLSL 1.1 which leads to that the shader compiler fails. So we need to append the choosen version number which is GLSL 1.3 in case of libgltf, but this also means that from that point OpenGL 3.0 is the new reuirements since GLSL 1.3 is available only from that version. (cherry picked from commit c67026f27023008d124c8ab76533169f032b04f6) Conflicts: external/libgltf/UnpackedTarball_libgltf.mk Change-Id: Ic4382266432ea474aeb3e603b32a998b9aeed280 Reviewed-on: https://gerrit.libreoffice.org/10947 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
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 Reviewed-on: https://gerrit.libreoffice.org/10744 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> (cherry picked from commit 48d1f860716720abdd7febdad4b57b9f31a6a1dc) Conflicts: avmedia/source/opengl/oglplayer.cxx download.lst libgltf: fix dbgutil build (cherry picked from commit dabfe7dd025f95862e302b3c4526d382eeba19ea) libgltf: missing <cstdio> include (cherry picked from commit d085bba9139d882e191b46ee8056d364e7526f88) libgltf: remove obsolete patch (cherry picked from commit 841d50ec234e71e8e89d0e9135e2002f35fc42fa) Change-Id: Icc5105d0668d5e4e3eb58bbaed6b2f059c30be99 Reviewed-on: https://gerrit.libreoffice.org/10747 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
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... (cherry picked from commit 378b1d24a958114eb4484cb10f609f6e482772ec) (and cherry picked some part of commit 23c876deeb357b6306712ff0586a819176151c15) Change-Id: I3a3caeab7ef593188ee742c53e6715648bf14f50 Reviewed-on: https://gerrit.libreoffice.org/10440 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-21glTF: 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 (cherry picked from commit 58fd5a6dd6d5d599df88c9fd4ed5257577562bd9) Reviewed-on: https://gerrit.libreoffice.org/10275 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-21fdo#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. (cherry picked from commit 51ba2df1cb29d4343f92174da6dc8f36ba9152eb) Conflicts: avmedia/source/opengl/oglwindow.cxx Change-Id: I9e8b70fcb4a0abf26e76e03cafd026f940eceb10 Reviewed-on: https://gerrit.libreoffice.org/10353 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-21glTF: allow to move camera also by keyboard in orbit mode.Zolnai Tamás1-2/+29
Change-Id: Ibf16b9651988358c30d649dd937813329d0f64ec (cherry picked from commit 9e8dbd37c4dda5d07c22c66a5a2b08cce4d175f5) Reviewed-on: https://gerrit.libreoffice.org/10368 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-11glTF: crash after starting a model without an OpenGL windowZolnai Tamás1-0/+3
Change-Id: I726f4d62ab062fbd41376183f60c26d8e6cfe33e (cherry picked from commit 6174152cfffd8e31b9eda238990a161c8c2b9a71) Reviewed-on: https://gerrit.libreoffice.org/10218 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
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 (cherry picked from commit 30fcee6ce56ec4e50ee86c308ca5621746d817d5) Reviewed-on: https://gerrit.libreoffice.org/10217 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-05glTF: constraine camera move in orbit modeZolnai Tamás2-0/+20
Not to get too close to / too far from the model. Too close means move into the model. Change-Id: Ie25d87c88093d4baaf98f13ab8239263b5e1bf66 (cherry picked from commit 9a670eb493f3760eb398c3f9d2296d979b608f95) glTF: improve camera movement constraint Stop moving only on the wrong direction. Change-Id: Ic9e7f2e7814d9adcbcf707e7fb786bf17fac3125 (cherry picked from commit 09fe9db46615265c6c7119f2524d19335d0e0283) glTF: camera movement constraint: use distance from the boundary box ... instead of distance from model center position. Change-Id: I379ab5e32cc5009d0eb751c4808fecf0109d1e5a (cherry picked from commit 2946c7c62718cb74feab554b5939ec340e6c4280) Reviewed-on: https://gerrit.libreoffice.org/10080 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-29Update libgltf: new build system and various fixesZolnai Tamás6-38/+70
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) Reviewed-on: https://gerrit.libreoffice.org/9895 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> (cherry picked from commit 6403f2b59b4c83e0899012e5ca0ddd705784350c) Conflicts: avmedia/source/opengl/oglplayer.cxx Change-Id: Ia6c9c4da53a9b4fedba0d73aa5791489f8ad424b libgltf: variable names need module prefix Change-Id: Id144a483fe5576cdd546ac5da87890dc61f964b3 (cherry picked from commit d83e66da94d9c789190c4729c8f0c8464e99ba88) libgltf: add patch to find the headers in WORKDIR Change-Id: I8570511be7c1d6de94ee82e18bad5b00b36d99bb (cherry picked from commit dfe787ef5de1b38e61989507b26ee4b92f25b9d5) libgltf: try to fix the MSVC2010 build Change-Id: I8dde439d19be45d5039904b6e917b17ca0ee4758 (cherry picked from commit 96ff10449464ae9d869fe21dccf193a6eef670c1) glTF rendering: moving in walktrough mode is to fast Change-Id: I2b7869c6c14b69732db864a03a2d9b6638424cf7 (cherry picked from commit f2b5ece0caca18f21f7c8e42a84d451bb399ec35) libgltf: use --with-pick Change-Id: Ide01491460c9c81ed044be762c7dd07e8a5ca575 (cherry picked from commit bb9078e3dee48afc4c2bd8006a892924f8b38b39) libgltf: replace configure patch to avoid using autoreconf Change-Id: Idcab012af9c27c4fed31c07ce230816d1c61d605 (cherry picked from commit c5bb272883e042e38c58847f6eb2a2f94c6ef919) libgltf: try again with this configure patch Touch only the configure but not the configure.ac Change-Id: Iee93036f2378f29530ffae9be8b4324e8425d2ec (cherry picked from commit 211e07c0e02ebfe9cea4b5d97b614a23f8b2012c) libgltf: remove dependencies of config.h.in It seems something is wrong with the files in the libgltf tarball (maybe wrong timestamps?), because config.h.in is always regenerated by make (autoheader). It causes build problems so just remove the deps for this time. Change-Id: I404c29673987d7c8f75ec8fe4978173593c75a2f (cherry picked from commit 3bebda9cd3269d684a3b430e25f17951deaf3d3d) libgltf: fix typo in license Change-Id: I0e5f3afb19c2457c5ccca922e75e617312801ab9 (cherry picked from commit 1d5e875a6c61ddc9fbf0ed09878b7dfb75f89fe3) libgltf: compiler error fixes: missing include and missing namespace Thanks to Rene Engelhard for the report and the fixes. Change-Id: Ia14980bdbcd9e714b1e9cd41f04af9371aa22371 (cherry picked from commit 481a17b6a6fb332935c3e41c077cc5f60b751021) libgltf: it seems gb_SPACE is not that we need here Change-Id: I099f2bb007cdd29db25a99ca84e53115a12379bd (cherry picked from commit c7d6541f5daa59d04accb30c727a83d936f02150) libgltf: fix wrong include path to config_$(gb_Side) Change-Id: I63d1822fd08c997a9432ed09ada6d5299bc658b1 (cherry picked from commit ab028bf00e3e5f8424ea5e746815e8438144e4bf) libgltf: use WHITESPACE Change-Id: I47ca82d5f08431c8af8b8a85cfbfd083ebd6fda0 (cherry picked from commit b05b970daaf69b5b491b847375ee07539de9481f) libgltf: make 'Requires' valid in libgltf-0.0.pc file Thanks to Rene Engelhard for help to make it valid. Plus glu is not used, so remove it. Change-Id: I5e3631e9b3d24c2b1d9044192d7c0a55c234f7c0 (cherry picked from commit 4bdbc1c93bb3b7e6b1f2fc9a700977ccfa3daae4) Change-Id: Ia14980bdbcd9e714b1e9cd41f04af9371aa22371 Reviewed-on: https://gerrit.libreoffice.org/9922 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-16glTF export: Use plural folder namesZolnai Tamás1-1/+1
Change-Id: If17628395ede512c00b666efc5511d9711edfb5a (cherry picked from commit 9ee69cbd6f1143160aa96001462b933770cc6b76)
2014-06-13kmz2gltf: Use LO's ZipFileAccess to unzip kmzZolnai Tamás1-13/+30
Instead of this hacky collada2gltf patch. Change-Id: I9f15c4ee1c9ea1a1a64116691b12b696c1d63ac5 (cherry picked from commit 3d300f1e86624b989863639626c6220e20a5b3fb)
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. (cherry picked from commit 6904c836b203acbe87a85446a0c59bfbed359240) 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 (cherry picked from commit 573ced4087f46788a8596fb89c657d3427be4bf8)
2014-06-13Change 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 (cherry picked from commit e8fcf1153fd93b4f8155da0d571935125367a59b)
2014-06-13Introduce 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 (cherry picked from commit fe70101856332663f600df144b39d2638b3d0570)
2014-06-11OGLFrameGrabber: use reference instead of pointerZolnai Tamás3-8/+9
Change-Id: Id21138ce2a5d8e764407f42afa2b21464da70e45 (cherry picked from commit 1f1c3b2966c36149ca8b8a2e411d562c154f6c6b)
2014-06-11OGLWindow: no need to call update after changes, timer takes care of itZolnai Tamás1-7/+0
Change-Id: Ifc5ecf4ec3e385293889c82a3b678a8dbcd3edbb (cherry picked from commit c90a742ed507b493fc20a5dbe68f8601217f7e4c)
2014-06-11OGLWindow: use reference instead of pointerZolnai Tamás3-45/+46
(cherry picked from commit 0bff18c4ec19462d325ea0ca6a24c3a15c1f8cfb) Change-Id: I72ef9570ac9e7b4cb4afc2319725743098722d31
2014-06-11OGLPlayer: use more assertionsZolnai Tamás1-0/+20
Change-Id: I0a224a90a3e99d12809d40612b1e66d7c023aebc (cherry picked from commit c1e1576dc081876b39e6f70d13571521a61eeb64)
2014-06-11OGLPlayer: handle json parsing errorZolnai Tamás1-2/+16
Change-Id: I86aea12318d4e21ccadd97ad2820e31bd4580c99
2014-06-11OGLPlayer: check before dereferenceZolnai Tamás1-4/+7
(cherry picked from commit 228c5099962b7b7574326e3c328db4165796e8a8) Conflicts: avmedia/source/opengl/oglplayer.cxx Change-Id: I4bbaf97fe8c5def441ca106c26ad312281ed352f
2014-06-11glTF 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) (cherry picked from commit 677302934793f1874b739b858a659220f247adac)
2014-06-11libgltf: 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) (cherry picked from commit 32f60d78b15b5f2c677e8687720665f6814fef62) Conflicts: avmedia/source/opengl/oglplayer.cxx Change-Id: Idf6c6971a8ac1b342d89dc4f61a62624183e01d0
2014-06-11glTF rendering: fix texture problemsZolnai Tamás1-1/+2
It seems we need mirroring. Change-Id: Id9ad7041eb09ec773e4174cb68d34a65a2c473fe (cherry picked from commit 7c0dc577a4bae2cd398894a68e2edfe966c9ae26)
2014-06-11First stop the timer, then the animation.Jan Holesovsky1-1/+1
Change-Id: Icd5f9f4b8e1c48176fdb73c954e1c4b7d0811516
2014-06-11Use AutoTimer instead of Timer, and add some more locking.Jan Holesovsky2-2/+5
(cherry picked from commit 91fb0866cad2518e5f2cbc48af0e952282fee19d) Conflicts: avmedia/source/opengl/oglplayer.cxx Change-Id: I83a99e333a6c62bf7779e3fbbcc3e5af38bb2ca5
2014-06-11libgltf: Another new version.Jan Holesovsky1-9/+9
Change-Id: I784579717674f1caf68ad489d1a931936f6f9651 (cherry picked from commit a0ef37c55febac05f19a2cece0552e68384e56aa)
2014-06-11glTF: 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 (cherry picked from commit b40ca0935d72a3aff8a2beeabec156850c3417ba)
2014-06-11collada2gltf: fix URL problemsZolnai Tamás1-12/+20
collada2gltf does not handle Windows pathes, the used COLLADABU::URI class can't parse native Windows pathes so call COLLADA2GLTFWriter with URL only. Other problems: collada2gltf uses the URL path for creating/opening files, instead of native ones. collada2gltf initializes _outputFilePath member in different way, sometimes as an URL path, sometimes as a native one, but handle it on the same way(as an URL). Change-Id: I104182653c07e7dcf6fc5b6e32c7031d59246b84 (cherry picked from commit 1dd84fc4674141449c78f6c5838e2254c5a28f35)
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-25fdo#79133: avoid segmentation fault during destruction of media windowZolnai Tamás1-1/+2
mpEvents is not initialized in the constructor any more: b5529c8c457f442bfc43305becc0c02d6a09ee80 So it can happen that mpEvents is null. (cherry picked from commit 4ec3554a80f065c2d9c957d6ce7f577fb195be02) Change-Id: Idaaa274e39c1ac34270ae5b0acdd237ee5aec1c3
2014-05-21libgltf: Updated version.Jan Holesovsky3-10/+9
Change-Id: Ia394ff00421f495757cc2ce55e7b91bfebe715eb
2014-05-21collada2gltf: Ignore case of the extension.Jan Holesovsky1-2/+4
Change-Id: If7f39a1a0537c561373137e6a9dcdb22b48037f0
2014-05-21gltf: Send delta when rotating, not absolute value.Jan Holesovsky1-1/+7
Change-Id: I2453132fedc9a38f43c3de4b110459ba7771d085
2014-05-21libgltf: Update to the new version.Jan Holesovsky2-2/+2
Change-Id: Iffc91425d4395699a1c5f18ac10f5ed065231fdf
2014-05-21glTF embedding: handle missing image on a better wayZolnai Tamás1-6/+14
Using empty tree leads to empty image url which cause problem. Change-Id: If815ce588fb303905035185404ede93fa424fcba
2014-05-20collada2gltf: output bundle path needs to be in url formatMatúš Kukan1-2/+3
Otherwise it does not work on Windows. It's strange though that input path has to be converted from url to native path format. At least that was my observation. Change-Id: Ia8d9e9719d927cab2ae4d928eb8066cab4588281
2014-05-19hrc and src files: squeeze multiple newlinesThomas Arnhold1-12/+0
for i in `find . -name *.src -or -name *.hrc`; do FILE=$(cat -s "$i"); echo "$FILE" > "$i"; done Change-Id: I2bac5ad3e1eb3c566e5c867ccf45893a19e1561e
2014-05-19libavmedia.so needs to link to librt under LinuxJeroen Nijhof1-0/+6
libavmedia.so links to libopencollada2gltf.a, which contains a reference to clock_gettime(). And for clock_gettime one needs to link to librt, under Linux, at least. So add -lrt when linking libavmedia.so. Change-Id: I28547c6216738b44701baaed7eaf44f5ca97e98a
2014-05-19Do not throw if there is no "images" child in json file tree.Matúš Kukan1-2/+2
Change-Id: I0b47ed00fecad84859ba3f1751407696878203fb
2014-05-16OGLPlayer: comment out gltf_animation_get_timeZolnai Tamás1-1/+1
It leads confusing behavior. Time is not set by now because set method does not work. Change-Id: I447d07d4193e25e6916ee05ee335d4cf150380a2
2014-05-16WaE: unused parameter 'fTime'Tor Lillqvist1-0/+1
Change-Id: I1f44de228fe09584699a1e158c32882cd9e7eac7
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 00:16:32 +0000