Skip to content
This repository
Browse code

Merge pull request #3583 from koying/quickpr

FIX: fixup stagefright disabling by properly using OnSettingUpdate
  • Loading branch information...
commit 07ab04702c38b878895ca691394c6cfb14861ab7 2 parents 813525b + 747c385
Chris Browet koying authored
3  system/settings/android.xml
@@ -23,6 +23,9 @@
23 23 <requirement>HAVE_LIBSTAGEFRIGHTDECODER</requirement>
24 24 <level>2</level>
25 25 <default>true</default>
  26 + <updates>
  27 + <update type="change" />
  28 + </updates>
26 29 <control type="toggle" />
27 30 </setting>
28 31 <setting id="videoplayer.usemediacodec" type="boolean" label="13439" help="36544">
8 xbmc/Application.cpp
@@ -1714,6 +1714,14 @@ bool CApplication::OnSettingUpdate(CSetting* &setting, const char *oldSettingId,
1714 1714 usemediacodec->SetValue(false);
1715 1715 }
1716 1716 }
  1717 + else if (settingId == "videoplayer.usestagefright")
  1718 + {
  1719 + if (CAndroidFeatures::GetVersion() >= 19)
  1720 + {
  1721 + CSettingBool *usestagefright = (CSettingBool*)setting;
  1722 + usestagefright->SetValue(false);
  1723 + }
  1724 + }
1717 1725 #endif
1718 1726
1719 1727 return false;
2  xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -287,7 +287,7 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, unsigne
287 287 #endif
288 288
289 289 #if defined(HAS_LIBSTAGEFRIGHT)
290   - if (!hint.software && CSettings::Get().GetBool("videoplayer.usestagefright") && CAndroidFeatures::GetVersion() < 19 )
  290 + if (!hint.software && CSettings::Get().GetBool("videoplayer.usestagefright"))
291 291 {
292 292 switch(hint.codec)
293 293 {

0 comments on commit 07ab047

Please sign in to comment.
Something went wrong with that request. Please try again.