Skip to content

A
audiowmark
Commit fe4cfc47 authored by Stefan Westerfeld's avatar Stefan Westerfeld
Browse files
Options

Refactor clip decoder into extra class. 

Signed-off-by: Stefan Westerfeld's avatarStefan Westerfeld <stefan@space.twc.de>
parent a4316753
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 63 deletions
src/wmget.cc
View file @ fe4cfc47
......@@ -650,6 +650,81 @@ public:
}
};
class ClipDecoder
{
public:
void
run (const WavData& wav_data, ResultSet& result_set)
{
FFTAnalyzer fft_analyzer (wav_data.n_channels());
// L-blocks
const int wav_frames = wav_data.n_values() / (Params::frame_size * wav_data.n_channels());
const int frames_per_block = mark_sync_frame_count() + mark_data_frame_count();
if (wav_frames < frames_per_block * 2.5) /* clip decoder is only used for small wavs */
{
// clip decoder padding at start:
// - for longer clips: at least one data block
// - for smaller clips: available frames + padding is the length of one L-block
// - 5 extra frames as safety
const int pad_frames_start = max (frames_per_block, frames_per_block * 2 - wav_frames) + 5;
// clip decoder padding at end:
// - one data block + 5 extra frames as safety
// for short clips, the sync pattern of the data block repeats after one block length
const int pad_frames_end = frames_per_block + 5;
auto ext_samples = wav_data.samples();
ext_samples.insert (ext_samples.begin(), pad_frames_start * Params::frame_size * wav_data.n_channels(), 0);
ext_samples.insert (ext_samples.end(), pad_frames_end * Params::frame_size * wav_data.n_channels(), 0);
WavData l_wav_data (ext_samples, wav_data.n_channels(), wav_data.sample_rate(), wav_data.bit_depth());
SyncFinder sync_finder_l;
vector<SyncFinder::Score> sync_scores_l = sync_finder_l.search (l_wav_data, SyncFinder::BlockLength::LONG);
for (auto sync_score : sync_scores_l)
{
const size_t count = mark_sync_frame_count() + mark_data_frame_count();
const size_t index = sync_score.index;
auto fft_range_out1 = fft_analyzer.fft_range (l_wav_data.samples(), index, count);
auto fft_range_out2 = fft_analyzer.fft_range (l_wav_data.samples(), index + count * Params::frame_size, count);
if (fft_range_out1.size() && fft_range_out2.size())
{
// FIXME: doesn't do linear decode
const auto raw_bit_vec1 = randomize_bit_order (mix_decode (fft_range_out1, l_wav_data.n_channels()), /* encode */ false);
const auto raw_bit_vec2 = randomize_bit_order (mix_decode (fft_range_out2, l_wav_data.n_channels()), /* encode */ false);
const size_t bits_per_block = raw_bit_vec1.size();
vector<float> raw_bit_vec;
for (size_t i = 0; i < bits_per_block; i++)
{
if (sync_score.block_type == ConvBlockType::a)
{
raw_bit_vec.push_back (raw_bit_vec1[i]);
raw_bit_vec.push_back (raw_bit_vec2[i]);
}
else
{
raw_bit_vec.push_back (raw_bit_vec2[i]);
raw_bit_vec.push_back (raw_bit_vec1[i]);
}
}
float decode_error = 0;
vector<int> bit_vec = conv_decode_soft (ConvBlockType::ab, normalize_soft_bits (raw_bit_vec), &decode_error);
SyncFinder::Score sync_score_nopad = sync_score;
if (sync_score_nopad.index >= pad_frames_start * Params::frame_size)
sync_score_nopad.index -= pad_frames_start * Params::frame_size;
else
sync_score_nopad.index = 0;
result_set.add_pattern (sync_score_nopad, bit_vec, decode_error, ResultSet::Type::CLIP);
}
}
}
}
};
static int
decode_and_report (const WavData& wav_data, const string& orig_pattern)
{
......@@ -744,70 +819,9 @@ decode_and_report (const WavData& wav_data, const string& orig_pattern)
result_set.add_pattern (score_all, bit_vec, decode_error, ResultSet::Type::ALL);
}
// L-blocks
const int wav_frames = wav_data.n_values() / (Params::frame_size * wav_data.n_channels());
const int frames_per_block = mark_sync_frame_count() + mark_data_frame_count();
if (wav_frames < frames_per_block * 2.5) /* clip decoder is only used for small wavs */
{
// clip decoder padding at start:
// - for longer clips: at least one data block
// - for smaller clips: available frames + padding is the length of one L-block
// - 5 extra frames as safety
const int pad_frames_start = max (frames_per_block, frames_per_block * 2 - wav_frames) + 5;
// clip decoder padding at end:
// - one data block + 5 extra frames as safety
// for short clips, the sync pattern of the data block repeats after one block length
const int pad_frames_end = frames_per_block + 5;
auto ext_samples = wav_data.samples();
ext_samples.insert (ext_samples.begin(), pad_frames_start * Params::frame_size * wav_data.n_channels(), 0);
ext_samples.insert (ext_samples.end(), pad_frames_end * Params::frame_size * wav_data.n_channels(), 0);
WavData l_wav_data (ext_samples, wav_data.n_channels(), wav_data.sample_rate(), wav_data.bit_depth());
SyncFinder sync_finder_l;
vector<SyncFinder::Score> sync_scores_l = sync_finder.search (l_wav_data, SyncFinder::BlockLength::LONG);
for (auto sync_score : sync_scores_l)
{
const size_t count = mark_sync_frame_count() + mark_data_frame_count();
const size_t index = sync_score.index;
auto fft_range_out1 = fft_analyzer.fft_range (l_wav_data.samples(), index, count);
auto fft_range_out2 = fft_analyzer.fft_range (l_wav_data.samples(), index + count * Params::frame_size, count);
if (fft_range_out1.size() && fft_range_out2.size())
{
// FIXME: doesn't do linear decode
const auto raw_bit_vec1 = randomize_bit_order (mix_decode (fft_range_out1, l_wav_data.n_channels()), /* encode */ false);
const auto raw_bit_vec2 = randomize_bit_order (mix_decode (fft_range_out2, l_wav_data.n_channels()), /* encode */ false);
const size_t bits_per_block = raw_bit_vec1.size();
vector<float> raw_bit_vec;
for (size_t i = 0; i < bits_per_block; i++)
{
if (sync_score.block_type == ConvBlockType::a)
{
raw_bit_vec.push_back (raw_bit_vec1[i]);
raw_bit_vec.push_back (raw_bit_vec2[i]);
}
else
{
raw_bit_vec.push_back (raw_bit_vec2[i]);
raw_bit_vec.push_back (raw_bit_vec1[i]);
}
}
float decode_error = 0;
vector<int> bit_vec = conv_decode_soft (ConvBlockType::ab, normalize_soft_bits (raw_bit_vec), &decode_error);
SyncFinder::Score sync_score_nopad = sync_score;
if (sync_score_nopad.index >= pad_frames_start * Params::frame_size)
sync_score_nopad.index -= pad_frames_start * Params::frame_size;
else
sync_score_nopad.index = 0;
result_set.add_pattern (sync_score_nopad, bit_vec, decode_error, ResultSet::Type::CLIP);
}
}
}
ClipDecoder clip_decoder;
clip_decoder.run (wav_data, result_set);
result_set.print();
if (!orig_pattern.empty())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment