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
48a5c353
Commit
48a5c353
authored
Jul 01, 2017
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caf: add an Opus tag
CC: libav-stable@libav.org
parent
ce1a99d8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
caf.c
libavformat/caf.c
+1
-0
cafdec.c
libavformat/cafdec.c
+8
-0
No files found.
libavformat/caf.c
View file @
48a5c353
...
...
@@ -49,6 +49,7 @@ const AVCodecTag ff_codec_caf_tags[] = {
{
AV_CODEC_ID_QCELP
,
MKBETAG
(
'Q'
,
'c'
,
'l'
,
'p'
)
},
{
AV_CODEC_ID_QDM2
,
MKBETAG
(
'Q'
,
'D'
,
'M'
,
'2'
)
},
{
AV_CODEC_ID_QDM2
,
MKBETAG
(
'Q'
,
'D'
,
'M'
,
'C'
)
},
{
AV_CODEC_ID_OPUS
,
MKBETAG
(
'o'
,
'p'
,
'u'
,
's'
)
},
/* currently unsupported codecs */
/*{ AC-3 over S/PDIF MKBETAG('c','a','c','3') },*/
/*{ MPEG4CELP MKBETAG('c','e','l','p') },*/
...
...
libavformat/cafdec.c
View file @
48a5c353
...
...
@@ -156,6 +156,14 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size)
avio_skip
(
pb
,
size
-
ALAC_NEW_KUKI
);
}
st
->
codecpar
->
extradata_size
=
ALAC_HEADER
;
}
else
if
(
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_OPUS
)
{
// The data layout for Opus is currently unknown, so we do not export
// extradata at all. Multichannel streams are not supported.
if
(
st
->
codecpar
->
channels
>
2
)
{
avpriv_request_sample
(
s
,
"multichannel Opus in CAF"
);
return
AVERROR_PATCHWELCOME
;
}
avio_skip
(
pb
,
size
);
}
else
{
st
->
codecpar
->
extradata
=
av_mallocz
(
size
+
AV_INPUT_BUFFER_PADDING_SIZE
);
if
(
!
st
->
codecpar
->
extradata
)
...
...
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