Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into feature/transcode2

This commit is contained in:
cqm
2024-12-02 18:12:57 +08:00
82 changed files with 1704 additions and 567 deletions

View File

@@ -388,11 +388,7 @@ Track::Ptr AACTrack::clone() const {
}
Sdp::Ptr AACTrack::getSdp(uint8_t payload_type) const {
if (!ready()) {
WarnL << getCodecName() << " Track未准备好";
return nullptr;
}
return std::make_shared<AACSdp>(getExtraData()->toString(), payload_type, getAudioSampleRate(), getAudioChannel(), getBitRate() / 1024);
return std::make_shared<AACSdp>(getExtraData()->toString(), payload_type, getAudioSampleRate(), getAudioChannel(), getBitRate() >> 10);
}
namespace {