Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3583 from koying/quickpr

FIX: fixup stagefright disabling by properly using OnSettingUpdate
  • Loading branch information...
commit 07ab04702c38b878895ca691394c6cfb14861ab7 2 parents 813525b + 747c385
@koying koying authored
View
3  system/settings/android.xml
@@ -23,6 +23,9 @@
<requirement>HAVE_LIBSTAGEFRIGHTDECODER</requirement>
<level>2</level>
<default>true</default>
+ <updates>
+ <update type="change" />
+ </updates>
<control type="toggle" />
</setting>
<setting id="videoplayer.usemediacodec" type="boolean" label="13439" help="36544">
View
8 xbmc/Application.cpp
@@ -1714,6 +1714,14 @@ bool CApplication::OnSettingUpdate(CSetting* &setting, const char *oldSettingId,
usemediacodec->SetValue(false);
}
}
+ else if (settingId == "videoplayer.usestagefright")
+ {
+ if (CAndroidFeatures::GetVersion() >= 19)
+ {
+ CSettingBool *usestagefright = (CSettingBool*)setting;
+ usestagefright->SetValue(false);
+ }
+ }
#endif
return false;
View
2  xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -287,7 +287,7 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, unsigne
#endif
#if defined(HAS_LIBSTAGEFRIGHT)
- if (!hint.software && CSettings::Get().GetBool("videoplayer.usestagefright") && CAndroidFeatures::GetVersion() < 19 )
+ if (!hint.software && CSettings::Get().GetBool("videoplayer.usestagefright"))
{
switch(hint.codec)
{
Please sign in to comment.
Something went wrong with that request. Please try again.