wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
160,425 Commits 1 Branch 165 Tags 1.2 GiB
be74d9325a
Commit Graph

3198 Commits

Author SHA1 Message Date
Sotaro Ikeda
0523044e79 Bug 935118 - Allow buffering to be triggered when we're low on decoded audio or video. r=roc 2013-11-19 09:01:14 -05:00
Mike Hommey
a65383e1e9 Bug 939632 - Remove LIBRARY_NAME for leaf libraries. r=gps 
Landing on a CLOSED TREE.
 2013-11-19 11:50:54 +09:00
Mike Hommey
8ceb917350 Bug 939074 - Remove most LIBXUL_LIBRARY. rs=gps 2013-11-19 11:48:10 +09:00
Mike Hommey
bb6779efe3 Bug 939044 - Remove most definitions of MODULE. r=mshal 2013-11-19 11:47:39 +09:00
Mike Hommey
57a2dfcb91 Bug 939039 - Remove now useless FORCE_STATIC_LIB definitions. r=gps 2013-11-19 11:47:28 +09:00
Mike Hommey
d7b6f95761 Bug 935881 - Use FINAL_LIBRARY for all (fake) libraries that end up linked in a single other library. r=gps 2013-11-19 11:47:14 +09:00
Ehsan Akhgari
84c0745ae1 Bug 939924 - Fix build error: KS.H must be included before codecapi.H in WMF.h. r=cpearce 2013-11-18 15:47:38 -05:00
Chris Double
2b4869da59 Bug 874897 - Mochitest for copying of frames of videos with aspect ratio to canvas - r=kinetik 
--HG--
extra : rebase_source : c5ff10d61a1ea46b0fdb2a43e926405660493912
 2013-11-18 18:26:51 +13:00
Ed Morley
e27c3b1f4f Merge latest green b2g-inbound changeset and mozilla-central 2013-11-18 10:54:01 +00:00
Vincent Chang
a0fe50f163 Bug 921963 - [RTSP] Support RTSP in Android JB build. r=sworkman 2013-11-13 16:03:26 +08:00
ISHIKAWA, Chiaki
e22fb2ab07 Bug 938693 - Check the return value of PR_Close() in ~FileBlockCache() and issue a message if it fails. r=cpearce 2013-11-15 21:46:40 -05:00
Matthew Gregan
260addb88e Bug 939613 - Remove MediaSource integration from HTMLMediaElement now and use the generic MediaDecoder interface, then move the necessary MS-specific bits to the MS decoder. r=doublec 2013-10-05 10:04:39 +02:00
Matthew Gregan
c6845c411d Bug 939612 - Improve readability of MediaSource::SetReadyState. r=doublec 2013-10-05 10:03:50 +02:00
Ehsan Akhgari
c426806741 Bug 939584 - Build some of the directories under content/media in unified mode; r=roc 2013-11-17 21:31:46 -05:00
Ehsan Akhgari
105dde09a8 Bug 939569 - Part 1: Stop using #pragma once in webspeech code; r=smaug 2013-11-17 19:48:02 -05:00
Matthew Gregan
ed941cac63 Bug 939601 - Refactor current thread assert into helper. r=cpearce 2013-11-04 11:11:09 +13:00
Chris Pearce
9f15c2477b Bug 871804 - Clarify HTMLMediaElement.canPlayType() codecs for MPEG on Windows. r=kinetik 2013-11-18 11:29:55 +13:00
Chris Double
4ab99de3f6 Bug 939716 - Destructor for MediaStreamGraph should be virtual - r=roc 
The destructor for MediaStreamGraph is non-virtual but it has a
derived class, MediaStreamGraphImpl, that overrides the destructor.
This destructor won't be called if an instance is deleted using a
pointer type of MediaStreamGraph.

It's unclear whether this actually happens but MediaStreamGraph.cpp
has code that creates a MediaStreamGraphImpl and returns it as a
MediaStreamGraph.

--HG--
extra : rebase_source : 9d006e5bf9bb056b5a54fc7aec159c26376c1459
 2013-11-19 02:09:47 +13:00
Chris Double
cf4ed28111 Bug 939655 - Remove LOG macro definition from MediaStreamGraphImpl.h - r=roc 
Removing this reduces opportunity for macro name clashes and using
the wrong log object if this header file is included out of order
in a .cpp file.

--HG--
rename : browser/themes/linux/Toolbar-inverted.png => browser/themes/windows/Toolbar-inverted.png
extra : rebase_source : 053384512e0f3a70d07ebe9ca0a07dc0f39d9b5b
 2013-11-19 00:48:04 +13:00
Phil Ringnalda
102ba52e3d Back out 4fd2bf2ec8db (bug 939662) for Windows build bustage 
CLOSED TREE
 2013-11-18 21:34:48 -08:00
Matthew Gregan
f9db1edec7 Bug 939662 - Remove "using namespace mozilla::dom;" from MediaDecoder.h and fix fallout. r=cpearce 
--HG--
extra : rebase_source : 922db8de8e9103e3001c26f23ed7402efa8237f5
 2013-11-18 17:22:47 +13:00
Paul Adenot
bb61e5a5d6 Bug 919215 - Start the AudioStream on creation when in low-latency mode, and let it underrun. r=roc 
The BufferedAudioStream buffers the data it gets through the Write() calls and
what is consumed by the callback. This means that if the audio producer starts
Write()ing data right after Start()ing the stream, data will accumulate in this
buffer and won't be consumed. Eventually, the buffer will be of a certain size
before it begins to be consumed by the callback, and this means an
umcompressible latency (because the data will be written at more or less the
same rate as it is produced).

This patch start the BufferedAudioStream right away when it is created, dropping
the silent AudioSegment until it finds real data (and padding with silence is
then done at the beginning). The stream will underrun, but the callback will
synthetize silence, avoiding overbuffering in the BufferedAudioStream. This
ensures minimal latency cause by the buffering.

Note that the clock will still advance, so this will not change the behavior of
content that has leading silence.
 2013-11-19 10:43:15 +13:00
