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
95ee0fba
Commit
95ee0fba
authored
Jun 12, 2015
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support demuxing 4gv codec stored in qcp files
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
54649cbd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
avcodec.h
libavcodec/avcodec.h
+1
-0
codec_desc.c
libavcodec/codec_desc.c
+7
-0
qcp.c
libavformat/qcp.c
+7
-0
No files found.
libavcodec/avcodec.h
View file @
95ee0fba
...
...
@@ -500,6 +500,7 @@ enum AVCodecID {
AV_CODEC_ID_DSD_MSBF
=
MKBETAG
(
'D'
,
'S'
,
'D'
,
'M'
),
AV_CODEC_ID_DSD_LSBF_PLANAR
=
MKBETAG
(
'D'
,
'S'
,
'D'
,
'1'
),
AV_CODEC_ID_DSD_MSBF_PLANAR
=
MKBETAG
(
'D'
,
'S'
,
'D'
,
'8'
),
AV_CODEC_ID_4GV
=
MKBETAG
(
's'
,
'4'
,
'g'
,
'v'
),
/* subtitle codecs */
AV_CODEC_ID_FIRST_SUBTITLE
=
0x17000
,
///< A dummy ID pointing at the start of subtitle codecs.
...
...
libavcodec/codec_desc.c
View file @
95ee0fba
...
...
@@ -2523,6 +2523,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"SMV (Selectable Mode Vocoder)"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
{
.
id
=
AV_CODEC_ID_4GV
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
name
=
"4gv"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"4GV (Fourth Generation Vocoder)"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
{
.
id
=
AV_CODEC_ID_DSD_LSBF
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
...
...
libavformat/qcp.c
View file @
95ee0fba
...
...
@@ -57,6 +57,11 @@ static const uint8_t guid_evrc[16] = {
0x91
,
0xef
,
0x73
,
0x6a
,
0x51
,
0x00
,
0xce
,
0xb4
};
static
const
uint8_t
guid_4gv
[
16
]
=
{
0xca
,
0x29
,
0xfd
,
0x3c
,
0x53
,
0xf6
,
0xf5
,
0x4e
,
0x90
,
0xe9
,
0xf4
,
0x23
,
0x6d
,
0x59
,
0x9b
,
0x61
};
/**
* SMV GUID as stored in the file
*/
...
...
@@ -106,6 +111,8 @@ static int qcp_read_header(AVFormatContext *s)
st
->
codec
->
codec_id
=
AV_CODEC_ID_EVRC
;
}
else
if
(
!
memcmp
(
buf
,
guid_smv
,
16
))
{
st
->
codec
->
codec_id
=
AV_CODEC_ID_SMV
;
}
else
if
(
!
memcmp
(
buf
,
guid_4gv
,
16
))
{
st
->
codec
->
codec_id
=
AV_CODEC_ID_4GV
;
}
else
{
av_log
(
s
,
AV_LOG_ERROR
,
"Unknown codec GUID "
FF_PRI_GUID
".
\n
"
,
FF_ARG_GUID
(
buf
));
...
...
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