Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kernel: Fix demux SPS error for NVENC and LARIX. v6.0.22 #3389

Merged
merged 8 commits into from
Feb 8, 2023
Merged

Kernel: Fix demux SPS error for NVENC and LARIX. v6.0.22 #3389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dad5998
Kernel: Refine complie warnig.
chundonglinlin Jan 23, 2023
defe237
SRT: fix stream with NVENC and LARIX.(#3388)
chundonglinlin Jan 27, 2023
9396723
H265: remove parse pps_range_extension.
chundonglinlin Feb 1, 2023
6cf3672
Kernel: init struct SrsHevcProfileTierLevel.
chundonglinlin Feb 1, 2023
fe4bac7
Kernel: dumps SrsHevcProfileTierLevel.
chundonglinlin Feb 1, 2023
d93d84e
Kernel: Refine demux hevc pps.
chundonglinlin Feb 7, 2023
e6d38b8
Merge branch 'develop' into bugfix/fix-demux-codec-pps-error
winlinvip Feb 8, 2023
366b676
Release v6.0.22
winlinvip Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
SRT: fix stream with NVENC and LARIX.(#3388)
  • Loading branch information
@chundonglinlin
chundonglinlin committed Jan 27, 2023
commit defe23743df3063eeeec1dd9d906c4d833d5222f
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_srt_source.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ srs_error_t SrsRtmpFromSrtBridge::check_vps_sps_pps_change(SrsTsMessage* msg)
}

if ((err = live_source_->on_video(&rtmp)) != srs_success) {
return srs_error_wrap(err, "srt to rtmp sps/pps");
return srs_error_wrap(err, "srt to rtmp vps/sps/pps");
}

return err;
Expand Down
6 changes: 3 additions & 3 deletions trunk/src/kernel/srs_kernel_codec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ srs_error_t SrsFormat::video_avc_demux(SrsBuffer* stream, int64_t timestamp)
if (avc_packet_type == SrsVideoAvcFrameTraitSequenceHeader) {
// TODO: demux vps/sps/pps for hevc
if ((err = hevc_demux_hvcc(stream)) != srs_success) {
return srs_error_wrap(err, "demux hevc SPS/PPS");
return srs_error_wrap(err, "demux hevc VPS/SPS/PPS");
}
} else if (avc_packet_type == SrsVideoAvcFrameTraitNALU) {
// TODO: demux nalu for hevc
Expand Down Expand Up @@ -1047,7 +1047,7 @@ srs_error_t SrsFormat::hevc_demux_hvcc(SrsBuffer* stream)

// demux nalu
if ((err = hevc_demux_vps_sps_pps(&hevc_unit)) != srs_success) {
return srs_error_wrap(err, "hevc demux vps sps pps failed");
return srs_error_wrap(err, "hevc demux vps/sps/pps failed");
}
}

Expand Down Expand Up @@ -1649,7 +1649,7 @@ srs_error_t SrsFormat::hevc_demux_pps_rbsp(char* rbsp, int nb_rbsp)
pps->deblocking_filter_override_enabled_flag = bs.read_bit();
// pps_deblocking_filter_disabled_flag u(1)
pps->pps_deblocking_filter_disabled_flag = bs.read_bit();
if (pps->pps_deblocking_filter_disabled_flag) {
if (!pps->pps_deblocking_filter_disabled_flag) {
// pps_beta_offset_div2 se(v)
if ((err = bs.read_bits_se(pps->pps_beta_offset_div2)) != srs_success) {
return srs_error_wrap(err, "pps_beta_offset_div2");
Expand Down