Ed Morley
274f5f80b5 Merge mozilla-central and b2g-inbound 2013-11-12 15:11:34 +00:00
Mike Hommey
f252e2fcc4 Bug 935857 - Replace MOZ_RTSP with proper NECKO_PROTOCOL handling. r=gps,r=vchang 2013-11-12 07:52:33 +09:00
Ryan VanderMeulen
4c2b6b9015 Merge m-c to inbound. 2013-11-11 15:55:25 -05:00
Ryan VanderMeulen
df21693fec Backed out changeset 0595650a11bd (bug 934440) for bustage. 2013-11-11 09:49:46 -05:00
Birunthan Mohanathas
58a91e67d8 Bug 784739 - Switch from NULL to nullptr in miscellaneous directories; r=ehsan 2013-11-11 14:17:14 -05:00
Carsten "Tomcat" Book
7c2476f6f2 merge fx-team to mozilla-central 2013-11-11 12:32:39 +01:00
Ms2ger
5e1bd894df No bug - Fix some style issues in DOM code. 2013-11-11 09:04:41 +01:00
Ms2ger
af09204569 Bug 931404 - Move LOCAL_INCLUDES to moz.build in content/; r=gps 2013-11-11 09:04:06 +01:00
Ms2ger
ff6eab15dd Bug 928741 - Stop using PR_STATIC_ASSERT in content; r=jst 2013-11-11 09:03:59 +01:00
Brad Lassey
2f86f92c0f bug 936549 - Tab sharing capture device won't stream, use FormatStrideForWidth in tab stream r=jesup 2013-11-08 13:26:20 -05:00
Matthew Gregan
daef6f1012 Bug 935343 - Convert content/media/tests to manifest format. r=doublec 2013-11-06 15:49:44 +13:00
Carsten "Tomcat" Book
a3e32f5a76 Merge mozilla-central to b2g-inbound 2013-11-08 15:29:28 +01:00
Sotaro Ikeda
77684a0250 Bug 929005 - Change from android::Vector to android::List. r=doublec 2013-11-08 09:09:46 -05:00
Gian-Carlo Pascutto
ab103628ff Bug 932112: Don't free the global, shared Context ref. r=blassey 2013-11-07 20:07:48 -05:00
Randell Jesup
52771d4abf Bug 932112: Rollup of changes previously applied to media/webrtc/trunk/webrtc rs=jesup 
* * *
* * *
Add AndroidAudioManager to the moz.build files.
 2013-11-07 20:07:47 -05:00
Karl Tomlinson
c990cba862 b=931311 wait for HRTF panner to load impulse database before doing test 
--HG--
extra : transplant_source : %2A%1F%D0kKSr%AA%8F%C1%26%E5%E6%EC%D5%CF%8C%A9%D11
 2013-11-09 14:07:50 +13:00
Karl Tomlinson
cc755050a7 b=936317 prevent MediaBufferDecoder threads from waiting after AudioContext shutdown() r=ehsan 
--HG--
extra : transplant_source : %CE%E5O%83N%8FX%ED%2Ck%17I%B1%92%B6%A0lXH%D1
 2013-11-09 14:07:45 +13:00
Karl Tomlinson
e27d8478a9 crashtest for bug 933156 
--HG--
extra : transplant_source : %9D/%19%13%80%D3cY%5D%93%FA%17%FB%CFTO%5Ex%82%C9
 2013-11-08 12:04:54 +13:00
Matthew Gregan
bf52a0e2d7 Bug 935349 - Remove remaining disabled DASH code. r=doublec 2013-11-07 17:08:42 +13:00
Matthew Gregan
f8472d2705 Bug 935349 - Remove disabled DASH code. r=doublec 2013-11-07 17:08:30 +13:00
Nicholas Nethercote
d8a3b0f0bb Bug 934321 - Add MemoryMultiReporter, a helper class that reduces some boilerplate, and convert all existing multi-reporters to use it. r=wchen. 
--HG--
extra : rebase_source : a6110c3558c571b7908b63e8cc7ca21103098d0d
 2013-11-06 14:58:20 +11:00
Ryan VanderMeulen
8065e2373d Merge inbound to m-c. 2013-11-05 15:28:52 -05:00
Carsten "Tomcat" Book
3009e7cb5d merge mozilla-central to b2g-inbound 2013-11-05 15:55:09 +01:00
Wes Kocher
367bda0c4e Merge m-c to inbound 2013-11-04 21:22:23 -08:00
Wes Kocher
e6aeda0671 Merge inbound to m-c 2013-11-04 21:09:17 -08:00
Matthew Gregan
0d5e4e456e Bug 848812 - Remove incorrect on-thread assertion from StopPlayback. r=cpearce 2013-11-05 17:12:01 +13:00
Matthew Gregan
3bdef6ed81 Bug 934820 - Remove LoadedEvent from MediaResource.cpp since it's almost identical to DataEnded. r=cpearce 2013-11-05 16:19:50 +13:00
Karl Tomlinson
8667fa5018 Bug 933156 - Don't send null input to EqualPowerPanningFunction. r=roc 2013-11-04 14:22:37 -05:00
Jesse Ruderman
9edb6de6a6 crashtest for bug 933151 
--HG--
extra : transplant_source : %E5%D0%FB%18H%E3%7Dl%C8o%10m%BD%B6%E1%A0v8%12%AE
 2013-11-05 13:02:55 +13:00
Karl Tomlinson
e19072ca3d b=856850 use PodMove for potentially overlapping buffers r=roc 
--HG--
extra : transplant_source : %A2%F8%85%0C%08%86%CE%E2%7F%A7X%9F%F1%B7%0E%3F%16%1E%BF%3F
 2013-11-05 13:02:55 +13:00
