Merge branch 'master' of https://github.com/AirenSoft/OvenMediaEngine

AirenSoft · Feb 21, 2025 · acf12c1 · acf12c1
2 parents c4e94f9 + ae48818
commit acf12c1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/docs/rest-api/v1/virtualhost/application/scheduledchannel-api.md b/docs/rest-api/v1/virtualhost/application/scheduledchannel-api.md
@@ -1,4 +1,4 @@
-# ScheduledChannel API
+# ScheduledChannel
 
 ScheduledChannel allows you to create a live channel by scheduling pre-recorded files has been added to OvenMediaEngine. Other services or software call this Pre-recorded Live or File Live, but OvenMediaEngine plans to expand the function to organize live channels as a source, so we named it Scheduled Channel.
 
@@ -142,7 +142,24 @@ Content-Type: application/json
         "name": "stream2",
         "bypassTranscoder": false,
         "videoTrack": true,
-        "audioTrack": true
+        "audioTrack": true,
+        "audioMap": [ // Optional
+            {
+                "name": "english",
+                "language": "en",
+                "characteristics": "1"
+            },
+            {
+                "name": "Korean",
+                "language": "ko",
+                "characteristics": "2"
+            },
+            {
+                "name": "Japanese",
+                "language": "ja",
+                "characteristics": "3"
+            }
+        ]
     },
     "fallbackProgram": {
         "items": [

diff --git a/docs/streaming/srt.md b/docs/streaming/srt.md
@@ -84,6 +84,12 @@ If you want to test SRT with FFplay, FFmpeg, or FFprobe, simply enter the SRT UR
 $ ffplay "srt://192.168.0.160:9998?streamid=default/app/stream/playlist"
 ```
 
+If you have multiple audio tracks, you can choose one with `-ast` parameter
+
+```
+$ ffplay "srt://192.168.0.160:9998?streamid=default/app/stream/playlist" -ast 1
+```
+
 <figure><img src="../.gitbook/assets/{BEF5152C-6311-4A4E-A715-22FDB1DDC9C3}.png" alt=""><figcaption></figcaption></figure>
 
 ### OBS Studio

diff --git a/src/projects/main/main.h b/src/projects/main/main.h
@@ -14,9 +14,9 @@
 // Major changes
 #define OME_VERSION_MAJOR               0
 // Minor changes
-#define OME_VERSION_MINOR               17
+#define OME_VERSION_MINOR               18
 // Micro changes
-#define OME_VERSION_MICRO               3
+#define OME_VERSION_MICRO               0
 
 #define OME_STR_INTERNAL(x)             # x
 #define OME_STR(x)                      OME_STR_INTERNAL(x)