diff options
author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2020-02-20 11:00:24 +0100 |
---|---|---|
committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2020-02-20 11:00:24 +0100 |
commit | b4d5b8515e75383b4fc59ea2813c90c615d59a96 (patch) | |
tree | cf9ea1f458965eea90dff60a607dc90bf42887b3 /nihav-duck/src | |
parent | 2b8bf9a03242bbd6e80091082a50ec13b1a95143 (diff) | |
download | nihav-b4d5b8515e75383b4fc59ea2813c90c615d59a96.tar.gz |
split nihav-codec-support crate from nihav-core
The former is intended just for NihAV decoders, the latter is for both
NihAV crates and for the code using NihAV.
Diffstat (limited to 'nihav-duck/src')
-rw-r--r-- | nihav-duck/src/codecs/on2avc.rs | 4 | ||||
-rw-r--r-- | nihav-duck/src/codecs/vp3.rs | 3 | ||||
-rw-r--r-- | nihav-duck/src/codecs/vp5.rs | 1 | ||||
-rw-r--r-- | nihav-duck/src/codecs/vp56.rs | 1 | ||||
-rw-r--r-- | nihav-duck/src/codecs/vp6.rs | 3 | ||||
-rw-r--r-- | nihav-duck/src/codecs/vp7.rs | 3 | ||||
-rw-r--r-- | nihav-duck/src/codecs/vp7dsp.rs | 2 | ||||
-rw-r--r-- | nihav-duck/src/codecs/vpcommon.rs | 3 | ||||
-rw-r--r-- | nihav-duck/src/lib.rs | 1 |
9 files changed, 14 insertions, 7 deletions
diff --git a/nihav-duck/src/codecs/on2avc.rs b/nihav-duck/src/codecs/on2avc.rs index b060501..f2f5a3d 100644 --- a/nihav-duck/src/codecs/on2avc.rs +++ b/nihav-duck/src/codecs/on2avc.rs @@ -4,8 +4,8 @@ use nihav_core::io::byteio::read_u16le; use nihav_core::io::bitreader::*; use nihav_core::io::codebook::*; use nihav_core::io::intcode::*; -use nihav_core::dsp::fft::*; -use nihav_core::dsp::mdct::IMDCT; +use nihav_codec_support::dsp::fft::*; +use nihav_codec_support::dsp::mdct::IMDCT; use std::str::FromStr; diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs index 3b8560e..b7fefcf 100644 --- a/nihav-duck/src/codecs/vp3.rs +++ b/nihav-duck/src/codecs/vp3.rs @@ -1,7 +1,8 @@ use std::mem; use std::ptr; use nihav_core::codecs::*; -use nihav_core::codecs::blockdsp::*; +use nihav_codec_support::codecs::{MV, ZERO_MV, ZIGZAG}; +use nihav_codec_support::codecs::blockdsp::*; use nihav_core::io::bitreader::*; use nihav_core::io::codebook::*; use nihav_core::io::intcode::*; diff --git a/nihav-duck/src/codecs/vp5.rs b/nihav-duck/src/codecs/vp5.rs index 35244df..4076989 100644 --- a/nihav-duck/src/codecs/vp5.rs +++ b/nihav-duck/src/codecs/vp5.rs @@ -1,5 +1,6 @@ use nihav_core::codecs::*; use nihav_core::io::bitreader::*; +use nihav_codec_support::codecs::{MV, ZIGZAG}; use super::vpcommon::*; use super::vp56::*; diff --git a/nihav-duck/src/codecs/vp56.rs b/nihav-duck/src/codecs/vp56.rs index de3a849..6f9f18c 100644 --- a/nihav-duck/src/codecs/vp56.rs +++ b/nihav-duck/src/codecs/vp56.rs @@ -1,5 +1,6 @@ use nihav_core::codecs::*; use nihav_core::io::bitreader::*; +use nihav_codec_support::codecs::{MV, ZERO_MV}; use super::vpcommon::*; pub const TOKEN_LARGE: u8 = 5; diff --git a/nihav-duck/src/codecs/vp6.rs b/nihav-duck/src/codecs/vp6.rs index da0fe40..9a6add7 100644 --- a/nihav-duck/src/codecs/vp6.rs +++ b/nihav-duck/src/codecs/vp6.rs @@ -1,6 +1,7 @@ use nihav_core::codecs::*; use nihav_core::io::bitreader::*; -use nihav_core::codecs::blockdsp::edge_emu; +use nihav_codec_support::codecs::{MV, ZIGZAG}; +use nihav_codec_support::codecs::blockdsp::edge_emu; use super::vpcommon::*; use super::vp56::*; diff --git a/nihav-duck/src/codecs/vp7.rs b/nihav-duck/src/codecs/vp7.rs index 9b3eef3..9464def 100644 --- a/nihav-duck/src/codecs/vp7.rs +++ b/nihav-duck/src/codecs/vp7.rs @@ -1,6 +1,7 @@ use nihav_core::codecs::*; use nihav_core::io::byteio::*; -use nihav_core::data::GenericCache; +use nihav_codec_support::codecs::{MV, ZERO_MV}; +use nihav_codec_support::data::GenericCache; use super::vpcommon::*; use super::vp7data::*; use super::vp7dsp::*; diff --git a/nihav-duck/src/codecs/vp7dsp.rs b/nihav-duck/src/codecs/vp7dsp.rs index afd035f..6dfc98f 100644 --- a/nihav-duck/src/codecs/vp7dsp.rs +++ b/nihav-duck/src/codecs/vp7dsp.rs @@ -1,5 +1,5 @@ use nihav_core::frame::*; -use nihav_core::codecs::blockdsp::edge_emu; +use nihav_codec_support::codecs::blockdsp::edge_emu; fn clip_u8(val: i16) -> u8 { val.max(0).min(255) as u8 diff --git a/nihav-duck/src/codecs/vpcommon.rs b/nihav-duck/src/codecs/vpcommon.rs index 8dbe161..f41b89b 100644 --- a/nihav-duck/src/codecs/vpcommon.rs +++ b/nihav-duck/src/codecs/vpcommon.rs @@ -1,5 +1,6 @@ use nihav_core::codecs::*; -use nihav_core::codecs::blockdsp::*; +use nihav_codec_support::codecs::blockdsp; +use nihav_codec_support::codecs::blockdsp::*; pub const VP_YUVA420_FORMAT: NAPixelFormaton = NAPixelFormaton{ model: ColorModel::YUV(YUVSubmodel::YUVJ), diff --git a/nihav-duck/src/lib.rs b/nihav-duck/src/lib.rs index 1760338..4e85ac5 100644 --- a/nihav-duck/src/lib.rs +++ b/nihav-duck/src/lib.rs @@ -1,4 +1,5 @@ extern crate nihav_core; +extern crate nihav_codec_support; mod codecs; |