vtskit 0.3.0__tar.gz → 0.3.1__tar.gz

{vtskit-0.3.0/vtskit.egg-info → vtskit-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vtskit
-Version: 0.3.0
+Version: 0.3.1
 Summary: DVD-Video titlesets in pure Python: VOBs, navigation packs and IFO files
 Author: kajisho5
 License-Expression: LGPL-3.0-or-later
@@ -184,7 +184,8 @@ The tests give the same titles to dvdauthor and to vtskit, and the IFO and
 the VOBs must be the same byte for byte: NTSC and PAL, 4:3 and 16:9,
 chapters on and between VOBU starts, two titles in a titleset, AC-3, LPCM
 and MPEG sound with languages, B-pictures, short GOPs, a 40-second title,
-a subtitle track, two titlesets; every command form is the bytes dvdauthor
+a subtitle track, two titlesets and three (whose attributes take the VMG
+a second sector); every command form is the bytes dvdauthor
 compiles for the same statement, and a disc described in its language
 (menus of commands alone, buttons of several commands, cell commands, two
 titlesets) comes out with the same IFOs; for menus, the highlight

{vtskit-0.3.0 → vtskit-0.3.1}/README.md

@@ -167,7 +167,8 @@ The tests give the same titles to dvdauthor and to vtskit, and the IFO and
 the VOBs must be the same byte for byte: NTSC and PAL, 4:3 and 16:9,
 chapters on and between VOBU starts, two titles in a titleset, AC-3, LPCM
 and MPEG sound with languages, B-pictures, short GOPs, a 40-second title,
-a subtitle track, two titlesets; every command form is the bytes dvdauthor
+a subtitle track, two titlesets and three (whose attributes take the VMG
+a second sector); every command form is the bytes dvdauthor
 compiles for the same statement, and a disc described in its language
 (menus of commands alone, buttons of several commands, cell commands, two
 titlesets) comes out with the same IFOs; for menus, the highlight

{vtskit-0.3.0 → vtskit-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vtskit"
-version = "0.3.0"
+version = "0.3.1"
 description = "DVD-Video titlesets in pure Python: VOBs, navigation packs and IFO files"
 readme = "README.md"
 license = "LGPL-3.0-or-later"

{vtskit-0.3.0 → vtskit-0.3.1}/tests/test_vmg.py

@@ -105,6 +105,23 @@ class TestAgainstDvdauthor(unittest.TestCase):
         self.assertEqual([c[:3] for c in ifo.chapters(ifo.read_folder(mine))],
                          [(1, 1, 1), (1, 1, 2), (2, 1, 1)])
 
+    def test_three_titlesets(self):
+        # VTS_ATRT holds 776 bytes a titleset: three no longer fit in a
+        # sector, and the table goes on into the next (as dvdauthor writes it)
+        paths = [os.path.join(self.tmp, f"{n}.mpg") for n in "abc"]
+        for p in paths:
+            encode(p, seconds=2)
+        theirs, mine = self.same("ntsc", [[Title(p, audio=(Audio("en", 2),))] for p in paths])
+        d = read(os.path.join(mine, "VIDEO_TS.IFO"))
+        tt_srpt, atrt = struct.unpack_from(">I", d, 0xC4)[0], struct.unpack_from(">I", d, 0xD0)[0]
+        self.assertEqual(struct.unpack_from(">H", d, atrt * 2048)[0], 3)
+        self.assertGreater(struct.unpack_from(">I", d, atrt * 2048 + 4)[0], 2048)
+        self.assertEqual([c[:3] for c in ifo.chapters(ifo.read_folder(mine))],
+                         [(1, 1, 1), (2, 1, 1), (3, 1, 1)])
+        if LIBDVDNAV:
+            with dvdnav_sim.DvdSim(mine, LIBDVDNAV) as nav:
+                self.assertEqual(nav.num_titles(), 3)
+
     @unittest.skipUnless(LIBDVDNAV, "needs libdvdnav")
     def test_libdvdnav_plays_a_whole_disc(self):
         # a VIDEO_TS written by vtskit alone: two titlesets, three titles;

{vtskit-0.3.0 → vtskit-0.3.1}/vtskit/__init__.py

@@ -21,5 +21,5 @@ subtitles and angles, and dvdauthor's command language:
 
 from .errors import VtsError
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 __all__ = ["VtsError"]

{vtskit-0.3.0 → vtskit-0.3.1}/vtskit/vmg.py

@@ -7,8 +7,9 @@ it, TT_SRPT (every title of the disc: its titleset, number there, chapters,
 angles, and where the titleset starts on the disc), VTS_ATRT (a copy of
 each titleset's stream attributes) and, with menus, VMGM_PGCI_UT (one
 language unit), VMGM_C_ADT and VMGM_VOBU_ADMAP. The parental masks and
-the text data are absent. Each table starts at a sector; the BUP is the
-IFO again.
+the text data are absent. Each table starts at a sector and takes as many
+as it needs (VTS_ATRT two from three titlesets on); the BUP is the IFO
+again.
 
 From dvdauthor's output: the VMG takes its IFO, its menu VOB and its BUP
 on the disc, 32 sectors at least, and the first titleset starts right
@@ -92,7 +93,12 @@ def write(folder, titlesets, menus=(), first_play=None, language="en", provider=
     for name, t in order:
         if t is not None:
             ifo_sectors += len(_pad(t)) // SECTOR
-    ifo_sectors += 2         # TT_SRPT and VTS_ATRT below, a sector each (checked)
+    # TT_SRPT and VTS_ATRT, written below once the titlesets' places are
+    # known: 12 bytes a title, and 4 + 8 + 0x300 bytes a titleset (from
+    # three titlesets on, the attributes take a second sector)
+    titles = sum(len(ts.titles) for ts in titlesets)
+    ifo_sectors += -(-(8 + 12 * titles) // SECTOR)
+    ifo_sectors += -(-(8 + (4 + 8 + 0x300) * len(titlesets)) // SECTOR)
     vmg_sectors = max(2 * ifo_sectors + menu_sectors, VMG_SECTORS)
 
     # TT_SRPT: the titles of the disc
@@ -131,7 +137,7 @@ def write(folder, titlesets, menus=(), first_play=None, language="en", provider=
         pointers[name] = sectors
         sectors += len(tables[name]) // SECTOR
     if sectors != ifo_sectors:
-        raise VtsError("the title table or the attributes outgrew a sector")   # (99 titles fit)
+        raise VtsError("the title table or the attributes are not the size counted")
     mat = bytearray(head)
     mat[:12] = b"DVDVIDEO-VMG"
     struct.pack_into(">I", mat, 0x0C, vmg_sectors - 1)

{vtskit-0.3.0 → vtskit-0.3.1/vtskit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vtskit
-Version: 0.3.0
+Version: 0.3.1
 Summary: DVD-Video titlesets in pure Python: VOBs, navigation packs and IFO files
 Author: kajisho5
 License-Expression: LGPL-3.0-or-later
@@ -184,7 +184,8 @@ The tests give the same titles to dvdauthor and to vtskit, and the IFO and
 the VOBs must be the same byte for byte: NTSC and PAL, 4:3 and 16:9,
 chapters on and between VOBU starts, two titles in a titleset, AC-3, LPCM
 and MPEG sound with languages, B-pictures, short GOPs, a 40-second title,
-a subtitle track, two titlesets; every command form is the bytes dvdauthor
+a subtitle track, two titlesets and three (whose attributes take the VMG
+a second sector); every command form is the bytes dvdauthor
 compiles for the same statement, and a disc described in its language
 (menus of commands alone, buttons of several commands, cell commands, two
 titlesets) comes out with the same IFOs; for menus, the highlight