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

H265: Support HEVC over HTTP-TS. v6.0.4 (#3275)

Browse source 
1. Update TS video codec to HEVC during streaming.
2. Return error when HEVC is disabled.
3. Parse HEVC NALU type by SrsHevcNaluTypeParse.
4. Show message when codec change for TS.

Co-authored-by: runner365 <shi.weibd@hotmail.com>
This commit is contained in:
Winlin 2022-11-23 17:05:21 +08:00 • committed by GitHub
parent 8debbe6db8
commit 70d5618979
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 178 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -555,7 +555,7 @@ srs_error_t SrsHlsMuxer::flush_audio(SrsTsMessageCache* cache)
return err;
}
srs_error_t SrsHlsMuxer::flush_video(SrsTsMessageCache* cache)
srs_error_t SrsHlsMuxer::flush_video(SrsTsMessageCache* cache, SrsVideoFrame* frame)
{
srs_error_t err = srs_success;
@ -573,6 +573,12 @@ srs_error_t SrsHlsMuxer::flush_video(SrsTsMessageCache* cache)
// update the duration of segment.
current->append(cache->video->dts / 90);
// The video codec might change during streaming. Note that the frame might be NULL, when reap segment.
if (frame && frame->vcodec()) {
SrsTsContextWriter* tscw = current->tscw;
tscw->update_video_codec(frame->vcodec()->id);
}
if ((err = current->tscw->write_video(cache->video)) != srs_success) {
return srs_error_wrap(err, "hls: write video");
@ -1025,7 +1031,7 @@ srs_error_t SrsHlsController::write_video(SrsVideoFrame* frame, int64_t dts)
}
// flush video when got one
if ((err = muxer->flush_video(tsmc)) != srs_success) {
if ((err = muxer->flush_video(tsmc, frame)) != srs_success) {
return srs_error_wrap(err, "hls: flush video");
}
@ -1057,7 +1063,7 @@ srs_error_t SrsHlsController::reap_segment()
}
// segment open, flush video first.
if ((err = muxer->flush_video(tsmc)) != srs_success) {
if ((err = muxer->flush_video(tsmc, NULL)) != srs_success) {
return srs_error_wrap(err, "hls: flush video");
}

2
trunk/src/app/srs_app_hls.hpp
View file

@ -193,7 +193,7 @@ public:
// Whether current hls muxer is pure audio mode.
virtual bool pure_audio();
virtual srs_error_t flush_audio(SrsTsMessageCache* cache);
virtual srs_error_t flush_video(SrsTsMessageCache* cache);
virtual srs_error_t flush_video(SrsTsMessageCache* cache, SrsVideoFrame* frame);
// Close segment(ts).
virtual srs_error_t segment_close();
private: