v1.06 (beta) rev4156 (19 Feb 2022)

- Support for videos in game "N Gauge Unten Kibun Game: Gatan Goton"
- Support for videos in more Electronic Arts games
  (Github issue #40 "Andretti Racing - Sector scanning fails with error message"
   by BloodRaynare)
- More accurate FPS detection, but indexing is slower, sometimes SIGNIFICANTLY slower
- Slightly improved video encoder quality and accuracy
- Command-line option "-a audio" now defaults to skipping audio associated
  with videos, and added additional option "-vidaud" to include all audio
  (see manual for details)
  (Github issue #42 "No Commandline Argument for skipping audio from video files"
   by Meerkov)
- A lot of bug fixes and improved error handling
Known issues
- Translations not updated since v1.00

jpsxdec/PSXListOFGames.txt

@@ -7305,7 +7305,7 @@ Status
 [ ]  SLPS-02507  Next Tetris, The - Deluxe DLX
 [ ]  SLPS-02701  Next Tetris, The [BPS The Choice]
 [ ]  SLPS-00221  NFL Quarterback Club '97
-[ ]  SLPM-86217  N-Gauge Unten Kibun Game - Gatan Goton
+[+]  SLPM-86217  N-Gauge Unten Kibun Game - Gatan Goton
 [ ]  SLPM-86766  N-Gauge Unten Kibun Game - Gatan Goton [MajorWave 1500 Series]
 [ ]  SLPS-00861  NHL '97
 [ ]  SLPM-86193  NHL Blades of Steel 2000

jpsxdec/TODO.txt

@@ -73,7 +73,7 @@ Improvements
 
 # Java 6 Console #
     _Background_
-Java <= 5 only had stdout PrintStream, which does not allow choosing the text 
+Java <= 5 only had stdout PrintStream, which does not allow choosing the text
 encoder (for non-English languages)
     _Suggested solution_
 Use Java 6 Console to use proper encoding when printing to the console.
@@ -237,14 +237,11 @@ Create my own smaller/simpler arg parser
     (some work is already done in jpsxdec.util.ArgParser)
 
 General code stuff
-    * Add unit tests to build.xml
-        * Create unit test subproject?
     * Clean up all the TODOs
     * Proper handling for InterruptedException
     * Cleanup IllegalArgumentException and IllegalStateExceptions
     * Findbug fixes
     * Replace package.html with package-info.java
-    Add @Override all the things
 
 Replace "presentation sector" with just "presentation time"
     Presentation sector made sense when it was just sector based videos

jpsxdec/build.xml

@@ -9,7 +9,7 @@
 
     <!-- ====== global build properties ====== -->
 
-    <property name="jpsxdec.ver" value="v1-05-beta"/>
+    <property name="jpsxdec.ver" value="v1-06-beta"/>
 
     <!-- sources -->
     <property name="src.dir.rel"      location="src"      relative="true"/>
@@ -27,7 +27,10 @@
     <property name="jpsxdec.manual" value="jPSXdec-manual.odt" />
     <property name="jpsxdec.manual.pdf" value="jPSXdec-manual.pdf" />
 
-    <property name="resource.include.glob" value="**/*.dat,**/*.properties,**/*.png,**/*.gif" />
+    <property 
+        name="resource.exclude.glob" 
+        value="**/*.java,**/*.form,**/package.html,src/jpsxdec/util/aviwriter/aviformat.txt" 
+    />
 
     <fileset dir="." id="release.include.files">
         <include name="${doc.dir.rel}/*" />
@@ -81,7 +84,7 @@
 
         <!-- Copy over resources -->
         <copy todir="${build-lgpl.dir}" verbose="true">
-            <fileset dir="${src-lgpl.dir}" includes="${resource.include.glob}" />
+            <fileset dir="${src-lgpl.dir}" excludes="${resource.exclude.glob}" />
         </copy>
     </target>
 
@@ -114,7 +117,7 @@
 
         <!-- Copy over resources -->
         <copy todir="${build.dir}" verbose="true">
-            <fileset dir="${src.dir}" includes="${resource.include.glob}" />
+            <fileset dir="${src.dir}" excludes="${resource.exclude.glob}" />
         </copy>
     </target>
 

jpsxdec/doc/CHANGES.txt

