Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
1c066867
Unverified
Commit
1c066867
authored
Jun 05, 2024
by
Lynne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aac: define a new profile for USAC
This allows users to determine whether a stream is USAC or not.
parent
ee419804
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
0 deletions
+7
-0
aacdec_usac.c
libavcodec/aac/aacdec_usac.c
+4
-0
defs.h
libavcodec/defs.h
+1
-0
profiles.c
libavcodec/profiles.c
+1
-0
profiles.h
libavcodec/profiles.h
+1
-0
No files found.
libavcodec/aac/aacdec_usac.c
View file @
1c066867
...
...
@@ -494,6 +494,8 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx,
}
}
ac
->
avctx
->
profile
=
AV_PROFILE_AAC_USAC
;
ret
=
ff_aac_usac_reset_state
(
ac
,
oc
);
if
(
ret
<
0
)
return
ret
;
...
...
@@ -1533,6 +1535,8 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac,
ff_aac_output_configure
(
ac
,
ac
->
oc
[
1
].
layout_map
,
ac
->
oc
[
1
].
layout_map_tags
,
ac
->
oc
[
1
].
status
,
0
);
ac
->
avctx
->
profile
=
AV_PROFILE_AAC_USAC
;
indep_flag
=
get_bits1
(
gb
);
nb_ch_el
=
0
;
...
...
libavcodec/defs.h
View file @
1c066867
...
...
@@ -73,6 +73,7 @@
#define AV_PROFILE_AAC_HE_V2 28
#define AV_PROFILE_AAC_LD 22
#define AV_PROFILE_AAC_ELD 38
#define AV_PROFILE_AAC_USAC 41
#define AV_PROFILE_MPEG2_AAC_LOW 128
#define AV_PROFILE_MPEG2_AAC_HE 131
...
...
libavcodec/profiles.c
View file @
1c066867
...
...
@@ -33,6 +33,7 @@ const AVProfile ff_aac_profiles[] = {
{
AV_PROFILE_AAC_MAIN
,
"Main"
},
{
AV_PROFILE_AAC_SSR
,
"SSR"
},
{
AV_PROFILE_AAC_LTP
,
"LTP"
},
{
AV_PROFILE_AAC_USAC
,
"xHE-AAC"
},
{
AV_PROFILE_UNKNOWN
},
};
...
...
libavcodec/profiles.h
View file @
1c066867
...
...
@@ -35,6 +35,7 @@
FF_AVCTX_PROFILE_OPTION("aac_he_v2", NULL, AUDIO, AV_PROFILE_AAC_HE_V2)\
FF_AVCTX_PROFILE_OPTION("aac_ld", NULL, AUDIO, AV_PROFILE_AAC_LD)\
FF_AVCTX_PROFILE_OPTION("aac_eld", NULL, AUDIO, AV_PROFILE_AAC_ELD)\
FF_AVCTX_PROFILE_OPTION("aac_xhe", NULL, AUDIO, AV_PROFILE_AAC_USAC)\
FF_AVCTX_PROFILE_OPTION("mpeg2_aac_low", NULL, AUDIO, AV_PROFILE_MPEG2_AAC_LOW)\
FF_AVCTX_PROFILE_OPTION("mpeg2_aac_he", NULL, AUDIO, AV_PROFILE_MPEG2_AAC_HE)\
...
...
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