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
aba9d5a9
Commit
aba9d5a9
authored
May 10, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DV: remove useless strdup
This plugin does not use its MRL at all (?!).
parent
06dad8d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
19 deletions
+7
-19
modules/access/dv.c
modules/access/dv.c
+7
-19
No files found.
modules/access/dv.c
View file @
aba9d5a9
...
@@ -133,11 +133,10 @@ static int Open( vlc_object_t *p_this )
...
@@ -133,11 +133,10 @@ static int Open( vlc_object_t *p_this )
{
{
access_t
*
p_access
=
(
access_t
*
)
p_this
;
access_t
*
p_access
=
(
access_t
*
)
p_this
;
access_sys_t
*
p_sys
;
access_sys_t
*
p_sys
;
char
*
psz_name
=
strdup
(
p_access
->
psz_path
);
struct
raw1394_portinfo
port_inf
[
16
];
struct
raw1394_portinfo
port_inf
[
16
];
msg_Dbg
(
p_access
,
"opening device
%s"
,
psz_name
);
msg_Dbg
(
p_access
,
"opening device
"
);
/* Set up p_access */
/* Set up p_access */
access_InitFields
(
p_access
);
access_InitFields
(
p_access
);
...
@@ -145,10 +144,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -145,10 +144,7 @@ static int Open( vlc_object_t *p_this )
p_access
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
access_sys_t
)
);
p_access
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
access_sys_t
)
);
if
(
!
p_sys
)
if
(
!
p_sys
)
{
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
p_sys
->
i_cards
=
0
;
p_sys
->
i_cards
=
0
;
p_sys
->
i_node
=
0
;
p_sys
->
i_node
=
0
;
...
@@ -167,42 +163,37 @@ static int Open( vlc_object_t *p_this )
...
@@ -167,42 +163,37 @@ static int Open( vlc_object_t *p_this )
{
{
msg_Err
(
p_access
,
"failed to open a Firewire (IEEE1394) connection"
);
msg_Err
(
p_access
,
"failed to open a Firewire (IEEE1394) connection"
);
Close
(
p_this
);
Close
(
p_this
);
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
p_sys
->
p_avc1394
=
AVCOpen
(
p_access
,
p_sys
->
i_port
);
p_sys
->
p_avc1394
=
AVCOpen
(
p_access
,
p_sys
->
i_port
);
if
(
!
p_sys
->
p_avc1394
)
if
(
!
p_sys
->
p_avc1394
)
{
{
msg_Err
(
p_access
,
"no Digital Video Control device found
on %s"
,
psz_name
);
msg_Err
(
p_access
,
"no Digital Video Control device found
"
);
Close
(
p_this
);
Close
(
p_this
);
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
p_sys
->
p_raw1394
=
raw1394_new_handle
();
p_sys
->
p_raw1394
=
raw1394_new_handle
();
if
(
!
p_sys
->
p_raw1394
)
if
(
!
p_sys
->
p_raw1394
)
{
{
msg_Err
(
p_access
,
"no Digital Video device found
on %s"
,
psz_name
);
msg_Err
(
p_access
,
"no Digital Video device found
"
);
Close
(
p_this
);
Close
(
p_this
);
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
p_sys
->
i_cards
=
raw1394_get_port_info
(
p_sys
->
p_raw1394
,
port_inf
,
16
);
p_sys
->
i_cards
=
raw1394_get_port_info
(
p_sys
->
p_raw1394
,
port_inf
,
16
);
if
(
p_sys
->
i_cards
<
0
)
if
(
p_sys
->
i_cards
<
0
)
{
{
msg_Err
(
p_access
,
"failed to get port info
for %s"
,
psz_name
);
msg_Err
(
p_access
,
"failed to get port info
"
);
Close
(
p_this
);
Close
(
p_this
);
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
if
(
raw1394_set_port
(
p_sys
->
p_raw1394
,
p_sys
->
i_port
)
<
0
)
if
(
raw1394_set_port
(
p_sys
->
p_raw1394
,
p_sys
->
i_port
)
<
0
)
{
{
msg_Err
(
p_access
,
"failed to set port info
for %s"
,
psz_name
);
msg_Err
(
p_access
,
"failed to set port info
"
);
Close
(
p_this
);
Close
(
p_this
);
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -210,9 +201,8 @@ static int Open( vlc_object_t *p_this )
...
@@ -210,9 +201,8 @@ static int Open( vlc_object_t *p_this )
ISOCHRONOUS_QUEUE_LENGTH
,
ISOCHRONOUS_MAX_PACKET_SIZE
,
ISOCHRONOUS_QUEUE_LENGTH
,
ISOCHRONOUS_MAX_PACKET_SIZE
,
p_sys
->
i_channel
,
RAW1394_DMA_PACKET_PER_BUFFER
,
-
1
)
<
0
)
p_sys
->
i_channel
,
RAW1394_DMA_PACKET_PER_BUFFER
,
-
1
)
<
0
)
{
{
msg_Err
(
p_access
,
"failed to init isochronous recv
for %s"
,
psz_name
);
msg_Err
(
p_access
,
"failed to init isochronous recv
"
);
Close
(
p_this
);
Close
(
p_this
);
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -229,9 +219,8 @@ static int Open( vlc_object_t *p_this )
...
@@ -229,9 +219,8 @@ static int Open( vlc_object_t *p_this )
p_sys
->
p_ev
=
vlc_object_create
(
p_access
,
sizeof
(
event_thread_t
)
);
p_sys
->
p_ev
=
vlc_object_create
(
p_access
,
sizeof
(
event_thread_t
)
);
if
(
!
p_sys
->
p_ev
)
if
(
!
p_sys
->
p_ev
)
{
{
msg_Err
(
p_access
,
"failed to create event thread
for %s"
,
psz_name
);
msg_Err
(
p_access
,
"failed to create event thread
"
);
Close
(
p_this
);
Close
(
p_this
);
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -242,7 +231,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -242,7 +231,6 @@ static int Open( vlc_object_t *p_this )
vlc_thread_create
(
p_sys
->
p_ev
,
"dv event thread handler"
,
vlc_thread_create
(
p_sys
->
p_ev
,
"dv event thread handler"
,
Raw1394EventThread
,
VLC_THREAD_PRIORITY_OUTPUT
);
Raw1394EventThread
,
VLC_THREAD_PRIORITY_OUTPUT
);
free
(
psz_name
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
...
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