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 #913, http callback use complex error

Browse source
This commit is contained in:
winlin 2017-09-22 19:54:50 +08:00
parent 59b53dab8b
commit 20a42599f3
22 changed files with 264 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

17
trunk/src/main/srs_main_ingest_hls.cpp
View file

@ -366,17 +366,24 @@ int SrsIngestHlsInput::parseAac(ISrsAacHandler* handler, char* body, int nb_body
int SrsIngestHlsInput::parseM3u8(SrsHttpUri* url, double& td, double& duration)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
SrsHttpClient client;
srs_trace("parse input hls %s", url->get_url().c_str());
if ((ret = client.initialize(url->get_host(), url->get_port())) != ERROR_SUCCESS) {
if ((err = client.initialize(url->get_host(), url->get_port())) != srs_success) {
// TODO: FIXME: Use error
ret = srs_error_code(err);
srs_freep(err);
srs_error("connect to server failed. ret=%d", ret);
return ret;
}
ISrsHttpMessage* msg = NULL;
if ((ret = client.get(url->get_path(), "", &msg)) != ERROR_SUCCESS) {
if ((err = client.get(url->get_path(), "", &msg)) != srs_success) {
// TODO: FIXME: Use error
ret = srs_error_code(err);
srs_freep(err);
srs_error("HTTP GET %s failed. ret=%d", url->get_url().c_str(), ret);
return ret;
}
@ -575,6 +582,7 @@ void SrsIngestHlsInput::remove_dirty()
int SrsIngestHlsInput::SrsTsPiece::fetch(string m3u8)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
if (skip || sent || !body.empty()) {
return ret;
@ -598,7 +606,10 @@ int SrsIngestHlsInput::SrsTsPiece::fetch(string m3u8)
}
ISrsHttpMessage* msg = NULL;
if ((ret = client.get(uri.get_path(), "", &msg)) != ERROR_SUCCESS) {
if ((err = client.get(uri.get_path(), "", &msg)) != srs_success) {
// TODO: FIXME: Use error
ret = srs_error_code(err);
srs_freep(err);
srs_error("HTTP GET %s failed. ret=%d", uri.get_url().c_str(), ret);
return ret;
}