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
f9f9ff61
Commit
f9f9ff61
authored
May 02, 2014
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fdkaac: simplify profile selection
parent
f31841cd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
21 deletions
+8
-21
modules/codec/fdkaac.c
modules/codec/fdkaac.c
+8
-21
No files found.
modules/codec/fdkaac.c
View file @
f9f9ff61
...
@@ -187,14 +187,11 @@ static int OpenEncoder( vlc_object_t *p_this )
...
@@ -187,14 +187,11 @@ static int OpenEncoder( vlc_object_t *p_this )
encoder_sys_t
*
p_sys
;
encoder_sys_t
*
p_sys
;
CHANNEL_MODE
mode
;
CHANNEL_MODE
mode
;
AACENC_ERROR
erraac
;
AACENC_ERROR
erraac
;
bool
b_profile_selected
;
int
sce
;
int
sce
;
int
cpe
;
int
cpe
;
int
i_profile
;
int
i_bitrate
;
int
i_bitrate
;
p_enc
=
(
encoder_t
*
)
p_this
;
p_enc
=
(
encoder_t
*
)
p_this
;
b_profile_selected
=
false
;
sce
=
0
;
sce
=
0
;
cpe
=
0
;
cpe
=
0
;
...
@@ -205,21 +202,6 @@ static int OpenEncoder( vlc_object_t *p_this )
...
@@ -205,21 +202,6 @@ static int OpenEncoder( vlc_object_t *p_this )
{
{
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
else
if
(
p_enc
->
fmt_out
.
i_codec
==
VLC_FOURCC
(
'l'
,
'a'
,
'a'
,
'c'
)
)
{
b_profile_selected
=
true
;
i_profile
=
PROFILE_AAC_LC
;
}
else
if
(
p_enc
->
fmt_out
.
i_codec
==
VLC_FOURCC
(
'h'
,
'a'
,
'a'
,
'c'
)
)
{
b_profile_selected
=
true
;
i_profile
=
PROFILE_AAC_HE
;
}
else
if
(
p_enc
->
fmt_out
.
i_codec
==
VLC_FOURCC
(
's'
,
'a'
,
'a'
,
'c'
)
)
{
b_profile_selected
=
true
;
i_profile
=
PROFILE_AAC_HE_v2
;
}
uint16_t
channel_config
;
uint16_t
channel_config
;
switch
(
p_enc
->
fmt_in
.
audio
.
i_channels
)
{
switch
(
p_enc
->
fmt_in
.
audio
.
i_channels
)
{
...
@@ -258,10 +240,15 @@ static int OpenEncoder( vlc_object_t *p_this )
...
@@ -258,10 +240,15 @@ static int OpenEncoder( vlc_object_t *p_this )
config_ChainParse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
config_ChainParse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
if
(
b_profile_selected
==
false
)
if
(
p_enc
->
fmt_out
.
i_codec
==
VLC_FOURCC
(
'l'
,
'a'
,
'a'
,
'c'
)
)
p_sys
->
i_aot
=
var_InheritInteger
(
p_enc
,
ENC_CFG_PREFIX
"profile"
);
p_sys
->
i_aot
=
PROFILE_AAC_LC
;
else
if
(
p_enc
->
fmt_out
.
i_codec
==
VLC_FOURCC
(
'h'
,
'a'
,
'a'
,
'c'
)
)
p_sys
->
i_aot
=
PROFILE_AAC_HE
;
else
if
(
p_enc
->
fmt_out
.
i_codec
==
VLC_FOURCC
(
's'
,
'a'
,
'a'
,
'c'
)
)
p_sys
->
i_aot
=
PROFILE_AAC_HE_v2
;
else
else
p_sys
->
i_aot
=
i_profile
;
p_sys
->
i_aot
=
var_InheritInteger
(
p_enc
,
ENC_CFG_PREFIX
"profile"
);
p_sys
->
b_eld_sbr
=
var_InheritBool
(
p_enc
,
ENC_CFG_PREFIX
"sbr"
);
p_sys
->
b_eld_sbr
=
var_InheritBool
(
p_enc
,
ENC_CFG_PREFIX
"sbr"
);
p_sys
->
i_vbr
=
var_InheritInteger
(
p_enc
,
ENC_CFG_PREFIX
"vbr"
);
p_sys
->
i_vbr
=
var_InheritInteger
(
p_enc
,
ENC_CFG_PREFIX
"vbr"
);
p_sys
->
b_afterburner
=
var_InheritBool
(
p_enc
,
ENC_CFG_PREFIX
"afterburner"
);
p_sys
->
b_afterburner
=
var_InheritBool
(
p_enc
,
ENC_CFG_PREFIX
"afterburner"
);
...
...
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