octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

citra_qt: camera integration (#3566)

Browse Source 
* Implement camera feature

* Make OpenCVCamera optional

* Fix styling problems

* CI configuration

* Fix CI

* Hopefully final fix

* Hopefully final fix

* Fix all the problems

* Oops..

* Add Qt Multimedia Camera

* Another oops

* Try to fix broken linux CI

* Try to fix broken linux CI

* Fix problems

* Improve UI

* Fix problems

* camera: Add support for Qt <5.10 and fix preview error

* CI: try to fix linux-frozen travis build

* camera: fix problems and add multiple handlers support

* fix CI

* remove most ServiceFramework changes

* Fix format

* Remove last ServiceFramework change

* camera: remove unused interfaces; revert submodule change

* camera: fix CI error

* ci: use ccache for opencv build

* citra_qt: fix configuration error; CI: add mediaservice plugin

* citra_qt: fix clang-format

* citra_qt: fix documentation error

* citra_qt: fix configuration page; camera: fix pausing crash

* citra_qt: fix preview not stopping

* camera: extend handlers length

* camera: fix camera resume error

* camera: fix clang-format

* camera: remove all OpenCV; citra_qt: rewrite configuration

* camera: remove all OpenCV; citra_qt: rewrite configuration

* camera: remove all OpenCV; citra_qt: rewrite configuration

* CI: fix linux ci

* camera: check settings update; citra_qt: fix configuration error

* service_cam: use a better way to apply configuration

* Service_CAM: rewrite camera reload

* cam: fix clang format

* citra_qt: fix argument load issue; camera: base of system camera selection

* citra_qt: Add system camera selection

* camera: fix image upside down, Implement SetFrameRate in Qt Multimedia Camera

* camera: Add missing <array> include, update SetFrameRate and add settings in Qt Multimedia Camera header

* camera: move started in Qt Multimedia Camera header

* QtMultimediaCamera: Move frame rates to SetFrameRate; Set minimum and maximum frame rate

* Update appveyor.yml
This commit is contained in:
朱鹏飞
2018-05-12 01:42:23 +08:00
committed by James Rowe
parent bcecfac0ef
commit 57827de38b
28 changed files with 1531 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/frontend/camera/blank_camera.cpp
View File

@ -23,9 +23,13 @@ void BlankCamera::SetFlip(Service::CAM::Flip) {}
void BlankCamera::SetEffect(Service::CAM::Effect) {}
std::vector<u16> BlankCamera::ReceiveFrame() const {
std::vector<u16> BlankCamera::ReceiveFrame() {
// Note: 0x80008000 stands for two black pixels in YUV422
return std::vector<u16>(width * height, output_rgb ? 0 : 0x8000);
}
bool BlankCamera::IsPreviewAvailable() {
return true;
}
} // namespace Camera

4
src/core/frontend/camera/blank_camera.h
View File

@ -17,7 +17,9 @@ public:
void SetFlip(Service::CAM::Flip) override;
void SetEffect(Service::CAM::Effect) override;
void SetFormat(Service::CAM::OutputFormat) override;
std::vector<u16> ReceiveFrame() const override;
void SetFrameRate(Service::CAM::FrameRate frame_rate) override {}
std::vector<u16> ReceiveFrame() override;
bool IsPreviewAvailable() override;
private:
int width = 0;

14
src/core/frontend/camera/factory.cpp
View File

@ -29,4 +29,18 @@ std::unique_ptr<CameraInterface> CreateCamera(const std::string& name, const std
return std::make_unique<BlankCamera>();
}
std::unique_ptr<CameraInterface> CreateCameraPreview(const std::string& name,
const std::string& config, int width,
int height) {
auto pair = factories.find(name);
if (pair != factories.end()) {
return pair->second->CreatePreview(config, width, height);
}
if (name != "blank") {
LOG_ERROR(Service_CAM, "Unknown camera \"%s\"", name.c_str());
}
return std::make_unique<BlankCamera>();
}
} // namespace Camera

24
src/core/frontend/camera/factory.h
View File

@ -21,6 +21,20 @@ public:
* @returns a unique_ptr to the created camera object.
*/
virtual std::unique_ptr<CameraInterface> Create(const std::string& config) const = 0;
/**
* Creates a camera object for preview based on the configuration string.
* @param config Configuration string to create the camera. The implementation can decide the
* meaning of this string.
* @returns a unique_ptr to the created camera object.
* Note: The default implementation for this is to call Create(). Derived classes may have other
* Implementations. For example, A dialog may be used instead of LOG_ERROR when error
* occurs.
*/
virtual std::unique_ptr<CameraInterface> CreatePreview(const std::string& config, int width,
int height) const {
return Create(config);
}
};
/**
@ -38,4 +52,14 @@ void RegisterFactory(const std::string& name, std::unique_ptr<CameraFactory> fac
*/
std::unique_ptr<CameraInterface> CreateCamera(const std::string& name, const std::string& config);
/**
* Creates a camera from the factory for previewing.
* @param name Identifier of the camera factory.
* @param config Configuration string to create the camera. The meaning of this string is
* defined by the factory.
*/
std::unique_ptr<CameraInterface> CreateCameraPreview(const std::string& name,
const std::string& config, int width,
int height);
} // namespace Camera

16
src/core/frontend/camera/interface.h
View File

