Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
a1bef303
Commit
a1bef303
authored
Jan 04, 2009
by
dionoea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix confusing variable name.
parent
9f7c2895
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
modules/access/alsa.c
modules/access/alsa.c
+3
-3
modules/access/oss.c
modules/access/oss.c
+3
-3
modules/access/v4l2/v4l2.c
modules/access/v4l2/v4l2.c
+6
-6
No files found.
modules/access/alsa.c
View file @
a1bef303
...
...
@@ -119,7 +119,7 @@ struct demux_sys_t
const
char
*
psz_device
;
/* Alsa device from MRL */
/* Audio */
int
i_
pts
;
int
i_
cache
;
unsigned
int
i_sample_rate
;
bool
b_stereo
;
size_t
i_max_frame_size
;
...
...
@@ -178,7 +178,7 @@ static int DemuxOpen( vlc_object_t *p_this )
p_sys
->
i_sample_rate
=
var_CreateGetInteger
(
p_demux
,
CFG_PREFIX
"samplerate"
);
p_sys
->
b_stereo
=
var_CreateGetBool
(
p_demux
,
CFG_PREFIX
"stereo"
);
p_sys
->
i_
pts
=
var_CreateGetInteger
(
p_demux
,
CFG_PREFIX
"caching"
);
p_sys
->
i_
cache
=
var_CreateGetInteger
(
p_demux
,
CFG_PREFIX
"caching"
);
p_sys
->
p_es
=
NULL
;
p_sys
->
p_block
=
NULL
;
p_sys
->
i_next_demux_date
=
-
1
;
...
...
@@ -237,7 +237,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
case
DEMUX_GET_PTS_DELAY
:
pi64
=
(
int64_t
*
)
va_arg
(
args
,
int64_t
*
);
*
pi64
=
(
int64_t
)
p_sys
->
i_
pts
*
1000
;
*
pi64
=
(
int64_t
)
p_sys
->
i_
cache
*
1000
;
return
VLC_SUCCESS
;
case
DEMUX_GET_TIME
:
...
...
modules/access/oss.c
View file @
a1bef303
...
...
@@ -118,7 +118,7 @@ struct demux_sys_t
int
i_fd
;
/* Audio */
int
i_
pts
;
int
i_
cache
;
unsigned
int
i_sample_rate
;
bool
b_stereo
;
size_t
i_max_frame_size
;
...
...
@@ -169,7 +169,7 @@ static int DemuxOpen( vlc_object_t *p_this )
p_sys
->
i_sample_rate
=
var_CreateGetInteger
(
p_demux
,
CFG_PREFIX
"samplerate"
);
p_sys
->
b_stereo
=
var_CreateGetBool
(
p_demux
,
CFG_PREFIX
"stereo"
);
p_sys
->
i_
pts
=
var_CreateGetInteger
(
p_demux
,
CFG_PREFIX
"caching"
);
p_sys
->
i_
cache
=
var_CreateGetInteger
(
p_demux
,
CFG_PREFIX
"caching"
);
p_sys
->
i_fd
=
-
1
;
p_sys
->
p_es
=
NULL
;
p_sys
->
p_block
=
NULL
;
...
...
@@ -225,7 +225,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
case
DEMUX_GET_PTS_DELAY
:
pi64
=
(
int64_t
*
)
va_arg
(
args
,
int64_t
*
);
*
pi64
=
(
int64_t
)
p_sys
->
i_
pts
*
1000
;
*
pi64
=
(
int64_t
)
p_sys
->
i_
cache
*
1000
;
return
VLC_SUCCESS
;
case
DEMUX_GET_TIME
:
...
...
modules/access/v4l2/v4l2.c
View file @
a1bef303
...
...
@@ -503,7 +503,7 @@ struct demux_sys_t
/* Video */
io_method
io
;
int
i_
pts
;
int
i_
cache
;
struct
v4l2_capability
dev_cap
;
...
...
@@ -624,7 +624,7 @@ static void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj )
p_sys
->
f_fps
=
var_CreateGetFloat
(
p_obj
,
"v4l2-fps"
);
p_sys
->
psz_requested_chroma
=
var_CreateGetString
(
p_obj
,
"v4l2-chroma"
);
p_sys
->
i_
pts
=
var_CreateGetInteger
(
p_obj
,
"v4l2-caching"
);
p_sys
->
i_
cache
=
var_CreateGetInteger
(
p_obj
,
"v4l2-caching"
);
p_sys
->
i_cur_tuner
=
var_CreateGetInteger
(
p_obj
,
"v4l2-tuner"
);
p_sys
->
i_frequency
=
var_CreateGetInteger
(
p_obj
,
"v4l2-tuner-frequency"
);
...
...
@@ -802,8 +802,8 @@ static void ParseMRL( demux_sys_t *p_sys, char *psz_path, vlc_object_t *p_obj )
#endif
else
if
(
!
strncmp
(
psz_parser
,
"caching="
,
strlen
(
"caching="
)
)
)
{
p_sys
->
i_
pts
=
strtol
(
psz_parser
+
strlen
(
"caching="
),
&
psz_parser
,
0
);
p_sys
->
i_
cache
=
strtol
(
psz_parser
+
strlen
(
"caching="
),
&
psz_parser
,
0
);
}
else
if
(
!
strncmp
(
psz_parser
,
"tuner="
,
strlen
(
"tuner="
)
)
)
{
...
...
@@ -1050,7 +1050,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
case
DEMUX_GET_PTS_DELAY
:
pi64
=
(
int64_t
*
)
va_arg
(
args
,
int64_t
*
);
*
pi64
=
(
int64_t
)
p_sys
->
i_
pts
*
1000
;
*
pi64
=
(
int64_t
)
p_sys
->
i_
cache
*
1000
;
return
VLC_SUCCESS
;
case
DEMUX_GET_TIME
:
...
...
@@ -1101,7 +1101,7 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
case
ACCESS_GET_PTS_DELAY
:
pi_64
=
(
int64_t
*
)
va_arg
(
args
,
int64_t
*
);
*
pi_64
=
(
int64_t
)
p_sys
->
i_
pts
*
1000
;
*
pi_64
=
(
int64_t
)
p_sys
->
i_
cache
*
1000
;
break
;
/* */
...
...
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