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
614d478c
Commit
614d478c
authored
Jul 18, 2009
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support v4l2 drivers with JPEG type
(and print some extra debug)
parent
56c94f9c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
modules/access/v4l2.c
modules/access/v4l2.c
+5
-3
No files found.
modules/access/v4l2.c
View file @
614d478c
...
...
@@ -429,8 +429,8 @@ static const struct
/* Compressed data types */
{
V4L2_PIX_FMT_MJPEG
,
VLC_FOURCC
(
'M'
,
'J'
,
'P'
,
'G'
),
0
,
0
,
0
},
{
V4L2_PIX_FMT_JPEG
,
VLC_FOURCC
(
'J'
,
'P'
,
'E'
,
'G'
),
0
,
0
,
0
},
#if 0
{ V4L2_PIX_FMT_JPEG, VLC_FOURCC('J','P','E','G') },
{ V4L2_PIX_FMT_DV, VLC_FOURCC('?','?','?','?') },
{ V4L2_PIX_FMT_MPEG, VLC_FOURCC('?','?','?','?') },
#endif
...
...
@@ -446,7 +446,7 @@ static const struct
static
const
__u32
p_chroma_fallbacks
[]
=
{
V4L2_PIX_FMT_YUV420
,
V4L2_PIX_FMT_YVU420
,
V4L2_PIX_FMT_YUV422P
,
V4L2_PIX_FMT_YUYV
,
V4L2_PIX_FMT_UYVY
,
V4L2_PIX_FMT_BGR24
,
V4L2_PIX_FMT_BGR32
,
V4L2_PIX_FMT_MJPEG
};
V4L2_PIX_FMT_BGR32
,
V4L2_PIX_FMT_MJPEG
,
V4L2_PIX_FMT_JPEG
};
static
const
struct
{
...
...
@@ -2010,8 +2010,10 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
p_sys
->
i_width
=
fmt
.
fmt
.
pix
.
width
;
p_sys
->
i_height
=
fmt
.
fmt
.
pix
.
height
;
/* Check interlacing */
if
(
v4l2_ioctl
(
i_fd
,
VIDIOC_G_FMT
,
&
fmt
)
<
0
)
{;}
/* Print extra info */
msg_Dbg
(
p_demux
,
"Driver requires at most %d bytes to store a complete image"
,
fmt
.
fmt
.
pix
.
sizeimage
);
/* Check interlacing */
switch
(
fmt
.
fmt
.
pix
.
field
)
{
case
V4L2_FIELD_NONE
:
...
...
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