k230 sdk release v1.1

kendryte · Nov 2, 2023 · 98e0c1d · 98e0c1d
1 parent ff6900f
commit 98e0c1d
Show file tree

Hide file tree

Showing 67 changed files with 17 additions and 9 deletions.
diff --git a/repo.mak b/repo.mak
@@ -5,7 +5,7 @@ OPENSBI_VERSION         = "9aa2f6d34e685bbbb0afaab4e308b93a9cd06ec7"
 BUILDROOT-EXT_VERSION   = "8eafd41f1dde4ff48b914d5978cecf7af627fba6"
 LINUX_VERSION           = "04b6371ff02d49cba18adc81dfcdbbec0cbfed56"
 UBOOT_VERSION           = "317894980fd498b863820b1343096fe188faae53"
-CDK_VERSION             = "fea98217f3a781508de19bb2ecfea390526414ba"
+CDK_VERSION             = "dbfb3da07812b2f73257ebc1fb0d54dded1f7740"
 
 RT-SMART_SRC_PATH        = src/big/rt-smart
 MPP_SRC_PATH             = src/big/mpp

diff --git a/src/big/mpp/kernel/lib/libaudio.a b/src/big/mpp/kernel/lib/libaudio.a
diff --git a/src/big/mpp/kernel/lib/libcmpi.a b/src/big/mpp/kernel/lib/libcmpi.a
diff --git a/src/big/mpp/kernel/lib/libdma.a b/src/big/mpp/kernel/lib/libdma.a
diff --git a/src/big/mpp/kernel/lib/libdpu.a b/src/big/mpp/kernel/lib/libdpu.a
diff --git a/src/big/mpp/kernel/lib/liblog.a b/src/big/mpp/kernel/lib/liblog.a
diff --git a/src/big/mpp/kernel/lib/libmediafreq.a b/src/big/mpp/kernel/lib/libmediafreq.a
diff --git a/src/big/mpp/kernel/lib/libmmz.a b/src/big/mpp/kernel/lib/libmmz.a
diff --git a/src/big/mpp/kernel/lib/libpm.a b/src/big/mpp/kernel/lib/libpm.a
diff --git a/src/big/mpp/kernel/lib/libsys.a b/src/big/mpp/kernel/lib/libsys.a
diff --git a/src/big/mpp/kernel/lib/libvb.a b/src/big/mpp/kernel/lib/libvb.a
diff --git a/src/big/mpp/kernel/lib/libvdss.a b/src/big/mpp/kernel/lib/libvdss.a
diff --git a/src/big/mpp/kernel/lib/libvicap.a b/src/big/mpp/kernel/lib/libvicap.a
diff --git a/src/big/mpp/kernel/lib/libvo.a b/src/big/mpp/kernel/lib/libvo.a
diff --git a/src/big/mpp/kernel/lib/libvpu.a b/src/big/mpp/kernel/lib/libvpu.a
diff --git a/src/big/mpp/kernel/lib/libvvi.a b/src/big/mpp/kernel/lib/libvvi.a
diff --git a/src/big/mpp/kernel/lib/libvvo.a b/src/big/mpp/kernel/lib/libvvo.a
diff --git a/src/big/mpp/userapps/lib/lib3a.a b/src/big/mpp/userapps/lib/lib3a.a
diff --git a/src/big/mpp/userapps/lib/libadec.a b/src/big/mpp/userapps/lib/libadec.a
diff --git a/src/big/mpp/userapps/lib/libaenc.a b/src/big/mpp/userapps/lib/libaenc.a
diff --git a/src/big/mpp/userapps/lib/libai.a b/src/big/mpp/userapps/lib/libai.a
diff --git a/src/big/mpp/userapps/lib/libao.a b/src/big/mpp/userapps/lib/libao.a
diff --git a/src/big/mpp/userapps/lib/libauto_ctrol.a b/src/big/mpp/userapps/lib/libauto_ctrol.a
diff --git a/src/big/mpp/userapps/lib/libbinder.a b/src/big/mpp/userapps/lib/libbinder.a
diff --git a/src/big/mpp/userapps/lib/libbuffer_management.a b/src/big/mpp/userapps/lib/libbuffer_management.a
diff --git a/src/big/mpp/userapps/lib/libcam_caldb.a b/src/big/mpp/userapps/lib/libcam_caldb.a
diff --git a/src/big/mpp/userapps/lib/libcam_device.a b/src/big/mpp/userapps/lib/libcam_device.a
diff --git a/src/big/mpp/userapps/lib/libcam_engine.a b/src/big/mpp/userapps/lib/libcam_engine.a
diff --git a/src/big/mpp/userapps/lib/libcameric_drv.a b/src/big/mpp/userapps/lib/libcameric_drv.a
diff --git a/src/big/mpp/userapps/lib/libcameric_reg_drv.a b/src/big/mpp/userapps/lib/libcameric_reg_drv.a
diff --git a/src/big/mpp/userapps/lib/libcmd_buffer.a b/src/big/mpp/userapps/lib/libcmd_buffer.a
diff --git a/src/big/mpp/userapps/lib/libcommon.a b/src/big/mpp/userapps/lib/libcommon.a
diff --git a/src/big/mpp/userapps/lib/libdma.a b/src/big/mpp/userapps/lib/libdma.a
diff --git a/src/big/mpp/userapps/lib/libdpu.a b/src/big/mpp/userapps/lib/libdpu.a
diff --git a/src/big/mpp/userapps/lib/libebase.a b/src/big/mpp/userapps/lib/libebase.a
diff --git a/src/big/mpp/userapps/lib/libfpga.a b/src/big/mpp/userapps/lib/libfpga.a
diff --git a/src/big/mpp/userapps/lib/libhal.a b/src/big/mpp/userapps/lib/libhal.a
diff --git a/src/big/mpp/userapps/lib/libisi.a b/src/big/mpp/userapps/lib/libisi.a
diff --git a/src/big/mpp/userapps/lib/libisp_drv.a b/src/big/mpp/userapps/lib/libisp_drv.a
diff --git a/src/big/mpp/userapps/lib/liboslayer.a b/src/big/mpp/userapps/lib/liboslayer.a
diff --git a/src/big/mpp/userapps/lib/libpm.a b/src/big/mpp/userapps/lib/libpm.a
diff --git a/src/big/mpp/userapps/lib/libsom_ctrl.a b/src/big/mpp/userapps/lib/libsom_ctrl.a
diff --git a/src/big/mpp/userapps/lib/libstart_engine.a b/src/big/mpp/userapps/lib/libstart_engine.a
diff --git a/src/big/mpp/userapps/lib/libswitch.a b/src/big/mpp/userapps/lib/libswitch.a
diff --git a/src/big/mpp/userapps/lib/libsys.a b/src/big/mpp/userapps/lib/libsys.a
diff --git a/src/big/mpp/userapps/lib/libt_common_c.a b/src/big/mpp/userapps/lib/libt_common_c.a
diff --git a/src/big/mpp/userapps/lib/libt_database_c.a b/src/big/mpp/userapps/lib/libt_database_c.a
diff --git a/src/big/mpp/userapps/lib/libt_json_c.a b/src/big/mpp/userapps/lib/libt_json_c.a
diff --git a/src/big/mpp/userapps/lib/libt_mxml_c.a b/src/big/mpp/userapps/lib/libt_mxml_c.a
diff --git a/src/big/mpp/userapps/lib/libvb.a b/src/big/mpp/userapps/lib/libvb.a
diff --git a/src/big/mpp/userapps/lib/libvdec.a b/src/big/mpp/userapps/lib/libvdec.a
diff --git a/src/big/mpp/userapps/lib/libvdss.a b/src/big/mpp/userapps/lib/libvdss.a
diff --git a/src/big/mpp/userapps/lib/libvenc.a b/src/big/mpp/userapps/lib/libvenc.a
diff --git a/src/big/mpp/userapps/lib/libvicap.a b/src/big/mpp/userapps/lib/libvicap.a
diff --git a/src/big/mpp/userapps/lib/libvideo_in.a b/src/big/mpp/userapps/lib/libvideo_in.a
diff --git a/src/big/mpp/userapps/lib/libvirtual_hal.a b/src/big/mpp/userapps/lib/libvirtual_hal.a
diff --git a/src/big/mpp/userapps/lib/libvo.a b/src/big/mpp/userapps/lib/libvo.a
diff --git a/src/big/mpp/userapps/lib/libvvi.a b/src/big/mpp/userapps/lib/libvvi.a
diff --git a/src/common/cdk/user/component/datafifo/host/lib/libdatafifo.a b/src/common/cdk/user/component/datafifo/host/lib/libdatafifo.a
diff --git a/src/common/cdk/user/component/datafifo/slave/lib/libdatafifo.a b/src/common/cdk/user/component/datafifo/slave/lib/libdatafifo.a
diff --git a/src/common/cdk/user/component/ipcmsg/host/lib/libipcmsg.a b/src/common/cdk/user/component/ipcmsg/host/lib/libipcmsg.a
diff --git a/src/common/cdk/user/component/ipcmsg/slave/lib/libipcmsg.a b/src/common/cdk/user/component/ipcmsg/slave/lib/libipcmsg.a
diff --git a/src/common/cdk/user/samples/rtsp_demo/include/streaming_player.h b/src/common/cdk/user/samples/rtsp_demo/include/streaming_player.h
@@ -45,6 +45,7 @@ struct SessionAttr {
     uint32_t video_width;
     uint32_t video_height;
     k_vicap_sensor_type sensor_type;
+    k_i2s_in_mono_channel  auido_mono_channel_type;
 };
 
 #define MAX_SESSION_NUM 3
