Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
48cecf7c
Commit
48cecf7c
authored
Nov 13, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OpenCV: do not assume picture is at p_data_orig
This seems quite wrong to me, but untested.
parent
2a9b3101
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
10 deletions
+1
-10
modules/video_filter/opencv_example.c
modules/video_filter/opencv_example.c
+1
-9
modules/video_filter/opencv_wrapper.c
modules/video_filter/opencv_wrapper.c
+0
-1
No files found.
modules/video_filter/opencv_example.c
View file @
48cecf7c
...
@@ -139,9 +139,6 @@ static void CloseFilter( vlc_object_t *p_this )
...
@@ -139,9 +139,6 @@ static void CloseFilter( vlc_object_t *p_this )
/****************************************************************************
/****************************************************************************
* Filter: Check for faces and raises an event when one is found.
* Filter: Check for faces and raises an event when one is found.
****************************************************************************
* p_pic: A picture_t with its p_data_orig member set to an array of
* IplImages (one image for each picture_t plane).
****************************************************************************/
****************************************************************************/
static
picture_t
*
Filter
(
filter_t
*
p_filter
,
picture_t
*
p_pic
)
static
picture_t
*
Filter
(
filter_t
*
p_filter
,
picture_t
*
p_pic
)
{
{
...
@@ -156,13 +153,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
...
@@ -156,13 +153,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
msg_Err
(
p_filter
,
"no image array"
);
msg_Err
(
p_filter
,
"no image array"
);
return
NULL
;
return
NULL
;
}
}
if
(
!
(
p_pic
->
p_data_orig
))
{
msg_Err
(
p_filter
,
"no image array"
);
return
NULL
;
}
//(hack) cast the picture_t to array of IplImage*
//(hack) cast the picture_t to array of IplImage*
p_img
=
(
IplImage
**
)
p_pic
->
p
_data_orig
;
p_img
=
(
IplImage
**
)
p_pic
->
p
[
0
].
p_pixels
;
i_planes
=
p_pic
->
i_planes
;
i_planes
=
p_pic
->
i_planes
;
//check the image array for validity
//check the image array for validity
...
...
modules/video_filter/opencv_wrapper.c
View file @
48cecf7c
...
@@ -509,7 +509,6 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in )
...
@@ -509,7 +509,6 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in )
//Hack the above opencv image array into a picture_t so that it can be sent to
//Hack the above opencv image array into a picture_t so that it can be sent to
//another video filter
//another video filter
p_sys
->
hacked_pic
.
p_data_orig
=
p_sys
->
p_cv_image
;
p_sys
->
hacked_pic
.
i_planes
=
planes
;
p_sys
->
hacked_pic
.
i_planes
=
planes
;
p_sys
->
hacked_pic
.
format
.
i_chroma
=
fmt_out
.
i_chroma
;
p_sys
->
hacked_pic
.
format
.
i_chroma
=
fmt_out
.
i_chroma
;
...
...
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