CJKu
cf22d443e6 Bug 924724 - Shutdown hang in Media Encoder when running state machine mochitest in bug 920595. r=roc 2013-11-04 17:27:39 -05:00
Jason Smith
96e4e8902c Bug 920595 - Mochitest for verifying state transitions in Media Recording API. r=roc 2013-10-08 13:15:09 -07:00
Steve Singer
b671aa6561 Bug 885002 - Fix casting on 64 bit Big Endian platforms. r=cpearce 2013-11-05 07:45:00 -05:00
Phil Ringnalda
f7a0d95293 Merge m-c to m-i 2013-11-03 16:38:02 -08:00
Phil Ringnalda
c5e09d361a No bug (or rather, too many), disable test_playback_rate.html for constant timeouts and crashes in random locations across every platform it ever gets enabled on 2013-11-03 16:35:21 -08:00
Chris Pearce
e8d0d063b3 Bug 933579 - Export IsVideoContentType() to VideoUtils, so that it can be used elsewhere, and move all of VideoUtils into namespace mozilla. r=kinetik 2013-11-04 11:45:19 +13:00
Matthew Gregan
cb96b209e4 Bug 933552 - Enable audio/mpeg MIME type in MediaSource. r=doublec 2013-11-01 14:07:22 +13:00
Bruce Sun
83d544a289 Bug 933091 - Re-enable MP3FrameParser to parse MP3 duration. r=sotaro, r=doublec 2013-11-01 11:02:53 +08:00
Ryan VanderMeulen
b3ebc15f66 Merge m-c to inbound on a CLOSED TREE. 2013-10-30 22:42:13 -04:00
Sotaro Ikeda
f6ac96b7d3 Bug 932076 - Add check for MediaExtractor creation failure. r=doublec 2013-10-30 15:41:07 -04:00
Gian-Carlo Pascutto
9de8db6aa9 Bug 902000 - Make the load adaption depend on a pref. r=jesup 2013-10-29 15:00:28 +01:00
Gian-Carlo Pascutto
6491450597 Bug 902000 - Add a service that monitors the system load. r=jesup 2013-10-29 15:00:20 +01:00
Andrew Quartey
4ddd9b2de8 Bug 893880 - Check TextTrackCueList before trying to update its cues. r=rillian 2013-10-28 22:18:35 -04:00
Andrea Marchesini
fac0bfead2 Bug 925594 - WebIDL enum for AudioChannel in HTMLMediaElement, r=ehsan, r=khuey 2013-10-28 17:08:14 -07:00
Ed Morley
f573d01d8a Merge mozilla-central and inbound 2013-10-28 18:36:22 +00:00
Ed Morley
e07a40f581 Bug 751539 - Disable test_played.html again because surprise surprise it is still failing 2013-10-28 17:45:33 +00:00
Carsten "Tomcat" Book
2769e506ae Backed out changeset 5506e7033c85 (bug 925594) perma-orange mochitest test-failure on b2g-ics 
--HG--
extra : transplant_source : %19E%9F_%BF%84%27%11%0D%DE%CA.%E7%09%9D%FD3%1A2U
 2013-10-28 15:34:08 +01:00
Andrea Marchesini
cc71776434 Bug 925594 - WebIDL enum for AudioChannel in HTMLMediaElement, r=ehsan, r=khuey 2013-10-28 03:45:10 -07:00
Andrew Quartey
cf444ec4b7 Bug 931453 - Ensure TextTrack's media element reference is not null. r=khuey 2013-10-28 12:32:51 -04:00
Carsten "Tomcat" Book
988edc9381 Backed out changeset 5506e7033c85 (bug 925594) perma-orange mochitest test-failure on b2g-ics 2013-10-28 15:34:08 +01:00
Bill Gianopoulos
942093ef65 Bug 931428 - Include NullPtr.h in GStreamerLoader.cpp; r=ehsan 2013-10-26 20:42:34 -04:00
Phil Ringnalda
a1f80ad10b Back out f872d288480b:9b86b4e60b29 (bug 929513) for failing to build on Windows 
CLOSED TREE
 2013-10-27 15:38:40 -07:00
David Zbarsky
8ce46e2762 Bug 929513 Part 3: Use some LayerIntSize in gfx/layers r=nical 2013-10-27 17:53:27 -04:00
David Zbarsky
b28c18df90 Bug 929513 Part 1: Use gfx::IntSize for image layer sizes r=nical 2013-10-27 17:53:26 -04:00
Randy Lin
c8290544de Bug 919905 - Media Recording - Refactor encoder architecture to support the video encoder module. r=roc, r=cjku 2013-10-25 10:59:52 +08:00
Chris Pearce
9125652ed9 Bug 930833 - Extract more WMF utility functions to WMFUtils.h/cpp. r=padenot 2013-10-26 15:23:37 +13:00
Randell Jesup
ee8e35ca44 Bug 920325: Add WebRTC latency logging from capture to RTP and from RTP to speakers r=padenot 2013-10-25 18:13:42 -04:00
Randell Jesup
345ac3892d backout 5f38b1bd3358 for bustage CLOSED TREE 2013-10-25 19:25:54 -04:00
Randell Jesup
2e3491f74c Bug 920325: Add WebRTC latency logging from capture to RTP and from RTP to speakers r=padenot 2013-10-25 18:13:42 -04:00
Cykesiopka
a3710e5c11 Bug 914270 - Part 1: Simple/Automated moves. r=joey 2013-10-24 18:51:00 +01:00
Andrew Quartey
a046671daf Bug 882665 - Part b: Add list of pending text tracks to TextTrackManager. r=rillian, khuey 2013-10-25 00:14:36 -04:00
Andrew Quartey
9e2c3eee34 Bug 882665 - Part a: Add readiness state attribute to text track. r= rillian, khuey 2013-10-25 00:14:36 -04:00
Chris Pearce
2744117b84 Bug 930829 - Add MediaData class as base for VideoData and AudioData to simplify writing a generic stream decoder. r=kinetik 2013-10-25 15:44:58 +13:00
Karl Tomlinson
04017096dd b=898291 skip HRTF panner processing when input has been null long enough for output to be null r=ehsan 
--HG--
extra : transplant_source : %E4l%83zo%0E%08%14%FF%F7%9D%D6%8C%FD%A2%07a%2A%8Aq
 2013-10-25 14:05:43 +13:00
Karl Tomlinson
1cb0a5c853 b=898291 remove unused PannerNodeEngine model type variables r=ehsan 
--HG--
extra : transplant_source : %0F%F0%EB%AF%17%B6%B6%CEI0%857%D8%09%C4%D1%0D%C2.l
 2013-10-25 14:05:43 +13:00
Karl Tomlinson
8c4aae7b76 b=898291 erase azimuth/elevation history when reset()ing HRTFPanner r=ehsan 
so that old cross-fade info does not distort new sound when a PannerNode
finishes and restarts.

--HG--
extra : transplant_source : I%A9%DAx%9F%AE%B8%88%90FN%3B%3E%FC%FE%827%CB%10%8C
 2013-10-25 14:05:42 +13:00
Karl Tomlinson
44c05b6e2a mochitest for bug 898291 
--HG--
extra : transplant_source : %1F%18%3A%91%21%06%B6%C47%7Ck%83%C7%C8yo%2A%22%A5%02
 2013-10-25 14:05:42 +13:00
