RV30 decoder

Originally committed as revision 16247 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Changelog b/Changelog
index 50d1896ca7051d3a4f4c1beed9291ca655011b7d..d785492bf362b684e5eed46bc8a77c7b276a354b 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -140,7 +140,7 @@ version <next>
 - liba52 wrapper removed
 - Speex decoding via libspeex
 - Electronic Arts TGQ decoder
-- RV40 decoder
+- RV30 and RV40 decoder
 - QCELP / PureVoice decoder
 
 version 0.4.9-pre1:

diff --git a/doc/general.texi b/doc/general.texi
index d2a0aedf982dfd24d2dcd6dcc80171bce7bacbb3..514e8e53523c945df05f7cc47bf75b27fbc9c218 100644 (file)
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -288,6 +288,8 @@ following image formats are supported:
     @tab fourccs: QPEG, Q1.0, Q1.1
 @item RealVideo 1.0          @tab  X  @tab  X
 @item RealVideo 2.0          @tab  X  @tab  X
+@item RealVideo 3.0          @tab     @tab  X
+    @tab still far from ideal
 @item RealVideo 4.0          @tab     @tab  X
 @item Renderware TXD         @tab     @tab  X
     @tab Texture dictionaries used by the Renderware Engine.

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 67f23db2e4577ecfa1c67a32f32e0018ca082a74..e4fb30d6e9a6c2fe01af2e74ca29d1d454e7f229 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -178,6 +178,7 @@ OBJS-$(CONFIG_RV10_DECODER)            += rv10.o h263.o mpeg12data.o mpegvideo.o
 OBJS-$(CONFIG_RV10_ENCODER)            += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_RV20_DECODER)            += rv10.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_RV20_ENCODER)            += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
+OBJS-$(CONFIG_RV30_DECODER)            += rv30.o rv34.o h264pred.o rv30dsp.o
 OBJS-$(CONFIG_RV40_DECODER)            += rv40.o rv34.o h264pred.o rv40dsp.o
 OBJS-$(CONFIG_SGI_DECODER)             += sgidec.o
 OBJS-$(CONFIG_SGI_ENCODER)             += sgienc.o rle.o

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 7faf4fa83072c1bd78b2663272883cbb6f7fd5c9..1fdda8e052091091db488aef78c64db12157ccf3 100644 (file)
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -132,6 +132,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER (RPZA, rpza);
     REGISTER_ENCDEC  (RV10, rv10);
     REGISTER_ENCDEC  (RV20, rv20);
+    REGISTER_DECODER (RV30, rv30);
     REGISTER_DECODER (RV40, rv40);
     REGISTER_ENCDEC  (SGI, sgi);
     REGISTER_DECODER (SMACKER, smacker);

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d98d2f21a9610e353da5d44ee7049178428d1aea..81ca0c3c8f2e42843960d1d7dd676fa1c2a03618 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR  7
+#define LIBAVCODEC_VERSION_MINOR  8
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 6cd7131c5742302c02e4b3de691e3b74ea27f6dd..78942775e4acf37022eb062ebff9c351f3c4fd71 100644 (file)
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2743,6 +2743,10 @@ void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx);
 /* H264 specific */
 void ff_h264dspenc_init(DSPContext* c, AVCodecContext *avctx);
 
+#if defined(CONFIG_RV30_DECODER)
+void ff_rv30dsp_init(DSPContext* c, AVCodecContext *avctx);
+#endif /* CONFIG_RV30_DECODER */
+
 #if defined(CONFIG_RV40_DECODER)
 static void put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride){
     put_pixels16_xy2_c(dst, src, stride, 16);
@@ -4495,6 +4499,9 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
 #if defined(CONFIG_H264_ENCODER)
     ff_h264dspenc_init(c,avctx);
 #endif
+#if defined(CONFIG_RV30_DECODER)
+    ff_rv30dsp_init(c,avctx);
+#endif
 #if defined(CONFIG_RV40_DECODER)
     ff_rv40dsp_init(c,avctx);
     c->put_rv40_qpel_pixels_tab[0][15] = put_rv40_qpel16_mc33_c;