release v1.3.3

switch to Project Whispercpp-Android successfully according to roadmap after finsihed PoC #64 this is the new baseline for new Project KanTV(aka Project Whispercpp-Android)
zhouwg · Mar 18, 2024 · 8f264df · 8f264df · zhouwg · Mar 18, 2024
1 parent 6c0c05d
commit 8f264df
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -205,7 +205,9 @@ The following is some English snapshots.
 ![Screenshot_2024_0304_131033](https://github.com/zhouwg/kantv/assets/6889919/6c5bd531-5577-4570-bc87-aa3a87822d6b)
 
 
-![1743987771](https://github.com/cdeos/kantv/assets/6889919/2c9268e2-aa4b-498b-b457-707ce4584c5d)
+![154248860](https://github.com/cdeos/kantv/assets/6889919/071ac55c-a5d7-4bd6-aece-83cbc8a487ff)
+
+![1118975128](https://github.com/cdeos/kantv/assets/6889919/ef2b256c-02fb-4318-a430-b4cd15ed5b44)
 
 
 

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-kantv 1.3.2 (based on customized FFmpeg 6.1, whisper.cpp)
+kantv 1.3.3 (based on customized FFmpeg 6.1, original whisper.cpp)
diff --git a/build/envsetup.sh b/build/envsetup.sh
@@ -65,7 +65,6 @@ export ANDROID_PLATFORM=android-34
 #export ANDROID_NDK=${KANTV_TOOLCHAIN_PATH}/android-ndk-r21e
 #export ANDROID_NDK=${KANTV_TOOLCHAIN_PATH}/android-ndk-r24
 export ANDROID_NDK=${KANTV_TOOLCHAIN_PATH}/android-ndk-r26c
-export LOCAL_BAZEL_PATH=${HOME_PATH}/.cache/bazel/_bazel_${BUILD_USER}/d483cd2a2d9204cb5bb4d870c2729238
 export UPSTREAM_WHISPERCPP_PATH=~/cdeos/whisper.cpp
 
 

diff --git a/cdeosplayer/cdeosplayer-lib/src/main/java/cdeos/media/player/KANTVVersion.java b/cdeosplayer/cdeosplayer-lib/src/main/java/cdeos/media/player/KANTVVersion.java
@@ -19,7 +19,7 @@
 
 final class KANTVVersion
 {
-    public static final String KANTV_VERSION="KANTV-v1.3.2";
+    public static final String KANTV_VERSION="KANTV-v1.3.3";
 
     public static native int kantv_anti_remove_rename_this_file();
 }

diff --git a/cdeosplayer/constants.gradle b/cdeosplayer/constants.gradle
@@ -44,8 +44,8 @@ project.ext {
     appTargetSdkVersion = 29
 
     //version and version code of KanTV
-    releaseVersion     = '1.3.2'
-    releaseVersionCode = 1000302
+    releaseVersion     = '1.3.3'
+    releaseVersionCode = 1000303
 
     modulePrefix = ':'
     guavaVersion = '27.1-android'

diff --git a/...splayer/kantv/src/main/java/com/cdeos/kantv/ui/fragment/settings/PlaySettingFragment.java b/...splayer/kantv/src/main/java/com/cdeos/kantv/ui/fragment/settings/PlaySettingFragment.java
@@ -128,7 +128,7 @@ public void onCreatePreferences(Bundle bundle, String s) {
                 mWidgetDumpMode.setEnabled(true);
         } else {
             if (mWidgetDumpMode != null)
-                mWidgetDumpMode.setEnabled(false);
+                mWidgetDumpMode.setEnabled(true);
         }
 
         if (mWidgetBackgroundPlay != null) {

diff --git a/cdeosplayer/kantv/src/main/java/com/cdeos/kantv/utils/Settings.java b/cdeosplayer/kantv/src/main/java/com/cdeos/kantv/utils/Settings.java
@@ -235,7 +235,7 @@ public String getApiGatewayServerUrl() {
 
     public boolean getDevMode() {
         String key = mAppContext.getString(R.string.pref_key_dev_mode);
-        return mSharedPreferences.getBoolean(key, false);
+        return mSharedPreferences.getBoolean(key, true);
     }
 
     public int getDumpMode() {

diff --git a/cdeosplayer/kantv/src/main/res/values-en/strings_pref.xml b/cdeosplayer/kantv/src/main/res/values-en/strings_pref.xml
@@ -277,7 +277,7 @@
     </string-array>
 
     <string name="pref_key_play_mode">pref.play_mode</string>
-    <string name="pref_title_play_mode">play_mode</string>
+    <string name="pref_title_play_mode">Playmode with Playlist</string>
     <string-array name="pref_entries_playmode">
         <item>normal mode</item>
         <item>loop play with content</item>
@@ -299,7 +299,7 @@
     <string name="pref_title_about">About</string>
     <string name="pref_key_version">pref.version</string>
     <string name="pref_title_version">Current Version</string>
-    <string name="pref_summary_version">1.3.2</string>
+    <string name="pref_summary_version">1.3.3</string>
 
     <string name="pref_key_versionhistory">pref.versionhistory</string>
     <string name="pref_title_versionhistory">Version history</string>

diff --git a/cdeosplayer/kantv/src/main/res/values-zh/strings_pref.xml b/cdeosplayer/kantv/src/main/res/values-zh/strings_pref.xml
@@ -277,7 +277,7 @@
     </string-array>
 
     <string name="pref_key_play_mode">pref.play_mode</string>
-    <string name="pref_title_play_mode">play_mode</string>
+    <string name="pref_title_play_mode">Playmode with Playlist</string>
     <string-array name="pref_entries_playmode">
         <item>normal mode</item>
         <item>loop play with content</item>
@@ -299,7 +299,7 @@
     <string name="pref_title_about">About</string>
     <string name="pref_key_version">pref.version</string>
     <string name="pref_title_version">Current Version</string>
-    <string name="pref_summary_version">1.3.2</string>
+    <string name="pref_summary_version">1.3.3</string>
 
     <string name="pref_key_versionhistory">pref.versionhistory</string>
     <string name="pref_title_versionhistory">Version history</string>

diff --git a/cdeosplayer/kantv/src/main/res/values/strings_pref.xml b/cdeosplayer/kantv/src/main/res/values/strings_pref.xml
@@ -277,7 +277,7 @@
     </string-array>
 
     <string name="pref_key_play_mode">pref.play_mode</string>
-    <string name="pref_title_play_mode">play_mode</string>
+    <string name="pref_title_play_mode">Playmode with Playlist</string>
     <string-array name="pref_entries_playmode">
         <item>normal mode</item>
         <item>loop play with content</item>
@@ -299,7 +299,7 @@
     <string name="pref_title_about">About</string>
     <string name="pref_key_version">pref.version</string>
     <string name="pref_title_version">Current Version</string>
-    <string name="pref_summary_version">1.3.2</string>
+    <string name="pref_summary_version">1.3.3</string>
 
     <string name="pref_key_versionhistory">pref.versionhistory</string>
     <string name="pref_title_versionhistory">Version history</string>

diff --git a/cdeosplayer/kantv/src/main/res/xml/settings_play.xml b/cdeosplayer/kantv/src/main/res/xml/settings_play.xml
@@ -37,12 +37,23 @@
             android:summary="@string/pref_summary_startplaypos"
             android:title="@string/pref_title_startplaypos"
             android:widgetLayout="@layout/my_checkbox" />
+
+        <com.cdeos.kantv.ui.fragment.settings.IjkListPreference
+            android:defaultValue="0"
+            android:enabled="true"
+            android:entries="@@array/pref_entries_playmode"
+            android:entryValues="@array/pref_entry_values_playmode"
+            android:key="@string/pref_key_play_mode"
+            android:persistent="true"
+            android:title="@string/pref_title_play_mode"
+            app:entrySummaries="@array/pref_entry_summaries_playmode" />
+
     </PreferenceCategory>
 
 
     <PreferenceCategory
-        android:key="debug"
-        android:title="Debug/Expert">
+        android:key="expert"
+        android:title="Expert">
 
         <SwitchPreference
             android:key="surface_renders"
@@ -64,16 +75,6 @@
             android:summary="@string/pref_summary_enable_texture_view"
             android:title="@string/pref_title_enable_texture_view" />
 
-        <com.cdeos.kantv.ui.fragment.settings.IjkListPreference
-            android:defaultValue="0"
-            android:enabled="true"
-            android:entries="@@array/pref_entries_playmode"
-            android:entryValues="@array/pref_entry_values_playmode"
-            android:key="@string/pref_key_play_mode"
-            android:persistent="true"
-            android:title="@string/pref_title_play_mode"
-            app:entrySummaries="@array/pref_entry_summaries_playmode" />
-
         <CheckBoxPreference
             android:defaultValue="false"
             android:disableDependentsState="true"
@@ -89,8 +90,11 @@
             android:persistent="true"
             android:summary="@string/pref_summary_disable_video"
             android:title="@string/pref_title_disable_video" />
+    </PreferenceCategory>
 
-
+    <PreferenceCategory
+        android:key="debug"
+        android:title="Debug">
         <com.cdeos.kantv.ui.fragment.settings.IjkListPreference
             android:defaultValue="0"
             android:enabled="false"

diff --git a/release/README.md b/release/README.md
@@ -159,3 +159,9 @@
                      <li> rename kantv_anti_tamper to kantv_anti_remove_rename_this_file to avoid confusion or misunderstanding</li>
                      <li> implmement AI English subtitle for English online TV by great whisper.cpp for the first time(NOT real "real-time" and bugfix is required)</li>
                  </ul>
+
+- v1.3.3 2024-03-18,
+                 <ul>
+                    <li>switch to Project Whispercpp-Android successfully according to roadmap after finsihed PoC #64</li>
+                    <li>this is the new baseline for new Project KanTV(aka Project Whispercpp-Android)</li>
+                 </ul>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		kantv 1.3.2 (based on customized FFmpeg 6.1, whisper.cpp)
		kantv 1.3.3 (based on customized FFmpeg 6.1, original whisper.cpp)