Karl Tomlinson
c0c070d7e0 b=924288 continue producing BiquadFilter sound output after input becomes null r=ehsan 
--HG--
extra : transplant_source : %A6%DDf%09%98C%C0%E6%AEy%F8%F6%FF%7E/f%D7%12Ub
 2013-10-25 14:05:42 +13:00
Jesse Ruderman
637b876274 crashtest for bug 926619 
--HG--
extra : transplant_source : %1CQ%E6%B7%A6%DB%98%BF%F3Vlc%F1%93Xe%9D8%BAm
 2013-10-25 14:05:42 +13:00
Karl Tomlinson
5ffa06990a b=926619 check for non-AudioNodeStreams in MediaStream cycles r=padenot 
--HG--
extra : transplant_source : %2B%F4%EEG%BD%17%2A/%B7%80%F6%22%04%9F%F4E%1FD%F0%A5
 2013-10-25 14:05:41 +13:00
Karl Tomlinson
e5e86b04cc b=923301 use MediaStreamGraph to dispatch the other PlayingRefChangeHandlers too r=trivial 
--HG--
extra : transplant_source : %A6%9F%81%40%AF%EE_EU%03%BCvZ%0B%1CE%7F%8C%80F
 2013-10-25 14:05:41 +13:00
Mike Hommey
1d566f7586 Bug 929905 - Consolidate sources in moz.build. r=gps 2013-10-25 08:23:05 +09:00
Karl Tomlinson
10fe0bff6e b=923301 use MediaStreamGraph to dispatch PlayingRefChangeHandlers r=roc 
This reduces the number of events dispatched to the main thread
and ensures these run in order with other pending updates.

--HG--
extra : transplant_source : %5E%235%DEz%EB%7D%C6%C7%F8%AF%A3%84%1F%F9%5B%87D%B3%13
 2013-10-25 12:12:33 +13:00
Karl Tomlinson
42a892d746 b=923301 skip reverb processing when input has been null long enough for output to be null r=roc 
--HG--
extra : transplant_source : t%F4Fi%7C%FE%A0l%7B%8FT%9D%F8%F8A%15%93%2A%5Bw
 2013-10-25 12:12:13 +13:00
Karl Tomlinson
2755fe230b b=923301 skip delay processing when nothing is buffered and input is null r=roc 
--HG--
extra : transplant_source : %60%1B%88Z%BD%9AoAI%92%FA%B1%E4%A1%EFg%2A%FE%05%8F
 2013-10-25 12:12:13 +13:00
Karl Tomlinson
256598bc36 b=923301 send only one release message when convolver tail time expires r=roc 
--HG--
extra : transplant_source : p%B7dN%D9%A7%DB%F3%FB%A9a%85%BC%2BH%A4uW%A4%84
 2013-10-25 12:12:13 +13:00
Karl Tomlinson
2852848da2 b=923301 send only one release message when delay buffer is drained r=roc 
--HG--
extra : transplant_source : %C7%8Ag%B2%C52X%A2%96%D1%8E%BB%15%E4%15%CC%1D%1Er%B8
 2013-10-25 12:12:13 +13:00
Karl Tomlinson
1f3810b405 b=923301 remove now-unnecessary node-type templating of PlayingRefChangeHandler r=roc 
--HG--
extra : transplant_source : %0A%BA%C9%1D%1AX%0Dxg9%3BL%1F%98%BE%98%87%20o%3A
 2013-10-25 12:12:12 +13:00
Karl Tomlinson
68a062c577 b=923301 remove now-unused GetCurrentGraphUpdateIndex() and rename mGraphUpdatesSent to mNextGraphUpdateIndex r=roc 
--HG--
extra : transplant_source : %B6%E8%FF%F8%CA%CCWo%D0%82s%FC%92C%F5L%D9%3D%81%88
 2013-10-25 12:12:00 +13:00
Karl Tomlinson
2f6f210f83 b=923301 remove now-unnecessary AcceptPlayingRefRelease r=roc 
--HG--
extra : transplant_source : %7B%21%18%B17%16%7B%9E%9F%B3%23%17%FD%3DZ%FC%5C%0F%D3%8C
 2013-10-25 12:11:24 +13:00
Karl Tomlinson
343e110e70 b=923301 keep a tail-time reference on DelayNode until *after* the last non-silent block has been produced r=roc 
This gives a downstream node a chance to take a tail-time reference when it
receives the last non-silent block from the DelayNode.

--HG--
extra : transplant_source : %B5%7C%E1%F6%00%D4W%D6%A22%0C%F2%0A%2C%60%F2%18%C6%A5%B8
 2013-10-25 12:11:24 +13:00
Karl Tomlinson
25bdde611d b=923301 keep disconnected destination nodes alive long enough for their engines to add tail-time references if necessary r=roc 
--HG--
extra : transplant_source : %24%5D%7B%3F%7E%87%20%FF%20%09%CE%AD%91%F8%7C%E7%E1%DB%3D%83
 2013-10-25 12:11:01 +13:00
Karl Tomlinson
a6013a6638 b=923301 add MediaStreamGraph::RunAfterPendingUpdates() r=roc 
--HG--
extra : transplant_source : %89%21%AE%87%C7%9C%07%28%3D%60T%83%16n%DC%C9O%87iy
 2013-10-25 12:07:29 +13:00