@@ -1,3 +1,18 @@
+v1.06 (beta) rev4156 (19 Feb 2022)
+    - Support for videos in game "N Gauge Unten Kibun Game: Gatan Goton"
+    - Support for videos in more Electronic Arts games
+      (Github issue #40 "Andretti Racing - Sector scanning fails with error message"
+       by BloodRaynare)
+    - More accurate FPS detection, but indexing is slower, sometimes SIGNIFICANTLY slower
+    - Slightly improved video encoder quality and accuracy
+    - Command-line option "-a audio" now defaults to skipping audio associated
+      with videos, and added additional option "-vidaud" to include all audio
+      (see manual for details)
+      (Github issue #42 "No Commandline Argument for skipping audio from video files"
+       by Meerkov)
+    - A lot of bug fixes and improved error handling
+    Known issues
+    - Translations not updated since v1.00
 v1.05 (beta) rev4052 (14 Mar 2021)
     - Support for Panekit - Infinitive Crafting Toy Case videos
     - Support for Star Wars - Rebel Assault II - The Hidden Empire videos

jpsxdec/doc/CREDITS.txt

@@ -78,7 +78,7 @@ The countless people who created so many open source tools that I've used
 in this project, and in my every day life. It is a huge list.
 
 ................................................................................
-Thanks to those who wrote code that I've used or referenced at some point 
+Thanks to those who wrote code that I've used or referenced at some point
 during development:
 
 Alexander Strange for porting the ffmpeg simple_idct to Java.

jpsxdec/doc/LICENSE.txt

@@ -1,6 +1,6 @@
 
 jPSXdec: PlayStation 1 Media Decoder/Converter in Java
-Copyright (C) 2007-2021  Michael Sabin
+Copyright (C) 2007-2022  Michael Sabin
 All rights reserved.
 
 jPSXdec is licensed as a whole under this non-commercial license:

jpsxdec/doc/lgpl-2.1.txt

@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -111,7 +111,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
+
 		  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -158,7 +158,7 @@ Library.
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
            How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest

jpsxdec/src/jpsxdec/LogToConsole.properties

@@ -3,4 +3,4 @@ handlers=java.util.logging.ConsoleHandler
 java.util.logging.ConsoleHandler.formatter=jpsxdec.i18n.log.DebugFormatter
 java.util.logging.ConsoleHandler.level=ALL
 
-#jpsxdec.level=ALL
+#jpsxdec.level=ALL

jpsxdec/src/jpsxdec/LogToFile.properties

@@ -7,4 +7,4 @@ java.util.logging.FileHandler.formatter=jpsxdec.i18n.log.DebugFormatter
 java.util.logging.FileHandler.count=1
 java.util.logging.FileHandler.level=ALL
 
-jpsxdec.level=INFO
+jpsxdec.level=INFO

jpsxdec/src/jpsxdec/Main.java

@@ -37,11 +37,10 @@
 
 package jpsxdec;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.logging.Level;
+import java.util.logging.LogManager;
 import java.util.logging.Logger;
 import javax.annotation.Nonnull;
 import jpsxdec.cmdline.CommandLine;
@@ -54,36 +53,16 @@ public class Main {
     private static final Logger LOG = Logger.getLogger(Main.class.getName());
 
 
-    private static boolean loadLoggerConfigFromSystemProperty() {
+    /** @see LogManager */
+    private static boolean isLoggerConfiguredFromProperty() {
         String sLogConfigFile = System.getProperty("java.util.logging.config.file");
-        if (sLogConfigFile == null)
-            return false;
+        if (sLogConfigFile != null)
+            return true;
+        String sLogConfigClass = System.getProperty("java.util.logging.config.class");
+        if (sLogConfigClass != null)
+            return true;
 
-        FileInputStream fis;
-        try {
-            fis = new FileInputStream(sLogConfigFile);
-        } catch (FileNotFoundException ex) {
-            ex.printStackTrace();
-            return false;
-        }
-
-        boolean blnSuccess = false;
-
-        try {
-            java.util.logging.LogManager.getLogManager().readConfiguration(fis);
-            blnSuccess = true;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            blnSuccess = false;
-        } finally {
-            try {
-                fis.close();
-            } catch (IOException ex1) {
-                ex1.printStackTrace();
-                blnSuccess = false;
-            }
-        }
-        return blnSuccess;
+        return false;
     }
 
     public static void loadDefaultLogger() {
@@ -107,7 +86,7 @@ public static void loadLoggerConfigResource(@Nonnull Class<?> referenceClass,
 
     /** Main entry point to the jPSXdec program. */
     public static void main(final String[] asArgs) {
-        if (!loadLoggerConfigFromSystemProperty())
+        if (!isLoggerConfiguredFromProperty())
             loadDefaultLogger();
 
         ArgParser ap = new ArgParser(asArgs);

jpsxdec/src/jpsxdec/Version.java

@@ -39,7 +39,7 @@
 
 public class Version {
 
-    public final static String Version = "1.05 (beta)";
+    public final static String Version = "1.06 (beta)";
     public final static String IndexHeader = "[jPSXdec v"+Version+"]";
 
 }