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
aba720dc
Commit
aba720dc
authored
Aug 16, 2018
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: add Brooktree ProSumer Video decoder
parent
1931761f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
408 additions
and
2 deletions
+408
-2
Changelog
Changelog
+1
-0
Makefile
libavcodec/Makefile
+1
-0
allcodecs.c
libavcodec/allcodecs.c
+1
-0
avcodec.h
libavcodec/avcodec.h
+1
-0
codec_desc.c
libavcodec/codec_desc.c
+7
-0
prosumer.c
libavcodec/prosumer.c
+394
-0
version.h
libavcodec/version.h
+2
-2
riff.c
libavformat/riff.c
+1
-0
No files found.
Changelog
View file @
aba720dc
...
...
@@ -18,6 +18,7 @@ version <next>:
- colorconstancy filter
- AVS2 video decoder via libdavs2
- IMM4 video decoder
- Brooktree ProSumer video decoder
version 4.0:
...
...
libavcodec/Makefile
View file @
aba720dc
...
...
@@ -515,6 +515,7 @@ OBJS-$(CONFIG_PRORES_DECODER) += proresdec2.o proresdsp.o proresdata.o
OBJS-$(CONFIG_PRORES_ENCODER)
+=
proresenc_anatoliy.o
OBJS-$(CONFIG_PRORES_AW_ENCODER)
+=
proresenc_anatoliy.o
OBJS-$(CONFIG_PRORES_KS_ENCODER)
+=
proresenc_kostya.o
proresdata.o
OBJS-$(CONFIG_PROSUMER_DECODER)
+=
prosumer.o
OBJS-$(CONFIG_PSD_DECODER)
+=
psd.o
OBJS-$(CONFIG_PTX_DECODER)
+=
ptx.o
OBJS-$(CONFIG_QCELP_DECODER)
+=
qcelpdec.o
\
...
...
libavcodec/allcodecs.c
View file @
aba720dc
...
...
@@ -235,6 +235,7 @@ extern AVCodec ff_prores_encoder;
extern
AVCodec
ff_prores_decoder
;
extern
AVCodec
ff_prores_aw_encoder
;
extern
AVCodec
ff_prores_ks_encoder
;
extern
AVCodec
ff_prosumer_decoder
;
extern
AVCodec
ff_psd_decoder
;
extern
AVCodec
ff_ptx_decoder
;
extern
AVCodec
ff_qdraw_decoder
;
...
...
libavcodec/avcodec.h
View file @
aba720dc
...
...
@@ -448,6 +448,7 @@ enum AVCodecID {
AV_CODEC_ID_GDV
,
AV_CODEC_ID_FITS
,
AV_CODEC_ID_IMM4
,
AV_CODEC_ID_PROSUMER
,
/* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO
=
0x10000
,
///< A dummy id pointing at the start of audio codecs
...
...
libavcodec/codec_desc.c
View file @
aba720dc
...
...
@@ -1661,6 +1661,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Infinity IMM4"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
{
.
id
=
AV_CODEC_ID_PROSUMER
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"prosumer"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Brooktree ProSumer Video"
),
.
props
=
AV_CODEC_PROP_INTRA_ONLY
|
AV_CODEC_PROP_LOSSY
,
},
/* various PCM "codecs" */
{
...
...
libavcodec/prosumer.c
0 → 100644
View file @
aba720dc
This diff is collapsed.
Click to expand it.
libavcodec/version.h
View file @
aba720dc
...
...
@@ -28,8 +28,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 2
4
#define LIBAVCODEC_VERSION_MICRO 10
1
#define LIBAVCODEC_VERSION_MINOR 2
5
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
libavformat/riff.c
View file @
aba720dc
...
...
@@ -471,6 +471,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{
AV_CODEC_ID_MSCC
,
MKTAG
(
'M'
,
'S'
,
'C'
,
'C'
)
},
{
AV_CODEC_ID_SRGC
,
MKTAG
(
'S'
,
'R'
,
'G'
,
'C'
)
},
{
AV_CODEC_ID_IMM4
,
MKTAG
(
'I'
,
'M'
,
'M'
,
'4'
)
},
{
AV_CODEC_ID_PROSUMER
,
MKTAG
(
'B'
,
'T'
,
'2'
,
'0'
)
},
{
AV_CODEC_ID_NONE
,
0
}
};
...
...
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