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 librtmp api, add prefix utils for utilities.

Browse source
This commit is contained in:
winlin 2014-11-21 14:09:17 +08:00
parent b3bb2cdf2b
commit 10bc5399ec
4 changed files with 36 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -858,27 +858,27 @@ int srs_version_revision()
return VERSION_REVISION;
}
int64_t srs_get_time_ms()
int64_t srs_utils_get_time_ms()
{
srs_update_system_time_ms();
return srs_get_system_time_ms();
}
int64_t srs_get_nsend_bytes(srs_rtmp_t rtmp)
int64_t srs_utils_get_send_bytes(srs_rtmp_t rtmp)
{
srs_assert(rtmp != NULL);
Context* context = (Context*)rtmp;
return context->rtmp->get_send_bytes();
}
int64_t srs_get_nrecv_bytes(srs_rtmp_t rtmp)
int64_t srs_utils_get_recv_bytes(srs_rtmp_t rtmp)
{
srs_assert(rtmp != NULL);
Context* context = (Context*)rtmp;
return context->rtmp->get_recv_bytes();
}
int srs_parse_timestamp(
int srs_utils_parse_timestamp(
u_int32_t time, char type, char* data, int size,
u_int32_t* ppts
) {
@ -919,7 +919,7 @@ int srs_parse_timestamp(
return ret;
}
char srs_get_codec_id(char* data, int size)
char srs_utils_get_flv_video_codec_id(char* data, int size)
{
if (size < 1) {
return 0;
@ -931,7 +931,7 @@ char srs_get_codec_id(char* data, int size)
return codec_id;
}
char srs_get_avc_packet_type(char* data, int size)
char srs_utils_get_flv_video_avc_packet_type(char* data, int size)
{
if (size < 2) {
return -1;
@ -950,7 +950,7 @@ char srs_get_avc_packet_type(char* data, int size)
return avc_packet_type;
}
char srs_get_frame_type(char* data, int size)
char srs_utils_get_flv_video_frame_type(char* data, int size)
{
if (size < 1) {
return -1;
@ -1526,16 +1526,16 @@ int srs_human_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int
int ret = ERROR_SUCCESS;
u_int32_t pts;
if (srs_parse_timestamp(timestamp, type, data, size, &pts) != 0) {
if (srs_utils_parse_timestamp(timestamp, type, data, size, &pts) != 0) {
return ret;
}
if (type == SRS_RTMP_TYPE_VIDEO) {
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))
srs_human_flv_video_codec_id2string(srs_utils_get_flv_video_codec_id(data, size)),
srs_human_flv_video_avc_packet_type2string(srs_utils_get_flv_video_avc_packet_type(data, size)),
srs_human_flv_video_frame_type2string(srs_utils_get_flv_video_frame_type(data, size))
);
} else if (type == SRS_RTMP_TYPE_AUDIO) {
srs_human_trace("Audio packet type=%s, dts=%d, pts=%d, size=%d",

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

@ -253,6 +253,11 @@ extern int srs_write_packet(srs_rtmp_t rtmp,
char type, u_int32_t timestamp, char* data, int size
);
/*************************************************************
**************************************************************
* version apis
**************************************************************
*************************************************************/
// get protocol stack version
extern int srs_version_major();
extern int srs_version_minor();
@ -267,17 +272,17 @@ extern int srs_version_revision();
* get the current system time in ms.
* use gettimeofday() to get system time.
*/
extern int64_t srs_get_time_ms();
extern int64_t srs_utils_get_time_ms();
/**
* get the send bytes.
*/
extern int64_t srs_get_nsend_bytes(srs_rtmp_t rtmp);
extern int64_t srs_utils_get_send_bytes(srs_rtmp_t rtmp);
/**
* get the recv bytes.
*/
extern int64_t srs_get_nrecv_bytes(srs_rtmp_t rtmp);
extern int64_t srs_utils_get_recv_bytes(srs_rtmp_t rtmp);
/**
* parse the dts and pts by time in header and data in tag,
@ -294,7 +299,7 @@ extern int64_t srs_get_nrecv_bytes(srs_rtmp_t rtmp);
* @remark, the pts=dts for audio or data.
* @remark, video only support h.264.
*/
extern int srs_parse_timestamp(
extern int srs_utils_parse_timestamp(
u_int32_t time, char type, char* data, int size,
u_int32_t* ppts
);
@ -310,7 +315,7 @@ extern int srs_parse_timestamp(
* 7 = AVC
* @return the code id. 0 for error.
*/
extern char srs_get_codec_id(char* data, int size);
extern char srs_utils_get_flv_video_codec_id(char* data, int size);
/**
* get the AVCPacketType of video tag.
@ -321,7 +326,7 @@ extern char srs_get_codec_id(char* data, int size);
* not required or supported)
* @return the avc packet type. -1(0xff) for error.
*/
extern char srs_get_avc_packet_type(char* data, int size);
extern char srs_utils_get_flv_video_avc_packet_type(char* data, int size);
/**
* get the FrameType of video tag.
@ -333,7 +338,7 @@ extern char srs_get_avc_packet_type(char* data, int size);
* 5 = video info/command frame
* @return the frame type. 0 for error.
*/
extern char srs_get_frame_type(char* data, int size);
extern char srs_utils_get_flv_video_frame_type(char* data, int size);
/*************************************************************
**************************************************************