Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
0eb5239c
Commit
0eb5239c
authored
Jan 29, 2014
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
smem: Use size_t for buffer sizes
parent
9f4a5e4d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
10 deletions
+11
-10
modules/stream_out/smem.c
modules/stream_out/smem.c
+11
-10
No files found.
modules/stream_out/smem.c
View file @
0eb5239c
...
...
@@ -146,10 +146,10 @@ struct sout_stream_id_t
struct
sout_stream_sys_t
{
vlc_mutex_t
*
p_lock
;
void
(
*
pf_video_prerender_callback
)
(
void
*
p_video_data
,
uint8_t
**
pp_pixel_buffer
,
in
t
size
);
void
(
*
pf_audio_prerender_callback
)
(
void
*
p_audio_data
,
uint8_t
**
pp_pcm_buffer
,
unsigned
in
t
size
);
void
(
*
pf_video_postrender_callback
)
(
void
*
p_video_data
,
uint8_t
*
p_pixel_buffer
,
int
width
,
int
height
,
int
pixel_pitch
,
in
t
size
,
mtime_t
pts
);
void
(
*
pf_audio_postrender_callback
)
(
void
*
p_audio_data
,
uint8_t
*
p_pcm_buffer
,
unsigned
int
channels
,
unsigned
int
rate
,
unsigned
int
nb_samples
,
unsigned
int
bits_per_sample
,
unsigned
in
t
size
,
mtime_t
pts
);
void
(
*
pf_video_prerender_callback
)
(
void
*
p_video_data
,
uint8_t
**
pp_pixel_buffer
,
size_
t
size
);
void
(
*
pf_audio_prerender_callback
)
(
void
*
p_audio_data
,
uint8_t
**
pp_pcm_buffer
,
size_
t
size
);
void
(
*
pf_video_postrender_callback
)
(
void
*
p_video_data
,
uint8_t
*
p_pixel_buffer
,
int
width
,
int
height
,
int
pixel_pitch
,
size_
t
size
,
mtime_t
pts
);
void
(
*
pf_audio_postrender_callback
)
(
void
*
p_audio_data
,
uint8_t
*
p_pcm_buffer
,
unsigned
int
channels
,
unsigned
int
rate
,
unsigned
int
nb_samples
,
unsigned
int
bits_per_sample
,
size_
t
size
,
mtime_t
pts
);
bool
time_sync
;
};
...
...
@@ -173,19 +173,19 @@ static int Open( vlc_object_t *p_this )
p_sys
->
time_sync
=
var_GetBool
(
p_stream
,
SOUT_CFG_PREFIX
"time-sync"
);
psz_tmp
=
var_GetString
(
p_stream
,
SOUT_PREFIX_VIDEO
"prerender-callback"
);
p_sys
->
pf_video_prerender_callback
=
(
void
(
*
)
(
void
*
,
uint8_t
**
,
in
t
))(
intptr_t
)
atoll
(
psz_tmp
);
p_sys
->
pf_video_prerender_callback
=
(
void
(
*
)
(
void
*
,
uint8_t
**
,
size_
t
))(
intptr_t
)
atoll
(
psz_tmp
);
free
(
psz_tmp
);
psz_tmp
=
var_GetString
(
p_stream
,
SOUT_PREFIX_AUDIO
"prerender-callback"
);
p_sys
->
pf_audio_prerender_callback
=
(
void
(
*
)
(
void
*
,
uint8_t
**
,
unsigned
in
t
))(
intptr_t
)
atoll
(
psz_tmp
);
p_sys
->
pf_audio_prerender_callback
=
(
void
(
*
)
(
void
*
,
uint8_t
**
,
size_
t
))(
intptr_t
)
atoll
(
psz_tmp
);
free
(
psz_tmp
);
psz_tmp
=
var_GetString
(
p_stream
,
SOUT_PREFIX_VIDEO
"postrender-callback"
);
p_sys
->
pf_video_postrender_callback
=
(
void
(
*
)
(
void
*
,
uint8_t
*
,
int
,
int
,
int
,
in
t
,
mtime_t
))(
intptr_t
)
atoll
(
psz_tmp
);
p_sys
->
pf_video_postrender_callback
=
(
void
(
*
)
(
void
*
,
uint8_t
*
,
int
,
int
,
int
,
size_
t
,
mtime_t
))(
intptr_t
)
atoll
(
psz_tmp
);
free
(
psz_tmp
);
psz_tmp
=
var_GetString
(
p_stream
,
SOUT_PREFIX_AUDIO
"postrender-callback"
);
p_sys
->
pf_audio_postrender_callback
=
(
void
(
*
)
(
void
*
,
uint8_t
*
,
unsigned
int
,
unsigned
int
,
unsigned
int
,
unsigned
int
,
unsigned
in
t
,
mtime_t
))(
intptr_t
)
atoll
(
psz_tmp
);
p_sys
->
pf_audio_postrender_callback
=
(
void
(
*
)
(
void
*
,
uint8_t
*
,
unsigned
int
,
unsigned
int
,
unsigned
int
,
unsigned
int
,
size_
t
,
mtime_t
))(
intptr_t
)
atoll
(
psz_tmp
);
free
(
psz_tmp
);
/* Setting stream out module callbacks */
...
...
@@ -312,7 +312,8 @@ static int SendVideo( sout_stream_t *p_stream, sout_stream_id_t *id,
block_t
*
p_buffer
)
{
sout_stream_sys_t
*
p_sys
=
p_stream
->
p_sys
;
int
i_line
,
i_line_size
,
i_size
,
i_pixel_pitch
;
int
i_line
,
i_line_size
,
i_pixel_pitch
;
size_t
i_size
;
uint8_t
*
p_pixels
=
NULL
;
if
(
id
->
format
->
video
.
i_bits_per_pixel
>
0
)
...
...
@@ -327,7 +328,7 @@ static int SendVideo( sout_stream_t *p_stream, sout_stream_id_t *id,
i_size
=
p_buffer
->
i_buffer
;
}
/* Calling the prerender callback to get user buffer */
p_sys
->
pf_video_prerender_callback
(
id
->
p_data
,
&
p_pixels
,
i_size
);
p_sys
->
pf_video_prerender_callback
(
id
->
p_data
,
&
p_pixels
,
i_size
);
if
(
!
p_pixels
)
{
...
...
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