Fixed issue #87 so that now SRT subtitles are read live and made local and remote file access consistent and easily extendable.

build.gradle

@@ -91,6 +91,14 @@ sourceSets {
             ]
         }
     }
+
+	test {
+		java {
+			srcDirs = [
+				'src/test/java'
+			]
+		}
+	}
 
 	// Miniclient configuration only specifies the Minimal files and
 	// javac will find and compile all the dependencies based on the
@@ -111,6 +119,8 @@ sourceSets {
 }
 
 dependencies {
+	testCompile 'org.testng:testng:6.1.1'
+
 	compile files(
 		'third_party/UPnPLib/sbbi-upnplib-1.0.3.jar',
 
@@ -124,11 +134,17 @@ dependencies {
 	compile "org.jogamp.gluegen:gluegen-rt-main:$jogampVer"
 
 
-	// Miniclient dependendencies for compiling
+	// Miniclient dependencies for compiling
 	miniclientCompile "org.jogamp.gluegen:gluegen-rt-main:$jogampVer"
 	miniclientCompile "org.jogamp.jogl:jogl-all-main:$jogampVer"
 }
 
+test {
+	useTestNG()
+	reports.html.destination = file("$sageBuildDir/reports/testng")
+	systemProperty 'io_test_file', "$sageBuildDir/delete-io-testng."
+	systemProperty 'nio_test_file', "$sageBuildDir/delete-nio-testng."
+}
 
 /**
  * this is sort of a hack... normally we'd never set the -sourcepath on a java compile
@@ -344,7 +360,7 @@ task (restoreSageConstants) << {
 
 // task dependencies
 compileJava.dependsOn updateBuildNumber
-sageJar.dependsOn cleanSageJar, classes
+sageJar.dependsOn cleanSageJar, classes, test
 miniclientJar.dependsOn clean, miniclientClasses, cleanMiniJar
 linuxMiniClientRelease.dependsOn miniclientJar
 sageJar.finalizedBy restoreSageConstants

java/sage/FastMpeg2Reader.java

@@ -15,11 +15,18 @@
  */
 package sage;
 
-import java.io.*;
+import sage.nio.BufferedFileChannel;
+import sage.nio.LocalFileChannel;
+import sage.nio.RemoteFileChannel;
+import sage.nio.SageFileChannel;
+
+import java.io.EOFException;
+import java.io.File;
+import java.io.IOException;
 
 public final class FastMpeg2Reader
 {
-  private FasterRandomFile ins;
+  private SageFileChannel ins;
   private sage.media.bluray.BluRayStreamer bdp; // for faster access w/out casting
   private TranscodeEngine inxs;
   private File mpegFile;
@@ -292,18 +299,15 @@ public void init(boolean findFirstPTS, boolean findDuration, boolean allowRemuxi
       if (isBluRaySource)
       {
         if (Sage.DBG) System.out.println("MPEG2 pusher detected network BluRay source format...");
-        sage.media.bluray.BluRayNetworkFile bnf = new sage.media.bluray.BluRayNetworkFile(hostname, mpegFile, false, targetBDTitle);
+        sage.media.bluray.BluRayFile bnf = new sage.media.bluray.BluRayFile(hostname, mpegFile, false, targetBDTitle, 131072);
         bdp = bnf;
         ins = bnf;
-        bdp.setBufferSize(131072);
         forceTSSource = true;
         tsPacketSize = 192;
       }
       else
       {
-        NetworkChannelFile nrf = new NetworkChannelFile(hostname, mpegFile, "r", null, false);
-        ins = nrf;
-        nrf.setBufferSize(131072);
+        ins = new BufferedFileChannel(new RemoteFileChannel(hostname, mpegFile), 131072, true);
         // If we already know it's TS then set it that way.
         // This is MUCH more reliable then the TS detection we have below which simply checks the first byte for 0x47
         if (sourceFormat != null)
@@ -375,16 +379,15 @@ else if (streamTranscodeMode != null)
       else if (mpegFile.isDirectory() && sage.media.format.MediaFormat.MPEG2_TS.equals(sourceFormat.getFormatName()))
       {
         if (Sage.DBG) System.out.println("MPEG2 pusher detected BluRay source format...");
-        sage.media.bluray.BluRayRandomFile bnf = new sage.media.bluray.BluRayRandomFile(mpegFile, false, targetBDTitle);
+        sage.media.bluray.BluRayFile bnf = new sage.media.bluray.BluRayFile(mpegFile, false, targetBDTitle, 65536);
         bdp = bnf;
         ins = bnf;
-        bdp.setBufferSize(65536);
         forceTSSource = true;
         tsPacketSize = 192;
       }
       else
       {
-        ins = new BufferedFileChannel(mpegFile, "r", null, false);
+        ins = new sage.nio.BufferedFileChannel(new LocalFileChannel(mpegFile, true), true);
         if (sourceFormat != null && sage.media.format.MediaFormat.VC1.equals(sourceFormat.getPrimaryVideoFormat()))
           vc1RemapMode = true;
         // If we already know it's TS then set it that way.
@@ -747,7 +750,7 @@ public long length()
   {
     try
     {
-      return (ins != null) ? ins.length() : inxs.getVirtualTranscodeSize();
+      return (ins != null) ? ins.size() : inxs.getVirtualTranscodeSize();
     }catch (Exception e){return 0;}
   }
 
@@ -766,7 +769,7 @@ public boolean lengthGreaterThan(long testLength)
 
   public long availableToRead()
   {
-    return Math.max(0, (ins != null) ? (length() - ins.getFilePointer()) : inxs.getAvailableTranscodeBytes());
+    return Math.max(0, (ins != null) ? (length() - ins.position()) : inxs.getAvailableTranscodeBytes());
   }
 
   // This will return a number less than or equal to the argument; it avoids checking the actual file size if it knows
@@ -776,7 +779,7 @@ public long availableToRead2(long numBytes)
     // Minimize the number of calls to length()
     if (ins != null)
     {
-      long currPos = ins.getFilePointer();
+      long currPos = ins.position();
       if (lastCheckSize - currPos >= numBytes)
         return numBytes;
       lastCheckSize = length();
@@ -792,7 +795,7 @@ public boolean availableToRead(long numBytes)
     // Minimize the number of calls to length()
     if (ins != null)
     {
-      long currPos = ins.getFilePointer();
+      long currPos = ins.position();
       if (lastCheckSize - currPos >= numBytes)
         return true;
       lastCheckSize = length();
@@ -802,7 +805,7 @@ public boolean availableToRead(long numBytes)
       return inxs.getAvailableTranscodeBytes() >= numBytes;
   }
 
-  public long getReadPos() { return (ins != null) ? ins.getFilePointer() : inxs.getVirtualReadPosition(); }
+  public long getReadPos() { return (ins != null) ? ins.position() : inxs.getVirtualReadPosition(); }
 
   public boolean canSkipOnNextRead()
   {
@@ -874,7 +877,7 @@ else if (skipRatio > 1.25f && iframeSkipMultiplier4 > 4)
     {
       if (ins != null)
       {
-        ins.seek(currBytePos);
+        ins.position(currBytePos);
       }
       buf.clear().limit(len);
       int rv = read(buf, len);
@@ -913,7 +916,7 @@ else if (skipRatio > 1.25f && iframeSkipMultiplier4 > 4)
       long llen = len;
       while (llen > 0) // try 16k blocks for the CIFS issue
       {
-        llen -= ins.transferTo(dest, llen);
+        llen -= ins.transferTo(llen, dest);
       }
     }
     else
@@ -979,7 +982,7 @@ else if (alignIFrames && lastRawIFramePTS != 0 && lastRawVideoPTS > lastRawIFram
             {
               if (Sage.DBG) System.out.println("BluRay reseek at end of cell w/ not enough left for buffer; skipping to next cell");
               long skipper = bdp.getBytesLeftInClip();
-              ins.skipBytes((int)skipper);
+              ins.skip(skipper);
               bitsDone += 8*skipper;
             }
             buf.clear().limit(len);
@@ -1178,7 +1181,7 @@ else if ((b1 & 0x40) != 0 && (adaptation_field_control == 1 || adaptation_field_
                                     // IDR start code found...good packet :)
                                     waitForIFrame = false;
                                     bytesSkippedForIFrameSync = tsStart;
-                                    ins.seek(lastPAT);
+                                    ins.position(lastPAT);
                                     bitsDone = lastPAT*8;
                                     numReseeksLeft = 0;
                                     forceAnotherCycle = true;
@@ -1198,7 +1201,7 @@ else if (mpeg2Video)
                                   // Found the I Frame
                                   waitForIFrame = false;
                                   bytesSkippedForIFrameSync = tsStart;
-                                  ins.seek(lastPAT);
+                                  ins.position(lastPAT);
                                   bitsDone = lastPAT*8;
                                   numReseeksLeft = 0;
                                   forceAnotherCycle = true;
@@ -1382,7 +1385,7 @@ else if (mpeg2Video)
                                 // Found the I Frame
                                 waitForIFrame = false;
                                 bytesSkippedForIFrameSync = i;
-                                ins.seek(bitsDone/8 + packStart);
+                                ins.position(bitsDone/8 + packStart);
                                 bitsDone += packStart*8;
                                 numReseeksLeft = 0;
                                 forceAnotherCycle = true;
@@ -1643,7 +1646,7 @@ public void seekToBeginning() throws IOException
   {
     if (Sage.DBG) System.out.println("Mpeg2Reader seeking to pos=" + 0);
     if (ins != null)
-      ins.seek(0);
+      ins.position(0);
     else
       inxs.seekToPosition(0);
     bitsDone = 0;
@@ -1701,7 +1704,7 @@ private void seek(long seekTime, int minReadRequired) throws IOException
       if (Sage.DBG) System.out.println("Mpeg2Reader seeking to pos=" + targetPos + " time=" + Sage.durFormatMillis(seekTime));
       if (streamTranscodeMode != null)
         transcodePTSOffset = seekTime*90;
-      ins.seek(targetPos);
+      ins.position(targetPos);
       bitsDone = targetPos*8;
     }
     else
@@ -2473,7 +2476,7 @@ void skipBytes(long numBytes) throws IOException
     numBytes -= numPeeks;
     if (ins != null)
     {
-      ins.seek(ins.getFilePointer() + numBytes);
+      ins.position(ins.position() + numBytes);
     }
     else
       inxs.seekToPosition(inxs.getVirtualReadPosition() + numBytes);

java/sage/FileDownloader.java

@@ -15,6 +15,8 @@
  */
 package sage;
 
+import sage.io.LocalSageFile;
+
 public class FileDownloader extends SystemTask
 {
   private static final int MP4_RESEEK_PREROLL_TIME = 1000;
@@ -239,7 +241,7 @@ public synchronized Object downloadFile(String serverName, String srcFile, java.
           }
           break;
         }
-        fileOut = new FastRandomFile(myDestFile, "rw", Sage.I18N_CHARSET);
+        fileOut = new LocalSageFile(myDestFile, false);
         if (captureMode)
           fileOut.seek(fileOut.length());
         else
@@ -318,7 +320,7 @@ else if (remoteUIXfer)
         outStream.flush();
         str = Sage.readLineBytes(inStream);
         remoteSize = Long.parseLong(str.substring(0, str.indexOf(' ')));
-        fileOut = new FastRandomFile(myDestFile, "rw", Sage.I18N_CHARSET);
+        fileOut = new LocalSageFile(myDestFile, false);
         if (captureMode)
           fileOut.seek(fileOut.length());
         else
@@ -616,11 +618,11 @@ else if (isMP4Stream && lastNotifyReadOffset > downloadedBytes + 256*1024)
                   waitForCircWrite(numRead);
                   synchronized (notifyRead)
                   {
-                    if (fileOut.getFilePointer() + numRead < circSize)
+                    if (fileOut.position() + numRead < circSize)
                       fileOut.write(decryptBuf, 0, numRead);
                     else
                     {
-                      int firstWrite = (int)(circSize - fileOut.getFilePointer());
+                      int firstWrite = (int)(circSize - fileOut.position());
                       fileOut.write(decryptBuf, 0, firstWrite);
                       fileOut.seek(0);
                       fileOut.write(decryptBuf, firstWrite, numRead - firstWrite);
@@ -648,11 +650,11 @@ else if (isMP4Stream && lastNotifyReadOffset > downloadedBytes + 256*1024)
             waitForCircWrite(numRead);
             synchronized (notifyRead)
             {
-              if (fileOut.getFilePointer() + numRead < circSize)
+              if (fileOut.position() + numRead < circSize)
                 fileOut.write(xferBuf, 0, numRead);
               else
               {
-                int firstWrite = (int)(circSize - fileOut.getFilePointer());
+                int firstWrite = (int)(circSize - fileOut.position());
                 fileOut.write(xferBuf, 0, firstWrite);
                 fileOut.seek(0);
                 fileOut.write(xferBuf, firstWrite, numRead - firstWrite);
@@ -1458,11 +1460,11 @@ private void stvTaskRun()
         if (circSize > 0)
         {
           waitForCircWrite(currRead);
-          if (fileOut.getFilePointer() + currRead < circSize)
+          if (fileOut.position() + currRead < circSize)
             fileOut.write(xferBuf, 0, currRead);
           else
           {
-            int firstWrite = (int)(circSize - fileOut.getFilePointer());
+            int firstWrite = (int)(circSize - fileOut.position());
             fileOut.write(xferBuf, 0, firstWrite);
             fileOut.seek(0);
             fileOut.write(xferBuf, firstWrite, currRead - firstWrite);
@@ -1755,7 +1757,7 @@ public DecryptInfo(String algorithm, byte[] key, byte[] iv)
   protected java.net.Socket sock = null;
   protected java.io.DataOutputStream outStream = null;
   protected java.io.DataInputStream inStream = null;
-  protected FastRandomFile fileOut = null;
+  protected sage.io.SageFileSource fileOut = null;
   protected long remoteSize;
   protected boolean isMP4Stream;
 

java/sage/FreetypeFont.java

@@ -15,6 +15,10 @@
  */
 package sage;
 
+import sage.io.BufferedSageFile;
+import sage.io.LocalSageFile;
+import sage.io.SageDataFile;
+
 public class FreetypeFont extends MetaFont
 {
   // Freetype is NOT designed for multi-threading so we need to ensure not more than a single thread goes into the native freetype code at one time
@@ -460,10 +464,10 @@ public SageRenderer.CachedFontGlyphs loadAcceleratedFont(int maxRequiredGlyphCod
     if (cacheFile.isFile())
     {
       // Verify the number of glyph
-      FasterRandomFile cacheIn = null;
+      SageDataFile cacheIn = null;
       try
       {
-        cacheIn = new FasterRandomFile(cacheFile, "r", Sage.I18N_CHARSET);
+        cacheIn = new SageDataFile(new BufferedSageFile(new LocalSageFile(cacheFile, true)), Sage.I18N_CHARSET);
         if(numGlyphs==cacheIn.readInt())
         {
           imageCount=cacheIn.readInt()-1;
@@ -494,7 +498,7 @@ public SageRenderer.CachedFontGlyphs loadAcceleratedFont(int maxRequiredGlyphCod
       catch (Exception e)
       {
         System.out.println("Error reading font cache : " + e);
-        e.printStackTrace();
+        e.printStackTrace(System.out);
       }
       finally
       {
@@ -575,11 +579,11 @@ public SageRenderer.CachedFontGlyphs loadAcceleratedFont(int maxRequiredGlyphCod
     {
       if (Sage.DBG) System.out.println("Saving cache version");
       cacheFile.getParentFile().mkdirs();
-      FasterRandomFile cacheOut = null;
+      SageDataFile cacheOut = null;
       try
       {
         // assumes font name is valid file string
-        cacheOut = new FasterRandomFile(cacheFile, "rw", Sage.I18N_CHARSET);
+        cacheOut = new SageDataFile(new BufferedSageFile(new LocalSageFile(cacheFile, false)), Sage.I18N_CHARSET);
         cacheOut.writeInt(numGlyphs);
         cacheOut.writeInt(imageCount+1);
         int j;