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

refine code, rename the human functions to prefixed with srs_human_

Browse source
This commit is contained in:
winlin 2014-11-21 14:03:30 +08:00
parent 30e7c38a48
commit b3bb2cdf2b
12 changed files with 190 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1432,7 +1432,7 @@ void srs_amf0_strict_array_append(srs_amf0_t amf0, srs_amf0_t value)
obj->append(any);
}
char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize)
char* srs_human_amf0_print(srs_amf0_t amf0, char** pdata, int* psize)
{
if (!amf0) {
return NULL;
@ -1443,7 +1443,7 @@ char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize)
return any->human_print(pdata, psize);
}
const char* srs_type2string(char type)
const char* srs_human_flv_tag_type2string(char type)
{
static const char* audio = "Audio";
static const char* video = "Video";
@ -1460,7 +1460,7 @@ const char* srs_type2string(char type)
return unknown;
}
const char* srs_code_id2string(char codec_id)
const char* srs_human_flv_video_codec_id2string(char codec_id)
{
static const char* h263 = "H.263";
static const char* screen = "Screen";
@ -1483,7 +1483,7 @@ const char* srs_code_id2string(char codec_id)
return unknown;
}
const char* srs_avc_packet2string(char avc_packet_type)
const char* srs_human_flv_video_avc_packet_type2string(char avc_packet_type)
{
static const char* sps_pps = "SpsPps";
static const char* nalu = "Nalu";
@ -1500,7 +1500,7 @@ const char* srs_avc_packet2string(char avc_packet_type)
return unknown;
}
const char* srs_frame_type2string(char frame_type)
const char* srs_human_flv_video_frame_type2string(char frame_type)
{
static const char* keyframe = "I";
static const char* interframe = "P/B";
@ -1521,7 +1521,7 @@ const char* srs_frame_type2string(char frame_type)
return unknown;
}
int srs_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int size)
int srs_human_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int size)
{
int ret = ERROR_SUCCESS;
@ -1531,18 +1531,18 @@ int srs_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int size)
}
if (type == SRS_RTMP_TYPE_VIDEO) {
srs_lib_trace("Video packet type=%s, dts=%d, pts=%d, size=%d, %s(%s,%s)",
srs_type2string(type), timestamp, pts, size,
srs_code_id2string(srs_get_codec_id(data, size)),
srs_avc_packet2string(srs_get_avc_packet_type(data, size)),
srs_frame_type2string(srs_get_frame_type(data, size))
srs_human_trace("Video packet type=%s, dts=%d, pts=%d, size=%d, %s(%s,%s)",
srs_human_flv_tag_type2string(type), timestamp, pts, size,
srs_human_flv_video_codec_id2string(srs_get_codec_id(data, size)),
srs_human_flv_video_avc_packet_type2string(srs_get_avc_packet_type(data, size)),
srs_human_flv_video_frame_type2string(srs_get_frame_type(data, size))
);
} else if (type == SRS_RTMP_TYPE_AUDIO) {
srs_lib_trace("Audio packet type=%s, dts=%d, pts=%d, size=%d",
srs_type2string(type), timestamp, pts, size);
srs_human_trace("Audio packet type=%s, dts=%d, pts=%d, size=%d",
srs_human_flv_tag_type2string(type), timestamp, pts, size);
} else if (type == SRS_RTMP_TYPE_SCRIPT) {
srs_lib_verbose("Data packet type=%s, time=%d, size=%d",
srs_type2string(type), timestamp, size);
srs_human_verbose("Data packet type=%s, time=%d, size=%d",
srs_human_flv_tag_type2string(type), timestamp, size);
int nparsed = 0;
while (nparsed < size) {
int nb_parsed_this = 0;
@ -1554,18 +1554,18 @@ int srs_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int size)
nparsed += nb_parsed_this;
char* amf0_str = NULL;
srs_raw_trace("%s", srs_amf0_human_print(amf0, &amf0_str, NULL));
srs_human_raw("%s", srs_human_amf0_print(amf0, &amf0_str, NULL));
srs_amf0_free_bytes(amf0_str);
}
} else {
srs_lib_trace("Unknown packet type=%s, dts=%d, pts=%d, size=%d",
srs_type2string(type), timestamp, pts, size);
srs_human_trace("Unknown packet type=%s, dts=%d, pts=%d, size=%d",
srs_human_flv_tag_type2string(type), timestamp, pts, size);
}
return ret;
}
const char* srs_format_time()
const char* srs_human_format_time()
{
struct timeval tv;
static char buf[23];

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

@ -504,7 +504,7 @@ extern void srs_amf0_strict_array_append(srs_amf0_t amf0, srs_amf0_t value);
* user must use srs_amf0_free_bytes to free it.
* @return return the *pdata for print. NULL to ignore.
*/
extern char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize);
extern char* srs_human_amf0_print(srs_amf0_t amf0, char** pdata, int* psize);
/**
* convert the flv tag type to string.
* SRS_RTMP_TYPE_AUDIO to "Audio"
@ -514,7 +514,7 @@ extern char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize);
* @remark user never free the return char*,
* it's static shared const string.
*/
extern const char* srs_type2string(char type);
extern const char* srs_human_flv_tag_type2string(char type);
/**
* get the codec id string.
@ -528,7 +528,7 @@ extern const char* srs_type2string(char type);
* @remark user never free the return char*,
* it's static shared const string.
*/
extern const char* srs_code_id2string(char codec_id);
extern const char* srs_human_flv_video_codec_id2string(char codec_id);
/**
* get the avc packet type string.
@ -539,7 +539,7 @@ extern const char* srs_code_id2string(char codec_id);
* @remark user never free the return char*,
* it's static shared const string.
*/
extern const char* srs_avc_packet2string(char avc_packet_type);
extern const char* srs_human_flv_video_avc_packet_type2string(char avc_packet_type);
/**
* get the frame type string.
@ -552,20 +552,20 @@ extern const char* srs_avc_packet2string(char avc_packet_type);
* @remark user never free the return char*,
* it's static shared const string.
*/
extern const char* srs_frame_type2string(char frame_type);
extern const char* srs_human_flv_video_frame_type2string(char frame_type);
/**
* print the rtmp packet, use srs_lib_trace/srs_lib_verbose for packet,
* and use srs_raw_trace for script data body.
* print the rtmp packet, use srs_human_trace/srs_human_verbose for packet,
* and use srs_human_raw for script data body.
* @return an error code for parse the timetstamp to dts and pts.
*/
extern int srs_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int size);
extern int srs_human_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int size);
// log to console, for use srs-librtmp application.
extern const char* srs_format_time();
#define srs_lib_trace(msg, ...) printf("[%s] ", srs_format_time());printf(msg, ##__VA_ARGS__);printf("\n")
#define srs_lib_verbose(msg, ...) printf("[%s] ", srs_format_time());printf(msg, ##__VA_ARGS__);printf("\n")
#define srs_raw_trace(msg, ...) printf(msg, ##__VA_ARGS__)
extern const char* srs_human_format_time();
#define srs_human_trace(msg, ...) printf("[%s] ", srs_human_format_time());printf(msg, ##__VA_ARGS__);printf("\n")
#define srs_human_verbose(msg, ...) printf("[%s] ", srs_human_format_time());printf(msg, ##__VA_ARGS__);printf("\n")
#define srs_human_raw(msg, ...) printf(msg, ##__VA_ARGS__)
/*************************************************************
**************************************************************