├── .github └── workflows │ └── build.yml ├── .gitignore ├── LICENSE ├── Makefile ├── README.md ├── cmd.hpp ├── main.cpp ├── pgs.hpp └── sup-parser.ksy /.github/workflows/build.yml: -------------------------------------------------------------------------------- 1 | name: Build 2 | 3 | on: 4 | push: 5 | branches: '*' 6 | pull_request: 7 | branches: '*' 8 | 9 | jobs: 10 | build-ubuntu: 11 | runs-on: ubuntu-latest 12 | 13 | steps: 14 | - name: Checkout 15 | uses: actions/checkout@v4 16 | - name: Install dependencies 17 | run: sudo apt-get install -y make g++ 18 | - name: Compile 19 | run: make 20 | - name: Strip binary 21 | run: strip supmover 22 | - uses: actions/upload-artifact@v4 23 | with: 24 | name: supmover-linux 25 | path: supmover 26 | 27 | build-macos: 28 | runs-on: macos-latest 29 | 30 | steps: 31 | - name: Checkout 32 | uses: actions/checkout@v4 33 | - name: Compile 34 | run: make 35 | - name: Strip binary 36 | run: strip supmover 37 | - uses: actions/upload-artifact@v4 38 | with: 39 | name: supmover-macos 40 | path: supmover 41 | 42 | build-windows: 43 | runs-on: windows-2022 44 | 45 | steps: 46 | - name: Checkout 47 | uses: actions/checkout@v4 48 | - name: Compile 49 | shell: cmd 50 | run: ${{ '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" && cl /nologo /O2 /Oi /Gy /GS /GL /fp:precise /EHsc /MD /Zc:inline /TP /analyze- /permissive- /Fesupmover.exe main.cpp' }} 51 | - uses: actions/upload-artifact@v4 52 | with: 53 | name: supmover.exe 54 | path: supmover.exe 55 | -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- 1 | bin/ 2 | obj/ 3 | SupMover.depend 4 | SupMover.cbp 5 | SupMover.layout 6 | 7 | supmover 8 | main.o 9 | -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- 1 | GNU AFFERO GENERAL PUBLIC LICENSE 2 | Version 3, 19 November 2007 3 | 4 | Copyright (C) 2007 Free Software Foundation, Inc. 5 | Everyone is permitted to copy and distribute verbatim copies 6 | of this license document, but changing it is not allowed. 7 | 8 | Preamble 9 | 10 | The GNU Affero General Public License is a free, copyleft license for 11 | software and other kinds of works, specifically designed to ensure 12 | cooperation with the community in the case of network server software. 13 | 14 | The licenses for most software and other practical works are designed 15 | to take away your freedom to share and change the works. By contrast, 16 | our General Public Licenses are intended to guarantee your freedom to 17 | share and change all versions of a program--to make sure it remains free 18 | software for all its users. 19 | 20 | When we speak of free software, we are referring to freedom, not 21 | price. Our General Public Licenses are designed to make sure that you 22 | have the freedom to distribute copies of free software (and charge for 23 | them if you wish), that you receive source code or can get it if you 24 | want it, that you can change the software or use pieces of it in new 25 | free programs, and that you know you can do these things. 26 | 27 | Developers that use our General Public Licenses protect your rights 28 | with two steps: (1) assert copyright on the software, and (2) offer 29 | you this License which gives you legal permission to copy, distribute 30 | and/or modify the software. 31 | 32 | A secondary benefit of defending all users' freedom is that 33 | improvements made in alternate versions of the program, if they 34 | receive widespread use, become available for other developers to 35 | incorporate. Many developers of free software are heartened and 36 | encouraged by the resulting cooperation. However, in the case of 37 | software used on network servers, this result may fail to come about. 38 | The GNU General Public License permits making a modified version and 39 | letting the public access it on a server without ever releasing its 40 | source code to the public. 41 | 42 | The GNU Affero General Public License is designed specifically to 43 | ensure that, in such cases, the modified source code becomes available 44 | to the community. It requires the operator of a network server to 45 | provide the source code of the modified version running there to the 46 | users of that server. Therefore, public use of a modified version, on 47 | a publicly accessible server, gives the public access to the source 48 | code of the modified version. 49 | 50 | An older license, called the Affero General Public License and 51 | published by Affero, was designed to accomplish similar goals. This is 52 | a different license, not a version of the Affero GPL, but Affero has 53 | released a new version of the Affero GPL which permits relicensing under 54 | this license. 55 | 56 | The precise terms and conditions for copying, distribution and 57 | modification follow. 58 | 59 | TERMS AND CONDITIONS 60 | 61 | 0. Definitions. 62 | 63 | "This License" refers to version 3 of the GNU Affero General Public License. 64 | 65 | "Copyright" also means copyright-like laws that apply to other kinds of 66 | works, such as semiconductor masks. 67 | 68 | "The Program" refers to any copyrightable work licensed under this 69 | License. Each licensee is addressed as "you". "Licensees" and 70 | "recipients" may be individuals or organizations. 71 | 72 | To "modify" a work means to copy from or adapt all or part of the work 73 | in a fashion requiring copyright permission, other than the making of an 74 | exact copy. The resulting work is called a "modified version" of the 75 | earlier work or a work "based on" the earlier work. 76 | 77 | A "covered work" means either the unmodified Program or a work based 78 | on the Program. 79 | 80 | To "propagate" a work means to do anything with it that, without 81 | permission, would make you directly or secondarily liable for 82 | infringement under applicable copyright law, except executing it on a 83 | computer or modifying a private copy. Propagation includes copying, 84 | distribution (with or without modification), making available to the 85 | public, and in some countries other activities as well. 86 | 87 | To "convey" a work means any kind of propagation that enables other 88 | parties to make or receive copies. Mere interaction with a user through 89 | a computer network, with no transfer of a copy, is not conveying. 90 | 91 | An interactive user interface displays "Appropriate Legal Notices" 92 | to the extent that it includes a convenient and prominently visible 93 | feature that (1) displays an appropriate copyright notice, and (2) 94 | tells the user that there is no warranty for the work (except to the 95 | extent that warranties are provided), that licensees may convey the 96 | work under this License, and how to view a copy of this License. If 97 | the interface presents a list of user commands or options, such as a 98 | menu, a prominent item in the list meets this criterion. 99 | 100 | 1. Source Code. 101 | 102 | The "source code" for a work means the preferred form of the work 103 | for making modifications to it. "Object code" means any non-source 104 | form of a work. 105 | 106 | A "Standard Interface" means an interface that either is an official 107 | standard defined by a recognized standards body, or, in the case of 108 | interfaces specified for a particular programming language, one that 109 | is widely used among developers working in that language. 110 | 111 | The "System Libraries" of an executable work include anything, other 112 | than the work as a whole, that (a) is included in the normal form of 113 | packaging a Major Component, but which is not part of that Major 114 | Component, and (b) serves only to enable use of the work with that 115 | Major Component, or to implement a Standard Interface for which an 116 | implementation is available to the public in source code form. A 117 | "Major Component", in this context, means a major essential component 118 | (kernel, window system, and so on) of the specific operating system 119 | (if any) on which the executable work runs, or a compiler used to 120 | produce the work, or an object code interpreter used to run it. 121 | 122 | The "Corresponding Source" for a work in object code form means all 123 | the source code needed to generate, install, and (for an executable 124 | work) run the object code and to modify the work, including scripts to 125 | control those activities. However, it does not include the work's 126 | System Libraries, or general-purpose tools or generally available free 127 | programs which are used unmodified in performing those activities but 128 | which are not part of the work. For example, Corresponding Source 129 | includes interface definition files associated with source files for 130 | the work, and the source code for shared libraries and dynamically 131 | linked subprograms that the work is specifically designed to require, 132 | such as by intimate data communication or control flow between those 133 | subprograms and other parts of the work. 134 | 135 | The Corresponding Source need not include anything that users 136 | can regenerate automatically from other parts of the Corresponding 137 | Source. 138 | 139 | The Corresponding Source for a work in source code form is that 140 | same work. 141 | 142 | 2. Basic Permissions. 143 | 144 | All rights granted under this License are granted for the term of 145 | copyright on the Program, and are irrevocable provided the stated 146 | conditions are met. This License explicitly affirms your unlimited 147 | permission to run the unmodified Program. The output from running a 148 | covered work is covered by this License only if the output, given its 149 | content, constitutes a covered work. This License acknowledges your 150 | rights of fair use or other equivalent, as provided by copyright law. 151 | 152 | You may make, run and propagate covered works that you do not 153 | convey, without conditions so long as your license otherwise remains 154 | in force. You may convey covered works to others for the sole purpose 155 | of having them make modifications exclusively for you, or provide you 156 | with facilities for running those works, provided that you comply with 157 | the terms of this License in conveying all material for which you do 158 | not control copyright. Those thus making or running the covered works 159 | for you must do so exclusively on your behalf, under your direction 160 | and control, on terms that prohibit them from making any copies of 161 | your copyrighted material outside their relationship with you. 162 | 163 | Conveying under any other circumstances is permitted solely under 164 | the conditions stated below. Sublicensing is not allowed; section 10 165 | makes it unnecessary. 166 | 167 | 3. Protecting Users' Legal Rights From Anti-Circumvention Law. 168 | 169 | No covered work shall be deemed part of an effective technological 170 | measure under any applicable law fulfilling obligations under article 171 | 11 of the WIPO copyright treaty adopted on 20 December 1996, or 172 | similar laws prohibiting or restricting circumvention of such 173 | measures. 174 | 175 | When you convey a covered work, you waive any legal power to forbid 176 | circumvention of technological measures to the extent such circumvention 177 | is effected by exercising rights under this License with respect to 178 | the covered work, and you disclaim any intention to limit operation or 179 | modification of the work as a means of enforcing, against the work's 180 | users, your or third parties' legal rights to forbid circumvention of 181 | technological measures. 182 | 183 | 4. Conveying Verbatim Copies. 184 | 185 | You may convey verbatim copies of the Program's source code as you 186 | receive it, in any medium, provided that you conspicuously and 187 | appropriately publish on each copy an appropriate copyright notice; 188 | keep intact all notices stating that this License and any 189 | non-permissive terms added in accord with section 7 apply to the code; 190 | keep intact all notices of the absence of any warranty; and give all 191 | recipients a copy of this License along with the Program. 192 | 193 | You may charge any price or no price for each copy that you convey, 194 | and you may offer support or warranty protection for a fee. 195 | 196 | 5. Conveying Modified Source Versions. 197 | 198 | You may convey a work based on the Program, or the modifications to 199 | produce it from the Program, in the form of source code under the 200 | terms of section 4, provided that you also meet all of these conditions: 201 | 202 | a) The work must carry prominent notices stating that you modified 203 | it, and giving a relevant date. 204 | 205 | b) The work must carry prominent notices stating that it is 206 | released under this License and any conditions added under section 207 | 7. This requirement modifies the requirement in section 4 to 208 | "keep intact all notices". 209 | 210 | c) You must license the entire work, as a whole, under this 211 | License to anyone who comes into possession of a copy. This 212 | License will therefore apply, along with any applicable section 7 213 | additional terms, to the whole of the work, and all its parts, 214 | regardless of how they are packaged. This License gives no 215 | permission to license the work in any other way, but it does not 216 | invalidate such permission if you have separately received it. 217 | 218 | d) If the work has interactive user interfaces, each must display 219 | Appropriate Legal Notices; however, if the Program has interactive 220 | interfaces that do not display Appropriate Legal Notices, your 221 | work need not make them do so. 222 | 223 | A compilation of a covered work with other separate and independent 224 | works, which are not by their nature extensions of the covered work, 225 | and which are not combined with it such as to form a larger program, 226 | in or on a volume of a storage or distribution medium, is called an 227 | "aggregate" if the compilation and its resulting copyright are not 228 | used to limit the access or legal rights of the compilation's users 229 | beyond what the individual works permit. Inclusion of a covered work 230 | in an aggregate does not cause this License to apply to the other 231 | parts of the aggregate. 232 | 233 | 6. Conveying Non-Source Forms. 234 | 235 | You may convey a covered work in object code form under the terms 236 | of sections 4 and 5, provided that you also convey the 237 | machine-readable Corresponding Source under the terms of this License, 238 | in one of these ways: 239 | 240 | a) Convey the object code in, or embodied in, a physical product 241 | (including a physical distribution medium), accompanied by the 242 | Corresponding Source fixed on a durable physical medium 243 | customarily used for software interchange. 244 | 245 | b) Convey the object code in, or embodied in, a physical product 246 | (including a physical distribution medium), accompanied by a 247 | written offer, valid for at least three years and valid for as 248 | long as you offer spare parts or customer support for that product 249 | model, to give anyone who possesses the object code either (1) a 250 | copy of the Corresponding Source for all the software in the 251 | product that is covered by this License, on a durable physical 252 | medium customarily used for software interchange, for a price no 253 | more than your reasonable cost of physically performing this 254 | conveying of source, or (2) access to copy the 255 | Corresponding Source from a network server at no charge. 256 | 257 | c) Convey individual copies of the object code with a copy of the 258 | written offer to provide the Corresponding Source. This 259 | alternative is allowed only occasionally and noncommercially, and 260 | only if you received the object code with such an offer, in accord 261 | with subsection 6b. 262 | 263 | d) Convey the object code by offering access from a designated 264 | place (gratis or for a charge), and offer equivalent access to the 265 | Corresponding Source in the same way through the same place at no 266 | further charge. You need not require recipients to copy the 267 | Corresponding Source along with the object code. If the place to 268 | copy the object code is a network server, the Corresponding Source 269 | may be on a different server (operated by you or a third party) 270 | that supports equivalent copying facilities, provided you maintain 271 | clear directions next to the object code saying where to find the 272 | Corresponding Source. Regardless of what server hosts the 273 | Corresponding Source, you remain obligated to ensure that it is 274 | available for as long as needed to satisfy these requirements. 275 | 276 | e) Convey the object code using peer-to-peer transmission, provided 277 | you inform other peers where the object code and Corresponding 278 | Source of the work are being offered to the general public at no 279 | charge under subsection 6d. 280 | 281 | A separable portion of the object code, whose source code is excluded 282 | from the Corresponding Source as a System Library, need not be 283 | included in conveying the object code work. 284 | 285 | A "User Product" is either (1) a "consumer product", which means any 286 | tangible personal property which is normally used for personal, family, 287 | or household purposes, or (2) anything designed or sold for incorporation 288 | into a dwelling. In determining whether a product is a consumer product, 289 | doubtful cases shall be resolved in favor of coverage. For a particular 290 | product received by a particular user, "normally used" refers to a 291 | typical or common use of that class of product, regardless of the status 292 | of the particular user or of the way in which the particular user 293 | actually uses, or expects or is expected to use, the product. A product 294 | is a consumer product regardless of whether the product has substantial 295 | commercial, industrial or non-consumer uses, unless such uses represent 296 | the only significant mode of use of the product. 297 | 298 | "Installation Information" for a User Product means any methods, 299 | procedures, authorization keys, or other information required to install 300 | and execute modified versions of a covered work in that User Product from 301 | a modified version of its Corresponding Source. The information must 302 | suffice to ensure that the continued functioning of the modified object 303 | code is in no case prevented or interfered with solely because 304 | modification has been made. 305 | 306 | If you convey an object code work under this section in, or with, or 307 | specifically for use in, a User Product, and the conveying occurs as 308 | part of a transaction in which the right of possession and use of the 309 | User Product is transferred to the recipient in perpetuity or for a 310 | fixed term (regardless of how the transaction is characterized), the 311 | Corresponding Source conveyed under this section must be accompanied 312 | by the Installation Information. But this requirement does not apply 313 | if neither you nor any third party retains the ability to install 314 | modified object code on the User Product (for example, the work has 315 | been installed in ROM). 316 | 317 | The requirement to provide Installation Information does not include a 318 | requirement to continue to provide support service, warranty, or updates 319 | for a work that has been modified or installed by the recipient, or for 320 | the User Product in which it has been modified or installed. Access to a 321 | network may be denied when the modification itself materially and 322 | adversely affects the operation of the network or violates the rules and 323 | protocols for communication across the network. 324 | 325 | Corresponding Source conveyed, and Installation Information provided, 326 | in accord with this section must be in a format that is publicly 327 | documented (and with an implementation available to the public in 328 | source code form), and must require no special password or key for 329 | unpacking, reading or copying. 330 | 331 | 7. Additional Terms. 332 | 333 | "Additional permissions" are terms that supplement the terms of this 334 | License by making exceptions from one or more of its conditions. 335 | Additional permissions that are applicable to the entire Program shall 336 | be treated as though they were included in this License, to the extent 337 | that they are valid under applicable law. If additional permissions 338 | apply only to part of the Program, that part may be used separately 339 | under those permissions, but the entire Program remains governed by 340 | this License without regard to the additional permissions. 341 | 342 | When you convey a copy of a covered work, you may at your option 343 | remove any additional permissions from that copy, or from any part of 344 | it. (Additional permissions may be written to require their own 345 | removal in certain cases when you modify the work.) You may place 346 | additional permissions on material, added by you to a covered work, 347 | for which you have or can give appropriate copyright permission. 348 | 349 | Notwithstanding any other provision of this License, for material you 350 | add to a covered work, you may (if authorized by the copyright holders of 351 | that material) supplement the terms of this License with terms: 352 | 353 | a) Disclaiming warranty or limiting liability differently from the 354 | terms of sections 15 and 16 of this License; or 355 | 356 | b) Requiring preservation of specified reasonable legal notices or 357 | author attributions in that material or in the Appropriate Legal 358 | Notices displayed by works containing it; or 359 | 360 | c) Prohibiting misrepresentation of the origin of that material, or 361 | requiring that modified versions of such material be marked in 362 | reasonable ways as different from the original version; or 363 | 364 | d) Limiting the use for publicity purposes of names of licensors or 365 | authors of the material; or 366 | 367 | e) Declining to grant rights under trademark law for use of some 368 | trade names, trademarks, or service marks; or 369 | 370 | f) Requiring indemnification of licensors and authors of that 371 | material by anyone who conveys the material (or modified versions of 372 | it) with contractual assumptions of liability to the recipient, for 373 | any liability that these contractual assumptions directly impose on 374 | those licensors and authors. 375 | 376 | All other non-permissive additional terms are considered "further 377 | restrictions" within the meaning of section 10. If the Program as you 378 | received it, or any part of it, contains a notice stating that it is 379 | governed by this License along with a term that is a further 380 | restriction, you may remove that term. If a license document contains 381 | a further restriction but permits relicensing or conveying under this 382 | License, you may add to a covered work material governed by the terms 383 | of that license document, provided that the further restriction does 384 | not survive such relicensing or conveying. 385 | 386 | If you add terms to a covered work in accord with this section, you 387 | must place, in the relevant source files, a statement of the 388 | additional terms that apply to those files, or a notice indicating 389 | where to find the applicable terms. 390 | 391 | Additional terms, permissive or non-permissive, may be stated in the 392 | form of a separately written license, or stated as exceptions; 393 | the above requirements apply either way. 394 | 395 | 8. Termination. 396 | 397 | You may not propagate or modify a covered work except as expressly 398 | provided under this License. Any attempt otherwise to propagate or 399 | modify it is void, and will automatically terminate your rights under 400 | this License (including any patent licenses granted under the third 401 | paragraph of section 11). 402 | 403 | However, if you cease all violation of this License, then your 404 | license from a particular copyright holder is reinstated (a) 405 | provisionally, unless and until the copyright holder explicitly and 406 | finally terminates your license, and (b) permanently, if the copyright 407 | holder fails to notify you of the violation by some reasonable means 408 | prior to 60 days after the cessation. 409 | 410 | Moreover, your license from a particular copyright holder is 411 | reinstated permanently if the copyright holder notifies you of the 412 | violation by some reasonable means, this is the first time you have 413 | received notice of violation of this License (for any work) from that 414 | copyright holder, and you cure the violation prior to 30 days after 415 | your receipt of the notice. 416 | 417 | Termination of your rights under this section does not terminate the 418 | licenses of parties who have received copies or rights from you under 419 | this License. If your rights have been terminated and not permanently 420 | reinstated, you do not qualify to receive new licenses for the same 421 | material under section 10. 422 | 423 | 9. Acceptance Not Required for Having Copies. 424 | 425 | You are not required to accept this License in order to receive or 426 | run a copy of the Program. Ancillary propagation of a covered work 427 | occurring solely as a consequence of using peer-to-peer transmission 428 | to receive a copy likewise does not require acceptance. However, 429 | nothing other than this License grants you permission to propagate or 430 | modify any covered work. These actions infringe copyright if you do 431 | not accept this License. Therefore, by modifying or propagating a 432 | covered work, you indicate your acceptance of this License to do so. 433 | 434 | 10. Automatic Licensing of Downstream Recipients. 435 | 436 | Each time you convey a covered work, the recipient automatically 437 | receives a license from the original licensors, to run, modify and 438 | propagate that work, subject to this License. You are not responsible 439 | for enforcing compliance by third parties with this License. 440 | 441 | An "entity transaction" is a transaction transferring control of an 442 | organization, or substantially all assets of one, or subdividing an 443 | organization, or merging organizations. If propagation of a covered 444 | work results from an entity transaction, each party to that 445 | transaction who receives a copy of the work also receives whatever 446 | licenses to the work the party's predecessor in interest had or could 447 | give under the previous paragraph, plus a right to possession of the 448 | Corresponding Source of the work from the predecessor in interest, if 449 | the predecessor has it or can get it with reasonable efforts. 450 | 451 | You may not impose any further restrictions on the exercise of the 452 | rights granted or affirmed under this License. For example, you may 453 | not impose a license fee, royalty, or other charge for exercise of 454 | rights granted under this License, and you may not initiate litigation 455 | (including a cross-claim or counterclaim in a lawsuit) alleging that 456 | any patent claim is infringed by making, using, selling, offering for 457 | sale, or importing the Program or any portion of it. 458 | 459 | 11. Patents. 460 | 461 | A "contributor" is a copyright holder who authorizes use under this 462 | License of the Program or a work on which the Program is based. The 463 | work thus licensed is called the contributor's "contributor version". 464 | 465 | A contributor's "essential patent claims" are all patent claims 466 | owned or controlled by the contributor, whether already acquired or 467 | hereafter acquired, that would be infringed by some manner, permitted 468 | by this License, of making, using, or selling its contributor version, 469 | but do not include claims that would be infringed only as a 470 | consequence of further modification of the contributor version. For 471 | purposes of this definition, "control" includes the right to grant 472 | patent sublicenses in a manner consistent with the requirements of 473 | this License. 474 | 475 | Each contributor grants you a non-exclusive, worldwide, royalty-free 476 | patent license under the contributor's essential patent claims, to 477 | make, use, sell, offer for sale, import and otherwise run, modify and 478 | propagate the contents of its contributor version. 479 | 480 | In the following three paragraphs, a "patent license" is any express 481 | agreement or commitment, however denominated, not to enforce a patent 482 | (such as an express permission to practice a patent or covenant not to 483 | sue for patent infringement). To "grant" such a patent license to a 484 | party means to make such an agreement or commitment not to enforce a 485 | patent against the party. 486 | 487 | If you convey a covered work, knowingly relying on a patent license, 488 | and the Corresponding Source of the work is not available for anyone 489 | to copy, free of charge and under the terms of this License, through a 490 | publicly available network server or other readily accessible means, 491 | then you must either (1) cause the Corresponding Source to be so 492 | available, or (2) arrange to deprive yourself of the benefit of the 493 | patent license for this particular work, or (3) arrange, in a manner 494 | consistent with the requirements of this License, to extend the patent 495 | license to downstream recipients. "Knowingly relying" means you have 496 | actual knowledge that, but for the patent license, your conveying the 497 | covered work in a country, or your recipient's use of the covered work 498 | in a country, would infringe one or more identifiable patents in that 499 | country that you have reason to believe are valid. 500 | 501 | If, pursuant to or in connection with a single transaction or 502 | arrangement, you convey, or propagate by procuring conveyance of, a 503 | covered work, and grant a patent license to some of the parties 504 | receiving the covered work authorizing them to use, propagate, modify 505 | or convey a specific copy of the covered work, then the patent license 506 | you grant is automatically extended to all recipients of the covered 507 | work and works based on it. 508 | 509 | A patent license is "discriminatory" if it does not include within 510 | the scope of its coverage, prohibits the exercise of, or is 511 | conditioned on the non-exercise of one or more of the rights that are 512 | specifically granted under this License. You may not convey a covered 513 | work if you are a party to an arrangement with a third party that is 514 | in the business of distributing software, under which you make payment 515 | to the third party based on the extent of your activity of conveying 516 | the work, and under which the third party grants, to any of the 517 | parties who would receive the covered work from you, a discriminatory 518 | patent license (a) in connection with copies of the covered work 519 | conveyed by you (or copies made from those copies), or (b) primarily 520 | for and in connection with specific products or compilations that 521 | contain the covered work, unless you entered into that arrangement, 522 | or that patent license was granted, prior to 28 March 2007. 523 | 524 | Nothing in this License shall be construed as excluding or limiting 525 | any implied license or other defenses to infringement that may 526 | otherwise be available to you under applicable patent law. 527 | 528 | 12. No Surrender of Others' Freedom. 529 | 530 | If conditions are imposed on you (whether by court order, agreement or 531 | otherwise) that contradict the conditions of this License, they do not 532 | excuse you from the conditions of this License. If you cannot convey a 533 | covered work so as to satisfy simultaneously your obligations under this 534 | License and any other pertinent obligations, then as a consequence you may 535 | not convey it at all. For example, if you agree to terms that obligate you 536 | to collect a royalty for further conveying from those to whom you convey 537 | the Program, the only way you could satisfy both those terms and this 538 | License would be to refrain entirely from conveying the Program. 539 | 540 | 13. Remote Network Interaction; Use with the GNU General Public License. 541 | 542 | Notwithstanding any other provision of this License, if you modify the 543 | Program, your modified version must prominently offer all users 544 | interacting with it remotely through a computer network (if your version 545 | supports such interaction) an opportunity to receive the Corresponding 546 | Source of your version by providing access to the Corresponding Source 547 | from a network server at no charge, through some standard or customary 548 | means of facilitating copying of software. This Corresponding Source 549 | shall include the Corresponding Source for any work covered by version 3 550 | of the GNU General Public License that is incorporated pursuant to the 551 | following paragraph. 552 | 553 | Notwithstanding any other provision of this License, you have 554 | permission to link or combine any covered work with a work licensed 555 | under version 3 of the GNU General Public License into a single 556 | combined work, and to convey the resulting work. The terms of this 557 | License will continue to apply to the part which is the covered work, 558 | but the work with which it is combined will remain governed by version 559 | 3 of the GNU General Public License. 560 | 561 | 14. Revised Versions of this License. 562 | 563 | The Free Software Foundation may publish revised and/or new versions of 564 | the GNU Affero General Public License from time to time. Such new versions 565 | will be similar in spirit to the present version, but may differ in detail to 566 | address new problems or concerns. 567 | 568 | Each version is given a distinguishing version number. If the 569 | Program specifies that a certain numbered version of the GNU Affero General 570 | Public License "or any later version" applies to it, you have the 571 | option of following the terms and conditions either of that numbered 572 | version or of any later version published by the Free Software 573 | Foundation. If the Program does not specify a version number of the 574 | GNU Affero General Public License, you may choose any version ever published 575 | by the Free Software Foundation. 576 | 577 | If the Program specifies that a proxy can decide which future 578 | versions of the GNU Affero General Public License can be used, that proxy's 579 | public statement of acceptance of a version permanently authorizes you 580 | to choose that version for the Program. 581 | 582 | Later license versions may give you additional or different 583 | permissions. However, no additional obligations are imposed on any 584 | author or copyright holder as a result of your choosing to follow a 585 | later version. 586 | 587 | 15. Disclaimer of Warranty. 588 | 589 | THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY 590 | APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT 591 | HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY 592 | OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, 593 | THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 594 | PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM 595 | IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF 596 | ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 597 | 598 | 16. Limitation of Liability. 599 | 600 | IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 601 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS 602 | THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY 603 | GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE 604 | USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF 605 | DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD 606 | PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), 607 | EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF 608 | SUCH DAMAGES. 609 | 610 | 17. Interpretation of Sections 15 and 16. 611 | 612 | If the disclaimer of warranty and limitation of liability provided 613 | above cannot be given local legal effect according to their terms, 614 | reviewing courts shall apply local law that most closely approximates 615 | an absolute waiver of all civil liability in connection with the 616 | Program, unless a warranty or assumption of liability accompanies a 617 | copy of the Program in return for a fee. 618 | 619 | END OF TERMS AND CONDITIONS 620 | 621 | How to Apply These Terms to Your New Programs 622 | 623 | If you develop a new program, and you want it to be of the greatest 624 | possible use to the public, the best way to achieve this is to make it 625 | free software which everyone can redistribute and change under these terms. 626 | 627 | To do so, attach the following notices to the program. It is safest 628 | to attach them to the start of each source file to most effectively 629 | state the exclusion of warranty; and each file should have at least 630 | the "copyright" line and a pointer to where the full notice is found. 631 | 632 | 633 | Copyright (C) 634 | 635 | This program is free software: you can redistribute it and/or modify 636 | it under the terms of the GNU Affero General Public License as published 637 | by the Free Software Foundation, either version 3 of the License, or 638 | (at your option) any later version. 639 | 640 | This program is distributed in the hope that it will be useful, 641 | but WITHOUT ANY WARRANTY; without even the implied warranty of 642 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 643 | GNU Affero General Public License for more details. 644 | 645 | You should have received a copy of the GNU Affero General Public License 646 | along with this program. If not, see . 647 | 648 | Also add information on how to contact you by electronic and paper mail. 649 | 650 | If your software can interact with users remotely through a computer 651 | network, you should also make sure that it provides a way for users to 652 | get its source. For example, if your program is a web application, its 653 | interface could display a "Source" link that leads users to an archive 654 | of the code. There are many ways you could offer source, and different 655 | solutions will be better for different programs; see section 13 for the 656 | specific requirements. 657 | 658 | You should also get your employer (if you work as a programmer) or school, 659 | if any, to sign a "copyright disclaimer" for the program, if necessary. 660 | For more information on this, and how to apply and follow the GNU AGPL, see 661 | . 662 | -------------------------------------------------------------------------------- /Makefile: -------------------------------------------------------------------------------- 1 | all: supmover 2 | 3 | supmover: main.o 4 | g++ -o supmover main.o 5 | 6 | main.o: main.cpp 7 | g++ -std=c++17 -fexceptions -O2 -Wall -Wextra -c main.cpp -o main.o 8 | 9 | clean: 10 | rm -f *.o supmover 11 | 12 | .PHONY: clean 13 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # SupMover 2 | SupMover - Shift timings and Screen Area of PGS/Sup subtitle 3 | 4 | # Usage 5 | ``` 6 | Usage: SupMover [] [OPTIONS ...] 7 | 8 | OPTIONS: 9 | --trace 10 | --delay 11 | --move 12 | --crop 13 | --resync (/ | ) 14 | --add_zero 15 | --tonemap 16 | --cut_merge [CUT&MERGE OPTIONS ...] 17 | 18 | CUT&MERGE OPTIONS: 19 | --list 20 | --format (secut | (vapoursynth | vs) | (avisynth | avs) | remap) 21 | --timemode (ms | frame (/ | ) | timestamp) 22 | --fixmode (cut | (delete | del)) 23 | ``` 24 | 25 | # Options 26 | * `--trace` 27 | * Print contents and structure of input file segments 28 | * `--delay` 29 | * Apply a milliseconds delay, positive or negative, to all the subpic of the subtitle, it can be fractional as the SUP speficication have a precision of 1/90ms 30 | * `--resync` 31 | * Multiply all the timestamp by this factor, this can also be supplied as a fraction 32 | * `--move` 33 | * Shift the windows position of all subpic by the inputed parameters (the image data is left untouched). 34 | * Position is clamped to the screen edges so that windows are always fully contained within the screen area. 35 | * `--crop` 36 | * Crop the windows area of all subpic by the inputed parameters. 37 | * This is done losslessly by only shifting the windows position (the image data is left untouched). 38 | * Crop functionality is not exstensivelly tested when multiple Composition Object or Windows are present or when the windows are is outside the new screen area, a warning is issued if that's the case and i strongly advise to check the resulting subtitle with a video player, also handling of the Object Cropped flag and windows area bigger than the new screen area is not implemented, a warning is issued if needed 39 | * If both `--move` and `--crop` are selected, the crop is performed after the move. 40 | * `--delay` + `--resync` 41 | * If both modes are selected the delay will be adjusted if it comes before the resync parameter, for example if the program is launched with `--delay 1000 --resync 1.001` it will be internally adjusted to 1001ms, instead if it's launched with `--resync 1.001 --delay 1000` it will not 42 | * `--add_zero` 43 | * Some media players (especially Plex) don't correctly sync `*.sup` subtitles. They seem to ignore any delay before the first 'display set'. This option adds a dummy 'display set' at time 0 so subsequent timestamps are correctly interpreted. 44 | * `--tonemap` 45 | * Change the brightness of the subtitle applying the specified percentage factor to all the palette's luminance value, similar to https://github.com/quietvoid/subtitle_tonemap , the percentage must be specified as a decimal value with 1 as 100%, it can be bigger than 1 to increase brightness 46 | * `--cut_merge` 47 | * allows to cut subtitle and optionally, if more sections are specified, to merge the cuts into a single subtitle file with the subsequent cuts shifted to have them begin at the end of the previous section. It is possible to personalize its functionality with some options 48 | * `--list`: specifies the space-separated list of sections, `--format` and `--timemode` can be used to further configure the parsing of this list. The list must be contained inside double quotes 49 | * `--format`: the format type of the list 50 | * `secut`: uses the same format as SECut. eg `1000-2000;3000-4000` 51 | * `vapoursynt` or `vs`: uses the same format as vapoursynth split sintax, additionally if `--timemode` is set as `frame` the range will be treated inclusively at the start and exclusively at the end. eg `[1000:2001] [3000:4001]` 52 | * `avisynth` or `avs`: uses the same format as avisynth trim sintax. Eg `(1000,2000) (3000,4000)` 53 | * `remap`: uses the same format as [Vapoursynth-RemapFrames ReplaceFrameSimple](https://github.com/Irrational-Encoding-Wizardry/Vapoursynth-RemapFrames#replaceframessimple). Eg `[1000 2000] [3000 4000]` 54 | * `--timemode`: allow to specifies how to read the values of the sections 55 | * `ms` 56 | * `frame`: if selected a framerate MUST be specified, as a fraction like `24000/1001` or as a number like `23.976` 57 | * `timestamp`: if selected the sections MUST be in the format hh:mm:ss.ms and can't be used with `--format vapoursynth` 58 | * `--fixmode`: allow to specify how to treat subtitles which are not fully contained in a section 59 | * `delete` or `del`: delete the subtitle if not fully contained inside a section 60 | * `cut`: cut the subtitle so that it is fully contained in the section 61 | * if no further option is specified it will works like secut so like the following command line `--format secut --timemode ms --fixmode delete` 62 | 63 | 64 | # Build instruction 65 | ``` 66 | g++.exe -Wall -fexceptions -O2 -Wall -Wextra -c main.cpp -o main.o 67 | g++.exe -o SupMover.exe main.o -s -static 68 | ``` 69 | -------------------------------------------------------------------------------- /cmd.hpp: -------------------------------------------------------------------------------- 1 | double const MS_TO_PTS_MULT = 90.0f; 2 | 3 | struct t_timestamp { 4 | unsigned long hh; 5 | unsigned long mm; 6 | unsigned long ss; 7 | unsigned long ms; 8 | }; 9 | 10 | struct t_move { 11 | int16_t deltaX; 12 | int16_t deltaY; 13 | }; 14 | 15 | struct t_crop { 16 | uint16_t left; 17 | uint16_t top; 18 | uint16_t right; 19 | uint16_t bottom; 20 | }; 21 | 22 | enum e_cutMergeFormat : uint8_t { 23 | secut = 0, //"[1000-2000] [3000-4000]" both inclusive 24 | vapoursynth = 1, //"[1000:2001] [3000:4001]" start inclusive, end exclusive 25 | avisynth = 2, //"(1000,2000) (3000,4000)" both inclusive 26 | remap = 3 //"[1000 2000] [3000 4000]" both inclusive 27 | }; 28 | 29 | enum e_cutMergeTimeMode : uint8_t { 30 | ms = 0, 31 | frame = 1, 32 | timestamp = 2 33 | }; 34 | 35 | enum e_cutMergeFixMode : uint8_t { 36 | del = 0, //delete section if not fully contained 37 | cut = 0 //cut begin and/or end to match current section 38 | }; 39 | 40 | struct t_cutMergeSection { 41 | uint32_t begin; 42 | uint32_t end; 43 | uint32_t delay_until; 44 | }; 45 | 46 | bool compareCutMergeSection(t_cutMergeSection a, t_cutMergeSection b) { 47 | return (a.begin < b.begin); 48 | } 49 | 50 | struct t_cutMerge { 51 | bool doCutMerge = false; 52 | e_cutMergeFormat format; 53 | e_cutMergeTimeMode timeMode; 54 | e_cutMergeFixMode fixMode; 55 | double fps; 56 | std::string list; 57 | std::vector section; 58 | }; 59 | 60 | struct t_cmd { 61 | const char* inputFile = nullptr; 62 | const char* outputFile = nullptr; 63 | bool trace = false; 64 | int32_t delay = 0; 65 | t_move move = {}; 66 | t_crop crop = {}; 67 | double resync = 1; 68 | bool addZero = false; 69 | double tonemap = 1; 70 | t_cutMerge cutMerge = {}; 71 | }; 72 | 73 | 74 | void toLower(std::string& str) { 75 | std::transform(str.begin(), str.end(), str.begin(), [](int i) { 76 | return std::tolower(i); 77 | }); 78 | } 79 | 80 | t_timestamp ptsToTimestamp(uint32_t pts) { 81 | t_timestamp res; 82 | 83 | res.ms = ((int)floor((float)pts / MS_TO_PTS_MULT)); 84 | res.ss = res.ms / 1000; 85 | res.mm = res.ss / 60; 86 | res.hh = res.mm / 60; 87 | 88 | res.ms %= 1000; 89 | res.ss %= 60; 90 | res.mm %= 60; 91 | 92 | return res; 93 | } 94 | 95 | int timestampToMs(char* timestamp) { 96 | int tokenRead; 97 | int hh, mm, ss, ms; 98 | 99 | tokenRead = std::sscanf(timestamp, "%d:%d:%d.%d", &hh, &mm, &ss, &ms); 100 | if (tokenRead != 4) { 101 | return -1; 102 | } 103 | 104 | return ((((hh * 60 * 60) + (mm * 60) + ss) * 1000) + ms); 105 | } 106 | 107 | bool parseCutMerge(t_cutMerge* cutMerge) { 108 | std::string pattern; 109 | 110 | switch (cutMerge->format) 111 | { 112 | case e_cutMergeFormat::secut: 113 | { 114 | pattern = "%[0123456789:.]-%[0123456789:.]%n"; 115 | break; 116 | } 117 | case e_cutMergeFormat::vapoursynth: 118 | { 119 | pattern = "[%[0123456789]:%[0123456789]]%n"; 120 | break; 121 | } 122 | case e_cutMergeFormat::avisynth: 123 | { 124 | pattern = "(%[0123456789:.],%[0123456789:.])%n"; 125 | break; 126 | } 127 | case e_cutMergeFormat::remap: 128 | { 129 | pattern = "[%[0123456789:.] %[0123456789:.]]%n"; 130 | break; 131 | } 132 | default: 133 | break; 134 | } 135 | 136 | char strBeg[1024], strEnd[1024]; 137 | int beg, end; 138 | int charRead, tokenRead; 139 | 140 | std::string list = cutMerge->list; 141 | 142 | do { 143 | tokenRead = std::sscanf(list.c_str(), pattern.c_str(), strBeg, strEnd, &charRead); 144 | if (tokenRead != 2) { 145 | return false; 146 | } 147 | 148 | t_cutMergeSection section = {}; 149 | switch (cutMerge->timeMode) 150 | { 151 | case e_cutMergeTimeMode::ms: 152 | { 153 | beg = std::atoi(strBeg); 154 | end = std::atoi(strEnd); 155 | 156 | section.begin = (uint32_t)std::round(beg * MS_TO_PTS_MULT); 157 | section.end = (uint32_t)std::round(end * MS_TO_PTS_MULT); 158 | break; 159 | } 160 | case e_cutMergeTimeMode::frame: 161 | { 162 | beg = std::atoi(strBeg); 163 | end = std::atoi(strEnd); 164 | 165 | if (cutMerge->format == e_cutMergeFormat::vapoursynth) { 166 | end--; 167 | } 168 | 169 | section.begin = (uint32_t)std::round(((double)beg) / cutMerge->fps * MS_TO_PTS_MULT); 170 | section.end = (uint32_t)std::round(((double)end) / cutMerge->fps * MS_TO_PTS_MULT); 171 | break; 172 | } 173 | case e_cutMergeTimeMode::timestamp: 174 | { 175 | beg = timestampToMs(strBeg); 176 | end = timestampToMs(strEnd); 177 | if (beg == -1) { 178 | std::fprintf(stderr, "Timestamp %s is invalid\n", strBeg); 179 | return false; 180 | } 181 | if (beg == -1) { 182 | std::fprintf(stderr, "Timestamp %s is invalid\n", strEnd); 183 | return false; 184 | } 185 | 186 | section.begin = (uint32_t)std::round(beg * MS_TO_PTS_MULT); 187 | section.end = (uint32_t)std::round(end * MS_TO_PTS_MULT); 188 | break; 189 | } 190 | default: 191 | break; 192 | } 193 | 194 | cutMerge->section.push_back(section); 195 | 196 | if (charRead + 1 < (int)list.length()) { 197 | list = list.substr(charRead + 1, list.length()); 198 | } 199 | else { 200 | list.clear(); 201 | } 202 | } while (list.length() > 0); 203 | 204 | std::sort(cutMerge->section.begin(), cutMerge->section.end(), compareCutMergeSection); 205 | 206 | int32_t runningDelay = 0; 207 | for (int i = 0; i < (int)cutMerge->section.size(); i++) { 208 | cutMerge->section[i].delay_until = runningDelay + cutMerge->section[i].begin; 209 | runningDelay += (cutMerge->section[i].begin - cutMerge->section[i].end); 210 | } 211 | 212 | return true; 213 | } 214 | 215 | bool parseCMD(int32_t argc, char** argv, t_cmd& cmd) { 216 | int i = 1; 217 | 218 | cmd.inputFile = argv[i++]; 219 | bool foundStartOfOptions = false; 220 | 221 | while (i < argc) { 222 | const char* argCStr = argv[i++]; 223 | std::string arg = argCStr; 224 | int remaining = argc - i; 225 | bool recognizedOption = true; 226 | 227 | if (arg == "trace" || arg == "--trace") { 228 | cmd.trace = true; 229 | } 230 | else if (arg == "delay" || arg == "--delay") { 231 | if (remaining < 1) return false; 232 | cmd.delay = (int32_t)round(atof(argv[i++]) * MS_TO_PTS_MULT); 233 | 234 | if (cmd.cutMerge.doCutMerge) { 235 | std::fprintf(stderr, "Delay parameter will NOT be applied to Cut&Merge\n"); 236 | /* 237 | for (int i = 0; i < cmd.cutMerge.section.size(); i++) { 238 | cmd.cutMerge.section[i].begin += cmd.delay; 239 | cmd.cutMerge.section[i].end += cmd.delay; 240 | } 241 | */ 242 | } 243 | } 244 | else if (arg == "move" || arg == "--move") { 245 | if (remaining < 2) return false; 246 | cmd.move.deltaX = atoi(argv[i++]); 247 | cmd.move.deltaY = atoi(argv[i++]); 248 | } 249 | else if (arg == "crop" || arg == "--crop") { 250 | if (remaining < 4) return false; 251 | cmd.crop.left = atoi(argv[i++]); 252 | cmd.crop.top = atoi(argv[i++]); 253 | cmd.crop.right = atoi(argv[i++]); 254 | cmd.crop.bottom = atoi(argv[i++]); 255 | } 256 | else if (arg == "resync" || arg == "--resync") { 257 | if (remaining < 1) return false; 258 | std::string strFactor = argv[i]; 259 | size_t idx = strFactor.find("/"); 260 | if (idx != SIZE_MAX) { 261 | double num = std::atof(strFactor.substr(0, idx).c_str()); 262 | double den = std::atof(strFactor.substr(idx + 1, strFactor.length()).c_str()); 263 | 264 | cmd.resync = num / den; 265 | } 266 | else { 267 | cmd.resync = std::atof(argv[i]); 268 | } 269 | i++; 270 | 271 | cmd.delay = (int32_t)std::round(((double)cmd.delay * cmd.resync)); 272 | 273 | if (cmd.cutMerge.doCutMerge) { 274 | std::fprintf(stderr, "Resync parameter will NOT be applied to Cut&Merge\n"); 275 | /* 276 | for (int i = 0; i < cmd.cutMerge.section.size(); i++) { 277 | cmd.cutMerge.section[i].begin *= cmd.resync; 278 | cmd.cutMerge.section[i].end *= cmd.resync; 279 | } 280 | */ 281 | } 282 | } 283 | else if (arg == "add_zero" || arg == "--add_zero") { 284 | cmd.addZero = true; 285 | } 286 | else if (arg == "tonemap" || arg == "--tonemap") { 287 | if (remaining < 1) return false; 288 | cmd.tonemap = std::atof(argv[i++]); 289 | } 290 | else if (arg == "cut_merge" || arg == "--cut_merge") { 291 | cmd.cutMerge.doCutMerge = true; 292 | } 293 | else if (arg == "format" || arg == "--format") { 294 | if (remaining < 1) return false; 295 | std::string formatMode = argv[i++]; 296 | toLower(formatMode); 297 | 298 | if (formatMode == "secut") { 299 | cmd.cutMerge.format = e_cutMergeFormat::secut; 300 | } 301 | else if (formatMode == "vapoursynth" || formatMode == "vs") { 302 | cmd.cutMerge.format = e_cutMergeFormat::vapoursynth; 303 | } 304 | else if (formatMode == "avisynth" || formatMode == "avs") { 305 | cmd.cutMerge.format = e_cutMergeFormat::avisynth; 306 | } 307 | else if (formatMode == "remap") { 308 | cmd.cutMerge.format = e_cutMergeFormat::remap; 309 | } 310 | else { 311 | return false; 312 | } 313 | } 314 | else if (arg == "list" || arg == "--list") { 315 | if (remaining < 1) return false; 316 | std::string list = argv[i++]; 317 | toLower(list); 318 | 319 | cmd.cutMerge.list = list; 320 | } 321 | else if (arg == "timemode" || arg == "--timemode") { 322 | if (remaining < 1) return false; 323 | std::string timemode = argv[i++]; 324 | toLower(timemode); 325 | 326 | if (timemode == "ms") { 327 | cmd.cutMerge.timeMode = e_cutMergeTimeMode::ms; 328 | } 329 | else if (timemode == "frame") { 330 | if (remaining < 2) return false; 331 | cmd.cutMerge.timeMode = e_cutMergeTimeMode::frame; 332 | std::string strFactor = argv[i]; 333 | 334 | size_t idx = strFactor.find("/"); 335 | if (idx != SIZE_MAX) { 336 | double num = std::atof(strFactor.substr(0, idx).c_str()); 337 | double den = std::atof(strFactor.substr(idx + 1, strFactor.length()).c_str()); 338 | 339 | cmd.cutMerge.fps = num / den; 340 | } 341 | else { 342 | cmd.cutMerge.fps = std::atof(argv[i]); 343 | } 344 | i++; 345 | } 346 | else if (timemode == "timestamp") { 347 | cmd.cutMerge.timeMode = e_cutMergeTimeMode::timestamp; 348 | } 349 | else { 350 | return false; 351 | } 352 | } 353 | else if (arg == "fixmode" || arg == "--fixmode") { 354 | if (remaining < 1) return false; 355 | std::string fixmode = argv[i++]; 356 | toLower(fixmode); 357 | 358 | if (fixmode == "cut") { 359 | cmd.cutMerge.fixMode = e_cutMergeFixMode::cut; 360 | } 361 | else if (fixmode == "delete" || fixmode == "del") { 362 | cmd.cutMerge.fixMode = e_cutMergeFixMode::del; 363 | } 364 | } 365 | else { 366 | recognizedOption = false; 367 | } 368 | 369 | if (recognizedOption) { 370 | foundStartOfOptions = true; 371 | } 372 | else if (!foundStartOfOptions) { 373 | cmd.outputFile = argCStr; 374 | foundStartOfOptions = true; 375 | } 376 | else { 377 | return false; 378 | } 379 | } 380 | 381 | if (cmd.cutMerge.doCutMerge) { 382 | if ( cmd.cutMerge.format == e_cutMergeFormat::vapoursynth 383 | && cmd.cutMerge.timeMode == e_cutMergeTimeMode::timestamp) { 384 | std::fprintf(stderr, "Compat mode VapourSynth cannot be used alongside timestamp time mode\n"); 385 | 386 | return false; 387 | } 388 | 389 | if (!parseCutMerge(&cmd.cutMerge)) { 390 | return false; 391 | } 392 | } 393 | 394 | return true; 395 | } 396 | -------------------------------------------------------------------------------- /main.cpp: -------------------------------------------------------------------------------- 1 | #include 2 | #include 3 | #include 4 | #include 5 | #include 6 | #include 7 | #include 8 | #include 9 | #include 10 | #include "pgs.hpp" 11 | #include "cmd.hpp" 12 | 13 | struct t_rect { 14 | uint16_t x; 15 | uint16_t y; 16 | uint16_t width; 17 | uint16_t height; 18 | }; 19 | 20 | struct t_compositionNumberToSaveInfo { 21 | uint16_t compositionNumber; 22 | size_t sectionIdx; 23 | }; 24 | 25 | bool rectIsContained(t_rect container, t_rect window) { 26 | if ((window.x + window.width) < (container.x + container.width) 27 | && (window.x) > (container.x) 28 | && (window.y) > (container.y) 29 | && (window.y + window.height) < (container.y + container.height) 30 | ) 31 | { 32 | return true; 33 | } 34 | else 35 | { 36 | return false; 37 | } 38 | } 39 | 40 | int searchSectionByPTS(std::vector section, uint32_t beginPTS, uint32_t endPTS, e_cutMergeFixMode fixMode) { 41 | for (int i = 0; i < (int)section.size(); i++) { 42 | t_cutMergeSection currSection = section[i]; 43 | int found = 0; 44 | 45 | if (currSection.begin <= beginPTS 46 | && currSection.end >= beginPTS) { 47 | found++; 48 | } 49 | 50 | if (currSection.begin <= endPTS 51 | && currSection.end >= endPTS) { 52 | found++; 53 | } 54 | 55 | if (currSection.begin <= beginPTS 56 | && currSection.end >= endPTS) { 57 | found += 2; 58 | } 59 | 60 | if ( fixMode == e_cutMergeFixMode::cut 61 | && found >= 1) { 62 | return i; 63 | } 64 | if ( fixMode == e_cutMergeFixMode::del 65 | && found >= 2) { 66 | return i; 67 | } 68 | } 69 | 70 | return -1; 71 | } 72 | 73 | 74 | const char* usageHelp = R"(Usage: SupMover [] [OPTIONS ...] 75 | 76 | OPTIONS: 77 | --trace 78 | --delay 79 | --move 80 | --crop 81 | --resync (/ | ) 82 | --add_zero 83 | --tonemap 84 | --cut_merge [CUT&MERGE OPTIONS ...] 85 | 86 | CUT&MERGE OPTIONS: 87 | --list 88 | --format (secut | (vapoursynth | vs) | (avisynth | avs) | remap) 89 | --timemode (ms | frame (/ | ) | timestamp) 90 | --fixmode (cut | (delete | del)) 91 | 92 | Delay and resync command are executed in the order supplied. 93 | )"; 94 | 95 | 96 | int main(int32_t argc, char** argv) 97 | { 98 | size_t size, newSize; 99 | t_header header; 100 | 101 | if (argc < 3) { 102 | std::fprintf(stderr, "%s", usageHelp); 103 | return -1; 104 | } 105 | t_cmd cmd = {}; 106 | 107 | if (!parseCMD(argc, argv, cmd)) { 108 | std::fprintf(stderr, "Error parsing input\n"); 109 | return -1; 110 | } 111 | 112 | 113 | bool doDelay = cmd.delay != 0; 114 | bool doMove = cmd.move.deltaX != 0 || cmd.move.deltaY != 0; 115 | bool doCrop = (cmd.crop.left + cmd.crop.top + cmd.crop.right + cmd.crop.bottom) > 0; 116 | bool doResync = cmd.resync != 1; 117 | bool doTonemap = cmd.tonemap != 1; 118 | 119 | bool doModification = doDelay || doMove || doCrop || doResync || cmd.addZero || doTonemap || cmd.cutMerge.doCutMerge; 120 | bool doAnalysis = cmd.trace; 121 | 122 | FILE* input = std::fopen(cmd.inputFile, "rb"); 123 | if (input == nullptr) { 124 | std::fprintf(stderr, "Unable to open input file!\n"); 125 | return -1; 126 | } 127 | FILE* output = nullptr; 128 | if (doModification) { 129 | if (cmd.outputFile == nullptr) { 130 | std::fprintf(stderr, "Specified options require an output file!\n"); 131 | return -1; 132 | } 133 | output = std::fopen(cmd.outputFile, "wb"); 134 | if (output == nullptr) { 135 | std::fprintf(stderr, "Unable to open output file!\n"); 136 | std::fclose(input); 137 | return -1; 138 | } 139 | } 140 | 141 | std::fseek(input, 0, SEEK_END); 142 | size = newSize = std::ftell(input); 143 | if (size != 0) { 144 | std::fseek(input, 0, SEEK_SET); 145 | 146 | uint8_t* buffer = (uint8_t*)std::calloc(1, size); 147 | uint8_t* newBuffer = buffer; 148 | if (buffer == nullptr) { 149 | return -1; 150 | } 151 | 152 | std::fread(buffer, size, 1, input); 153 | if (doModification || doAnalysis) { 154 | size_t start = 0; 155 | 156 | t_rect screenRect = {}; 157 | 158 | t_WDS wds = {}; 159 | t_PCS pcs = {}; 160 | t_PDS pds = {}; 161 | t_ODS ods = {}; 162 | 163 | size_t offsetCurrPCS = 0; 164 | bool fixPCS = false; 165 | 166 | std::vector cutMerge_compositionNumberToSave = {}; 167 | t_cutMergeSection cutMerge_currentSection = {}; 168 | size_t cutMerge_offsetBeginCopy = 0; 169 | size_t cutMerge_offsetEndCopy = 0; 170 | size_t cutMerge_currentNewBufferSize = 0; 171 | uint32_t cutMerge_currentBeginPTS = 0; 172 | uint32_t cutMerge_currentEndPTS = 0; 173 | uint16_t cutMerge_currentCompositionNumber = 0; 174 | uint16_t cutMerge_newCompositionNumber = 0; 175 | bool cutMerge_foundBegin = false; 176 | bool cutMerge_foundEnd = false; 177 | bool cutMerge_keepSection = false; 178 | uint32_t cutMerge_currentToSaveIdx = 0; 179 | 180 | 181 | for (start = 0; start < size; start = start + HEADER_SIZE + header.dataLength) { 182 | header = t_header::read(&buffer[start]); 183 | if (header.header != 0x5047) { 184 | std::fprintf(stderr, "Correct header not found at position %zd, abort!\n", start); 185 | std::fclose(input); 186 | std::fclose(output); 187 | return -1; 188 | } 189 | 190 | t_timestamp timestamp = ptsToTimestamp(header.pts); 191 | char timestampString[13]; // max 99:99:99.999 192 | std::snprintf(timestampString, 13, "%lu:%02lu:%02lu.%03lu", timestamp.hh, timestamp.mm, timestamp.ss, timestamp.ms); 193 | char offsetString[13]; // max 0xFFFFFFFFFF (1TB) 194 | std::snprintf(offsetString, 13, "%#zx", start); 195 | 196 | if (doResync) { 197 | header.pts = (uint32_t)std::round((double)header.pts * cmd.resync); 198 | } 199 | if (doDelay) { 200 | if ( cmd.delay < 0 201 | && header.pts < abs(cmd.delay)) { 202 | std::fprintf(stderr, "Object at timestamp %s starts before the full delay amount, it was set to start at 0!\n", timestampString); 203 | header.pts = 0; 204 | } 205 | else { 206 | header.pts = header.pts + cmd.delay; 207 | } 208 | } 209 | 210 | if (doResync || doDelay) { 211 | header.write(&buffer[start]); 212 | } 213 | 214 | switch (header.segmentType) { 215 | case e_segmentType::pds: 216 | if (cmd.trace || doTonemap) { 217 | pds = t_PDS::read(&buffer[start + HEADER_SIZE], header.dataLength); 218 | } 219 | 220 | if (cmd.trace) { 221 | std::printf(" + PDS Segment: offset %s\n", offsetString); 222 | std::printf(" + Palette ID: %u\n", pds.id); 223 | std::printf(" + Version: %u\n", pds.versionNumber); 224 | std::printf(" + Palette entries: %u\n", pds.numberOfPalettes); 225 | } 226 | if (doTonemap) { 227 | for (int i = 0; i < pds.numberOfPalettes; i++) { 228 | //convert Y from TV level (16-235) to full range 229 | double expandedY = ((((double)pds.palettes[i].valueY - 16.0) * (255.0 / (235.0 - 16.0))) / 255.0); 230 | double tonemappedY = expandedY * cmd.tonemap; 231 | double clampedY = std::min(1.0, std::max(tonemappedY, 0.0)); 232 | double newY = std::round((clampedY * (235.0 - 16.0)) + 16.0); 233 | 234 | pds.palettes[i].valueY = (uint8_t)newY; 235 | } 236 | 237 | pds.write(&buffer[start + HEADER_SIZE]); 238 | } 239 | break; 240 | case e_segmentType::ods: 241 | if (cmd.trace) { 242 | ods = t_ODS::read(&buffer[start + HEADER_SIZE]); 243 | 244 | std::printf(" + ODS Segment: offset %s\n", offsetString); 245 | std::printf(" + Object ID: %u\n", ods.id); 246 | std::printf(" + Version: %u\n", ods.versionNumber); 247 | if (ods.sequenceFlag != e_sequenceFlag::firstAndLast) { 248 | std::printf(" + Sequence flag: "); 249 | switch (ods.sequenceFlag) { 250 | case e_sequenceFlag::last: std::printf("Last\n"); break; 251 | case e_sequenceFlag::first: std::printf("First\n"); break; 252 | default: std::printf("%#x\n", ods.sequenceFlag); break; 253 | } 254 | } 255 | std::printf(" + Size: %ux%u\n", ods.width, ods.height); 256 | } 257 | break; 258 | case e_segmentType::pcs: 259 | if (cmd.trace) { 260 | std::printf("+ DS\n"); 261 | std::printf(" + PTS: %s\n", timestampString); 262 | std::printf(" + PCS Segment: offset %s\n", offsetString); 263 | } 264 | if (cmd.trace || doMove | doCrop || cmd.addZero || cmd.cutMerge.doCutMerge) { 265 | pcs = t_PCS::read(&buffer[start + HEADER_SIZE]); 266 | offsetCurrPCS = start; 267 | 268 | if (cmd.trace) { 269 | std::printf(" + Video size: %ux%u\n", pcs.width, pcs.height); 270 | std::printf(" + Composition number: %u\n", pcs.compositionNumber); 271 | std::printf(" + Composition state: "); 272 | switch (pcs.compositionState) { 273 | case e_compositionState::normal: std::printf("Normal\n"); break; 274 | case e_compositionState::acquisitionPoint: std::printf("Aquisition Point\n"); break; 275 | case e_compositionState::epochStart: std::printf("Epoch Start\n"); break; 276 | default: std::printf("%#x\n", pcs.compositionState); break; 277 | } 278 | if (pcs.paletteUpdateFlag == 0x80) { 279 | std::printf(" + Palette update: True\n"); 280 | } 281 | std::printf(" + Palette ID: %u\n", pcs.paletteID); 282 | for (int i = 0; i < pcs.numberOfCompositionObjects; i++) { 283 | std::printf(" + Composition object\n"); 284 | t_compositionObject object = pcs.compositionObjects[i]; 285 | std::printf(" + Object ID: %u\n", object.objectID); 286 | std::printf(" + Window ID: %u\n", object.windowID); 287 | std::printf(" + Position: %u,%u\n", object.horizontalPosition, object.verticalPosition); 288 | if (object.croppedAndForcedFlag & e_objectFlags::forced) { 289 | std::printf(" + Forced display: True\n"); 290 | } 291 | if (object.croppedAndForcedFlag & e_objectFlags::cropped) { 292 | std::printf(" + Cropped: True\n"); 293 | std::printf(" + Cropped position: %u,%u\n", object.croppedHorizontalPosition, object.croppedVerticalPosition); 294 | std::printf(" + Cropped size: %ux%u\n", object.croppedWidth, object.croppedHeight); 295 | } 296 | } 297 | } 298 | 299 | if (doCrop) { 300 | screenRect.x = 0 + cmd.crop.left; 301 | screenRect.y = 0 + cmd.crop.top; 302 | screenRect.width = pcs.width - (cmd.crop.left + cmd.crop.right); 303 | screenRect.height = pcs.height - (cmd.crop.top + cmd.crop.bottom); 304 | 305 | pcs.width = screenRect.width; 306 | pcs.height = screenRect.height; 307 | 308 | if (pcs.numberOfCompositionObjects > 1) { 309 | std::fprintf(stderr, "Multiple composition object at timestamp %s! Please Check!\n", timestampString); 310 | } 311 | 312 | for (int i = 0; i < pcs.numberOfCompositionObjects; i++) { 313 | if (pcs.compositionObjects[i].croppedAndForcedFlag & e_objectFlags::cropped) { 314 | std::fprintf(stderr, "Object Cropped Flag set at timestamp %s! Implement it!\n", timestampString); 315 | } 316 | 317 | if (cmd.crop.left > pcs.compositionObjects[i].horizontalPosition) { 318 | pcs.compositionObjects[i].horizontalPosition = 0; 319 | } 320 | else { 321 | pcs.compositionObjects[i].horizontalPosition -= cmd.crop.left; 322 | } 323 | 324 | if (cmd.crop.top > pcs.compositionObjects[i].verticalPosition) { 325 | pcs.compositionObjects[i].verticalPosition = 0; 326 | } 327 | else { 328 | pcs.compositionObjects[i].verticalPosition -= cmd.crop.top; 329 | } 330 | } 331 | } 332 | 333 | if (cmd.addZero) { 334 | if (pcs.compositionNumber == 0) { 335 | uint8_t zeroBuffer[60]; 336 | uint8_t pos = 0; 337 | t_header zeroHeader(header); 338 | zeroHeader.pts = 0; 339 | zeroHeader.dataLength = 11; //Length of upcoming PCS 340 | zeroHeader.write(&zeroBuffer[pos]); 341 | pos += 13; 342 | t_PCS zeroPcs(pcs); 343 | zeroPcs.compositionState = 0; 344 | zeroPcs.paletteUpdateFlag = 0; 345 | zeroPcs.paletteID = 0; 346 | zeroPcs.numberOfCompositionObjects = 0; 347 | zeroPcs.write(&zeroBuffer[pos]); 348 | pos += zeroHeader.dataLength; 349 | 350 | zeroHeader.segmentType = e_segmentType::wds; // WDS 351 | zeroHeader.dataLength = 10; //Length of upcoming WDS 352 | zeroHeader.write(&zeroBuffer[pos]); 353 | pos += 13; 354 | t_WDS zeroWds; 355 | zeroWds.numberOfWindows = 1; 356 | zeroWds.windows[0].id = 0; 357 | zeroWds.windows[0].horizontalPosition = 0; 358 | zeroWds.windows[0].verticalPosition = 0; 359 | zeroWds.windows[0].width = 0; 360 | zeroWds.windows[0].height = 0; 361 | zeroWds.write(&zeroBuffer[pos]); 362 | pos += zeroHeader.dataLength; 363 | 364 | zeroHeader.segmentType = e_segmentType::end; // END 365 | zeroHeader.dataLength = 0; //Length of upcoming END 366 | zeroHeader.write(&zeroBuffer[pos]); 367 | pos += 13; 368 | 369 | std::fprintf(stderr, "Writing %d bytes as first display set\n", pos); 370 | std::fwrite(zeroBuffer, pos, 1, output); 371 | 372 | //For Cut&Merge functionality we don't need to save the added segment as it 373 | //is saved in the resulting file automatically 374 | } 375 | pcs.compositionNumber += 1; 376 | } 377 | 378 | if (cmd.cutMerge.doCutMerge) { 379 | if (!cutMerge_foundBegin) { 380 | cutMerge_foundBegin = true; 381 | cutMerge_currentBeginPTS = header.pts; 382 | cutMerge_currentCompositionNumber = pcs.compositionNumber; 383 | } 384 | else if (!cutMerge_foundEnd) { 385 | cutMerge_foundEnd = true; 386 | cutMerge_currentEndPTS = header.pts; 387 | } 388 | } 389 | 390 | pcs.write(&buffer[start + HEADER_SIZE]); 391 | } 392 | break; 393 | case e_segmentType::wds: 394 | if (cmd.trace) { 395 | std::printf(" + WDS Segment: offset %s\n", offsetString); 396 | } 397 | fixPCS = false; 398 | if (cmd.trace || doMove || doCrop) { 399 | wds = t_WDS::read(&buffer[start + HEADER_SIZE]); 400 | 401 | if (wds.numberOfWindows > 1 && doModification) { 402 | std::fprintf(stderr, "Multiple windows at timestamp %s! Please Check!\n", timestampString); 403 | } 404 | 405 | if (cmd.trace) { 406 | for (int i = 0; i < wds.numberOfWindows; i++) { 407 | std::printf(" + Window\n"); 408 | t_window window = wds.windows[i]; 409 | std::printf(" + Window ID: %u\n", window.id); 410 | std::printf(" + Position: %u,%u\n", window.horizontalPosition, window.verticalPosition); 411 | std::printf(" + Size: %ux%u\n", window.width, window.height); 412 | } 413 | } 414 | 415 | if (doMove) { 416 | for (int i = 0; i < wds.numberOfWindows; i++) { 417 | t_window *window = &wds.windows[i]; 418 | int16_t minDeltaX = -(int16_t)window->horizontalPosition; 419 | int16_t minDeltaY = -(int16_t)window->verticalPosition; 420 | int16_t maxDeltaX = pcs.width - (window->horizontalPosition + window->width); 421 | int16_t maxDeltaY = pcs.height - (window->verticalPosition + window->height); 422 | int16_t clampedDeltaX = std::min(std::max(cmd.move.deltaX, minDeltaX), maxDeltaX); 423 | int16_t clampedDeltaY = std::min(std::max(cmd.move.deltaY, minDeltaY), maxDeltaY); 424 | 425 | window->horizontalPosition += clampedDeltaX; 426 | window->verticalPosition += clampedDeltaY; 427 | 428 | for (int j = 0; j < pcs.numberOfCompositionObjects; j++) { 429 | t_compositionObject *object = &pcs.compositionObjects[j]; 430 | if (object->windowID != window->id) continue; 431 | if (object->croppedAndForcedFlag & e_objectFlags::cropped) { 432 | object->croppedHorizontalPosition += clampedDeltaX; 433 | object->croppedVerticalPosition += clampedDeltaY; 434 | } 435 | object->horizontalPosition += clampedDeltaX; 436 | object->verticalPosition += clampedDeltaY; 437 | fixPCS = true; 438 | } 439 | } 440 | } 441 | 442 | if (doCrop) { 443 | for (int i = 0; i < wds.numberOfWindows; i++) { 444 | t_rect wndRect; 445 | uint16_t corrHor = 0; 446 | uint16_t corrVer = 0; 447 | 448 | wndRect.x = wds.windows[i].horizontalPosition; 449 | wndRect.y = wds.windows[i].verticalPosition; 450 | wndRect.width = wds.windows[i].width; 451 | wndRect.height = wds.windows[i].height; 452 | 453 | if (wndRect.width > screenRect.width 454 | || wndRect.height > screenRect.height) { 455 | std::fprintf(stderr, "Window is bigger than new screen area at timestamp %s\n", timestampString); 456 | std::fprintf(stderr, "Implement it!\n"); 457 | /* 458 | pcs.width = wndRect.width; 459 | pcs.height = wndRect.height; 460 | fixPCS = true; 461 | */ 462 | } 463 | else { 464 | if (!rectIsContained(screenRect, wndRect)) { 465 | std::fprintf(stderr, "Window is outside new screen area at timestamp %s\n", timestampString); 466 | 467 | uint16_t wndRightPoint = wndRect.x + wndRect.width; 468 | uint16_t screenRightPoint = screenRect.x + screenRect.width; 469 | if (wndRightPoint > screenRightPoint) { 470 | corrHor = wndRightPoint - screenRightPoint; 471 | } 472 | 473 | uint16_t wndBottomPoint = wndRect.y + wndRect.height; 474 | uint16_t screenBottomPoint = screenRect.y + screenRect.height; 475 | if (wndBottomPoint > screenBottomPoint) { 476 | corrVer = wndBottomPoint - screenBottomPoint; 477 | } 478 | 479 | if (corrHor + corrVer != 0) { 480 | std::fprintf(stderr, "Please check\n"); 481 | } 482 | } 483 | } 484 | 485 | if (cmd.crop.left > wds.windows[i].horizontalPosition) { 486 | wds.windows[i].horizontalPosition = 0; 487 | } 488 | else { 489 | wds.windows[i].horizontalPosition -= (cmd.crop.left + corrHor); 490 | } 491 | 492 | if (cmd.crop.top > wds.windows[i].verticalPosition) { 493 | wds.windows[i].verticalPosition = 0; 494 | } 495 | else { 496 | wds.windows[i].verticalPosition -= (cmd.crop.top + corrVer); 497 | } 498 | 499 | if (corrVer != 0 || corrHor != 0) { 500 | for (int j = 0; j < pcs.numberOfCompositionObjects; j++) { 501 | if (pcs.compositionObjects[j].windowID != wds.windows[i].id) continue; 502 | pcs.compositionObjects[j].verticalPosition -= corrVer; 503 | pcs.compositionObjects[j].horizontalPosition -= corrHor; 504 | } 505 | fixPCS = true; 506 | } 507 | } 508 | } 509 | 510 | if (fixPCS) { 511 | pcs.write(&buffer[offsetCurrPCS + HEADER_SIZE]); 512 | } 513 | wds.write(&buffer[start + HEADER_SIZE]); 514 | 515 | } 516 | break; 517 | case e_segmentType::end: 518 | if (cmd.trace) { 519 | std::printf(" + END Segment: offset %s\n", offsetString); 520 | } 521 | 522 | if (cmd.cutMerge.doCutMerge) { 523 | if (cutMerge_foundEnd) { 524 | cutMerge_foundBegin = false; 525 | cutMerge_foundEnd = false; 526 | int idxFound = searchSectionByPTS(cmd.cutMerge.section, cutMerge_currentBeginPTS, cutMerge_currentEndPTS, cmd.cutMerge.fixMode); 527 | if (idxFound != -1) { 528 | t_compositionNumberToSaveInfo compositionNumberToSaveInfo = {}; 529 | compositionNumberToSaveInfo.compositionNumber = cutMerge_currentCompositionNumber; 530 | compositionNumberToSaveInfo.sectionIdx = idxFound; 531 | 532 | cutMerge_compositionNumberToSave.push_back(compositionNumberToSaveInfo); 533 | } 534 | } 535 | } 536 | 537 | screenRect = {}; 538 | pcs = {}; 539 | wds = {}; 540 | break; 541 | } 542 | } 543 | 544 | //Cut&Merge functionality is done in two pass as we need the resulting timestamp to do it 545 | //and we need to fix all the segment with the sum of all the in-between section delay 546 | if (cmd.cutMerge.doCutMerge) { 547 | newBuffer = (uint8_t*)std::calloc(1, size); 548 | 549 | header = {}; 550 | cutMerge_foundBegin = false; 551 | cutMerge_foundEnd = false; 552 | cutMerge_keepSection = false; 553 | cutMerge_currentToSaveIdx = 0; 554 | cutMerge_newCompositionNumber = 0; 555 | if (cmd.addZero) { 556 | cutMerge_newCompositionNumber = 1; 557 | } 558 | for (start = 0; start < size; start = start + HEADER_SIZE + header.dataLength) { 559 | if (cutMerge_currentToSaveIdx >= cutMerge_compositionNumberToSave.size()) { 560 | break; 561 | } 562 | header = t_header::read(&buffer[start]); 563 | 564 | //For Cut&Merge we only need to handle the header (for the PTS), the PCS (to 565 | //get the compositionNumber) and the END segment (to know when it finished) 566 | if (header.segmentType == e_segmentType::pcs) 567 | { 568 | pcs = t_PCS::read(&buffer[start + HEADER_SIZE]); 569 | if (!cutMerge_foundBegin) { 570 | cutMerge_foundBegin = true; 571 | cutMerge_currentBeginPTS = header.pts; 572 | cutMerge_currentCompositionNumber = pcs.compositionNumber; 573 | 574 | if (cutMerge_compositionNumberToSave[cutMerge_currentToSaveIdx].compositionNumber == cutMerge_currentCompositionNumber) { 575 | cutMerge_keepSection = true; 576 | cutMerge_offsetBeginCopy = start; 577 | cutMerge_currentSection = cmd.cutMerge.section[cutMerge_compositionNumberToSave[cutMerge_currentToSaveIdx].sectionIdx]; 578 | pcs.compositionNumber = cutMerge_newCompositionNumber; 579 | pcs.write(&buffer[start + HEADER_SIZE]); 580 | } 581 | } 582 | else if (!cutMerge_foundEnd) { 583 | cutMerge_foundEnd = true; 584 | cutMerge_currentEndPTS = header.pts; 585 | if (cutMerge_keepSection) { 586 | pcs.compositionNumber = cutMerge_newCompositionNumber; 587 | 588 | pcs.write(&buffer[start + HEADER_SIZE]); 589 | } 590 | } 591 | } 592 | 593 | if (cutMerge_keepSection) { 594 | if (!cutMerge_foundEnd) { 595 | if (cutMerge_currentBeginPTS < cutMerge_currentSection.begin) { 596 | header.pts = cutMerge_currentSection.begin; 597 | } 598 | } 599 | else { 600 | if (cutMerge_currentEndPTS > cutMerge_currentSection.end) { 601 | header.pts = cutMerge_currentSection.end; 602 | } 603 | } 604 | 605 | header.pts -= cutMerge_currentSection.delay_until; 606 | 607 | header.write(&buffer[start]); 608 | } 609 | 610 | if (header.segmentType == e_segmentType::end) 611 | { 612 | if (cutMerge_foundEnd) { 613 | if (cutMerge_keepSection) { 614 | cutMerge_currentToSaveIdx++; 615 | 616 | cutMerge_offsetEndCopy = start + HEADER_SIZE + header.dataLength; 617 | 618 | std::memcpy(&newBuffer[cutMerge_currentNewBufferSize], 619 | &buffer[cutMerge_offsetBeginCopy], 620 | (cutMerge_offsetEndCopy - cutMerge_offsetBeginCopy)); 621 | 622 | cutMerge_currentNewBufferSize += (cutMerge_offsetEndCopy - cutMerge_offsetBeginCopy); 623 | cutMerge_newCompositionNumber++; 624 | } 625 | 626 | cutMerge_foundBegin = false; 627 | cutMerge_foundEnd = false; 628 | cutMerge_keepSection = false; 629 | cutMerge_offsetBeginCopy = -1; 630 | cutMerge_offsetEndCopy = -1; 631 | 632 | } 633 | } 634 | } 635 | newSize = cutMerge_currentNewBufferSize; 636 | } 637 | else { 638 | newBuffer = buffer; 639 | newSize = size; 640 | } 641 | } 642 | 643 | if (doModification) { 644 | std::fwrite(newBuffer, newSize, 1, output); 645 | } 646 | } 647 | 648 | std::fclose(input); 649 | std::fclose(output); 650 | 651 | return 0; 652 | } 653 | -------------------------------------------------------------------------------- /pgs.hpp: -------------------------------------------------------------------------------- 1 | //Documentation: http://blog.thescorpius.com/index.php/2017/07/15/presentation-graphic-stream-sup-files-bluray-subtitle-format/ 2 | 3 | enum e_segmentType : uint8_t { 4 | pds = 0x14, 5 | ods = 0x15, 6 | pcs = 0x16, 7 | wds = 0x17, 8 | end = 0x80 9 | }; 10 | struct t_header { 11 | uint16_t header; 12 | uint32_t pts; 13 | uint32_t dts; 14 | uint8_t segmentType; 15 | uint16_t dataLength; 16 | 17 | static t_header read(uint8_t*); 18 | void write(uint8_t*); 19 | }; 20 | size_t const HEADER_SIZE = 13; 21 | 22 | 23 | struct t_window { 24 | uint8_t id; 25 | uint16_t horizontalPosition; 26 | uint16_t verticalPosition; 27 | uint16_t width; 28 | uint16_t height; 29 | }; 30 | struct t_WDS { 31 | uint8_t numberOfWindows; 32 | t_window windows[256]; 33 | 34 | static t_WDS read(uint8_t*); 35 | void write(uint8_t*); 36 | }; 37 | 38 | 39 | enum e_compositionState : uint8_t { 40 | normal = 0x00, 41 | acquisitionPoint = 0x40, 42 | epochStart = 0x80, 43 | epochContinue = 0xC0 44 | }; 45 | enum e_objectFlags : uint8_t { 46 | none = 0x00, 47 | forced = 0x40, 48 | cropped = 0x80 49 | }; 50 | struct t_compositionObject { 51 | uint16_t objectID; 52 | uint8_t windowID; 53 | uint8_t croppedAndForcedFlag; 54 | uint16_t horizontalPosition; 55 | uint16_t verticalPosition; 56 | uint16_t croppedHorizontalPosition; 57 | uint16_t croppedVerticalPosition; 58 | uint16_t croppedWidth; 59 | uint16_t croppedHeight; 60 | }; 61 | struct t_PCS { 62 | uint16_t width; 63 | uint16_t height; 64 | uint8_t frameRate; 65 | uint16_t compositionNumber; 66 | uint8_t compositionState; 67 | uint8_t paletteUpdateFlag; 68 | uint8_t paletteID; 69 | uint8_t numberOfCompositionObjects; 70 | t_compositionObject compositionObjects[256]; 71 | 72 | static t_PCS read(uint8_t*); 73 | void write(uint8_t*); 74 | }; 75 | 76 | 77 | struct t_palette { 78 | uint8_t entryID; 79 | uint8_t valueY; 80 | uint8_t valueCr; 81 | uint8_t valueCb; 82 | uint8_t valueA; 83 | }; 84 | struct t_PDS { 85 | uint8_t id; 86 | uint8_t versionNumber; 87 | t_palette palettes[255]; 88 | uint8_t numberOfPalettes; //not in format, only used internally 89 | 90 | static t_PDS read(uint8_t*, size_t); 91 | void write(uint8_t*); 92 | }; 93 | 94 | 95 | enum e_sequenceFlag : uint8_t { 96 | last = 0x40, 97 | first = 0x80, 98 | firstAndLast = 0xC0 99 | }; 100 | struct t_ODS { 101 | uint16_t id; 102 | uint8_t versionNumber; 103 | uint8_t sequenceFlag; 104 | uint32_t dataLength; 105 | uint16_t width; 106 | uint16_t height; 107 | //uint8_t* data; 108 | 109 | static t_ODS read(uint8_t*); 110 | }; 111 | 112 | 113 | uint16_t swapEndianness(uint16_t input) { 114 | uint16_t output; 115 | 116 | output = (input >> 8) | (input << 8); 117 | 118 | return output; 119 | } 120 | uint32_t swapEndianness(uint32_t input) { 121 | uint32_t output; 122 | 123 | output = ((input >> 24) & 0xff) | // move byte 3 to byte 0 124 | ((input << 8 ) & 0xff0000) | // move byte 1 to byte 2 125 | ((input >> 8 ) & 0xff00) | // move byte 2 to byte 1 126 | ((input << 24) & 0xff000000); // byte 0 to byte 3; 127 | 128 | return output; 129 | } 130 | 131 | t_header t_header::read(uint8_t* buffer) { 132 | t_header header = {}; 133 | 134 | header.header = swapEndianness(*(uint16_t*)&buffer[0]); 135 | header.pts = swapEndianness(*(uint32_t*)&buffer[2]); 136 | header.dts = swapEndianness(*(uint32_t*)&buffer[6]); 137 | header.segmentType = *(uint8_t*) &buffer[10]; 138 | header.dataLength = swapEndianness(*(uint16_t*)&buffer[11]); 139 | 140 | return header; 141 | } 142 | 143 | void t_header::write(uint8_t* buffer) { 144 | *((uint16_t*)(&buffer[0])) = swapEndianness(header); 145 | *((uint32_t*)(&buffer[2])) = swapEndianness(pts); 146 | *((uint32_t*)(&buffer[6])) = swapEndianness(dts); 147 | *((uint8_t*) (&buffer[10])) = segmentType; 148 | *((uint16_t*)(&buffer[11])) = swapEndianness(dataLength); 149 | } 150 | 151 | 152 | t_WDS t_WDS::read(uint8_t* buffer) { 153 | t_WDS wds; 154 | 155 | wds.numberOfWindows = *(uint8_t*)&buffer[0]; 156 | for (int i = 0; i < wds.numberOfWindows; i++) { 157 | size_t bufferStartIdx = 1 + (size_t)i * 9; 158 | 159 | wds.windows[i].id = *(uint8_t*) &buffer[bufferStartIdx + 0]; 160 | wds.windows[i].horizontalPosition = swapEndianness(*(uint16_t*)&buffer[bufferStartIdx + 1]); 161 | wds.windows[i].verticalPosition = swapEndianness(*(uint16_t*)&buffer[bufferStartIdx + 3]); 162 | wds.windows[i].width = swapEndianness(*(uint16_t*)&buffer[bufferStartIdx + 5]); 163 | wds.windows[i].height = swapEndianness(*(uint16_t*)&buffer[bufferStartIdx + 7]); 164 | } 165 | 166 | return wds; 167 | } 168 | 169 | void t_WDS::write(uint8_t* buffer) { 170 | *((uint8_t*)(&buffer[0])) = numberOfWindows; 171 | for (int i = 0; i < numberOfWindows; i++) { 172 | size_t bufferStartIdx = 1 + (size_t)i * 9; 173 | 174 | *((uint8_t*) (&buffer[bufferStartIdx + 0])) = windows[i].id; 175 | *((uint16_t*)(&buffer[bufferStartIdx + 1])) = swapEndianness(windows[i].horizontalPosition); 176 | *((uint16_t*)(&buffer[bufferStartIdx + 3])) = swapEndianness(windows[i].verticalPosition); 177 | *((uint16_t*)(&buffer[bufferStartIdx + 5])) = swapEndianness(windows[i].width); 178 | *((uint16_t*)(&buffer[bufferStartIdx + 7])) = swapEndianness(windows[i].height); 179 | } 180 | } 181 | 182 | 183 | t_PCS t_PCS::read(uint8_t* buffer) { 184 | t_PCS pcs; 185 | 186 | pcs.width = swapEndianness(*(uint16_t*)&buffer[0]); 187 | pcs.height = swapEndianness(*(uint16_t*)&buffer[2]); 188 | pcs.frameRate = *(uint8_t*) &buffer[4]; 189 | pcs.compositionNumber = swapEndianness(*(uint16_t*)&buffer[5]); 190 | pcs.compositionState = *(uint8_t*) &buffer[7]; 191 | pcs.paletteUpdateFlag = *(uint8_t*) &buffer[8]; 192 | pcs.paletteID = *(uint8_t*) &buffer[9]; 193 | pcs.numberOfCompositionObjects = *(uint8_t*) &buffer[10]; 194 | 195 | size_t bufferStartIdx = 11; 196 | for (int i = 0; i < pcs.numberOfCompositionObjects; i++) { 197 | pcs.compositionObjects[i].objectID = swapEndianness(*(uint16_t*)&buffer[bufferStartIdx + 0]); 198 | pcs.compositionObjects[i].windowID = *(uint8_t*) &buffer[bufferStartIdx + 2]; 199 | pcs.compositionObjects[i].croppedAndForcedFlag = *(uint8_t*) &buffer[bufferStartIdx + 3]; 200 | pcs.compositionObjects[i].horizontalPosition = swapEndianness(*(uint16_t*)&buffer[bufferStartIdx + 4]); 201 | pcs.compositionObjects[i].verticalPosition = swapEndianness(*(uint16_t*)&buffer[bufferStartIdx + 6]); 202 | if (pcs.compositionObjects[i].croppedAndForcedFlag & e_objectFlags::cropped) { 203 | pcs.compositionObjects[i].croppedHorizontalPosition = swapEndianness(*(uint16_t*)&buffer[bufferStartIdx + 8]); 204 | pcs.compositionObjects[i].croppedVerticalPosition = swapEndianness(*(uint16_t*)&buffer[bufferStartIdx + 10]); 205 | pcs.compositionObjects[i].croppedWidth = swapEndianness(*(uint16_t*)&buffer[bufferStartIdx + 12]); 206 | pcs.compositionObjects[i].croppedHeight = swapEndianness(*(uint16_t*)&buffer[bufferStartIdx + 14]); 207 | bufferStartIdx += 8; 208 | } 209 | bufferStartIdx += 8; 210 | } 211 | 212 | return pcs; 213 | } 214 | 215 | void t_PCS::write(uint8_t* buffer) { 216 | *((uint16_t*)(&buffer[0])) = swapEndianness(width); 217 | *((uint16_t*)(&buffer[2])) = swapEndianness(height); 218 | *((uint8_t*) (&buffer[4])) = frameRate; 219 | *((uint16_t*)(&buffer[5])) = swapEndianness(compositionNumber); 220 | *((uint8_t*) (&buffer[7])) = compositionState; 221 | *((uint8_t*) (&buffer[8])) = paletteUpdateFlag; 222 | *((uint8_t*) (&buffer[9])) = paletteID; 223 | *((uint8_t*) (&buffer[10])) = numberOfCompositionObjects; 224 | 225 | size_t bufferStartIdx = 11; 226 | for (int i = 0; i < numberOfCompositionObjects; i++) { 227 | *((uint16_t*)(&buffer[bufferStartIdx + 0])) = swapEndianness(compositionObjects[i].objectID); 228 | *((uint8_t*) (&buffer[bufferStartIdx + 2])) = compositionObjects[i].windowID; 229 | *((uint8_t*) (&buffer[bufferStartIdx + 3])) = compositionObjects[i].croppedAndForcedFlag; 230 | *((uint16_t*)(&buffer[bufferStartIdx + 4])) = swapEndianness(compositionObjects[i].horizontalPosition); 231 | *((uint16_t*)(&buffer[bufferStartIdx + 6])) = swapEndianness(compositionObjects[i].verticalPosition); 232 | if (compositionObjects[i].croppedAndForcedFlag & e_objectFlags::cropped) { 233 | *((uint16_t*)(&buffer[bufferStartIdx + 8])) = swapEndianness(compositionObjects[i].croppedHorizontalPosition); 234 | *((uint16_t*)(&buffer[bufferStartIdx + 10])) = swapEndianness(compositionObjects[i].croppedVerticalPosition); 235 | *((uint16_t*)(&buffer[bufferStartIdx + 12])) = swapEndianness(compositionObjects[i].croppedWidth); 236 | *((uint16_t*)(&buffer[bufferStartIdx + 14])) = swapEndianness(compositionObjects[i].croppedHeight); 237 | bufferStartIdx += 8; 238 | } 239 | bufferStartIdx += 8; 240 | } 241 | } 242 | 243 | 244 | t_PDS t_PDS::read(uint8_t* buffer, size_t segment_size) { 245 | t_PDS pds; 246 | 247 | pds.id = *(uint8_t*)&buffer[0]; 248 | pds.versionNumber = *(uint8_t*)&buffer[1]; 249 | 250 | pds.numberOfPalettes = (segment_size - 2) / 5; 251 | 252 | for (int i = 0; i < pds.numberOfPalettes; i++) { 253 | size_t bufferStartIdx = 2 + (size_t)i * 5; 254 | 255 | pds.palettes[i].entryID = *(uint8_t*)&buffer[bufferStartIdx + 0]; 256 | pds.palettes[i].valueY = *(uint8_t*)&buffer[bufferStartIdx + 1]; 257 | pds.palettes[i].valueCb = *(uint8_t*)&buffer[bufferStartIdx + 2]; 258 | pds.palettes[i].valueCr = *(uint8_t*)&buffer[bufferStartIdx + 3]; 259 | pds.palettes[i].valueA = *(uint8_t*)&buffer[bufferStartIdx + 4]; 260 | } 261 | 262 | return pds; 263 | } 264 | 265 | void t_PDS::write(uint8_t* buffer) { 266 | *((uint8_t*)(&buffer[0])) = id; 267 | *((uint8_t*)(&buffer[1])) = versionNumber; 268 | 269 | for (int i = 0; i < numberOfPalettes; i++) { 270 | size_t bufferStartIdx = 2 + (size_t)i * 5; 271 | 272 | *((uint8_t*)(&buffer[bufferStartIdx + 0])) = palettes[i].entryID; 273 | *((uint8_t*)(&buffer[bufferStartIdx + 1])) = palettes[i].valueY; 274 | *((uint8_t*)(&buffer[bufferStartIdx + 2])) = palettes[i].valueCb; 275 | *((uint8_t*)(&buffer[bufferStartIdx + 3])) = palettes[i].valueCr; 276 | *((uint8_t*)(&buffer[bufferStartIdx + 4])) = palettes[i].valueA; 277 | } 278 | } 279 | 280 | 281 | t_ODS t_ODS::read(uint8_t* buffer) { 282 | t_ODS ods; 283 | 284 | ods.id = swapEndianness(*(uint16_t*)&buffer[0]); 285 | ods.versionNumber = *(uint8_t*) &buffer[2]; 286 | ods.sequenceFlag = *(uint8_t*) &buffer[3]; 287 | ods.dataLength = swapEndianness(*(uint32_t*)&buffer[3]) & 0xffffff; 288 | ods.width = swapEndianness(*(uint16_t*)&buffer[7]); 289 | ods.height = swapEndianness(*(uint16_t*)&buffer[9]); 290 | 291 | return ods; 292 | } 293 | -------------------------------------------------------------------------------- /sup-parser.ksy: -------------------------------------------------------------------------------- 1 | meta: 2 | id: sup 3 | title: PGS/Sup Subtitle 4 | file-extension: sup 5 | endian: be 6 | doc: | 7 | PGS/Sup Subtitle 8 | doc-ref: 9 | - https://blog.thescorpius.com/index.php/2017/07/15/presentation-graphic-stream-sup-files-bluray-subtitle-format/ 10 | - https://github.com/SubtitleEdit/subtitleedit/tree/main/src/libse/BluRaySup 11 | seq: 12 | - id: segment 13 | type: sup_segment 14 | repeat: eos 15 | types: 16 | sup_segment: 17 | seq: 18 | - id: magic 19 | contents: 'PG' 20 | - id: pts 21 | type: u4 22 | - id: dts 23 | type: u4 24 | - id: segment_type 25 | type: u1 26 | - id: segment_size 27 | type: u2 28 | - id: segment_body 29 | type: 30 | switch-on: segment_type 31 | cases: 32 | 0x14: pds 33 | 0x15: ods 34 | 0x16: pcs 35 | 0x17: wds 36 | 0x80: end 37 | size: segment_size 38 | pds: 39 | seq: 40 | - id: palette_id 41 | type: u1 42 | - id: palette_version_number 43 | type: u1 44 | - id: palette 45 | type: palette_type 46 | repeat: expr 47 | repeat-expr: (_parent.segment_size -2) / 5 48 | 49 | ods: 50 | seq: 51 | - id: object_id 52 | type: u2 53 | - id: object_version_number 54 | type: u1 55 | - id: last_in_sequence_flag 56 | type: u1 57 | - id: object_data_length 58 | type: b24 59 | - id: width 60 | type: u2 61 | - id: height 62 | type: u2 63 | - id: object_data 64 | size: object_data_length - 4 65 | pcs: 66 | seq: 67 | - id: width 68 | type: u2 69 | - id: height 70 | type: u2 71 | - id: frame_rate 72 | type: u1 73 | - id: composition_number 74 | type: u2 75 | - id: composition_state 76 | type: u1 77 | - id: palette_upd_flag 78 | type: u1 79 | - id: palette_id 80 | type: u1 81 | - id: num_composition_object 82 | type: u1 83 | - id: composition_object 84 | type: composition_object_type 85 | repeat: expr 86 | repeat-expr: num_composition_object 87 | wds: 88 | seq: 89 | - id: number_of_windows 90 | type: u1 91 | - id: windows_object 92 | type: windows_object_type 93 | repeat: expr 94 | repeat-expr: number_of_windows 95 | end: 96 | seq: [] 97 | 98 | composition_object_type: 99 | seq: 100 | - id: object_id 101 | type: u2 102 | - id: window_id 103 | type: u1 104 | - id: object_cropped_flag 105 | type: u1 106 | - id: object_hor_pos 107 | type: u2 108 | - id: object_ver_pos 109 | type: u2 110 | - id: obj_crop_hor_pos 111 | type: u2 112 | if: object_cropped_flag & 0x80 != 0 113 | - id: obj_crop_ver_pos 114 | type: u2 115 | if: object_cropped_flag & 0x80 != 0 116 | - id: obj_crop_width 117 | type: u2 118 | if: object_cropped_flag & 0x80 != 0 119 | - id: obj_crop_height 120 | type: u2 121 | if: object_cropped_flag & 0x80 != 0 122 | 123 | windows_object_type: 124 | seq: 125 | - id: window_id 126 | type: u1 127 | - id: windows_hor_pos 128 | type: u2 129 | - id: windows_ver_pos 130 | type: u2 131 | - id: windows_width 132 | type: u2 133 | - id: windows_height 134 | type: u2 135 | 136 | palette_type: 137 | seq: 138 | - id: palette_entry_id 139 | type: u1 140 | - id: palette_y 141 | type: u1 142 | - id: palette_cr 143 | type: u1 144 | - id: palette_cb 145 | type: u1 146 | - id: palette_a 147 | type: u1 --------------------------------------------------------------------------------