Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
819d135d
Commit
819d135d
authored
Aug 03, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dca: pass audio sample formats by pointer rather than value
parent
5d9de36f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
modules/audio_filter/converter/dtstofloat32.c
modules/audio_filter/converter/dtstofloat32.c
+12
-11
No files found.
modules/audio_filter/converter/dtstofloat32.c
View file @
819d135d
...
...
@@ -94,19 +94,20 @@ vlc_module_end ()
* Open:
*****************************************************************************/
static
int
Open
(
vlc_object_t
*
p_this
,
filter_sys_t
*
p_sys
,
audio_format_t
input
,
audio_format_t
output
)
const
audio_format_t
*
restrict
input
,
const
audio_format_t
*
restrict
output
)
{
p_sys
->
b_dynrng
=
var_InheritBool
(
p_this
,
"dts-dynrng"
);
p_sys
->
b_dontwarn
=
0
;
/* We'll do our own downmixing, thanks. */
p_sys
->
i_nb_channels
=
aout_FormatNbChannels
(
&
output
);
switch
(
(
output
.
i_physical_channels
&
AOUT_CHAN_PHYSMASK
)
p_sys
->
i_nb_channels
=
aout_FormatNbChannels
(
output
);
switch
(
(
output
->
i_physical_channels
&
AOUT_CHAN_PHYSMASK
)
&
~
AOUT_CHAN_LFE
)
{
case
AOUT_CHAN_CENTER
:
if
(
(
output
.
i_original_channels
&
AOUT_CHAN_CENTER
)
||
(
output
.
i_original_channels
if
(
(
output
->
i_original_channels
&
AOUT_CHAN_CENTER
)
||
(
output
->
i_original_channels
&
(
AOUT_CHAN_LEFT
|
AOUT_CHAN_RIGHT
))
)
{
p_sys
->
i_flags
=
DCA_MONO
;
...
...
@@ -114,15 +115,15 @@ static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
break
;
case
AOUT_CHAN_LEFT
|
AOUT_CHAN_RIGHT
:
if
(
output
.
i_original_channels
&
AOUT_CHAN_DOLBYSTEREO
)
if
(
output
->
i_original_channels
&
AOUT_CHAN_DOLBYSTEREO
)
{
p_sys
->
i_flags
=
DCA_DOLBY
;
}
else
if
(
input
.
i_original_channels
==
AOUT_CHAN_CENTER
)
else
if
(
input
->
i_original_channels
==
AOUT_CHAN_CENTER
)
{
p_sys
->
i_flags
=
DCA_MONO
;
}
else
if
(
input
.
i_original_channels
&
AOUT_CHAN_DUALMONO
)
else
if
(
input
->
i_original_channels
&
AOUT_CHAN_DUALMONO
)
{
p_sys
->
i_flags
=
DCA_CHANNEL
;
}
...
...
@@ -160,7 +161,7 @@ static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
free
(
p_sys
);
return
-
1
;
}
if
(
output
.
i_physical_channels
&
AOUT_CHAN_LFE
)
if
(
output
->
i_physical_channels
&
AOUT_CHAN_LFE
)
{
p_sys
->
i_flags
|=
DCA_LFE
;
}
...
...
@@ -175,7 +176,7 @@ static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
}
aout_CheckChannelReorder
(
pi_channels_in
,
NULL
,
output
.
i_physical_channels
&
AOUT_CHAN_PHYSMASK
,
output
->
i_physical_channels
&
AOUT_CHAN_PHYSMASK
,
p_sys
->
i_nb_channels
,
p_sys
->
pi_chan_table
);
...
...
@@ -343,7 +344,7 @@ static int OpenFilter( vlc_object_t *p_this )
return
VLC_ENOMEM
;
i_ret
=
Open
(
VLC_OBJECT
(
p_filter
),
p_sys
,
p_filter
->
fmt_in
.
audio
,
p_filter
->
fmt_out
.
audio
);
&
p_filter
->
fmt_in
.
audio
,
&
p_filter
->
fmt_out
.
audio
);
p_filter
->
pf_audio_filter
=
Convert
;
p_filter
->
fmt_out
.
audio
.
i_rate
=
p_filter
->
fmt_in
.
audio
.
i_rate
;
...
...
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