1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

enable RV40 decoder

Originally committed as revision 15968 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2008-12-01 06:40:36 +00:00
parent 2d8a081511
commit 11c0f9eca1
6 changed files with 9 additions and 1 deletions

View File

@ -140,6 +140,7 @@ version <next>
- liba52 wrapper removed - liba52 wrapper removed
- Speex decoding via libspeex - Speex decoding via libspeex
- Electronic Arts TGQ decoder - Electronic Arts TGQ decoder
- RV40 decoder
version 0.4.9-pre1: version 0.4.9-pre1:

View File

@ -288,6 +288,7 @@ following image formats are supported:
@tab fourccs: QPEG, Q1.0, Q1.1 @tab fourccs: QPEG, Q1.0, Q1.1
@item RealVideo 1.0 @tab X @tab X @item RealVideo 1.0 @tab X @tab X
@item RealVideo 2.0 @tab X @tab X @item RealVideo 2.0 @tab X @tab X
@item RealVideo 4.0 @tab @tab X
@item Renderware TXD @tab @tab X @item Renderware TXD @tab @tab X
@tab Texture dictionaries used by the Renderware Engine. @tab Texture dictionaries used by the Renderware Engine.
@item RTjpeg @tab @tab X @item RTjpeg @tab @tab X

View File

@ -177,6 +177,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_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_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_RV20_ENCODER) += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o h264pred.o rv40dsp.o
OBJS-$(CONFIG_SGI_DECODER) += sgidec.o OBJS-$(CONFIG_SGI_DECODER) += sgidec.o
OBJS-$(CONFIG_SGI_ENCODER) += sgienc.o rle.o OBJS-$(CONFIG_SGI_ENCODER) += sgienc.o rle.o
OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o

View File

@ -142,6 +142,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (RPZA, rpza); REGISTER_DECODER (RPZA, rpza);
REGISTER_ENCDEC (RV10, rv10); REGISTER_ENCDEC (RV10, rv10);
REGISTER_ENCDEC (RV20, rv20); REGISTER_ENCDEC (RV20, rv20);
REGISTER_DECODER (RV40, rv40);
REGISTER_ENCDEC (SGI, sgi); REGISTER_ENCDEC (SGI, sgi);
REGISTER_DECODER (SMACKER, smacker); REGISTER_DECODER (SMACKER, smacker);
REGISTER_DECODER (SMC, smc); REGISTER_DECODER (SMC, smc);

View File

@ -30,7 +30,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 4 #define LIBAVCODEC_VERSION_MINOR 5
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

View File

@ -485,6 +485,10 @@ typedef struct DSPContext {
*/ */
int32_t (*scalarproduct_int16)(int16_t *v1, int16_t *v2/*align 16*/, int len, int shift); int32_t (*scalarproduct_int16)(int16_t *v1, int16_t *v2/*align 16*/, int len, int shift);
/* rv30 functions */
qpel_mc_func put_rv30_tpel_pixels_tab[4][16];
qpel_mc_func avg_rv30_tpel_pixels_tab[4][16];
/* rv40 functions */ /* rv40 functions */
qpel_mc_func put_rv40_qpel_pixels_tab[4][16]; qpel_mc_func put_rv40_qpel_pixels_tab[4][16];
qpel_mc_func avg_rv40_qpel_pixels_tab[4][16]; qpel_mc_func avg_rv40_qpel_pixels_tab[4][16];