mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- bug 1179662 rename AudioNode::Stream() to GetStream() as it may return null r=padenot (d2d7e5f90) - bug 1197043 remove unnecessary aSampleRate parameter for AudioNodeStream creation r=padenot (3733ceb56) - bug 1197043 rename Add/RemoveStream to Add/RemoveStreamGraphThread r=padenot (f648b8251) - bug 1197043 introduce MediaStreamGraph::AddStream() r=padenot (ac021d4b2) - bug 1197043 move AudioNodeStream creation to stream class r=padenot (a90a05910) - bug 1197043 use flags to distinguish between external streams and events r=padenot (024dd96f1) - Bug 1176300 - Move libsoundtouch to lgpllibs; r=glandium (99a546adf) - Bug 1176300 - Add lgpllibs library to build system; r=glandium (bb4d07670) - Bug 1176300 - Update libsoundtouch to patched r222; r=padenot (hg rev 8c32c900cb48) - Bug 1176300 - Add soundtouch factory functions for DLL memory handling on windows; r=padenot (hg rev 84a1ffbc2db8) - Bug 901633 - Part 1 - Implement a generic audio packetizer. r=jesup (a38c2d70b) - Bug 901633 - Part 2 - Make AudioChannelFormat and AudioSegment more generic. r=roc (556b7349f) - Bug 901633 - Part 3 - Fix TrackEncoder to use the new AudioChunk methods. r=jesup (56e018f83) - Bug 901633 - Part 4 - Update AudioNodeStream to use new chunk methods. r=roc (9df19b894) - Bug 901633 - Part 6 - Update DelayBuffer to use the new AudioChunk methods. r=karlt (6d5684334) - Bug 901633 - Part 7 - Update AudioNodeExternalInputStream to use the new AudioChunk methods. r=karlt (caa3afa01) - Bug 1155089: Fix hazard analysis bustage on a CLOSED TREE. r=bustage (8d23ccf39) - Bug 1166183 - Back out the direct listener removal landed by mistake in bug 1141781. r=jesup (745d683d4) - Bug 1166183 - Reset PipelineListener's flag after ReplaceTrack(). r=bwc (2fb38ca01) - Bug 1170059 - Fix -Wunreachable-code clang warnings in webrtc/signaling. r=jesup (0d99b30ca) - Bug 1139144 - Remove unused empty() definition from databuffer.h. r=mt (2fef64e3c) - Bug 822129: don't alloc/free on every packet send in MediaPipeline r=bwc (ddfdc9455) - Bug 1172397 - Check for Conduit/Type mismatch on every frame. r=jesup, r=bwc (a399a3336) - Bug 1137169 - Uninitialised value uses related to mozilla::dom::WebAdioUtils::SpeexResamplerProcess. r=rjesup. (ce14ac278) - Bug 901633 - Part 5 - Make MediaPipeline downmix and properly convert audio for webrtc.org code. r=jesup (89138b5d5) - Bug 901633 - Part 8 - Use our new generic packetizer in the MediaPipeline so that we can packetize stereo easily. r=jesup (fb5d075b6) - Bug 901633 - Part 9 - Make the necessary changes to VoEExternalMediaImpl::ExternalRecordingInsertData so that it the number of channels is forwarded down the webrtc.org code. r=jesup (d5d7dd4ca) - Bug 901633 - Part 10 - Change the receiving side of the MediaPipeline so that it can detect and handle stereo. r=jesup (a73c1520f) - Bug 901633 - Part 11 - Add an API in webrtc.org's output mixer to get the output channel count. r=jesup (4b396b85e) - Bug 901633 - Part 12 - Add a function to deinterleave and convert an audio buffer. r=jesup (47ce3c7a5) - Bug 901633 - Part 13 - Teach the resampler at the input of the MSG to dynamically change its channel count if needed. r=jesup (120c8d037) - Bug 901633 - Part 14 - Add testing for our audio processing functions. r=jesup (5aa95b82e) - Bug 901633 - Part 15 - Remove an allocation on the sending side, out of the packetizer. r=jesup (df8aed252) - Bug 901633 - Part 16 - Remove another allocation in the sending side r=jesup (1e2fc8bca) - Bug 1196408 - Make sure we only report a corrupt/slow video frame once. r=cpearce (5bae2f17a) - bug 1162364 report telemetry on WMFMediaDataDecoder errors r=cpearce,f=vladan,bsmedberg (e217618ef) - Bug 1193864 - Fixed dom/media/platforms/wmf/ compilation on mingw. r=cpearce (4e8c0ecd7) - Bug 1141139: Enable low latency decoding on Windows. r=cpearce (9e0a36e27) - Bug 1193547 - Fallback to software decoding explicitly if the GPU doesn't support decoding the current resolution in hardware. r=cpearce,jya (7fbab8784) - Bug 1196417 - Make video software fallback only affect the current video instead of the entire browser. r=cpearce (3e83f0677)
This commit is contained in:
@@ -42,13 +42,6 @@ WMFDecoderModule::~WMFDecoderModule()
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
WMFDecoderModule::DisableHardwareAcceleration()
|
||||
{
|
||||
sDXVAEnabled = false;
|
||||
sIsIntelDecoderEnabled = false;
|
||||
}
|
||||
|
||||
static void
|
||||
SetNumOfDecoderThreads()
|
||||
{
|
||||
@@ -99,11 +92,11 @@ WMFDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
|
||||
FlushableTaskQueue* aVideoTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback)
|
||||
{
|
||||
nsAutoPtr<WMFVideoMFTManager> manager =
|
||||
nsAutoPtr<WMFVideoMFTManager> manager(
|
||||
new WMFVideoMFTManager(aConfig,
|
||||
aLayersBackend,
|
||||
aImageContainer,
|
||||
sDXVAEnabled && ShouldUseDXVA(aConfig));
|
||||
sDXVAEnabled));
|
||||
|
||||
nsRefPtr<MFTDecoder> mft = manager->Init();
|
||||
|
||||
@@ -122,7 +115,7 @@ WMFDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
FlushableTaskQueue* aAudioTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback)
|
||||
{
|
||||
nsAutoPtr<WMFAudioMFTManager> manager = new WMFAudioMFTManager(aConfig);
|
||||
nsAutoPtr<WMFAudioMFTManager> manager(new WMFAudioMFTManager(aConfig));
|
||||
nsRefPtr<MFTDecoder> mft = manager->Init();
|
||||
|
||||
if (!mft) {
|
||||
@@ -134,35 +127,6 @@ WMFDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
return decoder.forget();
|
||||
}
|
||||
|
||||
bool
|
||||
WMFDecoderModule::ShouldUseDXVA(const VideoInfo& aConfig) const
|
||||
{
|
||||
static bool isAMD = false;
|
||||
static bool initialized = false;
|
||||
if (!initialized) {
|
||||
nsCOMPtr<nsIGfxInfo> gfxInfo = services::GetGfxInfo();
|
||||
nsAutoString vendor;
|
||||
gfxInfo->GetAdapterVendorID(vendor);
|
||||
isAMD = vendor.Equals(widget::GfxDriverInfo::GetDeviceVendor(widget::VendorAMD), nsCaseInsensitiveStringComparator()) ||
|
||||
vendor.Equals(widget::GfxDriverInfo::GetDeviceVendor(widget::VendorATI), nsCaseInsensitiveStringComparator());
|
||||
initialized = true;
|
||||
}
|
||||
if (!isAMD) {
|
||||
return true;
|
||||
}
|
||||
// Don't use DXVA for 4k videos or above, since it seems to perform poorly.
|
||||
return aConfig.mDisplay.width <= 1920 && aConfig.mDisplay.height <= 1200;
|
||||
}
|
||||
|
||||
bool
|
||||
WMFDecoderModule::SupportsSharedDecoders(const VideoInfo& aConfig) const
|
||||
{
|
||||
// If DXVA is enabled, but we're not going to use it for this specific config, then
|
||||
// we can't use the shared decoder.
|
||||
return !AgnosticMimeType(aConfig.mMimeType) &&
|
||||
(!sDXVAEnabled || ShouldUseDXVA(aConfig));
|
||||
}
|
||||
|
||||
bool
|
||||
WMFDecoderModule::SupportsMimeType(const nsACString& aMimeType)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user