@hypit/hypit 0.1.3 → 0.1.5

package/packages/media-pipeline/src/audio-plan.ts

@@ -1,6 +1,6 @@
 import { programFrameSampleBoundary, programSpaceFrameCount } from "@hypit/program-space";
 import type { ProgramSpace } from "@hypit/program-space";
-import { assertCompositionIdentity } from "@hypit/composition";
+import { assertCompositionIdentity, assertAudioPresentation } from "@hypit/composition";
 import type { Composition } from "@hypit/composition";
 import { canonicalize, isResourceId } from "@hypit/protocol";
 
@@ -62,6 +62,7 @@ export function verifyAudioProgramPlan(value: unknown): asserts value is AudioPr
     assert(clip.pitch === "preserve", `AudioProgramPlan clip ${clip.id} pitch policy is invalid`);
     assert(Number.isFinite(clip.gain) && clip.gain >= 0 && clip.gain <= 64,
       `AudioProgramPlan clip ${clip.id} gain is invalid`);
+    assertAudioPresentation(clip, { startSample: clip.targetStartSample, endSampleExclusive: clip.targetEndSampleExclusive }, item.sampleFrames);
     const length = clip.targetEndSampleExclusive - clip.targetStartSample;
     assert(Number.isSafeInteger(clip.fadeInSamples) && clip.fadeInSamples >= 0 && clip.fadeInSamples <= length
       && Number.isSafeInteger(clip.fadeOutSamples) && clip.fadeOutSamples >= 0 && clip.fadeOutSamples <= length,
@@ -100,6 +101,8 @@ export function compileAudioProgramPlan(composition: Composition, programSpace:
         gain: clip.gain,
         fadeInSamples: clip.fadeInSamples,
         fadeOutSamples: clip.fadeOutSamples,
+        ...(clip.gainEnvelope === undefined ? {} : { gainEnvelope: clip.gainEnvelope }),
+        ...(clip.audibility === undefined ? {} : { audibility: clip.audibility }),
       };
     }));
   return sealAudioProgramPlan({

package/packages/media-pipeline/src/component.ts

@@ -66,6 +66,7 @@ function plannedMediaNeed(
   port: string,
   capability: CapabilityRef,
   roles: Readonly<Record<string, string>> = {},
+  present?: PlannedNeedFacet["present"],
 ): PlannedNeedFacet {
   return {
     producer,
@@ -75,6 +76,7 @@ function plannedMediaNeed(
       return { constraints: {}, pendingInputs: plannedNeedInputs(state, step, roles) };
     },
     present(specification) {
+      if (present !== undefined) return present(specification);
       const references: Record<string, number> = {};
       for (const item of specification.pendingInputs) {
         const role = item.role;
@@ -86,6 +88,18 @@ function plannedMediaNeed(
   };
 }
 
+const presentAudioRender: NonNullable<PlannedNeedFacet["present"]> = (specification) => {
+  const request = specification.constraints as Partial<RenderAudioNeed>;
+  if (request.plan === undefined) return { fields: {}, references: {} };
+  const { plan, range } = request;
+  return { fields: {
+    startFrame: [range?.startFrame ?? 0],
+    endFrameExclusive: [range?.endFrameExclusive ?? plan.frameCount],
+    frameRate: [`${plan.frameRate.numerator}/${plan.frameRate.denominator}`],
+    sampleRate: [plan.sampleRate],
+  }, references: {} };
+};
+
 export const mediaPipelineComponent = {
   validators: [
     {
@@ -363,8 +377,8 @@ export const mediaPipelineComponent = {
       mediaPipelineCapabilities.projectSpeechEvidenceAudio,
       { media: "audio" },
     ),
-    plannedMediaNeed(mediaPipelineProducers.renderAudio, "audio", mediaPipelineCapabilities.renderAudio, { plan: "audio" }),
-    plannedMediaNeed(mediaPipelineProducers.renderAudioRange, "audio", mediaPipelineCapabilities.renderAudio, { plan: "audio" }),
+    plannedMediaNeed(mediaPipelineProducers.renderAudio, "audio", mediaPipelineCapabilities.renderAudio, {}, presentAudioRender),
+    plannedMediaNeed(mediaPipelineProducers.renderAudioRange, "audio", mediaPipelineCapabilities.renderAudio, {}, presentAudioRender),
     plannedMediaNeed(mediaPipelineProducers.mux, "media", mediaPipelineCapabilities.mux, { visual: "video", audio: "audio" }),
   ],
 } satisfies ComponentPackage;

package/packages/media-pipeline/src/manifest.ts

@@ -3,7 +3,7 @@ import { mediaDependency, mediaTypes } from "@hypit/media";
 import { programSpaceDependency, programSpaceTypes } from "@hypit/program-space";
 import { svsModuleRef, svsRecipeType } from "@hypit/svs";
 import { speechDependency, speechTypes } from "@hypit/speech";
-import { compositionDependency, compositionTypes } from "@hypit/composition";
+import { compositionDependency, compositionTypes, audioSampleSpanSchema, audioGainEnvelopeSchema } from "@hypit/composition";
 import { artifactTypes } from "@hypit/artifact";
 import type {
   CapabilityRef,
@@ -237,6 +237,8 @@ export const audioProgramPlanSchema: ValueSchema = {
         gain: { schema: { kind: "number", minimum: 0, maximum: 64 } },
         fadeInSamples: { schema: integer },
         fadeOutSamples: { schema: integer },
+        gainEnvelope: { schema: audioGainEnvelopeSchema, optional: true },
+        audibility: { schema: { kind: "array", items: audioSampleSpanSchema }, optional: true },
       },
     } } },
     mix: { schema: {

package/packages/media-pipeline/src/types.ts

@@ -1,3 +1,4 @@
+import type { AudioPresentation } from "@hypit/composition";
 import type { BlobRef } from "@hypit/protocol";
 import type { MediaFrameRange, MediaInspection, MediaRational, MediaStreamSelection, RenderedVisual, TimelineAudio } from "@hypit/media";
 
@@ -134,7 +135,7 @@ export type ProjectSpeechEvidenceAudioNeed = {
   readonly evidenceSampleFrames: number;
 };
 
-export type AudioProgramClip = {
+export type AudioProgramClip = AudioPresentation & {
   readonly id: string;
   readonly artifact: BlobRef;
   readonly targetStartSample: number;

package/packages/media-track/README.md

@@ -1,61 +1,28 @@
 # `@hypit/media-track`
 
-The Track Surface accepts `semantic={speech.semantic}` or `space={animation}`. Semantic context
-resolves Script Selections and Moments; authored space supports clock-based animation. Shared `at`
+The Track Surface accepts `timeline={program.timeline}`. The same Timeline supports authored
+positions and, where prepared Takes supply evidence, Script Selections and Moments. Shared `at`
 inputs accept a Moment or a time such as `2s`; `at` with `for` produces a Window where required.
-`Performance` still needs `semantic`, which supplies its ordered prepared footage.
+[Performance](../performance/README.md) separately obtains existing footage and source positions from Timeline.
 
 Place images, prepared video or compositable surfaces over the semantic timeline. B-roll is a common
-use: the picture can illustrate a phrase while the A-roll's speech continues. Performance presents the semantic material as a full picture, inset or cutout.
+use: the picture can illustrate a phrase while the A-roll's speech continues.
 Media Items own independently timed pictures;
 a Sequence owns one visual slot whose Members replace each other through Handoffs.
 
-The Markup Track takes `canvas` and a time source (`semantic` or `space`). Its Surface projects
+The Markup Track takes `canvas` and `timeline`. Its Surface projects
 authored Selections, Moments, Segments or clock expressions into Windows and Instants. The component
-consumes those projected times with Frames, media and appearance; its Fragment receives ProgramSpace.
+consumes those projected times with Frames, media and appearance; its Fragment receives the same Timeline.
 
 Moving media enters after [normalization](../media-pipeline/README.md), with the intended streams and
 frame clock already selected. Still images use their actual intrinsic Extent. Placement, fitting,
 sampling and motion remain separate authored choices.
 
-## Display a semantic performance
+## Present existing Timeline footage
 
-```svml
-<media:Track id="performance" semantic={speech.semantic} canvas={canvas}>
-  <media:Performance during="program" frame={layout.full}
-    appearance={look.performance}/>
-</media:Track>
-```
-
-`Performance` displays the prepared material in its enclosing Track's `semantic` input. `during`
-selects the whole program, a Segment or a Selection; the other Window forms work as usual. One
-Performance can span any number of Takes. Each plays at its original program position: if a Take
-begins at program second 5, a Window from seconds 7 to 10 shows source seconds 2 to 5. An audio-only
-interval contributes no picture. The presentation shares one frame, appearance and lifecycle across
-Take boundaries.
-
-Its appearance Recipe needs `stack-order` and can set fit, crop anchors, opacity, filters, clipping,
-padding, border, shadow and frame paint. `motion` moves the framed presentation, and `Sampling`
-children transform the fitted picture over the complete selected Window, without restarting at
-Take boundaries. `Sound` children attach prepared effects to its entrance or exit. Its original
-sound is independently available as `speech.audio` for Film. Use an Item with direct `media` for
-independent playback or source trim; Performance preserves the semantic assembly's source timing.
-
-```svml
-<media:Performance during={story.segment.explanation} frame={layout.full}
-  appearance={look.performance}>
-  <media:Sampling at="start" zoom="1"/>
-  <media:Sampling at="end" zoom="1.08"/>
-</media:Performance>
-```
-
-This excerpt belongs inside the same Media Track. Its selected passage determines the appearance
-interval, while the two Sampling keys direct a gradual push-in inside the unchanged Frame.
-
-For a fixed card, full picture, circle or cutout this is ordinary Media presentation. If video and
-graphics must resize, mask or move together, write a project component that owns that relationship.
-`projectSemanticMedia` supplies the same material spans to its drawing function. The component can
-use a browser program from `@hypit/hypit/hyperframes` while Caption and independent overlays remain peers.
+[Performance](../performance/README.md) obtains existing footage from Timeline and applies broad
+and local Use rules. Use Media Items here for independently supplied assets and playback choices.
+Both reuse the same geometry and fitting capabilities.
 
 ## Place the frame, then fit its contents
 
@@ -115,10 +82,10 @@ a deliberate pan or rotation may reveal the backing or lower layers.
 ## Author Items and replacement Sequences
 
 These excerpts assume the imports, named assets, normalized media, Frames, Extents, Script,
-SemanticTrack and Recipes are already declared:
+Timeline and Recipes are already declared:
 
 ```svml
-<media-track:Track id="coverage" semantic={speech.semantic} canvas={vertical}>
+<media-track:Track id="coverage" timeline={speech.timeline} canvas={vertical}>
   <media-track:Item image={photo} extent={photo-extent} frame={full-frame}
     during={story.selection.example} appearance={recipes.media.still}/>
   <media-track:Item media={clip-media.media} frame={full-frame}
@@ -132,7 +99,7 @@ Appearance owns stack order, fit, clipping and source sampling; a `motion` Recip
 movement. `Sampling` children can move the sampled content inside the Frame independently.
 
 ```svml
-<media-track:Track id="cards" semantic={speech.semantic} canvas={vertical}>
+<media-track:Track id="cards" timeline={speech.timeline} canvas={vertical}>
   <media-track:Sequence id="steps" frame={card-frame} appearance={recipes.media.card}
     until={story.selection.demo} until-boundary="end">
     <media-track:Member id="one" image={first} extent={card-extent}
@@ -177,7 +144,7 @@ separately controls which source frames it occupies there. `playback` defaults t
 `trim-start` and `trim-end` are a pair of integer source-frame boundaries, with an exclusive end.
 Omit both to use the full source. The playback rules apply to the trimmed range when present.
 For `stretch`, the source-frame advance is `sourceLength / targetLength`. For native playback, moving
-media has already been normalized to ProgramSpace's frame rate, so one program frame advances one
+media has already been normalized to Timeline's frame rate, so one program frame advances one
 source frame. These are source sampling choices; they do not move a Selection's semantic boundaries.
 
 A two-second Item can use the beginning of a four-second generated clip without requesting a

package/packages/media-track/package.json

@@ -19,7 +19,7 @@
     "@hypit/narrative": "workspace:*",
     "@hypit/program-space": "workspace:*",
     "@hypit/protocol": "workspace:*",
-    "@hypit/semantic-track": "workspace:*",
+    "@hypit/timeline": "workspace:*",
     "@hypit/spatial": "workspace:*",
     "@hypit/svs": "workspace:*",
     "@hypit/markup": "workspace:*",

package/packages/media-track/preview/preview.svml

@@ -6,7 +6,7 @@
   <import from="@hypit/script@1"/>
   <import as="media" from="@hypit/media@1"/>
   <import as="pipeline" from="@hypit/media-pipeline@1"/>
-  <import as="speech" from="@hypit/speech-track@1"/>
+  <import as="time" from="@hypit/timeline-author@1"/>
   <import as="whisperx" from="@hypit/whisperx@1"/>
   <import as="media-track" from="@hypit/media-track@1"/>
   <import as="space" from="@hypit/spatial@1"/>
@@ -32,16 +32,16 @@
     video="primary-moving" audio="none" span-authority="video"/>
   <whisperx:SemanticTake id="showcase-time" narrative={story}
     segment={story.segment.empty} media={duration-media.media}/>
-  <speech:Track id="speech"><speech:Take source={showcase-time.take}/></speech:Track>
+  <time:Timeline id="speech" clock={clock}><time:Take source={showcase-time.take}/></time:Timeline>
 
-  <media-track:Track id="showcase" semantic={speech.semantic} canvas={vertical}>
+  <media-track:Track id="showcase" timeline={speech.timeline} canvas={vertical}>
     <media-track:Item id="rounded-card" image={picture-a} extent={picture-size} during="program"
       frame={card-a} appearance={recipes.media.card} motion={recipes.motion.card}/>
     <media-track:Item id="flush-card" image={picture-b} extent={picture-size} during="program"
       frame={card-b} appearance={recipes.media.wide} motion={recipes.motion.card}/>
   </media-track:Track>
-  <film:Film id="main" canvas={vertical} semantic={speech.semantic} appearance={recipes.film.vertical}>
+  <film:Film id="main" canvas={vertical} timeline={speech.timeline} appearance={recipes.film.vertical}>
     <film:Track source={showcase.visual}/>
   </film:Film>
-  <render:Video id="final" composition={main.composition} semantic={speech.semantic}/>
+  <render:Video id="final" composition={main.composition} timeline={speech.timeline}/>
 </svml>

package/packages/media-track/src/author.ts

@@ -182,12 +182,18 @@ export function decodeMediaSampleSpec(
 }
 
 /** Decode visual-only sample styling without choosing playback or source trim. */
+/** Public authored defaults shared by decoding and optional editor fields. */
+export const mediaAppearanceDefaults = {
+  opacity: 1, blur: 0, brightness: 1, contrast: 1, saturation: 1,
+  clip: "frame", radius: 0,
+} as const;
+
 export function decodeMediaSampleAppearance(recipe: SvsRecipe): MediaSampleAppearance {
   return {
-    opacity: number(recipe, "opacity", 1),
+    opacity: number(recipe, "opacity", mediaAppearanceDefaults.opacity),
     filter: {
-      blurPx: number(recipe, "blur", 0), brightness: number(recipe, "brightness", 1),
-      contrast: number(recipe, "contrast", 1), saturation: number(recipe, "saturation", 1),
+      blurPx: number(recipe, "blur", mediaAppearanceDefaults.blur), brightness: number(recipe, "brightness", mediaAppearanceDefaults.brightness),
+      contrast: number(recipe, "contrast", mediaAppearanceDefaults.contrast), saturation: number(recipe, "saturation", mediaAppearanceDefaults.saturation),
     },
   };
 }
@@ -236,10 +242,10 @@ export function decodeMediaMotion(recipe: SvsRecipe | undefined): MediaLifecycle
 }
 
 export function decodeMediaPresentation(recipe: SvsRecipe): MediaFramePresentation {
-  const clip = oneOf(recipe, "clip", ["none", "frame", "rounded"] as const, "frame");
+  const clip = oneOf(recipe, "clip", ["none", "frame", "rounded"] as const, mediaAppearanceDefaults.clip);
   const borderWidth = number(recipe, "border-width", 0);
   return {
-    clip: clip === "rounded" ? { kind: "rounded", radiusPx: number(recipe, "radius", 0) } : { kind: clip },
+    clip: clip === "rounded" ? { kind: "rounded", radiusPx: number(recipe, "radius", mediaAppearanceDefaults.radius) } : { kind: clip },
     padding: padding(recipe),
     ...(borderWidth === 0 ? {} : { border: {
       widthPx: borderWidth,
@@ -278,7 +284,7 @@ export function decodeMediaFramePaint(recipe: SvsRecipe, id: string): MediaPaint
 export function decodeMediaPaintSpec(recipe: SvsRecipe, id: string): MediaPaintLayerSpec {
   assertKeys(recipe, ["paint", "opacity"]);
   return sealMediaPaintLayerSpec({
-    id, paint: paint(recipe), opacity: number(recipe, "opacity", 1),
+    id, paint: paint(recipe), opacity: number(recipe, "opacity", mediaAppearanceDefaults.opacity),
   });
 }
 

package/packages/media-track/src/component.ts

@@ -1,10 +1,8 @@
-import { appendMediaPerformance } from "./performance.js";
-import type { SemanticTrack } from "@hypit/semantic-track";
+import type { Timeline } from "@hypit/timeline";
 import type { ComponentPackage, ProducerHandlerContext } from "@hypit/component-kit";
 import type { CompositableSurfaceRef, SynchronizedMedia } from "@hypit/media";
 import { canonicalize } from "@hypit/protocol";
 import type { BlobRef, StoredValue } from "@hypit/protocol";
-import type { ProgramSpace } from "@hypit/program-space";
 import type { CanvasSpace, ContentFit, IntrinsicExtent, SpatialFrame, SpatialPath } from "@hypit/spatial";
 import type { TemporalInstant, TemporalWindow } from "@hypit/temporal";
 
@@ -54,7 +52,7 @@ function itemInputs(inputs: ProducerHandlerContext["inputs"]) {
   return {
     set: inline<MediaTrackSet>(inputs.set?.value, "MediaTrackSet"),
     header: inline<MediaTrackHeader>(inputs.header?.value, "MediaTrackHeader"),
-    space: inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
+    timeline: inline<Timeline>(inputs.timeline?.value, "Timeline"),
     canvas: inline<CanvasSpace>(inputs.canvas?.value, "CanvasSpace"),
     layers: inline<MediaLayerSet>(inputs.layers?.value, "MediaLayerSet"),
     frame: inline<SpatialFrame>(inputs.frame?.value, "SpatialFrame"),
@@ -67,7 +65,7 @@ function itemInputs(inputs: ProducerHandlerContext["inputs"]) {
 function memberInputs(inputs: ProducerHandlerContext["inputs"]) {
   return {
     members: inline<MediaSequenceMemberSet>(inputs.members?.value, "MediaSequenceMemberSet"),
-    space: inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
+    timeline: inline<Timeline>(inputs.timeline?.value, "Timeline"),
     layers: inline<MediaLayerSet>(inputs.layers?.value, "MediaLayerSet"),
     spec: inline<MediaSequenceMemberSpec>(inputs.spec?.value, "MediaSequenceMemberSpec"),
     activation: inline<TemporalInstant>(inputs.activation?.value, "TemporalInstant"),
@@ -78,7 +76,7 @@ function sequenceInputs(inputs: ProducerHandlerContext["inputs"]) {
   return {
     set: inline<MediaTrackSet>(inputs.set?.value, "MediaTrackSet"),
     header: inline<MediaTrackHeader>(inputs.header?.value, "MediaTrackHeader"),
-    space: inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
+    timeline: inline<Timeline>(inputs.timeline?.value, "Timeline"),
     canvas: inline<CanvasSpace>(inputs.canvas?.value, "CanvasSpace"),
     members: inline<MediaSequenceMemberSet>(inputs.members?.value, "MediaSequenceMemberSet"),
     frame: inline<SpatialFrame>(inputs.frame?.value, "SpatialFrame"),
@@ -90,10 +88,6 @@ function sequenceInputs(inputs: ProducerHandlerContext["inputs"]) {
 
 export const mediaTrackComponent = {
   producers: [
-    { producer: mediaTrackProducers.appendPerformance, handler: ({ inputs }) => ({ outputs: { set: output(appendMediaPerformance(
-      itemInputs(inputs), inline<SemanticTrack>(inputs.semantic?.value, "SemanticTrack"),
-      inline<ContentFit>(inputs.fit?.value, "ContentFit"), inline<MediaSampleLayerSpec>(inputs.sampleSpec?.value, "MediaSampleLayerSpec"),
-    )) }, needs: {} }) },
     { producer: mediaTrackProducers.createLayers, handler: () => ({ outputs: { layers: output(createMediaLayerSet()) }, needs: {} }) },
     { producer: mediaTrackProducers.appendPaintLayer, handler: ({ inputs }) => ({ outputs: { layers: output(appendMediaPaintLayer(
       inline<MediaLayerSet>(inputs.layers?.value, "MediaLayerSet"),
@@ -121,7 +115,7 @@ export const mediaTrackComponent = {
     { producer: mediaTrackProducers.createSet, handler: () => ({ outputs: { set: output(createMediaTrackSet()) }, needs: {} }) },
     { producer: mediaTrackProducers.appendItem, handler: ({ inputs }) => {
       const value = itemInputs(inputs);
-      return { outputs: { set: output(appendMediaItem(value.set, value.header, value.space, value.canvas, value.layers, value.frame, value.spec, value.sounds, value.window)) }, needs: {} };
+      return { outputs: { set: output(appendMediaItem(value.set, value.header, value.timeline, value.canvas, value.layers, value.frame, value.spec, value.sounds, value.window)) }, needs: {} };
     } },
     { producer: mediaTrackProducers.bindItemClipPath, handler: ({ inputs }) => ({ outputs: { spec: output(bindMediaItemClipPath(
       inline<MediaItemSpec>(inputs.spec?.value, "MediaItemSpec"),
@@ -135,24 +129,24 @@ export const mediaTrackComponent = {
     { producer: mediaTrackProducers.appendMember, handler: ({ inputs }) => {
       const value = memberInputs(inputs);
       return { outputs: { members: output(appendMediaSequenceMember(
-        value.members, value.space, value.layers, value.spec, value.activation,
+        value.members, value.timeline, value.layers, value.spec, value.activation,
       )) }, needs: {} };
     } },
     { producer: mediaTrackProducers.appendSequence, handler: ({ inputs }) => {
       const value = sequenceInputs(inputs);
       return { outputs: { set: output(appendMediaSequence(
-        value.set, value.header, value.space, value.canvas, value.members, value.frame, value.spec, value.sounds, value.terminal,
+        value.set, value.header, value.timeline, value.canvas, value.members, value.frame, value.spec, value.sounds, value.terminal,
       )) }, needs: {} };
     } },
     { producer: mediaTrackProducers.finalize, handler: ({ inputs }) => ({ outputs: { program: output(finalizeMediaTrack(
       inline<MediaTrackSet>(inputs.set?.value, "MediaTrackSet"), inline<MediaTrackHeader>(inputs.header?.value, "MediaTrackHeader"),
-      inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
+      inline<Timeline>(inputs.timeline?.value, "Timeline"),
     )) }, needs: {} }) },
     { producer: mediaTrackProducers.projectVisual, handler: ({ inputs }) => ({ outputs: { track: output(projectMediaVisualTrack(
-      inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<MediaTrackProgram>(inputs.program?.value, "MediaTrackProgram"),
+      inline<Timeline>(inputs.timeline?.value, "Timeline"), inline<MediaTrackProgram>(inputs.program?.value, "MediaTrackProgram"),
     )) }, needs: {} }) },
     { producer: mediaTrackProducers.projectAudio, handler: ({ inputs }) => ({ outputs: { track: output(projectMediaAudioTrack(
-      inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<MediaTrackProgram>(inputs.program?.value, "MediaTrackProgram"),
+      inline<Timeline>(inputs.timeline?.value, "Timeline"), inline<MediaTrackProgram>(inputs.program?.value, "MediaTrackProgram"),
     )) }, needs: {} }) },
   ],
   validators: [{

package/packages/media-track/src/fragment.ts

@@ -1,4 +1,5 @@
-import { programSpaceTypes } from "@hypit/program-space";
+import { timelineTypes } from "@hypit/timeline";
+
 import { artifactTypes } from "@hypit/artifact";
 import { compositionTypes } from "@hypit/composition";
 import { sealGraphFragment } from "@hypit/elaborator";
@@ -14,7 +15,7 @@ const operation = (id: string) => ({ kind: "fragment-operation" as const, operat
 export const stillMediaTrackFragment = sealGraphFragment({
   inputs: [
     { name: "header", type: mediaTrackTypes.header },
-    { name: "space", type: programSpaceTypes.programSpace },
+    { name: "timeline", type: timelineTypes.track },
     { name: "canvas", type: spatialTypes.canvas },
     { name: "source", type: artifactTypes.blob },
     { name: "extent", type: spatialTypes.extent },
@@ -32,14 +33,14 @@ export const stillMediaTrackFragment = sealGraphFragment({
     { id: "set", producer: mediaTrackProducers.createSet, inputs: {}, result: { kind: "output", name: "set" } },
     { id: "sounds", producer: mediaTrackProducers.createSounds, inputs: {}, result: { kind: "output", name: "sounds" } },
     { id: "append", producer: mediaTrackProducers.appendItem, inputs: {
-      set: operation("set"), header: input("header"), space: input("space"), canvas: input("canvas"), layers: operation("sample"),
+      set: operation("set"), header: input("header"), timeline: input("timeline"), canvas: input("canvas"), layers: operation("sample"),
       frame: input("frame"), spec: input("item-spec"), sounds: operation("sounds"), window: input("window"),
     }, result: { kind: "output", name: "set" } },
     { id: "finalize", producer: mediaTrackProducers.finalize, inputs: {
-      set: operation("append"), header: input("header"), space: input("space"),
+      set: operation("append"), header: input("header"), timeline: input("timeline"),
     }, result: { kind: "output", name: "program" } },
     { id: "visual", producer: mediaTrackProducers.projectVisual, inputs: {
-      space: input("space"), program: operation("finalize"),
+      timeline: input("timeline"), program: operation("finalize"),
     }, result: { kind: "output", name: "track" } },
   ],
   exports: [
@@ -49,9 +50,9 @@ export const stillMediaTrackFragment = sealGraphFragment({
 });
 
 export const renderMediaTrackFragment = sealGraphFragment({
-  inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: mediaTrackTypes.program }],
+  inputs: [{ name: "timeline", type: timelineTypes.track }, { name: "program", type: mediaTrackTypes.program }],
   operations: [
-    { id: "visual", producer: mediaTrackProducers.projectVisual, inputs: { space: input("space"), program: input("program") }, result: { kind: "output", name: "track" } },
+    { id: "visual", producer: mediaTrackProducers.projectVisual, inputs: { timeline: input("timeline"), program: input("program") }, result: { kind: "output", name: "track" } },
   ],
   exports: [{ name: "track", type: compositionTypes.visualTrack, root: operation("visual") }],
 });

package/packages/media-track/src/index.ts

@@ -1,6 +1,7 @@
 export { mediaTrackComponent } from "./component.js";
 export {
   decodeMediaFit,
+  decodeMediaItemSpec,
   decodeMediaFramePaint,
   decodeMediaMotion,
   decodeMediaPresentation,
@@ -46,7 +47,6 @@ export {
 } from "./sounds.js";
 export { appendMediaItem, appendMediaSequence, bindMediaItemClipPath, bindMediaSequenceClipPath, assertMediaItemSpec, assertMediaTrackHeader, assertMediaTrackProgram, assertMediaTrackProgramIdentity, assertMediaTrackSet, createMediaTrackSet, finalizeMediaTrack, projectMediaAudioTrack, projectMediaVisualTrack, sealMediaItemSpec, sealMediaTrackHeader, sealMediaTrackProgram } from "./program.js";
 export { resolveVisualSampling } from "./sampling.js";
-export { appendMediaPerformance } from "./performance.js";
 export { decodeMediaSamplingKeyframe, decodeMediaTrackSurface } from "./surface.js";
 export {
   appendMediaSequenceMember,
@@ -63,3 +63,5 @@ export {
   sequenceMemberHandoffAnimation,
 } from "./sequence.js";
 export type * from "./types.js";
+
+export { mediaAppearanceDefaults } from "./author.js";

package/packages/media-track/src/lower.ts

@@ -1,10 +1,10 @@
+import type { Timeline } from "@hypit/timeline";
 import type {
   VisualAnimation,
   VisualElement,
   VisualStyleDeclaration,
   VisualTimedSampling,
 } from "@hypit/composition";
-import type { ProgramSpace } from "@hypit/program-space";
 import { fitContent } from "@hypit/spatial";
 import type { SpatialFrame, SpatialPath } from "@hypit/spatial";
 
@@ -133,7 +133,7 @@ function sampleElements(
   item: MediaItemProgram,
   parent: string,
   order: { value: number },
-  space: ProgramSpace,
+  timeline: Timeline,
   samplingOverrides: Readonly<Record<string, VisualTimedSampling>>,
   samplingAnimationOverrides: Readonly<Record<string, VisualAnimation | null>>,
 ): VisualElement[] {
@@ -209,7 +209,7 @@ function sampleElements(
     }];
   }
   const sampling = samplingOverrides[layer.id] ?? layer.sampling ?? resolveVisualSampling({
-      space,
+      timeline,
       sourceFrameRate: sourceTiming.frameRate,
       sourceFrameCount: sourceTiming.frameCount,
       targetFrameCount: durationFrames,
@@ -244,12 +244,12 @@ function layerElements(
   item: MediaItemProgram,
   parent: string,
   order: { value: number },
-  space: ProgramSpace,
+  timeline: Timeline,
   samplingOverrides: Readonly<Record<string, VisualTimedSampling>>,
   samplingAnimationOverrides: Readonly<Record<string, VisualAnimation | null>>,
 ): VisualElement[] {
   if (layer.kind === "sample") {
-    return sampleElements(layer, item, parent, order, space, samplingOverrides, samplingAnimationOverrides);
+    return sampleElements(layer, item, parent, order, timeline, samplingOverrides, samplingAnimationOverrides);
   }
   return [{
     id: layer.id,
@@ -271,7 +271,7 @@ function layerElements(
 /** Lower one independent Item through the fixed wrapper stack from the Media spec. */
 export function lowerMediaItemElements(
   item: MediaItemProgram,
-  space: ProgramSpace,
+  timeline: Timeline,
   options: {
     readonly includeHandoffWrapper?: boolean;
     readonly handoffAnimation?: VisualAnimation;
@@ -326,7 +326,7 @@ export function lowerMediaItemElements(
       item,
       frame,
       order,
-      space,
+      timeline,
       options.samplingOverrides ?? {},
       options.samplingAnimationOverrides ?? {},
     ));