Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
433c5199
Commit
433c5199
authored
Apr 01, 2020
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
videoio: fixed conversion in MSMF backend
parent
396f43d6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
12 deletions
+13
-12
cap_msmf.cpp
modules/videoio/src/cap_msmf.cpp
+13
-12
No files found.
modules/videoio/src/cap_msmf.cpp
View file @
433c5199
...
...
@@ -579,7 +579,7 @@ public:
virtual
bool
isOpened
()
const
CV_OVERRIDE
{
return
isOpen
;
}
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
return
CV_CAP_MSMF
;
}
protected
:
bool
configureOutput
(
MediaType
newType
,
cv
::
uint32_t
outFormat
,
bool
convertToFormat
);
bool
configureOutput
(
MediaType
newType
,
cv
::
uint32_t
outFormat
);
bool
setTime
(
double
time
,
bool
rough
);
bool
configureHW
(
bool
enable
);
...
...
@@ -766,7 +766,7 @@ bool CvCapture_MSMF::configureHW(bool enable)
#endif
}
bool
CvCapture_MSMF
::
configureOutput
(
MediaType
newType
,
cv
::
uint32_t
outFormat
,
bool
convertToFormat
)
bool
CvCapture_MSMF
::
configureOutput
(
MediaType
newType
,
cv
::
uint32_t
outFormat
)
{
FormatStorage
formats
;
formats
.
read
(
videoFileSource
.
Get
());
...
...
@@ -774,7 +774,7 @@ bool CvCapture_MSMF::configureOutput(MediaType newType, cv::uint32_t outFormat,
dwStreamIndex
=
bestMatch
.
first
.
stream
;
nativeFormat
=
bestMatch
.
second
;
MediaType
newFormat
=
nativeFormat
;
if
(
convert
To
Format
)
if
(
convertFormat
)
{
switch
(
outFormat
)
{
...
...
@@ -834,7 +834,7 @@ bool CvCapture_MSMF::open(int index)
camid
=
index
;
readCallback
=
cb
;
duration
=
0
;
if
(
configureOutput
(
MediaType
::
createDefault
(),
outputFormat
,
convertFormat
))
if
(
configureOutput
(
MediaType
::
createDefault
(),
outputFormat
))
{
frameStep
=
captureFormat
.
getFrameStep
();
}
...
...
@@ -855,7 +855,7 @@ bool CvCapture_MSMF::open(const cv::String& _filename)
{
isOpen
=
true
;
sampleTime
=
0
;
if
(
configureOutput
(
MediaType
(),
outputFormat
,
convertFormat
))
if
(
configureOutput
(
MediaType
(),
outputFormat
))
{
frameStep
=
captureFormat
.
getFrameStep
();
filename
=
_filename
;
...
...
@@ -1298,42 +1298,43 @@ bool CvCapture_MSMF::setProperty( int property_id, double value )
return
false
;
}
case
CV_CAP_PROP_FORMAT
:
return
configureOutput
(
newFormat
,
(
int
)
cvRound
(
value
)
,
convertFormat
);
return
configureOutput
(
newFormat
,
(
int
)
cvRound
(
value
));
case
CV_CAP_PROP_CONVERT_RGB
:
return
configureOutput
(
newFormat
,
outputFormat
,
value
!=
0
);
convertFormat
=
(
value
!=
0
);
return
configureOutput
(
newFormat
,
outputFormat
);
case
CV_CAP_PROP_SAR_NUM
:
if
(
value
>
0
)
{
newFormat
.
aspectRatioNum
=
(
UINT32
)
cvRound
(
value
);
return
configureOutput
(
newFormat
,
outputFormat
,
convertFormat
);
return
configureOutput
(
newFormat
,
outputFormat
);
}
break
;
case
CV_CAP_PROP_SAR_DEN
:
if
(
value
>
0
)
{
newFormat
.
aspectRatioDenom
=
(
UINT32
)
cvRound
(
value
);
return
configureOutput
(
newFormat
,
outputFormat
,
convertFormat
);
return
configureOutput
(
newFormat
,
outputFormat
);
}
break
;
case
CV_CAP_PROP_FRAME_WIDTH
:
if
(
value
>=
0
)
{
newFormat
.
width
=
(
UINT32
)
cvRound
(
value
);
return
configureOutput
(
newFormat
,
outputFormat
,
convertFormat
);
return
configureOutput
(
newFormat
,
outputFormat
);
}
break
;
case
CV_CAP_PROP_FRAME_HEIGHT
:
if
(
value
>=
0
)
{
newFormat
.
height
=
(
UINT32
)
cvRound
(
value
);
return
configureOutput
(
newFormat
,
outputFormat
,
convertFormat
);
return
configureOutput
(
newFormat
,
outputFormat
);
}
break
;
case
CV_CAP_PROP_FPS
:
if
(
value
>=
0
)
{
newFormat
.
setFramerate
(
value
);
return
configureOutput
(
newFormat
,
outputFormat
,
convertFormat
);
return
configureOutput
(
newFormat
,
outputFormat
);
}
break
;
case
CV_CAP_PROP_FOURCC
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment