*: update to 2.7

This commit is contained in:
meh
2015-06-19 01:04:49 +02:00
parent e95c55dbf5
commit 1e5d77816a
6 changed files with 80 additions and 6 deletions

View File

@ -150,6 +150,9 @@ pub enum Pixel {
GBRAP16BE_LIBAV,
GBRAP16LE_LIBAV,
QSV,
MMAL,
D3D11VA_VLD,
ZRGB,
RGBZ,
@ -192,6 +195,11 @@ pub enum Pixel {
BAYER_GRBG16LE,
BAYER_GRBG16BE,
YUV440P10LE,
YUV440P10BE,
YUV440P12LE,
YUV440P12BE,
// --- defaults
XVMC,
Y400A,
@ -221,9 +229,11 @@ pub enum Pixel {
YUV444P9,
YUV420P10,
YUV422P10,
YUV440P10,
YUV444P10,
YUV420P12,
YUV422P12,
YUV440P12,
YUV444P12,
YUV420P14,
YUV422P14,
@ -409,6 +419,9 @@ impl From<AVPixelFormat> for Pixel {
AV_PIX_FMT_GBRAP16BE_LIBAV => Pixel::GBRAP16BE_LIBAV,
AV_PIX_FMT_GBRAP16LE_LIBAV => Pixel::GBRAP16LE_LIBAV,
AV_PIX_FMT_QSV => Pixel::QSV,
AV_PIX_FMT_MMAL => Pixel::MMAL,
AV_PIX_FMT_D3D11VA_VLD => Pixel::D3D11VA_VLD,
AV_PIX_FMT_0RGB => Pixel::ZRGB,
AV_PIX_FMT_RGB0 => Pixel::RGBZ,
@ -451,6 +464,11 @@ impl From<AVPixelFormat> for Pixel {
AV_PIX_FMT_BAYER_GRBG16LE => Pixel::BAYER_GRBG16LE,
AV_PIX_FMT_BAYER_GRBG16BE => Pixel::BAYER_GRBG16BE,
AV_PIX_FMT_YUV440P10LE => Pixel::YUV440P10LE,
AV_PIX_FMT_YUV440P10BE => Pixel::YUV440P10BE,
AV_PIX_FMT_YUV440P12LE => Pixel::YUV440P12LE,
AV_PIX_FMT_YUV440P12BE => Pixel::YUV440P12BE,
AV_PIX_FMT_NB => Pixel::None
}
}
@ -607,6 +625,9 @@ impl Into<AVPixelFormat> for Pixel {
Pixel::GBRAP16BE_LIBAV => AV_PIX_FMT_GBRAP16BE_LIBAV,
Pixel::GBRAP16LE_LIBAV => AV_PIX_FMT_GBRAP16LE_LIBAV,
Pixel::QSV => AV_PIX_FMT_QSV,
Pixel::MMAL => AV_PIX_FMT_MMAL,
Pixel::D3D11VA_VLD => AV_PIX_FMT_D3D11VA_VLD,
Pixel::ZRGB => AV_PIX_FMT_0RGB,
Pixel::RGBZ => AV_PIX_FMT_RGB0,
@ -649,6 +670,11 @@ impl Into<AVPixelFormat> for Pixel {
Pixel::BAYER_GRBG16LE => AV_PIX_FMT_BAYER_GRBG16LE,
Pixel::BAYER_GRBG16BE => AV_PIX_FMT_BAYER_GRBG16BE,
Pixel::YUV440P10LE => AV_PIX_FMT_YUV440P10LE,
Pixel::YUV440P10BE => AV_PIX_FMT_YUV440P10BE,
Pixel::YUV440P12LE => AV_PIX_FMT_YUV440P12LE,
Pixel::YUV440P12BE => AV_PIX_FMT_YUV440P12BE,
// --- defaults
Pixel::XVMC => AV_PIX_FMT_XVMC,
Pixel::Y400A => AV_PIX_FMT_Y400A,
@ -678,9 +704,11 @@ impl Into<AVPixelFormat> for Pixel {
Pixel::YUV444P9 => AV_PIX_FMT_YUV444P9,
Pixel::YUV420P10 => AV_PIX_FMT_YUV420P10,
Pixel::YUV422P10 => AV_PIX_FMT_YUV422P10,
Pixel::YUV440P10 => AV_PIX_FMT_YUV440P10,
Pixel::YUV444P10 => AV_PIX_FMT_YUV444P10,
Pixel::YUV420P12 => AV_PIX_FMT_YUV420P12,
Pixel::YUV422P12 => AV_PIX_FMT_YUV422P12,
Pixel::YUV440P12 => AV_PIX_FMT_YUV440P12,
Pixel::YUV444P12 => AV_PIX_FMT_YUV444P12,
Pixel::YUV420P14 => AV_PIX_FMT_YUV420P14,
Pixel::YUV422P14 => AV_PIX_FMT_YUV422P14,