Change to new libavcodec video decoding API. Fixes some deprecation warnings.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 4035ea67351ec5abafd10337e538951910d26363..ff1f83c810b93317d7a9d985db6625fcd7be2334 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -31,10 +31,10 @@
 #include <sys/resource.h>
 
 #include "bmusb/bmusb.h"
+#include "bmusb/fake_capture.h"
 #include "context.h"
 #include "decklink_capture.h"
 #include "defs.h"
-#include "fake_capture.h"
 #include "flags.h"
 #include "video_encoder.h"
 #include "pbo_frame_allocator.h"
@@ -46,6 +46,7 @@ class QOpenGLContext;
 using namespace movit;
 using namespace std;
 using namespace std::placeholders;
+using namespace bmusb;
 
 Mixer *global_mixer = nullptr;
 bool uses_mlock = false;
@@ -143,7 +144,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
        movit_texel_subpixel_precision /= 2.0;
 
        resource_pool.reset(new ResourcePool);
-       theme.reset(new Theme(global_flags.theme_filename.c_str(), resource_pool.get(), num_cards));
+       theme.reset(new Theme(global_flags.theme_filename, global_flags.theme_dirs, resource_pool.get(), num_cards));
        for (unsigned i = 0; i < NUM_OUTPUTS; ++i) {
                output_channel[i].parent = this;
                output_channel[i].channel = i;
@@ -177,7 +178,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 
        assert(num_fake_cards <= num_cards);  // Enforced in flags.cpp.
        for ( ; card_index < num_fake_cards; ++card_index) {
-               configure_card(card_index, new FakeCapture(card_index), /*is_fake_capture=*/true);
+               configure_card(card_index, new FakeCapture(WIDTH, HEIGHT, FAKE_FPS, OUTPUT_FREQUENCY, card_index), /*is_fake_capture=*/true);
        }
 
        if (global_flags.num_fake_cards > 0) {
@@ -268,14 +269,12 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 
        locut.init(FILTER_HPF, 2);
 
-       // If --flat-audio is given, turn off everything that messes with the sound,
-       // except the final makeup gain.
-       if (global_flags.flat_audio) {
-               set_locut_enabled(false);
-               set_gain_staging_auto(false);
-               set_limiter_enabled(false);
-               set_compressor_enabled(false);
-       }
+       set_locut_enabled(global_flags.locut_enabled);
+       set_gain_staging_db(global_flags.initial_gain_staging_db);
+       set_gain_staging_auto(global_flags.gain_staging_auto);
+       set_compressor_enabled(global_flags.compressor_enabled);
+       set_limiter_enabled(global_flags.limiter_enabled);
+       set_final_makeup_gain_auto(global_flags.final_makeup_gain_auto);
 
        // hlen=16 is pretty low quality, but we use quite a bit of CPU otherwise,
        // and there's a limit to how important the peak meter is.
@@ -825,7 +824,7 @@ void Mixer::handle_hotplugged_cards()
                CaptureCard *card = &cards[card_index];
                if (card->capture->get_disconnected()) {
                        fprintf(stderr, "Card %u went away, replacing with a fake card.\n", card_index);
-                       configure_card(card_index, new FakeCapture(card_index), /*is_fake_capture=*/true);
+                       configure_card(card_index, new FakeCapture(WIDTH, HEIGHT, FAKE_FPS, OUTPUT_FREQUENCY, card_index), /*is_fake_capture=*/true);
                        card->queue_length_policy.reset(card_index);
                        card->capture->start_bm_capture();
                }