mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
rename rtmp amf0 to protocol amf0.
This commit is contained in:
parent
1310c0f577
commit
168625dce2
31 changed files with 43 additions and 43 deletions
|
@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
using namespace std;
|
||||
|
||||
#include <srs_rtmp_stack.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_app_config.hpp>
|
||||
#include <srs_core_autofree.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
|
|
|
@ -40,7 +40,7 @@ using namespace std;
|
|||
#include <srs_rtmp_utility.hpp>
|
||||
#include <srs_app_st.hpp>
|
||||
#include <srs_app_utility.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
|
||||
#define SRS_HTTP_FLV_STREAM_BUFFER 4096
|
||||
|
|
|
@ -46,7 +46,7 @@ using namespace std;
|
|||
#include <srs_kernel_file.hpp>
|
||||
#include <srs_app_utility.hpp>
|
||||
#include <srs_core_performance.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_app_statistic.hpp>
|
||||
#include <srs_protocol_json.hpp>
|
||||
#include <srs_app_http_hooks.hpp>
|
||||
|
|
|
@ -38,7 +38,7 @@ using namespace std;
|
|||
#include <srs_kernel_codec.hpp>
|
||||
#include <srs_kernel_flv.hpp>
|
||||
#include <srs_kernel_file.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_kernel_buffer.hpp>
|
||||
#include <srs_protocol_json.hpp>
|
||||
#include <srs_app_utility.hpp>
|
||||
|
|
|
@ -42,7 +42,7 @@ using namespace std;
|
|||
#include <srs_protocol_kbps.hpp>
|
||||
#include <srs_rtmp_msg_array.hpp>
|
||||
#include <srs_app_utility.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
|
||||
// when error, edge ingester sleep for a while and retry.
|
||||
|
|
|
@ -41,7 +41,7 @@ using namespace std;
|
|||
#include <srs_protocol_kbps.hpp>
|
||||
#include <srs_rtmp_msg_array.hpp>
|
||||
#include <srs_app_utility.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_kernel_codec.hpp>
|
||||
#include <srs_core_autofree.hpp>
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ using namespace std;
|
|||
#include <srs_app_utility.hpp>
|
||||
#include <srs_core_autofree.hpp>
|
||||
#include <srs_app_http_conn.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
|
||||
SrsHttpHeartbeat::SrsHttpHeartbeat()
|
||||
{
|
||||
|
|
|
@ -36,7 +36,7 @@ using namespace std;
|
|||
|
||||
#include <srs_kernel_error.hpp>
|
||||
#include <srs_kernel_codec.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_rtmp_stack.hpp>
|
||||
#include <srs_app_config.hpp>
|
||||
#include <srs_app_source.hpp>
|
||||
|
|
|
@ -45,7 +45,7 @@ using namespace std;
|
|||
#include <srs_app_http_conn.hpp>
|
||||
#include <srs_kernel_consts.hpp>
|
||||
#include <srs_app_server.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
|
||||
int srs_api_response_jsonp(ISrsHttpResponseWriter* w, string callback, string data)
|
||||
{
|
||||
|
|
|
@ -57,7 +57,7 @@ using namespace std;
|
|||
#include <srs_app_http_api.hpp>
|
||||
#include <srs_protocol_json.hpp>
|
||||
#include <srs_app_http_hooks.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ using namespace std;
|
|||
#include <srs_app_config.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
#include <srs_app_http_conn.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
|
||||
#define SRS_HTTP_RESPONSE_OK SRS_XSTR(ERROR_SUCCESS)
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ using namespace std;
|
|||
#include <srs_app_st.hpp>
|
||||
#include <srs_rtmp_utility.hpp>
|
||||
#include <srs_app_utility.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_raw_avc.hpp>
|
||||
#include <srs_app_pithy_print.hpp>
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ using namespace std;
|
|||
#include <srs_app_edge.hpp>
|
||||
#include <srs_app_utility.hpp>
|
||||
#include <srs_rtmp_msg_array.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_app_recv_thread.hpp>
|
||||
#include <srs_core_performance.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
|
|
|
@ -36,7 +36,7 @@ using namespace std;
|
|||
#include <srs_kernel_buffer.hpp>
|
||||
#include <srs_kernel_stream.hpp>
|
||||
#include <srs_rtmp_stack.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_rtmp_utility.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
#include <srs_raw_avc.hpp>
|
||||
|
|
|
@ -29,7 +29,7 @@ using namespace std;
|
|||
|
||||
#include <srs_kernel_log.hpp>
|
||||
#include <srs_rtmp_stack.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_kernel_codec.hpp>
|
||||
#include <srs_app_hls.hpp>
|
||||
#include <srs_app_forward.hpp>
|
||||
|
|
|
@ -33,7 +33,7 @@ using namespace std;
|
|||
#include <srs_app_conn.hpp>
|
||||
#include <srs_app_config.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
|
||||
int64_t srs_gvid = getpid();
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ using namespace std;
|
|||
#include <srs_protocol_kbps.hpp>
|
||||
#include <srs_protocol_json.hpp>
|
||||
#include <srs_kernel_buffer.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
|
||||
// the longest time to wait for a process to quit.
|
||||
#define SRS_PROCESS_QUIT_TIMEOUT_MS 1000
|
||||
|
|
|
@ -36,7 +36,7 @@ using namespace std;
|
|||
#include <srs_rtmp_stack.hpp>
|
||||
#include <srs_core_autofree.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
|
||||
/**
|
||||
* recv bandwidth helper.
|
||||
|
|
|
@ -43,7 +43,7 @@ using namespace std;
|
|||
#include <srs_rtmp_stack.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
#include <srs_kernel_buffer.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_kernel_flv.hpp>
|
||||
#include <srs_kernel_codec.hpp>
|
||||
#include <srs_kernel_file.hpp>
|
||||
|
|
|
@ -44,7 +44,7 @@ using namespace std;
|
|||
#include <srs_rtmp_utility.hpp>
|
||||
#include <srs_app_st.hpp>
|
||||
#include <srs_app_utility.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_raw_avc.hpp>
|
||||
#include <srs_app_http_conn.hpp>
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
|
||||
#include <utility>
|
||||
#include <vector>
|
|
@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef SRS_RTMP_PROTOCOL_AMF0_HPP
|
||||
#define SRS_RTMP_PROTOCOL_AMF0_HPP
|
||||
#ifndef SRS_PROTOCOL_AMF0_HPP
|
||||
#define SRS_PROTOCOL_AMF0_HPP
|
||||
|
||||
/*
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
*/
|
||||
|
||||
#include <srs_core.hpp>
|
|
@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
using namespace std;
|
||||
|
||||
#include <srs_kernel_log.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
|
||||
/* json encode
|
||||
cout<< SRS_JOBJECT_START
|
||||
|
|
|
@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include <srs_rtmp_stack.hpp>
|
||||
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_rtmp_io.hpp>
|
||||
#include <srs_kernel_buffer.hpp>
|
||||
#include <srs_core_autofree.hpp>
|
||||
|
|
|
@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
*/
|
||||
#include <srs_utest.hpp>
|
||||
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ using namespace std;
|
|||
#include <srs_rtmp_stack.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
#include <srs_app_st.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
#include <srs_protocol_amf0.hpp>
|
||||
#include <srs_rtmp_stack.hpp>
|
||||
|
||||
MockEmptyIO::MockEmptyIO()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue