mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:11:03 +00:00
f632bc6ab3
- Bug 1267186 - Split lookup of WebIDL DOM class names from lookup of DOMCI DOM class names. r=bz. (1cb4c3698e) - Bug 1206637: P1. Add MediaPrefs convenience class. r=cpearce (d352b9ca0b) - Bug 1254378 - Make new 'speech-synth-started' component service category. r=smaug (ece851540b) - Bug 1206637: P2. Replace all cached preferences with MediaPrefs ones. r=cpearce (1492083f62) - Bug 1216407 - Use mozilla/Endian.h for NfcService. r=yoshi (b2a508186d) - Bug 1237493 - [NFC] Separate Gecko and Gonk layers for accessing Androids properties. r=yoshi (062e468bed) - Bug 1272135, part 1 - Fix leading tab usage in ipc/chromium. r=billm (cf29df6977) - Bug 1272135, part 2 - Delete two weird modelines in ipc/chromium. r=billm (da4cdafc7c) - Bug 1272135, part 3 - Fix mode lines in ipc/chromium/. r=billm (040b11738e) - Bug 1273307 - Remove copy constructor/assignment operator for Message/Pickle (r=froydnj) (b53e6d3470) - Bug 1262671 - Remove unused TrimWriteData (r=froydnj) (8fbcefde63) - Bug 1267438 - Group ScrollMetadata's optional clip rect and mask layer index into a LayerClip structure. r=mstange (dcd01e3bce) - Bug 1267438 - Use IntersectMaybeRects() in Layer::GetCombinedClipRect(). r=mstange (5ec2d68aac) - Bug 1262937 - part 1 - don't include the protocol name in Clone error messages; r=jld (3e23610fb1) - Bug 1191452 - Limit IPDL-generated Move()s to Recv methods. r=billm (991cc733b6) - Bug 1262937 - part 2 - don't include the message name when complaining about handler failure; r=jld (b8abbc5c8b) - Bug 1262937 - part 3 - move quoting out of checkedRead; r=jld (16d36ae02a) - Bug 1262937 - part 4 - publically inherit from MessageListener in IProtocol; r=jld (b89aaa7347) - Bug 1262937 - part 5 - factor out actor reading code to a common base class; r=jld (702388bce7) - Bug 1262937 - part 7 - factor out union type deserialization errors; r=jld (dcdf428efc) - Bug 1262937 - part 6 - enable custom error message for ipdl.py's checkedRead; r=jld (5cf11d5d24) - Bug 1262937 - part 8 - factor out array length deserialization errors; r=jld (d1149cc120) - Bug 1271601: If a child process fails to duplicate a TransportDescriptor pipe handle then send it anyway and get the target to duplicate. r=gabor (d578cd0c85) - Bug 1270247 - Crash in ParamTraits<mozilla::net::NetAddr>::Write if the family is unknown. r=hurley (3ed49495c0) - Bug 1267474 - cache-control: immutable tests 3/3 r=mayhemer (ba0bc6e71a) - bug 1188100 - fold PSM's test_client_cert.js into necko's test_tls_server.js r=mcmanus (a2b93abbbb) - Bug 669259 - Expose original header received from a peer. r=mcmanus (cf53cad7ac) - Bug 386743 - Set default event bubbling/cancelable flags in the WidgetEvent constructor. r=smaug (1c68cfffd2) - Bug 1259661 part.1 Rename WidgetMouseEvent::reasonType to WidgetMouseEvent::Reason r=smaug (0edd107b56) - Bug 1259661 part.2 Rename WidgetMouseEvent::context to WidgetMouseEvent::ContextMenuTrigger r=smaug (0049757099) - Bug 1259661 part.3 Rename WidgetMouseEvent::exitType to WidgetMouseEvent::ExitFrom r=smaug (5ffd3f41b1) - Bug 1259661 part.4 Rename WidgetMouseEvent::reason to WidgetMouseEvent::mReason r=smaug (5605ce8fd0) - Bug 1259661 part.5 Rename WidgetMouseEvent::context to WidgetMouseEvent::mContextMenuTrigger r=smaug (4dd92f0066) - Bug 1259661 part.6 Rename WidgetMouseEvent::exit to WidgetMouseEvent::mExitFrom r=smaug (c46f5fe1bc) - Bug 1259661 part.7 Get rid of WidgetMouseEvent::acceptActivation because of unused r=smaug (4867aaf1a7) - Bug 1259661 part.8 Rename WidgetMouseEvent::ignoreRootScrollFrame to WidgetMouseEvent::mIgnoreRootScrollFrame r=smaug (c829c446fd) - Bug 1259661 part.9 Rename WidgetMouseEvent::clickCount to WidgetMouseEvent::mClickCount r=smaug (2fa015c006) - Bug 1259661 part.10 Clean up some nits of WidgetMouseEvent definition r=smaug (58d3a0cb2c) - Bug 1179346 - Add strings and accesskeys for Microsoft Edge. r=mak (b97f5e7ab4) - Bug 931445 part 1 - Remove unused code from pointerlock_utils.js. r=smaug (e1b9c15569) - Bug 931445 part 2 - Use util code from fullscreen tests to improve robustness of pointerlock tests. r=smaug (3c7b47751e) - Bug 931445 part 3 - Reset synth centering pointer when unlocking pointer. r=smaug (e272fec9c7) - Bug 1263389 NativeKey should initialize WidgetKeyboardEvent::mKeyValue of WM_KEYDOWN of VK_PACKET with following char message r=m_kato (e56a31bd4b) - Bug 1261880 NativeKey should decide printable KeyboardEvent.key value of keydown and keypress events with following WM_CHAR message of WM_KEYDOWN r=m_kato (7208001852) - Bug 1254755 part.1 Rename WidgetKeyboardEvent::keyCode to WidgetKeyboardEvent::mKeyCode r=smaug (97ebefa314) - put back some XP/2003 code, as well as crash/debug (73b3147e58) - Bug 1259679 - Space key shouldn't work as a space key if it's assigned to a function key. r=masayuki (db422c248b) - Bug 1101975, handle access keys in content process before menus, r=masayuki (760213b62e) - Bug 1254755 part.2 Rename WidgetKeyboardEvent::charCode to WidgetKeyboardEvent::mCharCode r=smaug (6cef6114a5) - Bug 1254755 part.3 Rename WidgetKeyboardEvent::alternativeCharCodes to WidgetKeyboardEvent::mAlternativeCharCodes r=smaug (9d23a113fd) - Bug 1254755 part.4 Rename WidgetKeyboardEvent::location to WidgetKeyboardEvent::mLocation r=smaug (f44e0212a6) - Bug 1254755 part.5 Rename WidgetKeyboardEvent::isChar to WidgetKeyboardEvent::mIsChar r=smaug (a713d9903c) - Bug 1254755 part.6 Reorder the members of WidgetKeyboardEvent for reducing its instance size r=smaug (39a14a7d4f) - Bug 1262671 - void** -> PickleIterator (r=froydnj) (716a88b499)
251 lines
7.7 KiB
C++
251 lines
7.7 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "GMPDecoderModule.h"
|
|
#include "DecoderDoctorDiagnostics.h"
|
|
#include "GMPAudioDecoder.h"
|
|
#include "GMPVideoDecoder.h"
|
|
#include "MediaDataDecoderProxy.h"
|
|
#include "MediaPrefs.h"
|
|
#include "mozIGeckoMediaPluginService.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "mozilla/StaticMutex.h"
|
|
#include "gmp-audio-decode.h"
|
|
#include "gmp-video-decode.h"
|
|
#ifdef XP_WIN
|
|
#include "WMFDecoderModule.h"
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
|
|
GMPDecoderModule::GMPDecoderModule()
|
|
{
|
|
}
|
|
|
|
GMPDecoderModule::~GMPDecoderModule()
|
|
{
|
|
}
|
|
|
|
static already_AddRefed<MediaDataDecoderProxy>
|
|
CreateDecoderWrapper(MediaDataDecoderCallback* aCallback)
|
|
{
|
|
RefPtr<gmp::GeckoMediaPluginService> s(gmp::GeckoMediaPluginService::GetGeckoMediaPluginService());
|
|
if (!s) {
|
|
return nullptr;
|
|
}
|
|
RefPtr<AbstractThread> thread(s->GetAbstractGMPThread());
|
|
if (!thread) {
|
|
return nullptr;
|
|
}
|
|
RefPtr<MediaDataDecoderProxy> decoder(new MediaDataDecoderProxy(thread.forget(), aCallback));
|
|
return decoder.forget();
|
|
}
|
|
|
|
already_AddRefed<MediaDataDecoder>
|
|
GMPDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
|
|
layers::LayersBackend aLayersBackend,
|
|
layers::ImageContainer* aImageContainer,
|
|
FlushableTaskQueue* aVideoTaskQueue,
|
|
MediaDataDecoderCallback* aCallback,
|
|
DecoderDoctorDiagnostics* aDiagnostics)
|
|
{
|
|
if (!aConfig.mMimeType.EqualsLiteral("video/avc")) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (aDiagnostics) {
|
|
const Maybe<nsCString> preferredGMP = PreferredGMP(aConfig.mMimeType);
|
|
if (preferredGMP.isSome()) {
|
|
aDiagnostics->SetGMP(preferredGMP.value());
|
|
}
|
|
}
|
|
|
|
RefPtr<MediaDataDecoderProxy> wrapper = CreateDecoderWrapper(aCallback);
|
|
wrapper->SetProxyTarget(new GMPVideoDecoder(aConfig,
|
|
aLayersBackend,
|
|
aImageContainer,
|
|
aVideoTaskQueue,
|
|
wrapper->Callback()));
|
|
return wrapper.forget();
|
|
}
|
|
|
|
already_AddRefed<MediaDataDecoder>
|
|
GMPDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
|
|
FlushableTaskQueue* aAudioTaskQueue,
|
|
MediaDataDecoderCallback* aCallback,
|
|
DecoderDoctorDiagnostics* aDiagnostics)
|
|
{
|
|
if (!aConfig.mMimeType.EqualsLiteral("audio/mp4a-latm")) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (aDiagnostics) {
|
|
const Maybe<nsCString> preferredGMP = PreferredGMP(aConfig.mMimeType);
|
|
if (preferredGMP.isSome()) {
|
|
aDiagnostics->SetGMP(preferredGMP.value());
|
|
}
|
|
}
|
|
|
|
RefPtr<MediaDataDecoderProxy> wrapper = CreateDecoderWrapper(aCallback);
|
|
wrapper->SetProxyTarget(new GMPAudioDecoder(aConfig,
|
|
aAudioTaskQueue,
|
|
wrapper->Callback()));
|
|
return wrapper.forget();
|
|
}
|
|
|
|
PlatformDecoderModule::ConversionRequired
|
|
GMPDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
|
|
{
|
|
// GMPVideoCodecType::kGMPVideoCodecH264 specifies that encoded frames must be in AVCC format.
|
|
if (aConfig.IsVideo()) {
|
|
return kNeedAVCC;
|
|
} else {
|
|
return kNeedNone;
|
|
}
|
|
}
|
|
|
|
static bool
|
|
HasGMPFor(const nsACString& aAPI,
|
|
const nsACString& aCodec,
|
|
const nsACString& aGMP)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
#ifdef XP_WIN
|
|
// gmp-clearkey uses WMF for decoding, so if we're using clearkey we must
|
|
// verify that WMF works before continuing.
|
|
if (aGMP.EqualsLiteral("org.w3.clearkey")) {
|
|
RefPtr<WMFDecoderModule> pdm(new WMFDecoderModule());
|
|
if (aCodec.EqualsLiteral("aac") &&
|
|
!pdm->SupportsMimeType(NS_LITERAL_CSTRING("audio/mp4a-latm"),
|
|
/* DecoderDoctorDiagnostics* */ nullptr)) {
|
|
return false;
|
|
}
|
|
if (aCodec.EqualsLiteral("h264") &&
|
|
!pdm->SupportsMimeType(NS_LITERAL_CSTRING("video/avc"),
|
|
/* DecoderDoctorDiagnostics* */ nullptr)) {
|
|
return false;
|
|
}
|
|
}
|
|
#endif
|
|
nsTArray<nsCString> tags;
|
|
tags.AppendElement(aCodec);
|
|
tags.AppendElement(aGMP);
|
|
nsCOMPtr<mozIGeckoMediaPluginService> mps =
|
|
do_GetService("@mozilla.org/gecko-media-plugin-service;1");
|
|
if (NS_WARN_IF(!mps)) {
|
|
return false;
|
|
}
|
|
bool hasPlugin = false;
|
|
if (NS_FAILED(mps->HasPluginForAPI(aAPI, &tags, &hasPlugin))) {
|
|
return false;
|
|
}
|
|
return hasPlugin;
|
|
}
|
|
|
|
StaticMutex sGMPCodecsMutex;
|
|
|
|
struct GMPCodecs {
|
|
const char* mKeySystem;
|
|
bool mHasAAC;
|
|
bool mHasH264;
|
|
};
|
|
|
|
static GMPCodecs sGMPCodecs[] = {
|
|
{ "org.w3.clearkey", false, false },
|
|
{ "com.adobe.primetime", false, false },
|
|
};
|
|
|
|
void
|
|
GMPDecoderModule::UpdateUsableCodecs()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
StaticMutexAutoLock lock(sGMPCodecsMutex);
|
|
for (GMPCodecs& gmp : sGMPCodecs) {
|
|
gmp.mHasAAC = HasGMPFor(NS_LITERAL_CSTRING(GMP_API_AUDIO_DECODER),
|
|
NS_LITERAL_CSTRING("aac"),
|
|
nsDependentCString(gmp.mKeySystem));
|
|
gmp.mHasH264 = HasGMPFor(NS_LITERAL_CSTRING(GMP_API_VIDEO_DECODER),
|
|
NS_LITERAL_CSTRING("h264"),
|
|
nsDependentCString(gmp.mKeySystem));
|
|
}
|
|
}
|
|
|
|
/* static */
|
|
void
|
|
GMPDecoderModule::Init()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
// GMPService::HasPluginForAPI is main thread only, so to implement
|
|
// SupportsMimeType() we build a table of the codecs which each whitelisted
|
|
// GMP has and update it when any GMPs are removed or added at runtime.
|
|
UpdateUsableCodecs();
|
|
}
|
|
|
|
/* static */
|
|
const Maybe<nsCString>
|
|
GMPDecoderModule::PreferredGMP(const nsACString& aMimeType)
|
|
{
|
|
Maybe<nsCString> rv;
|
|
if (aMimeType.EqualsLiteral("audio/mp4a-latm")) {
|
|
switch (MediaPrefs::GMPAACPreferred()) {
|
|
case 1: rv.emplace(NS_LITERAL_CSTRING("org.w3.clearkey")); break;
|
|
case 2: rv.emplace(NS_LITERAL_CSTRING("com.adobe.primetime")); break;
|
|
default: break;
|
|
}
|
|
}
|
|
|
|
if (aMimeType.EqualsLiteral("video/avc") ||
|
|
aMimeType.EqualsLiteral("video/mp4")) {
|
|
switch (MediaPrefs::GMPH264Preferred()) {
|
|
case 1: rv.emplace(NS_LITERAL_CSTRING("org.w3.clearkey")); break;
|
|
case 2: rv.emplace(NS_LITERAL_CSTRING("com.adobe.primetime")); break;
|
|
default: break;
|
|
}
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
/* static */
|
|
bool
|
|
GMPDecoderModule::SupportsMimeType(const nsACString& aMimeType,
|
|
const Maybe<nsCString>& aGMP)
|
|
{
|
|
const bool isAAC = aMimeType.EqualsLiteral("audio/mp4a-latm");
|
|
const bool isH264 = aMimeType.EqualsLiteral("video/avc") ||
|
|
aMimeType.EqualsLiteral("video/mp4");
|
|
|
|
StaticMutexAutoLock lock(sGMPCodecsMutex);
|
|
for (GMPCodecs& gmp : sGMPCodecs) {
|
|
if (isAAC && gmp.mHasAAC &&
|
|
(aGMP.isNothing() || aGMP.value().EqualsASCII(gmp.mKeySystem))) {
|
|
return true;
|
|
}
|
|
if (isH264 && gmp.mHasH264 &&
|
|
(aGMP.isNothing() || aGMP.value().EqualsASCII(gmp.mKeySystem))) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
GMPDecoderModule::SupportsMimeType(const nsACString& aMimeType,
|
|
DecoderDoctorDiagnostics* aDiagnostics) const
|
|
{
|
|
const Maybe<nsCString> preferredGMP = PreferredGMP(aMimeType);
|
|
bool rv = SupportsMimeType(aMimeType, preferredGMP);
|
|
if (rv && aDiagnostics && preferredGMP.isSome()) {
|
|
aDiagnostics->SetGMP(preferredGMP.value());
|
|
}
|
|
return rv;
|
|
}
|
|
|
|
} // namespace mozilla
|