@ -49,13 +49,27 @@ public:
*/
virtual void SetFormat(Service::CAM::OutputFormat format) = 0;
/**
* Sets the recommended framerate of the camera.
* @param frame_rate Recommended framerate
*/
virtual void SetFrameRate(Service::CAM::FrameRate frame_rate) = 0;
/**
* Receives a frame from the camera.
* This function should be only called between a StartCapture call and a StopCapture call.
* @returns A std::vector<u16> containing pixels. The total size of the vector is width * height
* where width and height are set by a call to SetResolution.
*/
virtual std::vector<u16> ReceiveFrame() const = 0;
virtual std::vector<u16> ReceiveFrame() = 0;
/**
* Test if the camera is opened successfully and can receive a preview frame. Only used for
* preview. This function should be only called between a StartCapture call and a StopCapture
* call.
* @returns true if the camera is opened successfully and false otherwise
*/
virtual bool IsPreviewAvailable() = 0;
};
} // namespace Camera

44
src/core/hle/service/cam/cam.cpp
View File

@ -22,6 +22,8 @@
namespace Service {
namespace CAM {
static std::weak_ptr<Module> current_cam;
// built-in resolution parameters
constexpr std::array<Resolution, 8> PRESET_RESOLUTION{{
{640, 480, 0, 0, 639, 479}, // VGA
@ -138,9 +140,16 @@ void Module::StartReceiving(int port_id) {
port.is_receiving = true;
// launches a capture task asynchronously
const CameraConfig& camera = cameras[port.camera_id];
port.capture_result =
std::async(std::launch::async, &Camera::CameraInterface::ReceiveFrame, camera.impl.get());
CameraConfig& camera = cameras[port.camera_id];
port.capture_result = std::async(std::launch::async, [&camera, &port, this] {
if (is_camera_reload_pending.exchange(false)) {
// reinitialize the camera according to new settings
camera.impl->StopCapture();
LoadCameraImplementation(camera, port.camera_id);
camera.impl->StartCapture();
}
return camera.impl->ReceiveFrame();
});
// schedules a completion event according to the frame rate. The event will block on the
// capture task if it is not finished within the expected time
@ -771,7 +780,7 @@ void Module::Interface::SetFrameRate(Kernel::HLERequestContext& ctx) {
if (camera_select.IsValid()) {
for (int camera : camera_select) {
cam->cameras[camera].frame_rate = frame_rate;
// TODO(wwylele): consider hinting the actual camera with the expected frame rate
cam->cameras[camera].impl->SetFrameRate(frame_rate);
}
rb.Push(RESULT_SUCCESS);
} else {
@ -980,12 +989,7 @@ void Module::Interface::DriverInitialize(Kernel::HLERequestContext& ctx) {
context.resolution =
context_id == 0 ? PRESET_RESOLUTION[5 /*DS_LCD*/] : PRESET_RESOLUTION[0 /*VGA*/];
}
camera.impl = Camera::CreateCamera(Settings::values.camera_name[camera_id],
Settings::values.camera_config[camera_id]);
camera.impl->SetFlip(camera.contexts[0].flip);
camera.impl->SetEffect(camera.contexts[0].effect);
camera.impl->SetFormat(camera.contexts[0].format);
camera.impl->SetResolution(camera.contexts[0].resolution);
cam->LoadCameraImplementation(camera, camera_id);
}
for (PortConfig& port : cam->ports) {
@ -1032,8 +1036,28 @@ Module::~Module() {
CancelReceiving(1);
}
void Module::ReloadCameraDevices() {
is_camera_reload_pending.store(true);
}
void Module::LoadCameraImplementation(CameraConfig& camera, int camera_id) {
camera.impl = Camera::CreateCamera(Settings::values.camera_name[camera_id],
Settings::values.camera_config[camera_id]);
camera.impl->SetFlip(camera.contexts[0].flip);
camera.impl->SetEffect(camera.contexts[0].effect);
camera.impl->SetFormat(camera.contexts[0].format);
camera.impl->SetResolution(camera.contexts[0].resolution);
}
void ReloadCameraDevices() {
if (auto cam = current_cam.lock())
cam->ReloadCameraDevices();
}
void InstallInterfaces(SM::ServiceManager& service_manager) {
auto cam = std::make_shared<Module>();
current_cam = cam;
std::make_shared<CAM_U>(cam)->InstallAsService(service_manager);
std::make_shared<CAM_S>(cam)->InstallAsService(service_manager);
std::make_shared<CAM_C>(cam)->InstallAsService(service_manager);

7
src/core/hle/service/cam/cam.h
View File

@ -240,6 +240,7 @@ class Module final {
public:
Module();
~Module();
void ReloadCameraDevices();
class Interface : public ServiceFramework<Interface> {
public:
@ -771,11 +772,17 @@ private:
void Clear();
};
void LoadCameraImplementation(CameraConfig& camera, int camera_id);
std::array<CameraConfig, NumCameras> cameras;
std::array<PortConfig, 2> ports;
CoreTiming::EventType* completion_event_callback;
std::atomic<bool> is_camera_reload_pending{false};
};
/// Reload camera devices. Used when input configuration changed
void ReloadCameraDevices();
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace CAM

1
src/core/settings.cpp
View File

@ -35,6 +35,7 @@ void Apply() {
Service::HID::ReloadInputDevices();
Service::IR::ReloadInputDevices();
Service::CAM::ReloadCameraDevices();
}
} // namespace Settings