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

Merge branch v4.0.269 into 5.0release

Browse source 
1. MP3: Fix bug for TS or HLS with mp3 codec. v4.0.269 (#296) (#3333)
This commit is contained in:
winlin 2022-12-25 12:10:03 +08:00
commit 05d7400cd5
9 changed files with 108 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2641,8 +2641,8 @@ SrsTsContextWriter::SrsTsContextWriter(ISrsStreamWriter* w, SrsTsContext* c, Srs
{
writer = w;
context = c;
acodec = ac;
acodec_ = ac;
vcodec = vc;
}
@ -2657,7 +2657,7 @@ srs_error_t SrsTsContextWriter::write_audio(SrsTsMessage* audio)
srs_info("hls: write audio pts=%" PRId64 ", dts=%" PRId64 ", size=%d",
audio->pts, audio->dts, audio->PES_packet_length);
if ((err = context->encode(writer, audio, vcodec, acodec)) != srs_success) {
if ((err = context->encode(writer, audio, vcodec, acodec_)) != srs_success) {
return srs_error_wrap(err, "ts: write audio");
}
srs_info("hls encode audio ok");
@ -2672,7 +2672,7 @@ srs_error_t SrsTsContextWriter::write_video(SrsTsMessage* video)
srs_info("hls: write video pts=%" PRId64 ", dts=%" PRId64 ", size=%d",
video->pts, video->dts, video->PES_packet_length);
if ((err = context->encode(writer, video, vcodec, acodec)) != srs_success) {
if ((err = context->encode(writer, video, vcodec, acodec_)) != srs_success) {
return srs_error_wrap(err, "ts: write video");
}
srs_info("hls encode video ok");
@ -2685,6 +2685,16 @@ SrsVideoCodecId SrsTsContextWriter::video_codec()
return vcodec;
}
SrsAudioCodecId SrsTsContextWriter::acodec()
{
return acodec_;
}
void SrsTsContextWriter::set_acodec(SrsAudioCodecId v)
{
acodec_ = v;
}
SrsEncFileWriter::SrsEncFileWriter()
{
memset(iv,0,16);
@ -3122,6 +3132,13 @@ srs_error_t SrsTsTransmuxer::write_audio(int64_t timestamp, char* data, int size
if (format->acodec->id == SrsAudioCodecIdAAC && format->audio->aac_packet_type == SrsAudioAacFrameTraitSequenceHeader) {
return err;
}
// Switch audio codec if not AAC.
if (tscw->acodec() != format->acodec->id) {
srs_trace("TS: Switch audio codec %d(%s) to %d(%s)", tscw->acodec(), srs_audio_codec_id2str(tscw->acodec()).c_str(),
format->acodec->id, srs_audio_codec_id2str(format->acodec->id).c_str());
tscw->set_acodec(format->acodec->id);
}
// the dts calc from rtmp/flv header.
// @remark for http ts stream, the timestamp is always monotonically increase,