mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 07:43:03 +04:00
Merge pull request #28309 from raimbekovm:fix-typos-batch6
docs: fix typos in documentation and code comments #28309 ## Summary This PR fixes 10 spelling errors in documentation and code comments across 7 files. ## Changes - `suppport` → `support` (2 occurrences in test_video_io.cpp) - `compability` → `compatibility` (2 occurrences in face.hpp) - `successfull` → `successful` (1 occurrence in cv2.cpp) - `accomodate` → `accommodate` (2 occurrences in calib3d.hpp and test_camera.cpp) - `minimun` → `minimum` (1 occurrence in aruco_detector.hpp) - `maximun` → `maximum` (1 occurrence in aruco_detector.hpp) - `orignal` → `original` (1 occurrence in aruco_detector.cpp) ## Test plan - [x] No API changes - [x] Documentation-only changes - [x] Code compiles without errors
This commit is contained in:
@@ -373,7 +373,7 @@ void MSMFStreamChannel::start(const StreamProfile& profile, FrameCallback frameC
|
||||
break;
|
||||
}
|
||||
}
|
||||
streamState_ = quit ? streamState_ : STREAM_STOPED;
|
||||
streamState_ = quit ? streamState_ : STREAM_STOPPED;
|
||||
}
|
||||
|
||||
void MSMFStreamChannel::stop()
|
||||
@@ -385,7 +385,7 @@ void MSMFStreamChannel::stop()
|
||||
streamReader_->Flush(currentStreamIndex_);
|
||||
std::unique_lock<std::mutex> lk(streamStateMutex_);
|
||||
streamStateCv_.wait_for(lk, std::chrono::milliseconds(1000), [&]() {
|
||||
return streamState_ == STREAM_STOPED;
|
||||
return streamState_ == STREAM_STOPPED;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -474,7 +474,7 @@ STDMETHODIMP MSMFStreamChannel::OnReadSample(HRESULT hrStatus, DWORD dwStreamInd
|
||||
streamStateCv_.notify_all();
|
||||
}
|
||||
|
||||
if (streamState_ != STREAM_STOPPING && streamState_ != STREAM_STOPED)
|
||||
if (streamState_ != STREAM_STOPPING && streamState_ != STREAM_STOPPED)
|
||||
{
|
||||
HR_FAILED_LOG(streamReader_->ReadSample(dwStreamIndex, 0, nullptr, nullptr, nullptr, nullptr));
|
||||
if (sample)
|
||||
@@ -505,10 +505,10 @@ STDMETHODIMP MSMFStreamChannel::OnEvent(DWORD /*sidx*/, IMFMediaEvent* /*event*/
|
||||
|
||||
STDMETHODIMP MSMFStreamChannel::OnFlush(DWORD)
|
||||
{
|
||||
if (streamState_ != STREAM_STOPED)
|
||||
if (streamState_ != STREAM_STOPPED)
|
||||
{
|
||||
std::unique_lock<std::mutex> lock(streamStateMutex_);
|
||||
streamState_ = STREAM_STOPED;
|
||||
streamState_ = STREAM_STOPPED;
|
||||
streamStateCv_.notify_all();
|
||||
}
|
||||
return S_OK;
|
||||
|
||||
@@ -176,7 +176,7 @@ Ptr<IStreamChannel> V4L2Context::createStreamChannel(const UvcDeviceInfo& devInf
|
||||
|
||||
V4L2StreamChannel::V4L2StreamChannel(const UvcDeviceInfo &devInfo) : IUvcStreamChannel(devInfo),
|
||||
devFd_(-1),
|
||||
streamState_(STREAM_STOPED)
|
||||
streamState_(STREAM_STOPPED)
|
||||
{
|
||||
|
||||
devFd_ = open(devInfo_.id.c_str(), O_RDWR | O_NONBLOCK, 0);
|
||||
@@ -203,7 +203,7 @@ V4L2StreamChannel::~V4L2StreamChannel() noexcept
|
||||
|
||||
void V4L2StreamChannel::start(const StreamProfile& profile, FrameCallback frameCallback)
|
||||
{
|
||||
if (streamState_ != STREAM_STOPED)
|
||||
if (streamState_ != STREAM_STOPPED)
|
||||
{
|
||||
CV_LOG_ERROR(NULL, devInfo_.id << ": repetitive operation!")
|
||||
return;
|
||||
@@ -248,7 +248,7 @@ void V4L2StreamChannel::start(const StreamProfile& profile, FrameCallback frameC
|
||||
streamState_ = STREAM_STARTING;
|
||||
uint32_t type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
IOCTL_FAILED_EXEC(xioctl(devFd_, VIDIOC_STREAMON, &type), {
|
||||
streamState_ = STREAM_STOPED;
|
||||
streamState_ = STREAM_STOPPED;
|
||||
for (uint32_t i = 0; i < MAX_FRAME_BUFFER_NUM; i++)
|
||||
{
|
||||
if (frameBuffList[i].ptr)
|
||||
@@ -279,7 +279,7 @@ void V4L2StreamChannel::grabFrame()
|
||||
|
||||
IOCTL_FAILED_EXEC(xioctl(devFd_, VIDIOC_QBUF, &buf), {
|
||||
std::unique_lock<std::mutex> lk(streamStateMutex_);
|
||||
streamState_ = STREAM_STOPED;
|
||||
streamState_ = STREAM_STOPPED;
|
||||
streamStateCv_.notify_all();
|
||||
return;
|
||||
});
|
||||
@@ -303,7 +303,7 @@ void V4L2StreamChannel::grabFrame()
|
||||
IOCTL_FAILED_CONTINUE(xioctl(devFd_, VIDIOC_QBUF, &buf));
|
||||
}
|
||||
std::unique_lock<std::mutex> lk(streamStateMutex_);
|
||||
streamState_ = STREAM_STOPED;
|
||||
streamState_ = STREAM_STOPPED;
|
||||
streamStateCv_.notify_all();
|
||||
}
|
||||
|
||||
@@ -357,7 +357,7 @@ void V4L2StreamChannel::stop()
|
||||
streamState_ = STREAM_STOPPING;
|
||||
std::unique_lock<std::mutex> lk(streamStateMutex_);
|
||||
streamStateCv_.wait_for(lk, std::chrono::milliseconds(1000), [&](){
|
||||
return streamState_ == STREAM_STOPED;
|
||||
return streamState_ == STREAM_STOPPED;
|
||||
});
|
||||
uint32_t type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
IOCTL_FAILED_LOG(xioctl(devFd_, VIDIOC_STREAMOFF, &type));
|
||||
|
||||
@@ -42,7 +42,7 @@ struct UvcDeviceInfo
|
||||
|
||||
enum StreamState
|
||||
{
|
||||
STREAM_STOPED = 0, // stoped or ready
|
||||
STREAM_STOPPED = 0, // stopped or ready
|
||||
STREAM_STARTING = 1,
|
||||
STREAM_STARTED = 2,
|
||||
STREAM_STOPPING = 3,
|
||||
|
||||
Reference in New Issue
Block a user