Explorar o código

修复音频播放代码未生效的问题

huihui hai 3 semanas
pai
achega
073e280bb3

+ 2 - 1
module/VideoPlayer/CMakeLists.txt

@@ -14,7 +14,8 @@ file(GLOB_RECURSE ALL_SOURCE
 list(REMOVE_ITEM ALL_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp)
 
 if (USE_PCM_PLAYER)
-    add_definitions(-DUSE_PCM_PLAYER -DENABLE_SDL)
+    # add_definitions(-DUSE_PCM_PLAYER -DENABLE_SDL)
+    target_compile_definitions (${PROJECT_NAME} PRIVATE USE_PCM_PLAYER ENABLE_SDL)
 else()
     #排除PcmPlayer
     list(REMOVE_ITEM ALL_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/PcmPlayer/PcmPlayer_SDL.cpp)

+ 2 - 2
module/VideoPlayer/src/PcmPlayer/PcmPlayer.cpp

@@ -148,11 +148,11 @@ void PcmPlayer::playAudioBuffer(void *stream, int len)
         m_current_pts = pcm_frame->pts();
     }
 
-    // printf("%s:%d %d %d m_is_stop=%d\n", __FILE__, __LINE__, len, m_pcm_frame_list.size(), m_is_stop);
+    // printf("%s:%d %d %d m_is_stop=%d m_is_mute=%d\n", __FILE__, __LINE__, len, m_pcm_frame_list.size(), m_is_stop, m_is_mute);
     if (m_last_frame_buffer_size > 0)
     {
-//        fprintf(stderr, "%s %d %d \n", __FUNCTION__, pcmFramePtr->getSize(), len);
         int buffer_size = std::min(m_last_frame_buffer_size, len);
+        // fprintf(stderr, "%s buffer_size=%d len=%d \n", __FUNCTION__, buffer_size, len);
         if (m_is_mute)// || mIsNeedPause) //静音 或者 是在暂停的时候跳转了
         {
             memset(stream, 0x0, len);