diff --git a/README.md b/README.md index 5eab76a..d264a17 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ With ffmpeg and bash, you might do something like this: done ``` With JVCL, you'd write this spec file and save it to a file -(for example `my-spec.jvcl`): +(for example `my-spec.jvc`): ```json { "assets": [ {"name": "src", "path": "/tmp/my/source.mp4"} ], @@ -45,7 +45,7 @@ With JVCL, you'd write this spec file and save it to a file ``` and then run it like this: ```shell script -jvcl my-spec.jvcl +jvcl my-spec.jvc ``` Yes, the JVCL is longer, but I think many would agree it is easier to read and maintain. @@ -88,37 +88,37 @@ Today, JVCL supports several basic operations. For each operation listed below, the header links to an example from the JVCL test suite. -### [add-silence](src/test/resources/tests/test_add_silence.jvcl) +### [add-silence](src/test/resources/tests/test_add_silence.jvc) Add a silent audio track to a video asset. -### [concat](src/test/resources/tests/test_concat.jvcl) +### [concat](src/test/resources/tests/test_concat.jvc) Concatenate audio/video assets together into one asset. -### [ken-burns](src/test/resources/tests/test_ken_burns.jvcl) +### [ken-burns](src/test/resources/tests/test_ken_burns.jvc) Transform still images into video via a fade-pan (aka Ken Burns) effect. -### [letterbox](src/test/resources/tests/test_letterbox.jvcl) +### [letterbox](src/test/resources/tests/test_letterbox.jvc) Transform a video from one size to another size, maintaining the aspect ratio of the video and adding letterboxes on the sides or top/bottom. Handy for embedding mobile videos into other screen formats. -### [merge-audio](src/test/resources/tests/test_merge_audio.jvcl) +### [merge-audio](src/test/resources/tests/test_merge_audio.jvc) Merge an audio asset into the audio track of a video asset. -### [overlay](src/test/resources/tests/test_overlay.jvcl) +### [overlay](src/test/resources/tests/test_overlay.jvc) Overlay one asset onto another. -### [remove-track](src/test/resources/tests/test_remove_track.jvcl) +### [remove-track](src/test/resources/tests/test_remove_track.jvc) Remove a track from a video asset. -### [scale](src/test/resources/tests/test_scale.jvcl) +### [scale](src/test/resources/tests/test_scale.jvc) Scale a video asset from one size to another. Scaling can be proportional or anamorphic. -### [split](src/test/resources/tests/test_split.jvcl) +### [split](src/test/resources/tests/test_split.jvc) Split an audio/video asset into multiple assets of equal time lengths. -### [trim](src/test/resources/tests/test_trim.jvcl) +### [trim](src/test/resources/tests/test_trim.jvc) Trim audio/video; crop a section of an asset, becomes a new asset. ## Complex Example diff --git a/docs/running.md b/docs/running.md index d93a05d..5f58962 100644 --- a/docs/running.md +++ b/docs/running.md @@ -39,11 +39,11 @@ There examples for every JVCL operation. ## Executing a JVCL Spec To execute a spec stored in the file `my-spec.json`, you would run: ```shell script -jvcl my-spec.jvcl +jvcl my-spec.jvc ``` or use stdin: ```shell script -cat my-spec.jvcl | jvcl +cat my-spec.jvc | jvcl ``` ## Command Line Options diff --git a/src/test/java/javicle/test/BasicTest.java b/src/test/java/javicle/test/BasicTest.java index 86c07ae..05b51a9 100644 --- a/src/test/java/javicle/test/BasicTest.java +++ b/src/test/java/javicle/test/BasicTest.java @@ -1,6 +1,6 @@ package javicle.test; -import jvcl.main.Jvcl; +import jvcl.main.jvc; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.junit.Test; @@ -19,18 +19,18 @@ import static org.junit.Assert.fail; public class BasicTest { @Test public void testSplitConcatTrimScaleLetterbox () { - runSpec("tests/test_split.jvcl"); - runSpec("tests/test_concat.jvcl"); - runSpec("tests/test_trim.jvcl"); - runSpec("tests/test_scale.jvcl"); - runSpec("tests/test_letterbox.jvcl"); + runSpec("tests/test_split.jvc"); + runSpec("tests/test_concat.jvc"); + runSpec("tests/test_trim.jvc"); + runSpec("tests/test_scale.jvc"); + runSpec("tests/test_letterbox.jvc"); } - @Test public void testOverlay () { runSpec("tests/test_overlay.jvcl"); } - @Test public void testKenBurns () { runSpec("tests/test_ken_burns.jvcl"); } - @Test public void testRemoveTrack () { runSpec("tests/test_remove_track.jvcl"); } - @Test public void testMergeAudio () { runSpec("tests/test_merge_audio.jvcl"); } - @Test public void testAddSilence () { runSpec("tests/test_add_silence.jvcl"); } + @Test public void testOverlay () { runSpec("tests/test_overlay.jvc"); } + @Test public void testKenBurns () { runSpec("tests/test_ken_burns.jvc"); } + @Test public void testRemoveTrack () { runSpec("tests/test_remove_track.jvc"); } + @Test public void testMergeAudio () { runSpec("tests/test_merge_audio.jvc"); } + @Test public void testAddSilence () { runSpec("tests/test_add_silence.jvc"); } private void runSpec(String specPath) { try { diff --git a/src/test/resources/tests/test_add_silence.jvcl b/src/test/resources/tests/test_add_silence.jvc similarity index 100% rename from src/test/resources/tests/test_add_silence.jvcl rename to src/test/resources/tests/test_add_silence.jvc diff --git a/src/test/resources/tests/test_concat.jvcl b/src/test/resources/tests/test_concat.jvc similarity index 100% rename from src/test/resources/tests/test_concat.jvcl rename to src/test/resources/tests/test_concat.jvc diff --git a/src/test/resources/tests/test_ken_burns.jvcl b/src/test/resources/tests/test_ken_burns.jvc similarity index 100% rename from src/test/resources/tests/test_ken_burns.jvcl rename to src/test/resources/tests/test_ken_burns.jvc diff --git a/src/test/resources/tests/test_letterbox.jvcl b/src/test/resources/tests/test_letterbox.jvc similarity index 100% rename from src/test/resources/tests/test_letterbox.jvcl rename to src/test/resources/tests/test_letterbox.jvc diff --git a/src/test/resources/tests/test_merge_audio.jvcl b/src/test/resources/tests/test_merge_audio.jvc similarity index 100% rename from src/test/resources/tests/test_merge_audio.jvcl rename to src/test/resources/tests/test_merge_audio.jvc diff --git a/src/test/resources/tests/test_overlay.jvcl b/src/test/resources/tests/test_overlay.jvc similarity index 100% rename from src/test/resources/tests/test_overlay.jvcl rename to src/test/resources/tests/test_overlay.jvc diff --git a/src/test/resources/tests/test_remove_track.jvcl b/src/test/resources/tests/test_remove_track.jvc similarity index 100% rename from src/test/resources/tests/test_remove_track.jvcl rename to src/test/resources/tests/test_remove_track.jvc diff --git a/src/test/resources/tests/test_scale.jvcl b/src/test/resources/tests/test_scale.jvc similarity index 100% rename from src/test/resources/tests/test_scale.jvcl rename to src/test/resources/tests/test_scale.jvc diff --git a/src/test/resources/tests/test_split.jvcl b/src/test/resources/tests/test_split.jvc similarity index 100% rename from src/test/resources/tests/test_split.jvcl rename to src/test/resources/tests/test_split.jvc diff --git a/src/test/resources/tests/test_trim.jvcl b/src/test/resources/tests/test_trim.jvc similarity index 100% rename from src/test/resources/tests/test_trim.jvcl rename to src/test/resources/tests/test_trim.jvc