mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-16 22:14:30 +00:00
craft-aaf: take Tick, FrameRate and TICKS_PER_SECOND from craft-timeline's crate root
Frame rates live in craft-timeline's rates module, so AAF and OMF import the time types from the crate root, where craft-timeline re-exports them.
This commit is contained in:
@@ -5,7 +5,7 @@ composition model.
|
||||
|
||||
| Module | What |
|
||||
|---|---|
|
||||
| `model` | `Document`: compositions (tracks of fillers, source clips and overlapping transitions; clip gain, constant or keyframed; markers; start timecode), nested compositions, and the media `Source`s they reference (file path or embedded PCM, picture size and rate, sound channels / rate / bits, start timecode, markers). Times are exact `craft_timeline::time::Tick`s. |
|
||||
| `model` | `Document`: compositions (tracks of fillers, source clips and overlapping transitions; clip gain, constant or keyframed; markers; start timecode), nested compositions, and the media `Source`s they reference (file path or embedded PCM, picture size and rate, sound channels / rate / bits, start timecode, markers). Times are exact `craft_timeline::Tick`s. |
|
||||
| `aaf` | `read`, `write`, `sniff`: AAF Edit Protocol in structured storage (`craft-cfb`). |
|
||||
| `omf` | `read`, `write`, `sniff`: OMF Interchange 2.0 in a Bento container. Sound only. |
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
use std::collections::{HashMap, HashSet};
|
||||
|
||||
use craft_timeline::time::{FrameRate, Tick};
|
||||
use craft_timeline::{FrameRate, Tick};
|
||||
|
||||
use super::ids::{cls, ddef, def, pid};
|
||||
use super::store::{self, Auid, Obj, Value, rational_of, utf16_of};
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
use std::collections::HashSet;
|
||||
|
||||
use craft_timeline::time::FrameRate;
|
||||
use craft_timeline::FrameRate;
|
||||
|
||||
use super::ids::{self, cls, ddef, def, path, pid};
|
||||
use super::store::{self, Obj, Value};
|
||||
@@ -517,7 +517,7 @@ fn sound_source_offsets_use_audio_sample_rate_on_disk() {
|
||||
_ => None,
|
||||
})
|
||||
.unwrap();
|
||||
assert_eq!(clip.start, craft_timeline::time::FrameRate::FPS_25.tick_of(10));
|
||||
assert_eq!(clip.start, craft_timeline::FrameRate::FPS_25.tick_of(10));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
use std::collections::HashMap;
|
||||
|
||||
use craft_timeline::time::{FrameRate, Tick};
|
||||
use craft_timeline::{FrameRate, Tick};
|
||||
|
||||
use super::ids::{META_DICTIONARY, ROOT, cls, ddef, def, path, pid};
|
||||
use super::store::{self, Auid, Obj, Value, rational, utf16z};
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
//!
|
||||
//! - [`model`]: a [`model::Document`] of compositions (tracks of fillers, source clips and
|
||||
//! overlapping transitions, with clip gain and markers) and the media sources they reference,
|
||||
//! with exact times ([`craft_timeline::time::Tick`]).
|
||||
//! with exact times ([`craft_timeline::Tick`]).
|
||||
//! - [`aaf`]: Advanced Authoring Format, Edit Protocol, in structured storage (`craft-cfb`).
|
||||
//! - [`omf`]: OMF Interchange 2.0 in a Bento container; sound only.
|
||||
//!
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
//! mobs and file source mobs: here, a [`Source`] per essence, grouped into one media item by its
|
||||
//! key. All times are ticks; the format serialisers convert to and from edit units.
|
||||
|
||||
use craft_timeline::time::{FrameRate, TICKS_PER_SECOND, Tick};
|
||||
use craft_timeline::{FrameRate, TICKS_PER_SECOND, Tick};
|
||||
|
||||
/// Picture or sound.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
use std::collections::{HashMap, HashSet};
|
||||
|
||||
use craft_timeline::time::{FrameRate, Tick};
|
||||
use craft_timeline::{FrameRate, Tick};
|
||||
|
||||
use super::bento::Container;
|
||||
use crate::model::{CClip, CItem, CKind, CTrack, CTransition, Composition, Document, Gain, Source, units_to_ticks};
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
use std::collections::HashMap;
|
||||
|
||||
use craft_timeline::time::Tick;
|
||||
use craft_timeline::Tick;
|
||||
|
||||
use super::bento;
|
||||
use crate::model::{CItem, CKind, Document, Gain, Source, ticks_to_units};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//! Documents written and read back, in both formats; damaged files.
|
||||
|
||||
use craft_timeline::time::{FrameRate, Tick};
|
||||
use craft_timeline::{FrameRate, Tick};
|
||||
|
||||
use crate::model::{CItem, CKind, CMarker, Composition, Document, Gain};
|
||||
use crate::testdoc::{IDENTITY, pcm_ramp, picture_and_sound, sound_only};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//! Documents the tests write: what an editor's two-clip sequence with a dissolve looks like in
|
||||
//! the model.
|
||||
|
||||
use craft_timeline::time::{FrameRate, Tick};
|
||||
use craft_timeline::{FrameRate, Tick};
|
||||
|
||||
use crate::Identity;
|
||||
use crate::model::{CClip, CItem, CKind, CTrack, CTransition, Composition, Document, Gain, Source};
|
||||
|
||||
Reference in New Issue
Block a user