Chris Pearce
251a222163 Bug 930372 - Use WMF instead of DirectShow for MP3 decoding on Vista and later, to avoid regressing duration calculation. r=padenot 2013-10-25 09:43:17 +13:00
Trevor Saunders
d3d322d222 [PATCH] bug 922566 - kill dom-config.mk 
From 6681eaa8bb47ddb4756fd71738771c4c437101c0 Mon Sep 17 00:00:00 2001
---
 content/media/webspeech/recognition/Makefile.in |  1 -
 content/media/webspeech/recognition/moz.build   |  5 +-
 content/media/webspeech/synth/Makefile.in       |  1 -
 content/media/webspeech/synth/pico/Makefile.in  |  3 --
 dom/alarm/Makefile.in                           |  2 -
 dom/apps/src/Makefile.in                        |  1 -
 dom/base/Makefile.in                            |  2 -
 dom/base/moz.build                              | 26 ++++++++++-
 dom/battery/Makefile.in                         |  1 -
 dom/bindings/Makefile.in                        |  3 --
 dom/bindings/moz.build                          | 17 ++++++-
 dom/bindings/test/Makefile.in                   |  5 +-
 dom/bluetooth/Makefile.in                       |  2 -
 dom/bluetooth/moz.build                         |  7 ++-
 dom/browser-element/Makefile.in                 |  3 --
 dom/browser-element/moz.build                   |  6 ++-
 dom/camera/Makefile.in                          |  1 -
 dom/camera/moz.build                            |  5 +-
 dom/devicestorage/Makefile.in                   |  1 -
 dom/dom-config.mk                               | 61 -------------------------
 dom/encoding/Makefile.in                        |  1 -
 dom/fmradio/Makefile.in                         |  2 -
 dom/fmradio/ipc/Makefile.in                     |  1 -
 dom/fmradio/ipc/moz.build                       |  5 +-
 dom/fmradio/moz.build                           |  5 +-
 dom/icc/src/Makefile.in                         |  4 --
 dom/media/Makefile.in                           |  3 --
 dom/media/moz.build                             |  6 ++-
 dom/mobilemessage/src/Makefile.in               |  1 -
 dom/mobilemessage/src/moz.build                 |  5 +-
 dom/network/src/Makefile.in                     |  2 -
 dom/plugins/base/Makefile.in                    |  1 -
 dom/plugins/base/moz.build                      |  8 +++-
 dom/power/Makefile.in                           |  1 -
 dom/quota/Makefile.in                           |  1 -
 dom/system/gonk/Makefile.in                     |  2 -
 dom/telephony/Makefile.in                       |  1 -
 dom/time/Makefile.in                            |  1 -
 dom/wifi/Makefile.in                            |  5 --
 39 files changed, 85 insertions(+), 123 deletions(-)
 delete mode 100644 dom/dom-config.mk
 delete mode 100644 dom/wifi/Makefile.in
 2013-10-23 17:20:55 -04:00
Randy Lin
952acb13b6 Bug 936352 - Media Recording - Fix wrong pointer usage in encoder module from Bug 919905. r=roc 2013-11-10 06:30:01 +08:00
Peiyong Lin
bad8db6326 Bug 934440 - Statically assert that MEDIA_STREAM_DEST_TRACK_ID is different than AUDIO_TRACK. r=jdm 2013-11-11 09:11:42 -05:00
Peiyong Lin
d60e379d37 Bug 934440 - Statically assert that MEDIA_STREAM_DEST_TRACK_ID is different than AUDIO_TRACK. r=jdm 2013-11-12 08:37:17 -05:00
Wes Kocher
0568023133 Merge inbound to m-c 2013-11-11 15:51:01 -08:00
Daniel Holbert
11f52e28e2 Bug 930532: Adjust '#if defined(MOZ_CUBEB)' checks to include cubeb-only static functions in AudioStream.cpp, to fix build warnings in non-cubeb builds. r=padenot 2013-10-24 17:26:19 +02:00
Brian O'Keefe
4c98f61956 Bug 928709 - Convert chromium-config.mk to mozbuild, r=mshal 2013-10-02 13:17:55 -04:00
Mike Hommey
61124c1afc Bug 921492 - Make StrictOrderingOnAppendList use actual alphabetical sorting. r=mshal,r=gps 2013-10-24 08:05:43 +09:00
Mike Hommey
e2ae65f67a Bug 913268 - Make CPP_SOURCES a StrictOrderingOnAppendList. r=mshal 2013-10-24 08:00:23 +09:00
Birunthan Mohanathas
872802570b Bug 784739 - Switch from NULL to nullptr in content/; r=ehsan 
--HG--
extra : rebase_source : 9237726507e8002479616a98a82646a763932507
 2013-10-23 16:34:10 -04:00
Karl Tomlinson
2364c5394f b=928222 move ReentrantMonitorAutoExit from VideoUtils.h to ReentrantMonitor.h r=bsmedberg 
--HG--
extra : transplant_source : %13O%CF%90x%02%B8%B6%A3%EA%AD%03%99%9A7%1B%A0%21%C4%A3
 2013-10-24 07:22:53 +13:00
Karl Tomlinson
ddaab5d1c5 b=914016 always dispatch main thread updates after non-realtime graph finishes r=padenot 
--HG--
extra : transplant_source : %0B%0C%93%05k%3F%3A%AEfT9%C9u%8D%C5pa%9F%11%0D
 2013-10-24 07:21:33 +13:00
Karl Tomlinson
57ec2f982a b=925619 simplify loop sanity checks r=ehsan 
The removed condition is always satisfied when mLoopEnd > 0.0

--HG--
extra : transplant_source : 4%9F%7C%92%F7-f%05%F96%0F%7C.%AF%8CE%82F%D3%A0
 2013-10-23 18:40:11 +13:00
Karl Tomlinson
e6eddf12f8 b=925619 truncate TrackTicks differences to uint32_t after limiting to WEBAUDIO_BLOCK_SIZE r=ehsan 
--HG--
extra : transplant_source : %F6%8B%89C%60%02Hm%11%9FZ%F7I%2BJ%CF%23%8E%CE%D3
 2013-10-23 18:36:59 +13:00
Rick Eyre
6e23c29cb6 Bug 865407 - Part 2: Change TextTrackList::RemoveTextTrack() to receive a pointer r=rillian 
The only code using this is TextTrackManager::RemoveTextTrack() which
receives a non-const pointer.
 2013-10-21 07:15:00 -07:00
Daniel Holbert
a4e08580e0 Bug 928547: Change AudioStream cubeb-dependent logic to handle success cases first, so we can add #ifdef that ends in failure case. r=padenot 2013-10-23 17:44:13 +02:00
Daniel Holbert
47591e6cd3 Bug 929430 part 2: Wrap OggReader.cpp's opus-specific variables and their usages in #ifdef MOZ_OPUS. r=rillian 2013-10-23 08:21:04 +02:00
Daniel Holbert
e40b5dbe47 Bug 929430 part 1: Wrap OggReader.cpp's opus-specific function calls in #ifdef MOZ_OPUS, so that it can build successfully with --disable-opus. r=rillian 2013-10-23 08:21:02 +02:00
Daniel Holbert
bb00d0a6dc Bug 929404: Mark unused-depending-on-build-config function as 'inline' instead of 'static'. r=derf 2013-10-23 08:20:54 +02:00
Matthew Gregan
51ba071a99 Bug 927245 - Preliminary work to enable preffing off the deprecated Audio Data API implementation. r=ehsan 2013-10-18 15:10:56 +13:00
Matthew Gregan
7ec0a8df14 Bug 926665 - Clear mMediaSource when Attach fails. r=doublec. 2013-10-16 15:23:39 +13:00
Wes Kocher
0af0586076 Backed out changeset a31b0fd17a7a (bug 926665) for crashtest bustage 2013-10-21 21:36:45 -04:00
Matthew Gregan
0cbbeb64df Bug 926665 - Clear mMediaSource when Attach fails. r=doublec. 2013-10-16 15:23:39 +13:00
Trevor Saunders
b61d74dae0 Backed out changeset 99b17c404db2 and e40a964458f8 for landing stuff that shouldn't have and then backing out stuff that should have stayed on a CLOSED TREE 
--HG--
extra : amend_source : 54312955270ea4098a3add3cd0708866de2e40bb
 2013-10-21 18:58:14 -04:00
