PapaTutuWawa/gpu-screen-recorder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only capture frame if num frames to capture > 0

Browse Source
This commit is contained in:
dec05eba 2023-04-18 22:31:44 +02:00
parent 3bb22d0b3e
commit 690065da0f
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main.cpp
View File

@ -1933,35 +1933,37 @@ int main(int argc, char **argv) {
if (frame_time_overflow >= 0.0) { if (frame_time_overflow >= 0.0) {
frame_time_overflow = std::min(frame_time_overflow, target_fps); frame_time_overflow = std::min(frame_time_overflow, target_fps);
frame_timer_start = time_now - frame_time_overflow; frame_timer_start = time_now - frame_time_overflow;
gsr_capture_capture(capture, frame);
const double this_video_frame_time = clock_get_monotonic_seconds(); const double this_video_frame_time = clock_get_monotonic_seconds();
const int64_t expected_frames = std::round((this_video_frame_time - start_time_pts) / target_fps); const int64_t expected_frames = std::round((this_video_frame_time - start_time_pts) / target_fps);
const int num_frames = framerate_mode == FramerateMode::CONSTANT ? std::max(0L, expected_frames - video_pts_counter) : 1; const int num_frames = framerate_mode == FramerateMode::CONSTANT ? std::max(0L, expected_frames - video_pts_counter) : 1;
// TODO: Check if duplicate frame can be saved just by writing it with a different pts instead of sending it again if(num_frames > 0) {
for(int i = 0; i < num_frames; ++i) { gsr_capture_capture(capture, frame);
if(framerate_mode == FramerateMode::CONSTANT) {
frame->pts = video_pts_counter + i;
} else {
frame->pts = (this_video_frame_time - record_start_time) * (double)AV_TIME_BASE;
const bool same_pts = frame->pts == video_prev_pts;
video_prev_pts = frame->pts;
if(same_pts)
continue;
}
int ret = avcodec_send_frame(video_codec_context, frame); // TODO: Check if duplicate frame can be saved just by writing it with a different pts instead of sending it again
if(ret == 0) { for(int i = 0; i < num_frames; ++i) {
// TODO: Move to separate thread because this could write to network (for example when livestreaming) if(framerate_mode == FramerateMode::CONSTANT) {
receive_frames(video_codec_context, VIDEO_STREAM_INDEX, video_stream, frame->pts, av_format_context, frame->pts = video_pts_counter + i;
record_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex); } else {
} else { frame->pts = (this_video_frame_time - record_start_time) * (double)AV_TIME_BASE;
fprintf(stderr, "Error: avcodec_send_frame failed, error: %s\n", av_error_to_string(ret)); const bool same_pts = frame->pts == video_prev_pts;
video_prev_pts = frame->pts;
if(same_pts)
continue;
}
int ret = avcodec_send_frame(video_codec_context, frame);
if(ret == 0) {
// TODO: Move to separate thread because this could write to network (for example when livestreaming)
receive_frames(video_codec_context, VIDEO_STREAM_INDEX, video_stream, frame->pts, av_format_context,
record_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex);
} else {
fprintf(stderr, "Error: avcodec_send_frame failed, error: %s\n", av_error_to_string(ret));
}
} }
video_pts_counter += num_frames;
} }
video_pts_counter += num_frames;
} }
if(save_replay_thread.valid() && save_replay_thread.wait_for(std::chrono::seconds(0)) == std::future_status::ready) { if(save_replay_thread.valid() && save_replay_thread.wait_for(std::chrono::seconds(0)) == std::future_status::ready) {