Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
82a10225
Commit
82a10225
authored
Mar 14, 2015
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xcbgrab: Do not assume the non shm image data is always available
Signed-off-by:
Luca Barbato
<
lu_zero@gentoo.org
>
parent
a09c499a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
xcbgrab.c
libavdevice/xcbgrab.c
+14
-2
No files found.
libavdevice/xcbgrab.c
View file @
82a10225
...
@@ -145,13 +145,25 @@ static int xcbgrab_frame(AVFormatContext *s, AVPacket *pkt)
...
@@ -145,13 +145,25 @@ static int xcbgrab_frame(AVFormatContext *s, AVPacket *pkt)
xcb_get_image_cookie_t
iq
;
xcb_get_image_cookie_t
iq
;
xcb_get_image_reply_t
*
img
;
xcb_get_image_reply_t
*
img
;
xcb_drawable_t
drawable
=
c
->
screen
->
root
;
xcb_drawable_t
drawable
=
c
->
screen
->
root
;
xcb_generic_error_t
*
e
=
NULL
;
uint8_t
*
data
;
uint8_t
*
data
;
int
length
,
ret
;
int
length
,
ret
;
iq
=
xcb_get_image
(
c
->
conn
,
XCB_IMAGE_FORMAT_Z_PIXMAP
,
drawable
,
iq
=
xcb_get_image
(
c
->
conn
,
XCB_IMAGE_FORMAT_Z_PIXMAP
,
drawable
,
c
->
x
,
c
->
y
,
c
->
width
,
c
->
height
,
~
0
);
c
->
x
,
c
->
y
,
c
->
width
,
c
->
height
,
~
0
);
img
=
xcb_get_image_reply
(
c
->
conn
,
iq
,
NULL
);
img
=
xcb_get_image_reply
(
c
->
conn
,
iq
,
&
e
);
if
(
e
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Cannot get the image data "
"event_error: response_type:%u error_code:%u "
"sequence:%u resource_id:%u minor_code:%u major_code:%u.
\n
"
,
e
->
response_type
,
e
->
error_code
,
e
->
sequence
,
e
->
resource_id
,
e
->
minor_code
,
e
->
major_code
);
return
AVERROR
(
EACCES
);
}
if
(
!
img
)
if
(
!
img
)
return
AVERROR
(
EAGAIN
);
return
AVERROR
(
EAGAIN
);
...
@@ -405,7 +417,7 @@ static int xcbgrab_read_packet(AVFormatContext *s, AVPacket *pkt)
...
@@ -405,7 +417,7 @@ static int xcbgrab_read_packet(AVFormatContext *s, AVPacket *pkt)
ret
=
xcbgrab_frame
(
s
,
pkt
);
ret
=
xcbgrab_frame
(
s
,
pkt
);
#if CONFIG_LIBXCB_XFIXES
#if CONFIG_LIBXCB_XFIXES
if
(
c
->
draw_mouse
&&
p
->
same_screen
)
if
(
ret
>=
0
&&
c
->
draw_mouse
&&
p
->
same_screen
)
xcbgrab_draw_mouse
(
s
,
pkt
,
p
,
geo
);
xcbgrab_draw_mouse
(
s
,
pkt
,
p
,
geo
);
#endif
#endif
...
...
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