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
f79599f9
Commit
f79599f9
authored
Aug 25, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12308 from StrangeTcy:patch-1
parents
d10a2198
c94d7587
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
cap_xine.cpp
modules/videoio/src/cap_xine.cpp
+6
-6
No files found.
modules/videoio/src/cap_xine.cpp
View file @
f79599f9
...
...
@@ -107,7 +107,7 @@ class XINECapture : public IVideoCapture
bool
open
(
const
char
*
filename
)
{
CV_Assert
(
!
xine
,
!
stream
,
!
vo_port
);
CV_Assert
_N
(
!
xine
,
!
stream
,
!
vo_port
);
char
configfile
[
2048
]
=
{
0
};
xine
=
xine_new
();
...
...
@@ -207,7 +207,7 @@ class XINECapture : public IVideoCapture
double
getProperty
(
int
property_id
)
const
CV_OVERRIDE
{
CV_Assert
(
xine
,
vo_port
,
stream
);
CV_Assert
_N
(
xine
,
vo_port
,
stream
);
int
pos_t
,
pos_l
,
length
;
bool
res
=
(
bool
)
xine_get_pos_length
(
stream
,
&
pos_l
,
&
pos_t
,
&
length
);
...
...
@@ -240,7 +240,7 @@ class XINECapture : public IVideoCapture
protected
:
bool
oldSeekFrame
(
int
f
)
{
CV_Assert
(
xine
,
vo_port
,
stream
);
CV_Assert
_N
(
xine
,
vo_port
,
stream
);
// no need to seek if we are already there...
if
(
f
==
frame_number
)
{
...
...
@@ -290,7 +290,7 @@ protected:
bool
seekFrame
(
int
f
)
{
CV_Assert
(
xine
,
vo_port
,
stream
);
CV_Assert
_N
(
xine
,
vo_port
,
stream
);
if
(
seekable
)
{
int
new_time
=
(
int
)((
f
+
1
)
*
(
float
)
frame_duration
);
...
...
@@ -309,7 +309,7 @@ protected:
bool
seekTime
(
int
t
)
{
CV_Assert
(
xine
,
vo_port
,
stream
);
CV_Assert
_N
(
xine
,
vo_port
,
stream
);
if
(
seekable
)
{
if
(
xine_play
(
stream
,
0
,
t
))
...
...
@@ -328,7 +328,7 @@ protected:
bool
seekRatio
(
double
ratio
)
{
CV_Assert
(
xine
,
vo_port
,
stream
);
CV_Assert
_N
(
xine
,
vo_port
,
stream
);
if
(
ratio
>
1
||
ratio
<
0
)
return
false
;
if
(
seekable
)
...
...
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