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

set metadata time equals to sequence header time.

Browse source
This commit is contained in:
winlin 2014-05-13 15:30:20 +08:00
parent 91eabda7b8
commit 300f264e92
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
trunk/src/app/srs_app_source.cpp
View file

@ -1250,15 +1250,12 @@ void SrsSource::on_unpublish()
double queue_size = _srs_config->get_queue_length(_req->vhost); double queue_size = _srs_config->get_queue_length(_req->vhost);
consumer->set_queue_size(queue_size); consumer->set_queue_size(queue_size);
if (cache_metadata && (ret = consumer->enqueue(cache_metadata->copy(), sample_rate, frame_rate)) != ERROR_SUCCESS) {
srs_error("dispatch metadata failed. ret=%d", ret);
return ret;
}
srs_info("dispatch metadata success");
// if atc, update the sequence header to gop cache time. // if atc, update the sequence header to gop cache time.
if (atc && !gop_cache->empty()) { if (atc && !gop_cache->empty()) {
if (cache_metadata) {
cache_metadata->header.timestamp = gop_cache->get_start_time();
}
if (cache_sh_video) { if (cache_sh_video) {
cache_sh_video->header.timestamp = gop_cache->get_start_time(); cache_sh_video->header.timestamp = gop_cache->get_start_time();
} }
@ -1266,6 +1263,13 @@ void SrsSource::on_unpublish()
cache_sh_audio->header.timestamp = gop_cache->get_start_time(); cache_sh_audio->header.timestamp = gop_cache->get_start_time();
} }
} }
// copy metadata.
if (cache_metadata && (ret = consumer->enqueue(cache_metadata->copy(), sample_rate, frame_rate)) != ERROR_SUCCESS) {
srs_error("dispatch metadata failed. ret=%d", ret);
return ret;
}
srs_info("dispatch metadata success");
// copy sequence header // copy sequence header
if (cache_sh_video && (ret = consumer->enqueue(cache_sh_video->copy(), sample_rate, frame_rate)) != ERROR_SUCCESS) { if (cache_sh_video && (ret = consumer->enqueue(cache_sh_video->copy(), sample_rate, frame_rate)) != ERROR_SUCCESS) {