Commit 11e993d8 by ziyue

修改接口

parent 01310979
...@@ -122,7 +122,7 @@ int AudioPlayer::getPCMData(char *buf, int size) { ...@@ -122,7 +122,7 @@ int AudioPlayer::getPCMData(char *buf, int size) {
return size; return size;
} }
void AudioPlayer::inputFrame(const char *data, size_t size) { void AudioPlayer::playPCM(const char *data, size_t size) {
lock_guard<mutex> lck(_mtx); lock_guard<mutex> lck(_mtx);
_buffer.append(data, size); _buffer.append(data, size);
} }
...@@ -68,7 +68,7 @@ public: ...@@ -68,7 +68,7 @@ public:
~AudioPlayer() override; ~AudioPlayer() override;
void setup(int sample_rate, int channel, SDL_AudioFormat format); void setup(int sample_rate, int channel, SDL_AudioFormat format);
void inputFrame(const char *data, size_t size); void playPCM(const char *data, size_t size);
private: private:
SDL_AudioFormat getPCMFormat() override; SDL_AudioFormat getPCMFormat() override;
......
...@@ -98,7 +98,7 @@ int main(int argc, char *argv[]) { ...@@ -98,7 +98,7 @@ int main(int argc, char *argv[]) {
//FFmpeg解码时已经统一转换为16位整型pcm //FFmpeg解码时已经统一转换为16位整型pcm
audio_player->setup(audioTrack->getAudioSampleRate(), audioTrack->getAudioChannel(), AUDIO_S16); audio_player->setup(audioTrack->getAudioSampleRate(), audioTrack->getAudioChannel(), AUDIO_S16);
decoder->setOnDecode([audio_player](const FFmpegFrame::Ptr &pcm) { decoder->setOnDecode([audio_player](const FFmpegFrame::Ptr &pcm) {
audio_player->inputFrame((const char *) (pcm->get()->data[0]), pcm->get()->linesize[0]); audio_player->playPCM((const char *) (pcm->get()->data[0]), pcm->get()->linesize[0]);
}); });
auto audio_delegate = std::make_shared<FrameWriterInterfaceHelper>( [decoder](const Frame::Ptr &frame) { auto audio_delegate = std::make_shared<FrameWriterInterfaceHelper>( [decoder](const Frame::Ptr &frame) {
decoder->inputFrame(frame); decoder->inputFrame(frame);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论