Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

*: update to 2.8

Browse Source
This commit is contained in:
meh
2015-09-15 20:53:49 +02:00
parent 7f0291bf78
commit 19548810dd
7 changed files with 156 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/util/channel_layout.rs
View File

@ -30,33 +30,34 @@ bitflags! {
const LOW_FREQUENCY_2 = AV_CH_LOW_FREQUENCY_2,
const NATIVE = AV_CH_LAYOUT_NATIVE,
const MONO = FRONT_CENTER.bits,
const STEREO = FRONT_LEFT.bits | FRONT_RIGHT.bits,
const _2POINT1 = STEREO.bits | LOW_FREQUENCY.bits,
const _2_1 = STEREO.bits | BACK_CENTER.bits,
const SURROUND = STEREO.bits | FRONT_CENTER.bits,
const _3POINT1 = SURROUND.bits | LOW_FREQUENCY.bits,
const _4POINT0 = SURROUND.bits | BACK_CENTER.bits,
const _4POINT1 = _4POINT0.bits | LOW_FREQUENCY.bits,
const _2_2 = STEREO.bits | SIDE_LEFT.bits | SIDE_RIGHT.bits,
const QUAD = STEREO.bits | BACK_LEFT.bits | BACK_RIGHT.bits,
const _5POINT0 = SURROUND.bits | SIDE_LEFT.bits | SIDE_RIGHT.bits,
const _5POINT1 = _5POINT0.bits | LOW_FREQUENCY.bits,
const _5POINT0_BACK = SURROUND.bits | BACK_LEFT.bits | BACK_RIGHT.bits,
const _5POINT1_BACK = _5POINT0_BACK.bits | LOW_FREQUENCY.bits,
const _6POINT0 = _5POINT0.bits | BACK_CENTER.bits,
const _6POINT0_FRONT = _2_2.bits | FRONT_LEFT_OF_CENTER.bits | FRONT_RIGHT_OF_CENTER.bits,
const HEXAGONAL = _5POINT0_BACK.bits | BACK_CENTER.bits,
const _6POINT1 = _5POINT1.bits | BACK_CENTER.bits,
const _6POINT1_BACK = _5POINT1_BACK.bits | BACK_CENTER.bits,
const _6POINT1_FRONT = _6POINT0_FRONT.bits | LOW_FREQUENCY.bits,
const _7POINT0 = _5POINT0.bits | BACK_LEFT.bits | BACK_RIGHT.bits,
const _7POINT0_FRONT = _5POINT0.bits | FRONT_LEFT_OF_CENTER.bits | FRONT_RIGHT_OF_CENTER.bits,
const _7POINT1 = _5POINT1.bits | BACK_LEFT.bits | BACK_RIGHT.bits,
const _7POINT1_WIDE = _5POINT1.bits | FRONT_LEFT_OF_CENTER.bits | FRONT_RIGHT_OF_CENTER.bits,
const _7POINT1_WIDE_BACK = _5POINT1_BACK.bits | FRONT_LEFT_OF_CENTER.bits | FRONT_RIGHT_OF_CENTER.bits,
const OCTAGONAL = _5POINT0.bits | BACK_LEFT.bits | BACK_CENTER.bits | BACK_RIGHT.bits,
const STEREO_DOWNMIX = STEREO_LEFT.bits | STEREO_RIGHT.bits,
const MONO = AV_CH_LAYOUT_MONO,
const STEREO = AV_CH_LAYOUT_STEREO,
const _2POINT1 = AV_CH_LAYOUT_2POINT1,
const _2_1 = AV_CH_LAYOUT_2_1,
const SURROUND = AV_CH_LAYOUT_SURROUND,
const _3POINT1 = AV_CH_LAYOUT_3POINT1,
const _4POINT0 = AV_CH_LAYOUT_4POINT0,
const _4POINT1 = AV_CH_LAYOUT_4POINT1,
const _2_2 = AV_CH_LAYOUT_2_2,
const QUAD = AV_CH_LAYOUT_QUAD,
const _5POINT0 = AV_CH_LAYOUT_5POINT0,
const _5POINT1 = AV_CH_LAYOUT_5POINT1,
const _5POINT0_BACK = AV_CH_LAYOUT_5POINT0_BACK,
const _5POINT1_BACK = AV_CH_LAYOUT_5POINT1_BACK,
const _6POINT0 = AV_CH_LAYOUT_6POINT0,
const _6POINT0_FRONT = AV_CH_LAYOUT_6POINT0_FRONT,
const HEXAGONAL = AV_CH_LAYOUT_HEXAGONAL,
const _6POINT1 = AV_CH_LAYOUT_6POINT1,
const _6POINT1_BACK = AV_CH_LAYOUT_6POINT1_BACK,
const _6POINT1_FRONT = AV_CH_LAYOUT_6POINT1_FRONT,
const _7POINT0 = AV_CH_LAYOUT_7POINT0,
const _7POINT0_FRONT = AV_CH_LAYOUT_7POINT0_FRONT,
const _7POINT1 = AV_CH_LAYOUT_7POINT1,
const _7POINT1_WIDE = AV_CH_LAYOUT_7POINT1_WIDE,
const _7POINT1_WIDE_BACK = AV_CH_LAYOUT_7POINT1_WIDE_BACK,
const OCTAGONAL = AV_CH_LAYOUT_OCTAGONAL,
const HEXADECAGONAL = AV_CH_LAYOUT_HEXADECAGONAL,
const STEREO_DOWNMIX = AV_CH_LAYOUT_STEREO_DOWNMIX,
}
}

