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 #738, parse avcc/sps/pps/asc from mp4.

Browse source
This commit is contained in:
winlin 2017-02-04 14:57:07 +08:00
parent 9d21a8bb33
commit 253ac40312
8 changed files with 346 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

49
trunk/research/librtmp/srs_ingest_mp4.c
View file

@ -180,35 +180,34 @@ int do_proxy(srs_mp4_t mp4, srs_rtmp_t ortmp, int64_t re, int32_t* pstarttime, u
{
int ret = 0;
// packet data
char type;
int size;
char* data = NULL;
srs_human_trace("start ingest mp4 to RTMP stream");
for (;;) {
#if 0
// tag header
if ((ret = srs_flv_read_tag_header(flv, &type, &size, ptimestamp)) != 0) {
if (srs_flv_is_eof(ret)) {
srs_human_trace("parse completed.");
return 0;
// packet data
char type;
int32_t size;
char* data = NULL;
// Read a mp4 sample and convert to flv tag.
if (1) {
srs_mp4_sample_t sample;
if ((ret = srs_mp4_read_sample(mp4, &sample)) != 0) {
if (srs_mp4_is_eof(ret)) {
srs_human_trace("parse completed.");
return 0;
}
srs_human_trace("mp4 get sample failed. ret=%d", ret);
return ret;
}
srs_human_trace("flv get packet failed. ret=%d", ret);
return ret;
size = srs_mp4_sizeof(mp4, &sample);
data = (char*)malloc(size);
if ((ret = srs_mp4_to_flv_tag(mp4, &sample, &type, ptimestamp, data, size)) != 0) {
return ret;
}
srs_mp4_free_sample(&sample);
}
if (size <= 0) {
srs_human_trace("invalid size=%d", size);
break;
}
// TODO: FIXME: mem leak when error.
data = (char*)malloc(size);
if ((ret = srs_flv_read_tag_data(flv, data, size)) != 0) {
return ret;
}
#endif
uint32_t timestamp = *ptimestamp;
if ((ret = srs_human_print_rtmp_packet(type, timestamp, data, size)) != 0) {