Commit 070ed1bc authored by Mike Melanson's avatar Mike Melanson

initial commit for Quicktime Animation (RLE) video decoder; bit depths

32, 24, and 16 are working; 8bpp is partially working; 4, 2, and 1 bpp
are not supported yet

Originally committed as revision 2748 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a412a03b
...@@ -2,6 +2,7 @@ version <next>: ...@@ -2,6 +2,7 @@ version <next>:
- DV encoder, DV muxer - DV encoder, DV muxer
- Microsoft RLE video decoder - Microsoft RLE video decoder
- Microsoft Video-1 decoder - Microsoft Video-1 decoder
- Apple Animation (RLE) decoder
- Apple Graphics (SMC) decoder - Apple Graphics (SMC) decoder
- Apple Video (RPZA) decoder - Apple Video (RPZA) decoder
- Cinepak decoder - Cinepak decoder
......
...@@ -715,6 +715,7 @@ following image formats are supported: ...@@ -715,6 +715,7 @@ following image formats are supported:
@item Id RoQ @tab @tab X @tab used in Quake III, Jedi Knight 2, other computer games @item Id RoQ @tab @tab X @tab used in Quake III, Jedi Knight 2, other computer games
@item Xan/WC3 @tab @tab X @tab used in Wing Commander III .MVE files @item Xan/WC3 @tab @tab X @tab used in Wing Commander III .MVE files
@item Interplay Video @tab @tab X @tab used in Interplay .MVE files @item Interplay Video @tab @tab X @tab used in Interplay .MVE files
@item Apple Animation @tab @tab X @tab fourcc: 'rle '
@item Apple Graphics @tab @tab X @tab fourcc: 'smc ' @item Apple Graphics @tab @tab X @tab fourcc: 'smc '
@item Apple Video @tab @tab X @tab fourcc: rpza @item Apple Video @tab @tab X @tab fourcc: rpza
@item Cinepak @tab @tab X @item Cinepak @tab @tab X
......
...@@ -19,7 +19,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \ ...@@ -19,7 +19,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \
vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \ vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \
roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \ roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \
msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \ msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \
smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o
ifeq ($(AMR_NB),yes) ifeq ($(AMR_NB),yes)
ifeq ($(AMR_NB_FIXED),yes) ifeq ($(AMR_NB_FIXED),yes)
......
...@@ -153,6 +153,7 @@ void avcodec_register_all(void) ...@@ -153,6 +153,7 @@ void avcodec_register_all(void)
register_avcodec(&roq_dpcm_decoder); register_avcodec(&roq_dpcm_decoder);
register_avcodec(&interplay_dpcm_decoder); register_avcodec(&interplay_dpcm_decoder);
register_avcodec(&xan_dpcm_decoder); register_avcodec(&xan_dpcm_decoder);
register_avcodec(&qtrle_decoder);
#endif /* CONFIG_DECODERS */ #endif /* CONFIG_DECODERS */
#ifdef AMR_NB #ifdef AMR_NB
......
...@@ -93,6 +93,7 @@ enum CodecID { ...@@ -93,6 +93,7 @@ enum CodecID {
CODEC_ID_VMDAUDIO, CODEC_ID_VMDAUDIO,
CODEC_ID_MSZH, CODEC_ID_MSZH,
CODEC_ID_ZLIB, CODEC_ID_ZLIB,
CODEC_ID_QTRLE,
/* various pcm "codecs" */ /* various pcm "codecs" */
CODEC_ID_PCM_S16LE, CODEC_ID_PCM_S16LE,
...@@ -1700,6 +1701,7 @@ extern AVCodec ra_288_decoder; ...@@ -1700,6 +1701,7 @@ extern AVCodec ra_288_decoder;
extern AVCodec roq_dpcm_decoder; extern AVCodec roq_dpcm_decoder;
extern AVCodec interplay_dpcm_decoder; extern AVCodec interplay_dpcm_decoder;
extern AVCodec xan_dpcm_decoder; extern AVCodec xan_dpcm_decoder;
extern AVCodec qtrle_decoder;
/* pcm codecs */ /* pcm codecs */
#define PCM_CODEC(id, name) \ #define PCM_CODEC(id, name) \
......
This diff is collapsed.
...@@ -105,6 +105,7 @@ static const CodecTag mov_video_tags[] = { ...@@ -105,6 +105,7 @@ static const CodecTag mov_video_tags[] = {
{ CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */ { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */
{ CODEC_ID_8BPS, MKTAG('8', 'B', 'P', 'S') }, /* Planar RGB (8BPS) */ { CODEC_ID_8BPS, MKTAG('8', 'B', 'P', 'S') }, /* Planar RGB (8BPS) */
{ CODEC_ID_SMC, MKTAG('s', 'm', 'c', ' ') }, /* Apple Graphics (SMC) */ { CODEC_ID_SMC, MKTAG('s', 'm', 'c', ' ') }, /* Apple Graphics (SMC) */
{ CODEC_ID_QTRLE, MKTAG('r', 'l', 'e', ' ') }, /* Apple Animation (RLE) */
{ CODEC_ID_NONE, 0 }, { CODEC_ID_NONE, 0 },
}; };
......
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