Trevor Saunders
4898a4f035 bug 922566 - kill dom-config.mk r=gps 2013-10-11 12:02:41 -04:00
Chris Pearce
cd4b7635ae Bug 928765 - Create MediaDecoderReader::GetBuffered() base implementation that estimates buffered ranges, so that subclasses do have to keep reimplementing the estimation. r=doublec 2013-10-21 16:31:05 +13:00
Daniel Holbert
12203c6f6b Bug 928541: Drop unused variable 'cairoFormat' from MediaEngineTabVideoSource::Draw(). r=blassey 2013-10-19 14:04:43 +02:00
Ryan VanderMeulen
133467df0a Merge inbound to m-c. 2013-10-18 15:08:39 -04:00
Brad Lassey
696b6ef7a0 bug 742832 - Add support for tab sharing for getUserMedia r=jesup 
--HG--
extra : rebase_source : e42fbab31083b0e91be9992b2ba0062d14294c25
 2013-10-17 16:48:30 -04:00
Carsten "Tomcat" Book
fd6b3a3bb9 merge b2g-inbound to mozilla-central 2013-10-18 11:39:28 +02:00
Sotaro Ikeda
1181e71e7f Bug 925381 - Fix mpeg4 video seek failure. r=nical, r=doublec 2013-10-17 11:09:15 -04:00
JW Wang
3636dfe0e3 Bug 927322 - AudioDestinationNode should support weak reference; r=ehsan 2013-10-16 17:27:45 +08:00
Carsten "Tomcat" Book
ba4b28bb05 Merge mozilla-central to mozilla-inbound 2013-10-18 14:13:10 +02:00
Landry Breuil
fbc0a0bf79 Bug 927898: fix loading of gstreamer libs at runtime on OpenBSD. r=doublec 2013-10-18 11:13:50 +02:00
Peter Chang
4290a36c9a Bug 922510 - Extend GonkNativeWindow to support android JB 4.2.2, r=sotaro,gps 2013-10-18 10:42:43 +08:00
Carsten "Tomcat" Book
4ee9d312e1 Merge mozilla-central to b2g-inbound 2013-10-15 10:43:38 +02:00
Karl Tomlinson
fa7c6ec5b6 b=923106 recompute frequency dependent parameters when OscillatorType changes r=padenot 
mSquare, mTriangle, and mSaw are not initialized in the OscillatorNodeEngine
constructor, just like they are not initialized when switching to
OscillatorType::Sine.  These parameters are initialized if and when switching
to the OscillatorTypes that use them.

mFinalFrequency, mNumberOfHarmonics, mSignalPeriod, mAmplitudeAtZero,
mPhaseIncrement, mPhaseWrap are not initialized in the OscillatorNodeEngine
constructor, just like they are not initialized immediately on switching
OscillatorType.  These parameters are initialized in
UpdateParametersIfNeeded(), conditional on mRecomputeParameters.

--HG--
extra : transplant_source : a%C1%83%03%03%5CJ%88%99j%A0%93%05%92%06%CA%D6%8B%00%21
 2013-10-15 13:10:02 +13:00
Sotaro Ikeda
ac7b9a7971 Bug 923848 - Reuse mp3 file format check result. r=doublec 2013-10-14 07:37:09 -04:00
Thomas Zimmermann
7c4b5403fb Bug 924678: Stop MP3 parser if decoder got cleared, r=doublec 
If the decoder has been cleaned up, there is no point in further
parsing the MP3 file. This patch makes the I/O logic stop in that
case.

The patch also fixes a bug where the beginning of an MP3 chunk was
parsed multiple times if the chunk is larger than 4 GiB.

--HG--
extra : rebase_source : d247ed3995991d362c51a0666274e9de3b90b7d2
 2013-10-14 10:38:48 +02:00
Thomas Zimmermann
112777cbb8 Bug 924678: Explicitly clear OmxDecoder::mDecoder, r=doublec 
The MediaDecoderStateMachine frees the Decoder during its own
shutdown. If the the MediaDecoderStateMachine for an MP3 file
gets cleaned up before the MP3 frame parser is finished, the
OmxDecoder operates with an invalid Decoder.

With this patch, the MediaDecoderStateMachine informs the
OmxDecoder to clear the decoder field. The MP3 parser logic
detects this case and returns.

--HG--
extra : rebase_source : 0a00de3cf7b95ede77408e5d43cccbcd706750cd
 2013-10-14 10:38:17 +02:00
Benjamin Chen
a5637c000c Bug 831645 - part2, Rtsp media resource and decoder. r=roc, doublec, sworkman, khuey, gps 2013-09-23 17:53:36 +08:00
Benjamin Chen
9d77c4acf5 Bug 831645 - Part1, Add Rtsp protocol and streaming protocol interface. r=jduell.mcbugs, sworkman 2013-09-23 18:12:11 +08:00
Paul Adenot
554d95edf9 Bug 922247 - When an AudioContext is not running at 48kHz, resample the input of the MediaRecorder when encoding in Opus. r=roc 
--HG--
extra : rebase_source : 8dd9202ed1a3e6b2b38fed78050223d1fccb74e5
 2013-10-17 15:45:32 +02:00
Paul Adenot
67517ee2fb Bug 918861 - Update tests that were relying on a 48000Hz samplerate. r=ehsan 
--HG--
extra : rebase_source : 84ba0d07e2c1905bc9b7d6e37121c6e0d3d53b33
 2013-10-17 15:44:52 +02:00
