Merge pull request #3 from umjammer/1.0.4

1.0.4
umjammer · Dec 7, 2017 · 67db9c0 · 67db9c0
2 parents 196bdc1 + 1c4aba9
commit 67db9c0
Show file tree

Hide file tree

Showing 468 changed files with 3,088 additions and 4,771 deletions.
diff --git a/README.md b/README.md
@@ -2,23 +2,23 @@
 
 # vavi-sound
 
-| **SPI** |  **Codec** |  **Description** | **IN Status** | **OUT Status** | **SPI Status** |
-|:--------|:-----------|:-----------------|:--------------|:---------------|:---------------|
-| midi | MFi | Japanese cell phone format |  c | o | o |
-| midi | SMAF | YAMAHA cell phone format | c | o | o |
-| sampled | MFi | Japanese cell phone format |  x | o | x |
-| sampled | SMAF | YAMAHA cell phone format | o | o | o |
-| sampled | CCITT ADPCM | G711, G721, G723 | o | o | x |
-| - | DVI ADPCM | DVI ADPCM | o  | o | - |
-| - | IMA ADPCM | IMA ADPCM  | o | o | - |
-| - | MA ADPCM | YAMAHA ADPCM  | o  | o | - |
-| - | MS ADPCM | Microsoft ADPCM  | o  | o | - |
-| - | OKI ADPCM | OKI ADPCM  | o | o | - |
-| - | ROHM ADPCM | ROHM ADPCM  | o | o | - |
-| - | VOX ADPCM | VOX ADPCM  | o | o | - |
-| - | YAMAHA ADPCM | YAMAHA ADPCM  | o | o | - |
-| - | YM2068 ADPCM | YAMAHA ADPCM  | o | o | - |
-| - | ssrc | resampling | o | - | - |
+| **SPI** |  **Codec** |  **Description** | **IN Status** | **OUT Status** | **SPI Status** | **Comment** |
+|:--------|:-----------|:-----------------|:--------------|:---------------|:---------------|:------------|
+| midi | MFi | Japanese cell phone format |  c | o | o | spi write only |
+| midi | SMAF | YAMAHA cell phone format | c | o | o | spi write only |
+| sampled | MFi | Japanese cell phone format |  x | o | x | |
+| sampled | SMAF | YAMAHA cell phone format | o | o | o | |
+| sampled | CCITT ADPCM | G711, G721, G723 | o | o | x | |
+| - | DVI ADPCM | DVI ADPCM | o  | o | - | |
+| - | IMA ADPCM | IMA ADPCM  | o | o | - | |
+| - | MA ADPCM | YAMAHA ADPCM  | o  | o | - | |
+| - | MS ADPCM | Microsoft ADPCM  | o  | o | - | |
+| - | OKI ADPCM | OKI ADPCM  | o | o | - | |
+| - | ROHM ADPCM | ROHM ADPCM  | o | o | - | |
+| - | VOX ADPCM | VOX ADPCM  | o | o | - | |
+| - | YAMAHA ADPCM | YAMAHA ADPCM  | o | o | - | |
+| - | YM2068 ADPCM | YAMAHA ADPCM  | o | o | - | |
+| sampled | ssrc | resampling | o | - | o | waiting for phase 1, TODO use nio pipe |
 
 ### Legend ###
 

diff --git a/build.xml b/build.xml
@@ -16,16 +16,15 @@
          xmlns:artifact="urn:maven-artifact-ant">
 
   <path id="maven-ant-tasks.classpath">
-    <fileset dir="${user.home}/lib/java/maven-ant-tasks">
-      <include name="*.jar" />
+    <fileset dir="${user.home}/lib/java">
+      <include name="maven-ant-tasks*.jar" />
     </fileset>
   </path>
   <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
            classpathref="maven-ant-tasks.classpath" /> 
 
   <property environment="env"/>
   <property file="local.properties" />
-
   <xmlproperty file="pom.xml" />
 
   <!-- Path Definitions -->
@@ -42,8 +41,10 @@
       <pom refid="maven.project"/>
     </artifact:dependencies>
     <artifact:mvn pom="pom.xml">
-      <arg value="package"/>
-      <arg value="-Dmaven.test.skip=true"/>
+      <arg value="-q" />
+      <arg value="clean" />
+      <arg value="package" />
+      <arg value="-DskipTests=true" />
     </artifact:mvn>
   </target>
 

diff --git a/local.properties.sample b/local.properties.sample
@@ -1,14 +1,3 @@
-#
-# Copyright (c) 2005 by Naohide Sano, All rights reserved.
-#
-# Written by Naohide Sano
-#
-# ant properties for vavi.sound
-#
-# @author	Naohide Sano
-# @version	0.00	030331	nsano	initial version
-#
-
 jvm=${env.JAVA_HOME}/bin/java
 javac.source=src/main/java
 javac.source.test=src/test/java
@@ -18,87 +7,3 @@ javac.dest=target/classes
 javac.dest.test=target/test-classes
 
 findbugs.home=/usr/local/findbugs
