diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3826258a1f..357ac487fc 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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 \ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 1c253257a0..b06e9a591f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -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); diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index d73de46519..15e122f535 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -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, diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 7bf71a3e89..ccd0392ca6 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -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), diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 8da13ac822..2d6dcceeaa 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -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), diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index fbbe4a44d9..5ddee19fe0 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -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 diff --git a/tests/ref/vsynth/vsynth1-prores_kostya b/tests/ref/vsynth/vsynth1-prores_kostya deleted file mode 100644 index ab6ecffa96..0000000000 --- a/tests/ref/vsynth/vsynth1-prores_kostya +++ /dev/null @@ -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 diff --git a/tests/ref/vsynth/vsynth1-prores_ks b/tests/ref/vsynth/vsynth1-prores_ks new file mode 100644 index 0000000000..4e33ec75cc --- /dev/null +++ b/tests/ref/vsynth/vsynth1-prores_ks @@ -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 diff --git a/tests/ref/vsynth/vsynth2-prores_kostya b/tests/ref/vsynth/vsynth2-prores_kostya deleted file mode 100644 index 16b6078ec0..0000000000 --- a/tests/ref/vsynth/vsynth2-prores_kostya +++ /dev/null @@ -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 diff --git a/tests/ref/vsynth/vsynth2-prores_ks b/tests/ref/vsynth/vsynth2-prores_ks new file mode 100644 index 0000000000..b9902dbcce --- /dev/null +++ b/tests/ref/vsynth/vsynth2-prores_ks @@ -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