diff --git a/rootfs/link/bin/Encoder b/rootfs/link/bin/Encoder index 0f0fe97..a13cf0a 100644 Binary files a/rootfs/link/bin/Encoder and b/rootfs/link/bin/Encoder differ diff --git a/rootfs/link/config/config.json b/rootfs/link/config/config.json index c84331a..66badc3 100644 --- a/rootfs/link/config/config.json +++ b/rootfs/link/config/config.json @@ -19,7 +19,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -35,7 +37,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 0, @@ -76,7 +80,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main0" + "path": "rtmp://127.0.0.1/live/test_main0", + "flvflags": "" }, "suffix": "stream0" }, @@ -111,7 +116,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub0" + "path": "rtmp://127.0.0.1/live/test_sub0", + "flvflags": "" }, "suffix": "sub0" }, @@ -167,7 +173,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -183,7 +191,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 1, @@ -224,7 +234,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main1" + "path": "rtmp://127.0.0.1/live/test_main1", + "flvflags": "" }, "suffix": "stream1" }, @@ -259,7 +270,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub1" + "path": "rtmp://127.0.0.1/live/test_sub1", + "flvflags": "" }, "suffix": "sub1" }, @@ -306,7 +318,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -322,7 +336,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 2, @@ -363,7 +379,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main2" + "path": "rtmp://127.0.0.1/live/test_main2", + "flvflags": "" }, "suffix": "stream2" }, @@ -398,7 +415,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub2" + "path": "rtmp://127.0.0.1/live/test_sub2", + "flvflags": "" }, "suffix": "sub2" }, @@ -451,7 +469,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -467,7 +487,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 3, @@ -508,7 +530,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main3" + "path": "rtmp://127.0.0.1/live/test_main3", + "flvflags": "" }, "suffix": "stream3" }, @@ -543,7 +566,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub3" + "path": "rtmp://127.0.0.1/live/test_sub3", + "flvflags": "" }, "suffix": "sub3" }, @@ -613,7 +637,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main4" + "path": "rtmp://127.0.0.1/live/test_main4", + "flvflags": "" }, "suffix": "stream4" }, @@ -648,7 +673,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub4" + "path": "rtmp://127.0.0.1/live/test_sub4", + "flvflags": "" }, "suffix": "sub4" }, @@ -695,7 +721,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -711,7 +739,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 5, @@ -752,7 +782,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main5" + "path": "rtmp://127.0.0.1/live/test_main5", + "flvflags": "" }, "suffix": "stream5" }, @@ -787,7 +818,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub5" + "path": "rtmp://127.0.0.1/live/test_sub5", + "flvflags": "" }, "suffix": "sub5" }, @@ -834,7 +866,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -850,7 +884,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 6, @@ -891,7 +927,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main6" + "path": "rtmp://127.0.0.1/live/test_main6", + "flvflags": "" }, "suffix": "stream6" }, @@ -926,7 +963,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub6" + "path": "rtmp://127.0.0.1/live/test_sub6", + "flvflags": "" }, "suffix": "sub6" }, @@ -998,7 +1036,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1014,7 +1054,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 7, @@ -1055,7 +1097,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main7" + "path": "rtmp://127.0.0.1/live/test_main7", + "flvflags": "" }, "suffix": "stream7" }, @@ -1090,7 +1133,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub7" + "path": "rtmp://127.0.0.1/live/test_sub7", + "flvflags": "" }, "suffix": "sub7" }, diff --git a/rootfs/link/config/default/config.json b/rootfs/link/config/default/config.json index c84331a..66badc3 100644 --- a/rootfs/link/config/default/config.json +++ b/rootfs/link/config/default/config.json @@ -19,7 +19,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -35,7 +37,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 0, @@ -76,7 +80,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main0" + "path": "rtmp://127.0.0.1/live/test_main0", + "flvflags": "" }, "suffix": "stream0" }, @@ -111,7 +116,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub0" + "path": "rtmp://127.0.0.1/live/test_sub0", + "flvflags": "" }, "suffix": "sub0" }, @@ -167,7 +173,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -183,7 +191,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 1, @@ -224,7 +234,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main1" + "path": "rtmp://127.0.0.1/live/test_main1", + "flvflags": "" }, "suffix": "stream1" }, @@ -259,7 +270,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub1" + "path": "rtmp://127.0.0.1/live/test_sub1", + "flvflags": "" }, "suffix": "sub1" }, @@ -306,7 +318,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -322,7 +336,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 2, @@ -363,7 +379,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main2" + "path": "rtmp://127.0.0.1/live/test_main2", + "flvflags": "" }, "suffix": "stream2" }, @@ -398,7 +415,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub2" + "path": "rtmp://127.0.0.1/live/test_sub2", + "flvflags": "" }, "suffix": "sub2" }, @@ -451,7 +469,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -467,7 +487,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 3, @@ -508,7 +530,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main3" + "path": "rtmp://127.0.0.1/live/test_main3", + "flvflags": "" }, "suffix": "stream3" }, @@ -543,7 +566,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub3" + "path": "rtmp://127.0.0.1/live/test_sub3", + "flvflags": "" }, "suffix": "sub3" }, @@ -613,7 +637,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main4" + "path": "rtmp://127.0.0.1/live/test_main4", + "flvflags": "" }, "suffix": "stream4" }, @@ -648,7 +673,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub4" + "path": "rtmp://127.0.0.1/live/test_sub4", + "flvflags": "" }, "suffix": "sub4" }, @@ -695,7 +721,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -711,7 +739,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 5, @@ -752,7 +782,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main5" + "path": "rtmp://127.0.0.1/live/test_main5", + "flvflags": "" }, "suffix": "stream5" }, @@ -787,7 +818,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub5" + "path": "rtmp://127.0.0.1/live/test_sub5", + "flvflags": "" }, "suffix": "sub5" }, @@ -834,7 +866,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -850,7 +884,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 6, @@ -891,7 +927,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main6" + "path": "rtmp://127.0.0.1/live/test_main6", + "flvflags": "" }, "suffix": "stream6" }, @@ -926,7 +963,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub6" + "path": "rtmp://127.0.0.1/live/test_sub6", + "flvflags": "" }, "suffix": "sub6" }, @@ -998,7 +1036,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1014,7 +1054,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 7, @@ -1055,7 +1097,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main7" + "path": "rtmp://127.0.0.1/live/test_main7", + "flvflags": "" }, "suffix": "stream7" }, @@ -1090,7 +1133,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub7" + "path": "rtmp://127.0.0.1/live/test_sub7", + "flvflags": "" }, "suffix": "sub7" }, diff --git a/rootfs/link/config/push.json b/rootfs/link/config/push.json index 9df61d5..ca98ec8 100644 --- a/rootfs/link/config/push.json +++ b/rootfs/link/config/push.json @@ -7,22 +7,26 @@ { "des": "platform 1", "enable": true, - "path": "rtmp://127.0.0.1/live/push1" + "path": "rtmp://127.0.0.1/live/push1", + "flvflags": "" }, { "des": "platform 2", "enable": false, - "path": "rtmp://127.0.0.1/live/push2" + "path": "rtmp://127.0.0.1/live/push2", + "flvflags": "" }, { "des": "platform 3", "enable": false, - "path": "rtmp://127.0.0.1/live/push3" + "path": "rtmp://127.0.0.1/live/push3", + "flvflags": "" }, { "des": "platform 4", "enable": false, - "path": "rtmp://127.0.0.1/live/push4" + "path": "rtmp://127.0.0.1/live/push4", + "flvflags": "" } ] } diff --git a/rootfs/link/config/verLogs.json b/rootfs/link/config/verLogs.json index a7fb07c..8f9a901 100644 --- a/rootfs/link/config/verLogs.json +++ b/rootfs/link/config/verLogs.json @@ -1,4 +1,14 @@ [ + { + "version": "2.7.0 build 20231031", + "logs": [ + "编码设置页面新增帧同步设置", + "多平台直播页面，新增推流兼容性设置，兼容向youtube推流", + "优化NTP同步功能", + "优化纯音频网络流编码逻辑", + "系统底层优化" + ] + }, { "version": "2.6.0 build 20230928", "logs": [ @@ -10,7 +20,7 @@ ] }, { - "version": "2.5.0 build 20230927", + "version": "2.5.0 build 20230831", "logs": [ "修正http接口获取/设置水印异常问题", "修正srt输出，latency参数值不能大于1000的问题", diff --git a/rootfs/link/config/version.json b/rootfs/link/config/version.json index e869b23..f29c72d 100644 --- a/rootfs/link/config/version.json +++ b/rootfs/link/config/version.json @@ -1,5 +1,5 @@ { "app": "2.0.0 build 20220512_869", "sdk": "2.0.0 build 20220518_20716", - "sys": "2.6.0 build 20230928" + "sys": "2.7.0 build 20231031" } diff --git a/rootfs/link/fac/EX2/config/config.json b/rootfs/link/fac/EX2/config/config.json index c84331a..66badc3 100644 --- a/rootfs/link/fac/EX2/config/config.json +++ b/rootfs/link/fac/EX2/config/config.json @@ -19,7 +19,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -35,7 +37,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 0, @@ -76,7 +80,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main0" + "path": "rtmp://127.0.0.1/live/test_main0", + "flvflags": "" }, "suffix": "stream0" }, @@ -111,7 +116,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub0" + "path": "rtmp://127.0.0.1/live/test_sub0", + "flvflags": "" }, "suffix": "sub0" }, @@ -167,7 +173,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -183,7 +191,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 1, @@ -224,7 +234,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main1" + "path": "rtmp://127.0.0.1/live/test_main1", + "flvflags": "" }, "suffix": "stream1" }, @@ -259,7 +270,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub1" + "path": "rtmp://127.0.0.1/live/test_sub1", + "flvflags": "" }, "suffix": "sub1" }, @@ -306,7 +318,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -322,7 +336,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 2, @@ -363,7 +379,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main2" + "path": "rtmp://127.0.0.1/live/test_main2", + "flvflags": "" }, "suffix": "stream2" }, @@ -398,7 +415,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub2" + "path": "rtmp://127.0.0.1/live/test_sub2", + "flvflags": "" }, "suffix": "sub2" }, @@ -451,7 +469,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -467,7 +487,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 3, @@ -508,7 +530,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main3" + "path": "rtmp://127.0.0.1/live/test_main3", + "flvflags": "" }, "suffix": "stream3" }, @@ -543,7 +566,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub3" + "path": "rtmp://127.0.0.1/live/test_sub3", + "flvflags": "" }, "suffix": "sub3" }, @@ -613,7 +637,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main4" + "path": "rtmp://127.0.0.1/live/test_main4", + "flvflags": "" }, "suffix": "stream4" }, @@ -648,7 +673,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub4" + "path": "rtmp://127.0.0.1/live/test_sub4", + "flvflags": "" }, "suffix": "sub4" }, @@ -695,7 +721,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -711,7 +739,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 5, @@ -752,7 +782,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main5" + "path": "rtmp://127.0.0.1/live/test_main5", + "flvflags": "" }, "suffix": "stream5" }, @@ -787,7 +818,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub5" + "path": "rtmp://127.0.0.1/live/test_sub5", + "flvflags": "" }, "suffix": "sub5" }, @@ -834,7 +866,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -850,7 +884,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 6, @@ -891,7 +927,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main6" + "path": "rtmp://127.0.0.1/live/test_main6", + "flvflags": "" }, "suffix": "stream6" }, @@ -926,7 +963,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub6" + "path": "rtmp://127.0.0.1/live/test_sub6", + "flvflags": "" }, "suffix": "sub6" }, @@ -998,7 +1036,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1014,7 +1054,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 7, @@ -1055,7 +1097,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main7" + "path": "rtmp://127.0.0.1/live/test_main7", + "flvflags": "" }, "suffix": "stream7" }, @@ -1090,7 +1133,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub7" + "path": "rtmp://127.0.0.1/live/test_sub7", + "flvflags": "" }, "suffix": "sub7" }, diff --git a/rootfs/link/fac/EX2/config/default/config.json b/rootfs/link/fac/EX2/config/default/config.json index c84331a..66badc3 100644 --- a/rootfs/link/fac/EX2/config/default/config.json +++ b/rootfs/link/fac/EX2/config/default/config.json @@ -19,7 +19,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -35,7 +37,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 0, @@ -76,7 +80,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main0" + "path": "rtmp://127.0.0.1/live/test_main0", + "flvflags": "" }, "suffix": "stream0" }, @@ -111,7 +116,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub0" + "path": "rtmp://127.0.0.1/live/test_sub0", + "flvflags": "" }, "suffix": "sub0" }, @@ -167,7 +173,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -183,7 +191,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 1, @@ -224,7 +234,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main1" + "path": "rtmp://127.0.0.1/live/test_main1", + "flvflags": "" }, "suffix": "stream1" }, @@ -259,7 +270,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub1" + "path": "rtmp://127.0.0.1/live/test_sub1", + "flvflags": "" }, "suffix": "sub1" }, @@ -306,7 +318,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -322,7 +336,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 2, @@ -363,7 +379,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main2" + "path": "rtmp://127.0.0.1/live/test_main2", + "flvflags": "" }, "suffix": "stream2" }, @@ -398,7 +415,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub2" + "path": "rtmp://127.0.0.1/live/test_sub2", + "flvflags": "" }, "suffix": "sub2" }, @@ -451,7 +469,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -467,7 +487,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 3, @@ -508,7 +530,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main3" + "path": "rtmp://127.0.0.1/live/test_main3", + "flvflags": "" }, "suffix": "stream3" }, @@ -543,7 +566,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub3" + "path": "rtmp://127.0.0.1/live/test_sub3", + "flvflags": "" }, "suffix": "sub3" }, @@ -613,7 +637,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main4" + "path": "rtmp://127.0.0.1/live/test_main4", + "flvflags": "" }, "suffix": "stream4" }, @@ -648,7 +673,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub4" + "path": "rtmp://127.0.0.1/live/test_sub4", + "flvflags": "" }, "suffix": "sub4" }, @@ -695,7 +721,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -711,7 +739,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 5, @@ -752,7 +782,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main5" + "path": "rtmp://127.0.0.1/live/test_main5", + "flvflags": "" }, "suffix": "stream5" }, @@ -787,7 +818,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub5" + "path": "rtmp://127.0.0.1/live/test_sub5", + "flvflags": "" }, "suffix": "sub5" }, @@ -834,7 +866,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -850,7 +884,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 6, @@ -891,7 +927,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main6" + "path": "rtmp://127.0.0.1/live/test_main6", + "flvflags": "" }, "suffix": "stream6" }, @@ -926,7 +963,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub6" + "path": "rtmp://127.0.0.1/live/test_sub6", + "flvflags": "" }, "suffix": "sub6" }, @@ -998,7 +1036,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1014,7 +1054,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 7, @@ -1055,7 +1097,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main7" + "path": "rtmp://127.0.0.1/live/test_main7", + "flvflags": "" }, "suffix": "stream7" }, @@ -1090,7 +1133,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub7" + "path": "rtmp://127.0.0.1/live/test_sub7", + "flvflags": "" }, "suffix": "sub7" }, diff --git a/rootfs/link/fac/SH/config/config.json b/rootfs/link/fac/SH/config/config.json index aecf3c3..48694bf 100644 --- a/rootfs/link/fac/SH/config/config.json +++ b/rootfs/link/fac/SH/config/config.json @@ -19,7 +19,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -35,7 +37,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 0, @@ -76,7 +80,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main0" + "path": "rtmp://127.0.0.1/live/test_main0", + "flvflags": "" }, "suffix": "stream0" }, @@ -111,7 +116,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub0" + "path": "rtmp://127.0.0.1/live/test_sub0", + "flvflags": "" }, "suffix": "sub0" }, @@ -167,7 +173,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -183,7 +191,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 1, @@ -224,7 +234,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main1" + "path": "rtmp://127.0.0.1/live/test_main1", + "flvflags": "" }, "suffix": "stream1" }, @@ -259,7 +270,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub1" + "path": "rtmp://127.0.0.1/live/test_sub1", + "flvflags": "" }, "suffix": "sub1" }, @@ -315,7 +327,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -331,7 +345,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 2, @@ -372,7 +388,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main2" + "path": "rtmp://127.0.0.1/live/test_main2", + "flvflags": "" }, "suffix": "stream2" }, @@ -407,7 +424,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub2" + "path": "rtmp://127.0.0.1/live/test_sub2", + "flvflags": "" }, "suffix": "sub2" }, @@ -454,7 +472,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -470,7 +490,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 3, @@ -511,7 +533,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main3" + "path": "rtmp://127.0.0.1/live/test_main3", + "flvflags": "" }, "suffix": "stream3" }, @@ -546,7 +569,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub3" + "path": "rtmp://127.0.0.1/live/test_sub3", + "flvflags": "" }, "suffix": "sub3" }, @@ -599,7 +623,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -615,7 +641,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 4, @@ -656,7 +684,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main4" + "path": "rtmp://127.0.0.1/live/test_main4", + "flvflags": "" }, "suffix": "stream4" }, @@ -691,7 +720,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub4" + "path": "rtmp://127.0.0.1/live/test_sub4", + "flvflags": "" }, "suffix": "sub4" }, @@ -744,7 +774,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -760,7 +792,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 5, @@ -801,7 +835,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main5" + "path": "rtmp://127.0.0.1/live/test_main5", + "flvflags": "" }, "suffix": "stream5" }, @@ -836,7 +871,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub5" + "path": "rtmp://127.0.0.1/live/test_sub5", + "flvflags": "" }, "suffix": "sub5" }, @@ -889,7 +925,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -905,7 +943,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 6, @@ -946,7 +986,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main6" + "path": "rtmp://127.0.0.1/live/test_main6", + "flvflags": "" }, "suffix": "stream6" }, @@ -981,7 +1022,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub6" + "path": "rtmp://127.0.0.1/live/test_sub6", + "flvflags": "" }, "suffix": "sub6" }, @@ -1051,7 +1093,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main7" + "path": "rtmp://127.0.0.1/live/test_main7", + "flvflags": "" }, "suffix": "stream7" }, @@ -1086,7 +1129,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub7" + "path": "rtmp://127.0.0.1/live/test_sub7", + "flvflags": "" }, "suffix": "sub7" }, @@ -1133,7 +1177,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1149,7 +1195,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 8, @@ -1190,7 +1238,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main8" + "path": "rtmp://127.0.0.1/live/test_main8", + "flvflags": "" }, "suffix": "stream8" }, @@ -1225,7 +1274,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub8" + "path": "rtmp://127.0.0.1/live/test_sub8", + "flvflags": "" }, "suffix": "sub8" }, @@ -1272,7 +1322,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1288,7 +1340,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 9, @@ -1329,7 +1383,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main9" + "path": "rtmp://127.0.0.1/live/test_main9", + "flvflags": "" }, "suffix": "stream9" }, @@ -1364,7 +1419,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub9" + "path": "rtmp://127.0.0.1/live/test_sub9", + "flvflags": "" }, "suffix": "sub9" }, @@ -1436,7 +1492,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1452,7 +1510,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 10, @@ -1493,7 +1553,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main10" + "path": "rtmp://127.0.0.1/live/test_main10", + "flvflags": "" }, "suffix": "stream10" }, @@ -1528,7 +1589,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub10" + "path": "rtmp://127.0.0.1/live/test_sub10", + "flvflags": "" }, "suffix": "sub10" }, diff --git a/rootfs/link/fac/SH/config/default/config.json b/rootfs/link/fac/SH/config/default/config.json index aecf3c3..48694bf 100644 --- a/rootfs/link/fac/SH/config/default/config.json +++ b/rootfs/link/fac/SH/config/default/config.json @@ -19,7 +19,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -35,7 +37,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 0, @@ -76,7 +80,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main0" + "path": "rtmp://127.0.0.1/live/test_main0", + "flvflags": "" }, "suffix": "stream0" }, @@ -111,7 +116,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub0" + "path": "rtmp://127.0.0.1/live/test_sub0", + "flvflags": "" }, "suffix": "sub0" }, @@ -167,7 +173,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -183,7 +191,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 1, @@ -224,7 +234,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main1" + "path": "rtmp://127.0.0.1/live/test_main1", + "flvflags": "" }, "suffix": "stream1" }, @@ -259,7 +270,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub1" + "path": "rtmp://127.0.0.1/live/test_sub1", + "flvflags": "" }, "suffix": "sub1" }, @@ -315,7 +327,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -331,7 +345,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 2, @@ -372,7 +388,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main2" + "path": "rtmp://127.0.0.1/live/test_main2", + "flvflags": "" }, "suffix": "stream2" }, @@ -407,7 +424,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub2" + "path": "rtmp://127.0.0.1/live/test_sub2", + "flvflags": "" }, "suffix": "sub2" }, @@ -454,7 +472,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -470,7 +490,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 3, @@ -511,7 +533,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main3" + "path": "rtmp://127.0.0.1/live/test_main3", + "flvflags": "" }, "suffix": "stream3" }, @@ -546,7 +569,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub3" + "path": "rtmp://127.0.0.1/live/test_sub3", + "flvflags": "" }, "suffix": "sub3" }, @@ -599,7 +623,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -615,7 +641,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 4, @@ -656,7 +684,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main4" + "path": "rtmp://127.0.0.1/live/test_main4", + "flvflags": "" }, "suffix": "stream4" }, @@ -691,7 +720,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub4" + "path": "rtmp://127.0.0.1/live/test_sub4", + "flvflags": "" }, "suffix": "sub4" }, @@ -744,7 +774,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -760,7 +792,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 5, @@ -801,7 +835,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main5" + "path": "rtmp://127.0.0.1/live/test_main5", + "flvflags": "" }, "suffix": "stream5" }, @@ -836,7 +871,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub5" + "path": "rtmp://127.0.0.1/live/test_sub5", + "flvflags": "" }, "suffix": "sub5" }, @@ -889,7 +925,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -905,7 +943,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 6, @@ -946,7 +986,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main6" + "path": "rtmp://127.0.0.1/live/test_main6", + "flvflags": "" }, "suffix": "stream6" }, @@ -981,7 +1022,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub6" + "path": "rtmp://127.0.0.1/live/test_sub6", + "flvflags": "" }, "suffix": "sub6" }, @@ -1051,7 +1093,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main7" + "path": "rtmp://127.0.0.1/live/test_main7", + "flvflags": "" }, "suffix": "stream7" }, @@ -1086,7 +1129,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub7" + "path": "rtmp://127.0.0.1/live/test_sub7", + "flvflags": "" }, "suffix": "sub7" }, @@ -1133,7 +1177,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1149,7 +1195,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 8, @@ -1190,7 +1238,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main8" + "path": "rtmp://127.0.0.1/live/test_main8", + "flvflags": "" }, "suffix": "stream8" }, @@ -1225,7 +1274,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub8" + "path": "rtmp://127.0.0.1/live/test_sub8", + "flvflags": "" }, "suffix": "sub8" }, @@ -1272,7 +1322,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1288,7 +1340,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 9, @@ -1329,7 +1383,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main9" + "path": "rtmp://127.0.0.1/live/test_main9", + "flvflags": "" }, "suffix": "stream9" }, @@ -1364,7 +1419,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub9" + "path": "rtmp://127.0.0.1/live/test_sub9", + "flvflags": "" }, "suffix": "sub9" }, @@ -1436,7 +1492,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1452,7 +1510,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 10, @@ -1493,7 +1553,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main10" + "path": "rtmp://127.0.0.1/live/test_main10", + "flvflags": "" }, "suffix": "stream10" }, @@ -1528,7 +1589,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub10" + "path": "rtmp://127.0.0.1/live/test_sub10", + "flvflags": "" }, "suffix": "sub10" }, diff --git a/rootfs/link/fac/V2/config/config.json b/rootfs/link/fac/V2/config/config.json index c84331a..66badc3 100644 --- a/rootfs/link/fac/V2/config/config.json +++ b/rootfs/link/fac/V2/config/config.json @@ -19,7 +19,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -35,7 +37,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 0, @@ -76,7 +80,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main0" + "path": "rtmp://127.0.0.1/live/test_main0", + "flvflags": "" }, "suffix": "stream0" }, @@ -111,7 +116,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub0" + "path": "rtmp://127.0.0.1/live/test_sub0", + "flvflags": "" }, "suffix": "sub0" }, @@ -167,7 +173,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -183,7 +191,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 1, @@ -224,7 +234,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main1" + "path": "rtmp://127.0.0.1/live/test_main1", + "flvflags": "" }, "suffix": "stream1" }, @@ -259,7 +270,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub1" + "path": "rtmp://127.0.0.1/live/test_sub1", + "flvflags": "" }, "suffix": "sub1" }, @@ -306,7 +318,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -322,7 +336,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 2, @@ -363,7 +379,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main2" + "path": "rtmp://127.0.0.1/live/test_main2", + "flvflags": "" }, "suffix": "stream2" }, @@ -398,7 +415,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub2" + "path": "rtmp://127.0.0.1/live/test_sub2", + "flvflags": "" }, "suffix": "sub2" }, @@ -451,7 +469,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -467,7 +487,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 3, @@ -508,7 +530,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main3" + "path": "rtmp://127.0.0.1/live/test_main3", + "flvflags": "" }, "suffix": "stream3" }, @@ -543,7 +566,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub3" + "path": "rtmp://127.0.0.1/live/test_sub3", + "flvflags": "" }, "suffix": "sub3" }, @@ -613,7 +637,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main4" + "path": "rtmp://127.0.0.1/live/test_main4", + "flvflags": "" }, "suffix": "stream4" }, @@ -648,7 +673,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub4" + "path": "rtmp://127.0.0.1/live/test_sub4", + "flvflags": "" }, "suffix": "sub4" }, @@ -695,7 +721,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -711,7 +739,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 5, @@ -752,7 +782,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main5" + "path": "rtmp://127.0.0.1/live/test_main5", + "flvflags": "" }, "suffix": "stream5" }, @@ -787,7 +818,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub5" + "path": "rtmp://127.0.0.1/live/test_sub5", + "flvflags": "" }, "suffix": "sub5" }, @@ -834,7 +866,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -850,7 +884,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 6, @@ -891,7 +927,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main6" + "path": "rtmp://127.0.0.1/live/test_main6", + "flvflags": "" }, "suffix": "stream6" }, @@ -926,7 +963,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub6" + "path": "rtmp://127.0.0.1/live/test_sub6", + "flvflags": "" }, "suffix": "sub6" }, @@ -998,7 +1036,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1014,7 +1054,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 7, @@ -1055,7 +1097,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main7" + "path": "rtmp://127.0.0.1/live/test_main7", + "flvflags": "" }, "suffix": "stream7" }, @@ -1090,7 +1133,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub7" + "path": "rtmp://127.0.0.1/live/test_sub7", + "flvflags": "" }, "suffix": "sub7" }, diff --git a/rootfs/link/fac/V2/config/default/config.json b/rootfs/link/fac/V2/config/default/config.json index c84331a..66badc3 100644 --- a/rootfs/link/fac/V2/config/default/config.json +++ b/rootfs/link/fac/V2/config/default/config.json @@ -19,7 +19,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -35,7 +37,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 0, @@ -76,7 +80,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main0" + "path": "rtmp://127.0.0.1/live/test_main0", + "flvflags": "" }, "suffix": "stream0" }, @@ -111,7 +116,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub0" + "path": "rtmp://127.0.0.1/live/test_sub0", + "flvflags": "" }, "suffix": "sub0" }, @@ -167,7 +173,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -183,7 +191,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 1, @@ -224,7 +234,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main1" + "path": "rtmp://127.0.0.1/live/test_main1", + "flvflags": "" }, "suffix": "stream1" }, @@ -259,7 +270,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub1" + "path": "rtmp://127.0.0.1/live/test_sub1", + "flvflags": "" }, "suffix": "sub1" }, @@ -306,7 +318,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -322,7 +336,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 2, @@ -363,7 +379,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main2" + "path": "rtmp://127.0.0.1/live/test_main2", + "flvflags": "" }, "suffix": "stream2" }, @@ -398,7 +415,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub2" + "path": "rtmp://127.0.0.1/live/test_sub2", + "flvflags": "" }, "suffix": "sub2" }, @@ -451,7 +469,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -467,7 +487,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 3, @@ -508,7 +530,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main3" + "path": "rtmp://127.0.0.1/live/test_main3", + "flvflags": "" }, "suffix": "stream3" }, @@ -543,7 +566,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub3" + "path": "rtmp://127.0.0.1/live/test_sub3", + "flvflags": "" }, "suffix": "sub3" }, @@ -613,7 +637,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main4" + "path": "rtmp://127.0.0.1/live/test_main4", + "flvflags": "" }, "suffix": "stream4" }, @@ -648,7 +673,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub4" + "path": "rtmp://127.0.0.1/live/test_sub4", + "flvflags": "" }, "suffix": "sub4" }, @@ -695,7 +721,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -711,7 +739,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 5, @@ -752,7 +782,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main5" + "path": "rtmp://127.0.0.1/live/test_main5", + "flvflags": "" }, "suffix": "stream5" }, @@ -787,7 +818,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub5" + "path": "rtmp://127.0.0.1/live/test_sub5", + "flvflags": "" }, "suffix": "sub5" }, @@ -834,7 +866,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -850,7 +884,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 6, @@ -891,7 +927,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main6" + "path": "rtmp://127.0.0.1/live/test_main6", + "flvflags": "" }, "suffix": "stream6" }, @@ -926,7 +963,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub6" + "path": "rtmp://127.0.0.1/live/test_sub6", + "flvflags": "" }, "suffix": "sub6" }, @@ -998,7 +1036,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "encv2": { "width": 640, @@ -1014,7 +1054,9 @@ "minqp": 22, "maxqp": 36, "Iqp": 25, - "Pqp": 25 + "Pqp": 25, + "syncTS": false, + "syncTSMode": "linkpi" }, "enca": { "audioSrc": 7, @@ -1055,7 +1097,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_main7" + "path": "rtmp://127.0.0.1/live/test_main7", + "flvflags": "" }, "suffix": "stream7" }, @@ -1090,7 +1133,8 @@ "format": "auto", "enable": false, "hevc_id": 12, - "path": "rtmp://127.0.0.1/live/test_sub7" + "path": "rtmp://127.0.0.1/live/test_sub7", + "flvflags": "" }, "suffix": "sub7" }, diff --git a/rootfs/link/shell/fusb.sh b/rootfs/link/shell/fusb.sh index 2d0deda..0089db5 100644 --- a/rootfs/link/shell/fusb.sh +++ b/rootfs/link/shell/fusb.sh @@ -2,7 +2,7 @@ umount_usb(){ mnt=`df -h | grep /root/usb | wc -l` count=0 - while [ $mnt -eq 1 -a $count -le 5 ] + while [ $mnt -gt 0 -a $count -le 5 ] do umount -f /root/usb/ mnt=`df -h | grep /root/usb | wc -l` diff --git a/rootfs/link/shell/netManager.sh b/rootfs/link/shell/netManager.sh index 96172bf..a1e8b36 100644 --- a/rootfs/link/shell/netManager.sh +++ b/rootfs/link/shell/netManager.sh @@ -7,9 +7,13 @@ sleep 2 if [ -d /sys/class/net/eth1 ]; then /link/shell/setMac2.sh -if [ "$fac"=="ENC2" ] && [ -d /sys/class/net/eth2 ]; then - /link/shell/setNetwork2.sh eth2 -else - /link/shell/setNetwork2.sh eth1 -fi + if [ -d /sys/class/net/eth2 ];then + if [ "$fac" == "ENC2" ] || [ "$fac" == "ENC2V2" ] || [ "$fac" == "ENC2_SS528" ]; then + /link/shell/setNetwork2.sh eth2 + fi + else + if [ "$fac" != "ENC2" ] && [ "$fac" != "ENC2V2" ] && [ "$fac" != "ENC2V2_SS528" ]; then + /link/shell/setNetwork2.sh eth1 + fi + fi fi diff --git a/rootfs/link/web/encode.php b/rootfs/link/web/encode.php index 729b1e3..4eaa79a 100644 --- a/rootfs/link/web/encode.php +++ b/rootfs/link/web/encode.php @@ -49,7 +49,7 @@ include( "groupList.php" );
-
+
分辨率 @@ -65,23 +65,31 @@ include( "groupList.php" );
-
码率bitrate(kb/s)
+
+ 码率 + bitrate(kb/s) +
帧率 framerate
GOP( 秒 - sec)
+ sec) +
+
+ 帧同步 + sync +
主流参数 Main stream
-
+
-
+
-
+
@@ -117,7 +125,7 @@ include( "groupList.php" );
- +
@@ -129,16 +137,22 @@ include( "groupList.php" );
- +
+ +
辅流参数 Sub stream
-
+
-
+
-
+
@@ -184,6 +198,13 @@ include( "groupList.php" );
+
+ +
@@ -313,13 +334,13 @@ include( "groupList.php" ); 频道名称 channel name
-
+
-
+
分辨率 video size
-
+
编码方式 codec
@@ -339,6 +360,10 @@ include( "groupList.php" );
GOP( 秒 sec)
+
+ 帧同步 + sync +
开关 enable @@ -350,9 +375,9 @@ include( "groupList.php" );
-
+
-
+
-
+
@@ -400,16 +425,23 @@ include( "groupList.php" );
-
- -
+
+ +
+
+ +
-
+
-
+
-
+
@@ -457,6 +489,13 @@ include( "groupList.php" );
+
+ +
@@ -782,6 +821,14 @@ include( "groupList.php" ); + + +
@@ -812,7 +859,7 @@ include( "groupList.php" );
- +
-
+
@@ -1019,6 +1067,8 @@ include( "groupList.php" ); all.gop = hdmi[ 0 ].encv.gop; all.profile = hdmi[ 0 ].encv.profile; all.gopmode = hdmi[ 0 ].encv.gopmode; + all.syncTS = hdmi[ 0 ].encv.syncTS; + all.syncTSMode = hdmi[ 0 ].encv.syncTSMode; zcfg( "#all", all ); all_sub.width = hdmi[ 0 ].encv2.width; @@ -1030,6 +1080,8 @@ include( "groupList.php" ); all_sub.framerate = hdmi[ 0 ].encv2.framerate; all_sub.gop = hdmi[ 0 ].encv2.gop; all_sub.gopmode = hdmi[ 0 ].encv2.gopmode; + all_sub.syncTS = hdmi[ 0 ].encv2.syncTS; + all_sub.syncTSMode = hdmi[ 0 ].encv2.syncTSMode; zcfg( "#all_sub", all_sub ); diff --git a/rootfs/link/web/js/zcfg.js b/rootfs/link/web/js/zcfg.js index a8af4cb..533d2f8 100644 --- a/rootfs/link/web/js/zcfg.js +++ b/rootfs/link/web/js/zcfg.js @@ -40,6 +40,8 @@ function zcfg(name, json) { val = "\""+val+"\""; } + if(val == '"true"' || val == '"false"') + return eval(jstr + "=" + JSON.parse(val)); return eval(jstr + "=" + val); } diff --git a/rootfs/link/web/link/api/encoder.php b/rootfs/link/web/link/api/encoder.php index b4cbc4a..dc1ff61 100644 --- a/rootfs/link/web/link/api/encoder.php +++ b/rootfs/link/web/link/api/encoder.php @@ -261,4 +261,21 @@ class Encoder extends Verify } } + function do_snap($params = "{}"): string + { + try { + $this->link_verify(); + $params = json_decode($params,true); + $this->check_args($params); + + $client = new RpcClient(); + $result = $client->do_snap($params); + return $this->handleRet($result,"success","执行完成","execution is completed"); + } + catch (Exception $ex) + { + return $this->handleRet('','error',$ex->getMessage(),$ex->getMessage()); + } + } + } \ No newline at end of file diff --git a/rootfs/link/web/link/api/overlay.php b/rootfs/link/web/link/api/overlay.php index 59ffe05..9918a8c 100644 --- a/rootfs/link/web/link/api/overlay.php +++ b/rootfs/link/web/link/api/overlay.php @@ -51,13 +51,15 @@ class Overlay extends Verify $conf = $this->load_conf('/link/config/config.json'); $mark = file_exists("/link/config/auto/overlay.json"); + var_dump($mark); + if($mark) { - $overlayConf = []; + $overlayConf = $this->load_conf('/link/config/auto/overlay.json'); for($i=0;$iupdate_overlay($overlayConf); @@ -69,7 +71,6 @@ class Overlay extends Verify $param = $params[$i]; $id = $param['id']; - $chn=null;$index=-1; for($j=0;$jlink_verify(); $params = json_decode($params,true); $this->check_args($params); + + $time1 = $params["sysDate"]; + $parts = explode("/", $time1); + $time2 = $parts[0] . "-" . $parts[1] . "-" . $parts[2] . " " . $parts[3] . ":" . $parts[4] . ":" . $parts[5]; - $date = $params["sysDate"]; - exec( "/link/bin/rtc -s time " . $date); + exec( "/link/bin/rtc -s time " . $time1. " '".$time2."'" ); exec( "/link/bin/rtc -g time" ); + return $this->handleRet("","success","执行完成","execution is completed"); } catch (Exception $ex) @@ -111,8 +115,9 @@ class System extends Verify { try { $this->link_verify(); - $result = date( "Y-m-d H:i:s", intval( time() ) ); - return $this->handleRet($result,"success","执行完成","execution is completed"); + //$result = date( "Y-m-d H:i:s", intval( time() ) ); + exec('date +"%Y-%m-%d %H:%M:%S"',$result); + return $this->handleRet($result[0],"success","执行完成","execution is completed"); } catch (Exception $ex) { @@ -159,4 +164,28 @@ class System extends Verify return $this->handleRet('','error',$ex->getMessage(),$ex->getMessage()); } } + + function reboot() + { + try { + $this->link_verify(); + exec( '/link/shell/reboot.sh' ); + } + catch (Exception $ex) + { + return $this->handleRet('','error',$ex->getMessage(),$ex->getMessage()); + } + } + + function reset() + { + try { + $this->link_verify(); + exec( '/link/shell/reset.sh' ); + } + catch (Exception $ex) + { + return $this->handleRet('','error',$ex->getMessage(),$ex->getMessage()); + } + } } \ No newline at end of file diff --git a/rootfs/link/web/link/api/verify.php b/rootfs/link/web/link/api/verify.php index cfff285..3a447e3 100644 --- a/rootfs/link/web/link/api/verify.php +++ b/rootfs/link/web/link/api/verify.php @@ -11,7 +11,7 @@ class Verify extends Basic if($_REQUEST['verify'] == 'true') { $user = ['admin'=>'admin']; - $realm = 'www.linkpi.cn'; + $realm = 'lph_http'; if(!isset($_SERVER['PHP_AUTH_DIGEST'])) $this->send_verify($realm); diff --git a/rootfs/link/web/link/basic.php b/rootfs/link/web/link/basic.php index 0d614c6..4ffbf4e 100644 --- a/rootfs/link/web/link/basic.php +++ b/rootfs/link/web/link/basic.php @@ -23,19 +23,29 @@ class Basic protected static function handleRet($data,$status,$msg_cn,$msg_en): string { - $lang = Basic::load_conf('/link/config/lang.json'); + session_start(); + if(!isset($_SESSION["lang"])) + { + $langConf = Basic::load_conf('/link/config/lang.json'); + $lang = $langConf['lang']; + $_SESSION["lang"] = $lang; + } + else + { + $lang = $_SESSION["lang"]; + } if(strpos($msg_cn,'&&')) { $msg_array = explode("&&", $msg_cn); - if($lang['lang'] == 'cn') + if($lang == 'cn') $msg = $msg_array[0]; else $msg = $msg_array[1]; } else { - if($lang['lang'] == 'en') + if($lang == 'en') $msg = $msg_en; else $msg = $msg_cn; @@ -46,6 +56,7 @@ class Basic 'status' => $status, 'msg' => $msg ); + header('Content-Type: application/json'); return json_encode($retVal,JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT); } } \ No newline at end of file diff --git a/rootfs/link/web/link/rpc/rpc_client.php b/rootfs/link/web/link/rpc/rpc_client.php index 6dc366a..bf36866 100644 --- a/rootfs/link/web/link/rpc/rpc_client.php +++ b/rootfs/link/web/link/rpc/rpc_client.php @@ -94,4 +94,12 @@ class RpcClient $client->query('enc.updateOverlay',[json_encode($param,JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT)]); $client->send(); } + + public function do_snap($param) + { + $client = new Client(self::enc_url); + $client->query('enc.snap',[json_encode($param,JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT)],$ret); + $client->send(); + return $ret; + } } \ No newline at end of file diff --git a/rootfs/link/web/push.php b/rootfs/link/web/push.php index ac53317..d3664ca 100644 --- a/rootfs/link/web/push.php +++ b/rootfs/link/web/push.php @@ -198,9 +198,13 @@ include( "head.php" ); 描述 Description
-
+
URL
+
+ 兼容性 + Compatible +
启用 Enable @@ -220,9 +224,15 @@ include( "head.php" );
-
+
+
+ +
diff --git a/rootfs/link/web/stream.php b/rootfs/link/web/stream.php index 87848fa..0386ba5 100644 --- a/rootfs/link/web/stream.php +++ b/rootfs/link/web/stream.php @@ -680,6 +680,10 @@ else
Format
+
+ 兼容性 + Compatible +
上传速度 Push speed @@ -704,6 +708,12 @@ else
+
+ +
kb/s
@@ -724,6 +734,12 @@ else
+
+ +
kb/s
diff --git a/rootfs/usr/lib/libLinkBase.so.1.0.0 b/rootfs/usr/lib/libLinkBase.so.1.0.0 index db3c6be..f3d9407 100644 Binary files a/rootfs/usr/lib/libLinkBase.so.1.0.0 and b/rootfs/usr/lib/libLinkBase.so.1.0.0 differ diff --git a/rootfs/usr/lib/libLinkCodec.so.1.0.0 b/rootfs/usr/lib/libLinkCodec.so.1.0.0 index cf7572b..5c08a7b 100644 Binary files a/rootfs/usr/lib/libLinkCodec.so.1.0.0 and b/rootfs/usr/lib/libLinkCodec.so.1.0.0 differ diff --git a/rootfs/usr/lib/libLinkIO.so.1.0.0 b/rootfs/usr/lib/libLinkIO.so.1.0.0 index 7dfc502..3ed7ae5 100644 Binary files a/rootfs/usr/lib/libLinkIO.so.1.0.0 and b/rootfs/usr/lib/libLinkIO.so.1.0.0 differ diff --git a/rootfs/usr/lib/libLinkRTLP.so.1.0.0 b/rootfs/usr/lib/libLinkRTLP.so.1.0.0 index eacce74..f7b14ec 100644 Binary files a/rootfs/usr/lib/libLinkRTLP.so.1.0.0 and b/rootfs/usr/lib/libLinkRTLP.so.1.0.0 differ diff --git a/rootfs/usr/lib/libLinkStream.so.1.0.0 b/rootfs/usr/lib/libLinkStream.so.1.0.0 index 666070b..7b6cf5a 100644 Binary files a/rootfs/usr/lib/libLinkStream.so.1.0.0 and b/rootfs/usr/lib/libLinkStream.so.1.0.0 differ diff --git a/rootfs/usr/lib/libavformat.so.58.23.100 b/rootfs/usr/lib/libavformat.so.58.23.100 index c569249..a9c7f42 100644 Binary files a/rootfs/usr/lib/libavformat.so.58.23.100 and b/rootfs/usr/lib/libavformat.so.58.23.100 differ