public/gpu-screen-recorder
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder synced 2026-05-05 06:20:43 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix mixed audio messed up because of sleep in mutex lock

Browse Source
This commit is contained in:
dec05eba
2024-09-16 23:28:27 +02:00
parent c9d83e9ae4
commit 69088303c0
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main.cpp
View File

@@ -3287,23 +3287,25 @@ int main(int argc, char **argv) {
amix_thread = std::thread([&]() { amix_thread = std::thread([&]() {
AVFrame *aframe = av_frame_alloc(); AVFrame *aframe = av_frame_alloc();
while(running) { while(running) {
std::lock_guard<std::mutex> lock(audio_filter_mutex); {
for(AudioTrack &audio_track : audio_tracks) { std::lock_guard<std::mutex> lock(audio_filter_mutex);
if(!audio_track.sink) for(AudioTrack &audio_track : audio_tracks) {
continue; if(!audio_track.sink)
continue;
int err = 0; int err = 0;
while ((err = av_buffersink_get_frame(audio_track.sink, aframe)) >= 0) { while ((err = av_buffersink_get_frame(audio_track.sink, aframe)) >= 0) {
aframe->pts = audio_track.pts; aframe->pts = audio_track.pts;
err = avcodec_send_frame(audio_track.codec_context, aframe); err = avcodec_send_frame(audio_track.codec_context, aframe);
if(err >= 0){ if(err >= 0){
// TODO: Move to separate thread because this could write to network (for example when livestreaming) // TODO: Move to separate thread because this could write to network (for example when livestreaming)
receive_frames(audio_track.codec_context, audio_track.stream_index, audio_track.stream, aframe->pts, av_format_context, record_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex, paused_time_offset); receive_frames(audio_track.codec_context, audio_track.stream_index, audio_track.stream, aframe->pts, av_format_context, record_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex, paused_time_offset);
} else { } else {
fprintf(stderr, "Failed to encode audio!\n"); fprintf(stderr, "Failed to encode audio!\n");
}
av_frame_unref(aframe);
audio_track.pts += audio_track.codec_context->frame_size;
} }
av_frame_unref(aframe);
audio_track.pts += audio_track.codec_context->frame_size;
} }
} }
av_usleep(5 * 1000); // 5 milliseconds av_usleep(5 * 1000); // 5 milliseconds