diff --git a/src/Device/PlayerProxy.cpp b/src/Device/PlayerProxy.cpp index 1d4b0010..2d318092 100644 --- a/src/Device/PlayerProxy.cpp +++ b/src/Device/PlayerProxy.cpp @@ -38,6 +38,36 @@ using namespace ZL::Thread; namespace ZL { namespace DEV { +static uint8_t s_mute_adts[] = {0xff, 0xf1, 0x6c, 0x40, 0x2d, 0x3f, 0xfc, 0x00, 0xe0, 0x34, 0x20, 0xad, 0xf2, 0x3f, 0xb5, 0xdd, + 0x73, 0xac, 0xbd, 0xca, 0xd7, 0x7d, 0x4a, 0x13, 0x2d, 0x2e, 0xa2, 0x62, 0x02, 0x70, 0x3c, 0x1c, + 0xc5, 0x63, 0x55, 0x69, 0x94, 0xb5, 0x8d, 0x70, 0xd7, 0x24, 0x6a, 0x9e, 0x2e, 0x86, 0x24, 0xea, + 0x4f, 0xd4, 0xf8, 0x10, 0x53, 0xa5, 0x4a, 0xb2, 0x9a, 0xf0, 0xa1, 0x4f, 0x2f, 0x66, 0xf9, 0xd3, + 0x8c, 0xa6, 0x97, 0xd5, 0x84, 0xac, 0x09, 0x25, 0x98, 0x0b, 0x1d, 0x77, 0x04, 0xb8, 0x55, 0x49, + 0x85, 0x27, 0x06, 0x23, 0x58, 0xcb, 0x22, 0xc3, 0x20, 0x3a, 0x12, 0x09, 0x48, 0x24, 0x86, 0x76, + 0x95, 0xe3, 0x45, 0x61, 0x43, 0x06, 0x6b, 0x4a, 0x61, 0x14, 0x24, 0xa9, 0x16, 0xe0, 0x97, 0x34, + 0xb6, 0x58, 0xa4, 0x38, 0x34, 0x90, 0x19, 0x5d, 0x00, 0x19, 0x4a, 0xc2, 0x80, 0x4b, 0xdc, 0xb7, + 0x00, 0x18, 0x12, 0x3d, 0xd9, 0x93, 0xee, 0x74, 0x13, 0x95, 0xad, 0x0b, 0x59, 0x51, 0x0e, 0x99, + 0xdf, 0x49, 0x98, 0xde, 0xa9, 0x48, 0x4b, 0xa5, 0xfb, 0xe8, 0x79, 0xc9, 0xe2, 0xd9, 0x60, 0xa5, + 0xbe, 0x74, 0xa6, 0x6b, 0x72, 0x0e, 0xe3, 0x7b, 0x28, 0xb3, 0x0e, 0x52, 0xcc, 0xf6, 0x3d, 0x39, + 0xb7, 0x7e, 0xbb, 0xf0, 0xc8, 0xce, 0x5c, 0x72, 0xb2, 0x89, 0x60, 0x33, 0x7b, 0xc5, 0xda, 0x49, + 0x1a, 0xda, 0x33, 0xba, 0x97, 0x9e, 0xa8, 0x1b, 0x6d, 0x5a, 0x77, 0xb6, 0xf1, 0x69, 0x5a, 0xd1, + 0xbd, 0x84, 0xd5, 0x4e, 0x58, 0xa8, 0x5e, 0x8a, 0xa0, 0xc2, 0xc9, 0x22, 0xd9, 0xa5, 0x53, 0x11, + 0x18, 0xc8, 0x3a, 0x39, 0xcf, 0x3f, 0x57, 0xb6, 0x45, 0x19, 0x1e, 0x8a, 0x71, 0xa4, 0x46, 0x27, + 0x9e, 0xe9, 0xa4, 0x86, 0xdd, 0x14, 0xd9, 0x4d, 0xe3, 0x71, 0xe3, 0x26, 0xda, 0xaa, 0x17, 0xb4, + 0xac, 0xe1, 0x09, 0xc1, 0x0d, 0x75, 0xba, 0x53, 0x0a, 0x37, 0x8b, 0xac, 0x37, 0x39, 0x41, 0x27, + 0x6a, 0xf0, 0xe9, 0xb4, 0xc2, 0xac, 0xb0, 0x39, 0x73, 0x17, 0x64, 0x95, 0xf4, 0xdc, 0x33, 0xbb, + 0x84, 0x94, 0x3e, 0xf8, 0x65, 0x71, 0x60, 0x7b, 0xd4, 0x5f, 0x27, 0x79, 0x95, 0x6a, 0xba, 0x76, + 0xa6, 0xa5, 0x9a, 0xec, 0xae, 0x55, 0x3a, 0x27, 0x48, 0x23, 0xcf, 0x5c, 0x4d, 0xbc, 0x0b, 0x35, + 0x5c, 0xa7, 0x17, 0xcf, 0x34, 0x57, 0xc9, 0x58, 0xc5, 0x20, 0x09, 0xee, 0xa5, 0xf2, 0x9c, 0x6c, + 0x39, 0x1a, 0x77, 0x92, 0x9b, 0xff, 0xc6, 0xae, 0xf8, 0x36, 0xba, 0xa8, 0xaa, 0x6b, 0x1e, 0x8c, + 0xc5, 0x97, 0x39, 0x6a, 0xb8, 0xa2, 0x55, 0xa8, 0xf8}; +#define MUTE_ADTS_CHN_CNT 1 +#define MUTE_ADTS_SAMPLE_BIT 16 +#define MUTE_ADTS_SAMPLE_RATE 8000 +#define MUTE_ADTS_DATA s_mute_adts +#define MUTE_ADTS_DATA_LEN sizeof(s_mute_adts) +#define MUTE_ADTS_DATA_MS 120 + PlayerProxy::PlayerProxy(const char *strVhost, const char *strApp, const char *strSrc, @@ -60,6 +90,9 @@ void PlayerProxy::play(const char* strUrl) { } if(strongSelf->m_pChn){ strongSelf->m_pChn->inputH264((char *)data.data.data(), data.data.size(), data.timeStamp); + if(!strongSelf->m_haveAudio){ + strongSelf->makeMuteAudio(data.timeStamp); + } }else{ strongSelf->initMedia(); } @@ -140,12 +173,20 @@ void PlayerProxy::initMedia() { info.iHeight = getVideoHeight(); m_pChn->initVideo(info); } + + m_haveAudio = containAudio(); if (containAudio()) { AudioInfo info; info.iSampleRate = getAudioSampleRate(); info.iChannel = getAudioChannel(); info.iSampleBit = getAudioSampleBit(); m_pChn->initAudio(info); + }else{ + AudioInfo info; + info.iSampleRate = MUTE_ADTS_SAMPLE_RATE; + info.iChannel = MUTE_ADTS_CHN_CNT; + info.iSampleBit = MUTE_ADTS_SAMPLE_BIT; + m_pChn->initAudio(info); } } bool PlayerProxy::shutDown() { @@ -161,6 +202,15 @@ bool PlayerProxy::shutDown() { return true; } +void PlayerProxy::makeMuteAudio(uint32_t stamp) { + auto iAudioIndex = stamp / MUTE_ADTS_DATA_MS; + if(m_iAudioIndex != iAudioIndex){ + m_iAudioIndex = iAudioIndex; + m_pChn->inputAAC((char *)MUTE_ADTS_DATA,MUTE_ADTS_DATA_LEN, m_iAudioIndex * MUTE_ADTS_DATA_MS); + //DebugL << m_iAudioIndex * MUTE_ADTS_DATA_MS << " " << stamp; + } +} -} /* namespace Player */ + + } /* namespace Player */ } /* namespace ZL */ diff --git a/src/Device/PlayerProxy.h b/src/Device/PlayerProxy.h index ac698f79..9d2f72a7 100644 --- a/src/Device/PlayerProxy.h +++ b/src/Device/PlayerProxy.h @@ -55,17 +55,20 @@ public: void play(const char* strUrl) override; bool shutDown() override; +private: + void initMedia(); + void rePlay(const string &strUrl,int iFailedCnt); + void makeMuteAudio(uint32_t stamp); private: bool m_bEnableHls; bool m_bEnableMp4; int m_iRetryCount; DevChannel::Ptr m_pChn; - string m_strVhost; - string m_strApp; - string m_strSrc; -private: - void initMedia(); - void rePlay(const string &strUrl,int iFailedCnt); + string m_strVhost; + string m_strApp; + string m_strSrc; + bool m_haveAudio = false; + int m_iAudioIndex = 0; }; } /* namespace Player */ diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d90f431c..eccecd5d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -11,7 +11,7 @@ find_package(AVUTIL QUIET) if(AVUTIL_FOUND) include_directories(${AVUTIL_INCLUDE_DIR}) list(APPEND LINK_LIB_LIST ${AVUTIL_LIBRARIES}) - message(STATUS " found libutil") + message(STATUS "found libutil ${AVUTIL_LIBRARIES}") endif() #查找ffmpeg/libavcodec是否安装 @@ -19,7 +19,7 @@ find_package(AVCODEC QUIET) if(AVCODEC_FOUND) include_directories(${AVCODEC_INCLUDE_DIR}) list(APPEND LINK_LIB_LIST ${AVCODEC_LIBRARIES}) - message(STATUS " found libavcodec") + message(STATUS "found libavcodec ${AVCODEC_LIBRARIES}") endif() aux_source_directory(. TEST_SRC_LIST) diff --git a/tests/YuvDisplayer.h b/tests/YuvDisplayer.h index 69d73b45..8d15603a 100644 --- a/tests/YuvDisplayer.h +++ b/tests/YuvDisplayer.h @@ -42,6 +42,8 @@ using namespace ZL::Util; #define REFRESH_EVENT (SDL_USEREVENT + 1) + +#ifndef __MACH__ class SDLDisplayerHelper { public: @@ -104,6 +106,8 @@ private: }; +#endif //__MACH__ + class YuvDisplayer { public: YuvDisplayer(void *hwnd = nullptr,const char *title = "untitled"){ @@ -121,7 +125,9 @@ public: },nullptr); InfoL << "SDL_Init"; }, []() { +#ifndef __MACH__ SDLDisplayerHelper::Destory(); +#endif SDL_Quit(); }); diff --git a/tests/test_player.cpp b/tests/test_player.cpp index 1534bf5f..721d4348 100644 --- a/tests/test_player.cpp +++ b/tests/test_player.cpp @@ -73,16 +73,29 @@ int main(int argc, char *argv[]) { H264Decoder decoder; YuvDisplayer displayer; player->setOnVideoCB([&](const H264Frame &frame) { +#ifndef __MACH__ SDLDisplayerHelper::Instance().doTask([&, frame]() { AVFrame *pFrame = nullptr; bool flag = decoder.inputVideo((unsigned char *) frame.data.data(), frame.data.size(), frame.timeStamp, &pFrame); if (flag) { //DebugL << pFrame->pkt_pts; - displayer.displayYUV(pFrame); + EventPoller::Instance().sync([&](){ + displayer.displayYUV(pFrame); + }); } return true; }); +#else + AVFrame *pFrame = nullptr; + bool flag = decoder.inputVideo((unsigned char *) frame.data.data(), frame.data.size(), frame.timeStamp, + &pFrame); + if (flag) { + //DebugL << pFrame->pkt_pts; + displayer.displayYUV(pFrame); + } +#endif + }); EventPoller::Instance().runLoop();