external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

refine the re of ingest flv, re cleanup always sleep

Browse source
This commit is contained in:
winlin 2014-05-21 09:31:38 +08:00
parent 1d6b096ce9
commit 2a8db3ab83
1 changed files with 49 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
trunk/research/librtmp/srs_ingest_flv.c
View file

@ -46,6 +46,7 @@ int flv_read_packet(int flv_fd, int* type, u_int32_t* timestamp, char** data, in
#define RE_PULSE_MS 300 #define RE_PULSE_MS 300
int64_t re_create(); int64_t re_create();
void re_update(int64_t re, u_int32_t time); void re_update(int64_t re, u_int32_t time);
void re_cleanup(int64_t re, u_int32_t time);
int64_t tools_main_entrance_startup_time; int64_t tools_main_entrance_startup_time;
int main(int argc, char** argv) int main(int argc, char** argv)
@ -115,15 +116,41 @@ int main(int argc, char** argv)
return ret; return ret;
} }
int proxy(int flv_fd, srs_rtmp_t ortmp) int do_proxy(int flv_fd, srs_rtmp_t ortmp, int64_t re, u_int32_t* ptimestamp)
{ {
int ret = 0; int ret = 0;
// packet data // packet data
int type, size; int type, size;
u_int32_t timestamp = 0;
char* data = NULL; char* data = NULL;
trace("start ingest flv to RTMP stream");
for (;;) {
if ((ret = flv_read_packet(flv_fd, &type, ptimestamp, &data, &size)) != 0) {
trace("irtmp get packet failed. ret=%d", ret);
return ret;
}
verbose("irtmp got packet: type=%s, time=%d, size=%d",
srs_type2string(type), timestamp, size);
if ((ret = srs_write_packet(ortmp, type, *ptimestamp, data, size)) != 0) {
trace("irtmp get packet failed. ret=%d", ret);
return ret;
}
verbose("ortmp sent packet: type=%s, time=%d, size=%d",
srs_type2string(type), *ptimestamp, size);
re_update(re, *ptimestamp);
}
return ret;
}
int proxy(int flv_fd, srs_rtmp_t ortmp)
{
int ret = 0;
u_int32_t timestamp = 0;
if ((ret = flv_open_ic(flv_fd)) != 0) { if ((ret = flv_open_ic(flv_fd)) != 0) {
return ret; return ret;
} }
@ -131,27 +158,12 @@ int proxy(int flv_fd, srs_rtmp_t ortmp)
return ret; return ret;
} }
// re
int64_t re = re_create(); int64_t re = re_create();
trace("start ingest flv to RTMP stream"); ret = do_proxy(flv_fd, ortmp, re, &timestamp);
for (;;) {
if ((ret = flv_read_packet(flv_fd, &type, &timestamp, &data, &size)) != 0) {
trace("irtmp get packet failed. ret=%d", ret);
return ret;
}
verbose("irtmp got packet: type=%s, time=%d, size=%d",
srs_type2string(type), timestamp, size);
if ((ret = srs_write_packet(ortmp, type, timestamp, data, size)) != 0) { // for the last pulse, always sleep.
trace("irtmp get packet failed. ret=%d", ret); re_cleanup(re, timestamp);
return ret;
}
verbose("ortmp sent packet: type=%s, time=%d, size=%d",
srs_type2string(type), timestamp, size);
re_update(re, timestamp);
}
return ret; return ret;
} }
@ -190,13 +202,11 @@ int64_t re_create()
int64_t deviation = re - tools_main_entrance_startup_time; int64_t deviation = re - tools_main_entrance_startup_time;
trace("deviation is %d ms, pulse is %d ms", (int)(deviation), (int)(RE_PULSE_MS)); trace("deviation is %d ms, pulse is %d ms", (int)(deviation), (int)(RE_PULSE_MS));
// so, we adjust time to max(0, deviation - pulse/10) // so, we adjust time to max(0, deviation)
// because the last pulse, we never sleep, so we use pulse/10, // because the last pulse, we already sleeped
// for example, when EOF at the 120ms of last pulse, int adjust = (int)(deviation);
// these bytes is additional data and to fill the deviation.
int adjust = (int)(deviation - (RE_PULSE_MS / 10));
if (adjust > 0) { if (adjust > 0) {
trace("adjust re time, sub %d ms", adjust); trace("adjust re time for %d ms", adjust);
re -= adjust; re -= adjust;
} else { } else {
trace("no need to adjust re time"); trace("no need to adjust re time");
@ -206,12 +216,24 @@ int64_t re_create()
} }
void re_update(int64_t re, u_int32_t time) void re_update(int64_t re, u_int32_t time)
{ {
// send by pulse algorithm.
int64_t now = srs_get_time_ms(); int64_t now = srs_get_time_ms();
int64_t diff = time - (now -re); int64_t diff = time - (now -re);
if (diff > RE_PULSE_MS) { if (diff > RE_PULSE_MS) {
usleep(diff * 1000); usleep(diff * 1000);
} }
} }
void re_cleanup(int64_t re, u_int32_t time)
{
// for the last pulse, always sleep.
// for the virtual live encoder long time publishing.
int64_t now = srs_get_time_ms();
int64_t diff = time - (now -re);
if (diff > 0) {
trace("re_cleanup sleep for the last pulse for %d ms", (int)diff);
usleep(diff * 1000);
}
}
int open_flv_file(char* in_flv_file) int open_flv_file(char* in_flv_file)
{ {