Commit Graph

66 Commits

Author SHA1 Message Date
Gregory Szorc
27c42e83c6 Merge mozilla-central into build-system
The 3 merged files had no conflicts and were manually verified to ensure
no incompatible changes crept in.
2013-02-27 21:02:02 -08:00
Gregory Szorc
fee2be3026 Bug 784841 - Part 18g: Convert /content; r=glandium 2013-02-25 12:47:19 -08:00
Robert O'Callahan
d2391664ce Bug 843214. Make SourceMediaStream::AddTrack/AppendToTrack/HaveEnoughBuffered/DispatchWhenNotEnoughBuffered/EndTrack smoothly handle cases where track does not exist. r=jesup 2013-02-25 22:25:07 +13:00
Ed Morley
48a74b755b Backed out changeset dba7a059ed22 (bug 843214) 2013-02-27 12:49:26 +00:00
Robert O'Callahan
de4bc36a35 Bug 843214. Make SourceMediaStream::AddTrack/AppendToTrack/HaveEnoughBuffered/DispatchWhenNotEnoughBuffered/EndTrack smoothly handle cases where track does not exist. r=jesup
--HG--
extra : rebase_source : adcfa0e92b5e498c597e16e013fdcba2dae4b8e5
2013-02-25 22:25:07 +13:00
Daniel Holbert
66a3c9644d Bug 843929 - Part 3: Add '(void) mFps' to silence Wunused-private-field warnings, until the code that uses it is turned on. r=jesup 2013-02-22 06:59:45 -05:00
Daniel Holbert
c43defdf94 Bug 843929 - Part 2: Add '(void) mEchoCancel' to silence Wunused-private-field warnings, until the code that uses it is turned on. r=jesup 2013-02-22 06:59:29 -05:00
Daniel Holbert
54b8a8553c Bug 843929 - Part 1: Remove no-longer-used private variables mTrackID & mLastEndTime from MediaEngineWebRTCVideoSource. r=jesup 2013-02-22 06:59:11 -05:00
Randell Jesup
eb711b7f7d Bug 842715: add prefs for default getUserMedia resolution r=derf 2013-02-20 10:18:54 -05:00
Robert O'Callahan
009ce30b8d Bug 837034. Part 1: Rename nsDOM(Local)MediaStream to DOM(Local)MediaStream and put them in the mozilla namespace. r=jesup
--HG--
rename : content/media/nsDOMMediaStream.cpp => content/media/DOMMediaStream.cpp
rename : content/media/nsDOMMediaStream.h => content/media/DOMMediaStream.h
extra : rebase_source : 6fd3f71779b4ecb9d3b053b6cd844c2ff0c25f80
2013-02-15 21:01:58 +13:00
Randell Jesup
1abf09a6e0 Bug 829907: release video capture device on MainThread (mac only) r=bsmedberg 2013-02-14 14:59:27 -05:00
Randell Jesup
61ea66ea37 Bug 830247: rollup of changes to media/webrtc/trunk, and backouts of some temp patches r=ted,derf
--HG--
rename : media/webrtc/trunk/webrtc/modules/video_capture/main/source/Windows/BaseFilter.cpp => media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp
rename : media/webrtc/trunk/webrtc/modules/video_capture/main/source/Windows/BaseFilter.h => media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.h
rename : media/webrtc/trunk/webrtc/modules/video_capture/main/source/Windows/BaseInputPin.cpp => media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.cpp
rename : media/webrtc/trunk/webrtc/modules/video_capture/main/source/Windows/BaseInputPin.h => media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.h
rename : media/webrtc/trunk/webrtc/modules/video_capture/main/source/Windows/BasePin.cpp => media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp
rename : media/webrtc/trunk/webrtc/modules/video_capture/main/source/Windows/BasePin.h => media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.h
rename : media/webrtc/trunk/webrtc/modules/video_capture/main/source/Windows/DShowTools.h => media/webrtc/trunk/webrtc/modules/video_capture/windows/DShowTools.h
rename : media/webrtc/trunk/webrtc/modules/video_capture/main/source/Windows/MediaType.cpp => media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp
rename : media/webrtc/trunk/webrtc/modules/video_capture/main/source/Windows/MediaType.h => media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.h
2013-02-09 23:16:10 -05:00
Robert O'Callahan
ee2ea45fed Bug 830707. Part 3: Don't constrain AudioSegment to a fixed number of channels. r=jesup
--HG--
extra : rebase_source : feacede00821b6673ce04c886a9c3727a4989404
2013-01-21 09:44:44 +13:00
Randell Jesup
439ab021c2 Bug 818670: Enable AEC in PeerConnection, AGC/NoiseSuppression in gUM (w/bustage fix) r=derf 2013-01-29 11:55:09 -05:00
Ed Morley
b8cab0271d Backout 40f09f7bc670 & fc262e3c635f (bug 818670) for frequent fedora64 mochitest-3 leaks on a CLOSED TREE 2013-01-30 10:32:11 +00:00
Randell Jesup
31ade0db43 Bug 818670: Enable AEC in PeerConnection, AGC/NoiseSuppression in gUM (w/bustage fix) r=derf 2013-01-29 11:55:09 -05:00
Ed Morley
67d41c1674 Backout df75a87cce60 & 19e164f7d88d (bug 818670) for build bustage on a CLOSED TREE 2013-01-29 17:28:30 +00:00
Randell Jesup
eb99b87929 Bug 818670: Enable AEC in PeerConnection, AGC/NoiseSuppression in gUM r=derf 2013-01-29 11:55:09 -05:00
Randell Jesup
da209aea3d Bug 831427: Gate RemoveListener(stream) to avoid calling if Destroy() pending r=roc 2013-01-17 02:38:21 -05:00
Mats Palmgren
0ae685efa9 Bug 786533 - On Windows, one of the system header files (windef.h) defines 'min' and 'max' as macros which breaks any use of std::min/std::max. Define NOMINMAX before including system header files where needed to avoid defining those macros. r=ehsan 2013-01-15 13:22:03 +01:00
Dan Mosedale
5af872649d Bug 829314, enable webrtc_trace logging for getUserMedia's VideoEngine, r=jesup 2013-01-11 15:30:20 -08:00
Robert O'Callahan
f2ee4df1a0 Bug 827537. Refactor AudioChunk to support having separate buffers for each channel. r=jesup
--HG--
extra : rebase_source : 0aa26e1c3181d9fe5158520d4b33248bae0fa5d0
2012-11-22 18:04:27 +13:00
Randell Jesup
49e05b2a18 Bug 828828: Use monitor around all accesses to stream array r=derf 2013-01-10 11:52:53 -05:00
Randell Jesup
90c9997e1f Bug 816664: wallpaper patch for negative delta times for video frames r=roc,derf 2012-11-30 03:08:17 -05:00
Randell Jesup
a2eb2a18b8 Bug 804760: Drop cached image when we stop capturing + debugs r=anant 2012-12-29 21:55:24 -05:00
Randell Jesup
42b9a000b3 Bug 811757: Allow the user to explicitly share devices between tabs r=anant 2012-12-31 18:12:12 -05:00
Josh Matthews
24b5b26242 Backed out changeset 7d6255d1c547 (bug 816664) 2012-12-28 19:03:48 -05:00
Randell Jesup
39a4dffd71 Bug 816664: wallpaper patch for negative delta times for video frames r=derf 2012-12-28 15:34:01 -05:00
Saurabh Anand
151d13c7a5 Bug 818817 - Fix some compiler warnings, r=Ms2ger 2012-12-09 22:53:19 +05:30
Trevor Saunders
d2a9c007b8 bug 801466 - part 3.1 remove some prmem usage from dom/ and content/ r=mounir 2012-12-05 02:55:37 -05:00
Jan-Ivar Bruaroey
3eb95d1eaa Bug 800538: Added MOZ_ASSERTs of passed-in VoiceEngine/VideoEngine in MediaEngineWebRTCAudio/VideoSource constructors respectively. r=jesup 2012-11-28 22:30:31 -05:00
Timothy B. Terriberry
015fc30139 Bug 815825 - Rotate colors in fake video streams, r=jesup 2012-11-27 16:15:55 -08:00
Randell Jesup
f3cbf201a0 Bug 802399: set capture index for audio input when device is Allocate()ed, plug VoEHw leak r=derf 2012-11-15 18:23:39 -05:00
Randell Jesup
f01b2fce9c Bug 811695: disable internal socket transports for getUserMedia Audio capture r=derf 2012-11-15 17:58:40 -05:00
Randell Jesup
6d92219d4c Bug 809554: if a device has no uniqueId, use the name r=derf 2012-11-12 20:46:52 -05:00
Nathan Froyd
f9b2a74082 Bug 806618 - rewrite PR_NewLogModule calls to not generate static initializers; r=ehsan 2012-10-29 19:32:10 -04:00
Robert O'Callahan
a0d739c463 Bug 805254. Part 7: Move SampleFormat to mozilla::AudioSampleFormat in its own file. r=kinetik 2012-10-25 23:09:40 +13:00
Randell Jesup
c69045b847 Bug 805596: Incorrect audio rates used for fake audio streams r=anant 2012-10-25 20:14:47 -04:00
Randell Jesup
97d57fb78e Bug 803799: Start gUM streams in Success callback; add MediaManager mutex r=anant,roc 2012-10-24 19:21:15 -04:00
Ehsan Akhgari
28c105ccf5 Backed out changeset ea436c6f7d2d (bug 803799), landed on a CLOSED TREE 2012-10-24 20:30:08 -04:00
Randell Jesup
781f490022 Bug 803799: Start gUM streams in Success callback; add MediaManager mutex r=anant,roc 2012-10-24 19:21:15 -04:00
Randell Jesup
e4efdf3c82 Bug 803535: Add mutex for MediaEngineDefault access, fix cut-and-paste error r=anant 2012-10-19 18:06:18 -04:00
Randell Jesup
728f12acfb Bug 803093: Lock access to MediaEngineWebRTC singleton r=anant 2012-10-18 14:03:00 -04:00
Randell Jesup
ca11404fd3 Bug 802661: Clean up getUserMedia MediaStream handling r=roc,anant 2012-10-17 17:40:14 -04:00
Randell Jesup
2614d8891d Bug 801843: Change how video frames are inserted into getUserMedia streams to remove blocking r=roc,anant 2012-10-17 05:46:40 -04:00
Anant Narayanan
ba618700c7 Bug 802411: Refactor MediaEngine to use GIPS singletons; r=jesup 2012-10-16 17:53:55 -07:00
Randell Jesup
d1d511ba1f Bug 773649: Support getting audio and video in the same getUserMedia call r=roc,anant 2012-10-15 16:41:46 -04:00
Randell Jesup
a858a862db Bug 797671: cleanup from importing webrtc.org update r=ted,glandium (Part is bug 778801 r=derf) 2012-10-04 12:09:35 -04:00
Anant Narayanan
d1b0968bdf Bug 794668 - Add fake media stream functionality to getUserMedia; r=jesup 2012-09-28 15:26:00 -07:00
Paul Adenot
d6650a6ddf Bug 783953 - Rename MOZ_SAMPLE_TYPE_S16LE to MOZ_SAMPLE_TYPE_S16. r=kinetik,roc 2012-09-01 11:35:56 -04:00