amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix crash issue when exit test_player

Browse Source
This commit is contained in:
xiongziliang 2024-02-07 22:40:41 +08:00
parent 4d28b99780
commit 306a32131c
1 changed files with 64 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
player/test_player.cpp
View File

@ -10,6 +10,7 @@
#include <signal.h> #include <signal.h>
#include "Util/logger.h" #include "Util/logger.h"
#include "Util/util.h"
#include <iostream> #include <iostream>
#include "Common/config.h" #include "Common/config.h"
#include "Rtsp/UDPServer.h" #include "Rtsp/UDPServer.h"
@ -48,6 +49,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstanc, LPSTR lpCmdLine,
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
#endif #endif
static char *url = argv[1]; static char *url = argv[1];
{
// 设置退出信号处理函数 // 设置退出信号处理函数
signal(SIGINT, [](int) { SDLDisplayerHelper::Instance().shutdown(); }); signal(SIGINT, [](int) { SDLDisplayerHelper::Instance().shutdown(); });
// 设置日志 // 设置日志
@ -83,9 +85,7 @@ int main(int argc, char *argv[]) {
return true; return true;
}); });
}); });
videoTrack->addDelegate([decoder](const Frame::Ptr &frame) { videoTrack->addDelegate([decoder](const Frame::Ptr &frame) { return decoder->inputFrame(frame, false, true); });
return decoder->inputFrame(frame, false, true);
});
} }
if (audioTrack) { if (audioTrack) {
@ -97,22 +97,17 @@ int main(int argc, char *argv[]) {
decoder->setOnDecode([audio_player, swr](const FFmpegFrame::Ptr &frame) mutable { decoder->setOnDecode([audio_player, swr](const FFmpegFrame::Ptr &frame) mutable {
if (!swr) { if (!swr) {
swr = std::make_shared<FFmpegSwr>(AV_SAMPLE_FMT_S16, frame->get()->channels, swr = std::make_shared<FFmpegSwr>(AV_SAMPLE_FMT_S16, frame->get()->channels, frame->get()->channel_layout, frame->get()->sample_rate);
frame->get()->channel_layout, frame->get()->sample_rate);
} }
auto pcm = swr->inputFrame(frame); auto pcm = swr->inputFrame(frame);
auto len = pcm->get()->nb_samples * pcm->get()->channels * av_get_bytes_per_sample((enum AVSampleFormat)pcm->get()->format); auto len = pcm->get()->nb_samples * pcm->get()->channels * av_get_bytes_per_sample((enum AVSampleFormat)pcm->get()->format);
audio_player->playPCM((const char *)(pcm->get()->data[0]), MIN(len, frame->get()->linesize[0])); audio_player->playPCM((const char *)(pcm->get()->data[0]), MIN(len, frame->get()->linesize[0]));
}); });
audioTrack->addDelegate([decoder](const Frame::Ptr &frame) { audioTrack->addDelegate([decoder](const Frame::Ptr &frame) { return decoder->inputFrame(frame, false, true); });
return decoder->inputFrame(frame, false, true);
});
} }
}); });
player->setOnShutdown([](const SockException &ex){ player->setOnShutdown([](const SockException &ex) { WarnL << "play shutdown: " << ex.what(); });
WarnL << "play shutdown: " << ex.what();
});
(*player)[Client::kRtpType] = atoi(argv[2]); (*player)[Client::kRtpType] = atoi(argv[2]);
// 不等待track ready再回调播放成功事件，这样可以加快秒开速度 // 不等待track ready再回调播放成功事件，这样可以加快秒开速度
@ -122,6 +117,8 @@ int main(int argc, char *argv[]) {
} }
player->play(argv[1]); player->play(argv[1]);
SDLDisplayerHelper::Instance().runLoop(); SDLDisplayerHelper::Instance().runLoop();
}
sleep(1);
return 0; return 0;
} }