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 detect tool, support atc stream.

Browse source
This commit is contained in:
winlin 2014-06-11 14:16:44 +08:00
parent 17cb8c4550
commit 55b99c90c7
4 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
trunk/research/librtmp/srs_detect_rtmp.c
View file

@ -50,6 +50,7 @@ int main(int argc, char** argv)
// packet data // packet data
int type, size; int type, size;
u_int32_t basetime = 0;
u_int32_t timestamp = 0; u_int32_t timestamp = 0;
char* data; char* data;
@ -131,8 +132,13 @@ int main(int argc, char** argv)
} }
printf("got packet: type=%s, time=%d, size=%d\n", srs_type2string(type), timestamp, size); printf("got packet: type=%s, time=%d, size=%d\n", srs_type2string(type), timestamp, size);
if (time_first_packet <= 0) { if (SRS_RTMP_TYPE_VIDEO == type || SRS_RTMP_TYPE_AUDIO == type) {
time_first_packet = srs_get_time_ms(); if (time_first_packet <= 0) {
time_first_packet = srs_get_time_ms();
}
if (basetime <= 0) {
basetime = timestamp;
}
} }
free(data); free(data);
@ -142,7 +148,7 @@ int main(int argc, char** argv)
goto rtmp_destroy; goto rtmp_destroy;
} }
if (timestamp > duration * 1000) { if ((timestamp - basetime) > duration * 1000) {
printf("duration exceed, terminate.\n"); printf("duration exceed, terminate.\n");
goto rtmp_destroy; goto rtmp_destroy;
} }
@ -178,11 +184,11 @@ rtmp_destroy:
"start_play", (int)(time_play_stream - time_socket_connect), //#4 "start_play", (int)(time_play_stream - time_socket_connect), //#4
"first_packet", (int)(time_first_packet - time_play_stream), //#5 "first_packet", (int)(time_first_packet - time_play_stream), //#5
"last_packet", (int)(time_cleanup - time_first_packet), //#6 "last_packet", (int)(time_cleanup - time_first_packet), //#6
"stream", (int)(timestamp), //#7 "stream", (int)(timestamp - basetime), //#7
// expect = time_cleanup - time_first_packet // expect = time_cleanup - time_first_packet
// actual = stream // actual = stream
// delay = actual - expect // delay = actual - expect
"delay", (int)(timestamp - (time_cleanup - time_first_packet)), //#8 "delay", (int)(timestamp - basetime - (time_cleanup - time_first_packet)), //#8
"publish_kbps", (int)((time_duration <= 0)? 0:(bytes_nsend * 8 / time_duration)), //#9 "publish_kbps", (int)((time_duration <= 0)? 0:(bytes_nsend * 8 / time_duration)), //#9
"play_kbps", (int)((time_duration <= 0)? 0:(bytes_nrecv * 8 / time_duration)), //#10 "play_kbps", (int)((time_duration <= 0)? 0:(bytes_nrecv * 8 / time_duration)), //#10
// unit in ms. // unit in ms.

3
trunk/src/app/srs_app_config.hpp
View file

@ -34,9 +34,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_reload.hpp> #include <srs_app_reload.hpp>
// default vhost for rtmp
#define RTMP_VHOST_DEFAULT "__defaultVhost__"
#define SRS_LOCALHOST "127.0.0.1" #define SRS_LOCALHOST "127.0.0.1"
#define SRS_CONF_DEFAULT_PID_FILE "./objs/srs.pid" #define SRS_CONF_DEFAULT_PID_FILE "./objs/srs.pid"
#define SRS_DEFAULT_CONF "conf/srs.conf" #define SRS_DEFAULT_CONF "conf/srs.conf"

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

@ -263,7 +263,12 @@ int srs_connect_app(srs_rtmp_t rtmp)
Context* context = (Context*)rtmp; Context* context = (Context*)rtmp;
string tcUrl = "rtmp://"; string tcUrl = "rtmp://";
tcUrl += context->vhost; // TODO: FIXME: extrace shared method
if (context->vhost == RTMP_VHOST_DEFAULT) {
tcUrl += context->ip;
} else {
tcUrl += context->vhost;
}
tcUrl += ":"; tcUrl += ":";
tcUrl += context->port; tcUrl += context->port;
tcUrl += "/"; tcUrl += "/";

3
trunk/src/rtmp/srs_protocol_utility.hpp
View file

@ -31,6 +31,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string> #include <string>
// default vhost for rtmp
#define RTMP_VHOST_DEFAULT "__defaultVhost__"
#define RTMP_DEFAULT_PORT "1935" #define RTMP_DEFAULT_PORT "1935"
// the default chunk size for system. // the default chunk size for system.