Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec: rename prores encoders

Browse Source 
Using the first names of authors sounds somewhat unprofessional
and might be considered offensive which is not intended.
The new names use the initials of the authors due to simplicity
and the possibility to apply it consistently without the need
to find political correct names for each future case where
alternative codecs might exist. Also its shorter ...

If someone has a better idea, like maybe 2 random letters
and people prefer it then iam happy to switch to that ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/21/head
Michael Niedermayer 12 years ago
parent d980641ec4
commit b3c3996212
10 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavcodec/Makefile
  2. 4
      libavcodec/allcodecs.c
  3. 4
      libavcodec/proresdsp.c
  4. 4
      libavcodec/proresenc_anatoliy.c
  5. 4
      libavcodec/proresenc_kostya.c
  6. 6
      tests/fate/vcodec.mak
  7. 4
      tests/ref/vsynth/vsynth1-prores_kostya
  8. 4
      tests/ref/vsynth/vsynth1-prores_ks
  9. 4
      tests/ref/vsynth/vsynth2-prores_kostya
  10. 4
      tests/ref/vsynth/vsynth2-prores_ks

4
libavcodec/Makefile
Unescape View File

@ -334,8 +334,8 @@ OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o
OBJS-$(CONFIG_PRORES_DECODER) += proresdec2.o proresdsp.o
OBJS-$(CONFIG_PRORES_LGPL_DECODER) += proresdec_lgpl.o proresdsp.o proresdata.o
OBJS-$(CONFIG_PRORES_ENCODER) += proresenc_anatoliy.o
OBJS-$(CONFIG_PRORES_ANATOLIY_ENCODER) += proresenc_anatoliy.o
OBJS-$(CONFIG_PRORES_KOSTYA_ENCODER) += proresenc_kostya.o proresdata.o proresdsp.o
OBJS-$(CONFIG_PRORES_AW_ENCODER) += proresenc_anatoliy.o
OBJS-$(CONFIG_PRORES_KS_ENCODER) += proresenc_kostya.o proresdata.o proresdsp.o
OBJS-$(CONFIG_PTX_DECODER) += ptx.o
OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o \
celp_filters.o acelp_vectors.o \

4
libavcodec/allcodecs.c
Unescape View File

@ -220,8 +220,8 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (PNG, png);
REGISTER_ENCDEC (PPM, ppm);
REGISTER_ENCDEC (PRORES, prores);
REGISTER_ENCODER(PRORES_ANATOLIY, prores_anatoliy);
REGISTER_ENCODER(PRORES_KOSTYA, prores_kostya);
REGISTER_ENCODER(PRORES_AW, prores_aw);
REGISTER_ENCODER(PRORES_KS, prores_ks);
REGISTER_DECODER(PRORES_LGPL, prores_lgpl);
REGISTER_DECODER(PTX, ptx);
REGISTER_DECODER(QDRAW, qdraw);

4
libavcodec/proresdsp.c
Unescape View File

