Make Theme::register_class() private.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index ca55be0c470f44234f307e09572b08fd30679f1a..0f8cf903d326d87fc41b00ec65b07afa6ce1c8b7 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -71,7 +71,8 @@ void convert_fixed24_to_fp32(float *dst, size_t out_channels, const uint8_t *src
 }  // namespace
 
 Mixer::Mixer(const QSurfaceFormat &format)
-       : mixer_surface(create_surface(format)),
+       : httpd("test.ts", WIDTH, HEIGHT),
+         mixer_surface(create_surface(format)),
          h264_encoder_surface(create_surface(format))
 {
        httpd.start(9095);
@@ -79,6 +80,10 @@ Mixer::Mixer(const QSurfaceFormat &format)
        CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF));
        check_error();
 
+       // Since we allow non-bouncing 4:2:2 YCbCrInputs, effective subpixel precision
+       // will be halved when sampling them, and we need to compensate here.
+       movit_texel_subpixel_precision /= 2.0;
+
        resource_pool.reset(new ResourcePool);
        theme.reset(new Theme("theme.lua", resource_pool.get()));
        output_channel[OUTPUT_LIVE].parent = this;
@@ -99,12 +104,12 @@ Mixer::Mixer(const QSurfaceFormat &format)
        display_chain->set_dither_bits(0);  // Don't bother.
        display_chain->finalize();
 
-       h264_encoder.reset(new H264Encoder(h264_encoder_surface, WIDTH, HEIGHT, "test.ts", &httpd));
+       h264_encoder.reset(new H264Encoder(h264_encoder_surface, WIDTH, HEIGHT, &httpd));
 
        for (int card_index = 0; card_index < NUM_CARDS; ++card_index) {
                printf("Configuring card %d...\n", card_index);
                CaptureCard *card = &cards[card_index];
-               card->usb = new BMUSBCapture(0x1edb, card_index == 0 ? 0xbd3b : 0xbd4f);
+               card->usb = new BMUSBCapture(card_index);
                card->usb->set_frame_callback(bind(&Mixer::bm_frame, this, card_index, _1, _2, _3, _4, _5, _6, _7));
                card->frame_allocator.reset(new PBOFrameAllocator(WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44, WIDTH, HEIGHT));
                card->usb->set_video_frame_allocator(card->frame_allocator.get());
@@ -117,7 +122,6 @@ Mixer::Mixer(const QSurfaceFormat &format)
                                        printf("failed to create bmusb context\n");
                                        exit(1);
                                }
-                               printf("inited!\n");
                        },
                        [this]{
                                resource_pool->clean_context();
@@ -146,6 +150,9 @@ Mixer::Mixer(const QSurfaceFormat &format)
                "    gl_FragColor = texture2D(cbcr_tex, tc0); \n"
                "} \n";
        cbcr_program_num = resource_pool->compile_glsl_program(cbcr_vert_shader, cbcr_frag_shader);
+
+       r128.init(2, 48000);
+       r128.integr_start();
 }
 
 Mixer::~Mixer()
@@ -175,6 +182,30 @@ int unwrap_timecode(uint16_t current_wrapped, int last)
        }
 }
 
+float find_peak(const vector<float> &samples)
+{
+       float m = fabs(samples[0]);
+       for (size_t i = 1; i < samples.size(); ++i) {
+               m = std::max(m, fabs(samples[i]));
+       }
+       return m;
+}
+
+void deinterleave_samples(const vector<float> &in, vector<float> *out_l, vector<float> *out_r)
+{
+       size_t num_samples = in.size() / 2;
+       out_l->resize(num_samples);
+       out_r->resize(num_samples);
+
+       const float *inptr = in.data();
+       float *lptr = &(*out_l)[0];
+       float *rptr = &(*out_r)[0];
+       for (size_t i = 0; i < num_samples; ++i) {
+               *lptr++ = *inptr++;
+               *rptr++ = *inptr++;
+       }
+}
+
 }  // namespace
 
 void Mixer::bm_frame(int card_index, uint16_t timecode,
@@ -352,6 +383,11 @@ void Mixer::thread_func()
                                        }
                                }
                                if (card_index == 0) {
+                                       vector<float> left, right;
+                                       peak = std::max(peak, find_peak(samples_out));
+                                       deinterleave_samples(samples_out, &left, &right);
+                                       float *ptrs[] = { left.data(), right.data() };
+                                       r128.process(left.size(), ptrs);
                                        h264_encoder->add_audio(pts_int, move(samples_out));
                                }
                        }
@@ -362,6 +398,16 @@ void Mixer::thread_func()
                        }
                }
 
+               if (audio_level_callback != nullptr) {
+                       double loudness_s = r128.loudness_S();
+                       double loudness_i = r128.integrated();
+                       double loudness_range_low = r128.range_min();
+                       double loudness_range_high = r128.range_max();
+
+                       audio_level_callback(loudness_s, 20.0 * log10(peak),
+                                            loudness_i, loudness_range_low, loudness_range_high);
+               }
+
                // If the first card is reporting a corrupted or otherwise dropped frame,
                // just increase the pts (skipping over this frame) and don't try to compute anything new.
                if (card_copy[0].new_frame->len == 0) {
@@ -404,6 +450,7 @@ void Mixer::thread_func()
                GLuint cbcr_full_tex = resource_pool->create_2d_texture(GL_RG8, WIDTH, HEIGHT);
                GLuint rgba_tex = resource_pool->create_2d_texture(GL_RGB565, WIDTH, HEIGHT);  // Saves texture bandwidth, although dithering gets messed up.
                GLuint fbo = resource_pool->create_fbo(y_tex, cbcr_full_tex, rgba_tex);
+               check_error();
                chain->render_to_fbo(fbo, WIDTH, HEIGHT);
                resource_pool->release_fbo(fbo);