Paul Adenot
d94b857af1 Bug 918861 - Allow the MSG to choose a better samplerate than 48000Hz. r=roc 
--HG--
extra : rebase_source : 2181ccbbdca370031d1d3ae5b44ef4e37a3e948c
 2013-10-17 15:44:52 +02:00
Paul Adenot
7e0682e3c8 Bug 918861 - Expose a better samplerate though the AudioStream interface. r=kinetik 
--HG--
extra : rebase_source : d085d173aeb00f47f56016c0a1d1bf7fe11fb6f3
 2013-10-17 15:44:52 +02:00
Paul Adenot
2ecd0a5c7e Bug 907817 - Allow AudioStream users to pass-in latency requirements. r=kinetik 
--HG--
extra : rebase_source : 3cf1971913b3cfd8000c58614b0d0be8b7805af0
 2013-10-17 15:44:52 +02:00
Andrea Marchesini
a51331fdcf Bug 924870 - AudioContext.mozAudioChannel attribute, r=ehsan 2013-10-11 13:55:47 +02:00
Mike Hommey
c2fbbcbbda Bug 922460 - Kill media/webrtc/shared_libs.mk. r=ted 
--HG--
rename : media/webrtc/shared_libs.mk => layout/media/webrtc/Makefile.in
 2013-10-11 08:15:24 +09:00
Boris Zbarsky
48ef79b3bb Bug 817194. Make WebIDL dictionary types sanely initialized by default; add a new Fast subclass to handle cases when we can skip the initialization safely. r=khuey 2013-10-09 12:05:22 -04:00
Ed Morley
2c635d5d0c Backed out changeset 8fa0cbe4a54d (bug 817194) for build failures 2013-10-09 17:48:13 +01:00
Ed Morley
a805716e0a Backed out changeset ccedb8b1cefc (bug 817194) 2013-10-09 17:47:58 +01:00
Boris Zbarsky
27e51b13e1 Bug 817194 followup because someone added another *Initializer use. r=bustage 2013-10-09 12:20:49 -04:00
Boris Zbarsky
cf8ba5ee47 Bug 817194. Make WebIDL dictionary types sanely initialized by default; add a new Fast subclass to handle cases when we can skip the initialization safely. r=khuey 2013-10-09 12:05:22 -04:00
Karl Tomlinson
3594531f4d b=924288 no need to set filter parameters after every process() r=ehsan 
--HG--
extra : transplant_source : %23%D1%3B%D8%03%85%25%95%A8z%15%24K%F0%F7f2%20u%95
 2013-10-09 15:33:07 +13:00
Karl Tomlinson
bca3f10dd4 b=924286 handle non-unit mVolume in BiquadFilterNode r=ehsan 
--HG--
extra : transplant_source : %E5%9E%3E%5D%F2%E5%99%7B%88%DB%21%7D%1C%82%1A.q%26%F0%EA
 2013-10-09 15:33:02 +13:00
Karl Tomlinson
e859e3d998 b=922458 allow copying the last sample in an AudioBuffer channel r=ehsan 
--HG--
extra : transplant_source : %5EM%40g%06n%04%A1%DB%0A%7D%3A%5C6%21%CA%C101%09
 2013-10-09 15:32:16 +13:00
Andrea Marchesini
5b731001cd Bug 874508 - Web Audio is connected to AudioChannelService, r=ehsan 2013-10-08 20:20:33 +02:00
Phil Ringnalda
ebe7b42c23 Merge m-c to m-i 2013-10-04 22:17:30 -07:00
Phil Ringnalda
7f051a26a9 Merge b-i to m-c 2013-10-04 22:06:34 -07:00
Andrew Quartey
3a03fec19c Bug 893309 - Implement TrackEvent. r=cpearce 2013-10-04 14:28:25 -04:00
Carsten "Tomcat" Book
f5d6799f05 Backed out changeset b607cc162c2c (bug 874508) for causing perma orange b2g-crashtest failures 2013-10-04 16:31:02 +02:00
Andrea Marchesini
b8d1c01e56 Bug 874508 - Web Audio is connected to AudioChannelService, r=ehsan 2013-10-04 06:27:49 -04:00
Phil Ringnalda
8459f2486d Backed out changeset 643354059afb (bug 874508) for b2g build bustage 
CLOSED TREE
 2013-10-03 20:11:58 -07:00
Andrea Marchesini
5635de1215 Bug 874508 - Web Audio is connected to AudioChannelService, r=ehsan 2013-10-03 18:42:04 -04:00
Andrea Marchesini
998bedf816 Bug 923517 - AudioDestinationNode should work as an EventTarget, r=ehsan 2013-10-03 18:40:20 -04:00
Kartikaya Gupta
8fe0b41e3a Bug 923472 - Use memset instead of block field assignment to fix a compile error. r=cpearce 2013-10-03 17:00:33 -04:00
JW Wang
66cdab8a24 Bug 921695 - Part 2: Modify callers. r=karlt 2013-10-01 14:22:57 +08:00
JW Wang
79dc006472 Bug 921695 - Part 1: Add convert function. r=karlt 2013-10-01 14:22:54 +08:00
Ms2ger
bc14e4aa9c Merge m-c to inbound. 2013-10-03 11:09:17 +02:00
Sotaro Ikeda
0ff2ce37ce Bug 922334 - Add zero division check and prevent unncecessary mp3 parsing r=doublec 2013-10-03 10:53:21 +02:00
Ms2ger
7ffcd856c2 Bug 900980 - Part a: Move unconditional assignments to EXPORT_LIBRARY to moz.build; rs=gps 2013-10-03 09:11:13 +02:00
Ms2ger
cefa43a749 Bug 912099 - Part a: Make sure CPP_SOURCES only points to existing files in most of the tree; r=mshal 2013-10-03 09:10:00 +02:00
Ms2ger
105ce73cfa Bug 922268 - Remove empty makefiles; r=gps 2013-10-03 09:10:00 +02:00
Masayuki Nakano
5e5853070a Bug 920377 part.31 Get rid of nsEvent r=roc 2013-10-02 12:46:04 +09:00
Ehsan Akhgari
4818a0f3af Bug 923151 - Part 2: Don't #include nsIDocument.h in mozilla/dom/Element.h; r=jst 
--HG--
extra : rebase_source : 8c5f5429574313a1304eb2779cdb6b5702e4094d
 2013-10-02 16:09:18 -04:00
