summaryrefslogtreecommitdiff
path: root/avmedia
AgeCommit message (Collapse)AuthorFilesLines
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
2014-05-22collada2gltf: 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
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
2014-05-16OGLPlayer: fix playing of animation in edit modeZolnai Tamás1-1/+2
gltf_animation_set_time doesn't work but stops the animation. Change-Id: Ia17724c36e2007451e24f97e04a09240359ad969
2014-05-16OGLPlayer: set a timer which call redrawing to show animationZolnai Tamás2-2/+26
Change-Id: I7c98ba61be0510e9f86cb80fda73d18f7f7957cf
2014-05-16OGLWindow: fix key capturing issueZolnai Tamás1-0/+4
Sometimes the event handler parent captures the mouse moce which should grab the focus for key event handling. Change-Id: Ida1022968543059154de824fc3d026c5cecba7b3
2014-05-16Use correct header guard name in comment at #endifTor Lillqvist1-1/+1
Change-Id: I2df05054c4108cb173f80ce6fa66f30c713b70cd
2014-05-16Make the MacAVF code build also as 32-bitTor Lillqvist4-20/+19
When compiling 32-bit OS X code, the code will use the "legacy Objective-C runtime", which means that instance variables of an Objective-C class must be declared in the @interface block, not in the @implementation. CGRect and NSRect are not the same for 32-bit code. Also, use boost::unordered_map. Change-Id: Icc56ff298203565a7568714b0e9f42c7c6b89737
2014-05-15loplugin:saloverrideStephan Bergmann8-115/+115
Change-Id: I53a7cd73ff754bf3b019cb36341b2ab09c61e762
2014-05-15loplugin:bodynotinblockStephan Bergmann1-0/+2
Change-Id: I9c573af8f378cd0b0cb9898d84b5d566f498f57e
2014-05-15OGLWindow: improve camera movement, make it fasterZolnai Tamás1-10/+10
By now there is no a timer which rerender the scene all the time so we need to move camera without setting time. Change-Id: Iba1bfd9b9dc87309cf83d5dcd6832f0e4cb2cd92
2014-05-15The macavf code doesn't compile as 32-bit, sighTor Lillqvist1-0/+3
Change-Id: I51336c09aaa6ecdaa5da537a4a21efbff305da6e
2014-05-15Argh, it's <ext/hash_map> apparentlyTor Lillqvist1-1/+1
Change-Id: Ide91e3302aa17052eb4deb3ddd16ff1ef83401fe
2014-05-15Use std::hash:map when building against libstdc++ (and not libc++)Tor Lillqvist1-0/+5
Change-Id: I7873d99e5982170551ba0ff7b4f383af5935c25b
2014-05-15The AVFoundation framework appeared in OS X 10.7Tor Lillqvist1-0/+2
Change-Id: I76eb213ff4cb93196ea81dd43a465da61c0cdee2
2014-05-15AOO: #i124875# use AVAsset's best guess duration if AVPlayerItem isn't ready yetHerbert Dürr1-1/+4
in AV Foundation the most accurate media asset duration is available when the AVPlayerItem's status changes to AVPlayerItemStatusReadyToPlay. There already is an observer for this, but the upper layers expect getDuration() to be synchronous and to return within a reasonable time. Since returning an approximation is sufficient using the AVAsset's duration as fallback is fine.
2014-05-15The AVMedia framework is not deprecatedTor Lillqvist1-1/+6
So no reason to avoid it when building for the Mac App Store (i.e. when building a sandboxed LibreOffice). (At least I assume it was because of the deprecatedness of QuickTime that it was conditional on not building a sandboxed LibreOffice.) Change-Id: I9d50490aa878ba5e40594b39eac88f23df3ef0a6
2014-05-15Try the AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1Tor Lillqvist1-0/+4
Change-Id: Iacd00f1371ea276758702bd5eb8380f542790c55