mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Merge branch v5.0.116 into develop
1. MP3: Fix bug for TS or HLS with mp3 codec. v4.0.269 (#296) (#3333) 2. MP3: Add config examples for MP3. #296 3. Script: Refine GitHub actions.
This commit is contained in:
commit
b5aaf67c93
16 changed files with 212 additions and 55 deletions
|
@ -156,6 +156,9 @@ private:
|
|||
SrsHlsSegment* current;
|
||||
// The ts context, to keep cc continous between ts.
|
||||
SrsTsContext* context;
|
||||
private:
|
||||
// Latest audio codec, parsed from stream.
|
||||
SrsAudioCodecId latest_acodec_;
|
||||
public:
|
||||
SrsHlsMuxer();
|
||||
virtual ~SrsHlsMuxer();
|
||||
|
@ -166,6 +169,9 @@ public:
|
|||
virtual std::string ts_url();
|
||||
virtual srs_utime_t duration();
|
||||
virtual int deviation();
|
||||
public:
|
||||
SrsAudioCodecId latest_acodec();
|
||||
void set_latest_acodec(SrsAudioCodecId v);
|
||||
public:
|
||||
// Initialize the hls muxer.
|
||||
virtual srs_error_t initialize();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue