Snow is a toy codec with no real-world use and horrible code.
---
Updated to also drop the DWT code, which is completely Snow-specific
and cannot be shared with Dirac. Plus drop some Snow-specific parts
from dsputil.
configure | 4 -
doc/general.texi | 2 -
doc/snow.txt | 630 -------------
libavcodec/Makefile | 4 -
libavcodec/allcodecs.c | 1 -
libavcodec/avcodec.h | 8 +-
libavcodec/codec_desc.c | 7 -
libavcodec/dsputil.c | 11 -
libavcodec/dsputil.h | 7 -
libavcodec/dwt.c | 861 -----------------
libavcodec/dwt.h | 124 ---
libavcodec/ivi_dsp.c | 5 +-
libavcodec/motion_est.c | 21 +-
libavcodec/old_codec_ids.h | 2 +
libavcodec/options_table.h | 9 +-
libavcodec/snow.c | 676 -------------
libavcodec/snow.h | 692 --------------
libavcodec/snowdata.h | 132 ---
libavcodec/snowdec.c | 573 -----------
libavcodec/snowenc.c | 1938 --------------------------------------
libavcodec/version.h | 3 +
libavcodec/x86/Makefile | 1 -
libavcodec/x86/motion_est.c | 2 +-
libavcodec/x86/snowdsp.c | 902 ------------------
libavformat/matroska.c | 1 -
libavformat/riff.c | 1 -
tests/fate/vcodec.mak | 14 -
tests/ref/fate/vsynth1-snow | 4 -
tests/ref/fate/vsynth1-snow-hpel | 4 -
tests/ref/fate/vsynth1-snow-ll | 4 -
tests/ref/fate/vsynth2-snow | 4 -
tests/ref/fate/vsynth2-snow-hpel | 4 -
tests/ref/fate/vsynth2-snow-ll | 4 -
tests/ref/seek/snow_avi | 46 -
tests/ref/seek/snow_ll_avi | 46 -
35 files changed, 29 insertions(+), 6718 deletions(-)
delete mode 100644 doc/snow.txt
delete mode 100644 libavcodec/dwt.c
delete mode 100644 libavcodec/dwt.h
delete mode 100644 libavcodec/snow.c
delete mode 100644 libavcodec/snow.h
delete mode 100644 libavcodec/snowdata.h
delete mode 100644 libavcodec/snowdec.c
delete mode 100644 libavcodec/snowenc.c
delete mode 100644 libavcodec/x86/snowdsp.c
delete mode 100644 tests/ref/fate/vsynth1-snow
delete mode 100644 tests/ref/fate/vsynth1-snow-hpel
delete mode 100644 tests/ref/fate/vsynth1-snow-ll
delete mode 100644 tests/ref/fate/vsynth2-snow
delete mode 100644 tests/ref/fate/vsynth2-snow-hpel
delete mode 100644 tests/ref/fate/vsynth2-snow-ll
delete mode 100644 tests/ref/seek/snow_avi
delete mode 100644 tests/ref/seek/snow_ll_avi
diff --git a/configure b/configure
index 34680d4..c9072f3 100755
--- a/configure
+++ b/configure
@@ -116,7 +116,6 @@ Component options:
--enable-x11grab enable X11 grabbing [no]
--disable-network disable network support [no]
--disable-dct disable DCT code
- --disable-dwt disable DWT code
--disable-lsp disable LSP code
--disable-mdct disable MDCT code
--disable-rdft disable RDFT code
@@ -991,7 +990,6 @@ CONFIG_LIST="
bzlib
dct
doc
- dwt
dxva2
fft
frei0r
@@ -1512,8 +1510,6 @@ rv30_decoder_select="error_resilience golomb h264chroma
h264pred h264qpel mpegvi
rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel
mpegvideo"
shorten_decoder_select="golomb"
sipr_decoder_select="lsp"
-snow_decoder_select="dwt rangecoder"
-snow_encoder_select="aandcttables dwt error_resilience mpegvideoenc rangecoder"
svq1_decoder_select="error_resilience mpegvideo"
svq1_encoder_select="aandcttables error_resilience mpegvideoenc"
svq3_decoder_select="error_resilience golomb h264chroma h264dsp h264pred
h264qpel mpegvideo"
diff --git a/doc/general.texi b/doc/general.texi
index 7b78308..93eb4da 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -605,8 +605,6 @@ following image formats are supported:
@item Smacker video @tab @tab X
@tab Video encoding used in Smacker.
@item SMPTE VC-1 @tab @tab X
-@item Snow @tab X @tab X
- @tab experimental wavelet codec (fourcc: SNOW)
@item Sony PlayStation MDEC (Motion DECoder) @tab @tab X
@item Sorenson Vector Quantizer 1 @tab X @tab X
@tab fourcc: SVQ1
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index bd6567e..80dda02 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -34,7 +34,6 @@ OBJS = allcodecs.o
\
OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o
OBJS-$(CONFIG_AC3DSP) += ac3dsp.o
OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o
-OBJS-$(CONFIG_DWT) += dwt.o
OBJS-$(CONFIG_DXVA2) += dxva2.o
OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o
OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o
@@ -329,9 +328,6 @@ OBJS-$(CONFIG_SIPR_DECODER) += sipr.o
acelp_pitch_delay.o \
OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o
OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o
OBJS-$(CONFIG_SMC_DECODER) += smc.o
-OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o
-OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o \
- h263.o ituh263enc.o
OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o
OBJS-$(CONFIG_SP5X_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o
OBJS-$(CONFIG_SRT_DECODER) += srtdec.o ass.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index b175fbb..b926baf 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -193,7 +193,6 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (SGI, sgi);
REGISTER_DECODER (SMACKER, smacker);
REGISTER_DECODER (SMC, smc);
- REGISTER_ENCDEC (SNOW, snow);
REGISTER_DECODER (SP5X, sp5x);
REGISTER_ENCDEC (SUNRAST, sunrast);
REGISTER_ENCDEC (SVQ1, svq1);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8e37b83..f4f4eee 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -152,7 +152,9 @@ enum AVCodecID {
AV_CODEC_ID_MSZH,
AV_CODEC_ID_ZLIB,
AV_CODEC_ID_QTRLE,
+#if FF_API_SNOW
AV_CODEC_ID_SNOW,
+#endif
AV_CODEC_ID_TSCC,
AV_CODEC_ID_ULTI,
AV_CODEC_ID_QDRAW,
@@ -516,7 +518,9 @@ enum Motion_Est_ID {
ME_X1, ///< reserved for experiments
ME_HEX, ///< hexagon based search
ME_UMH, ///< uneven multi-hexagon search
+#if FF_API_SNOW
ME_ITER, ///< iterative search
+#endif
ME_TESA, ///< transformed exhaustive search algorithm
};
@@ -1503,7 +1507,7 @@ typedef struct AVCodecContext {
/**
* Motion estimation algorithm used for video coding.
* 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
- * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow
specific]
+ * 8 (umh), 10 (tesa) [7, 8, 10 are x264 specific]
* - encoding: MUST be set by user.
* - decoding: unused
*/
@@ -1726,8 +1730,10 @@ typedef struct AVCodecContext {
#define FF_CMP_VSAD 8
#define FF_CMP_VSSE 9
#define FF_CMP_NSSE 10
+#if FF_API_SNOW
#define FF_CMP_W53 11
#define FF_CMP_W97 12
+#endif
#define FF_CMP_DCTMAX 13
#define FF_CMP_DCT264 14
#define FF_CMP_CHROMA 256
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 818a35e..fd2dbf9 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -419,13 +419,6 @@ static const AVCodecDescriptor codec_descriptors[] = {
.props = AV_CODEC_PROP_LOSSLESS,
},
{
- .id = AV_CODEC_ID_SNOW,
- .type = AVMEDIA_TYPE_VIDEO,
- .name = "snow",
- .long_name = NULL_IF_CONFIG_SMALL("Snow"),
- .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS,
- },
- {
.id = AV_CODEC_ID_TSCC,
.type = AVMEDIA_TYPE_VIDEO,
.name = "tscc",
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 5c705ea..74e8572 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -1784,14 +1784,6 @@ void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int
type){
case FF_CMP_NSSE:
cmp[i]= c->nsse[i];
break;
-#if CONFIG_DWT
- case FF_CMP_W53:
- cmp[i]= c->w53[i];
- break;
- case FF_CMP_W97:
- cmp[i]= c->w97[i];
- break;
-#endif
default:
av_log(NULL, AV_LOG_ERROR,"internal error in cmp function
selection\n");
}
@@ -2834,9 +2826,6 @@ av_cold void ff_dsputil_init(DSPContext* c,
AVCodecContext *avctx)
c->vsse[5]= vsse_intra8_c;
c->nsse[0]= nsse16_c;
c->nsse[1]= nsse8_c;
-#if CONFIG_DWT
- ff_dsputil_init_dwt(c);
-#endif
c->ssd_int8_vs_int16 = ssd_int8_vs_int16_c;
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 6ce41df..c911cfb 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -255,8 +255,6 @@ typedef struct DSPContext {
me_cmp_func vsad[6];
me_cmp_func vsse[6];
me_cmp_func nsse[6];
- me_cmp_func w53[6];
- me_cmp_func w97[6];
me_cmp_func dct_max[6];
me_cmp_func dct264_sad[6];
@@ -585,10 +583,6 @@ static inline int get_penalty_factor(int lambda, int
lambda2, int type){
return lambda>>FF_LAMBDA_SHIFT;
case FF_CMP_DCT:
return (3*lambda)>>(FF_LAMBDA_SHIFT+1);
- case FF_CMP_W53:
- return (4*lambda)>>(FF_LAMBDA_SHIFT);
- case FF_CMP_W97:
- return (2*lambda)>>(FF_LAMBDA_SHIFT);
case FF_CMP_SATD:
case FF_CMP_DCT264:
return (2*lambda)>>FF_LAMBDA_SHIFT;
@@ -611,7 +605,6 @@ void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext
*avctx);
void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx);
void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
-void ff_dsputil_init_dwt(DSPContext *c);
void ff_mlp_init(DSPContext* c, AVCodecContext *avctx);
void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx);
diff --git a/libavcodec/ivi_dsp.c b/libavcodec/ivi_dsp.c
index caad843..1d75d56 100644
--- a/libavcodec/ivi_dsp.c
+++ b/libavcodec/ivi_dsp.c
@@ -28,7 +28,6 @@
#include "avcodec.h"
#include "dsputil.h"
-#include "dwt.h"
#include "ivi_common.h"
#include "ivi_dsp.h"
@@ -40,7 +39,7 @@ void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t
*dst,
int32_t b0_1, b0_2, b1_1, b1_2, b1_3, b2_1, b2_2, b2_3, b2_4,
b2_5, b2_6;
int32_t b3_1, b3_2, b3_3, b3_4, b3_5, b3_6, b3_7, b3_8, b3_9;
int32_t pitch, back_pitch;
- const IDWTELEM *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr;
+ const short *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr;
/* all bands should have the same pitch */
pitch = plane->bands[0].pitch;
@@ -182,7 +181,7 @@ void ff_ivi_recompose_haar(const IVIPlaneDesc *plane,
uint8_t *dst,
const int dst_pitch, const int num_bands)
{
int x, y, indx, b0, b1, b2, b3, p0, p1, p2, p3;
- const IDWTELEM *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr;
+ const short *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr;
int32_t pitch;
/* all bands should have the same pitch */
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 932406d..d354159 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -302,8 +302,9 @@ int ff_init_me(MpegEncContext *s){
av_log(s->avctx, AV_LOG_ERROR, "ME_MAP size is too small for SAB
diamond\n");
return -1;
}
- //special case of snow is needed because snow uses its own iterative ME
code
- if(s->me_method!=ME_ZERO && s->me_method!=ME_EPZS && s->me_method!=ME_X1
&& s->avctx->codec_id != AV_CODEC_ID_SNOW){
+ if (s->me_method != ME_ZERO &&
+ s->me_method != ME_EPZS &&
+ s->me_method != ME_X1) {
av_log(s->avctx, AV_LOG_ERROR, "me_method is only allowed to be set to
zero and epzs; for hex,umh,full and others see dia_size\n");
return -1;
}
@@ -354,16 +355,14 @@ int ff_init_me(MpegEncContext *s){
/* 8x8 fullpel search would need a 4x4 chroma compare, which we do
* not have yet, and even if we had, the motion estimation code
* does not expect it. */
- if(s->codec_id != AV_CODEC_ID_SNOW){
- if((c->avctx->me_cmp&FF_CMP_CHROMA)/* && !s->dsp.me_cmp[2]*/){
- s->dsp.me_cmp[2]= zero_cmp;
- }
- if((c->avctx->me_sub_cmp&FF_CMP_CHROMA) && !s->dsp.me_sub_cmp[2]){
- s->dsp.me_sub_cmp[2]= zero_cmp;
- }
- c->hpel_put[2][0]= c->hpel_put[2][1]=
- c->hpel_put[2][2]= c->hpel_put[2][3]= zero_hpel;
+ if((c->avctx->me_cmp&FF_CMP_CHROMA)/* && !s->dsp.me_cmp[2]*/){
+ s->dsp.me_cmp[2]= zero_cmp;
+ }
+ if((c->avctx->me_sub_cmp&FF_CMP_CHROMA) && !s->dsp.me_sub_cmp[2]){
+ s->dsp.me_sub_cmp[2]= zero_cmp;
}
+ c->hpel_put[2][0]= c->hpel_put[2][1]=
+ c->hpel_put[2][2]= c->hpel_put[2][3]= zero_hpel;
if(s->codec_id == AV_CODEC_ID_H261){
c->sub_motion_search= no_sub_motion_search;
diff --git a/libavcodec/old_codec_ids.h b/libavcodec/old_codec_ids.h
index 2b72e38..aabc05f 100644
--- a/libavcodec/old_codec_ids.h
+++ b/libavcodec/old_codec_ids.h
@@ -86,7 +86,9 @@
CODEC_ID_MSZH,
CODEC_ID_ZLIB,
CODEC_ID_QTRLE,
+#if FF_API_SNOW
CODEC_ID_SNOW,
+#endif
CODEC_ID_TSCC,
CODEC_ID_ULTI,
CODEC_ID_QDRAW,
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 4b6d417..1daaf23 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -25,6 +25,7 @@
#include "libavutil/opt.h"
#include "avcodec.h"
+#include "version.h"
#include "config.h"
#define OFFSET(x) offsetof(AVCodecContext,x)
@@ -91,7 +92,9 @@ static const AVOption options[]={
{"x1", "X1 motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_X1 }, INT_MIN,
INT_MAX, V|E, "me_method" },
{"hex", "hex motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_HEX },
INT_MIN, INT_MAX, V|E, "me_method" },
{"umh", "umh motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_UMH },
INT_MIN, INT_MAX, V|E, "me_method" },
+#if FF_API_SNOW
{"iter", "iter motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ITER },
INT_MIN, INT_MAX, V|E, "me_method" },
+#endif
{"extradata_size", NULL, OFFSET(extradata_size), AV_OPT_TYPE_INT, {.i64 =
DEFAULT }, INT_MIN, INT_MAX},
{"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0},
INT_MIN, INT_MAX},
{"g", "set the group of picture size", OFFSET(gop_size), AV_OPT_TYPE_INT,
{.i64 = 12 }, INT_MIN, INT_MAX, V|E},
@@ -259,10 +262,6 @@ static const AVOption options[]={
{"vsad", "sum of absolute vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 =
FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
{"vsse", "sum of squared vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 =
FF_CMP_VSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
{"nsse", "noise preserving sum of squared differences", 0, AV_OPT_TYPE_CONST,
{.i64 = FF_CMP_NSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-#if CONFIG_SNOW_ENCODER
-{"w53", "5/3 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 =
FF_CMP_W53 }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"w97", "9/7 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 =
FF_CMP_W97 }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-#endif
{"dctmax", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCTMAX }, INT_MIN,
INT_MAX, V|E, "cmp_func"},
{"chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_CHROMA }, INT_MIN,
INT_MAX, V|E, "cmp_func"},
{"pre_dia_size", "diamond type & size for motion estimation pre-pass",
OFFSET(pre_dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX,
V|E},
@@ -347,7 +346,7 @@ static const AVOption options[]={
{"bidir_refine", "refine the two motion vectors used in bidirectional
macroblocks", OFFSET(bidir_refine), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 4, V|E},
{"brd_scale", "downscales frames for dynamic B-frame decision",
OFFSET(brd_scale), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, 10, V|E},
{"keyint_min", "minimum interval between IDR-frames (x264)",
OFFSET(keyint_min), AV_OPT_TYPE_INT, {.i64 = 25 }, INT_MIN, INT_MAX, V|E},
-{"refs", "reference frames to consider for motion compensation (Snow)",
OFFSET(refs), AV_OPT_TYPE_INT, {.i64 = 1 }, INT_MIN, INT_MAX, V|E},
+{"refs", "reference frames to consider for motion compensation", OFFSET(refs),
AV_OPT_TYPE_INT, {.i64 = 1 }, INT_MIN, INT_MAX, V|E},
{"chromaoffset", "chroma qp offset from luma", OFFSET(chromaoffset),
AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
{"trellis", "rate-distortion optimal quantization", OFFSET(trellis),
AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E},
#if FF_API_MPV_GLOBAL_OPTS
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 5b2d7b9..389c409 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -85,5 +85,8 @@
#ifndef FF_API_AVCODEC_RESAMPLE
#define FF_API_AVCODEC_RESAMPLE (LIBAVCODEC_VERSION_MAJOR < 55)
#endif
+#ifndef FF_API_SNOW
+#define FF_API_SNOW (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
#endif /* AVCODEC_VERSION_H */
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index be4fd54..16a11b0 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -16,7 +16,6 @@ MMX-OBJS += x86/dsputil_mmx.o
\
MMX-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o
MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o
MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o
-MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp.o
MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \
x86/motion_est.o
MMX-OBJS-$(CONFIG_FFT) += x86/fft_init.o
diff --git a/libavcodec/x86/motion_est.c b/libavcodec/x86/motion_est.c
index 6eb44d4..56d1876 100644
--- a/libavcodec/x86/motion_est.c
+++ b/libavcodec/x86/motion_est.c
@@ -462,7 +462,7 @@ void ff_dsputil_init_pix_mmx(DSPContext* c, AVCodecContext
*avctx)
c->pix_abs[1][3] = sad8_xy2_mmx2;
}
}
- if ((mm_flags & AV_CPU_FLAG_SSE2) && !(mm_flags & AV_CPU_FLAG_3DNOW) &&
avctx->codec_id != AV_CODEC_ID_SNOW) {
+ if ((mm_flags & AV_CPU_FLAG_SSE2) && !(mm_flags & AV_CPU_FLAG_3DNOW)) {
c->sad[0]= sad16_sse2;
}
#endif /* HAVE_INLINE_ASM */
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index edb7ab7..5d1c134 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -76,7 +76,6 @@ const CodecTags ff_mkv_codec_tags[]={
{"V_REAL/RV20" , AV_CODEC_ID_RV20},
{"V_REAL/RV30" , AV_CODEC_ID_RV30},
{"V_REAL/RV40" , AV_CODEC_ID_RV40},
- {"V_SNOW" , AV_CODEC_ID_SNOW},
{"V_THEORA" , AV_CODEC_ID_THEORA},
{"V_UNCOMPRESSED" , AV_CODEC_ID_RAWVIDEO},
{"V_VP8" , AV_CODEC_ID_VP8},
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 2539b23..4530878 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -231,7 +231,6 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_TRUEMOTION1, MKTAG('P', 'V', 'E', 'Z') },
{ AV_CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') },
{ AV_CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') },
- { AV_CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') },
{ AV_CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
{ AV_CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
{ AV_CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') },
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index e9a9ad6..8f91e30 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -206,20 +206,6 @@ FATE_VCODEC += rv20
fate-vsynth%-rv20: ENCOPTS = -qscale 10
fate-vsynth%-rv20: FMT = rm
-FATE_VCODEC += snow
-fate-vsynth%-snow: ENCOPTS = -strict -2 -qscale 2 -flags +qpel \
- -me_method iter -dia_size 2 \
- -cmp 12 -subcmp 12 -s 128x64
-
-FATE_VCODEC += snow-hpel
-fate-vsynth%-snow-hpel: ENCOPTS = -strict -2 -qscale 2 \
- -me_method iter -dia_size 2 \
- -cmp 12 -subcmp 12 -s 128x64
-
-FATE_VCODEC += snow-ll
-fate-vsynth%-snow-ll: ENCOPTS = -strict -2 -qscale .001 -pred 1 \
- -flags +mv4+qpel
-
FATE_VCODEC += svq1
fate-vsynth%-svq1: ENCOPTS = -qscale 3 -pix_fmt yuv410p
fate-vsynth%-svq1: FMT = mov
diff --git a/doc/snow.txt b/doc/snow.txt
deleted file mode 100644
index f991339..0000000
--- a/doc/snow.txt
+++ /dev/null
@@ -1,630 +0,0 @@
diff --git a/libavcodec/dwt.c b/libavcodec/dwt.c
deleted file mode 100644
index 93cf2c6..0000000
--- a/libavcodec/dwt.c
+++ /dev/null
@@ -1,861 +0,0 @@
diff --git a/libavcodec/dwt.h b/libavcodec/dwt.h
deleted file mode 100644
index e06f3f9..0000000
--- a/libavcodec/dwt.h
+++ /dev/null
@@ -1,124 +0,0 @@
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
deleted file mode 100644
index d69f452..0000000
--- a/libavcodec/snow.c
+++ /dev/null
@@ -1,676 +0,0 @@
diff --git a/libavcodec/snow.h b/libavcodec/snow.h
deleted file mode 100644
index abf3309..0000000
--- a/libavcodec/snow.h
+++ /dev/null
@@ -1,692 +0,0 @@
diff --git a/libavcodec/snowdata.h b/libavcodec/snowdata.h
deleted file mode 100644
index 4a91858..0000000
--- a/libavcodec/snowdata.h
+++ /dev/null
@@ -1,132 +0,0 @@
diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c
deleted file mode 100644
index 38afdd2..0000000
--- a/libavcodec/snowdec.c
+++ /dev/null
@@ -1,573 +0,0 @@
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
deleted file mode 100644
index 5a4a3ac..0000000
--- a/libavcodec/snowenc.c
+++ /dev/null
@@ -1,1938 +0,0 @@
diff --git a/libavcodec/x86/snowdsp.c b/libavcodec/x86/snowdsp.c
deleted file mode 100644
index fb190d8..0000000
--- a/libavcodec/x86/snowdsp.c
+++ /dev/null
@@ -1,902 +0,0 @@
diff --git a/tests/ref/fate/vsynth1-snow b/tests/ref/fate/vsynth1-snow
deleted file mode 100644
index 0b47513..0000000
--- a/tests/ref/fate/vsynth1-snow
+++ /dev/null
@@ -1,4 +0,0 @@
diff --git a/tests/ref/fate/vsynth1-snow-hpel b/tests/ref/fate/vsynth1-snow-hpel
deleted file mode 100644
index e2968b1..0000000
--- a/tests/ref/fate/vsynth1-snow-hpel
+++ /dev/null
@@ -1,4 +0,0 @@
diff --git a/tests/ref/fate/vsynth1-snow-ll b/tests/ref/fate/vsynth1-snow-ll
deleted file mode 100644
index fdc5046..0000000
--- a/tests/ref/fate/vsynth1-snow-ll
+++ /dev/null
@@ -1,4 +0,0 @@
diff --git a/tests/ref/fate/vsynth2-snow b/tests/ref/fate/vsynth2-snow
deleted file mode 100644
index 0e78f32..0000000
--- a/tests/ref/fate/vsynth2-snow
+++ /dev/null
@@ -1,4 +0,0 @@
diff --git a/tests/ref/fate/vsynth2-snow-hpel b/tests/ref/fate/vsynth2-snow-hpel
deleted file mode 100644
index 2194a13..0000000
--- a/tests/ref/fate/vsynth2-snow-hpel
+++ /dev/null
@@ -1,4 +0,0 @@
diff --git a/tests/ref/fate/vsynth2-snow-ll b/tests/ref/fate/vsynth2-snow-ll
deleted file mode 100644
index 2d33b08..0000000
--- a/tests/ref/fate/vsynth2-snow-ll
+++ /dev/null
@@ -1,4 +0,0 @@
diff --git a/tests/ref/seek/snow_avi b/tests/ref/seek/snow_avi
deleted file mode 100644
index 39f8ac8..0000000
--- a/tests/ref/seek/snow_avi
+++ /dev/null
@@ -1,46 +0,0 @@
diff --git a/tests/ref/seek/snow_ll_avi b/tests/ref/seek/snow_ll_avi
deleted file mode 100644
index 5eb0ba0..0000000
--- a/tests/ref/seek/snow_ll_avi
+++ /dev/null
@@ -1,46 +0,0 @@
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
