Merge branch 'master' of https://gitee.com/openLuat/LuatOS

openLuat · Jan 22, 2024 · 8343b53 · 8343b53
2 parents ac0848f + 54307b0
commit 8343b53
Show file tree

Hide file tree

Showing 9 changed files with 552 additions and 25 deletions.
diff --git a/components/cc/luat_lib_cc.c b/components/cc/luat_lib_cc.c
@@ -158,24 +158,11 @@ static void luat_volte_task(void *param){
 	luat_i2s_setup(&i2s_conf);
     luat_cc.i2s_conf = luat_i2s_get_config(audio_conf->codec_conf.i2s_id);
 
-    int ret = audio_conf->codec_conf.codec_opts->init(&audio_conf->codec_conf,LUAT_CODEC_MODE_SLAVE);
-    if (ret){
-		LLOGE("no codec %s",audio_conf->codec_conf.codec_opts->name);
-		luat_rtos_task_delete(luat_cc.task_handle);
-		return;
-    }else{
-		LLOGD("find codec %s",audio_conf->codec_conf.codec_opts->name);
-
-        audio_conf->codec_conf.codec_opts->control(&audio_conf->codec_conf,LUAT_CODEC_SET_RATE,16000);
-        audio_conf->codec_conf.codec_opts->control(&audio_conf->codec_conf,LUAT_CODEC_SET_BITS,16);
-		audio_conf->codec_conf.codec_opts->control(&audio_conf->codec_conf,LUAT_CODEC_SET_FORMAT,LUAT_CODEC_FORMAT_I2S);
-
-        audio_conf->codec_conf.codec_opts->control(&audio_conf->codec_conf,LUAT_CODEC_SET_VOICE_VOL,70);
-        audio_conf->codec_conf.codec_opts->control(&audio_conf->codec_conf,LUAT_CODEC_SET_MIC_VOL,80);
-
-        // // audio_conf->codec_conf.codec_opts->control(&audio_conf->codec_conf,LUAT_CODEC_MODE_STANDBY,LUAT_CODEC_MODE_ALL);
-        audio_conf->codec_conf.codec_opts->stop(&audio_conf->codec_conf);
-    }
+	audio_conf->codec_conf.codec_opts->control(&audio_conf->codec_conf,LUAT_CODEC_SET_RATE,16000);
+	audio_conf->codec_conf.codec_opts->control(&audio_conf->codec_conf,LUAT_CODEC_SET_BITS,16);
+
+	audio_conf->codec_conf.codec_opts->stop(&audio_conf->codec_conf);
+
 	while (1){
 		luat_rtos_event_recv(luat_cc.task_handle, 0, &event, NULL, LUAT_WAIT_FOREVER);
 		switch(event.id)

diff --git a/components/gmssl/src/asn1.c b/components/gmssl/src/asn1.c
@@ -962,7 +962,7 @@ static void asn1_oid_node_to_base128(uint32_t a, uint8_t **out, size_t *outlen)
 
 static int asn1_oid_node_from_base128(uint32_t *a, const uint8_t **in, size_t *inlen)
 {
-	uint8_t buf[5];
+	uint8_t buf[5] = {0};
 	int n = 0;
 	int i;
 

diff --git a/components/multimedia/luat_lib_multimedia_audio.c b/components/multimedia/luat_lib_multimedia_audio.c
@@ -374,6 +374,7 @@ static int l_audio_set_output_bus(lua_State *L) {
     luat_audio_conf_t* audio_conf = luat_audio_get_config(id);
     int tp = luaL_checkinteger(L, 2);
     if (audio_conf!=NULL && lua_istable(L,3) && tp==MULTIMEDIA_AUDIO_BUS_I2S){
+        audio_conf->bus_type = MULTIMEDIA_AUDIO_BUS_I2S;
 		lua_pushstring(L, "chip");
 		if (LUA_TSTRING == lua_gettable(L, 3)) {
             const char *chip = luaL_checklstring(L, -1,&len);
@@ -393,8 +394,8 @@ static int l_audio_set_output_bus(lua_State *L) {
 		}
 		lua_pop(L, 1);
     }
-    luat_audio_set_bus_type(id,tp);
-    return 0;
+    lua_pushboolean(L, !luat_audio_set_bus_type(id,tp));
+    return 1;
 }
 
 LUAT_WEAK void luat_audio_set_debug(uint8_t on_off)

diff --git a/components/multimedia/luat_multimedia_audio.c b/components/multimedia/luat_multimedia_audio.c
@@ -153,15 +153,22 @@ LUAT_WEAK uint8_t luat_audio_mic_vol(uint8_t multimedia_id, uint16_t vol){
     return -1;
 }
 
-LUAT_WEAK void luat_audio_set_bus_type(uint8_t multimedia_id,uint8_t bus_type){
+LUAT_WEAK int luat_audio_set_bus_type(uint8_t multimedia_id,uint8_t bus_type){
     luat_audio_conf_t* audio_conf = luat_audio_get_config(multimedia_id);
     if (audio_conf){
         if (bus_type == MULTIMEDIA_AUDIO_BUS_I2S){
             audio_conf->bus_type = MULTIMEDIA_AUDIO_BUS_I2S;
-            audio_conf->codec_conf.codec_opts->init(&audio_conf->codec_conf,LUAT_CODEC_MODE_SLAVE);
+            if (audio_conf->codec_conf.codec_opts->init(&audio_conf->codec_conf,LUAT_CODEC_MODE_SLAVE)){
+                LLOGE("no codec %s",audio_conf->codec_conf.codec_opts->name);
+                return -1;
+            }else{
+                LLOGD("find codec %s",audio_conf->codec_conf.codec_opts->name);
+            }
             audio_conf->codec_conf.codec_opts->control(&audio_conf->codec_conf,LUAT_CODEC_SET_FORMAT,LUAT_CODEC_FORMAT_I2S);
+            return 0;
         }
     }
+    return -1;
 }