diff --git a/trunk/research/librtmp/srs_ingest_flv.c b/trunk/research/librtmp/srs_ingest_flv.c index 3e94b6109..e624a972d 100644 --- a/trunk/research/librtmp/srs_ingest_flv.c +++ b/trunk/research/librtmp/srs_ingest_flv.c @@ -49,6 +49,9 @@ void close_flv_file(int flv_fd); int flv_open_ic(int flv_fd); int flv_read_packet(int flv_fd, int* type, u_int32_t* timestamp, char** data, int* size); +int64_t re_create(); +int64_t re_update(int64_t re, u_int32_t time); + int main(int argc, char** argv) { int ret = 0; @@ -105,7 +108,7 @@ int main(int argc, char** argv) ortmp = srs_rtmp_create(out_rtmp_url); ret = proxy(flv_fd, ortmp); - trace("proxy completed"); + trace("ingest flv to RTMP completed"); srs_rtmp_destroy(ortmp); close_flv_file(flv_fd); @@ -113,20 +116,6 @@ int main(int argc, char** argv) return ret; } -int64_t re_create() -{ - return 0; -} -int64_t re_update(int64_t re, u_int32_t time) -{ - if (time - re > 500) { - usleep((time - re) * 1000); - return time; - } - - return re; -} - int proxy(int flv_fd, srs_rtmp_t ortmp) { int ret = 0; @@ -145,7 +134,7 @@ int proxy(int flv_fd, srs_rtmp_t ortmp) return ret; } - trace("start proxy RTMP stream"); + trace("start ingest flv to RTMP stream"); for (;;) { if ((ret = flv_read_packet(flv_fd, &type, ×tamp, &data, &size)) != 0) { trace("irtmp get packet failed. ret=%d", ret); @@ -192,6 +181,20 @@ int connect_oc(srs_rtmp_t ortmp) return ret; } +int64_t re_create() +{ + return 0; +} +int64_t re_update(int64_t re, u_int32_t time) +{ + if (time - re > 500) { + usleep((time - re) * 1000); + return time; + } + + return re; +} + int open_flv_file(char* in_flv_file) { return open(in_flv_file, O_RDONLY);