@@ -90,7 +91,7 @@ class StreamingPlayer {
     void Stop();
 
 private:
-    int CreateAudioEncode();
+    int CreateAudioEncode(const SessionAttr &session_attr);
     int CreateVideoEncode(const SessionAttr &session_attr);
     int StreamingPlayerInit();
     int StreamingPlayerDeinit();

diff --git a/src/common/cdk/user/samples/rtsp_demo/main.cpp b/src/common/cdk/user/samples/rtsp_demo/main.cpp
@@ -12,13 +12,15 @@ static void sigHandler(int sig_no) {
 }
 
 static void help() {
-    std::cout << "Usage: ./rtsp_demo -s 7 -n 2 -t h265 -w 1280 -h 720." << std::endl;
+    std::cout << "Usage: ./rtsp_demo -s 7 -n 2 -t h265 -w 1280 -h 720 -a 0." << std::endl;
     std::cout << "-s: the sensor type: default 7" << std::endl;
     std::cout << "       see camera sensor doc." << std::endl;
     std::cout << "-n: the session number, range: [1, 3]." << std::endl;
     std::cout << "-t: the video encoder type: h264/h265/mjpeg." << std::endl;
     std::cout << "-w: the video encoder width." << std::endl;
     std::cout << "-h: the video encoder height." << std::endl;
+    std::cout << "-a: audio input type(0:mic input  1:headphone input):default 0." << std::endl;
+
 }
 
 int main(int argc, char *argv[]) {
@@ -33,6 +35,7 @@ int main(int argc, char *argv[]) {
     int session_num = 1;
     int video_width = 1280;
     int video_height = 720;
+    k_i2s_in_mono_channel audio_input_type = KD_I2S_IN_MONO_RIGHT_CHANNEL;//mic input
 
     if (argc > 1) {
         for (int i = 1; i < argc; i += 2) {
@@ -60,14 +63,16 @@ int main(int argc, char *argv[]) {
                 video_height = atoi(argv[i+1]);
             } else if (strcmp(argv[i], "-s") == 0) {
                 sensor_type = (k_vicap_sensor_type)atoi(argv[i+1]);
+            } else if (strcmp(argv[i], "-a") == 0) {
+                audio_input_type = (k_i2s_in_mono_channel)atoi(argv[i+1]);
             }
             else if (strcmp(argv[i], "--help") == 0) {
                 help();
                 return 0;
             }
         }
     }
-    
+
     StreamingPlayer *sample_player = new StreamingPlayer(sensor_type, video_width, video_height, session_num);
     if (!sample_player) {
         std::cout << "StreamingPlayer Init failed." << std::endl;
@@ -83,14 +88,15 @@ int main(int argc, char *argv[]) {
         session_attr.video_width = video_width;
         session_attr.video_height = video_height;
         session_attr.session_name = session_name.append(std::to_string(i));
+        session_attr.auido_mono_channel_type = audio_input_type;
 
         ret = sample_player->CreateSession(session_attr);
         if (ret < 0) {
             std::cout << "CreateSession failed." << std::endl;
             goto end;
         }
     }
-    
+
     sample_player->Start();
 
     while (!g_exit_flag) {

diff --git a/src/common/cdk/user/samples/rtsp_demo/src/streaming_player.cpp b/src/common/cdk/user/samples/rtsp_demo/src/streaming_player.cpp
@@ -180,7 +180,7 @@ int StreamingPlayer::CreateSession(const SessionAttr &session_attr) {
     ServerMediaSession *sms = ServerMediaSession::createNew(*env_, streamName.c_str(), streamName.c_str(), descriptionString);
 
     if (!audio_created_) {
-        int ret = CreateAudioEncode();
+        int ret = CreateAudioEncode(session_attr);
         if (ret < 0) {
             std::cout << "create audio encode failed." << std::endl;
             return -1;
@@ -296,7 +296,7 @@ int StreamingPlayer::CreateVideoEncode(const SessionAttr &session_attr) {
     return 0;
 }
 
-int StreamingPlayer::CreateAudioEncode() {
+int StreamingPlayer::CreateAudioEncode(const SessionAttr &session_attr) {
     k_aio_dev_attr aio_dev_attr;
     memset(&aio_dev_attr, 0, sizeof(aio_dev_attr));
     aio_dev_attr.audio_type = KD_AUDIO_INPUT_TYPE_I2S;
@@ -305,6 +305,7 @@ int StreamingPlayer::CreateAudioEncode() {
     aio_dev_attr.kd_audio_attr.i2s_attr.chn_cnt = 2;
     aio_dev_attr.kd_audio_attr.i2s_attr.i2s_mode = K_STANDARD_MODE;
     aio_dev_attr.kd_audio_attr.i2s_attr.snd_mode = KD_AUDIO_SOUND_MODE_MONO;
+    aio_dev_attr.kd_audio_attr.i2s_attr.mono_channel =  session_attr.auido_mono_channel_type;
     aio_dev_attr.kd_audio_attr.i2s_attr.frame_num = AUDIO_PERSEC_DIV_NUM;
     aio_dev_attr.kd_audio_attr.i2s_attr.point_num_per_frame = audio_sample_rate_ / aio_dev_attr.kd_audio_attr.i2s_attr.frame_num;
     aio_dev_attr.kd_audio_attr.i2s_attr.i2s_type = K_AIO_I2STYPE_INNERCODEC;

diff --git a/src/reference/ai_poc/version b/src/reference/ai_poc/version
@@ -1 +1 @@
-v1.0.2
+v1.1
diff --git a/src/reference/fancy_poc/version b/src/reference/fancy_poc/version
@@ -1 +1 @@
-v1.0.2
+v1.1