mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
* H265: Refine demux vps/sps/pps interface for SRT and GB. * H265: Support HEVC over SRT.(#465) * UTest: add hevc vps/sps/pps utest. * SRT: fix mpegts.js play hevc http-flv error. * UTest: add HTTP-TS and HTTP-FLV blackbox test. * Update release v6.0.20 Co-authored-by: Winlin <winlin@vip.126.com> Co-authored-by: Haibo Chen <495810242@qq.com> Co-authored-by: john <hondaxiao@tencent.com>
This commit is contained in:
parent
7922057467
commit
ef90da352e
13 changed files with 991 additions and 7 deletions
|
@ -117,12 +117,19 @@ public:
|
|||
public:
|
||||
virtual srs_error_t on_ts_message(SrsTsMessage* msg);
|
||||
private:
|
||||
srs_error_t on_ts_video(SrsTsMessage* msg, SrsBuffer* avs);
|
||||
srs_error_t on_ts_video_avc(SrsTsMessage* msg, SrsBuffer* avs);
|
||||
srs_error_t on_ts_audio(SrsTsMessage* msg, SrsBuffer* avs);
|
||||
srs_error_t check_sps_pps_change(SrsTsMessage* msg);
|
||||
srs_error_t on_h264_frame(SrsTsMessage* msg, std::vector<std::pair<char*, int> >& ipb_frames);
|
||||
srs_error_t check_audio_sh_change(SrsTsMessage* msg, uint32_t pts);
|
||||
srs_error_t on_aac_frame(SrsTsMessage* msg, uint32_t pts, char* frame, int frame_size);
|
||||
|
||||
#ifdef SRS_H265
|
||||
srs_error_t on_ts_video_hevc(SrsTsMessage *msg, SrsBuffer *avs);
|
||||
srs_error_t check_vps_sps_pps_change(SrsTsMessage *msg);
|
||||
srs_error_t on_hevc_frame(SrsTsMessage *msg, std::vector<std::pair<char *, int>> &ipb_frames);
|
||||
#endif
|
||||
|
||||
private:
|
||||
SrsTsContext* ts_ctx_;
|
||||
|
||||
|
@ -131,6 +138,13 @@ private:
|
|||
std::string sps_;
|
||||
std::string pps_;
|
||||
|
||||
#ifdef SRS_H265
|
||||
bool vps_sps_pps_change_;
|
||||
std::string hevc_vps_;
|
||||
std::string hevc_sps_;
|
||||
std::string hevc_pps_;
|
||||
#endif
|
||||
|
||||
// Record audio sepcific config had changed, if change, need to generate new audio sh frame.
|
||||
bool audio_sh_change_;
|
||||
std::string audio_sh_;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue