Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
1f604f96
Commit
1f604f96
authored
Jan 17, 2014
by
Tim Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ac3: set default matrix encoding modes in parse_frame_header.
Deduplicates some code.
parent
8b2e5e42
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
9 deletions
+2
-9
ac3dec.c
libavcodec/ac3dec.c
+2
-4
eac3dec.c
libavcodec/eac3dec.c
+0
-5
No files found.
libavcodec/ac3dec.c
View file @
1f604f96
...
...
@@ -227,10 +227,6 @@ static int ac3_parse_header(AC3DecodeContext *s)
skip_bits
(
gbc
,
2
);
//skip copyright bit and original bitstream bit
/* default dolby matrix encoding modes */
s
->
dolby_surround_ex_mode
=
AC3_DSUREXMOD_NOTINDICATED
;
s
->
dolby_headphone_mode
=
AC3_DHEADPHONMOD_NOTINDICATED
;
/* skip the timecodes or parse the Alternate Bit Stream Syntax
TODO: read & use the xbsi1 downmix levels */
if
(
s
->
bitstream_id
!=
6
)
{
...
...
@@ -290,6 +286,8 @@ static int parse_frame_header(AC3DecodeContext *s)
s
->
frame_type
=
hdr
.
frame_type
;
s
->
substreamid
=
hdr
.
substreamid
;
s
->
dolby_surround_mode
=
hdr
.
dolby_surround_mode
;
s
->
dolby_surround_ex_mode
=
AC3_DSUREXMOD_NOTINDICATED
;
s
->
dolby_headphone_mode
=
AC3_DHEADPHONMOD_NOTINDICATED
;
if
(
s
->
lfe_on
)
{
s
->
start_freq
[
s
->
lfe_ch
]
=
0
;
...
...
libavcodec/eac3dec.c
View file @
1f604f96
...
...
@@ -341,11 +341,6 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
}
}
/* default dolby matrix encoding modes */
s
->
dolby_surround_mode
=
AC3_DSURMOD_NOTINDICATED
;
s
->
dolby_surround_ex_mode
=
AC3_DSUREXMOD_NOTINDICATED
;
s
->
dolby_headphone_mode
=
AC3_DHEADPHONMOD_NOTINDICATED
;
/* mixing metadata */
if
(
get_bits1
(
gbc
))
{
/* center and surround mix levels */
...
...
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