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 #293, support http mp3 streaming

Browse source
This commit is contained in:
winlin 2015-01-19 10:13:43 +08:00
parent 99bf397487
commit d364a81d8f
1 changed files with 12 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

40
trunk/src/app/srs_app_http_conn.cpp
View file

@ -245,6 +245,10 @@ int SrsMp3StreamEncoder::initialize(SrsFileWriter* w)
return ret; return ret;
} }
if ((ret = enc->write_header()) != ERROR_SUCCESS) {
return ret;
}
return ret; return ret;
} }
@ -316,22 +320,24 @@ int SrsLiveStream::serve_http(ISrsGoHttpResponseWriter* w, SrsHttpMessage* r)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
bool serve_flv_streaming = false; ISrsStreamEncoder* enc = NULL;
bool serve_aac_streaming = false;
bool serve_mp3_streaming = false;
srs_assert(entry); srs_assert(entry);
if (srs_string_ends_with(entry->pattern, ".flv")) { if (srs_string_ends_with(entry->pattern, ".flv")) {
serve_flv_streaming = true; w->header()->set_content_type("video/x-flv");
enc = new SrsFlvStreamEncoder();
} else if (srs_string_ends_with(entry->pattern, ".aac")) { } else if (srs_string_ends_with(entry->pattern, ".aac")) {
serve_aac_streaming = true; w->header()->set_content_type("audio/x-aac");
enc = new SrsAacStreamEncoder();
} else if (srs_string_ends_with(entry->pattern, ".mp3")) { } else if (srs_string_ends_with(entry->pattern, ".mp3")) {
serve_mp3_streaming = true; w->header()->set_content_type("audio/mpeg");
enc = new SrsMp3StreamEncoder();
} else { } else {
ret = ERROR_HTTP_LIVE_STREAM_EXT; ret = ERROR_HTTP_LIVE_STREAM_EXT;
srs_error("http: unsupported pattern %s", entry->pattern.c_str()); srs_error("http: unsupported pattern %s", entry->pattern.c_str());
return ret; return ret;
} }
SrsAutoFree(ISrsStreamEncoder, enc);
// create consumer of souce. // create consumer of souce.
SrsConsumer* consumer = NULL; SrsConsumer* consumer = NULL;
@ -345,30 +351,8 @@ int SrsLiveStream::serve_http(ISrsGoHttpResponseWriter* w, SrsHttpMessage* r)
SrsMessageArray msgs(SRS_PERF_MW_MSGS); SrsMessageArray msgs(SRS_PERF_MW_MSGS);
// TODO: FIMXE: add pithy print. // TODO: FIMXE: add pithy print.
// write http header for streaming.
// use chunked encoding, for we donot specifes the content length.
if (serve_flv_streaming) {
w->header()->set_content_type("video/x-flv");
}
if (serve_aac_streaming) {
w->header()->set_content_type("audio/x-aac");
}
// the memory writer. // the memory writer.
SrsStreamWriter writer(w); SrsStreamWriter writer(w);
ISrsStreamEncoder* enc = NULL;
if (serve_flv_streaming) {
enc = new SrsFlvStreamEncoder();
}
if (serve_aac_streaming) {
enc = new SrsAacStreamEncoder();
}
if (serve_mp3_streaming) {
enc = new SrsMp3StreamEncoder();
}
SrsAutoFree(ISrsStreamEncoder, enc);
if ((ret = enc->initialize(&writer)) != ERROR_SUCCESS) { if ((ret = enc->initialize(&writer)) != ERROR_SUCCESS) {
return ret; return ret;
} }