mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-24 19:50:38 +08:00
Compare commits
5 Commits
3caeda27f1
...
f1c09a9ac0
Author | SHA1 | Date | |
---|---|---|---|
|
f1c09a9ac0 | ||
|
6b2fcf7943 | ||
|
90bd28249e | ||
|
c3106d514a | ||
|
f03d414e82 |
@ -114,12 +114,14 @@ void MediaSink::checkTrackIfReady() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 等待音频超时时间
|
// 等待音频超时时间 [AUTO-TRANSLATED:5ec16b26]
|
||||||
|
// Wait for audio timeout time
|
||||||
GET_CONFIG(uint32_t, kWaitAudioTrackDataMS, General::kWaitAudioTrackDataMS);
|
GET_CONFIG(uint32_t, kWaitAudioTrackDataMS, General::kWaitAudioTrackDataMS);
|
||||||
if (_max_track_size > 1) {
|
if (_max_track_size > 1) {
|
||||||
for (auto it = _track_map.begin(); it != _track_map.end();) {
|
for (auto it = _track_map.begin(); it != _track_map.end();) {
|
||||||
if (it->second.first->getTrackType() == TrackAudio && _ticker.elapsedTime() > kWaitAudioTrackDataMS && !it->second.second) {
|
if (it->second.first->getTrackType() == TrackAudio && _ticker.elapsedTime() > kWaitAudioTrackDataMS && !it->second.second) {
|
||||||
// 音频超时且完全没收到音频数据,忽略音频
|
// 音频超时且完全没收到音频数据,忽略音频 [AUTO-TRANSLATED:0d0fbb13]
|
||||||
|
// Audio timeout and did not receive any audio data, ignore audio
|
||||||
auto index = it->second.first->getIndex();
|
auto index = it->second.first->getIndex();
|
||||||
WarnL << "Audio track index " << index << " codec " << it->second.first->getCodecName() << " receive no data for long "
|
WarnL << "Audio track index " << index << " codec " << it->second.first->getCodecName() << " receive no data for long "
|
||||||
<< _ticker.elapsedTime() << "ms. Ignore it!";
|
<< _ticker.elapsedTime() << "ms. Ignore it!";
|
||||||
|
@ -247,7 +247,8 @@ bool MP4MuxerMemory::inputFrame(const Frame::Ptr &frame) {
|
|||||||
_key_frame = false;
|
_key_frame = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (frame->keyFrame()) {
|
// only audio all frame is key frame
|
||||||
|
if (frame->keyFrame() || !haveVideo()) {
|
||||||
_key_frame = true;
|
_key_frame = true;
|
||||||
}
|
}
|
||||||
if (frame->getTrackType() == TrackVideo || !haveVideo()) {
|
if (frame->getTrackType() == TrackVideo || !haveVideo()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user