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

Better color typing

Browse Source
This commit is contained in:
Ian Gulliver
2017-08-13 08:44:49 -07:00
parent 0ccae577eb
commit 00a1577c53
8 changed files with 87 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
piraw.h
View File

@@ -10,15 +10,15 @@ namespace std {
using string_view = experimental::string_view;
}
template <int32_t X, int32_t Y, int32_t C, int32_t D, int32_t A, int32_t P>
template <int32_t X, int32_t Y, int32_t D, int32_t A, int32_t P>
class PiRaw {
public:
PiRaw() = delete;
PiRaw(const PiRaw&) = delete;
PiRaw(PiRaw&&) = delete;
static std::unique_ptr<Image<X / 2, Y / 2, C>> FromJpeg(const std::string_view& jpeg);
static std::unique_ptr<Image<X / 2, Y / 2, C>> FromRaw(const std::string_view& raw);
static std::unique_ptr<Image<X / 2, Y / 2, RgbColor>> FromJpeg(const std::string_view& jpeg);
static std::unique_ptr<Image<X / 2, Y / 2, RgbColor>> FromRaw(const std::string_view& raw);
private:
static constexpr int32_t kJpegHeaderBytes = 32768;
@@ -36,30 +36,27 @@ class PiRaw {
typedef Array<int32_t, kPixelsPerChunk> Chunk;
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);
static constexpr RgbColor CombineRaw(int32_t y0x0, int32_t y0x1, int32_t y1x0, int32_t y1x1);
};
typedef PiRaw<3280, 2464, 3, 10, 16, 2> PiRaw2;
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);
typedef PiRaw<3280, 2464, 10, 16, 2> PiRaw2;
template <int32_t X, int32_t Y, int32_t D, int32_t A, int32_t P>
typename std::unique_ptr<Image<X / 2, Y / 2, RgbColor>> PiRaw<X, Y, D, A, P>::FromJpeg(const std::string_view& jpeg) {
size_t container_len = GetRawBytes() + kJpegHeaderBytes;
assert(jpeg.substr(jpeg.size() - container_len, 4) == kJpegHeaderMagic);
return FromRaw(jpeg.substr(jpeg.size() - GetRawBytes(), GetRawBytes()));
}
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);
template <int32_t X, int32_t Y, int32_t D, int32_t A, int32_t P>
typename std::unique_ptr<Image<X / 2, Y / 2, RgbColor>> PiRaw<X, Y, D, A, P>::FromRaw(const std::string_view& raw) {
static_assert(X % 2 == 0);
static_assert(Y % 2 == 0);
static_assert(kPixelsPerChunk == 4);
assert(raw.size() == GetRawBytes());
auto image = std::make_unique<Image<X / 2, Y / 2, C>>();
auto image = std::make_unique<Image<X / 2, Y / 2, RgbColor>>();
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) {
@@ -72,35 +69,34 @@ typename std::unique_ptr<Image<X / 2, Y / 2, C>> PiRaw<X, Y, C, D, A, P>::FromRa
return image;
}
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() {
template <int32_t X, int32_t Y, int32_t D, int32_t A, int32_t P>
constexpr int32_t PiRaw<X, Y, D, A, P>::GetRawBytes() {
return GetRowBytes() * 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>::GetRowBytes() {
template <int32_t X, int32_t Y, int32_t D, int32_t A, int32_t P>
constexpr int32_t PiRaw<X, Y, D, A, P>::GetRowBytes() {
return Align(Align(X + P) * D / kBitsPerByte);
}
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() {
template <int32_t X, int32_t Y, int32_t D, int32_t A, int32_t P>
constexpr int32_t PiRaw<X, Y, D, A, P>::GetNumRows() {
return Align(Y + P);
}
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() {
template <int32_t X, int32_t Y, int32_t D, int32_t A, int32_t P>
constexpr int32_t PiRaw<X, Y, D, A, P>::GetChunkBytes() {
return D * kPixelsPerChunk / kBitsPerByte;
}
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) {
template <int32_t X, int32_t Y, int32_t D, int32_t A, int32_t P>
constexpr int32_t PiRaw<X, Y, D, A, P>::Align(int32_t val) {
return (~(A - 1)) & ((val) + (A - 1));
}
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) {
template <int32_t X, int32_t Y, int32_t D, int32_t A, int32_t P>
constexpr typename PiRaw<X, Y, D, A, P>::Chunk PiRaw<X, Y, 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);
size_t start = static_cast<size_t>(y * GetRowBytes() + x_chunk * GetChunkBytes());
@@ -118,12 +114,9 @@ constexpr typename PiRaw<X, Y, C, D, A, P>::Chunk PiRaw<X, Y, C, D, A, P>::GetCh
return ret;
}
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);
Color<C> ret;
template <int32_t X, int32_t Y, int32_t D, int32_t A, int32_t P>
constexpr RgbColor PiRaw<X, Y, D, A, P>::CombineRaw(int32_t y0x0, int32_t y0x1, int32_t y1x0, int32_t y1x1) {
RgbColor ret;
ret.at(0) = static_cast<int32_t>(y1x1);
ret.at(1) = static_cast<int32_t>((y0x1 + y1x0) / 2);
ret.at(2) = static_cast<int32_t>(y0x0);