refactor: STCP connections as ETCP links (is_tcp)
- Add is_tcp, tcp_link, tcp_reconnect_* fields to ETCP_LINK - Remove transport_link from ETCP_CONN, add tcp_link_count - stcp_link: replace embedded etcp_conn with pointer; add etcp_link backpointer - stcp_link: link_rx_cb routes ETCP data to etcp_conn_input - stcp_link: call on_close_cb in close - New TCP functions: etcp_link_enter_ready_tcp, etcp_tcp_link_start_connect, etcp_tcp_link_start_reconnect, tcp_link_close_cb, etcp_tcp_send - etcp_link_new: handle NULL conn for TCP links; skip enter_init for TCP - etcp_link_close: close stcp_link for TCP - etcp_encrypt_send: redirect TCP to etcp_tcp_send (skips AES-CCM) - tcp_server_on_link: create ETCP_LINK(is_tcp=1) + enter_ready_tcp - etcp_connect: TCP addrs -> etcp_tcp_link_start_connect - Remove ctx->tcp_link/tcp_ready - test_stcp_traffic: find stcp_link via links->is_tcp instead of transport_link - 66/68 tests pass; 2 STCP tests expected to fail (integration not complete)
This commit is contained in:
evgeny committed
1 parent
937af4c26a
commit
d773f1724a
1705 files changed
+187
-1082154
No files matched your search
@@ -1,199 +0,0 @@
|
||||
/*
|
||||
* Copyright 2016 Nu-book Inc.
|
||||
* Copyright 2016 ZXing authors
|
||||
* Copyright 2022 Axel Waggershauser
|
||||
*/
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "Matrix.h"
|
||||
#include "Point.h"
|
||||
|
||||
#ifdef ZXING_INTERNAL
|
||||
#include "Range.h"
|
||||
#endif
|
||||
|
||||
#include <cstdint>
|
||||
#include <stdexcept>
|
||||
#include <vector>
|
||||
|
||||
namespace ZXing {
|
||||
|
||||
class BitArray;
|
||||
|
||||
/**
|
||||
* @brief A simple, fast 2D array of bits.
|
||||
*/
|
||||
class BitMatrix
|
||||
{
|
||||
int _width = 0;
|
||||
int _height = 0;
|
||||
using data_t = uint8_t;
|
||||
|
||||
std::vector<data_t> _bits;
|
||||
// There is nothing wrong to support this but disable to make it explicit since we may copy something very big here.
|
||||
// Use copy() below.
|
||||
BitMatrix(const BitMatrix&) = default;
|
||||
|
||||
const data_t& get(int i) const
|
||||
{
|
||||
#if 1
|
||||
return _bits.at(i);
|
||||
#else
|
||||
return _bits[i];
|
||||
#endif
|
||||
}
|
||||
|
||||
data_t& get(int i) { return const_cast<data_t&>(static_cast<const BitMatrix*>(this)->get(i)); }
|
||||
|
||||
bool getTopLeftOnBit(int &left, int& top) const;
|
||||
bool getBottomRightOnBit(int &right, int& bottom) const;
|
||||
|
||||
public:
|
||||
static constexpr data_t SET_V = 0xff; // allows playing with SIMD binarization
|
||||
static constexpr data_t UNSET_V = 0;
|
||||
static_assert(bool(SET_V) && !bool(UNSET_V), "SET_V needs to evaluate to true, UNSET_V to false, see iterator usage");
|
||||
|
||||
BitMatrix() = default;
|
||||
|
||||
#if defined(__llvm__) || (defined(__GNUC__) && (__GNUC__ > 7))
|
||||
__attribute__((no_sanitize("signed-integer-overflow")))
|
||||
#endif
|
||||
BitMatrix(int width, int height) : _width(width), _height(height), _bits(width * height, UNSET_V)
|
||||
{
|
||||
if (width != 0 && int(_bits.size()) / width != height)
|
||||
throw std::invalid_argument("Invalid size: width * height is too big");
|
||||
}
|
||||
|
||||
explicit BitMatrix(int dimension) : BitMatrix(dimension, dimension) {} // Construct a square matrix.
|
||||
|
||||
BitMatrix(BitMatrix&& other) noexcept = default;
|
||||
BitMatrix& operator=(BitMatrix&& other) noexcept = default;
|
||||
BitMatrix& operator=(const BitMatrix&) = delete;
|
||||
|
||||
BitMatrix copy() const { return *this; }
|
||||
|
||||
#ifdef ZXING_INTERNAL
|
||||
Range<data_t*> row(int y) { return {_bits.data() + y * _width, _bits.data() + (y + 1) * _width}; }
|
||||
Range<const data_t*> row(int y) const { return {_bits.data() + y * _width, _bits.data() + (y + 1) * _width}; }
|
||||
|
||||
Range<StrideIter<const data_t*>> col(int x) const
|
||||
{
|
||||
return {{_bits.data() + x + (_height - 1) * _width, -_width}, {_bits.data() + x - _width, -_width}};
|
||||
}
|
||||
#endif
|
||||
|
||||
bool get(int x, int y) const { return get(y * _width + x); }
|
||||
void set(int x, int y, bool val = true) { get(y * _width + x) = val * SET_V; }
|
||||
|
||||
/**
|
||||
* <p>Flips the given bit.</p>
|
||||
*
|
||||
* @param x The horizontal component (i.e. which column)
|
||||
* @param y The vertical component (i.e. which row)
|
||||
*/
|
||||
void flip(int x, int y)
|
||||
{
|
||||
auto& v = get(y * _width + x);
|
||||
v = !v;
|
||||
}
|
||||
|
||||
void flipAll()
|
||||
{
|
||||
for (auto& i : _bits)
|
||||
i = !i * SET_V;
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Sets a square region of the bit matrix to true.</p>
|
||||
*
|
||||
* @param left The horizontal position to begin at (inclusive)
|
||||
* @param top The vertical position to begin at (inclusive)
|
||||
* @param width The width of the region
|
||||
* @param height The height of the region
|
||||
*/
|
||||
void setRegion(int left, int top, int width, int height);
|
||||
|
||||
void rotate90();
|
||||
|
||||
void rotate180();
|
||||
|
||||
void mirror();
|
||||
|
||||
/**
|
||||
* Find the rectangle that contains all non-white pixels. Useful for detection of 'pure' barcodes.
|
||||
*
|
||||
* @return True iff this rectangle is at least minWidth x minHeight pixels big
|
||||
*/
|
||||
bool findBoundingBox(int &left, int& top, int& width, int& height, int minSize = 1) const;
|
||||
|
||||
int width() const { return _width; }
|
||||
|
||||
int height() const { return _height; }
|
||||
|
||||
bool empty() const { return _bits.empty(); }
|
||||
|
||||
friend bool operator==(const BitMatrix& a, const BitMatrix& b)
|
||||
{
|
||||
return a._width == b._width && a._height == b._height && a._bits == b._bits;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
bool isIn(PointT<T> p, int b = 0) const noexcept
|
||||
{
|
||||
return b <= p.x && p.x < width() - b && b <= p.y && p.y < height() - b;
|
||||
}
|
||||
|
||||
bool get(PointI p) const { return get(p.x, p.y); }
|
||||
bool get(PointF p) const { return get(PointI(p)); }
|
||||
void set(PointI p, bool v = true) { set(p.x, p.y, v); }
|
||||
void set(PointF p, bool v = true) { set(PointI(p), v); }
|
||||
};
|
||||
|
||||
void GetPatternRow(const BitMatrix& matrix, int r, std::vector<uint16_t>& pr, bool transpose);
|
||||
|
||||
/**
|
||||
* @brief Inflate scales a BitMatrix up and adds a quiet Zone plus padding
|
||||
* @param input matrix to be expanded
|
||||
* @param width new width in bits (pixel)
|
||||
* @param height new height in bits (pixel)
|
||||
* @param quietZone size of quiet zone to add in modules
|
||||
* @return expanded BitMatrix, maybe move(input) if size did not change
|
||||
*/
|
||||
BitMatrix Inflate(BitMatrix&& input, int width, int height, int quietZone);
|
||||
|
||||
/**
|
||||
* @brief Deflate (crop + subsample) a bit matrix
|
||||
* @param input matrix to be shrunk
|
||||
* @param width new width
|
||||
* @param height new height
|
||||
* @param top cropping starts at top row
|
||||
* @param left cropping starts at left col
|
||||
* @param subSampling typically the module size
|
||||
* @return deflated input
|
||||
*/
|
||||
BitMatrix Deflate(const BitMatrix& input, int width, int height, float top, float left, float subSampling);
|
||||
|
||||
template<typename T>
|
||||
BitMatrix ToBitMatrix(const Matrix<T>& in, T trueValue = {true})
|
||||
{
|
||||
BitMatrix out(in.width(), in.height());
|
||||
for (int y = 0; y < in.height(); ++y)
|
||||
for (int x = 0; x < in.width(); ++x)
|
||||
if (in.get(x, y) == trueValue)
|
||||
out.set(x, y);
|
||||
return out;
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
Matrix<T> ToMatrix(const BitMatrix& in, T black = 0, T white = ~0)
|
||||
{
|
||||
Matrix<T> res(in.width(), in.height());
|
||||
for (int y = 0; y < in.height(); ++y)
|
||||
for (int x = 0; x < in.width(); ++x)
|
||||
res.set(x, y, in.get(x, y) ? black : white);
|
||||
return res;
|
||||
}
|
||||
|
||||
} // ZXing
|
||||
Reference in new issue
Block a user