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
23e8e0cd
Commit
23e8e0cd
authored
Dec 20, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vorbis: fix cast warnings
parent
51087cc2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
10 deletions
+9
-10
modules/codec/vorbis.c
modules/codec/vorbis.c
+9
-10
No files found.
modules/codec/vorbis.c
View file @
23e8e0cd
...
...
@@ -156,7 +156,7 @@ static block_t *SendPacket( decoder_t *, ogg_packet *, block_t * );
static
void
ParseVorbisComments
(
decoder_t
*
);
static
void
ConfigureChannelOrder
(
in
t
*
,
int
,
uint32_t
,
bool
);
static
void
ConfigureChannelOrder
(
uint8_
t
*
,
int
,
uint32_t
,
bool
);
#ifdef HAVE_VORBIS_ENCODER
static
int
OpenEncoder
(
vlc_object_t
*
);
...
...
@@ -471,7 +471,7 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
* Interleave: helper function to interleave channels
*****************************************************************************/
static
void
Interleave
(
INTERLEAVE_TYPE
*
p_out
,
const
INTERLEAVE_TYPE
**
pp_in
,
int
i_nb_channels
,
int
i_samples
,
in
t
*
pi_chan_table
)
int
i_nb_channels
,
int
i_samples
,
uint8_
t
*
pi_chan_table
)
{
for
(
int
j
=
0
;
j
<
i_samples
;
j
++
)
for
(
int
i
=
0
;
i
<
i_nb_channels
;
i
++
)
...
...
@@ -513,7 +513,8 @@ static block_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
/* Interleave the samples */
Interleave
(
(
INTERLEAVE_TYPE
*
)
p_aout_buffer
->
p_buffer
,
(
const
INTERLEAVE_TYPE
**
)
pp_pcm
,
p_sys
->
vi
.
channels
,
i_samples
,
p_sys
->
pi_chan_table
);
(
const
INTERLEAVE_TYPE
**
)
pp_pcm
,
p_sys
->
vi
.
channels
,
i_samples
,
p_sys
->
pi_chan_table
);
/* Tell libvorbis how many samples we actually consumed */
vorbis_synthesis_read
(
&
p_sys
->
vd
,
i_samples
);
...
...
@@ -626,7 +627,8 @@ static void ParseVorbisComments( decoder_t *p_dec )
/*****************************************************************************
*
*****************************************************************************/
static
void
ConfigureChannelOrder
(
int
*
pi_chan_table
,
int
i_channels
,
uint32_t
i_channel_mask
,
bool
b_decode
)
static
void
ConfigureChannelOrder
(
uint8_t
*
pi_chan_table
,
int
i_channels
,
uint32_t
i_channel_mask
,
bool
b_decode
)
{
const
uint32_t
*
pi_channels_in
;
switch
(
i_channels
)
...
...
@@ -658,15 +660,12 @@ static void ConfigureChannelOrder(int *pi_chan_table, int i_channels, uint32_t i
}
}
uint8_t
tab
[
AOUT_CHAN_MAX
];
if
(
b_decode
)
aout_CheckChannelReorder
(
pi_channels_in
,
NULL
,
i_channel_mask
,
tab
);
i_channel_mask
,
pi_chan_table
);
else
aout_CheckChannelReorder
(
NULL
,
pi_channels_in
,
i_channel_mask
,
tab
);
for
(
int
i
=
0
;
i
<
i_channels
;
i
++
)
pi_chan_table
[
i
]
=
tab
[
i
];
i_channel_mask
,
pi_chan_table
);
}
/*****************************************************************************
...
...
@@ -713,7 +712,7 @@ struct encoder_sys_t
/*
** Channel reordering
*/
in
t
pi_chan_table
[
AOUT_CHAN_MAX
];
uint8_
t
pi_chan_table
[
AOUT_CHAN_MAX
];
};
...
...
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