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 HLS. v6.0.11 (#465) (#3354)

Browse source 
* H265: Support HEVC over HLS.(#465)

* HLS: Support HEVC over HLS. v6.0.11 (#465)

Co-authored-by: winlin <winlin@vip.126.com>
This commit is contained in:
chundonglinlin 2023-01-02 09:04:50 +08:00 • committed by GitHub
parent 4bfc4de710
commit fff8d9863c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 58 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

20
trunk/src/kernel/srs_kernel_ts.cpp
View file

@ -2678,7 +2678,7 @@ SrsTsContextWriter::SrsTsContextWriter(ISrsStreamWriter* w, SrsTsContext* c, Srs
context = c;
acodec_ = ac;
vcodec = vc;
vcodec_ = vc;
}
SrsTsContextWriter::~SrsTsContextWriter()
@ -2692,8 +2692,8 @@ srs_error_t SrsTsContextWriter::write_audio(SrsTsMessage* audio)
srs_info("hls: write audio codec=%d/%d, pts=%" PRId64 ", dts=%" PRId64 ", size=%d",
acodec_, vcodec_, audio->pts, audio->dts, audio->PES_packet_length);
if ((err = context->encode(writer, audio, vcodec, acodec_)) != srs_success) {
return srs_error_wrap(err, "ts: write audio acodec=%d, vcodec=%d", acodec_, vcodec);
if ((err = context->encode(writer, audio, vcodec_, acodec_)) != srs_success) {
return srs_error_wrap(err, "ts: write audio");
}
srs_info("hls encode audio ok");
@ -2707,22 +2707,22 @@ srs_error_t SrsTsContextWriter::write_video(SrsTsMessage* video)
srs_info("hls: write video codec=%d/%d, pts=%" PRId64 ", dts=%" PRId64 ", size=%d",
acodec_, vcodec_, video->pts, video->dts, video->PES_packet_length);
if ((err = context->encode(writer, video, vcodec, acodec_)) != srs_success) {
return srs_error_wrap(err, "ts: write video acodec=%d, vcodec=%d", acodec_, vcodec);
if ((err = context->encode(writer, video, vcodec_, acodec_)) != srs_success) {
return srs_error_wrap(err, "ts: write video");
}
srs_info("hls encode video ok");
return err;
}
SrsVideoCodecId SrsTsContextWriter::video_codec()
SrsVideoCodecId SrsTsContextWriter::vcodec()
{
return vcodec;
return vcodec_;
}
void SrsTsContextWriter::update_video_codec(SrsVideoCodecId v)
void SrsTsContextWriter::set_vcodec(SrsVideoCodecId v)
{
vcodec = v;
vcodec_ = v;
}
SrsAudioCodecId SrsTsContextWriter::acodec()
@ -3293,7 +3293,7 @@ srs_error_t SrsTsTransmuxer::write_video(int64_t timestamp, char* data, int size
}
// The video codec might change during streaming.
tscw->update_video_codec(format->vcodec->id);
tscw->set_vcodec(format->vcodec->id);
// ignore sequence header
if (format->video->frame_type == SrsVideoAvcFrameTypeKeyFrame && format->video->avc_packet_type == SrsVideoAvcFrameTraitSequenceHeader) {

6
trunk/src/kernel/srs_kernel_ts.hpp
View file

@ -1259,7 +1259,7 @@ class SrsTsContextWriter
private:
// User must config the codec in right way.
// @see https://github.com/ossrs/srs/issues/301
SrsVideoCodecId vcodec;
SrsVideoCodecId vcodec_;
SrsAudioCodecId acodec_;
private:
SrsTsContext* context;
@ -1275,8 +1275,8 @@ public:
virtual srs_error_t write_video(SrsTsMessage* video);
public:
// Get or update the video codec of ts muxer.
virtual SrsVideoCodecId video_codec();
virtual void update_video_codec(SrsVideoCodecId v);
virtual SrsVideoCodecId vcodec();
virtual void set_vcodec(SrsVideoCodecId v);
public:
// Get and set the audio codec.
SrsAudioCodecId acodec();