Commit Graph

3089 Commits

Author SHA1 Message Date
Ms2ger
a129edb4cb Merge mozilla-inbound to mozilla-central. 2013-11-29 09:54:12 +01:00
Ms2ger
f56294acdb Bug 937258 - Part a: Remove empty makefiles; r=gps 2013-11-28 15:25:40 +01:00
Matthew Gregan
358b7e64f0 Bug 942657 - Devirtualize AudioStream. r=doublec,gps 2013-11-28 18:09:08 +13:00
Benjamin Peterson
168ae22e9f backout dc9ebdf27e98 (bug 942657) for bustage 2013-11-28 20:50:16 -06:00
Matthew Gregan
647694fec9 Bug 942657 - Devirtualize AudioStream. r=doublec,gps 2013-11-28 18:09:08 +13:00
Nicholas Nethercote
df39d9afe9 Bug 936964 (part 4, attempt 2) - Make MediaMemoryTracker ref-counted. r=kinetik.
--HG--
extra : rebase_source : fb032c262779678a33baa80700f448d3c9c469d3
2013-11-25 16:01:31 -08:00
Ehsan Akhgari
7bba8eaeec Bug 944378 - Build content/media/webspeech/synth/pico in unified mode; r=glandium 2013-11-28 08:46:23 -05:00
Nicholas Nethercote
77419f6a47 Bug 936964 (part 7, attempt 2) - Make lots of classes report their own memory consumption, instead of using a separate reporter class. r=mccr8,sr=bz.
* * *
Bug 936964 (part 7b) - Fix a use-after-free found by ASan.

--HG--
extra : rebase_source : d38ab6b63e9d576773baf8e55fa4f7182c33915e
2013-11-07 16:35:30 +11:00
Ehsan Akhgari
c3970a73fb Backed out 9 changesets (bug 943660, bug 936964) because of ASAN use-after-free crashes on browser-chrome and mochitest-other
Backed out changeset 85486c4aa3d8 (bug 936964)
Backed out changeset 25312eb71998 (bug 936964)
Backed out changeset 6dbb8333960c (bug 936964)
Backed out changeset da6465ad476f (bug 936964)
Backed out changeset a87ffc992f38 (bug 936964)
Backed out changeset 4ae3a61182db (bug 936964)
Backed out changeset 34e9c3137804 (bug 936964)
Backed out changeset fd1459e71585 (bug 936964)
Backed out changeset 3e8a701d8bdc (bug 943660)

Landed on a CLOSED TREE

