squash: Use bit mask for resampler flags

popcornmix · Mar 7, 2015 · a275f7f · a275f7f
1 parent fbd48e3
commit a275f7f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/xbmc/cores/AudioEngine/AEResampleFactory.cpp b/xbmc/cores/AudioEngine/AEResampleFactory.cpp
@@ -28,10 +28,10 @@
 namespace ActiveAE
 {
 
-IAEResample *CAEResampleFactory::Create(bool force_ffmpeg /* = false */)
+IAEResample *CAEResampleFactory::Create(uint32_t flags /* = 0 */)
 {
 #if defined(TARGET_RASPBERRY_PI)
-  if (!force_ffmpeg && CSettings::Get().GetInt("audiooutput.processquality") == AE_QUALITY_GPU)
+  if (!(flags & AERESAMPLEFACTORY_QUICK_RESAMPLE) && CSettings::Get().GetInt("audiooutput.processquality") == AE_QUALITY_GPU)
     return new CActiveAEResamplePi();
 #endif
   return new CActiveAEResampleFFMPEG();

diff --git a/xbmc/cores/AudioEngine/AEResampleFactory.h b/xbmc/cores/AudioEngine/AEResampleFactory.h
@@ -26,10 +26,17 @@ class IAEResample;
 namespace ActiveAE
 {
 
+/**
+ * Bit options to pass to IAE::GetStream
+ */
+enum AEStreamOptions {
+  AERESAMPLEFACTORY_QUICK_RESAMPLE = 0x01  /* This is a quick resample job (e.g. resample a single noise packet) and may not be worth using GPU acceleration */
+};
+
 class CAEResampleFactory
 {
 public:
-  static IAEResample *Create(bool force_ffmpeg = false);
+  static IAEResample *Create(uint32_t flags = 0);
 };
 
 }
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
@@ -895,7 +895,7 @@ void CActiveAESink::GenerateNoise()
   }
 
   SampleConfig config = m_sampleOfSilence.pkt->config;
-  IAEResample *resampler = CAEResampleFactory::Create(true);
+  IAEResample *resampler = CAEResampleFactory::Create(AERESAMPLEFACTORY_QUICK_RESAMPLE);
   resampler->Init(config.channel_layout,
                  config.channels,
                  config.sample_rate,