external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for #354, remove the double underscore functions and variables.

Browse source
This commit is contained in:
winlin 2015-03-21 11:55:28 +08:00
parent 7065db192c
commit bbac2348db
31 changed files with 280 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

55
trunk/src/libs/srs_librtmp.cpp
View file

@ -570,22 +570,22 @@ int srs_rtmp_handshake(srs_rtmp_t rtmp)
{
int ret = ERROR_SUCCESS;
if ((ret = __srs_rtmp_dns_resolve(rtmp)) != ERROR_SUCCESS) {
if ((ret = srs_rtmp_dns_resolve(rtmp)) != ERROR_SUCCESS) {
return ret;
}
if ((ret = __srs_rtmp_connect_server(rtmp)) != ERROR_SUCCESS) {
if ((ret = srs_rtmp_connect_server(rtmp)) != ERROR_SUCCESS) {
return ret;
}
if ((ret = __srs_rtmp_do_simple_handshake(rtmp)) != ERROR_SUCCESS) {
if ((ret = srs_rtmp_do_simple_handshake(rtmp)) != ERROR_SUCCESS) {
return ret;
}
return ret;
}
int __srs_rtmp_dns_resolve(srs_rtmp_t rtmp)
int srs_rtmp_dns_resolve(srs_rtmp_t rtmp)
{
int ret = ERROR_SUCCESS;
@ -604,7 +604,7 @@ int __srs_rtmp_dns_resolve(srs_rtmp_t rtmp)
return ret;
}
int __srs_rtmp_connect_server(srs_rtmp_t rtmp)
int srs_rtmp_connect_server(srs_rtmp_t rtmp)
{
int ret = ERROR_SUCCESS;
@ -618,7 +618,7 @@ int __srs_rtmp_connect_server(srs_rtmp_t rtmp)
return ret;
}
int __srs_rtmp_do_complex_handshake(srs_rtmp_t rtmp)
int srs_rtmp_do_complex_handshake(srs_rtmp_t rtmp)
{
#ifndef SRS_AUTO_SSL
// complex handshake requires ssl
@ -670,7 +670,7 @@ int srs_rtmp_set_connect_args(srs_rtmp_t rtmp,
return ret;
}
int __srs_rtmp_do_simple_handshake(srs_rtmp_t rtmp)
int srs_rtmp_do_simple_handshake(srs_rtmp_t rtmp)
{
int ret = ERROR_SUCCESS;
@ -818,7 +818,7 @@ int srs_rtmp_bandwidth_check(srs_rtmp_t rtmp,
}
int __srs_rtmp_on_aggregate(Context* context, SrsCommonMessage* msg)
int srs_rtmp_on_aggregate(Context* context, SrsCommonMessage* msg)
{
int ret = ERROR_SUCCESS;
@ -889,8 +889,7 @@ int __srs_rtmp_on_aggregate(Context* context, SrsCommonMessage* msg)
}
// to common message.
SrsCommonMessage __o;
SrsCommonMessage& o = __o;
SrsCommonMessage o;
o.header.message_type = type;
o.header.payload_length = data_size;
@ -924,7 +923,7 @@ int __srs_rtmp_on_aggregate(Context* context, SrsCommonMessage* msg)
return ret;
}
int __srs_rtmp_go_packet(Context* context, SrsCommonMessage* msg,
int srs_rtmp_go_packet(Context* context, SrsCommonMessage* msg,
char* type, u_int32_t* timestamp, char** data, int* size,
bool* got_msg
) {
@ -954,7 +953,7 @@ int __srs_rtmp_go_packet(Context* context, SrsCommonMessage* msg,
// detach bytes from packet.
msg->payload = NULL;
} else if (msg->header.is_aggregate()) {
if ((ret = __srs_rtmp_on_aggregate(context, msg)) != ERROR_SUCCESS) {
if ((ret = srs_rtmp_on_aggregate(context, msg)) != ERROR_SUCCESS) {
return ret;
}
*got_msg = false;
@ -1005,7 +1004,7 @@ int srs_rtmp_read_packet(srs_rtmp_t rtmp, char* type, u_int32_t* timestamp, char
// process the got packet, if nothing, try again.
bool got_msg;
if ((ret = __srs_rtmp_go_packet(context, msg, type, timestamp, data, size, &got_msg)) != ERROR_SUCCESS) {
if ((ret = srs_rtmp_go_packet(context, msg, type, timestamp, data, size, &got_msg)) != ERROR_SUCCESS) {
return ret;
}
@ -1073,7 +1072,7 @@ srs_bool srs_rtmp_is_onMetaData(char type, char* data, int size)
/**
* directly write a audio frame.
*/
int __srs_write_audio_raw_frame(Context* context,
int srs_write_audio_raw_frame(Context* context,
char* frame, int frame_size, SrsRawAacStreamCodec* codec, u_int32_t timestamp
) {
int ret = ERROR_SUCCESS;
@ -1090,7 +1089,7 @@ int __srs_write_audio_raw_frame(Context* context,
/**
* write aac frame in adts.
*/
int __srs_write_aac_adts_frame(Context* context,
int srs_write_aac_adts_frame(Context* context,
SrsRawAacStreamCodec* codec, char* frame, int frame_size, u_int32_t timestamp
) {
int ret = ERROR_SUCCESS;
@ -1105,19 +1104,19 @@ int __srs_write_aac_adts_frame(Context* context,
codec->aac_packet_type = 0;
if ((ret = __srs_write_audio_raw_frame(context, (char*)sh.data(), (int)sh.length(), codec, timestamp)) != ERROR_SUCCESS) {
if ((ret = srs_write_audio_raw_frame(context, (char*)sh.data(), (int)sh.length(), codec, timestamp)) != ERROR_SUCCESS) {
return ret;
}
}
codec->aac_packet_type = 1;
return __srs_write_audio_raw_frame(context, frame, frame_size, codec, timestamp);
return srs_write_audio_raw_frame(context, frame, frame_size, codec, timestamp);
}
/**
* write aac frames in adts.
*/
int __srs_write_aac_adts_frames(Context* context,
int srs_write_aac_adts_frames(Context* context,
char sound_format, char sound_rate, char sound_size, char sound_type,
char* frames, int frames_size, u_int32_t timestamp
) {
@ -1142,7 +1141,7 @@ int __srs_write_aac_adts_frames(Context* context,
codec.sound_size = sound_size;
codec.sound_type = sound_type;
if ((ret = __srs_write_aac_adts_frame(context, &codec, frame, frame_size, timestamp)) != ERROR_SUCCESS) {
if ((ret = srs_write_aac_adts_frame(context, &codec, frame, frame_size, timestamp)) != ERROR_SUCCESS) {
return ret;
}
}
@ -1169,7 +1168,7 @@ int srs_audio_write_raw_frame(srs_rtmp_t rtmp,
}
// for aac, demux the ADTS to RTMP format.
return __srs_write_aac_adts_frames(context,
return srs_write_aac_adts_frames(context,
sound_format, sound_rate, sound_size, sound_type,
frame, frame_size, timestamp);
} else {
@ -1182,7 +1181,7 @@ int srs_audio_write_raw_frame(srs_rtmp_t rtmp,
codec.aac_packet_type = 0;
// for other data, directly write frame.
return __srs_write_audio_raw_frame(context, frame, frame_size, &codec, timestamp);
return srs_write_audio_raw_frame(context, frame, frame_size, &codec, timestamp);
}
@ -1234,7 +1233,7 @@ int srs_aac_adts_frame_size(char* aac_raw_data, int ac_raw_size)
/**
* write h264 IPB-frame.
*/
int __srs_write_h264_ipb_frame(Context* context,
int srs_write_h264_ipb_frame(Context* context,
char* frame, int frame_size, u_int32_t dts, u_int32_t pts
) {
int ret = ERROR_SUCCESS;
@ -1266,7 +1265,7 @@ int __srs_write_h264_ipb_frame(Context* context,
/**
* write the h264 sps/pps in context over RTMP.
*/
int __srs_write_h264_sps_pps(Context* context, u_int32_t dts, u_int32_t pts)
int srs_write_h264_sps_pps(Context* context, u_int32_t dts, u_int32_t pts)
{
int ret = ERROR_SUCCESS;
@ -1303,7 +1302,7 @@ int __srs_write_h264_sps_pps(Context* context, u_int32_t dts, u_int32_t pts)
/**
* write h264 raw frame, maybe sps/pps/IPB-frame.
*/
int __srs_write_h264_raw_frame(Context* context,
int srs_write_h264_raw_frame(Context* context,
char* frame, int frame_size, u_int32_t dts, u_int32_t pts
) {
int ret = ERROR_SUCCESS;
@ -1321,7 +1320,7 @@ int __srs_write_h264_raw_frame(Context* context,
context->h264_sps_changed = true;
context->h264_sps = sps;
return __srs_write_h264_sps_pps(context, dts, pts);
return srs_write_h264_sps_pps(context, dts, pts);
}
// for pps
@ -1337,11 +1336,11 @@ int __srs_write_h264_raw_frame(Context* context,
context->h264_pps_changed = true;
context->h264_pps = pps;
return __srs_write_h264_sps_pps(context, dts, pts);
return srs_write_h264_sps_pps(context, dts, pts);
}
// ibp frame.
return __srs_write_h264_ipb_frame(context, frame, frame_size, dts, pts);
return srs_write_h264_ipb_frame(context, frame, frame_size, dts, pts);
}
/**
@ -1382,7 +1381,7 @@ int srs_h264_write_raw_frames(srs_rtmp_t rtmp,
}
// it may be return error, but we must process all packets.
if ((ret = __srs_write_h264_raw_frame(context, frame, frame_size, dts, pts)) != ERROR_SUCCESS) {
if ((ret = srs_write_h264_raw_frame(context, frame, frame_size, dts, pts)) != ERROR_SUCCESS) {
error_code_return = ret;
// ignore known error, process all packets.

14
trunk/src/libs/srs_librtmp.hpp
View file

@ -131,20 +131,20 @@ extern void srs_rtmp_destroy(srs_rtmp_t rtmp);
*/
/**
* srs_rtmp_handshake equals to invoke:
* __srs_rtmp_dns_resolve()
* __srs_rtmp_connect_server()
* __srs_rtmp_do_simple_handshake()
* srs_rtmp_dns_resolve()
* srs_rtmp_connect_server()
* srs_rtmp_do_simple_handshake()
* user can use these functions if needed.
*/
extern int srs_rtmp_handshake(srs_rtmp_t rtmp);
// parse uri, create socket, resolve host
extern int __srs_rtmp_dns_resolve(srs_rtmp_t rtmp);
extern int srs_rtmp_dns_resolve(srs_rtmp_t rtmp);
// connect socket to server
extern int __srs_rtmp_connect_server(srs_rtmp_t rtmp);
extern int srs_rtmp_connect_server(srs_rtmp_t rtmp);
// do simple handshake over socket.
extern int __srs_rtmp_do_simple_handshake(srs_rtmp_t rtmp);
extern int srs_rtmp_do_simple_handshake(srs_rtmp_t rtmp);
// do complex handshake over socket.
extern int __srs_rtmp_do_complex_handshake(srs_rtmp_t rtmp);
extern int srs_rtmp_do_complex_handshake(srs_rtmp_t rtmp);
/**
* set the args of connect packet for rtmp.