[aml] move aml_cpufreq_limit out of AESinkAUDIOTRACK.cpp and into AML…

…Utils where it belongs
xbmc · Sep 29, 2012 · a2b0ee3 · a2b0ee3
1 parent a9e5d90
commit a2b0ee3
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 52 deletions.
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
@@ -23,6 +23,9 @@
 #include "Utils/AERingBuffer.h"
 #include "android/activity/XBMCApp.h"
 #include "utils/log.h"
+#if defined(HAS_AMLPLAYER)
+#include "cores/amlplayer/AMLUtils.h"
+#endif
 
 #include <jni.h>
 
@@ -52,58 +55,6 @@ static void pa_sconv_s16le_from_f32ne_neon(unsigned n, const float32_t *a, int16
 }
 #endif
 
-#if defined(HAS_AMLPLAYER)
-// yes this is nasty here but there is really no place else to do it.
-static void aml_cpufreq_limit(bool limit)
-{
-  static int audiotrack_cputype = -1;
-
-  if (audiotrack_cputype == -1)
-  {
-    // defualt to m1 SoC
-    audiotrack_cputype = 1;
-
-    FILE *cpuinfo_fd = fopen("/proc/cpuinfo", "r");
-    if (cpuinfo_fd)
-    {
-      char buffer[512];
-      while (fgets(buffer, sizeof(buffer), cpuinfo_fd))
-      {
-        std::string stdbuffer(buffer);
-        if (stdbuffer.find("MESON-M3") != std::string::npos)
-        {
-          audiotrack_cputype = 3;
-          CLog::Log(LOGDEBUG, "CAMLPlayer::GetCpuType is AMLOGIC MESON-M3");
-          break;
-        }
-      }
-      fclose(cpuinfo_fd);
-    }
-  }
-  // On M1 SoCs, when playing hw decoded audio, we cannot drop below 600MHz
-  // or risk hw audio dropouts. AML code does a 2X scaling based off
-  // /sys/class/audiodsp/codec_mips but tests show that this is
-  // seems risky so we just clamp to 600Mhz to be safe.
-  if (audiotrack_cputype == 3)
-    return;
-
-  int cpufreq;
-  if (limit)
-    cpufreq = 600000;
-  else
-    cpufreq = 300000;
-
-  int fd = open("/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", O_CREAT | O_RDWR | O_TRUNC, 0644);
-  if (fd >= 0)
-  {
-    char bcmd[16];
-    sprintf(bcmd, "%d", cpufreq);
-    write(fd, bcmd, strlen(bcmd));
-    close(fd);
-  }
-}
-#endif
-
 static jint GetStaticIntField(JNIEnv *jenv, std::string class_name, std::string field_name)
 {
   class_name.insert(0, "android/media/");

diff --git a/xbmc/cores/amlplayer/AMLUtils.cpp b/xbmc/cores/amlplayer/AMLUtils.cpp
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <string>
 
 int aml_set_sysfs_str(const char *path, const char *val)
 {
@@ -79,6 +80,53 @@ int aml_get_sysfs_int(const char *path)
   return val;
 }
 
+void aml_cpufreq_limit(bool limit)
+{
+  static int audiotrack_cputype = -1;
+  if (audiotrack_cputype == -1)
+  {
+    // defualt to m1 SoC
+    audiotrack_cputype = 1;
+
+    FILE *cpuinfo_fd = fopen("/proc/cpuinfo", "r");
+    if (cpuinfo_fd)
+    {
+      char buffer[512];
+      while (fgets(buffer, sizeof(buffer), cpuinfo_fd))
+      {
+        std::string stdbuffer(buffer);
+        if (stdbuffer.find("MESON-M3") != std::string::npos)
+        {
+          audiotrack_cputype = 3;
+          break;
+        }
+      }
+      fclose(cpuinfo_fd);
+    }
+  }
+  // On M1 SoCs, when playing hw decoded audio, we cannot drop below 600MHz
+  // or risk hw audio dropouts. AML code does a 2X scaling based off
+  // /sys/class/audiodsp/codec_mips but tests show that this is
+  // seems risky so we just clamp to 600Mhz to be safe.
+  if (audiotrack_cputype == 3)
+    return;
+
+  int cpufreq;
+  if (limit)
+    cpufreq = 600000;
+  else
+    cpufreq = 300000;
+
+  int fd = open("/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", O_CREAT | O_RDWR | O_TRUNC, 0644);
+  if (fd >= 0)
+  {
+    char bcmd[16];
+    sprintf(bcmd, "%d", cpufreq);
+    write(fd, bcmd, strlen(bcmd));
+    close(fd);
+  }
+}
+
 int aml_set_audio_passthrough(bool passthrough)
 {
   static int has_aml = -1;

diff --git a/xbmc/cores/amlplayer/AMLUtils.h b/xbmc/cores/amlplayer/AMLUtils.h
@@ -24,4 +24,5 @@ int aml_get_sysfs_str(const char *path, char *valstr, const int size);
 int aml_set_sysfs_int(const char *path, const int val);
 int aml_get_sysfs_int(const char *path);
 
+void aml_cpufreq_limit(bool limit);
 void aml_set_audio_passthrough(bool passthrough);