StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

libraw: CR @cblichmann

Browse Source
This commit is contained in:
Piotr Bartman 2022-03-31 22:47:16 +02:00
parent 1b1c085cfe
commit 7e76425c37
7 changed files with 75 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/libraw/CMakeLists.txt
View File

@ -35,8 +35,7 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/LibRaw/LibRaw.git
GIT_TAG adcb898a00746c8aa886eb06cc9f5a1cb1834fca
)
FetchContent_GetProperties(libraw)
FetchContent_Populate(libraw)
FetchContent_MakeAvailable(libraw)
set(LIBRAW_PATH "${libraw_SOURCE_DIR}" CACHE STRING "" FORCE)
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)

107
contrib/libraw/example/main.cc
View File

@ -1,7 +1,7 @@
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// you may !use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
@ -20,9 +20,9 @@
#include "contrib/libraw/sandboxed.h"
#include "contrib/libraw/utils/utils_libraw.h"
void usage(const char* av) {
void PrintUsage(const char* name) {
std::cout << "Dump (small) selecton of RAW file as tab-separated text file\n"
<< "Usage: " << av
<< "Usage: " << name
<< " inputfile COL ROW [CHANNEL] [width] [height]\n"
" COL - start column\n"
" ROW - start row\n"
@ -31,92 +31,89 @@ void usage(const char* av) {
" height - area height to dump, default is 4\n";
}
unsigned subtract_bl(int val, int bl) { return val > bl ? val - bl : 0; }
uint16_t SubtractBlack(uint16_t val, unsigned int bl) {
return val > bl ? val - bl : 0;
}
int main(int ac, char* av[]) {
google::InitGoogleLogging(av[0]);
int main(int argc, char* argv[]) {
google::InitGoogleLogging(argv[0]);
if (ac < 4) {
usage(av[0]);
exit(1);
if (argc < 4) {
PrintUsage(argv[0]);
return EXIT_FAILURE;
}
int colstart = atoi(av[2]);
int rowstart = atoi(av[3]);
int colstart = atoi(argv[2]);
int rowstart = atoi(argv[3]);
int channel = 0;
if (ac > 4) channel = atoi(av[4]);
if (argc > 4) channel = atoi(argv[4]);
int width = 16;
if (ac > 5) width = atoi(av[5]);
if (argc > 5) width = atoi(argv[5]);
int height = 4;
if (ac > 6) height = atoi(av[6]);
if (argc > 6) height = atoi(argv[6]);
if (width < 1 || height < 1) {
usage(av[0]);
exit(1);
}
sapi::v::ConstCStr file_name(av[1]);
LibRawSapiSandbox sandbox(file_name.GetData());
if (!sandbox.Init().ok()) {
std::cerr << "Unable to start sandbox\n";
PrintUsage(argv[0]);
return EXIT_FAILURE;
}
sapi::v::ConstCStr file_name(argv[1]);
absl::Status status;
LibRawSapiSandbox sandbox(file_name.GetData());
LibRaw lr(&sandbox, av[1]);
if (not lr.CheckIsInit().ok()) {
std::cerr << "Unable init LibRaw";
std::cerr << lr.CheckIsInit().status();
status = sandbox.Init();
if (!status.ok()) {
std::cerr << "Unable to start sandbox: " << status.message() << "\n";
return EXIT_FAILURE;
}
LibRaw lr(&sandbox, argv[1]);
if (!lr.CheckIsInit().ok()) {
std::cerr << "Unable init LibRaw: " << lr.CheckIsInit().message();
return EXIT_FAILURE;
}
status = lr.OpenFile();
if (not status.ok()) {
std::cerr << "Unable to open file" << av[1] << "\n";
std::cerr << status;
if (!status.ok()) {
std::cerr << "Unable to open file " << argv[1] << ": " << status.message();
return EXIT_FAILURE;
}
if ((lr.GetColorCount() == 1 and channel > 0) or (channel > 3)) {
std::cerr << "Incorrect CHANNEL specified:" << channel << "\n";
if ((lr.GetColorCount() == 1 && channel > 0) || (channel > 3)) {
std::cerr << "Incorrect CHANNEL specified: " << channel << "\n";
return EXIT_FAILURE;
}
status = lr.Unpack();
if (not status.ok()) {
std::cerr << "Unable to unpack file" << av[1] << "\n";
std::cerr << status;
if (!status.ok()) {
std::cerr << "Unable to unpack file " << argv[1] << status.message();
return EXIT_FAILURE;
}
status = lr.SubtractBlack();
if (not status.ok()) {
std::cerr << "Unable to subtract black level";
std::cerr << status;
if (!status.ok()) {
std::cerr << "Unable to subtract black level: " << status.message();
// ok, but different output
}
absl::StatusOr<std::vector<uint16_t>> rawdata = lr.RawData();
if (not rawdata.ok()) {
std::cerr << "Unable to get raw data\n";
std::cerr << rawdata.status();
if (!rawdata.ok()) {
std::cerr << "Unable to get raw data: " << rawdata.status().message();
return EXIT_FAILURE;
}
absl::StatusOr<ushort> raw_height = lr.GetRawHeight();
absl::StatusOr<ushort> raw_width = lr.GetRawWidth();
if (not raw_height.ok() or not raw_width.ok()) {
std::cerr << "Unable to get raw image sizes.";
if (!raw_height.ok() || !raw_width.ok()) {
std::cerr << "Unable to get raw image sizes";
return EXIT_FAILURE;
}
// header
std::cout << av[1] << "\t" << colstart << "-" << rowstart << "-" << width
std::cout << argv[1] << "\t" << colstart << "-" << rowstart << "-" << width
<< "x" << height << "\t"
<< "channel: " << channel << "\n";
std::cout << std::setw(6) << "R\\C";
for (int col = colstart;
col < colstart + width and col < *raw_width;
col < colstart + width && col < *raw_width;
col++) {
std::cout << std::setw(6) << col;
}
@ -125,8 +122,8 @@ int main(int ac, char* av[]) {
// dump raw to output
for (int row = rowstart;
row < rowstart + height && row < *raw_height;
row++) {
unsigned rcolors[48];
++row) {
int rcolors[48];
if (lr.GetColorCount() > 1) {
absl::StatusOr<int> color;
for (int c = 0; c < 48; c++) {
@ -140,18 +137,18 @@ int main(int ac, char* av[]) {
for (int col = colstart;
col < colstart + width && col < *raw_width;
col++) {
++col) {
int idx = row * lr.GetImgData().sizes.raw_pitch / 2 + col;
if (rcolors[col % 48] == (unsigned)channel) {
absl::StatusOr<int> cblack = lr.GetCBlack(channel);
if (not cblack.ok()) {
std::cerr << "Unable to get cblack for channel " << channel;
std::cerr << cblack.status();
if (rcolors[col % 48] == channel) {
absl::StatusOr<unsigned int> cblack = lr.GetCBlack(channel);
if (!cblack.ok()) {
std::cerr << "Unable to get cblack for channel " << channel
<< ": " << cblack.status().message();
return EXIT_FAILURE;
}
std::cout << std::setw(6)
<< subtract_bl((*rawdata).at(idx), *cblack);
<< SubtractBlack((*rawdata).at(idx), *cblack);
} else {
std::cout << " -";
}
@ -160,4 +157,4 @@ int main(int ac, char* av[]) {
}
return EXIT_SUCCESS;
}
}

8
contrib/libraw/raw.gen.h.in
View File

@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef CONTRIB_LIBRAW_RAW_GEN_H
#define CONTRIB_LIBRAW_RAW_GEN_H
#include <cstdint>
#define __time_t uint64_t
#define time_t uint64_t
#include "${libraw_SOURCE_DIR}/libraw/libraw.h"
#endif // CONTRIB_LIBRAW_RAW_GEN_H

2
contrib/libraw/sandboxed.h
View File

@ -45,4 +45,4 @@ class LibRawSapiSandbox : public LibRawSandbox {
std::string file_name_;
};
#endif // CONTRIB_LIBRAW_SANDBOXED_
#endif // CONTRIB_LIBRAW_SANDBOXED_H_

6
contrib/libraw/test/libraw_test.cc
View File

@ -28,7 +28,7 @@ const struct TestVariant {
ushort raw_width;
int COLOR[4][4];
int color_values[4][4];
} TestData[] = {
} kTestData[] = {
{.filename = "img.raw",
.raw_height = 3516,
.raw_width = 5344,
@ -178,6 +178,6 @@ TEST_P(LibRawTestFiles, TestSubtractBlack) {
}
INSTANTIATE_TEST_SUITE_P(LibRawBase, LibRawTestFiles,
testing::ValuesIn(TestData));
testing::ValuesIn(kTestData));
} // namespace
} // namespace

12
contrib/libraw/utils/utils_libraw.cc
View File

@ -101,7 +101,7 @@ absl::StatusOr<int> LibRaw::COLOR(int row, int col) {
return color;
}
absl::StatusOr<ushort> LibRaw::GetRawHeight() {
absl::StatusOr<int> LibRaw::GetRawHeight() {
SAPI_RETURN_IF_ERROR(CheckIsInit());
ushort height;
@ -111,7 +111,7 @@ absl::StatusOr<ushort> LibRaw::GetRawHeight() {
return height;
}
absl::StatusOr<ushort> LibRaw::GetRawWidth() {
absl::StatusOr<int> LibRaw::GetRawWidth() {
SAPI_RETURN_IF_ERROR(CheckIsInit());
ushort width;
@ -121,7 +121,7 @@ absl::StatusOr<ushort> LibRaw::GetRawWidth() {
return width;
}
absl::StatusOr<unsigned> LibRaw::GetCBlack(int channel) {
absl::StatusOr<unsigned int> LibRaw::GetCBlack(int channel) {
SAPI_RETURN_IF_ERROR(CheckIsInit());
if (channel < 0 or channel >= LIBRAW_CBLACK_SIZE) {
@ -147,11 +147,11 @@ int LibRaw::GetColorCount() {
absl::StatusOr<std::vector<uint16_t>> LibRaw::RawData() {
SAPI_RETURN_IF_ERROR(CheckIsInit());
ushort raw_height;
ushort raw_width;
int raw_height;
int raw_width;
SAPI_ASSIGN_OR_RETURN(raw_height, GetRawHeight());
SAPI_ASSIGN_OR_RETURN(raw_width, GetRawWidth());
unsigned size = raw_height * raw_width;
int size = raw_height * raw_width;
std::vector<uint16_t> buf(size);
sapi::v::Array<uint16_t> rawdata(buf.data(), buf.size());

8
contrib/libraw/utils/utils_libraw.h
View File

@ -60,9 +60,9 @@ class LibRaw {
absl::Status SubtractBlack();
absl::StatusOr<std::vector<char*>> GetCameraList();
absl::StatusOr<int> COLOR(int row, int col);
absl::StatusOr<ushort> GetRawHeight();
absl::StatusOr<ushort> GetRawWidth();
absl::StatusOr<unsigned> GetCBlack(int channel);
absl::StatusOr<int> GetRawHeight();
absl::StatusOr<int> GetRawWidth();
absl::StatusOr<unsigned int> GetCBlack(int channel);
int GetColorCount();
private:
@ -77,4 +77,4 @@ class LibRaw {
sapi::v::Struct<libraw_data_t> sapi_libraw_data_t_;
};
#endif // CONTRIB_LIBRAW_UTILS_UTILS_LIBRAW_H_
#endif // CONTRIB_LIBRAW_UTILS_UTILS_LIBRAW_H_