完善音频模组功能

xausky · Aug 12, 2018 · ad5bcc1 · ad5bcc1
1 parent 69b90c5
commit ad5bcc1
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 21 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         applicationId "io.github.xausky.unitymodmanager"
         minSdkVersion 19
         targetSdkVersion 23
-        versionCode 251
-        versionName "2.5.1"
+        versionCode 252
+        versionName "2.5.2"
         ndk{
             abiFilters "armeabi-v7a","x86"
         }

diff --git a/app/src/main/cpp/libuabe/FolderFile.hh b/app/src/main/cpp/libuabe/FolderFile.hh
@@ -2,7 +2,6 @@
 #define XAUSKY_FOLDER_FILE_HH
 #include <string>
 using namespace std;
-#define DATA_BUFFER_SIZE (1024*1024*300)
 #define PATH_BUFFER_SIZE (1024)
 #define RESULT_STATE_OK (0)
 #define RESULT_STATE_INTERNAL_ERROR (-1)

diff --git a/app/src/main/cpp/libuabe/libumm/wwise_akpk.c b/app/src/main/cpp/libuabe/libumm/wwise_akpk.c
@@ -97,8 +97,10 @@ int8_t wwise_akpk_parser(wwise_akpk_t *akpk, binary_stream_t *stream, uint8_t pa
             }
             bank->sound.sections = NULL;
             if(parser_event){
-                if(wwise_bank_parser(&bank->sound, &bank->data, 1) != 0){
-                    return -21;
+                if(memcmp(bank->data.data, "RIFF", 4) != 0){
+                    if(wwise_bank_parser(&bank->sound, &bank->data, 1) != 0){
+                        return -21;
+                    }
                 }
                 kbitr_t wwise_bank_itr;
                 if(bank->sound.event_wems_map != NULL){
@@ -158,8 +160,10 @@ int8_t wwise_akpk_make_patch(wwise_akpk_patch_t *patch, const char *path){
     uint32_t bank_id, index, wem_id;
     wwise_akpk_patch_element_t find, *result;
     wwise_bank_key_stream_t put;
+    wwise_akpk_key_stream_t akpk_put;
     memset(patch, 0, sizeof(wwise_akpk_patch_t));
     patch->patch = kb_init(wwise_akpk_patch_map, KB_DEFAULT_SIZE);
+    patch->bank_patch = kb_init(wwise_akpk_key_stream_map, KB_DEFAULT_SIZE);
     if(patch->patch == NULL){
         return -1;
     }
@@ -168,21 +172,33 @@ int8_t wwise_akpk_make_patch(wwise_akpk_patch_t *patch, const char *path){
         return -1;
     }
     for (p = kl_begin(files); p != kl_end(files); p = kl_next(p)){
-        if(sscanf(kl_val(p).name, "%u-%u-%u.wem", &bank_id, &index, &wem_id) != 3){
-            continue;
-        }
-        find.key = ((uint64_t)index) << 32 | ((uint64_t)bank_id);
-        result = kb_getp(wwise_akpk_patch_map, patch->patch, &find);
-        if(result == NULL){
-            result = kb_putp(wwise_akpk_patch_map, patch->patch, &find);
-            result->patch = kb_init(wwise_bank_key_stream_map, KB_DEFAULT_SIZE);
-        }
-        put.key = wem_id;
-        sprintf(path_buffer, "%s/%s", path, kl_val(p).name);
-        if(binary_stream_create_file(&put.stream, path_buffer, BINARY_STREAM_ORDER_LITTLE_ENDIAN) != 0){
-            return -4;
+        if(memcmp(kl_val(p).name, "bank", 4) == 0){
+            if(sscanf(kl_val(p).name, "bank-%u-%u.wem", &bank_id, &index) != 2){
+                continue;
+            }
+            sprintf(path_buffer, "%s/%s", path, kl_val(p).name);
+            if(binary_stream_create_file(&akpk_put.stream, path_buffer, BINARY_STREAM_ORDER_LITTLE_ENDIAN) != 0){
+                return -4;
+            }
+            akpk_put.key = ((uint64_t)index) << 32 | ((uint64_t)bank_id);
+            kb_put(wwise_akpk_key_stream_map, patch->bank_patch, akpk_put);
+        }else{
+            if(sscanf(kl_val(p).name, "%u-%u-%u.wem", &bank_id, &index, &wem_id) != 3){
+                continue;
+            }
+            find.key = ((uint64_t)index) << 32 | ((uint64_t)bank_id);
+            result = kb_getp(wwise_akpk_patch_map, patch->patch, &find);
+            if(result == NULL){
+                result = kb_putp(wwise_akpk_patch_map, patch->patch, &find);
+                result->patch = kb_init(wwise_bank_key_stream_map, KB_DEFAULT_SIZE);
+            }
+            put.key = wem_id;
+            sprintf(path_buffer, "%s/%s", path, kl_val(p).name);
+            if(binary_stream_create_file(&put.stream, path_buffer, BINARY_STREAM_ORDER_LITTLE_ENDIAN) != 0){
+                return -4;
+            }
+            kb_put(wwise_bank_key_stream_map, result->patch, put);
         }
-        kb_put(wwise_bank_key_stream_map, result->patch, put);
     }
     utils_file_list_destory(files);
     return 0;
@@ -199,14 +215,19 @@ void wwise_akpk_destory_patch(wwise_akpk_patch_t *patch){
         kb_destroy(wwise_bank_key_stream_map, entity->patch);
     }
     kb_destroy(wwise_akpk_patch_map, patch->patch);
+    for(kb_itr_first(wwise_akpk_key_stream_map, patch->bank_patch, &bank); kb_itr_valid(&bank); kb_itr_next(wwise_akpk_key_stream_map, patch->bank_patch, &bank)){
+        wwise_akpk_key_stream_t *entity = &kb_itr_key(wwise_akpk_key_stream_t, &bank);
+        binary_stream_destory(&entity->stream);
+    }
+    kb_destroy(wwise_akpk_key_stream_map, patch->bank_patch);
 }
 
 int8_t wwise_akpk_patch(wwise_akpk_t *akpk, wwise_akpk_patch_t *patch){
     kbitr_t itr;
+    int64_t size;
     wwise_akpk_key_bank_map_t find, *result;
     for(kb_itr_first(wwise_akpk_patch_map, patch->patch, &itr); kb_itr_valid(&itr); kb_itr_next(wwise_akpk_patch_map, patch->patch, &itr)){
         wwise_akpk_patch_element_t *entity = &kb_itr_key(wwise_akpk_patch_element_t, &itr);
-        wwise_akpk_key_bank_map_t *result;
         find.key = entity->key;
         for(int i = 0; i < 3; ++i){
             result = kb_getp(wwise_akpk_key_bank_map, akpk->banks[i], &find);
@@ -231,6 +252,31 @@ int8_t wwise_akpk_patch(wwise_akpk_t *akpk, wwise_akpk_patch_t *patch){
             wwise_bank_destory(&result->sound);
         }
     }
+    for(kb_itr_first(wwise_akpk_key_stream_map, patch->bank_patch, &itr); kb_itr_valid(&itr); kb_itr_next(wwise_akpk_key_stream_map, patch->bank_patch, &itr)){
+        wwise_akpk_key_stream_t *entity = &kb_itr_key(wwise_akpk_key_stream_t, &itr);
+        find.key = entity->key;
+        for(int i = 0; i < 3; ++i){
+            result = kb_getp(wwise_akpk_key_bank_map, akpk->banks[i], &find);
+            if(result != NULL){
+                break;
+            }
+        }
+        if(result != NULL){
+            binary_stream_destory(&result->data);
+            if(binary_stream_create_memory(&result->data, 1024, BINARY_STREAM_ORDER_LITTLE_ENDIAN) != 0){
+                return -2;
+            }
+            if((size = binary_stream_seek(&entity->stream, 0, SEEK_END)) < 0){
+                return -1;
+            }
+            if(binary_stream_seek(&entity->stream, 0, SEEK_SET) != 0){
+                return -1;
+            }
+            if(binary_stream_copy(&result->data, &entity->stream, size) < 0){
+                return -3;
+            }
+        }
+    }
     return 0;
 }
 

diff --git a/app/src/main/cpp/libuabe/libumm/wwise_akpk.h b/app/src/main/cpp/libuabe/libumm/wwise_akpk.h
@@ -60,8 +60,16 @@ typedef struct {
 
 KBTREE_INIT(wwise_akpk_patch_map, wwise_akpk_patch_element_t, wwise_akpk_key_map_cmp) ;
 
+typedef struct {
+    uint64_t key;
+    binary_stream_t stream;
+} wwise_akpk_key_stream_t;
+
+KBTREE_INIT(wwise_akpk_key_stream_map, wwise_akpk_key_stream_t, wwise_bank_key_value_cmp)
+
 typedef struct {
     kbtree_t(wwise_akpk_patch_map) *patch;
+    kbtree_t(wwise_akpk_key_stream_map) *bank_patch;
 } wwise_akpk_patch_t;
 
 int8_t wwise_akpk_parser(wwise_akpk_t *akpk, binary_stream_t *stream, uint8_t parser_event);

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
     }
 }