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

for #155, fix all warnings for mac.

Browse source
This commit is contained in:
winlin 2015-03-13 12:53:01 +08:00
parent 51967afb52
commit a15ce1147f
12 changed files with 148 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/research/librtmp/srs_flv_injecter.c
View file

@ -38,6 +38,9 @@ gcc srs_flv_injecter.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_flv_i
#define ERROR_INJECTED 10000
int process(const char* in_flv_file, const char* out_flv_file, srs_flv_t* pic, srs_flv_t* poc);
int build_keyframes(srs_flv_t ic, srs_amf0_t *pname, srs_amf0_t* pdata, srs_amf0_t* pfilepositions, int64_t* pmetadata_end_offset);
int do_inject_flv(srs_flv_t ic, srs_flv_t oc, srs_amf0_t amf0_name, srs_amf0_t amf0_data, srs_amf0_t filepositions, int64_t metadata_end_offset);
int main(int argc, char** argv)
{
int ret = 0;

2
trunk/research/librtmp/srs_flv_parser.c
View file

@ -122,6 +122,8 @@ int parse_bytes(char* data, int size, char* hbuf, int hsize, char* tbuf, int tsi
if (size > print_size * 2) {
digit_to_char(data + size - print_size, size, tbuf, tsize - 1);
}
return 0;
}
int parse_flv(srs_flv_t flv)

10
trunk/research/librtmp/srs_h264_raw_publish.c
View file

@ -146,11 +146,11 @@ int main(int argc, char** argv)
}
srs_human_trace("publish stream success");
u_int32_t dts = 0;
u_int32_t pts = 0;
int dts = 0;
int pts = 0;
// @remark, the dts and pts if read from device, for instance, the encode lib,
// so we assume the fps is 25, and each h264 frame is 1000ms/25fps=40ms/f.
u_int32_t fps = 25;
int fps = 25;
// @remark, to decode the file.
char* p = h264_raw;
for (;p < h264_raw + file_size;) {
@ -158,9 +158,7 @@ int main(int argc, char** argv)
char* data = NULL;
int size = 0;
int nb_start_code = 0;
if (read_h264_frame(h264_raw, file_size, &p, &nb_start_code, fps,
&data, &size, &dts, &pts) < 0
) {
if (read_h264_frame(h264_raw, (int)file_size, &p, &nb_start_code, fps, &data, &size, &dts, &pts) < 0) {
srs_human_trace("read a frame from file buffer failed.");
goto rtmp_destroy;
}