Ehsan Akhgari
589178c8cd
Merge IonMonkey into mozilla-inbound
2012-09-11 16:38:44 -04:00
David Anderson
76ab271ead
Merge IonMonkey to mozilla-central. a=arewefastyet
...
--HG--
rename : content/base/src/nsWebSocket.cpp => content/base/src/WebSocket.cpp
rename : content/base/src/nsWebSocket.h => content/base/src/WebSocket.h
2012-09-11 10:25:14 -07:00
Rafael Ávila de Espíndola
6467bb860f
Bug 790283 - add newline to the end of two files. r=ehsan.
2012-09-11 13:59:10 -04:00
David Anderson
09854d2b71
Merge from mozilla-central.
2012-09-10 12:16:38 -07:00
David Anderson
f4bf6ff039
Merge from mozilla-central.
2012-09-06 18:28:59 -07:00
Ryan VanderMeulen
c03d084401
Merge m-c to inbound.
2012-09-05 23:03:09 -04:00
Makoto Kato
1356f06137
Bug 784912 - nsIStreamListener.onDataAvailable should handle 64-bit offset. r=honza
2012-09-06 11:41:02 +09:00
David Anderson
f6eca6c7f0
Merge from mozilla-central.
...
--HG--
rename : js/jsd/jsd_scpt.c => js/jsd/jsd_scpt.cpp
rename : js/jsd/jsd_stak.c => js/jsd/jsd_stak.cpp
rename : js/jsd/jsd_val.c => js/jsd/jsd_val.cpp
2012-09-05 16:18:11 -07:00
Paul Adenot
8370333187
Bug 567077 - Tests for sniffing the types of media files that are served with no Content-Type. r=cpearce
2012-09-04 16:24:34 -07:00
Paul Adenot
eca50b7f5f
Bug 567077 - Avoid sniffing when recreating a channel. r=cpearce
2012-09-04 17:49:46 -07:00
Paul Adenot
5d61981f79
Bug 567077 - Sniff types of media files that are served with no Content-Type. r=cpearce
2012-09-04 16:22:34 -07:00
David Anderson
25cb077cb2
Merge from mozilla-central.
...
--HG--
rename : js/src/sharkctl.cpp => js/src/devtools/sharkctl.cpp
rename : js/src/sharkctl.h => js/src/devtools/sharkctl.h
rename : js/src/MemoryMetrics.cpp => js/src/jsmemorymetrics.cpp
2012-08-29 17:57:37 -07:00
David Anderson
a77264d9fb
Merge from mozilla-central.
...
--HG--
rename : content/base/public/nsIFrameMessageManager.idl => content/base/public/nsIMessageManager.idl
2012-08-29 17:51:24 -07:00
Ryan VanderMeulen
12c1c8ace2
Backout bug 567077 for bustage.
2012-09-05 18:36:38 -04:00
Paul Adenot
02155af3db
Bug 567077 - Tests for sniffing the types of media files that are served with no Content-Type. r=cpearce
2012-09-04 16:24:34 -07:00
Paul Adenot
fb2a42f014
Bug 567077 - Avoid sniffing when recreating a channel. r=cpearce
2012-09-04 16:24:12 -07:00
Paul Adenot
0836baba74
Bug 567077 - Sniff types of media files that are served with no Content-Type. r=cpearce
2012-09-04 16:22:34 -07:00
Paul Adenot
6ad35d0369
Bug 730765 - Media cache shouldn't be used when loading from blob: urls. r=biesi
2012-09-04 14:53:52 -07:00
Siddharth Agarwal
52e2d1e6cf
Merge mozilla-central to mozilla-inbound.
2012-08-29 20:41:03 +05:30
Ed Morley
ebda6d0912
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-08-29 14:35:19 +01:00
Chris Pearce
4fc9788c64
Bug 785909 - Don't init FileMediaResource::mSize on the main thread. r=roc
2012-08-29 15:55:57 +12:00
Matthew Gregan
04cafd2f3e
Bug 785967 - Reject Wave files with invalid data block size in the format chunk. r=doublec
2012-08-28 18:21:58 +12:00
Ed Morley
9e5b3951f3
Bug 752796 - Disable test_streams_element_capture{,_reset}.html on Windows for too many timeouts. r=kinetik
2012-08-28 12:59:33 +12:00
David Anderson
3b9fed8952
Merge from mozilla-central.
2012-08-22 16:09:24 -07:00
David Anderson
a264d0ebc8
Merge from mozilla-central.
2012-08-21 15:59:12 -07:00
Michael Wu
a2f4fba3b5
Bug 694484 - OpenSL backend for libcubeb, r=kinetik
2012-09-04 17:45:08 -03:00
Chris Double
4c372a8b86
Bug 783927 - Handle zero length audio reads in stagefright backend to fix audio issues - r=cpeterson
2012-08-21 17:03:21 +12:00
David Zbarsky
3154e1b535
Bug 784004 - Don't include Layers.h everywhere Part 3 r=nical
2012-08-21 00:06:46 -04:00
David Anderson
58e1815704
Merge from mozilla-central.
2012-08-15 14:22:26 -07:00
David Anderson
d522cd5bdc
Merge from mozilla-central.
2012-08-14 12:20:09 -07:00
Ehsan Akhgari
a09e69cee0
Merge removal of nsnull
2012-08-14 11:29:00 -04:00
David Anderson
5c045998a5
Merge from mozilla-central.
2012-08-13 13:40:42 -07:00
Aryeh Gregor
a88ffe5c80
Bug 626472 part 3 - Remove nsnull for good; r=ehsan
2012-08-12 13:43:47 +03:00
David Anderson
ecf43e9ddf
Merge from mozilla-central.
2012-08-10 14:50:20 -07:00
Alexandros Chronopoulos
2eed568811
Bug 748144 - Support multichannel Opus files. r=rillian
...
The Opus audio format supports multichannel (surround) audio, but our initial implementation used a simpler API which only supported mono and stereo output.
To handle these files gracefully, this patch uses the multichannel api and downmixes the output, if possible, to stereo, since we don't currently support surround sound playback.
2012-08-09 15:53:23 -07:00
Honza Bambas
15daadba69
Bug 215450: Allow uploading of files greater than 2gb in size. Involves making input streams 64-bit capable. Significant work done by Makoto Kato, finished by Honza Bambas. r=hbambas,bsmedberg,jdrew,sicking
2012-08-10 22:44:11 -04:00
David Anderson
a02edfdd65
Merge from mozilla-central.
2012-08-09 13:41:13 -07:00
Ed Morley
b5f4776008
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-08-09 12:46:05 +01:00
Ms2ger
374d1023c2
Bug 780387 - Part f: Stop using PRBool & PRPackedBool; r=bsmedberg
2012-08-09 09:10:13 +02:00
David Anderson
8d084d5b2e
Merge from mozilla-central.
2012-08-08 15:09:49 -07:00
Ehsan Akhgari
e368dc9c85
Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg
...
This patch was generated by a script. Here's the source of the script for
future reference:
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name nsXPCOMCID.h \
! -name prtypes.h \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.c" \
-o -iname "*.cc" \
-o -iname "*.idl" \
-o -iname "*.ipdl" \
-o -iname "*.ipdlh" \
-o -iname "*.mm" \) | \
xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}
convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t
convert PRIntn int
convert PRUintn unsigned
convert PRSize size_t
convert PROffset32 int32_t
convert PROffset64 int64_t
convert PRPtrdiff ptrdiff_t
convert PRFloat64 double
2012-08-22 11:56:38 -04:00
Paul Adenot
82b123b5a7
Bug 730765 - Media cache shouldn't be used when loading from blob: urls. r=biesi
2012-08-21 16:00:23 -07:00
Ehsan Akhgari
f2ed1e6d36
Bug 784536 - Use the name of the enum value directly as opposed to access it from the enum's scope; r=dzbarsky
2012-08-21 19:06:50 -04:00
Ryan VanderMeulen
8df811156e
Backout 3ce94808577b, 56f288230d5a, and 18ff170ecb1f (bug 730765) for bustage. r=fail
2012-08-21 18:45:54 -04:00
Paul Adenot
a952a58489
Bug 730765 - Media cache shouldn't be used when loading from blob: urls. r=biesi
2012-08-15 10:36:12 -07:00
Paul Adenot
ee3a886b03
Bug 775319 - Determine the sample format at compile time for all media code. r=kinetik
2012-08-16 18:10:36 -07:00
Kan-Ru Chen (陳侃如)
967b36e8ae
Bug 767480 - Gralloc backed video buffer. r=roc
2012-08-21 18:22:58 +08:00
Kan-Ru Chen (陳侃如)
a55761dc81
Bug 767480 - PlanarYCbCrImage Refactoring. r=roc
2012-08-21 18:18:20 +08:00
Kan-Ru Chen (陳侃如)
1460a419c4
Back out c8f7bace9cf9, 17ec4e01c126 (bug 767480) r=bustage
2012-08-21 17:55:02 +08:00
Kan-Ru Chen (陳侃如)
4a4557a29e
Bug 767480 - Gralloc backed video buffer. r=roc
2012-08-21 14:59:42 +08:00
Kan-Ru Chen (陳侃如)
b992322a3a
Bug 767480 - PlanarYCbCrImage refactoring. r=roc
2012-08-21 17:31:36 +08:00
David Anderson
f2b01e4cbb
Merge from mozilla-central.
...
--HG--
rename : layout/base/nsFrameTraversal.cpp => layout/base/nsFrameIterator.cpp
rename : layout/base/nsFrameTraversal.h => layout/base/nsFrameIterator.h
rename : browser/modules/WebappsInstaller.jsm => toolkit/webapps/WebappsInstaller.jsm
2012-08-06 12:44:06 -07:00
David Anderson
f0e6ae1aeb
Merge from mozilla-central.
2012-08-03 18:58:30 -07:00
Ed Morley
a86a12d456
Bug 760770 - Mark test_timeupdate_small_files.html's "got unexpected stalled after ended" as todo for seek.webm, for frequent intermittent failures; r=cpearce
2012-08-03 11:28:12 +01:00
Ed Morley
0bd6c4dc3e
Bug 620598, Bug 661076 & Bug 687972 - Disable frequently intermittent media tests on Linux; r=cpearce
2012-08-03 11:28:12 +01:00
Nicolas Silva
7417a56a21
Bug 773469 - Remove unnecessary layer transactions when using async-video. r=roc
2012-08-10 11:42:53 -04:00
Chris Double
f73d553698
Bug 759945 - Part 4: MP4 test file - r=cpearce
...
--HG--
extra : rebase_source : 0aa155c4ebc60ddc8afe720161af345c555897a8
2012-08-10 20:15:24 +12:00
Chris Double
af9559fd5b
Bug 759945 - Part 3: Android OS headers and stub files for software decoding using libstagefright on Android - r=cpearce
...
--HG--
extra : rebase_source : 0f5b9fed7dac3040a98af6dcc324407c4f8a9772
2012-08-10 20:15:20 +12:00
Chris Double
525c351efa
Backed out changeset dcb9299974a0 due to audio issues on android and b2g
...
--HG--
extra : rebase_source : 7e2b937487c3df9a40406eadf250e6596b89664f
2012-08-10 17:30:01 +12:00
David Anderson
b1e8dd2805
Merge from mozilla-central.
2012-08-02 13:47:20 -07:00
Robert O'Callahan
cc1037deb4
Bug 646331. Specify correct duration for 320x240.ogv. r=cpearce
2012-08-03 15:22:24 +12:00
Ed Morley
2c3082317d
Backout ec46cfa51bf8, 4a54f06efee8, de811fbd27b0 & 67ea1314c777 (bug 567077) for causing bug 781141
2012-08-08 13:11:34 +01:00
David Anderson
bd3a52c3e2
Merge.
...
--HG--
rename : content/base/src/nsGenericElement.h => content/base/public/FragmentOrElement.h
rename : content/base/src/nsGenericElement.cpp => content/base/src/FragmentOrElement.cpp
rename : gfx/thebes/nsCoreAnimationSupport.mm => gfx/2d/QuartzSupport.mm
2012-08-01 11:30:00 -07:00
Matthew Gregan
b9a449e923
Bug 779412 - Iterate over correct test array in test_info_leak. r=cpearce
2012-08-01 17:58:09 +12:00
Chris Pearce
3747bd5737
Bug 778105 - Fix an nsOggReader::GetBuffered() return value type mismatch. r=doublec
2012-08-01 13:24:25 +12:00
David Anderson
56597a8412
Merge from mozilla-central.
2012-07-31 17:19:41 -07:00
David Anderson
e7f516869b
Merge from mozilla-central.
2012-07-30 13:15:39 -07:00
Aryeh Gregor
d0ad5a7d0c
Bug 777292 part 2 - Change all nsnull to nullptr
2012-07-30 17:20:58 +03:00
David Anderson
b8519fb4f1
Merge from mozilla-central.
2012-07-26 18:19:02 -07:00
David Anderson
8027cb08c0
Merge from mozilla-central.
2012-07-24 16:32:08 -07:00
David Anderson
04a683031c
Merge from mozilla-central.
2012-07-23 12:37:49 -07:00
David Anderson
07f7d8e680
Merge from mozilla-central.
2012-07-20 12:02:04 -07:00
David Anderson
5297cee003
Merge from mozilla-central.
2012-07-19 14:34:36 -07:00
Ed Morley
6e77ed5e6e
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-07-19 13:25:37 +01:00
David Anderson
eec7db39f5
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
Bobby Holley
1895527d8c
Bug 778420 - Fix up tests that don't like the new enablePrivilege. r=jmaher
...
--HG--
extra : rebase_source : 1158df4a4eb917074204e649efd8f2b8e699f115
2012-08-03 22:19:54 +02:00
Ed Morley
fcaa2b9642
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-07-18 13:32:24 +01:00
Ms2ger
7b92acdf47
Bug 756397 - Enable FAIL_ON_WARNINGS in content/media; r=cpearce
2012-07-18 12:36:08 +02:00
David Zbarsky
9a61d96c70
[Bug 774505] Don't include Layers.h everywhere r=cjones
2012-07-18 12:31:40 -04:00
Matthew Gregan
7c54dee4c4
Bug 761274 - Work around buffer sizing bug in PulseAudio ALSA plugin. r=doublec
2012-07-16 17:15:24 -04:00
Matthew Gregan
a515ca6a14
Bug 768333 - nsBufferedAudioStream::GetPositionInFrames miscompiled with Win32 PGO. r=cpearce
2012-07-16 17:21:04 -04:00
Matthew Gregan
4a025b6513
Bug 779187 - Fix nsBufferedAudioStream's sample format selection for big endian machines. r=doublec
2012-08-06 15:26:41 +12:00
David Zbarsky
03039446fa
[Bug 780428] Don't include nsIFrame.h in places where it's not necessary r=roc
2012-08-05 23:00:56 -04:00
Oleg Romashin
b222e74143
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
3c2fd3031d
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
4264d447f8
Merge from mozilla-central.
2012-07-12 13:23:26 -07:00
Anant Narayanan
5f5ec4a638
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
12f86be1b6
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
b1d34774bf
Bug 775134 - Remove extra ; r=ehsan.
...
--HG--
extra : rebase_source : 1d44663679e8f1944649d54608e5e6e6694e88c5
2012-07-18 12:15:47 -04:00
Aryeh Gregor
65eef91085
Bug 626472 part 1 - Define nsnull as nullptr where available; r=ehsan
2012-07-20 14:16:17 +03:00
Mike Hommey
70d7c821af
Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted
2012-08-04 20:26:44 +02:00
Matthew Gregan
011c398419
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
c3978f0b7a
Merge mozilla-central into mozilla-inbound
2012-07-19 08:44:19 -04:00
Jacek Caban
c51d30b89c
Bug 472799 - Undefine GetCurrentTime in nsDOMMediaStream.h r=cpearce
2012-07-19 11:58:48 +02:00
Nathan Froyd
bfff055672
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
57a3d866e4
Merge from mozilla-central.
2012-06-28 15:17:18 -07:00
Chris Pearce
a9821c5977
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
3fe736b4c3
Merge from mozilla-central.
2012-06-27 11:00:48 -07:00
Kan-Ru Chen (陳侃如)
1d4714c9e2
Bug 767480 - Remove offset field from PlanarYCbCrImage::Data. r=roc
2012-08-26 00:22:51 -03:00
Ralph Giles
585c620ea4
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