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
12bd8532
Commit
12bd8532
authored
Sep 30, 2011
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Synchronize various 4CCs and codec tags from FFmpeg.
parent
7d49f79f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
1 deletion
+17
-1
avcodec.h
libavcodec/avcodec.h
+2
-0
raw.c
libavcodec/raw.c
+3
-1
isom.c
libavformat/isom.c
+5
-0
riff.c
libavformat/riff.c
+7
-0
No files found.
libavcodec/avcodec.h
View file @
12bd8532
...
...
@@ -210,6 +210,8 @@ enum CodecID {
CODEC_ID_DFA
,
CODEC_ID_WMV3IMAGE
,
CODEC_ID_VC1IMAGE
,
CODEC_ID_G723_1
,
CODEC_ID_G729
,
/* various PCM "codecs" */
CODEC_ID_FIRST_AUDIO
=
0x10000
,
///< A dummy id pointing at the start of audio codecs
...
...
libavcodec/raw.c
View file @
12bd8532
...
...
@@ -36,6 +36,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{
PIX_FMT_YUV411P
,
MKTAG
(
'Y'
,
'4'
,
'1'
,
'B'
)
},
{
PIX_FMT_YUV422P
,
MKTAG
(
'Y'
,
'4'
,
'2'
,
'B'
)
},
{
PIX_FMT_YUV422P
,
MKTAG
(
'P'
,
'4'
,
'2'
,
'2'
)
},
{
PIX_FMT_YUV422P
,
MKTAG
(
'Y'
,
'V'
,
'1'
,
'6'
)
},
/* yuvjXXX formats are deprecated hacks specific to libav*,
they are identical to yuvXXX */
{
PIX_FMT_YUVJ420P
,
MKTAG
(
'I'
,
'4'
,
'2'
,
'0'
)
},
/* Planar formats */
...
...
@@ -44,7 +45,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{
PIX_FMT_YUVJ422P
,
MKTAG
(
'Y'
,
'4'
,
'2'
,
'B'
)
},
{
PIX_FMT_YUVJ422P
,
MKTAG
(
'P'
,
'4'
,
'2'
,
'2'
)
},
{
PIX_FMT_GRAY8
,
MKTAG
(
'Y'
,
'8'
,
'0'
,
'0'
)
},
{
PIX_FMT_GRAY8
,
MKTAG
(
'
'
,
' '
,
'Y'
,
'8
'
)
},
{
PIX_FMT_GRAY8
,
MKTAG
(
'
Y'
,
'8'
,
' '
,
'
'
)
},
{
PIX_FMT_YUYV422
,
MKTAG
(
'Y'
,
'U'
,
'Y'
,
'2'
)
},
/* Packed formats */
{
PIX_FMT_YUYV422
,
MKTAG
(
'Y'
,
'4'
,
'2'
,
'2'
)
},
...
...
@@ -135,6 +136,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
/* special */
{
PIX_FMT_RGB565LE
,
MKTAG
(
3
,
0
,
0
,
0
)
},
/* flipped RGB565LE */
{
PIX_FMT_YUV444P
,
MKTAG
(
'Y'
,
'V'
,
'2'
,
'4'
)
},
/* YUV444P, swapped UV */
{
PIX_FMT_NONE
,
0
},
};
...
...
libavformat/isom.c
View file @
12bd8532
...
...
@@ -204,6 +204,8 @@ const AVCodecTag codec_movvideo_tags[] = {
{
CODEC_ID_DIRAC
,
MKTAG
(
'd'
,
'r'
,
'a'
,
'c'
)
},
{
CODEC_ID_DNXHD
,
MKTAG
(
'A'
,
'V'
,
'd'
,
'n'
)
},
/* AVID DNxHD */
{
CODEC_ID_FLV1
,
MKTAG
(
'H'
,
'2'
,
'6'
,
'3'
)
},
/* Flash Media Server */
{
CODEC_ID_MSMPEG4V3
,
MKTAG
(
'3'
,
'I'
,
'V'
,
'D'
)
},
/* 3ivx DivX Doctor */
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'A'
,
'V'
,
'1'
,
'x'
)
},
/* AVID 1:1x */
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'A'
,
'V'
,
'u'
,
'p'
)
},
{
CODEC_ID_SGI
,
MKTAG
(
's'
,
'g'
,
'i'
,
' '
)
},
/* SGI */
...
...
@@ -259,6 +261,7 @@ const AVCodecTag codec_movaudio_tags[] = {
{
CODEC_ID_AMR_WB
,
MKTAG
(
's'
,
'a'
,
'w'
,
'b'
)
},
/* AMR-WB 3gp */
{
CODEC_ID_GSM
,
MKTAG
(
'a'
,
'g'
,
's'
,
'm'
)
},
{
CODEC_ID_NELLYMOSER
,
MKTAG
(
'n'
,
'm'
,
'o'
,
's'
)
},
/* Flash Media Server */
{
CODEC_ID_ALAC
,
MKTAG
(
'a'
,
'l'
,
'a'
,
'c'
)
},
/* Apple Lossless */
{
CODEC_ID_QCELP
,
MKTAG
(
'Q'
,
'c'
,
'l'
,
'p'
)
},
...
...
@@ -271,6 +274,8 @@ const AVCodecTag codec_movaudio_tags[] = {
{
CODEC_ID_DVAUDIO
,
MKTAG
(
'v'
,
'd'
,
'v'
,
'a'
)
},
{
CODEC_ID_DVAUDIO
,
MKTAG
(
'd'
,
'v'
,
'c'
,
'a'
)
},
{
CODEC_ID_SPEEX
,
MKTAG
(
's'
,
'p'
,
'e'
,
'x'
)
},
/* Flash Media Server */
{
CODEC_ID_WMAV2
,
MKTAG
(
'W'
,
'M'
,
'A'
,
'2'
)
},
{
CODEC_ID_NONE
,
0
},
...
...
libavformat/riff.c
View file @
12bd8532
...
...
@@ -87,6 +87,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{
CODEC_ID_MPEG4
,
MKTAG
(
'G'
,
'E'
,
'O'
,
'V'
)
},
{
CODEC_ID_MPEG4
,
MKTAG
(
'S'
,
'I'
,
'P'
,
'P'
)
},
/* Samsung SHR-6040 */
{
CODEC_ID_MPEG4
,
MKTAG
(
'X'
,
'V'
,
'I'
,
'X'
)
},
{
CODEC_ID_MPEG4
,
MKTAG
(
'D'
,
'r'
,
'e'
,
'X'
)
},
{
CODEC_ID_MSMPEG4V3
,
MKTAG
(
'M'
,
'P'
,
'4'
,
'3'
)
},
{
CODEC_ID_MSMPEG4V3
,
MKTAG
(
'D'
,
'I'
,
'V'
,
'3'
)
},
{
CODEC_ID_MSMPEG4V3
,
MKTAG
(
'M'
,
'P'
,
'G'
,
'3'
)
},
...
...
@@ -173,10 +174,13 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'y'
,
'u'
,
'v'
,
's'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'P'
,
'4'
,
'2'
,
'2'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'Y'
,
'V'
,
'1'
,
'2'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'Y'
,
'V'
,
'1'
,
'6'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'Y'
,
'V'
,
'2'
,
'4'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'U'
,
'Y'
,
'V'
,
'Y'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'V'
,
'Y'
,
'U'
,
'Y'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'I'
,
'Y'
,
'U'
,
'V'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'Y'
,
'8'
,
'0'
,
'0'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'Y'
,
'8'
,
' '
,
' '
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'H'
,
'D'
,
'Y'
,
'C'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'Y'
,
'V'
,
'U'
,
'9'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'V'
,
'D'
,
'T'
,
'Z'
)
},
/* SoftLab-NSK VideoTizer */
...
...
@@ -254,6 +258,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{
CODEC_ID_CAVS
,
MKTAG
(
'C'
,
'A'
,
'V'
,
'S'
)
},
{
CODEC_ID_JPEG2000
,
MKTAG
(
'm'
,
'j'
,
'p'
,
'2'
)
},
{
CODEC_ID_JPEG2000
,
MKTAG
(
'M'
,
'J'
,
'2'
,
'C'
)
},
{
CODEC_ID_JPEG2000
,
MKTAG
(
'L'
,
'J'
,
'2'
,
'C'
)
},
{
CODEC_ID_JPEG2000
,
MKTAG
(
'L'
,
'J'
,
'2'
,
'K'
)
},
{
CODEC_ID_VMNC
,
MKTAG
(
'V'
,
'M'
,
'n'
,
'c'
)
},
{
CODEC_ID_TARGA
,
MKTAG
(
't'
,
'g'
,
'a'
,
' '
)
},
{
CODEC_ID_PNG
,
MKTAG
(
'M'
,
'P'
,
'N'
,
'G'
)
},
...
...
@@ -318,6 +324,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
{
CODEC_ID_PCM_MULAW
,
0x6c75
},
{
CODEC_ID_AAC
,
0x706d
},
{
CODEC_ID_AAC
,
0x4143
},
{
CODEC_ID_SPEEX
,
0xA109
},
{
CODEC_ID_FLAC
,
0xF1AC
},
{
CODEC_ID_ADPCM_SWF
,
(
'S'
<<
8
)
+
'F'
},
{
CODEC_ID_VORBIS
,
(
'V'
<<
8
)
+
'o'
},
//HACK/FIXME, does vorbis in WAV/AVI have an (in)official id?
...
...
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