Commit a63496cc authored by Kostya Shishkov's avatar Kostya Shishkov Committed by Paul B Mahol

avcodec: add ClearVideo decoder

Only I-frames are decoded for now.
Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 2b8151c8
...@@ -25,6 +25,7 @@ version <next>: ...@@ -25,6 +25,7 @@ version <next>:
- FM Screen Capture Codec decoder - FM Screen Capture Codec decoder
- native Opus encoder - native Opus encoder
- ScreenPressor decoder - ScreenPressor decoder
- incomplete ClearVideo decoder
version 3.2: version 3.2:
- libopenmpt demuxer - libopenmpt demuxer
......
...@@ -342,6 +342,7 @@ library: ...@@ -342,6 +342,7 @@ library:
@item iLBC @tab X @tab X @item iLBC @tab X @tab X
@item Interplay MVE @tab @tab X @item Interplay MVE @tab @tab X
@tab Format used in various Interplay computer games. @tab Format used in various Interplay computer games.
@item Iterated Systems ClearVideo @tab @tab X
@item IV8 @tab @tab X @item IV8 @tab @tab X
@tab A format generated by IndigoVision 8000 video server. @tab A format generated by IndigoVision 8000 video server.
@item IVF (On2) @tab X @tab X @item IVF (On2) @tab X @tab X
......
...@@ -228,6 +228,7 @@ OBJS-$(CONFIG_CDXL_DECODER) += cdxl.o ...@@ -228,6 +228,7 @@ OBJS-$(CONFIG_CDXL_DECODER) += cdxl.o
OBJS-$(CONFIG_CFHD_DECODER) += cfhd.o cfhddata.o OBJS-$(CONFIG_CFHD_DECODER) += cfhd.o cfhddata.o
OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o
OBJS-$(CONFIG_CINEPAK_ENCODER) += cinepakenc.o elbg.o OBJS-$(CONFIG_CINEPAK_ENCODER) += cinepakenc.o elbg.o
OBJS-$(CONFIG_CLEARVIDEO_DECODER) += clearvideo.o
OBJS-$(CONFIG_CLJR_DECODER) += cljrdec.o OBJS-$(CONFIG_CLJR_DECODER) += cljrdec.o
OBJS-$(CONFIG_CLJR_ENCODER) += cljrenc.o OBJS-$(CONFIG_CLJR_ENCODER) += cljrenc.o
OBJS-$(CONFIG_CLLC_DECODER) += cllc.o canopus.o OBJS-$(CONFIG_CLLC_DECODER) += cllc.o canopus.o
......
...@@ -157,6 +157,7 @@ void avcodec_register_all(void) ...@@ -157,6 +157,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(CDXL, cdxl); REGISTER_DECODER(CDXL, cdxl);
REGISTER_DECODER(CFHD, cfhd); REGISTER_DECODER(CFHD, cfhd);
REGISTER_ENCDEC (CINEPAK, cinepak); REGISTER_ENCDEC (CINEPAK, cinepak);
REGISTER_DECODER(CLEARVIDEO, clearvideo);
REGISTER_ENCDEC (CLJR, cljr); REGISTER_ENCDEC (CLJR, cljr);
REGISTER_DECODER(CLLC, cllc); REGISTER_DECODER(CLLC, cllc);
REGISTER_ENCDEC (COMFORTNOISE, comfortnoise); REGISTER_ENCDEC (COMFORTNOISE, comfortnoise);
......
...@@ -416,6 +416,7 @@ enum AVCodecID { ...@@ -416,6 +416,7 @@ enum AVCodecID {
AV_CODEC_ID_SPEEDHQ, AV_CODEC_ID_SPEEDHQ,
AV_CODEC_ID_FMVC, AV_CODEC_ID_FMVC,
AV_CODEC_ID_SCPR, AV_CODEC_ID_SCPR,
AV_CODEC_ID_CLEARVIDEO,
/* various PCM "codecs" */ /* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
......
This diff is collapsed.
...@@ -1367,6 +1367,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1367,6 +1367,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("ScreenPressor"), .long_name = NULL_IF_CONFIG_SMALL("ScreenPressor"),
.props = AV_CODEC_PROP_LOSSLESS | AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSLESS | AV_CODEC_PROP_LOSSY,
}, },
{
.id = AV_CODEC_ID_CLEARVIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.name = "clearvideo",
.long_name = NULL_IF_CONFIG_SMALL("Iterated Systems ClearVideo"),
.props = AV_CODEC_PROP_LOSSY,
},
/* image codecs */ /* image codecs */
{ {
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 81 #define LIBAVCODEC_VERSION_MINOR 82
#define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
......
...@@ -450,6 +450,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -450,6 +450,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '9') }, { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '9') },
{ AV_CODEC_ID_FMVC, MKTAG('F', 'M', 'V', 'C') }, { AV_CODEC_ID_FMVC, MKTAG('F', 'M', 'V', 'C') },
{ AV_CODEC_ID_SCPR, MKTAG('S', 'C', 'P', 'R') }, { AV_CODEC_ID_SCPR, MKTAG('S', 'C', 'P', 'R') },
{ AV_CODEC_ID_CLEARVIDEO, MKTAG('U', 'C', 'O', 'D') },
{ AV_CODEC_ID_NONE, 0 } { AV_CODEC_ID_NONE, 0 }
}; };
......
...@@ -43,5 +43,6 @@ const AVCodecTag ff_rm_codec_tags[] = { ...@@ -43,5 +43,6 @@ const AVCodecTag ff_rm_codec_tags[] = {
{ AV_CODEC_ID_AAC, MKTAG('r','a','a','c') }, { AV_CODEC_ID_AAC, MKTAG('r','a','a','c') },
{ AV_CODEC_ID_AAC, MKTAG('r','a','c','p') }, { AV_CODEC_ID_AAC, MKTAG('r','a','c','p') },
{ AV_CODEC_ID_RALF, MKTAG('L','S','D',':') }, { AV_CODEC_ID_RALF, MKTAG('L','S','D',':') },
{ AV_CODEC_ID_CLEARVIDEO, MKTAG('C','L','V','1') },
{ AV_CODEC_ID_NONE }, { AV_CODEC_ID_NONE },
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment