зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset d047739306d9 (bug 1322650)
This commit is contained in:
Родитель
66955a7251
Коммит
6ae312ded4
|
@ -7,7 +7,7 @@
|
||||||
#define MEDIA_PREFS_H
|
#define MEDIA_PREFS_H
|
||||||
|
|
||||||
#ifdef MOZ_WIDGET_ANDROID
|
#ifdef MOZ_WIDGET_ANDROID
|
||||||
#include "AndroidBridge.h"
|
#include "GeneratedJNIWrappers.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mozilla/Atomics.h"
|
#include "mozilla/Atomics.h"
|
||||||
|
@ -199,8 +199,7 @@ private:
|
||||||
static int32_t MediaDecoderLimitDefault()
|
static int32_t MediaDecoderLimitDefault()
|
||||||
{
|
{
|
||||||
#ifdef MOZ_WIDGET_ANDROID
|
#ifdef MOZ_WIDGET_ANDROID
|
||||||
if (AndroidBridge::Bridge() &&
|
if (jni::GetAPIVersion() < 18) {
|
||||||
AndroidBridge::Bridge()->GetAPIVersion() < 18) {
|
|
||||||
// Older Android versions have broken support for multiple simultaneous
|
// Older Android versions have broken support for multiple simultaneous
|
||||||
// decoders, see bug 1278574.
|
// decoders, see bug 1278574.
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* 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/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
#include "AndroidDecoderModule.h"
|
#include "GeneratedJNIWrappers.h"
|
||||||
#include "AndroidBridge.h"
|
|
||||||
#include "MediaInfo.h"
|
#include "MediaInfo.h"
|
||||||
#include "MediaPrefs.h"
|
#include "MediaPrefs.h"
|
||||||
#include "OpusDecoder.h"
|
#include "OpusDecoder.h"
|
||||||
|
@ -128,8 +127,7 @@ AndroidDecoderModule::SupportsMimeType(
|
||||||
const nsACString& aMimeType,
|
const nsACString& aMimeType,
|
||||||
DecoderDoctorDiagnostics* aDiagnostics) const
|
DecoderDoctorDiagnostics* aDiagnostics) const
|
||||||
{
|
{
|
||||||
if (!AndroidBridge::Bridge() ||
|
if (jni::GetAPIVersion() < 16) {
|
||||||
AndroidBridge::Bridge()->GetAPIVersion() < 16) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче