aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-19 08:17:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve the getSnap code (#4128)

Browse Source
This commit is contained in:
PioLing 2025-01-20 14:32:11 +08:00 committed by GitHub
parent 2ede3197cd
commit 5160769112
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/FFmpegSource.cpp
View File

@ -358,10 +358,10 @@ static void makeSnapAsync(const string &play_url, const string &save_path, float
MediaPlayer::Ptr player; MediaPlayer::Ptr player;
}; };
auto holder = std::make_shared<Holder>(); auto holder = std::make_shared<Holder>();
holder->player = std::make_shared<MediaPlayer>(); auto player = std::make_shared<MediaPlayer>();
(*holder->player)[mediakit::Client::kTimeoutMS] = timeout_sec * 1000; (*player)[mediakit::Client::kTimeoutMS] = timeout_sec * 1000;
holder->player->setOnPlayResult([holder, save_path, cb, timeout_sec](const SockException &ex) mutable { player->setOnPlayResult([holder, save_path, cb, timeout_sec](const SockException &ex) mutable {
onceToken token(nullptr, [&]() { holder->player = nullptr; }); onceToken token(nullptr, [&]() { holder->player = nullptr; });
auto video = ex ? nullptr : dynamic_pointer_cast<VideoTrack>(holder->player->getTrack(TrackVideo, false)); auto video = ex ? nullptr : dynamic_pointer_cast<VideoTrack>(holder->player->getTrack(TrackVideo, false));
if (!video) { if (!video) {
@ -370,24 +370,25 @@ static void makeSnapAsync(const string &play_url, const string &save_path, float
} }
auto decoder = std::make_shared<FFmpegDecoder>(video); auto decoder = std::make_shared<FFmpegDecoder>(video);
auto new_holder = std::make_shared<Holder>(*holder); auto new_holder = std::make_shared<Holder>(*holder);
auto timer = EventPollerPool::Instance().getPoller()->doDelayTask(1000 * timeout_sec, [new_holder]() { auto timer = EventPollerPool::Instance().getPoller()->doDelayTask(1000 * timeout_sec, [cb, new_holder]() {
// 防止解码失败导致播放器无法释放 // 防止解码失败导致播放器无法释放
new_holder->player = nullptr; new_holder->player = nullptr;
cb(false, "decode frame timeout");
return 0; return 0;
}); });
auto success = false; auto done = false;
decoder->setOnDecode([save_path, new_holder, cb, success, timer](const FFmpegFrame::Ptr &frame) mutable { decoder->setOnDecode([save_path, new_holder, cb, done, timer](const FFmpegFrame::Ptr &frame) mutable {
if (success) { if (done) {
return; return;
} }
onceToken token(nullptr, [&]() { new_holder->player = nullptr; timer->cancel(); }); onceToken token(nullptr, [&]() { new_holder->player = nullptr; timer->cancel(); done = true; });
auto ret = FFmpegUtils::saveFrame(frame, save_path.data()); auto ret = FFmpegUtils::saveFrame(frame, save_path.data());
success = std::get<0>(ret); cb(std::get<0>(ret), std::get<1>(ret));
cb(success, std::get<1>(ret));
}); });
video->addDelegate([decoder](const Frame::Ptr &frame) { return decoder->inputFrame(frame, false, true); }); video->addDelegate([decoder](const Frame::Ptr &frame) { return decoder->inputFrame(frame, false, true); });
}); });
holder->player->play(play_url); player->play(play_url);
holder->player = std::move(player);
} }
#endif #endif