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
72db6a4f
Commit
72db6a4f
authored
Oct 21, 2022
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/ac3dec: split off code discarding garbage at the beginning of a packet
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
31162eb9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
13 deletions
+23
-13
ac3_parser.c
libavcodec/ac3_parser.c
+19
-0
ac3_parser_internal.h
libavcodec/ac3_parser_internal.h
+2
-0
ac3dec.c
libavcodec/ac3dec.c
+2
-13
No files found.
libavcodec/ac3_parser.c
View file @
72db6a4f
...
...
@@ -53,6 +53,25 @@ static const uint8_t center_levels[4] = { 4, 5, 6, 5 };
*/
static
const
uint8_t
surround_levels
[
4
]
=
{
4
,
6
,
7
,
6
};
int
ff_ac3_find_syncword
(
const
uint8_t
*
buf
,
int
buf_size
)
{
int
i
;
for
(
i
=
1
;
i
<
buf_size
;
i
+=
2
)
{
if
(
buf
[
i
]
==
0x77
||
buf
[
i
]
==
0x0B
)
{
if
((
buf
[
i
]
^
buf
[
i
-
1
])
==
(
0x77
^
0x0B
))
{
i
--
;
break
;
}
else
if
((
buf
[
i
]
^
buf
[
i
+
1
])
==
(
0x77
^
0x0B
))
{
break
;
}
}
}
if
(
i
>=
buf_size
)
return
AVERROR_INVALIDDATA
;
return
i
;
}
int
ff_ac3_parse_header
(
GetBitContext
*
gbc
,
AC3HeaderInfo
*
hdr
)
{
...
...
libavcodec/ac3_parser_internal.h
View file @
72db6a4f
...
...
@@ -79,4 +79,6 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr);
int
avpriv_ac3_parse_header
(
AC3HeaderInfo
**
hdr
,
const
uint8_t
*
buf
,
size_t
size
);
int
ff_ac3_find_syncword
(
const
uint8_t
*
buf
,
int
buf_size
);
#endif
/* AVCODEC_AC3_PARSER_INTERNAL_H */
libavcodec/ac3dec.c
View file @
72db6a4f
...
...
@@ -1508,19 +1508,8 @@ static int ac3_decode_frame(AVCodecContext *avctx, AVFrame *frame,
s
->
superframe_size
=
0
;
buf_size
=
full_buf_size
;
for
(
i
=
1
;
i
<
buf_size
;
i
+=
2
)
{
if
(
buf
[
i
]
==
0x77
||
buf
[
i
]
==
0x0B
)
{
if
((
buf
[
i
]
^
buf
[
i
-
1
])
==
(
0x77
^
0x0B
))
{
i
--
;
break
;
}
else
if
((
buf
[
i
]
^
buf
[
i
+
1
])
==
(
0x77
^
0x0B
))
{
break
;
}
}
}
if
(
i
>=
buf_size
)
return
AVERROR_INVALIDDATA
;
if
(
i
>
10
)
i
=
ff_ac3_find_syncword
(
buf
,
buf_size
);
if
(
i
<
0
||
i
>
10
)
return
i
;
buf
+=
i
;
buf_size
-=
i
;
...
...
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