--HG--
rename : content/canvas/src/WebGLMemoryTracker.h => content/canvas/src/WebGLMemoryReporterWrapper.h
2013-11-27 20:05:00 -05:00
Nicholas Nethercote
78e4d6490d Bug 936964 (part 7) - Make lots of classes report their own memory consumption, instead of using a separate reporter class. r=mccr8,sr=bz.
--HG--
rename : content/canvas/src/WebGLMemoryReporterWrapper.h => content/canvas/src/WebGLMemoryTracker.h
extra : rebase_source : 611e8d35907959b163aeced1c4ffe1d265048fe6
2013-11-07 16:35:30 +11:00
Nicholas Nethercote
354d9bc155 Bug 936964 (part 4) - Make MediaMemoryTracker ref-counted. r=kinetik.
--HG--
extra : rebase_source : fced8b650971a152299fcf07a9ee75936d1810a2
2013-11-25 16:01:31 -08:00
Chris Pearce
7d71645558 Bug 943721 - Make MP4Reader restrict its codecs output to H.264 and AAC. r=kinetk
We should restrict the output of MP4Reader to H.264 and AAC so that we
don't end up invoking rogue platform decoders (if that's even possible).
This means that we won't play MP3 audio inside MP4, that's deliberate.
2013-11-28 11:12:24 +13:00
Chris Pearce
e818aefeaf Bug 944088 - Make MP4Reader::Init() assume mLayersBackendType=LAYERS_NONE if it doesn't have a decoder owner. r=kinetik
This ensures that if the MP4Reader fails to get a decoder owner, we
don't abort the media load, but instead we will assume that we don't
have an advanced layers backend, and so fallback to software decoding on
Windows.
2013-11-28 11:12:22 +13:00
Randy Lin
49b38b189e Bug 935774 - "Assertion failure: meta" in mozilla::MediaEncoder::GetEncodedData. r=roc 2013-11-25 12:57:52 +13:00
Ehsan Akhgari
5a56056193 Bug 942489 - Deunify more files that are caught by bug 941854; r=BenWa 2013-11-24 01:29:24 -05:00
Chris Pearce
d56b819726 Bug 941857 - Only build WMFPlatofrmDecoderModule when MOZ_WMF is defined. r=kinetik
--HG--
extra : rebase_source : a9a8741540560d7591261f2a68dd68fce956e6f5
2013-11-22 10:36:02 -05:00
Masatoshi Kimura
23ff300256 Bug 925599 - Replace WinUtils::GetWindowsVersion() and GetWindowsServicePackVersion(). r=jimm 2013-11-22 12:35:42 +09:00
Masatoshi Kimura
8816e06bd6 Bug 941931 - Add <algorithm> for VC12 to use std::min. r=cpearce 2013-11-22 12:35:39 +09:00
Sotaro Ikeda
b1a733db60 Bug 939654 - Remove unnecessary wait from instantiating MediaResourceManagerService. r=mwu 2013-11-21 16:03:27 -05:00
Ryan VanderMeulen
94ddc2e1d9 Merge m-c to inbound. 2013-11-21 11:37:10 -05:00
Ryan VanderMeulen
b94d4e7bae Backed out changesets efb217f1897a and c9a22296f311 (bug 935774) due to test_mediarecorder_record_4ch_audiocontext.html perma-fail on all platforms after today's inbound merge. 2013-11-21 11:28:06 -05:00
Carsten "Tomcat" Book
9f47cb96d7 merge mozilla-inbound to mozilla-central 2013-11-21 14:20:21 +01:00
Vincent Chang
2c0c620b05 Bug 898864 - RTSP content process crash when press the play button at the end of video. r=sworkman 2013-11-20 11:08:10 +08:00
Ehsan Akhgari
8a4376526e Bug 939582 - Part 2: Build content/media in unified mode; r=doublec 2013-11-20 21:12:13 -05:00
Ehsan Akhgari
2f9d8a7309 Bug 939582 - Part 1: Rework the NSPR logging in content/media to use different macro names for different logs; r=doublec 2013-11-20 22:02:42 -05:00
Ehsan Akhgari
e7936b0d93 Backed out 2 changesets (bug 939582) because of build bustage
Backed out changeset 2079c828645a (bug 939582)
Backed out changeset af472e590088 (bug 939582)
2013-11-20 21:41:40 -05:00
Ehsan Akhgari
4f0894ce81 Bug 939582 - Part 2: Build content/media in unified mode; r=doublec 2013-11-20 21:12:13 -05:00
Ehsan Akhgari
3c5450530e Bug 939582 - Part 1: Rework the NSPR logging in content/media to use different macro names for different logs; r=doublec 2013-11-20 21:11:54 -05:00
Ralph Giles
62b851a4ee Bug 941281 - Release resampler in OpusTrackEncoder dtor. r=roc
We released the resampler when we reached the end of the stream
but would leak if the encoder was destroyed while data was still
available.
2013-11-21 11:09:08 +13:00
Randy Lin
75f55f589a Bug 935774 - Test for record four audio channels audiocontext. r=jsmith 2013-11-20 17:32:22 +08:00
Randy Lin
4e505b7361 Bug 935774 - Assertion failure: meta in mozilla::MediaEncoder::GetEncodedData. r=roc 2013-11-20 17:14:13 +08:00
Chris Pearce
cb7276fa04 Bug 886196 - Create a PlatformDecoderModule that outputs blank frames for fuzzing/testing purposes. r=kinetik 2013-11-21 10:04:33 +13:00
Chris Pearce
25d65fda1c Bug 886196 - Implement WMF platform decoder for FMP4 demuxer. r=padenot 2013-11-21 10:04:33 +13:00
Chris Pearce
5e21be5dc6 Bug 886196 - Add pref to enable creation of fmp4 reader in DecoderTraits. Preffed of by default. r=kinetik 2013-11-21 10:04:33 +13:00
Chris Pearce
47e87db4d3 Bug 886196 - MP4 demuxing using Chromium's MP4 demuxer. No decoding yet. r=kinetik 2013-11-21 10:04:33 +13:00
Chris Pearce
0d0095228b Bug 886196 - Import Chromium's MSE MP4 demuxer code. r=kinetik 2013-11-21 10:04:32 +13:00
Ehsan Akhgari
d778db48a9 Bug 939571 - Build Web Audio in unified mode; r=glandium 2013-11-19 14:11:16 -05:00
Ryan VanderMeulen
18621dd236 Merge m-c to inbound.
--HG--
rename : dom/contacts/tests/test_contacts_upgrade.html => dom/contacts/tests/test_contacts_upgrade.xul
rename : dom/indexedDB/test/test_globalObjects.xul => dom/indexedDB/test/test_globalObjects_chrome.xul
rename : dom/indexedDB/test/test_globalObjects.html => dom/indexedDB/test/test_globalObjects_content.html
rename : dom/indexedDB/test/unit/test_globalObjects.js => dom/indexedDB/test/unit/test_globalObjects_xpc.js
2013-11-19 13:54:20 -05:00
Ryan VanderMeulen
1eadf974aa Merge b2g-inbound to m-c. 2013-11-19 13:36:41 -05:00
Matthew Gregan
6dcb5015db Bug 939662 - Remove "using namespace mozilla::dom;" from MediaDecoder.h and fix fallout. r=cpearce 2013-11-18 17:22:47 +13:00
Boris Zbarsky
4c293cf8e4 Bug 941437 part 2. Remove the unused cx argument from UNWRAP_OBJECT and UNWRAP_WORKER_OBJECT. r=smaug 2013-11-21 07:51:16 -05:00
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