From e2d886719370306464e2c67574bb6eef62a0a64e Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 8 Nov 2015 23:46:19 +0100 Subject: [PATCH] Rename Resampler to ResamplingQueue, to avoid conflicts with zita-resampler. --- Makefile | 2 +- mixer.cpp | 12 ++++++------ mixer.h | 4 ++-- resampler.cpp => resampling_queue.cpp | 8 ++++---- resampler.h => resampling_queue.h | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) rename resampler.cpp => resampling_queue.cpp (94%) rename resampler.h => resampling_queue.h (94%) diff --git a/Makefile b/Makefile index 9cd5240..91ebdde 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ OBJS=glwidget.o main.o mainwindow.o vumeter.o lrameter.o vu_common.o OBJS += glwidget.moc.o mainwindow.moc.o vumeter.moc.o lrameter.moc.o # Mixer objects -OBJS += h264encode.o mixer.o bmusb/bmusb.o pbo_frame_allocator.o context.o ref_counted_frame.o theme.o resampler.o httpd.o ebu_r128_proc.o flags.o image_input.o stereocompressor.o filter.o +OBJS += h264encode.o mixer.o bmusb/bmusb.o pbo_frame_allocator.o context.o ref_counted_frame.o theme.o resampling_queue.o httpd.o ebu_r128_proc.o flags.o image_input.o stereocompressor.o filter.o %.o: %.cpp $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $< diff --git a/mixer.cpp b/mixer.cpp index 08c562f..6bf8119 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -124,7 +124,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) [this]{ resource_pool->clean_context(); }); - card->resampler.reset(new Resampler(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY, 2)); + card->resampling_queue.reset(new ResamplingQueue(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY, 2)); card->usb->configure_card(); } @@ -249,7 +249,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, if (dropped_frames > FPS * 2) { fprintf(stderr, "Card %d lost more than two seconds (or time code jumping around), resetting resampler\n", card_index); - card->resampler.reset(new Resampler(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY, 2)); + card->resampling_queue.reset(new ResamplingQueue(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY, 2)); } else if (dropped_frames > 0) { // Insert silence as needed. fprintf(stderr, "Card %d dropped %d frame(s) (before timecode 0x%04x), inserting silence.\n", @@ -257,10 +257,10 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, vector silence; silence.resize((OUTPUT_FREQUENCY / FPS) * 2); for (int i = 0; i < dropped_frames; ++i) { - card->resampler->add_input_samples((unwrapped_timecode - dropped_frames + i) / double(FPS), silence.data(), (OUTPUT_FREQUENCY / FPS)); + card->resampling_queue->add_input_samples((unwrapped_timecode - dropped_frames + i) / double(FPS), silence.data(), (OUTPUT_FREQUENCY / FPS)); } } - card->resampler->add_input_samples(unwrapped_timecode / double(FPS), audio.data(), num_samples); + card->resampling_queue->add_input_samples(unwrapped_timecode / double(FPS), audio.data(), num_samples); } // Done with the audio, so release it. @@ -466,7 +466,7 @@ void Mixer::thread_func() for (unsigned card_index = 0; card_index < num_cards; ++card_index) { input_frames.push_back(bmusb_current_rendering_frame[card_index]); } - const int64_t av_delay = TIMEBASE / 10; // Corresponds to the fixed delay in resampler.h. TODO: Make less hard-coded. + const int64_t av_delay = TIMEBASE / 10; // Corresponds to the fixed delay in resampling_queue.h. TODO: Make less hard-coded. h264_encoder->end_frame(fence, pts_int + av_delay, input_frames); ++frame; pts_int += TIMEBASE / FPS; @@ -533,7 +533,7 @@ void Mixer::process_audio_one_frame() samples_card.resize((OUTPUT_FREQUENCY / FPS) * 2); { unique_lock lock(cards[card_index].audio_mutex); - if (!cards[card_index].resampler->get_output_samples(pts(), &samples_card[0], OUTPUT_FREQUENCY / FPS)) { + if (!cards[card_index].resampling_queue->get_output_samples(pts(), &samples_card[0], OUTPUT_FREQUENCY / FPS)) { printf("Card %d reported previous underrun.\n", card_index); } } diff --git a/mixer.h b/mixer.h index 6725a7f..3a19d3a 100644 --- a/mixer.h +++ b/mixer.h @@ -27,7 +27,7 @@ #include "pbo_frame_allocator.h" #include "ref_counted_frame.h" #include "ref_counted_gl_sync.h" -#include "resampler.h" +#include "resampling_queue.h" #include "theme.h" #include "timebase.h" #include "stereocompressor.h" @@ -181,7 +181,7 @@ private: unsigned dropped_frames = 0; // Before new_frame. std::mutex audio_mutex; - std::unique_ptr resampler; // Under audio_mutex. + std::unique_ptr resampling_queue; // Under audio_mutex. int last_timecode = -1; // Unwrapped. }; CaptureCard cards[MAX_CARDS]; // protected by diff --git a/resampler.cpp b/resampling_queue.cpp similarity index 94% rename from resampler.cpp rename to resampling_queue.cpp index 138f837..80d1229 100644 --- a/resampler.cpp +++ b/resampling_queue.cpp @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "resampler.h" +#include "resampling_queue.h" #include #include @@ -24,7 +24,7 @@ #include #include -Resampler::Resampler(unsigned freq_in, unsigned freq_out, unsigned num_channels) +ResamplingQueue::ResamplingQueue(unsigned freq_in, unsigned freq_out, unsigned num_channels) : freq_in(freq_in), freq_out(freq_out), num_channels(num_channels), ratio(double(freq_out) / double(freq_in)) { @@ -36,7 +36,7 @@ Resampler::Resampler(unsigned freq_in, unsigned freq_out, unsigned num_channels) vresampler.process (); } -void Resampler::add_input_samples(double pts, const float *samples, ssize_t num_samples) +void ResamplingQueue::add_input_samples(double pts, const float *samples, ssize_t num_samples) { if (first_input) { // Synthesize a fake length. @@ -56,7 +56,7 @@ void Resampler::add_input_samples(double pts, const float *samples, ssize_t num_ } } -bool Resampler::get_output_samples(double pts, float *samples, ssize_t num_samples) +bool ResamplingQueue::get_output_samples(double pts, float *samples, ssize_t num_samples) { double last_output_len; if (first_output) { diff --git a/resampler.h b/resampling_queue.h similarity index 94% rename from resampler.h rename to resampling_queue.h index 7d3b602..c085ece 100644 --- a/resampler.h +++ b/resampling_queue.h @@ -1,5 +1,5 @@ -#ifndef _RESAMPLER_H -#define _RESAMPLER_H 1 +#ifndef _RESAMPLING_QUEUE_H +#define _RESAMPLING_QUEUE_H 1 // Takes in samples from an input source, possibly with jitter, and outputs a fixed number // of samples every iteration. Used to a) change sample rates if needed, and b) deal with @@ -45,9 +45,9 @@ #include #include -class Resampler { +class ResamplingQueue { public: - Resampler(unsigned freq_in, unsigned freq_out, unsigned num_channels = 2); + ResamplingQueue(unsigned freq_in, unsigned freq_out, unsigned num_channels = 2); // Note: pts is always in seconds. void add_input_samples(double pts, const float *samples, ssize_t num_samples); @@ -88,4 +88,4 @@ private: std::deque buffer; }; -#endif // !defined(_RESAMPLER_H) +#endif // !defined(_RESAMPLING_QUEUE_H) -- 2.39.2