-
-#
-# midi
-#
-# @param 
-#
-m2.repos=${user.home}/.m2/repository
-gervill.dir=${user.home}/src/000/gervill
-vavi.sound.midi.dir=../156/tmp
-dir.support1=${user.home}/work/mobaradi-audio
-#vavi.sound.midi.dir=/tmp
-#vavi.sound.midi.dir=${user.home}/Music/1/1
-vavi.sound.midi.sequencer=#Real Time Sequencer
-vavi.sound.midi.synthesizer=com.sun.media.sound.SoftSynthesizer
-vavi.sound.midi.soundbank=${user.home}/lib/audio/sf2/SGM-V2.01.sf2
-
-#
-# analyze
-#
-#vavi.sound.analyze.dir=/tmp/sound/wav2mld/n505
-
-#
-# wave
-#
-vavi.sound.wave.in=tmp/00001.wav
-vavi.sound.wave.out=tmp/xxx.pcm
-
-#
-# play
-#
-vavi.sound.play.model=sh900
-vavi.sound.play.mld_play=tmp/${vavi.sound.play.model}/*.mld
-mld.file=src/test/resources/vavi/sound/mfi/HOTEL\ PACIFIC.mld
-vavi.sound.play.mmf_play=tmp/mmf/*.mmf
-
-#
-# split
-#
-vavi.sound.split.in=file://${user.home}/Movies/battle_of_the_sexes.avi
-vavi.sound.split.audio=.wav
-vavi.sound.split.video=.mov
-
-#
-# dsr
-#
-vavi.sound.dsr.in=file://${user.home}/Movies/[PV]\ wyolica\ -\ red\ song.mpg
-
-#
-# run
-#
-vavi.sound.run.in=tmp/w8.wav
-vavi.sound.run.out=${user.home}/src/vavi/java/test/150/tmp
-vavi.sound.run.length=10
-vavi.sound.run.base=out_%05d.mld
-vavi.sound.run.type=sh900
-vavi.sound.run.null=/dev/null
-
-#
-# smaf
-#
-vavi.sound.smaf.in=tmp/w8.wav
-vavi.sound.smaf.out=${user.home}/src/vavi/java/test/150/tmp
-vavi.sound.smaf.time=15
-vavi.sound.smaf.base=out_%05d.mmf
-#vavi.sound.smaf.null=NUL
-vavi.sound.smaf.null=/dev/null
-vavi.sound.smaf.sampleRate=8000
-
-#
-# vsq
-#
-#vavi.sound.vsq.in=tmp/utahime.vsq
-#vavi.sound.vsq.in=${user.home}/arc/DTM/1/Tunak.vsq
-vavi.sound.vsq.in=${user.home}/arc/DTM/1/MrBlue.vsq
-vavi.sound.vsq.out=tmp/utahime.txt
-
-#
-# midi
-#
-vavi.sound.midi.device=Microsoft MIDI \u30de\u30c3\u30d1\u30fc
-vavi.sound.midi.sequencer=Tritonus Java Sequencer
-vavi.sound.midi.in=../../vavi/apps/midiEditor/sekaini.mid
-
-##
diff --git a/pom.xml b/pom.xml
@@ -11,9 +11,13 @@
   <organization>
     <name></name>
   </organization>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
   <url>https://github.com/umjammer/vavi-sound</url>
-  <description>1.0.3
+  <description>1.0.4
+
+    ssrc spi (wip)
+
+1.0.3
 
     make build pass
 
@@ -23,7 +27,11 @@
 
 1.0.1
 
-    refactor properties related</description>
+    refactor properties related
+
+TODO
+
+    adpcm spi</description>
   <build>
     <plugins>
       <plugin>
@@ -43,7 +51,9 @@
               <goal>native2ascii</goal>
             </goals>
             <configuration>
-              <encoding>Windows-31J</encoding>
+              <includes>
+                <include>**/*_ja.properties</include>
+              </includes>
             </configuration>
           </execution>
         </executions>

diff --git a/src/main/java/vavi/sound/adpcm/AdpcmInputStream.java b/src/main/java/vavi/sound/adpcm/AdpcmInputStream.java
@@ -20,7 +20,7 @@
 /**
  * AdpcmInputStream.
  * 
- * @author <a href="mailto:[email protected]">Naohide Sano</a> (nsano)
+ * @author <a href="mailto:[email protected]">Naohide Sano</a> (nsano)
  * @version 0.00 030714 nsano initial version <br>
  *          0.01 030714 nsano fine tune <br>
  *          0.02 030714 nsano fix available() <br>

diff --git a/src/main/java/vavi/sound/adpcm/AdpcmOutputStream.java b/src/main/java/vavi/sound/adpcm/AdpcmOutputStream.java
@@ -19,7 +19,7 @@
 /**
  * AdpcmOutputStream.
  * 
- * @author <a href="mailto:[email protected]">Naohide Sano</a> (nsano)
+ * @author <a href="mailto:[email protected]">Naohide Sano</a> (nsano)
  * @version 0.00 030827 nsano initial version <br>
  *          0.10 060427 nsano refactoring <br>
  */

diff --git a/src/main/java/vavi/sound/adpcm/Codec.java b/src/main/java/vavi/sound/adpcm/Codec.java
@@ -8,20 +8,20 @@
 
 
 /**
- * Codec. 
+ * Codec.
  *
- * @author <a href="mailto:[email protected]">Naohide Sano</a> (nsano)
+ * @author <a href="mailto:[email protected]">Naohide Sano</a> (nsano)
  * @version 0.00 060427 nsano initial version <br>
  */
 public interface Codec {
     /**
-     * @param pcm 16bit 
+     * @param pcm 16bit
      * @return adpcm 4bit
      */
     int encode(int pcm);
 
     /**
-     * @param adpcm 4bit 
+     * @param adpcm 4bit
      * @return pcm 16bit
      */
     int decode(int adpcm);