Breaking change: Remove AudioProperties from Metadata class, add new …

…getAudioProperties method
Kyant0 · May 3, 2024 · 8c365f4 · 8c365f4
1 parent cdf100e
commit 8c365f4
Show file tree

Hide file tree

Showing 9 changed files with 304 additions and 26 deletions.
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ android {
     namespace = "com.kyant.taglib"
     compileSdk = libs.versions.android.compileSdk.get().toInt()
     buildToolsVersion = "34.0.0"
-    ndkVersion = "27.0.11718014"
+    ndkVersion = "26.3.11579264"
 
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
-agp = "8.5.0-alpha05"
+agp = "8.5.0-alpha07"
 android-minSdk = "21"
 android-compileSdk = "34"
-lib-version = "1.0.0-alpha13"
+lib-version = "1.0.0-alpha14"
 kotlin = "1.9.23"
 rules = "1.5.0"
 runner = "1.5.2"

diff --git a/src/androidTest/kotlin/Tests.kt b/src/androidTest/kotlin/Tests.kt
@@ -24,10 +24,14 @@ class Tests {
     private fun read_and_write_m4a() {
         getFdFromAssets(context, "Sample_BeeMoved_48kHz16bit.m4a").use { fd ->
 
+            // Read audio properties
+
+            val audioProperties = TagLib.getAudioProperties(fd.dup().detachFd())!!
+            Assert.assertEquals(39936, audioProperties.length)
+
             // Read metadata
 
             val metadata = TagLib.getMetadata(fd = fd.dup().detachFd(), readPictures = true)!!
-            Assert.assertEquals(39936, metadata.audioProperties.length)
             Assert.assertEquals("Bee Moved", metadata.propertyMap["TITLE"]!!.single())
             Assert.assertEquals(58336, metadata.pictures.single().data.size)
 

diff --git a/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt
@@ -2,13 +2,14 @@ cmake_minimum_required(VERSION 3.22.1)
 
 project(taglib)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -flto -fdata-sections -ffunction-sections -fomit-frame-pointer")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -flto -fdata-sections -ffunction-sections -fomit-frame-pointer")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fvisibility=hidden -flto -fdata-sections -ffunction-sections -fomit-frame-pointer")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fvisibility=hidden -flto -fdata-sections -ffunction-sections -fomit-frame-pointer")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto -Wl,--gc-sections -s")
 
 set(VISIBILITY_HIDDEN ON)
 set(BUILD_BINDINGS OFF)
 set(BUILD_TESTING OFF)
+
 add_subdirectory(taglib)
 
 include_directories(

diff --git a/src/main/cpp/taglib.cpp b/src/main/cpp/taglib.cpp
@@ -3,12 +3,11 @@
 
 extern "C" {
 JNIEXPORT jobject JNICALL
-Java_com_kyant_taglib_TagLib_getMetadata(
+Java_com_kyant_taglib_TagLib_getAudioProperties(
         JNIEnv *env,
         jobject,
         jint fd,
-        jint read_style,
-        jboolean read_pictures
+        jint read_style
 ) {
     try {
         auto path = getRealPathFromFd(fd);
@@ -17,10 +16,36 @@ Java_com_kyant_taglib_TagLib_getMetadata(
         TagLibExt::FileRef f(path, stream.get(), true, style);
 
         if (f.isNull()) {
+            free(path);
             return nullptr;
         }
 
         jobject audioProperties = getAudioProperties(env, f);
+        free(path);
+        return audioProperties;
+    } catch (const std::exception &e) {
+        throwJavaException(env, e.what());
+        return nullptr;
+    }
+}
+
+JNIEXPORT jobject JNICALL
+Java_com_kyant_taglib_TagLib_getMetadata(
+        JNIEnv *env,
+        jobject,
+        jint fd,
+        jboolean read_pictures
+) {
+    try {
+        auto path = getRealPathFromFd(fd);
+        auto stream = std::make_unique<TagLib::FileStream>(fd, true);
+        TagLibExt::FileRef f(path, stream.get(), false);
+
+        if (f.isNull()) {
+            free(path);
+            return nullptr;
+        }
+
         jobject propertiesMap = getPropertyMap(env, f);
         jobjectArray pictures;
         if (read_pictures) {
@@ -31,7 +56,7 @@ Java_com_kyant_taglib_TagLib_getMetadata(
 
         jobject metadata = env->NewObject(
                 metadataClass, metadataConstructor,
-                audioProperties, propertiesMap, pictures
+                 propertiesMap, pictures
         );
         free(path);
         return metadata;
@@ -53,6 +78,7 @@ Java_com_kyant_taglib_TagLib_getPictures(
         TagLibExt::FileRef f(path, stream.get(), false);
 
         if (f.isNull()) {
+            free(path);
             return emptyPictureArray(env);
         }
 
@@ -78,6 +104,7 @@ Java_com_kyant_taglib_TagLib_savePropertyMap(
         TagLibExt::FileRef f(path, stream.get(), false);
 
         if (f.isNull()) {
+            free(path);
             return false;
         }
 
@@ -105,6 +132,7 @@ Java_com_kyant_taglib_TagLib_savePictures(
         TagLibExt::FileRef f(path, stream.get(), false);
 
         if (f.isNull()) {
+            free(path);
             return false;
         }
 

diff --git a/src/main/cpp/utils.h b/src/main/cpp/utils.h
@@ -58,7 +58,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *) {
     metadataClass = reinterpret_cast<jclass>(env->NewGlobalRef(_metadataClass));
     env->DeleteLocalRef(_metadataClass);
     metadataConstructor = env->GetMethodID(metadataClass, "<init>",
-                                           "(Lcom/kyant/taglib/AudioProperties;Ljava/util/HashMap;[Lcom/kyant/taglib/Picture;)V");
+                                           "(Ljava/util/HashMap;[Lcom/kyant/taglib/Picture;)V");
 
     jclass _audioPropertiesClass = env->FindClass("com/kyant/taglib/AudioProperties");
     audioPropertiesClass = reinterpret_cast<jclass>(env->NewGlobalRef(_audioPropertiesClass));
@@ -318,7 +318,7 @@ jobjectArray emptyPictureArray(JNIEnv *env) {
     return env->NewObjectArray(0, pictureClass, nullptr);
 }
 
-char *getRealPathFromFd(int fd) {
+char *getRealPathFromFd(const int fd) {
     const std::string path = "/proc/self/fd/" + std::to_string(fd);
     const char *pathStr = path.c_str();