From c2e4e3c2e9be855277d9f4fa9cd0544892ff829a Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期三, 30 八月 2023 09:57:30 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR add

---
 funasr/runtime/docs/websocket_protocol_zh.md |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/funasr/runtime/docs/websocket_protocol_zh.md b/funasr/runtime/docs/websocket_protocol_zh.md
index 156c010..b5fa016 100644
--- a/funasr/runtime/docs/websocket_protocol_zh.md
+++ b/funasr/runtime/docs/websocket_protocol_zh.md
@@ -1,4 +1,8 @@
+(绠�浣撲腑鏂噟[English](./websocket_protocol.md))
 # websocket/grpc閫氫俊鍗忚
+
+鏈崗璁负FunASR杞欢鍖呴�氫俊鍗忚锛屽垎涓虹绾挎枃浠惰浆鍐欙紙[閮ㄧ讲鏂囨。](./SDK_tutorial_zh.md)锛夛紝瀹炴椂璇煶璇嗗埆锛圼閮ㄧ讲鏂囨。](./SDK_tutorial_online_zh.md)锛�
+
 ## 绂荤嚎鏂囦欢杞啓
 ### 浠庡鎴风寰�鏈嶅姟绔彂閫佹暟鎹�
 #### 娑堟伅鏍煎紡
@@ -6,7 +10,7 @@
 #### 棣栨閫氫俊
 message涓猴紙闇�瑕佺敤json搴忓垪鍖栵級锛�
 ```text
-{"mode": "offline", "wav_name": "wav_name", "is_speaking": True,"wav_format":"pcm"}
+{"mode": "offline", "wav_name": "wav_name","wav_format":"pcm","is_speaking": True,"wav_format":"pcm","hotwords":"闃块噷宸村反 杈炬懇闄� 闃块噷浜�"}
 ```
 鍙傛暟浠嬬粛锛�
 ```text
@@ -15,6 +19,7 @@
 `wav_format`锛氳〃绀洪煶瑙嗛鏂囦欢鍚庣紑鍚嶏紝鍙�塸cm銆乵p3銆乵p4绛�
 `is_speaking`锛欶alse 琛ㄧず鏂彞灏剧偣锛屼緥濡傦紝vad鍒囧壊鐐癸紝鎴栬�呬竴鏉av缁撴潫
 `audio_fs`锛氬綋杈撳叆闊抽涓簆cm鏁版嵁鏄紝闇�瑕佸姞涓婇煶棰戦噰鏍风巼鍙傛暟
+`hotwords`锛氬鏋淎M涓虹儹璇嶆ā鍨嬶紝闇�瑕佸悜鏈嶅姟绔彂閫佺儹璇嶆暟鎹紝鏍煎紡涓哄瓧绗︿覆锛岀儹璇嶄箣闂寸敤" "鍒嗛殧锛屼緥濡� "闃块噷宸村反 杈炬懇闄� 闃块噷浜�"
 ```
 
 #### 鍙戦�侀煶棰戞暟鎹�
@@ -30,7 +35,7 @@
 #### 鍙戦�佽瘑鍒粨鏋�
 message涓猴紙閲囩敤json搴忓垪鍖栵級
 ```text
-{"mode": "offline", "wav_name": "wav_name", "text": "asr ouputs", "is_final": True}
+{"mode": "offline", "wav_name": "wav_name", "text": "asr ouputs", "is_final": True,"timestamp":"[[100,200], [200,500]]"}
 ```
 鍙傛暟浠嬬粛锛�
 ```text
@@ -38,12 +43,13 @@
 `wav_name`锛氳〃绀洪渶瑕佹帹鐞嗛煶棰戞枃浠跺悕
 `text`锛氳〃绀鸿闊宠瘑鍒緭鍑烘枃鏈�
 `is_final`锛氳〃绀鸿瘑鍒粨鏉�
+`timestamp`锛氬鏋淎M涓烘椂闂存埑妯″瀷锛屼細杩斿洖姝ゅ瓧娈碉紝琛ㄧず鏃堕棿鎴筹紝鏍煎紡涓� "[[100,200], [200,500]]"(ms)
 ```
 
 ## 瀹炴椂璇煶璇嗗埆
 ### 绯荤粺鏋舵瀯鍥�
 
-<div align="left"><img src="images/2pass.jpg" width="400"/></div>
+<div align="left"><img src="images/2pass.jpg" width="600"/></div>
 
 ### 浠庡鎴风寰�鏈嶅姟绔彂閫佹暟鎹�
 #### 娑堟伅鏍煎紡
@@ -52,7 +58,7 @@
 #### 棣栨閫氫俊
 message涓猴紙闇�瑕佺敤json搴忓垪鍖栵級锛�
 ```text
-{"mode": "2pass", "wav_name": "wav_name", "is_speaking": True, "wav_format":"pcm", "chunk_size":[5,10,5]
+{"mode": "2pass", "wav_name": "wav_name", "is_speaking": True, "wav_format":"pcm", "chunk_size":[5,10,5]}
 ```
 鍙傛暟浠嬬粛锛�
 ```text
@@ -64,7 +70,7 @@
 `audio_fs`锛氬綋杈撳叆闊抽涓簆cm鏁版嵁鏄紝闇�瑕佸姞涓婇煶棰戦噰鏍风巼鍙傛暟
 ```
 #### 鍙戦�侀煶棰戞暟鎹�
-鐩存帴灏嗛煶棰戞暟鎹紝绉婚櫎澶撮儴淇℃伅鍚庣殑bytes鏁版嵁鍙戦�侊紝鏀寔闊抽閲囨牱鐜囦负8000锛堥渶瑕佹寚瀹歚audio_fs`涓�8000锛夛紝16000
+鐩存帴灏嗛煶棰戞暟鎹紝绉婚櫎澶撮儴淇℃伅鍚庣殑bytes鏁版嵁鍙戦�侊紝鏀寔闊抽閲囨牱鐜囦负8000锛坄message`涓渶瑕佹寚瀹歚audio_fs`涓�8000锛夛紝16000
 #### 鍙戦�佺粨鏉熸爣蹇�
 闊抽鏁版嵁鍙戦�佺粨鏉熷悗锛岄渶瑕佸彂閫佺粨鏉熸爣蹇楋紙闇�瑕佺敤json搴忓垪鍖栵級锛�
 ```text
@@ -82,4 +88,4 @@
 `wav_name`锛氳〃绀洪渶瑕佹帹鐞嗛煶棰戞枃浠跺悕
 `text`锛氳〃绀鸿闊宠瘑鍒緭鍑烘枃鏈�
 `is_final`锛氳〃绀鸿瘑鍒粨鏉�
-```
\ No newline at end of file
+```

--
Gitblit v1.9.1