正在显示
4 个修改的文件
包含
24 行增加
和
6 行删除
| @@ -180,12 +180,18 @@ stream_caster { | @@ -180,12 +180,18 @@ stream_caster { | ||
| 180 | caster mpegts_over_udp; | 180 | caster mpegts_over_udp; |
| 181 | # the output rtmp url. | 181 | # the output rtmp url. |
| 182 | # for mpegts_over_udp caster, the typically output url: | 182 | # for mpegts_over_udp caster, the typically output url: |
| 183 | - # rtmp://127.0.0.1/live/livestream | 183 | + # rtmp://127.0.0.1/live/livestream |
| 184 | # for rtsp caster, the typically output url: | 184 | # for rtsp caster, the typically output url: |
| 185 | - # rtmp://127.0.0.1/[app]/[stream] | 185 | + # rtmp://127.0.0.1/[app]/[stream] |
| 186 | # for example, the rtsp url: | 186 | # for example, the rtsp url: |
| 187 | # rtsp://192.168.1.173:8544/live/livestream.sdp | 187 | # rtsp://192.168.1.173:8544/live/livestream.sdp |
| 188 | - # where the [app] is "live" and [stream] is "livestream", output is: | 188 | + # where the [app] is "live" and [stream] is "livestream", output is: |
| 189 | + # rtmp://127.0.0.1/live/livestream | ||
| 190 | + # for flv caster, the typically output url: | ||
| 191 | + # rtmp://127.0.0.1/[app]/[stream] | ||
| 192 | + # for example, POST to url: | ||
| 193 | + # http://127.0.0.1:8936/live/livestream.flv | ||
| 194 | + # where the [app] is "live" and [stream] is "livestream", output is: | ||
| 189 | # rtmp://127.0.0.1/live/livestream | 195 | # rtmp://127.0.0.1/live/livestream |
| 190 | output rtmp://127.0.0.1/live/livestream; | 196 | output rtmp://127.0.0.1/live/livestream; |
| 191 | # the listen port for stream caster. | 197 | # the listen port for stream caster. |
| @@ -1509,7 +1509,19 @@ int SrsConfig::global_to_json(SrsAmf0Object* obj) | @@ -1509,7 +1509,19 @@ int SrsConfig::global_to_json(SrsAmf0Object* obj) | ||
| 1509 | } else if (sdir->name == "crossdomain") { | 1509 | } else if (sdir->name == "crossdomain") { |
| 1510 | sobj->set(sdir->name, sdir->dumps_arg0_to_boolean()); | 1510 | sobj->set(sdir->name, sdir->dumps_arg0_to_boolean()); |
| 1511 | } else if (sdir->name == "raw_api") { | 1511 | } else if (sdir->name == "raw_api") { |
| 1512 | - sobj->set(sdir->name, SrsAmf0Any::boolean(get_raw_api())); | 1512 | + SrsAmf0Object* ssobj = SrsAmf0Any::object(); |
| 1513 | + sobj->set(sdir->name, ssobj); | ||
| 1514 | + | ||
| 1515 | + for (int j = 0; j < (int)sdir->directives.size(); j++) { | ||
| 1516 | + SrsConfDirective* ssdir = sdir->directives.at(j); | ||
| 1517 | + if (ssdir->name == "enabled") { | ||
| 1518 | + ssobj->set(ssdir->name, ssdir->dumps_arg0_to_boolean()); | ||
| 1519 | + } else if (ssdir->name == "allow_reload") { | ||
| 1520 | + ssobj->set(ssdir->name, ssdir->dumps_arg0_to_boolean()); | ||
| 1521 | + } else if (ssdir->name == "allow_query") { | ||
| 1522 | + ssobj->set(ssdir->name, ssdir->dumps_arg0_to_boolean()); | ||
| 1523 | + } | ||
| 1524 | + } | ||
| 1513 | } | 1525 | } |
| 1514 | } | 1526 | } |
| 1515 | obj->set(dir->name, sobj); | 1527 | obj->set(dir->name, sobj); |
-
请 注册 或 登录 后发表评论