Skip to content

Commit 88ea1f3

Browse files
simoninnssimoninns
authored
Merge pull request #974 from simoninns/toolfix-2025
Course correct some broken tools, fix ld-ldf-reader and other minor fixes
2 parents 8c8c1e3 + f56d0f9 commit 88ea1f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+736
-6068
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
3232
- name: Set up build dir
3333
timeout-minutes: 1
34-
run: mkdir obj && ln -s ../testdata obj/testdata
34+
run: mkdir obj
3535

3636
- name: Configure
3737
timeout-minutes: 5
@@ -75,7 +75,7 @@ jobs:
7575
7676
- name: Set up build dir
7777
timeout-minutes: 1
78-
run: mkdir obj && ln -s ../testdata obj/testdata
78+
run: mkdir obj
7979

8080
- name: Configure
8181
timeout-minutes: 5

‎CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ add_subdirectory(tools/ld-dropout-correct)
113113
add_subdirectory(tools/ld-export-metadata)
114114
add_subdirectory(tools/ld-json-converter)
115115
add_subdirectory(tools/ld-lds-converter)
116-
add_subdirectory(tools/ld-process-ac3)
117-
add_subdirectory(tools/ld-process-efm)
118116
add_subdirectory(tools/ld-process-vbi)
119117
add_subdirectory(tools/ld-process-vits)
120118
add_subdirectory(tools/library)

‎cmake_modules/LdDecodeTests.cmake‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,15 @@ add_test(
124124
--expect-vbi 0,8449774,8449774
125125
${TESTDATA_DIR}/pal/kagemusha-leadout-cbar.ldf
126126
)
127+
128+
add_test(
129+
NAME ldf-reader-full
130+
COMMAND ${SCRIPTS_DIR}/test-ldf-reader
131+
--build ${CMAKE_BINARY_DIR}
132+
--testdata ${TESTDATA_DIR}
133+
--input ggv-ntsc-mb-v2800.ldf
134+
--full-sha256 0984ab9a4e66b49426b61e2d4de266e7783801dc48f566ed805257bc596098ec
135+
--offset 1000000
136+
--partial-bytes 1000000
137+
--partial-sha256 7dae0f342b4b365d5d607676961ca28b39ef78c71b7b0be11f77c303a7ac50f7
138+
)

‎lddecode/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ def _close(self):
497497
def _open(self, sample):
498498
self._close()
499499

500-
command = ["ld-ldf-reader", self.filename, str(sample)]
500+
command = ["ld-ldf-reader", "--quiet", "--start-offset", str(sample), self.filename]
501501

502502
ldfreader = subprocess.Popen(
503503
command, stdout=subprocess.PIPE, stderr=subprocess.PIPE

‎prototypes/README.md‎

Lines changed: 3 additions & 0 deletions

‎prototypes/ld-process-ac3/.gitignore‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Build directories
2+
build/
3+
4+
# CMake generated files
5+
CMakeCache.txt
6+
CMakeFiles/
7+
cmake_install.cmake
8+
CTestTestfile.cmake
9+
Makefile
10+
11+
# Build artifacts
12+
*.o
13+
*.a
14+
*.so
15+
*.dylib
16+
*.exe

tools/ld-process-ac3/CMakeLists.txt renamed to prototypes/ld-process-ac3/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
cmake_minimum_required(VERSION 3.16)
2+
3+
project(ld-process-ac3)
4+
15
if(MSVC)
26
find_package(Getopt REQUIRED)
37
endif()

tools/ld-process-ac3/LICENSE renamed to prototypes/ld-process-ac3/LICENSE

File renamed without changes.

‎prototypes/ld-process-ac3/README.md‎

Lines changed: 44 additions & 0 deletions

tools/ld-process-ac3/decode/AC3Framer.hpp renamed to prototypes/ld-process-ac3/decode/AC3Framer.hpp

File renamed without changes.

0 commit comments

Comments
 (0)