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 #299, refine the codec info structure.

Browse source
This commit is contained in:
winlin 2017-02-11 23:09:23 +08:00
parent 5e419c66f8
commit c4a510b834
10 changed files with 574 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

9
trunk/src/app/srs_app_hls.cpp
View file

@ -50,6 +50,7 @@ using namespace std;
#include <srs_kernel_ts.hpp>
#include <srs_app_utility.hpp>
#include <srs_app_http_hooks.hpp>
#include <srs_protocol_format.hpp>
// drop the segment when duration of ts too small.
#define SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS 100
@ -1117,13 +1118,12 @@ SrsHls::SrsHls()
{
req = NULL;
hub = NULL;
format = NULL;
enabled = false;
disposable = false;
last_update_time = 0;
codec = new SrsAvcAacCodec();
sample = new SrsCodecSample();
jitter = new SrsRtmpJitter();
muxer = new SrsHlsMuxer();
@ -1135,8 +1135,6 @@ SrsHls::SrsHls()
SrsHls::~SrsHls()
{
srs_freep(codec);
srs_freep(sample);
srs_freep(jitter);
srs_freep(muxer);
@ -1188,12 +1186,13 @@ int SrsHls::cycle()
return ret;
}
int SrsHls::initialize(SrsOriginHub* h, SrsRequest* r)
int SrsHls::initialize(SrsOriginHub* h, SrsFormat* f, SrsRequest* r)
{
int ret = ERROR_SUCCESS;
hub = h;
req = r;
format = f;
if ((ret = muxer->initialize()) != ERROR_SUCCESS) {
return ret;