mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-02-11 17:10:58 +03:00
Revert "Use "rav1e" if available as default ("auto") avif encoder"
This reverts commit ddc8e7e459
.
This commit is contained in:
parent
b585f9e560
commit
da2e18de3e
|
@ -1370,7 +1370,7 @@ The :py:meth:`~PIL.Image.Image.save` method supports the following options:
|
||||||
YUV range, either "full" or "limited". Defaults to "full"
|
YUV range, either "full" or "limited". Defaults to "full"
|
||||||
|
|
||||||
**codec**
|
**codec**
|
||||||
AV1 codec to use for encoding. Specific values are "rav1e", "aom", and
|
AV1 codec to use for encoding. Specific values are "aom", "rav1e", and
|
||||||
"svt", presuming the chosen codec is available. Defaults to "auto", which
|
"svt", presuming the chosen codec is available. Defaults to "auto", which
|
||||||
will choose the first available codec in the order of the preceding list.
|
will choose the first available codec in the order of the preceding list.
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
#include <Python.h>
|
#include <Python.h>
|
||||||
#include "avif/avif.h"
|
#include "avif/avif.h"
|
||||||
|
|
||||||
static int have_rav1e = 0;
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
avifPixelFormat subsampling;
|
avifPixelFormat subsampling;
|
||||||
int qmin;
|
int qmin;
|
||||||
|
@ -361,11 +359,7 @@ AvifEncoderNew(PyObject *self_, PyObject *args) {
|
||||||
enc_options.speed = speed;
|
enc_options.speed = speed;
|
||||||
|
|
||||||
if (strcmp(codec, "auto") == 0) {
|
if (strcmp(codec, "auto") == 0) {
|
||||||
if (have_rav1e) {
|
|
||||||
enc_options.codec = AVIF_CODEC_CHOICE_RAV1E;
|
|
||||||
} else {
|
|
||||||
enc_options.codec = AVIF_CODEC_CHOICE_AUTO;
|
enc_options.codec = AVIF_CODEC_CHOICE_AUTO;
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
enc_options.codec = avifCodecChoiceFromName(codec);
|
enc_options.codec = avifCodecChoiceFromName(codec);
|
||||||
}
|
}
|
||||||
|
@ -1011,8 +1005,6 @@ setup_module(PyObject *m) {
|
||||||
PyDict_SetItemString(d, "libavif_version", v ? v : Py_None);
|
PyDict_SetItemString(d, "libavif_version", v ? v : Py_None);
|
||||||
Py_XDECREF(v);
|
Py_XDECREF(v);
|
||||||
|
|
||||||
have_rav1e = _codec_available("rav1e", AVIF_CODEC_FLAG_CAN_ENCODE);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user