diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..c6ff6696b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "source/video_trim/lib/ffmpeg"]
+ path = source/video_trim/lib/ffmpeg
+ url = https://github.com/Josh5/unmanic.plugin.helpers.ffmpeg.git
diff --git a/source/video_trim/changelog.md b/source/video_trim/changelog.md
index a62744f0f..cb85b2447 100644
--- a/source/video_trim/changelog.md
+++ b/source/video_trim/changelog.md
@@ -1,4 +1,10 @@
+**0.0.8**
+- Update FFmpeg helper
+- fix trim calculation, specifically trimming off the end
+- move -ss and -to arguments to advanced options
+- add some debug logger output
+
**0.0.7**
- Update FFmpeg helper
- Add platform declaration
diff --git a/source/video_trim/info.json b/source/video_trim/info.json
index 8f0737437..297693e49 100644
--- a/source/video_trim/info.json
+++ b/source/video_trim/info.json
@@ -17,5 +17,5 @@
"on_postprocessor_task_results": 99
},
"tags": "video,audio,ffmpeg",
- "version": "0.0.7"
+ "version": "0.0.8"
}
diff --git a/source/video_trim/lib/ffmpeg b/source/video_trim/lib/ffmpeg
new file mode 160000
index 000000000..5c4741be7
--- /dev/null
+++ b/source/video_trim/lib/ffmpeg
@@ -0,0 +1 @@
+Subproject commit 5c4741be7e514b0f2faf8ab1c606637088c4095d
diff --git a/source/video_trim/lib/ffmpeg/.gitignore b/source/video_trim/lib/ffmpeg/.gitignore
deleted file mode 100644
index c6332d8f3..000000000
--- a/source/video_trim/lib/ffmpeg/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-**/__pycache__
-*.py[cod]
diff --git a/source/video_trim/lib/ffmpeg/LICENSE b/source/video_trim/lib/ffmpeg/LICENSE
deleted file mode 100644
index f288702d2..000000000
--- a/source/video_trim/lib/ffmpeg/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Copyright (C)
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
diff --git a/source/video_trim/lib/ffmpeg/README.md b/source/video_trim/lib/ffmpeg/README.md
deleted file mode 100644
index f1209743e..000000000
--- a/source/video_trim/lib/ffmpeg/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# unmanic.plugin.helpers.ffmpeg
-
-This python module is a helper library for any Unmanic plugin that needs to build FFmpeg commands to be executed.
-
-
-## Using the module
-
-### Adding it to your project
-It should be included in your plugin project as a submodule.
-
-```
-git submodule add https://github.com/Josh5/unmanic.plugin.helpers.ffmpeg.git ./lib/ffmpeg
-```
-
-### Calling it in your project
-For an example of how to use this module, see the [libx264 encoder plugin](https://github.com/Josh5/unmanic.plugin.encoder_video_h264_libx264).
diff --git a/source/video_trim/lib/ffmpeg/__init__.py b/source/video_trim/lib/ffmpeg/__init__.py
deleted file mode 100644
index 658bd6744..000000000
--- a/source/video_trim/lib/ffmpeg/__init__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
- unmanic.__init__.py
-
- Written by: Josh.5
- Date: 30 Jul 2021, (12:12 PM)
-
- Copyright:
- Copyright (C) 2021 Josh Sunnex
-
- This program is free software: you can redistribute it and/or modify it under the terms of the GNU General
- Public License as published by the Free Software Foundation, version 3.
-
- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License along with this program.
- If not, see .
-
-"""
-
-from __future__ import absolute_import
-import warnings
-
-from .parser import Parser
-from .probe import Probe
-from .stream_mapper import StreamMapper
-
-__author__ = 'Josh.5 (jsunnex@gmail.com)'
-
-__all__ = (
- 'Parser',
- 'Probe',
- 'StreamMapper',
-)
diff --git a/source/video_trim/lib/ffmpeg/mimetype_overrides.py b/source/video_trim/lib/ffmpeg/mimetype_overrides.py
deleted file mode 100644
index 1b7892a83..000000000
--- a/source/video_trim/lib/ffmpeg/mimetype_overrides.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
- plugins.probe.py
-
- Written by: Josh.5
- Date: 17 Mar 2022, (9:29 AM)
-
- Copyright:
- Copyright (C) 2021 Josh Sunnex
-
- This program is free software: you can redistribute it and/or modify it under the terms of the GNU General
- Public License as published by the Free Software Foundation, version 3.
-
- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License along with this program.
- If not, see .
-
-"""
-
-
-class MimetypeOverrides(object):
- audio = {
- '.flac': 'audio/flac',
- }
- video = {
- '.m4v': 'video/x-m4v',
- '.3gp': 'video/3gpp',
- '.axv': 'video/annodex',
- '.dl': 'video/dl',
- '.dif': 'video/dv',
- '.dv': 'video/dv',
- '.fli': 'video/fli',
- '.gl': 'video/gl',
- '.mpeg': 'video/mpeg',
- '.mpg': 'video/mpeg',
- '.mpe': 'video/mpeg',
- '.ts': 'video/MP2T',
- '.mp4': 'video/mp4',
- '.qt': 'video/quicktime',
- '.mov': 'video/quicktime',
- '.ogv': 'video/ogg',
- '.webm': 'video/webm',
- '.mxu': 'video/vnd.mpegurl',
- '.flv': 'video/x-flv',
- '.lsf': 'video/x-la-asf',
- '.lsx': 'video/x-la-asf',
- '.mng': 'video/x-mng',
- '.asf': 'video/x-ms-asf',
- '.asx': 'video/x-ms-asf',
- '.wm': 'video/x-ms-wm',
- '.wmv': 'video/x-ms-wmv',
- '.wmx': 'video/x-ms-wmx',
- '.wvx': 'video/x-ms-wvx',
- '.avi': 'video/x-msvideo',
- '.movie': 'video/x-sgi-movie',
- '.mpv': 'video/x-matroska',
- '.mkv': 'video/x-matroska',
- }
-
- def get_all(self):
- return {**self.audio, **self.video}
diff --git a/source/video_trim/lib/ffmpeg/parser.py b/source/video_trim/lib/ffmpeg/parser.py
deleted file mode 100644
index ba46cb813..000000000
--- a/source/video_trim/lib/ffmpeg/parser.py
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
- plugins.parser.py
-
- Written by: Josh.5
- Date: 12 Aug 2021, (9:00 AM)
-
- Copyright:
- Copyright (C) 2021 Josh Sunnex
-
- This program is free software: you can redistribute it and/or modify it under the terms of the GNU General
- Public License as published by the Free Software Foundation, version 3.
-
- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License along with this program.
- If not, see .
-
-"""
-import datetime
-import math
-import re
-from logging import Logger
-
-from .probe import Probe
-
-
-class Parser(object):
- """
- Parser
-
- Class to manage parsing the FFmpeg commandline output and return progress data for Unmanic.
- """
-
- percent = '0'
- time = '0'
- frame = '0'
- speed = '0'
- bitrate = '0'
-
- src_fps = None
- duration = None
- total_frames = None
-
- def __init__(self, logger: Logger, duration=None, total_frames=None):
- self.logger = logger
-
- def set_probe(self, probe: Probe):
- """
- Set the information require to calculate progress from the file probe
-
- :param probe:
- :return:
- """
- # Get FPS from file probe info
- self.src_fps = None
- try:
- file_probe_streams = probe.get('streams', [])
- self.src_fps = eval(file_probe_streams[0]['avg_frame_rate'])
- except ZeroDivisionError:
- # Warning, Cannot use input FPS
- self.logger.warning('Cannot use input FPS for FFmpeg conversion progress')
- except KeyError:
- # Warning, Cannot use input FPS
- self.logger.warning('Cannot use input FPS for FFmpeg conversion progress - key not found in probe')
- if self.src_fps == 0:
- raise ValueError('Unexpected zero FPS')
-
- # Get Duration from file probe info
- self.duration = None
- try:
- file_probe_format = probe.get('format', {})
- self.duration = float(file_probe_format['duration'])
- except ZeroDivisionError:
- # Warning, Cannot use input Duration
- self.logger.warning('Cannot use input Duration for FFmpeg conversion progress')
- except KeyError:
- # Warning, Cannot use input Duration
- self.logger.warning('Cannot use input Duration for FFmpeg conversion progress - key not found in probe')
-
- if self.src_fps is None and self.duration is None:
- raise ValueError('Unable to match against FPS or Duration.')
-
- # If we have probed both the source FPS and total duration, then we can calculate the total frames
- if self.duration and self.src_fps and self.duration > 0 and self.src_fps > 0:
- self.total_frames = int(self.duration * self.src_fps)
-
- def parse_progress(self, line_text):
- """
- Given a single line of STDOUT text, parse it using regex and extract progress as a percent value.
-
- :param line_text:
- :return:
- """
- # Fetch data from line text
- if line_text and 'frame=' in line_text:
- # Update time
- _time = self.get_progress_from_regex_of_string(line_text, r"time=(\s+|)(\d+:\d+:\d+\.\d+)", self.time)
- if _time:
- self.time = str(self.time_string_to_seconds(_time))
-
- # Update frames
- _frame = self.get_progress_from_regex_of_string(line_text, r"frame=(\s+|)(\d+)", self.frame)
- if _frame and int(_frame) > int(self.frame):
- self.frame = _frame
-
- # Update speed
- _speed = self.get_progress_from_regex_of_string(line_text, r"speed=(\s+|)(\d+\.\d+)", self.speed)
- if _speed:
- self.speed = str(_speed)
-
- # Update bitrate
- _bitrate = self.get_progress_from_regex_of_string(line_text, r"bitrate=(\s+|)(\d+\.\d+\w+|\d+w)",
- self.bitrate)
- if _bitrate:
- self.bitrate = "{}/s".format(_bitrate)
-
- # Update file size
- _size = self.get_progress_from_regex_of_string(line_text, r"size=(\s+|)(\d+\w+|\d+.\d+\w+)", self.frame)
- if _size:
- self.file_size = _size
-
- # Update percent
- _percent = None
- if _frame and self.total_frames and int(_frame) > 0 and int(self.total_frames) > 0:
- # If we have both the current frame and the total number of frames, then we can easily calculate the %
- # _percent = float(int(_frame) / int(self.total_frames))
- _percent = float(int(_frame) / int(self.total_frames)) * 100
- _percent = math.trunc(_percent)
- elif self.time and self.duration and int(self.time) > 0 and int(self.duration) > 0:
- # If that was not successful, we need to resort to assuming the percent by the duration and the time
- # passed so far
- _percent = float(int(self.time) / int(self.duration)) * 100
- _percent = math.trunc(_percent)
- if _percent and int(_percent) > int(self.percent):
- self.percent = str(_percent)
-
- # Return the values.
- # Currently Unmanic only cares about the percent. So for now we will ignore everything else.
- return {
- 'percent': self.percent
- }
-
- @staticmethod
- def time_string_to_seconds(time_string):
- """
- Converts a time string from the FFmpeg output into an epoch timestamp
-
- :param time_string:
- :return:
- """
- pt = datetime.datetime.strptime(time_string, '%H:%M:%S.%f')
- return pt.second + pt.minute * 60 + pt.hour * 3600
-
- @staticmethod
- def get_progress_from_regex_of_string(line, regex_string, default=None):
- """
- Parse value from line text using the given regular expression.
- If no match is found, return the given default value.
-
- :param line:
- :param regex_string:
- :param default:
- :return:
- """
- if default is None:
- default = 0
-
- return_value = default
- regex = re.compile(regex_string)
- findall = re.findall(regex, line)
- if findall:
- split_list = findall[-1]
- if len(split_list) == 2:
- return_value = split_list[1].strip()
- return return_value
diff --git a/source/video_trim/lib/ffmpeg/probe.py b/source/video_trim/lib/ffmpeg/probe.py
deleted file mode 100644
index 0fa2f1fe0..000000000
--- a/source/video_trim/lib/ffmpeg/probe.py
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
- plugins.probe.py
-
- Written by: Josh.5
- Date: 12 Aug 2021, (9:20 AM)
-
- Copyright:
- Copyright (C) 2021 Josh Sunnex
-
- This program is free software: you can redistribute it and/or modify it under the terms of the GNU General
- Public License as published by the Free Software Foundation, version 3.
-
- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License along with this program.
- If not, see .
-
-"""
-import json
-import mimetypes
-import os
-import subprocess
-from logging import Logger
-
-from .mimetype_overrides import MimetypeOverrides
-
-
-class FFProbeError(Exception):
- """
- FFProbeError
- Custom exception for errors encountered while executing the ffprobe command.
- """
-
- def __init___(self, path, info):
- Exception.__init__(self, "Unable to fetch data from file {}. {}".format(path, info))
- self.path = path
- self.info = info
-
-
-def ffprobe_cmd(params):
- """
- Execute a ffprobe command subprocess and read the output
-
- :param params:
- :return:
- """
- command = ["ffprobe"] + params
-
- pipe = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
- out, err = pipe.communicate()
-
- # Check for results
- try:
- raw_output = out.decode("utf-8")
- except Exception as e:
- raise FFProbeError(command, str(e))
- if pipe.returncode == 1 or 'error' in raw_output:
- raise FFProbeError(command, raw_output)
- if not raw_output:
- raise FFProbeError(command, 'No info found')
-
- return raw_output
-
-
-def ffprobe_file(vid_file_path):
- """
- Returns a dictionary result from ffprobe command line prove of a file
-
- :param vid_file_path: The absolute (full) path of the video file, string.
- :return:
- """
- if type(vid_file_path) != str:
- raise Exception('Give ffprobe a full file path of the video')
-
- params = [
- "-loglevel", "quiet",
- "-print_format", "json",
- "-show_format",
- "-show_streams",
- "-show_error",
- vid_file_path
- ]
-
- # Check result
- results = ffprobe_cmd(params)
- try:
- info = json.loads(results)
- except Exception as e:
- raise FFProbeError(vid_file_path, str(e))
-
- return info
-
-
-class Probe(object):
- """
- Probe
- """
-
- probe_info = {}
-
- def __init__(self, logger: Logger, allowed_mimetypes=None):
- self.logger = logger
- if allowed_mimetypes is None:
- allowed_mimetypes = ['audio', 'video', 'image']
- self.allowed_mimetypes = allowed_mimetypes
-
- # Init (reset) our mimetype list
- mimetypes.init()
-
- # Add mimetype overrides to mimetype dictionary (replaces any existing entries)
- mimetype_overrides = MimetypeOverrides()
- all_mimetype_overrides = mimetype_overrides.get_all()
- for extension in all_mimetype_overrides:
- mimetypes.add_type(all_mimetype_overrides.get(extension), extension)
-
- def __test_valid_mimetype(self, file_path):
- """
- Test the given file path for its mimetype.
- If the mimetype cannot be detected, it will fail this test.
- If the detected mimetype is not in the configured 'allowed_mimetypes'
- class variable, it will fail this test.
-
- :param file_path:
- :return:
- """
- # Only run this check against video/audio/image MIME types
- file_type = mimetypes.guess_type(file_path)[0]
-
- # If the file has no MIME type then it cannot be tested
- if file_type is None:
- self.logger.debug("Unable to fetch file MIME type - '{}'".format(file_path))
- return False
-
- # Make sure the MIME type is either audio, video or image
- file_type_category = file_type.split('/')[0]
- if file_type_category not in self.allowed_mimetypes:
- self.logger.debug("File MIME type not in 'audio', 'video' or 'image' - '{}'".format(file_path))
- return False
-
- return True
-
- def file(self, file_path):
- """
- Sets the 'probe' dict by probing the given file path.
- Files that are not able to be probed will not set the 'probe' dict.
-
- :param file_path:
- :return:
- """
- self.probe_info = {}
-
- # Ensure file exists
- if not os.path.exists(file_path):
- self.logger.debug("File does not exist - '{}'".format(file_path))
- return
-
- if not self.__test_valid_mimetype(file_path):
- return
-
- try:
- # Get the file probe info
- self.probe_info = ffprobe_file(file_path)
- return True
- except FFProbeError:
- # This will only happen if it was not a file that could be probed.
- self.logger.debug("File unable to be probed by FFProbe - '{}'".format(file_path))
- return
- except Exception as e:
- # The process failed for some unknown reason. Log it.
- self.logger.debug("Failed to set file probe - ".format(str(e)))
- return
-
- def get_probe(self):
- """Return the probe dictionary"""
- return self.probe_info
-
- def get(self, key, default=None):
- """Return the value of the given key from the probe dictionary"""
- return self.probe_info.get(key, default)
diff --git a/source/video_trim/lib/ffmpeg/stream_mapper.py b/source/video_trim/lib/ffmpeg/stream_mapper.py
deleted file mode 100644
index eb6312862..000000000
--- a/source/video_trim/lib/ffmpeg/stream_mapper.py
+++ /dev/null
@@ -1,455 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
- unmanic.stream_mapper.py
-
- Written by: Josh.5
- Date: 30 Jul 2021, (9:41 AM)
-
- Copyright:
- Copyright (C) 2021 Josh Sunnex
-
- This program is free software: you can redistribute it and/or modify it under the terms of the GNU General
- Public License as published by the Free Software Foundation, version 3.
-
- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License along with this program.
- If not, see .
-
-"""
-import os
-from logging import Logger
-
-from .probe import Probe
-
-
-class StreamMapper(object):
- """
- StreamMapper
-
- Manage FFmpeg stream mapping and generating FFmpeg command-line args.
- """
-
- probe: Probe = None
-
- processing_stream_type = ''
- found_streams_to_encode = False
- stream_mapping = []
- stream_encoding = []
- video_stream_count = 0
- audio_stream_count = 0
- subtitle_stream_count = 0
- data_stream_count = 0
- attachment_stream_count = 0
-
- input_file = ''
- output_file = ''
- generic_options = []
- main_options = []
- advanced_options = []
- format_options = []
-
- def __init__(self, logger: Logger, processing_stream_type: list):
- self.logger = logger
- if processing_stream_type is not None:
- if any(pst for pst in processing_stream_type if
- pst not in ['video', 'audio', 'subtitle', 'data', 'attachment']):
- raise Exception(
- "processing_stream_type must be one of ['video','audio','subtitle','data','attachment']")
- self.processing_stream_type = processing_stream_type
-
- # Set default Generic options
- self.generic_options = [
- '-hide_banner',
- '-loglevel', 'info',
- ]
-
- # Set default Main options
- self.main_options = []
-
- # Set default Advanced options
- self.advanced_options = [
- '-strict', '-2',
- '-max_muxing_queue_size', '4096',
- ]
-
- def __copy_stream_mapping(self, codec_type, stream_id):
- """
- Create stream mapping to simply copy the stream without encoding.
- Apply this to the 'stream_mapping' and 'stream_encoding' attributes.
-
- :param codec_type:
- :param stream_id:
- :return:
- """
- # Map this stream for copy to the destination file
- self.stream_mapping += ['-map', '0:{}:{}'.format(codec_type, stream_id)]
- # Add a encoding flag copying this stream
- self.stream_encoding += ['-c:{}:{}'.format(codec_type, stream_id), 'copy']
-
- def __apply_custom_stream_mapping(self, mapping_dict):
- """
- Apply a custom stream mapping.
- This method tests that the provided mapping dictionary is valid.
- If it is valid, apply it to the 'stream_mapping' and 'stream_encoding' attributes.
-
- :param mapping_dict:
- :return:
- """
- # Ensure the mapping dictionary provided is correct
- if not isinstance(mapping_dict, dict):
- raise Exception("processing_stream_type must return a dictionary")
- if 'stream_mapping' not in mapping_dict:
- raise Exception("processing_stream_type return dictionary must contain 'stream_mapping' key")
- if not isinstance(mapping_dict.get('stream_mapping'), list):
- raise Exception("processing_stream_type 'stream_mapping' value must be of type 'list'")
- if 'stream_encoding' not in mapping_dict:
- raise Exception("processing_stream_type return dictionary must contain 'stream_encoding' key")
- if not isinstance(mapping_dict.get('stream_encoding'), list):
- raise Exception("processing_stream_type 'stream_mapping' value must be of type 'list'")
- # Append this custom stream mapping
- self.stream_mapping += mapping_dict.get('stream_mapping')
- # Append these custom encoding flags
- self.stream_encoding += mapping_dict.get('stream_encoding')
-
- def set_probe(self, probe: Probe):
- """Set the ffprobe Probe object"""
- self.probe = probe
-
- def test_stream_needs_processing(self, stream_info: dict):
- """
- Overwrite this function to test a stream.
- Return 'True' if it needs to be process.
- Return 'False' if it should just be copied over to the new file
-
- :param stream_info:
- :return: bool
- """
- raise NotImplementedError
-
- def custom_stream_mapping(self, stream_info: dict, stream_id: int):
- """
- Configure custom mapping for a single stream
- This function must return a dictionary containing 2 key values:
- {
- 'stream_mapping': [],
- 'stream_encoding': [],
- }
-
- :param stream_info:
- :param stream_id:
- :return: dict
- """
- raise NotImplementedError
-
- def __set_stream_mapping(self):
- """
- Sets a list of stream maps and encoding variables
-
- :return:
- """
-
- # Require a list of probe streams to continue
- file_probe_streams = self.probe.get('streams')
- if not file_probe_streams:
- return False
-
- # What type of streams are we looking for ('video', 'audio', 'subtitle', 'data' or 'attachment')
- processing_stream_type = self.processing_stream_type
-
- # Map the streams into two arrays that will be placed together in the correct order.
- self.stream_mapping = []
- self.stream_encoding = []
-
- # Count streams by type
- self.video_stream_count = 0
- self.audio_stream_count = 0
- self.subtitle_stream_count = 0
- self.data_stream_count = 0
- self.attachment_stream_count = 0
-
- # Set flag for finding a stream that needs to be processed as False by default.
- found_streams_to_process = False
-
- # Loop over all streams found in the file probe
- for stream_info in file_probe_streams:
- codec_type = stream_info.get('codec_type', '').lower()
- # Fore each of these streams:
-
- # If this is a video/image stream?
- if codec_type == "video":
- # Map the video stream
- if "video" in processing_stream_type:
- if not self.test_stream_needs_processing(stream_info):
- self.__copy_stream_mapping('v', self.video_stream_count)
- self.video_stream_count += 1
- continue
- else:
- found_streams_to_process = True
- self.__apply_custom_stream_mapping(
- self.custom_stream_mapping(stream_info, self.video_stream_count)
- )
- self.video_stream_count += 1
- continue
- else:
- self.__copy_stream_mapping('v', self.video_stream_count)
- self.video_stream_count += 1
- continue
-
- # If this is a audio stream?
- elif codec_type == "audio":
- # Map the audio stream
- if "audio" in processing_stream_type:
- if not self.test_stream_needs_processing(stream_info):
- self.__copy_stream_mapping('a', self.audio_stream_count)
- self.audio_stream_count += 1
- continue
- else:
- found_streams_to_process = True
- self.__apply_custom_stream_mapping(
- self.custom_stream_mapping(stream_info, self.audio_stream_count)
- )
- self.audio_stream_count += 1
- continue
- else:
- self.__copy_stream_mapping('a', self.audio_stream_count)
- self.audio_stream_count += 1
- continue
-
- # If this is a subtitle stream?
- elif codec_type == "subtitle":
- # Map the subtitle stream
- if "subtitle" in processing_stream_type:
- if not self.test_stream_needs_processing(stream_info):
- self.__copy_stream_mapping('s', self.subtitle_stream_count)
- self.subtitle_stream_count += 1
- continue
- else:
- found_streams_to_process = True
- self.__apply_custom_stream_mapping(
- self.custom_stream_mapping(stream_info, self.subtitle_stream_count)
- )
- self.subtitle_stream_count += 1
- continue
- else:
- self.__copy_stream_mapping('s', self.subtitle_stream_count)
- self.subtitle_stream_count += 1
- continue
-
- # If this is a data stream?
- elif codec_type == "data":
- # Map the data stream
- if "data" in processing_stream_type:
- if not self.test_stream_needs_processing(stream_info):
- self.__copy_stream_mapping('d', self.data_stream_count)
- self.data_stream_count += 1
- continue
- else:
- found_streams_to_process = True
- self.__apply_custom_stream_mapping(
- self.custom_stream_mapping(stream_info, self.data_stream_count)
- )
- self.data_stream_count += 1
- continue
- else:
- self.__copy_stream_mapping('d', self.data_stream_count)
- self.data_stream_count += 1
- continue
-
- # If this is a attachment stream?
- elif codec_type == "attachment":
- # Map the attachment stream
- if "attachment" in processing_stream_type:
- if not self.test_stream_needs_processing(stream_info):
- self.__copy_stream_mapping('t', self.attachment_stream_count)
- self.attachment_stream_count += 1
- continue
- else:
- found_streams_to_process = True
- self.__apply_custom_stream_mapping(
- self.custom_stream_mapping(stream_info, self.attachment_stream_count)
- )
- self.attachment_stream_count += 1
- continue
- else:
- self.__copy_stream_mapping('t', self.attachment_stream_count)
- self.attachment_stream_count += 1
- continue
-
- return found_streams_to_process
-
- def __build_args(self, options: list, *args, **kwargs):
- """
- Build a list of FFmpeg options based on the given default options, args and kwargs
-
- :param options:
- :param args:
- :param kwargs:
- :return:
- """
- for arg in args:
- if arg in options:
- options = [value for value in options if value != arg]
- options += [arg]
- else:
- options += [arg]
- for kwarg in kwargs:
- key = kwarg
- value = kwargs.get(kwarg)
- if key in options:
- key_pos = options.index(key)
- val_pos = int(key_pos) + 1
- options[key_pos] = key
- options[val_pos] = value
- else:
- options += [key, value]
- return
-
- def streams_need_processing(self):
- """
- Returns True/False if the streams need to be processed.
- If at least one stream needs custom stream mapping (processing), then this will return True.
- If the stream mapping will copy all streams to output file untouched, then this will return False.
-
- :return:
- """
- return self.__set_stream_mapping()
-
- def container_needs_remuxing(self, container_extension):
- """
- Returns True/False if the file container needs to be processed.
-
- :return:
- """
- if not self.input_file:
- raise Exception("Input file not yet set")
-
- split_file_in = os.path.splitext(self.input_file)
- if split_file_in[1].lstrip('.') != container_extension.lstrip('.'):
- return True
- return False
-
- def set_input_file(self, path):
- """Set the input file for the FFmpeg args"""
- self.input_file = os.path.abspath(path)
-
- def set_output_file(self, path):
- """Set the output file for the FFmpeg args"""
- self.output_file = os.path.abspath(path)
-
- def set_output_null(self):
- """Set the output container to NULL for the FFmpeg args"""
- self.output_file = '-'
- main_options = {
- "-f": 'null',
- }
- self.__build_args(self.main_options, **main_options)
-
- def set_ffmpeg_generic_options(self, *args, **kwargs):
- """
- Set FFmpeg Generic options.
- These are the initial options that follow the 'ffmpeg' command.
-
- Ref:
- http://ffmpeg.org/ffmpeg-all.html#Generic-options
-
-
- :param args:
- :param kwargs:
- :return:
- """
- self.__build_args(self.generic_options, *args, **kwargs)
-
- def set_ffmpeg_main_options(self, *args, **kwargs):
- """
- Set FFmpeg Main options.
- These options follow the generic options.
- They include things like the input file(s), metadata mapping, etc.
-
- Ref:
- http://ffmpeg.org/ffmpeg-all.html#Main-options
-
- :return:
- """
- self.__build_args(self.main_options, *args, **kwargs)
-
- def set_ffmpeg_advanced_options(self, *args, **kwargs):
- """
- Set FFmpeg Advanced options.
- These options follow the generic options.
- They include things like the custom stream mapping, custom metadata mapping,
- filters, etc.
-
- Note:
- The custom stream mapping is carried out with another method.
- This method should not be used for creating custom stream mapping if the
- 'stream_mapping' and 'stream_encoding' attributes are set.
-
- Ref:
- http://ffmpeg.org/ffmpeg-all.html#Advanced-options
-
- :return:
- """
- self.__build_args(self.advanced_options, *args, **kwargs)
-
- def get_stream_mapping(self):
- """
- Fetch the custom stream mapping generated by this class.
- If the mapping args are not yet generated, generate them at this point.
-
- :return:
- """
- if not self.stream_mapping:
- self.__set_stream_mapping()
- return self.stream_mapping
-
- def get_stream_encoding(self):
- """
- Fetch the custom stream encoding args generated by this class.
- If the encoding args are not yet generated, generate them at this point.
-
- :return:
- """
- if not self.stream_encoding:
- self.__set_stream_mapping()
- return self.stream_encoding
-
- def get_ffmpeg_args(self):
- """
- Build the FFmpeg command args and return them as a list.
-
- :return:
- """
- args = []
-
- # Add generic options first
- args += self.generic_options
-
- # Add the input file
- # This class requires at least one input file specified with the input_file attribute
- if not self.input_file:
- raise Exception("Input file has not been set")
- args += ['-i', self.input_file]
-
- # Add other main options
- args += self.main_options
-
- # Add advanced options. This includes the stream mapping and the encoding args
- args += self.advanced_options
- args += self.stream_mapping
- args += self.stream_encoding
-
- # Add the output file
- # This class requires at least one output file specified with the output_file attribute
- if not self.output_file:
- raise Exception("Output file has not been set")
- elif self.output_file == '-':
- args += [self.output_file]
- else:
- args += ['-y', self.output_file]
-
- return args
diff --git a/source/video_trim/plugin.py b/source/video_trim/plugin.py
index 2a721208b..9979a98be 100644
--- a/source/video_trim/plugin.py
+++ b/source/video_trim/plugin.py
@@ -72,38 +72,39 @@ def custom_stream_mapping(self, stream_info: dict, stream_id: int):
def __gen_start_args(self, duration):
start_seconds = self.settings.get_setting('start_seconds')
- main_options = {}
+ advanced_options = {}
if start_seconds and float(start_seconds) > 0:
# Ensure the start trim is less than the duration of the file
if float(start_seconds) > float(duration):
# The configured value is larger than the duration of the file.
# Skip this file for now...
- return main_options
+ return advanced_options
# Build the start trim args
- main_options = {
+ advanced_options = {
"-ss": str(self.settings.get_setting('start_seconds')),
}
- self.set_ffmpeg_main_options(**main_options)
+ self.set_ffmpeg_advanced_options(**advanced_options)
- return main_options
+ return advanced_options
def __gen_end_args(self, duration):
# Reduce duration by X seconds less the start_seconds
end_seconds = self.settings.get_setting('end_seconds')
- main_options = {}
+ start_seconds = self.settings.get_setting('start_seconds')
+ advanced_options = {}
if end_seconds and float(end_seconds) > 0:
- # Ensure the end trim is less than the duration of the file
+ # Ensure the end trim is less than the duration of the file, less the start trim
if float(end_seconds) > float(duration):
# The configured value is larger than the duration of the file.
# Skip this file for now...
- return main_options
+ return advanced_options
# Build the start trim args
- main_options = {
- "-to": str(duration),
+ advanced_options = {
+ "-to": str(float(duration) - float(end_seconds)),
}
- self.set_ffmpeg_main_options(**main_options)
+ self.set_ffmpeg_advanced_options(**advanced_options)
- return main_options
+ return advanced_options
def gen_trim_args(self):
"""
@@ -124,8 +125,10 @@ def gen_trim_args(self):
args_string = ''
for key in start_args:
args_string += "{} {}".format(key, start_args.get(key))
+ logger.debug("args_string: '{}'".format(args_string))
for key in end_args:
args_string += "{} {}".format(key, end_args.get(key))
+ logger.debug("args_string: '{}'".format(args_string))
return args_string
@staticmethod
@@ -268,6 +271,8 @@ def on_worker_process(data):
data['exec_command'] = ['ffmpeg']
data['exec_command'] += ffmpeg_args
+ logger.debug("ffmpeg.args: '{}'".format(ffmpeg_args))
+
# Set the parser
parser = Parser(logger)
parser.set_probe(probe)