20
src/util/format/pixel.rs
View File

@ -63,6 +63,7 @@ pub enum Pixel {
VAAPI_MOCO,
VAAPI_IDCT,
VAAPI_VLD,
VAAPI,
YUV420P16LE,
YUV420P16BE,
@ -199,6 +200,10 @@ pub enum Pixel {
YUV440P10BE,
YUV440P12LE,
YUV440P12BE,
AYUV64LE,
AYUV64BE,
VIDEOTOOLBOX,
// --- defaults
XVMC,
@ -266,6 +271,7 @@ pub enum Pixel {
XYZ12,
NV20,
AYUV64,
}
impl From<AVPixelFormat> for Pixel {
@ -468,6 +474,10 @@ impl From<AVPixelFormat> for Pixel {
AV_PIX_FMT_YUV440P10BE => Pixel::YUV440P10BE,
AV_PIX_FMT_YUV440P12LE => Pixel::YUV440P12LE,
AV_PIX_FMT_YUV440P12BE => Pixel::YUV440P12BE,
AV_PIX_FMT_AYUV64LE => Pixel::AYUV64LE,
AV_PIX_FMT_AYUV64BE => Pixel::AYUV64BE,
AV_PIX_FMT_VIDEOTOOLBOX => Pixel::VIDEOTOOLBOX,
AV_PIX_FMT_NB => Pixel::None
}
@ -538,6 +548,7 @@ impl Into<AVPixelFormat> for Pixel {
Pixel::VAAPI_MOCO => AV_PIX_FMT_VAAPI_MOCO,
Pixel::VAAPI_IDCT => AV_PIX_FMT_VAAPI_IDCT,
Pixel::VAAPI_VLD => AV_PIX_FMT_VAAPI_VLD,
Pixel::VAAPI => AV_PIX_FMT_VAAPI_VLD,
Pixel::YUV420P16LE => AV_PIX_FMT_YUV420P16LE,
Pixel::YUV420P16BE => AV_PIX_FMT_YUV420P16BE,
@ -674,6 +685,10 @@ impl Into<AVPixelFormat> for Pixel {
Pixel::YUV440P10BE => AV_PIX_FMT_YUV440P10BE,
Pixel::YUV440P12LE => AV_PIX_FMT_YUV440P12LE,
Pixel::YUV440P12BE => AV_PIX_FMT_YUV440P12BE,
Pixel::AYUV64LE => AV_PIX_FMT_AYUV64LE,
Pixel::AYUV64BE => AV_PIX_FMT_AYUV64BE,
Pixel::VIDEOTOOLBOX => AV_PIX_FMT_VIDEOTOOLBOX,
// --- defaults
Pixel::XVMC => AV_PIX_FMT_XVMC,
@ -739,8 +754,9 @@ impl Into<AVPixelFormat> for Pixel {
Pixel::YUVA422P16 => AV_PIX_FMT_YUVA422P16,
Pixel::YUVA444P16 => AV_PIX_FMT_YUVA444P16,
Pixel::XYZ12 => AV_PIX_FMT_XYZ12,
Pixel::NV20 => AV_PIX_FMT_NV20,
Pixel::XYZ12 => AV_PIX_FMT_XYZ12,
Pixel::NV20 => AV_PIX_FMT_NV20,
Pixel::AYUV64 => AV_PIX_FMT_AYUV64,
}
}
}