Move SyncFinder class to its own cc/hh file.

Signed-off-by: Stefan Westerfeld <stefan@space.twc.de>

src/Makefile.am

@@ -6,7 +6,7 @@ COMMON_SRC = utils.hh utils.cc convcode.hh convcode.cc random.hh random.cc wavda
 	     sfoutputstream.cc sfoutputstream.hh rawinputstream.cc rawinputstream.hh rawoutputstream.cc rawoutputstream.hh \
 	     rawconverter.cc rawconverter.hh mp3inputstream.cc mp3inputstream.hh wmcommon.cc wmcommon.hh fft.cc fft.hh \
 	     limiter.cc limiter.hh shortcode.cc shortcode.hh mpegts.cc mpegts.hh hls.cc hls.hh audiobuffer.hh \
-	     wmget.cc wmadd.cc
+	     wmget.cc wmadd.cc syncfinder.cc syncfinder.hh
 COMMON_LIBS = $(SNDFILE_LIBS) $(FFTW_LIBS) $(LIBGCRYPT_LIBS) $(LIBMPG123_LIBS) $(FFMPEG_LIBS)
 
 audiowmark_SOURCES = audiowmark.cc $(COMMON_SRC)

src/syncfinder.hh

+/*
+ * Copyright (C) 2018-2020 Stefan Westerfeld
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AUDIOWMARK_SYNC_FINDER_HH
+#define AUDIOWMARK_SYNC_FINDER_HH
+
+#include "convcode.hh"
+#include "wavdata.hh"
+
+/*
+ * The SyncFinder class searches for sync bits in an input WavData. It is used
+ * by both, the BlockDecoder and ClipDecoder to find a time index where
+ * decoding should start.
+ *
+ * The first step for finding sync bits is search_approx, which generates a
+ * list of approximate locations where sync bits match, using a stepping of
+ * sync_search_step=256 (for a frame size of 1024). The approximate candidate
+ * locations are later refined with search_refine using sync_search_fine=8 as
+ * stepping.
+ *
+ * BlockDecoder and ClipDecoder have similar but not identical needs, so
+ * both use this class, using either Mode::BLOCK or Mode::CLIP.
+ *
+ * BlockDecoder (Mode::BLOCK)
+ *  - search for full A or full B blocks
+ *  - select candidates by threshold(s) only
+ *  - zero samples are not treated any special
+ *
+ * ClipDecoder (Mode::CLIP)
+ *  - search for AB block (one A block followed by one B block) or BA block
+ *  - select candidates by threshold, but only keep at most the 5 best matches
+ *  - zero samples at beginning/end don't affect the score returned by sync_decode
+ *  - zero samples at beginning/end don't cost much cpu time (no fft performed)
+ *
+ * The ClipDecoder will always use a big amount of zero padding at the beginning
+ * and end to be able to find "partial" AB blocks, where most of the data is
+ * matched with zeros.
+ *
+ * ORIG:   |AAAAA|BBBBB|AAAAA|BBBBB|
+ * CLIP:                   |A|BB|
+ * ZEROPAD:           00000|A|BB|00000
+ * MATCH                AAAAA|BBBBB
+ *
+ * In this example a clip (CLIP) is generated from an original file (ORIG).  By
+ * zero padding we get a file that contains the clip (ZEROPAD). Finally we are
+ * able to match an AB block to the zeropadded file (MATCH). This gives us an
+ * index in the zeropadded file that can be used for decoding the available
+ * data.
+ */
+class SyncFinder
+{
+public:
+  enum class Mode { BLOCK, CLIP };
+
+  struct Score {
+    size_t        index;
+    double        quality;
+    ConvBlockType block_type;
+  };
+  struct FrameBit
+  {
+    int frame;
+    std::vector<int> up;
+    std::vector<int> down;
+  };
+private:
+  std::vector<std::vector<FrameBit>> sync_bits;
+
+  void    init_up_down (const WavData& wav_data, Mode mode);
+  double  normalize_sync_quality (double raw_quality);
+  double  sync_decode (const WavData& wav_data, const size_t start_frame,
+                       const std::vector<float>& fft_out_db,
+                       const std::vector<char>&  have_frames,
+                       ConvBlockType *block_type);
+  void scan_silence (const WavData& wav_data);
+  std::vector<Score> search_approx (const WavData& wav_data, Mode mode);
+  void sync_select_by_threshold (std::vector<Score>& sync_scores);
+  void sync_select_n_best (std::vector<Score>& sync_scores, size_t n);
+  void search_refine (const WavData& wav_data, Mode mode, std::vector<Score>& sync_scores);
+  std::vector<Score> fake_sync (const WavData& wav_data, Mode mode);
+
+  // non-zero sample range: [wav_data_first, wav_data_last)
+  size_t wav_data_first = 0;
+  size_t wav_data_last = 0;
+public:
+  std::vector<Score> search (const WavData& wav_data, Mode mode);
+  std::vector<std::vector<FrameBit>> get_sync_bits (const WavData& wav_data, Mode mode);
+private:
+  void sync_fft (const WavData& wav_data,
+                 size_t index,
+                 size_t frame_count,
+                 std::vector<float>& fft_out_db,
+                 std::vector<char>& have_frames,
+                 const std::vector<char>& want_frames);
+  const char *find_closest_sync (size_t index);
+};
+
+#endif

src/wmcommon.cc

@@ -250,4 +250,8 @@ gen_mix_entries()
   return mix_entries;
 }
 
-
+int
+frame_count (const WavData& wav_data)
+{
+  return wav_data.n_values() / wav_data.n_channels() / Params::frame_size;
+}

src/wmcommon.hh

@@ -23,6 +23,7 @@
 
 #include "random.hh"
 #include "rawinputstream.hh"
+#include "wavdata.hh"
 
 #include <assert.h>
 
@@ -142,6 +143,8 @@ double db_from_factor (double factor, double min_dB);
 size_t mark_data_frame_count();
 size_t mark_sync_frame_count();
 
+int frame_count (const WavData& wav_data);
+
 int sync_frame_pos (int f);
 int data_frame_pos (int f);