Ed Morley
1b0a2c0479 Backed out changeset dc8642fe6529 (bug 893309) for build failures 2013-10-02 15:59:07 +01:00
Andrew Quartey
d5a48c9f44 Bug 893309 - Implement TrackEvent. r=cpearce 2013-10-02 10:30:29 -04:00
Ehsan Akhgari
180798444f Bug 922933 - Don't #include nsIDocument.h in nsIContent.h; r=jst 
--HG--
extra : rebase_source : 51f56fa27604224eacc2ba384bb826c49f4f917f
 2013-10-02 07:40:07 -04:00
Matt Woodrow
d188bf5f9a Bug 921910 - Invalidate when we change the frame of an asynchronous ImageContainer that is part of a main-thread layer tree. r=roc 2013-10-02 16:05:49 +13:00
Matt Woodrow
9ad44524fe Bug 886219 - Force an invalidation when an async video finishes. r=nical 2013-10-02 16:05:34 +13:00
Robert O'Callahan
e2de87eee6 Bug 922601. Use StreamTimeToGraphTime to get the correct conversion to graph time. r=padenot 
--HG--
extra : rebase_source : 148da9b3fdc1cd6fb12489ad20d724218fcd75d1
 2013-10-01 22:28:49 -04:00
Nicolas Silva
8605f47406 Bug 922202 - Make PlanarYCbCrImage::Data forward-declarable and remove some header includes. r=bjacob 2013-10-01 17:57:50 -07:00
Steven Lee
920772d32e Bug 918056 - Return errors when the mic is occupied. r=rjesup 2013-10-01 08:06:57 -04:00
Sotaro Ikeda
bdb3259801 Bug 914870 - Reduce mp3 parse chunk buffer size to 32KiB. r=doublec 2013-10-01 08:06:57 -04:00
David Anderson
c8133fee65 Rename IPDL's RPC to Interrupt (bug 910020, r=bent). 
--HG--
rename : ipc/ipdl/test/cxx/PTestRPCErrorCleanup.ipdl => ipc/ipdl/test/cxx/PTestInterruptErrorCleanup.ipdl
rename : ipc/ipdl/test/cxx/PTestRPCRaces.ipdl => ipc/ipdl/test/cxx/PTestInterruptRaces.ipdl
rename : ipc/ipdl/test/cxx/PTestRPCShutdownRace.ipdl => ipc/ipdl/test/cxx/PTestInterruptShutdownRace.ipdl
rename : ipc/ipdl/test/cxx/PTestRacyRPCReplies.ipdl => ipc/ipdl/test/cxx/PTestRacyInterruptReplies.ipdl
rename : ipc/ipdl/test/cxx/TestRPCErrorCleanup.cpp => ipc/ipdl/test/cxx/TestInterruptErrorCleanup.cpp
rename : ipc/ipdl/test/cxx/TestRPCErrorCleanup.h => ipc/ipdl/test/cxx/TestInterruptErrorCleanup.h
rename : ipc/ipdl/test/cxx/TestRPCRaces.cpp => ipc/ipdl/test/cxx/TestInterruptRaces.cpp
rename : ipc/ipdl/test/cxx/TestRPCRaces.h => ipc/ipdl/test/cxx/TestInterruptRaces.h
rename : ipc/ipdl/test/cxx/TestRPCShutdownRace.cpp => ipc/ipdl/test/cxx/TestInterruptShutdownRace.cpp
rename : ipc/ipdl/test/cxx/TestRPCShutdownRace.h => ipc/ipdl/test/cxx/TestInterruptShutdownRace.h
rename : ipc/ipdl/test/cxx/TestRacyRPCReplies.cpp => ipc/ipdl/test/cxx/TestRacyInterruptReplies.cpp
rename : ipc/ipdl/test/cxx/TestRacyRPCReplies.h => ipc/ipdl/test/cxx/TestRacyInterruptReplies.h
rename : ipc/ipdl/test/ipdl/error/rpcMessageCompress.ipdl => ipc/ipdl/test/ipdl/error/intrMessageCompress.ipdl
rename : ipc/ipdl/test/ipdl/error/tooWeakRPCAsync.ipdl => ipc/ipdl/test/ipdl/error/tooWeakInterruptAsync.ipdl
rename : ipc/ipdl/test/ipdl/ok/rpcProtocol.ipdl => ipc/ipdl/test/ipdl/ok/intrProtocol.ipdl
 2013-09-30 17:27:45 -07:00
Ehsan Akhgari
e85e1b2a99 Convert the Web Audio DynamicsCompressorNode fatal assertion to a warning, because it should not be a fatal assertion (no bug) 2013-09-30 18:20:03 -04:00
Karl Tomlinson
2900c28a02 b=910174 add DelayNode's tail-time reference as soon as the engine receives sound r=ehsan 
This removes the dependence on AllInputsFinished() which didn't return true
for many input types.

The DelayProcessor is no longer continuously reset (bug 921457) and the
reference is now correctly added again when all inputs are finished and then
new inputs are connected.

--HG--
extra : rebase_source : b85c62305a6fcfce57bd40a11edaeaaf2a63c188
 2013-10-01 09:50:04 +13:00
Karl Tomlinson
ba487756fb b=921675 use maximum instead of current delay for tail time because delay can increase faster than time passes r=ehsan 
--HG--
extra : rebase_source : b74864829e5fa0cdfbd555d93d2c71dd656f2258
 2013-10-01 09:50:03 +13:00
Karl Tomlinson
2723d7ceb7 test for bug 920987 
--HG--
extra : rebase_source : 0e049c2e25f60bfff2dd45869a770ed9055c9de2
 2013-10-01 09:49:31 +13:00
Paul Adenot
ecada2c0f4 Bug 921099 - Remove alignment assertions in AudioNodeEngineNEON.cpp for now. r=ehsan 2013-09-30 15:04:54 -04:00
Ed Morley
f2ee101f41 Bug 897843 - Disable test_media_selection.html on Windows for too many intermittent failures 2013-09-30 17:37:44 +01:00
Gregory Szorc
e53ac5e38d Bug 920223 - Part 1: Mass convert MOCHITEST_FILES to manifests; rs=Ms2ger 2013-09-30 09:51:57 +02:00
Ed Morley
d84dee3273 Backed out changeset 77bff106b704 (bug 920223) 2013-09-30 12:50:12 +01:00