David Anderson
7b87cb9a76
Merge from mozilla-central.
2012-07-20 12:02:04 -07:00
David Anderson
180cbd4d9d
Merge from mozilla-central.
2012-07-19 14:34:36 -07:00
Ed Morley
c7736aea1d
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-07-19 13:25:37 +01:00
David Anderson
921bd834c9
Merge from mozilla-central.
...
--HG--
rename : js/xpconnect/wrappers/CrossOriginWrapper.cpp => js/xpconnect/wrappers/WaiveXrayWrapper.cpp
rename : js/xpconnect/wrappers/CrossOriginWrapper.h => js/xpconnect/wrappers/WaiveXrayWrapper.h
2012-07-18 19:02:32 -07:00
Ed Morley
ab4a6323cd
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-07-18 13:32:24 +01:00
Ms2ger
1a4b2fb61b
Bug 756397 - Enable FAIL_ON_WARNINGS in content/media; r=cpearce
2012-07-18 12:36:08 +02:00
David Zbarsky
88371b030a
[Bug 774505] Don't include Layers.h everywhere r=cjones
2012-07-18 12:31:40 -04:00
Oleg Romashin
999917220b
Bug 775257 - Gstreamer backend on Meego N9 produce extra noise in audio playback.r=giles
2012-07-18 22:46:11 -04:00
Robert O'Callahan
0be0d048a2
Bug 774597. Avoid accessing MediaStreamGraphImpl members after the graph object may have been cleaned up by the main thread. r=jesup
...
--HG--
extra : rebase_source : 5f6c34855ad5df629c25d4b11f008b03cf2266ae
2012-07-18 01:02:06 -04:00
David Anderson
b93d6b9c04
Merge from mozilla-central.
2012-07-12 13:23:26 -07:00
Anant Narayanan
e91b26162f
Bug 691234: Part 2/3: Implement WebRTC backend for MediaEngine on Desktop; r=jesup, r=roc
2012-07-12 04:53:08 -07:00
David Anderson
56d1e29054
Merge from mozilla-central.
...
--HG--
rename : editor/libeditor/base/DeleteElementTxn.cpp => editor/libeditor/base/DeleteNodeTxn.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicBuffers.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicBuffers.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicCanvasLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicColorLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicContainerLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicContainerLayer.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicImageLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayerManager.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayersImpl.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayersImpl.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicThebesLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicThebesLayer.h
rename : js/src/jsobj.cpp => js/src/builtin/Eval.cpp
2012-07-10 19:45:14 -07:00
Rafael Ávila de Espíndola
6fa6b984a6
Bug 775134 - Remove extra ; r=ehsan.
...
--HG--
extra : rebase_source : 1d44663679e8f1944649d54608e5e6e6694e88c5
2012-07-18 12:15:47 -04:00
Matthew Gregan
68e63d3ddc
Bug 775170 - Use naming convention from coding style guide for static member of StateMachineTracker. r=doublec
...
--HG--
extra : rebase_source : 4dacfc1e600fe1ba00c16a235032f7e52a1cd10a
2012-07-18 13:26:24 -04:00
Ehsan Akhgari
6f83bbeaa8
Merge mozilla-central into mozilla-inbound
2012-07-19 08:44:19 -04:00
Jacek Caban
35647e8a59
Bug 472799 - Undefine GetCurrentTime in nsDOMMediaStream.h r=cpearce
2012-07-19 11:58:48 +02:00
Nathan Froyd
a7eb97f896
Bug 370750 - consolidate mochitest files installation; r=glandium
...
With assistance on the patch from Ms2ger, Waldo, and Mossop.
2012-07-03 16:49:02 -04:00
David Anderson
8cc88ca2e4
Merge from mozilla-central.
2012-06-28 15:17:18 -07:00
Chris Pearce
407767521d
Bug 762191 - Make video controls mute/volume widgets do nothing if the video doesn't have audio. r=jaws
2012-06-28 17:31:09 +12:00
David Anderson
af248c16a6
Merge from mozilla-central.
2012-06-27 11:00:48 -07:00
Ralph Giles
ce957c9c8b
Bug 766331 - Don't rescan old data for Ogg timestamps - r=cpearce
...
nsOggReader::RangeEndTime() relied on CRC values from valid ogg
pages to keep track of already-searched data when looking for a
end timestamp. This caused quadratic behaviour searching in a
section of a file with no valid pages.
Instead, remember where we last looked, and backoff immediately
if we go more than the maximum length of a page into previously
scanned data. This avoids searching data we've eliminated as
containing valid Ogg pages and lets us search backward with O(N)
instead.
2012-06-25 09:38:56 -07:00
Anant Narayanan
2a355449fc
Bug 691234: Part 1/3: Move MediaEngine files and tweak interface; r=roc
...
--HG--
rename : content/media/MediaEngine.h => content/media/webrtc/MediaEngine.h
rename : content/media/MediaEngineDefault.cpp => content/media/webrtc/MediaEngineDefault.cpp
rename : content/media/MediaEngineDefault.h => content/media/webrtc/MediaEngineDefault.h
2012-06-19 17:29:43 -07:00
Anant Narayanan
bb04cfc046
Backout 431ab4d097c9, bustage
2012-07-11 21:51:20 -07:00
Anant Narayanan
a268b8a7a6
Backout 431ab4d097c9, bustage
2012-07-11 21:45:20 -07:00
Anant Narayanan
de0f08c487
Backout 038e89521330, bustage
2012-07-11 21:44:16 -07:00
Anant Narayanan
641e5c597a
Bug 691234: Part 2/3: Implement WebRTC backend for MediaEngine on Desktop; r=jesup, r=roc
2012-07-11 21:22:24 -07:00
Anant Narayanan
f8751ea4ae
Bug 691234: Part 1/3: Move MediaEngine files and tweak interface; r=roc
...
--HG--
rename : content/media/MediaEngine.h => content/media/webrtc/MediaEngine.h
rename : content/media/MediaEngineDefault.cpp => content/media/webrtc/MediaEngineDefault.cpp
rename : content/media/MediaEngineDefault.h => content/media/webrtc/MediaEngineDefault.h
2012-06-19 17:29:43 -07:00
David Anderson
5708a1e047
Merge from mozilla-central.
...
--HG--
extra : rebase_source : 521cbf2f434cad88106f32be797faae4861afc39
2012-06-25 13:09:36 -07:00
Robert O'Callahan
3af104f72b
Bug 752796. More logging. r=jesup
2012-06-22 22:51:04 +12:00
Mounir Lamouri
744531ad99
Back out bug 766007, bug 703241 and bug 752796 due to perma-orange (419f0d1b848b to 8661c74deeb5).
2012-06-22 11:13:32 +02:00
Robert O'Callahan
c23627b32f
Bug 752796. Add a bit more logging. r=jesup
2012-06-22 17:07:41 +12:00
Paul Adenot
49489f9d00
Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
2012-06-21 20:44:39 -04:00
David Anderson
f9753b6d4c
Merge from mozilla-central.
...
--HG--
rename : js/xpconnect/src/XPCThreadContext.cpp => js/xpconnect/src/XPCJSContextStack.cpp
2012-06-22 14:26:15 -07:00
David Anderson
56ca9ab8a4
Merge from mozilla-central.
...
--HG--
rename : accessible/src/msaa/CAccessibleText.cpp => accessible/src/msaa/ia2AccessibleText.cpp
rename : accessible/src/msaa/CAccessibleText.h => accessible/src/msaa/ia2AccessibleText.h
2012-06-20 17:36:56 -07:00
David Anderson
9c1aa0957a
Merge from mozilla-central.
2012-06-15 15:23:58 -07:00
David Anderson
26ac034690
Merge from mozilla-central.
...
--HG--
rename : accessible/src/html/nsHTMLTableAccessible.cpp => accessible/src/html/HTMLTableAccessible.cpp
rename : accessible/src/html/nsHTMLTableAccessible.h => accessible/src/html/HTMLTableAccessible.h
rename : accessible/src/xul/nsXULAlertAccessible.cpp => accessible/src/xul/XULAlertAccessible.cpp
rename : accessible/src/xul/nsXULAlertAccessible.h => accessible/src/xul/XULAlertAccessible.h
rename : accessible/src/xul/nsXULColorPickerAccessible.cpp => accessible/src/xul/XULColorPickerAccessible.cpp
rename : accessible/src/xul/nsXULColorPickerAccessible.h => accessible/src/xul/XULColorPickerAccessible.h
rename : accessible/src/xul/nsXULComboboxAccessible.cpp => accessible/src/xul/XULComboboxAccessible.cpp
rename : accessible/src/xul/nsXULComboboxAccessible.h => accessible/src/xul/XULComboboxAccessible.h
rename : accessible/src/xul/nsXULMenuAccessible.cpp => accessible/src/xul/XULMenuAccessible.cpp
rename : accessible/src/xul/nsXULMenuAccessible.h => accessible/src/xul/XULMenuAccessible.h
rename : accessible/src/xul/nsXULSliderAccessible.cpp => accessible/src/xul/XULSliderAccessible.cpp
rename : accessible/src/xul/nsXULSliderAccessible.h => accessible/src/xul/XULSliderAccessible.h
rename : accessible/src/xul/nsXULTabAccessible.cpp => accessible/src/xul/XULTabAccessible.cpp
rename : accessible/src/xul/nsXULTreeAccessible.cpp => accessible/src/xul/XULTreeAccessible.cpp
rename : accessible/src/xul/nsXULTreeAccessible.h => accessible/src/xul/XULTreeAccessible.h
rename : accessible/src/xul/nsXULTreeGridAccessible.cpp => accessible/src/xul/XULTreeGridAccessible.cpp
rename : accessible/src/xul/nsXULTreeGridAccessible.h => accessible/src/xul/XULTreeGridAccessible.h
2012-06-12 17:44:22 -07:00
Jan de Mooij
4f467d66c2
Merge m-c to ionmonkey
...
--HG--
rename : accessible/src/html/nsHTMLSelectAccessible.cpp => accessible/src/html/HTMLSelectAccessible.cpp
rename : accessible/src/html/nsHTMLSelectAccessible.h => accessible/src/html/HTMLSelectAccessible.h
rename : memory/jemalloc/jemalloc.c => memory/mozjemalloc/jemalloc.c
rename : memory/jemalloc/jemalloc.h => memory/mozjemalloc/jemalloc.h
2012-06-08 11:18:39 +02:00
Matthew Gregan
d6ea8c2c90
Bug 723860 - Early bail from reader's GetBuffered() if not yet initialized. r=doublec
2012-06-06 17:58:07 +12:00
Paul Adenot
8558f22925
Bug 760336 - Set nsBuiltinDecoderStateMachine::mBufferingWait to be seconds instead of milliseconds r=chris.double
2012-06-07 11:43:25 +12:00
Paul Adenot
f387024003
Bug 761708 - Wrong |played| value when seeking back in the media. r=chris.double
2012-06-07 11:43:13 +12:00
Sean Stangl
fe3f5b47a2
Merge m-c to Ionmonkey.
...
--HG--
rename : accessible/src/base/nsBaseWidgetAccessible.h => accessible/src/generic/BaseAccessibles.h
rename : accessible/src/html/nsHTMLImageMapAccessible.cpp => accessible/src/html/HTMLImageMapAccessible.cpp
rename : accessible/src/html/nsHTMLLinkAccessible.cpp => accessible/src/html/HTMLLinkAccessible.cpp
rename : accessible/src/html/nsHTMLLinkAccessible.h => accessible/src/html/HTMLLinkAccessible.h
2012-06-05 16:54:36 -07:00
Ms2ger
37be1fb791
Bug 760156 - Cleanup LOCAL_INCLUDES in content/media/; r=sicking
...
This patch makes it possible to include nsGenericHTMLElement.h without adding
to LOCAL_INCLUDES.
2012-06-06 09:40:02 +02:00
Geoff Lankow
00f3a215c9
Bug 749930 - Replace uses of nsILocalFile with nsIFile (compiled code only); r=bsmedberg
2012-06-06 14:08:30 +12:00
Sean Stangl
7d9dc67f9e
Merge m-c to Ionmonkey.
...
--HG--
rename : accessible/src/html/nsHyperTextAccessible.cpp => accessible/src/generic/HyperTextAccessible.cpp
rename : accessible/src/html/nsHyperTextAccessible.h => accessible/src/generic/HyperTextAccessible.h
rename : accessible/src/html/nsHTMLImageAccessible.cpp => accessible/src/generic/ImageAccessible.cpp
rename : accessible/src/html/nsHTMLImageAccessible.h => accessible/src/generic/ImageAccessible.h
rename : accessible/src/msaa/nsHyperTextAccessibleWrap.cpp => accessible/src/msaa/HyperTextAccessibleWrap.cpp
rename : accessible/src/msaa/nsHyperTextAccessibleWrap.h => accessible/src/msaa/HyperTextAccessibleWrap.h
2012-06-04 13:30:29 -07:00
Stephen Moehle
6954c5cbf1
Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik
...
--HG--
extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a
2012-06-05 11:32:36 +12:00
Stephen Moehle
3d568999e1
Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik
...
--HG--
extra : rebase_source : 5e884550f9870bd2fda247d50bebd472e8368588
2012-06-05 11:31:13 +12:00
Sean Stangl
d9462a4f06
Merge m-c onto Ionmonkey.
...
--HG--
rename : accessible/src/atk/nsAccessibleWrap.cpp => accessible/src/atk/AccessibleWrap.cpp
rename : accessible/src/atk/nsAccessibleWrap.h => accessible/src/atk/AccessibleWrap.h
rename : accessible/src/atk/nsDocAccessibleWrap.h => accessible/src/atk/DocAccessibleWrap.h
rename : accessible/src/base/nsAccessible.cpp => accessible/src/generic/Accessible.cpp
rename : accessible/src/base/nsAccessible.h => accessible/src/generic/Accessible.h
rename : accessible/src/base/nsDocAccessible.cpp => accessible/src/generic/DocAccessible.cpp
rename : accessible/src/base/nsDocAccessible.h => accessible/src/generic/DocAccessible.h
rename : accessible/src/mac/nsAccessibleWrap.h => accessible/src/mac/AccessibleWrap.h
rename : accessible/src/mac/nsAccessibleWrap.mm => accessible/src/mac/AccessibleWrap.mm
rename : accessible/src/mac/nsDocAccessibleWrap.h => accessible/src/mac/DocAccessibleWrap.h
rename : accessible/src/mac/nsDocAccessibleWrap.mm => accessible/src/mac/DocAccessibleWrap.mm
rename : accessible/src/msaa/nsAccessibleWrap.cpp => accessible/src/msaa/AccessibleWrap.cpp
rename : accessible/src/msaa/nsDocAccessibleWrap.cpp => accessible/src/msaa/DocAccessibleWrap.cpp
rename : accessible/src/msaa/nsTextAccessibleWrap.cpp => accessible/src/msaa/TextLeafAccessibleWrap.cpp
rename : accessible/src/msaa/nsTextAccessibleWrap.h => accessible/src/msaa/TextLeafAccessibleWrap.h
rename : netwerk/protocol/http/SpdySession.cpp => netwerk/protocol/http/SpdySession2.cpp
rename : netwerk/protocol/http/SpdySession.h => netwerk/protocol/http/SpdySession2.h
rename : netwerk/protocol/http/SpdySession.cpp => netwerk/protocol/http/SpdySession3.cpp
rename : netwerk/protocol/http/SpdySession.h => netwerk/protocol/http/SpdySession3.h
rename : netwerk/protocol/http/SpdyStream.cpp => netwerk/protocol/http/SpdyStream2.cpp
rename : netwerk/protocol/http/SpdyStream.cpp => netwerk/protocol/http/SpdyStream3.cpp
2012-05-31 17:17:52 -07:00
Ralph Giles
08ed5054b4
Bug 758833 - Track and trim opus preskip samples - r=doublec
...
We trim the initial few samples out of the opus decoder,
to give the output time to converge, and to correct for
the encoding delay. Encoders store the delay in the preskip
field of the Ogg encapsulation header.
The previous code to do this was a hack based on the granulepos
values and could fail on some inputs. Instead, keep a count
of how many samples we want to trip, and remove packet data
until that value matches the preskip value from the header.
The value is set to the preskip value from the header when
the decoder is initialized. We also need to do this after
seek. To do this we add a specialized nsOggReader::ResetDecode
method which takes a boolean argument, set to true when
we are seeking to the start of the stream. In that case,
the method resets the skip count.
There is still an issue after general seeks. The spec recommends
trimming a full 80 ms (3840 frames) to allow the decoder to fully
settle from the previous state. It's tricky to do this inside
nsOpusState because it doesn't know where it is in the stream.
Also add some debug output to track the decode behaviour.
2012-05-31 16:03:14 +12:00
Abhishek Bhatnagar
dfa16e20ca
Bug 500784 - Video/Audio files over 2^31 bytes now return proper durations; r=cpearce
...
--HG--
extra : rebase_source : 219872db85890a3358456dde226a29595e738f1b
2012-05-31 14:33:15 +12:00
Chris Double
0e0ad7b069
Bug 758481 - When seeking in an unbuffered range after having ended a media, networkState is NETWORK_IDLE r=chris.double
...
--HG--
extra : rebase_source : e62887187ed20ad6e832bd0211c50392759bb321
2012-05-31 14:30:23 +12:00