misc/piphoto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conversion to signed

Browse Source
This commit is contained in:
Ian Gulliver
2017-08-12 11:46:05 -07:00
parent 566c60d91a
commit ed6ae66171
11 changed files with 233 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
piraw.h
View File

@@ -10,7 +10,7 @@ namespace std {
using string_view = experimental::string_view;
}
template <uint32_t X, uint32_t Y, uint32_t C, uint32_t D, uint32_t A, uint32_t P>
template <int32_t X, int32_t Y, int32_t C, int32_t D, int32_t A, int32_t P>
class PiRaw {
public:
PiRaw() = delete;
@@ -21,36 +21,36 @@ class PiRaw {
static std::unique_ptr<Image<X / 2, Y / 2, C>> FromRaw(const std::string_view& raw);
private:
static constexpr uint32_t kJpegHeaderBytes = 32768;
static constexpr int32_t kJpegHeaderBytes = 32768;
static constexpr const char* kJpegHeaderMagic = "BRCM";
static constexpr uint32_t kPixelsPerChunk = 4;
static constexpr uint32_t kBitsPerByte = 8;
static constexpr int32_t kPixelsPerChunk = 4;
static constexpr int32_t kBitsPerByte = 8;
static constexpr uint32_t GetRawBytes();
static constexpr uint32_t GetRowBytes();
static constexpr uint32_t GetNumRows();
static constexpr uint32_t GetChunkBytes();
static constexpr int32_t GetRawBytes();
static constexpr int32_t GetRowBytes();
static constexpr int32_t GetNumRows();
static constexpr int32_t GetChunkBytes();
static constexpr uint32_t Align(uint32_t val);
static constexpr int32_t Align(int32_t val);
typedef std::array<uint32_t, kPixelsPerChunk> Chunk;
typedef Array<int32_t, kPixelsPerChunk> Chunk;
static constexpr Chunk GetChunk(const std::string_view& raw, const uint32_t x_chunk, const uint32_t y);
static constexpr Color<C> CombineRaw(uint32_t y0x0, uint32_t y0x1, uint32_t y1x0, uint32_t y1x1);
static constexpr Chunk GetChunk(const std::string_view& raw, const int32_t x_chunk, const int32_t y);
static constexpr Color<C> CombineRaw(int32_t y0x0, int32_t y0x1, int32_t y1x0, int32_t y1x1);
};
typedef PiRaw<3280, 2464, 3, 10, 16, 2> PiRaw2;
template <uint32_t X, uint32_t Y, uint32_t C, uint32_t D, uint32_t A, uint32_t P>
template <int32_t X, int32_t Y, int32_t C, int32_t D, int32_t A, int32_t P>
typename std::unique_ptr<Image<X / 2, Y / 2, C>> PiRaw<X, Y, C, D, A, P>::FromJpeg(const std::string_view& jpeg) {
static_assert(C == 3);
auto container_len = GetRawBytes() + kJpegHeaderBytes;
size_t container_len = GetRawBytes() + kJpegHeaderBytes;
assert(jpeg.substr(jpeg.size() - container_len, 4) == kJpegHeaderMagic);
return FromRaw(jpeg.substr(jpeg.size() - GetRawBytes(), GetRawBytes()));
}
template <uint32_t X, uint32_t Y, uint32_t C, uint32_t D, uint32_t A, uint32_t P>
template <int32_t X, int32_t Y, int32_t C, int32_t D, int32_t A, int32_t P>
typename std::unique_ptr<Image<X / 2, Y / 2, C>> PiRaw<X, Y, C, D, A, P>::FromRaw(const std::string_view& raw) {
static_assert(C == 3);
static_assert(X % 2 == 0);
@@ -61,8 +61,8 @@ typename std::unique_ptr<Image<X / 2, Y / 2, C>> PiRaw<X, Y, C, D, A, P>::FromRa
auto image = std::make_unique<Image<X / 2, Y / 2, C>>();
for (uint32_t y = 0, out_y = 0; y < Y; y += 2, ++out_y) {
for (uint32_t x_chunk = 0, out_x = 0; x_chunk < X / kPixelsPerChunk; ++x_chunk, out_x += kPixelsPerChunk / 2) {
for (int32_t y = 0, out_y = 0; y < Y; y += 2, ++out_y) {
for (int32_t x_chunk = 0, out_x = 0; x_chunk < X / kPixelsPerChunk; ++x_chunk, out_x += kPixelsPerChunk / 2) {
auto chunk1 = GetChunk(raw, x_chunk, y + 0);
auto chunk2 = GetChunk(raw, x_chunk, y + 1);
image->at(out_y).at(out_x + 0) = CombineRaw(chunk1.at(0), chunk1.at(1), chunk2.at(0), chunk2.at(1));
@@ -72,38 +72,38 @@ typename std::unique_ptr<Image<X / 2, Y / 2, C>> PiRaw<X, Y, C, D, A, P>::FromRa
return image;
}
template <uint32_t X, uint32_t Y, uint32_t C, uint32_t D, uint32_t A, uint32_t P>
constexpr uint32_t PiRaw<X, Y, C, D, A, P>::GetRawBytes() {
template <int32_t X, int32_t Y, int32_t C, int32_t D, int32_t A, int32_t P>
constexpr int32_t PiRaw<X, Y, C, D, A, P>::GetRawBytes() {
return GetRowBytes() * GetNumRows();
}
template <uint32_t X, uint32_t Y, uint32_t C, uint32_t D, uint32_t A, uint32_t P>
constexpr uint32_t PiRaw<X, Y, C, D, A, P>::GetRowBytes() {
template <int32_t X, int32_t Y, int32_t C, int32_t D, int32_t A, int32_t P>
constexpr int32_t PiRaw<X, Y, C, D, A, P>::GetRowBytes() {
return Align(Align(X + P) * D / kBitsPerByte);
}
template <uint32_t X, uint32_t Y, uint32_t C, uint32_t D, uint32_t A, uint32_t P>
constexpr uint32_t PiRaw<X, Y, C, D, A, P>::GetNumRows() {
template <int32_t X, int32_t Y, int32_t C, int32_t D, int32_t A, int32_t P>
constexpr int32_t PiRaw<X, Y, C, D, A, P>::GetNumRows() {
return Align(Y + P);
}
template <uint32_t X, uint32_t Y, uint32_t C, uint32_t D, uint32_t A, uint32_t P>
constexpr uint32_t PiRaw<X, Y, C, D, A, P>::GetChunkBytes() {
template <int32_t X, int32_t Y, int32_t C, int32_t D, int32_t A, int32_t P>
constexpr int32_t PiRaw<X, Y, C, D, A, P>::GetChunkBytes() {
return D * kPixelsPerChunk / kBitsPerByte;
}
template <uint32_t X, uint32_t Y, uint32_t C, uint32_t D, uint32_t A, uint32_t P>
constexpr uint32_t PiRaw<X, Y, C, D, A, P>::Align(uint32_t val) {
template <int32_t X, int32_t Y, int32_t C, int32_t D, int32_t A, int32_t P>
constexpr int32_t PiRaw<X, Y, C, D, A, P>::Align(int32_t val) {
return (~(A - 1)) & ((val) + (A - 1));
}
template <uint32_t X, uint32_t Y, uint32_t C, uint32_t D, uint32_t A, uint32_t P>
constexpr typename PiRaw<X, Y, C, D, A, P>::Chunk PiRaw<X, Y, C, D, A, P>::GetChunk(const std::string_view& raw, const uint32_t x_chunk, const uint32_t y) {
template <int32_t X, int32_t Y, int32_t C, int32_t D, int32_t A, int32_t P>
constexpr typename PiRaw<X, Y, C, D, A, P>::Chunk PiRaw<X, Y, C, D, A, P>::GetChunk(const std::string_view& raw, const int32_t x_chunk, const int32_t y) {
// Function is bit depth & layout specific
static_assert(C == 3);
static_assert(D == 10);
uint32_t start = y * GetRowBytes() + x_chunk * GetChunkBytes();
size_t start = static_cast<size_t>(y * GetRowBytes() + x_chunk * GetChunkBytes());
uint32_t high0 = static_cast<uint8_t>(raw.at(start + 0));
uint32_t high1 = static_cast<uint8_t>(raw.at(start + 1));
uint32_t high2 = static_cast<uint8_t>(raw.at(start + 2));
@@ -111,15 +111,15 @@ constexpr typename PiRaw<X, Y, C, D, A, P>::Chunk PiRaw<X, Y, C, D, A, P>::GetCh
uint32_t packed_low = static_cast<uint8_t>(raw.at(start + 4));
Chunk ret;
ret.at(0) = ((high0 << 2) | ((packed_low >> 6) & 0b11)) << 6;
ret.at(1) = ((high1 << 2) | ((packed_low >> 4) & 0b11)) << 6;
ret.at(2) = ((high2 << 2) | ((packed_low >> 2) & 0b11)) << 6;
ret.at(3) = ((high3 << 2) | ((packed_low >> 0) & 0b11)) << 6;
ret.at(0) = static_cast<int32_t>(((high0 << 2) | ((packed_low >> 6) & 0b11)) << 6);
ret.at(1) = static_cast<int32_t>(((high1 << 2) | ((packed_low >> 4) & 0b11)) << 6);
ret.at(2) = static_cast<int32_t>(((high2 << 2) | ((packed_low >> 2) & 0b11)) << 6);
ret.at(3) = static_cast<int32_t>(((high3 << 2) | ((packed_low >> 0) & 0b11)) << 6);
return ret;
}
template <uint32_t X, uint32_t Y, uint32_t C, uint32_t D, uint32_t A, uint32_t P>
constexpr Color<C> PiRaw<X, Y, C, D, A, P>::CombineRaw(uint32_t y0x0, uint32_t y0x1, uint32_t y1x0, uint32_t y1x1) {
template <int32_t X, int32_t Y, int32_t C, int32_t D, int32_t A, int32_t P>
constexpr Color<C> PiRaw<X, Y, C, D, A, P>::CombineRaw(int32_t y0x0, int32_t y0x1, int32_t y1x0, int32_t y1x1) {
// Function is bit layout specific
static_assert(C == 3);