@ -56,7 +56,7 @@ static void prores_idct_put_c(uint16_t *out, int linesize, int16_t *block, const
}
#endif
#if CONFIG_PRORES_KOSTYA_ENCODER
#if CONFIG_PRORES_KS_ENCODER
static void prores_fdct_c(const uint16_t *src, int linesize, int16_t *block)
{
int x, y;
@ -82,7 +82,7 @@ void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx)
ff_init_scantable_permutation(dsp->idct_permutation,
dsp->idct_permutation_type);
#endif
#if CONFIG_PRORES_KOSTYA_ENCODER
#if CONFIG_PRORES_KS_ENCODER
dsp->fdct = prores_fdct_c;
dsp->dct_permutation_type = FF_NO_IDCT_PERM;
ff_init_scantable_permutation(dsp->dct_permutation,

4
libavcodec/proresenc_anatoliy.c
Unescape View File

@ -597,8 +597,8 @@ static av_cold int prores_encode_close(AVCodecContext *avctx)
return 0;
}
AVCodec ff_prores_anatoliy_encoder = {
.name = "prores_anatoliy",
AVCodec ff_prores_aw_encoder = {
.name = "prores_aw",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PRORES,
.priv_data_size = sizeof(ProresContext),

4
libavcodec/proresenc_kostya.c
Unescape View File

@ -1060,8 +1060,8 @@ static const AVClass proresenc_class = {
.version = LIBAVUTIL_VERSION_INT,
};
AVCodec ff_prores_kostya_encoder = {
.name = "prores_kostya",
AVCodec ff_prores_ks_encoder = {
.name = "prores_ks",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PRORES,
.priv_data_size = sizeof(ProresContext),

6
tests/fate/vcodec.mak
Unescape View File

@ -202,11 +202,11 @@ fate-vsynth%-mpng: CODEC = png
FATE_VCODEC-$(call ENCDEC, MSVIDEO1, AVI) += msvideo1
FATE_VCODEC-$(call ENCDEC, PRORES, MOV) += prores prores_kostya
FATE_VCODEC-$(call ENCDEC, PRORES, MOV) += prores prores_ks
fate-vsynth%-prores: FMT = mov
fate-vsynth%-prores_kostya: ENCOPTS = -profile hq
fate-vsynth%-prores_kostya: FMT = mov
fate-vsynth%-prores_ks: ENCOPTS = -profile hq
fate-vsynth%-prores_ks: FMT = mov
FATE_VCODEC-$(call ENCDEC, QTRLE, MOV) += qtrle qtrlegray
fate-vsynth%-qtrle: FMT = mov

4
tests/ref/vsynth/vsynth1-prores_kostya
Unescape View File

@ -1,4 +0,0 @@
36411e06db3f86ddedd6171a56784d6b *tests/data/fate/vsynth1-prores_kostya.mov
3858911 tests/data/fate/vsynth1-prores_kostya.mov
0a4153637d0cc0a88a8bcbf04cfaf8c6 *tests/data/fate/vsynth1-prores_kostya.out.rawvideo
stddev: 3.17 PSNR: 38.09 MAXDIFF: 39 bytes: 7603200/ 7603200

4
tests/ref/vsynth/vsynth1-prores_ks
Unescape View File

@ -0,0 +1,4 @@
2f760d0e579bbbe24a922e9cbcf3294c *tests/data/fate/vsynth1-prores_ks.mov
3858911 tests/data/fate/vsynth1-prores_ks.mov
0a4153637d0cc0a88a8bcbf04cfaf8c6 *tests/data/fate/vsynth1-prores_ks.out.rawvideo
stddev: 3.17 PSNR: 38.09 MAXDIFF: 39 bytes: 7603200/ 7603200

4
tests/ref/vsynth/vsynth2-prores_kostya
Unescape View File

@ -1,4 +0,0 @@
7de64c634620de738c98aa22e9df927d *tests/data/fate/vsynth2-prores_kostya.mov
3884596 tests/data/fate/vsynth2-prores_kostya.mov
ca2f6c1162635dedfa468c90f1fdc0ef *tests/data/fate/vsynth2-prores_kostya.out.rawvideo
stddev: 0.92 PSNR: 48.77 MAXDIFF: 10 bytes: 7603200/ 7603200

4
tests/ref/vsynth/vsynth2-prores_ks
Unescape View File

@ -0,0 +1,4 @@
12c24e7305e131388d5beb2a980293f4 *tests/data/fate/vsynth2-prores_ks.mov
3884596 tests/data/fate/vsynth2-prores_ks.mov
ca2f6c1162635dedfa468c90f1fdc0ef *tests/data/fate/vsynth2-prores_ks.out.rawvideo
stddev: 0.92 PSNR: 48.77 MAXDIFF: 10 bytes: 7603200/ 7603200
Write Preview
Loading…
Cancel
Save