X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=02f4dd29c33e3afbf1b09fb8f75cfa528d195fb1;hb=206659626a57120fecc27673e94bc444b09bc713;hp=b7e720d2feb6dbaffb3ead7ac17689620bee4e42;hpb=86f32b5a80b232e6d824776a87ecc1b5f8fbfa96;p=nageru diff --git a/mixer.cpp b/mixer.cpp index b7e720d..02f4dd2 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -10,12 +10,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include @@ -59,6 +59,21 @@ void convert_fixed24_to_fp32(float *dst, size_t out_channels, const uint8_t *src } } +void insert_new_frame(RefCountedFrame frame, unsigned field_num, bool interlaced, unsigned card_index, InputState *input_state) +{ + if (interlaced) { + for (unsigned frame_num = FRAME_HISTORY_LENGTH; frame_num --> 1; ) { // :-) + input_state->buffered_frames[card_index][frame_num] = + input_state->buffered_frames[card_index][frame_num - 1]; + } + input_state->buffered_frames[card_index][0] = { frame, field_num }; + } else { + for (unsigned frame_num = 0; frame_num < FRAME_HISTORY_LENGTH; ++frame_num) { + input_state->buffered_frames[card_index][frame_num] = { frame, field_num }; + } + } +} + } // namespace Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) @@ -130,8 +145,6 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) cards[card_index].usb->start_bm_capture(); } - //chain->enable_phase_timing(true); - // Set up stuff for NV12 conversion. // Cb/Cr shader. @@ -143,7 +156,8 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) "void main() { \n" " gl_FragColor = texture2D(cbcr_tex, tc0); \n" "} \n"; - cbcr_program_num = resource_pool->compile_glsl_program(cbcr_vert_shader, cbcr_frag_shader); + vector frag_shader_outputs; + cbcr_program_num = resource_pool->compile_glsl_program(cbcr_vert_shader, cbcr_frag_shader, frag_shader_outputs); r128.init(2, OUTPUT_FREQUENCY); r128.integr_start(); @@ -267,8 +281,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, // Insert silence as needed. fprintf(stderr, "Card %d dropped %d frame(s) (before timecode 0x%04x), inserting silence.\n", card_index, dropped_frames, timecode); - vector silence; - silence.resize(silence_samples * 2); + vector silence(silence_samples * 2, 0.0f); for (int i = 0; i < dropped_frames; ++i) { card->resampling_queue->add_input_samples(local_pts / double(TIMEBASE), silence.data(), silence_samples); // Note that if the format changed in the meantime, we have @@ -316,6 +329,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, card->new_data_ready = true; card->new_frame = RefCountedFrame(FrameAllocator::Frame()); card->new_frame_length = frame_length; + card->new_frame_interlaced = false; card->new_data_ready_fence = nullptr; card->dropped_frames = dropped_frames; card->new_data_ready_changed.notify_all(); @@ -371,10 +385,8 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, check_error(); glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo); check_error(); - glFlushMappedBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, video_frame.size); + glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT); check_error(); - //glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT); - //check_error(); glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr[field]); check_error(); @@ -415,6 +427,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, card->new_frame = new_frame; card->new_frame_length = frame_length; card->new_frame_field = field; + card->new_frame_interlaced = interlaced; card->new_data_ready_fence = fence; card->dropped_frames = dropped_frames; card->new_data_ready_changed.notify_all(); @@ -461,6 +474,7 @@ void Mixer::thread_func() card_copy[card_index].new_frame = card->new_frame; card_copy[card_index].new_frame_length = card->new_frame_length; card_copy[card_index].new_frame_field = card->new_frame_field; + card_copy[card_index].new_frame_interlaced = card->new_frame_interlaced; card_copy[card_index].new_data_ready_fence = card->new_data_ready_fence; card_copy[card_index].dropped_frames = card->dropped_frames; card->new_data_ready = false; @@ -491,6 +505,7 @@ void Mixer::thread_func() } if (audio_level_callback != nullptr) { + unique_lock lock(r128_mutex); double loudness_s = r128.loudness_S(); double loudness_i = r128.integrated(); double loudness_range_low = r128.range_min(); @@ -525,16 +540,7 @@ void Mixer::thread_func() continue; assert(card->new_frame != nullptr); - if (card->new_frame_interlaced) { - for (unsigned frame_num = FRAME_HISTORY_LENGTH; frame_num --> 1; ) { // :-) - buffered_frames[card_index][frame_num] = buffered_frames[card_index][frame_num - 1]; - } - buffered_frames[card_index][0] = { card->new_frame, card->new_frame_field }; - } else { - for (unsigned frame_num = 0; frame_num < FRAME_HISTORY_LENGTH; ++frame_num) { - buffered_frames[card_index][frame_num] = { card->new_frame, card->new_frame_field }; - } - } + insert_new_frame(card->new_frame, card->new_frame_field, card->new_frame_interlaced, card_index, &input_state); check_error(); // The new texture might still be uploaded, @@ -548,9 +554,10 @@ void Mixer::thread_func() } // Get the main chain from the theme, and set its state immediately. - Theme::Chain theme_main_chain = theme->get_chain(0, pts(), WIDTH, HEIGHT); + Theme::Chain theme_main_chain = theme->get_chain(0, pts(), WIDTH, HEIGHT, input_state); EffectChain *chain = theme_main_chain.chain; theme_main_chain.setup_chain(); + //theme_main_chain.chain->enable_phase_timing(true); GLuint y_tex, cbcr_tex; bool got_frame = h264_encoder->begin_frame(&y_tex, &cbcr_tex); @@ -597,7 +604,7 @@ void Mixer::thread_func() // Set up preview and any additional channels. for (int i = 1; i < theme->get_num_channels() + 2; ++i) { DisplayFrame display_frame; - Theme::Chain chain = theme->get_chain(i, pts(), WIDTH, HEIGHT); // FIXME: dimensions + Theme::Chain chain = theme->get_chain(i, pts(), WIDTH, HEIGHT, input_state); // FIXME: dimensions display_frame.chain = chain.chain; display_frame.setup_chain = chain.setup_chain; display_frame.ready_fence = fence; @@ -741,7 +748,10 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples) vector left, right; deinterleave_samples(samples_out, &left, &right); float *ptrs[] = { left.data(), right.data() }; - r128.process(left.size(), ptrs); + { + unique_lock lock(r128_mutex); + r128.process(left.size(), ptrs); + } // Send the samples to the sound card. if (alsa) {