openharmony/distributed_camera
1
0
Fork 0
mirror of https://github.com/openharmony/distributed_camera.git synced 2026-07-19 16:43:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix distributed camera bug

Browse Source 
Signed-off-by: zhuxu <zhuxu29@huawei.com>
This commit is contained in:
zhuxu
2022-05-26 20:48:05 +08:00
parent a04d916cc1
commit 1cfeff35dd
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.h
+4
View File
@@ -42,6 +42,7 @@ public:
void UpdateInterval(uint32_t fps);
private:
void StartEvent();
void LooperContinue();
void LooperSnapShot();
int32_t FeedStreamToDriver(const std::shared_ptr<DHBase>& dhBase, const std::shared_ptr<DataBuffer>& buffer);
@@ -53,9 +54,12 @@ private:
std::string devId_;
std::string dhId_;
std::thread eventThread_;
std::thread producerThread_;
std::condition_variable eventCon_;
std::condition_variable producerCon_;
std::mutex bufferMutex_;
std::mutex eventMutex_;
std::queue<std::shared_ptr<DataBuffer>> buffers_;
DCameraProducerState state_;
uint32_t interval_;
services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp
+19 -5
View File
@@ -27,7 +27,7 @@ namespace OHOS {
namespace DistributedHardware {
DCameraStreamDataProcessProducer::DCameraStreamDataProcessProducer(std::string devId, std::string dhId,
int32_t streamId, DCStreamType streamType)
: devId_(devId), dhId_(dhId), streamId_(streamId), streamType_(streamType)
: devId_(devId), dhId_(dhId), streamId_(streamId), streamType_(streamType), eventHandler_(nullptr)
{
DHLOGI("DCameraStreamDataProcessProducer Constructor devId %s dhId %s streamType: %d streamId: %d",
GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_);
@@ -50,10 +50,12 @@ void DCameraStreamDataProcessProducer::Start()
GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_);
state_ = DCAMERA_PRODUCER_STATE_START;
if (streamType_ == CONTINUOUS_FRAME) {
eventThread_ = std::thread(&DCameraStreamDataProcessProducer::StartEvent, this);
std::unique_lock<std::mutex> lock(eventMutex_);
eventCon_.wait(lock, [this] {
return eventHandler_ != nullptr;
});
producerThread_ = std::thread(&DCameraStreamDataProcessProducer::LooperContinue, this);
std::string threadName = "DCameraProducer_" + std::to_string(streamType_) + "_" + std::to_string(streamId_);
auto runner = AppExecFwk::EventRunner::Create(threadName);
eventHandler_ = std::make_shared<AppExecFwk::EventHandler>(runner);
} else {
producerThread_ = std::thread(&DCameraStreamDataProcessProducer::LooperSnapShot, this);
}
@@ -66,7 +68,11 @@ void DCameraStreamDataProcessProducer::Stop()
state_ = DCAMERA_PRODUCER_STATE_STOP;
producerCon_.notify_one();
producerThread_.join();
eventHandler_ = nullptr;
if (streamType_ == CONTINUOUS_FRAME) {
eventHandler_->GetEventRunner()->Stop();
eventThread_.join();
eventHandler_ = nullptr;
}
DHLOGI("DCameraStreamDataProcessProducer Stop end devId: %s dhId: %s streamType: %d streamId: %d state: %d",
GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_);
}
@@ -87,6 +93,14 @@ void DCameraStreamDataProcessProducer::FeedStream(const std::shared_ptr<DataBuff
}
}
void DCameraStreamDataProcessProducer::StartEvent()
{
auto runner = AppExecFwk::EventRunner::Create(false);
eventHandler_ = std::make_shared<AppExecFwk::EventHandler>(runner);
eventCon_.notify_one();
runner->Run();
}
void DCameraStreamDataProcessProducer::LooperContinue()
{
DHLOGI("LooperContinue producer devId: %s dhId: %s streamType: %d streamId: %d state: %d",