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 bug #293, support http aac stream

Browse source
This commit is contained in:
winlin 2015-01-19 00:05:12 +08:00
parent 7674524c31
commit 3244c083c7
4 changed files with 148 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -214,9 +214,10 @@ int SrsAacStreamEncoder::write_audio(int64_t timestamp, char* data, int size)
return enc->write_audio(timestamp, data, size);
}
int SrsAacStreamEncoder::write_video(int64_t timestamp, char* data, int size)
int SrsAacStreamEncoder::write_video(int64_t /*timestamp*/, char* /*data*/, int /*size*/)
{
return enc->write_video(timestamp, data, size);
// aac ignore any flv video.
return ERROR_SUCCESS;
}
int SrsAacStreamEncoder::write_metadata(int64_t /*timestamp*/, char* /*data*/, int /*size*/)
@ -318,6 +319,9 @@ int SrsLiveStream::serve_http(ISrsGoHttpResponseWriter* w, SrsHttpMessage* r)
if (serve_flv_streaming) {
enc = new SrsFlvStreamEncoder();
}
if (serve_aac_streaming) {
enc = new SrsAacStreamEncoder();
}
SrsAutoFree(ISrsStreamEncoder, enc);
if ((ret = enc->initialize(&writer)) != ERROR_SUCCESS) {