From ae901b257b38ef69f5131a80332544d3426f62c1 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Mon, 31 Jul 2023 00:29:34 +0900 Subject: [PATCH] Remove the C transcoder --- back/Dockerfile | 11 +- back/Dockerfile.dev | 12 +- back/src/Kyoo.Transcoder/.gitignore | 10 - back/src/Kyoo.Transcoder/CMakeLists.txt | 36 - back/src/Kyoo.Transcoder/LICENSE | 674 ------------------ back/src/Kyoo.Transcoder/README.md | 15 - .../Kyoo.Transcoder/include/compatibility.h | 32 - back/src/Kyoo.Transcoder/include/export.h | 13 - back/src/Kyoo.Transcoder/include/helper.h | 16 - .../src/Kyoo.Transcoder/include/path_helper.h | 46 -- back/src/Kyoo.Transcoder/include/stream.h | 40 -- back/src/Kyoo.Transcoder/include/transcoder.h | 25 - back/src/Kyoo.Transcoder/src/compatibility.c | 49 -- back/src/Kyoo.Transcoder/src/destroyer.c | 22 - back/src/Kyoo.Transcoder/src/extractor.c | 145 ---- back/src/Kyoo.Transcoder/src/helper.c | 79 -- back/src/Kyoo.Transcoder/src/info.c | 116 --- back/src/Kyoo.Transcoder/src/path_helper.c | 78 -- back/src/Kyoo.Transcoder/src/transmuxer.c | 133 ---- back/src/Kyoo.Transcoder/tests/.gitignore | 5 - back/src/Kyoo.Transcoder/tests/test_main.c | 72 -- .../Kyoo.Tests/Transcoder/TranscoderTests.cs | 107 --- docker-compose.dev.yml | 1 - docker-compose.prod.yml | 1 - docker-compose.yml | 1 - 25 files changed, 3 insertions(+), 1736 deletions(-) delete mode 100644 back/src/Kyoo.Transcoder/.gitignore delete mode 100644 back/src/Kyoo.Transcoder/CMakeLists.txt delete mode 100644 back/src/Kyoo.Transcoder/LICENSE delete mode 100644 back/src/Kyoo.Transcoder/README.md delete mode 100644 back/src/Kyoo.Transcoder/include/compatibility.h delete mode 100644 back/src/Kyoo.Transcoder/include/export.h delete mode 100644 back/src/Kyoo.Transcoder/include/helper.h delete mode 100644 back/src/Kyoo.Transcoder/include/path_helper.h delete mode 100644 back/src/Kyoo.Transcoder/include/stream.h delete mode 100644 back/src/Kyoo.Transcoder/include/transcoder.h delete mode 100644 back/src/Kyoo.Transcoder/src/compatibility.c delete mode 100644 back/src/Kyoo.Transcoder/src/destroyer.c delete mode 100644 back/src/Kyoo.Transcoder/src/extractor.c delete mode 100644 back/src/Kyoo.Transcoder/src/helper.c delete mode 100644 back/src/Kyoo.Transcoder/src/info.c delete mode 100644 back/src/Kyoo.Transcoder/src/path_helper.c delete mode 100644 back/src/Kyoo.Transcoder/src/transmuxer.c delete mode 100644 back/src/Kyoo.Transcoder/tests/.gitignore delete mode 100644 back/src/Kyoo.Transcoder/tests/test_main.c delete mode 100644 back/tests/Kyoo.Tests/Transcoder/TranscoderTests.cs diff --git a/back/Dockerfile b/back/Dockerfile index 3bead739..fd30450e 100644 --- a/back/Dockerfile +++ b/back/Dockerfile @@ -1,9 +1,3 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as transcoder -RUN apt-get update && apt-get install -y cmake make libavutil-dev libavcodec-dev libavformat-dev -WORKDIR /transcoder -COPY src/Kyoo.Transcoder . -RUN cmake . && make -j - FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0 as builder ARG TARGETARCH WORKDIR /kyoo @@ -22,12 +16,11 @@ RUN dotnet restore -a $TARGETARCH COPY . . ARG VERSION -RUN dotnet publish -a $TARGETARCH --no-restore -c Release -o /app "-p:Version=${VERSION:-"0.0.0-dev"};SkipTranscoder=true" src/Kyoo.Host +RUN dotnet publish -a $TARGETARCH --no-restore -c Release -o /app "-p:Version=${VERSION:-"0.0.0-dev"}" src/Kyoo.Host FROM mcr.microsoft.com/dotnet/aspnet:7.0 -RUN apt-get update && apt-get install -y libavutil-dev libavcodec-dev libavformat-dev curl +RUN apt-get update && apt-get install -y curl COPY --from=builder /app /app -COPY --from=transcoder /transcoder/libtranscoder.so /app WORKDIR /kyoo EXPOSE 5000 diff --git a/back/Dockerfile.dev b/back/Dockerfile.dev index b2d05a93..4b37417b 100644 --- a/back/Dockerfile.dev +++ b/back/Dockerfile.dev @@ -1,12 +1,5 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as transcoder -# Using the dotnet sdk as a base image to have the same versions of glibc/ffmpeg -RUN apt-get update && apt-get install -y gcc cmake make libavutil-dev libavcodec-dev libavformat-dev -WORKDIR /transcoder -COPY src/Kyoo.Transcoder . -RUN cmake . && make -j - FROM mcr.microsoft.com/dotnet/sdk:7.0 -RUN apt-get update && apt-get install -y libavutil-dev libavcodec-dev libavformat-dev curl +RUN apt-get update && apt-get install -y curl WORKDIR /app COPY Kyoo.sln ./Kyoo.sln @@ -21,12 +14,9 @@ COPY src/Kyoo.Swagger/Kyoo.Swagger.csproj src/Kyoo.Swagger/Kyoo.Swagger.csproj COPY tests/Kyoo.Tests/Kyoo.Tests.csproj tests/Kyoo.Tests/Kyoo.Tests.csproj RUN dotnet restore -COPY --from=transcoder /transcoder/libtranscoder.so /lib/libtranscoder.so - WORKDIR /kyoo EXPOSE 5000 ENV DOTNET_USE_POLLING_FILE_WATCHER 1 HEALTHCHECK --interval=5s CMD curl --fail http://localhost:5000/health || exit -# ENV LD_DEBUG libs CMD dotnet watch run --no-restore --project /app/src/Kyoo.Host diff --git a/back/src/Kyoo.Transcoder/.gitignore b/back/src/Kyoo.Transcoder/.gitignore deleted file mode 100644 index c2d49478..00000000 --- a/back/src/Kyoo.Transcoder/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -.idea/* -cmake-build-debug/* -build/* -buildWin/* -buildOSX/* -tests/*.o -tests/ts -tests/*/* -.cache/ -compile_commands.json diff --git a/back/src/Kyoo.Transcoder/CMakeLists.txt b/back/src/Kyoo.Transcoder/CMakeLists.txt deleted file mode 100644 index c446443c..00000000 --- a/back/src/Kyoo.Transcoder/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -cmake_minimum_required(VERSION 3.12) -set(CMAKE_C_STANDARD 11) - -set(PROJECT_VERSION "1.0") -project(transcoder VERSION ${PROJECT_VERSION} LANGUAGES C) - -add_library(transcoder SHARED - src/helper.c - src/info.c - src/extractor.c - src/transmuxer.c - src/path_helper.c - src/destroyer.c - src/compatibility.c -) -set_property(TARGET transcoder PROPERTY C_STANDARD 11) -set_property(TARGET transcoder PROPERTY POSITION_INDEPENDENT_CODE ON) - -include_directories(include) -target_link_directories(transcoder PRIVATE ${CMAKE_SOURCE_DIR}/lib) - -target_link_libraries(transcoder avformat avcodec avutil) - -if(WIN32) - target_link_libraries(transcoder wsock32 ws2_32) - target_link_libraries(transcoder Secur32 Secur32) - target_link_libraries(transcoder Bcrypt Bcrypt) -else() - target_link_libraries(transcoder m pthread) -endif() - -add_executable(test EXCLUDE_FROM_ALL - tests/test_main.c -) -set_property(TARGET test PROPERTY C_STANDARD 11) -target_link_libraries(test transcoder) diff --git a/back/src/Kyoo.Transcoder/LICENSE b/back/src/Kyoo.Transcoder/LICENSE deleted file mode 100644 index f288702d..00000000 --- a/back/src/Kyoo.Transcoder/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/back/src/Kyoo.Transcoder/README.md b/back/src/Kyoo.Transcoder/README.md deleted file mode 100644 index 40f768a0..00000000 --- a/back/src/Kyoo.Transcoder/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Kyoo.Transcoder - -A C library using FFMPEG (libav) to process videos files for kyoo. - -## Features - - Return streams informations (language, title, codec, arrangement) - - Extract subtitles, fonts & chapters to an external file - - Transmux to hls (TODO support multi-audio) - -## Building - -To build this library, you will need a cmake compatible environment. If you are on linux, you can simply use cmake, make and gcc. -Simply run ```mkdir -p build; cd build; cmake ..; make -j``` and it will create a libtranscoder.so file. - -If you are on windows, I haven't tested the build process yet. It should work with minimal modification. diff --git a/back/src/Kyoo.Transcoder/include/compatibility.h b/back/src/Kyoo.Transcoder/include/compatibility.h deleted file mode 100644 index 51565653..00000000 --- a/back/src/Kyoo.Transcoder/include/compatibility.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// Created by Anonymus Raccoon on 16/12/2019. -// - -#pragma once - -#if defined(_WIN32) || defined(WIN32) - #define _CRT_SECURE_NO_WARNINGS - #define _CRT_NONSTDC_NO_DEPRECATE - - - #include - #include - #include - #include - - #pragma warning(disable : 5105) - #include - #define PATH_MAX MAX_PATH - - char *strndup(const char *str, size_t count); - int asprintf(char **buffer, const char *fmt, ...); - int vasprintf(char **buffer, const char *fmt, va_list args); - - #define S_ISDIR(x) ((x) & S_IFDIR) -#else - #define _GNU_SOURCE - - #include -#endif - -#include diff --git a/back/src/Kyoo.Transcoder/include/export.h b/back/src/Kyoo.Transcoder/include/export.h deleted file mode 100644 index 737e7850..00000000 --- a/back/src/Kyoo.Transcoder/include/export.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// Created by Anonymus Raccoon on 15/12/2019. -// - -#pragma once - -#if defined _WIN32 || defined __CYGWIN__ - #define API __declspec(dllexport) -#elif defined __GNUC__ - #define API __attribute__((unused)) -#else - #define API -#endif diff --git a/back/src/Kyoo.Transcoder/include/helper.h b/back/src/Kyoo.Transcoder/include/helper.h deleted file mode 100644 index 3cd6d318..00000000 --- a/back/src/Kyoo.Transcoder/include/helper.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// Created by Anonymus Raccoon on 15/12/2019. -// - -#pragma once - -#include -#include -#include -#include "stream.h" - -int open_input_context(AVFormatContext **inputContext, const char *path); -AVStream *copy_stream_to_output(AVFormatContext *out_ctx, AVStream *in_stream); -int open_output_file_for_write(AVFormatContext *out_ctx, const char *out_path, AVDictionary **options); -void process_packet(AVPacket *pkt, AVStream *in_stream, AVStream *out_stream); -type type_fromffmpeg(AVStream *stream); \ No newline at end of file diff --git a/back/src/Kyoo.Transcoder/include/path_helper.h b/back/src/Kyoo.Transcoder/include/path_helper.h deleted file mode 100644 index 4094c8e3..00000000 --- a/back/src/Kyoo.Transcoder/include/path_helper.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// Created by Zoe Roux on 2019-12-29. -// - -#pragma once - -/** - * A function that return a newly allocated string containing the filename - * without the extension of a path. - * - * @param path The path of the file to get the name for. - * @return The name of the the file without the extension - * @warning The returned string is malloced and should be freed after use. - */ -char *path_getfilename(const char *path); - -/** - * Get the extension that should be used for a specific codec. - * - * @param codec The name of the codec to get the extension for. - * @return A read only string containing the extension to use for the given - * codec or NULL if the codec is not known. - */ -char *get_extension_from_codec(char *codec); - -/** - * Create a new directory at the given path, if the directory already exists, - * do nothing and succeed. - * - * @param path The path of the directory to create - * @param mode The permissions flags (unused on windows) - * @return 0 if the directory was created without fail, the error code of mkdir otherwise - * (-1 and the errno set appropriately). - */ -int path_mkdir(const char *path, int mode); - -/** - * Create a new directory and create parent directories if needed. If the whole - * path tree already exists, do nothing and succeed. - * - * @param path The path of the directory to create. - * @param mode The permission flags of new directories (unused on windows) - * @return 0 if all directory were created without fail, the error code of mkdir otherwise - * (-1 and the errno set appropriately). - */ -int path_mkdir_p(const char *path, int mode); \ No newline at end of file diff --git a/back/src/Kyoo.Transcoder/include/stream.h b/back/src/Kyoo.Transcoder/include/stream.h deleted file mode 100644 index 3ff1f21e..00000000 --- a/back/src/Kyoo.Transcoder/include/stream.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// Created by Anonymus Raccoon on 16/12/2019. -// - -#pragma once -#include -#include -#include -#include - -#define AV_LOG_LEVEL AV_LOG_WARNING - -typedef enum -{ - none = 0, - video = 1, - audio = 2, - subtitle = 3, - attachment = 4 -} type; - -typedef struct stream -{ - char *title; - char *language; - char *codec; - bool is_default; - bool is_forced; - char *path; - type type; -} stream; - -void extract_track(stream *track, - const char *out_path, - AVStream *stream, - AVFormatContext *in_ctx, - AVFormatContext **out_ctx, - bool reextract); -void extract_attachment(stream *font, const char *out_path, AVStream *stream); -void extract_chapters(AVFormatContext *ctx, const char *out_path); \ No newline at end of file diff --git a/back/src/Kyoo.Transcoder/include/transcoder.h b/back/src/Kyoo.Transcoder/include/transcoder.h deleted file mode 100644 index 26f29410..00000000 --- a/back/src/Kyoo.Transcoder/include/transcoder.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// Created by Anonymus Raccoon on 15/12/2019. -// - - -#pragma once -#include "export.h" -#include "stream.h" - -API int init(); - -API int transmux(const char *path, const char *out_path, float *playable_duration); - -//API int transcode(const char *path, const char *out_path, float *playable_duration); - -API stream *extract_infos(const char *path, - const char *out_path, - unsigned *stream_count, - unsigned *track_count, - bool reextract); - -API void destroy_stream(stream *s); - -API void free_streams(stream *streamsPtr, unsigned count); - diff --git a/back/src/Kyoo.Transcoder/src/compatibility.c b/back/src/Kyoo.Transcoder/src/compatibility.c deleted file mode 100644 index 85783724..00000000 --- a/back/src/Kyoo.Transcoder/src/compatibility.c +++ /dev/null @@ -1,49 +0,0 @@ -// -// Created by Zoe Roux on 2021-04-15. -// - -#include "compatibility.h" -#include -#include -#include - -#if defined(_WIN32) || defined(WIN32) -char *strndup(const char *str, size_t count) -{ - size_t len = strnlen(str, count); - char *ret = malloc(sizeof(char) * (len + 1)); - - if (!ret) - return NULL; - ret[len] = '\0'; - memcpy(ret, str, len); - return ret; -} - -int asprintf(char **buffer, const char *fmt, ...) -{ - va_list args; - int ret; - - va_start(args, fmt); - ret = vasprintf(buffer, fmt, args); - va_end(args); - return ret; -} - -int vasprintf(char **buffer, const char *fmt, va_list args) -{ - va_list copy; - int len; - - va_copy(copy, args); - len = _vscprintf(fmt, args); - va_end(copy); - - *buffer = malloc(sizeof(char) * (len + 1)); - if (!*buffer) - return -1; - vsprintf(*buffer, fmt, args); - return len; -} -#endif \ No newline at end of file diff --git a/back/src/Kyoo.Transcoder/src/destroyer.c b/back/src/Kyoo.Transcoder/src/destroyer.c deleted file mode 100644 index bd5e50ba..00000000 --- a/back/src/Kyoo.Transcoder/src/destroyer.c +++ /dev/null @@ -1,22 +0,0 @@ -// -// Created by anonymus-raccoon on 12/29/19. -// - -#include "stream.h" -#include "export.h" -#include - -API void destroy_stream(stream *s) -{ - free(s->title); - free(s->language); - free(s->codec); - free(s->path); -} - -API void free_streams(stream *s, unsigned count) -{ - for (unsigned i = 0; i < count; i++) - destroy_stream(s + i); - free(s); -} diff --git a/back/src/Kyoo.Transcoder/src/extractor.c b/back/src/Kyoo.Transcoder/src/extractor.c deleted file mode 100644 index 3b5503eb..00000000 --- a/back/src/Kyoo.Transcoder/src/extractor.c +++ /dev/null @@ -1,145 +0,0 @@ -// -// Created by Zoe Roux on 2020-10-27. -// - -#include "compatibility.h" -#include "path_helper.h" -#include "stream.h" -#include "helper.h" -#include -#include -#include - -// @return -1 on error, 1 if track has already been extracted, 0 if the track does not exist. -int create_out_path(stream *track, const char *out_path, int track_id) -{ - char *file_name = path_getfilename(track->path); - char *extension = get_extension_from_codec(track->codec); - char identifier[20]; - - if (!extension || !file_name) { - free(file_name); - return -2; - } - free(track->path); - - if (!track->language || !strcmp(track->language, "und")) - snprintf(identifier, sizeof(identifier), "und-%d", track_id); - asprintf( - &track->path, - "%s/%s.%s%s%s%s", - out_path, - file_name, - track->language ? track->language : identifier, - track->is_default ? ".default" : "", - track->is_forced ? ".forced" : "", - extension - ); - free(file_name); - if (!track->path) - return -2; - struct stat s; - return stat(track->path, &s) == 0 && s.st_size > 0; -} - -int extract_stream(AVFormatContext **out_ctx, stream *s, AVFormatContext *int_ctx, AVStream *in_stream) -{ - AVStream *out_stream = NULL; - - if (avformat_alloc_output_context2(out_ctx, NULL, NULL, s->path) < 0) { - av_log(NULL, AV_LOG_ERROR, "Could not create an output file.\n"); - return -1; - } - - av_dict_copy(&(*out_ctx)->metadata, int_ctx->metadata, 0); - out_stream = copy_stream_to_output(*out_ctx, in_stream); - if (out_stream && open_output_file_for_write(*out_ctx, s->path, NULL) == 0) - return 0; - - if (*out_ctx && !((*out_ctx)->flags & AVFMT_NOFILE)) - avio_closep(&(*out_ctx)->pb); - avformat_free_context(*out_ctx); - av_log(NULL, AV_LOG_ERROR, "An error occurred, cleaning up the output context for the %s stream.\n", s->language); - *out_ctx = NULL; - return -1; -} - -void extract_track(stream *track, - const char *out_path, - AVStream *stream, - AVFormatContext *in_ctx, - AVFormatContext **out_ctx, - bool reextract) -{ - int ret = create_out_path(track, out_path, stream->id); - if (ret == 0 || (reextract && ret == 1)) - extract_stream(out_ctx, track, in_ctx, stream); -} - -void extract_attachment(stream *font, const char *out_path, AVStream *stream) -{ - AVDictionaryEntry *filename = av_dict_get(stream->metadata, "filename", NULL, 0); - - if (!filename) - return; - free(font->path); - font->path = malloc((strlen(out_path) + 18 + strlen(filename->value)) * sizeof(char)); - if (!font->path) - return; - strcpy(font->path, out_path); - strcat(font->path, "/Attachments/"); - if (path_mkdir(font->path, 0755) < 0) { - free(font->path); - return; - } - strcat(font->path, filename->value); - size_t count = strchr(filename->value, '.') - filename->value; - if (count > 0) - font->title = strndup(filename->value, count); - - int fd = open(font->path, O_WRONLY | O_CREAT, 0644); - if (fd == -1) { - av_log(NULL, AV_LOG_ERROR, "Could not extract an attachment (%s).\n", strerror(errno)); - return; - } - write(fd, stream->codecpar->extradata, stream->codecpar->extradata_size); - close(fd); -} - -void extract_chapters(AVFormatContext *ctx, const char *out_path) -{ - if (ctx->nb_chapters == 0) - return; - - const char *filename = strrchr(ctx->url, '/'); - char *path = malloc((strlen(filename) + strlen(out_path) + 15) * sizeof(char)); - char *tmp; - - if (!path) - return; - strcpy(path, out_path); - strcat(path, "/Chapters/"); - if (path_mkdir_p(path, 0755) < 0) - return; - strcat(path, filename); - tmp = strrchr(path, '.'); - if (tmp) - *tmp = '\0'; - strcat(path, ".txt"); - - FILE *file = fopen(path, "w"); - - for (unsigned i = 0; i < ctx->nb_chapters; i++) { - AVDictionaryEntry *name = av_dict_get(ctx->chapters[i]->metadata, "title", NULL, 0); - if (!name) - continue; - const AVChapter *chapter = ctx->chapters[i]; - if (chapter->start == AV_NOPTS_VALUE || chapter->end == AV_NOPTS_VALUE) - continue; - double start = chapter->start * av_q2d(chapter->time_base); - double end = chapter->end * av_q2d(chapter->time_base); - fprintf(file, "%f %f %s\n", start, end, name->value); - } - fclose(file); - free(path); -} diff --git a/back/src/Kyoo.Transcoder/src/helper.c b/back/src/Kyoo.Transcoder/src/helper.c deleted file mode 100644 index eee0c1bd..00000000 --- a/back/src/Kyoo.Transcoder/src/helper.c +++ /dev/null @@ -1,79 +0,0 @@ -// -// Created by Zoe Roux on 2019-12-20. -// - -#include -#include "helper.h" -#include "stream.h" - -int open_input_context(AVFormatContext **in_ctx, const char *path) -{ - if (avformat_open_input(in_ctx, path, NULL, NULL)) { - av_log(NULL, AV_LOG_ERROR, "Can't open the file at %s.\n", path); - return 1; - } - if (avformat_find_stream_info(*in_ctx, NULL) < 0) { - av_log(NULL, AV_LOG_ERROR, "Could not find streams information for the file at %s.\n", path); - return 1; - } - return 0; -} - -AVStream *copy_stream_to_output(AVFormatContext *out_ctx, AVStream *in_stream) -{ - AVStream *out_stream = avformat_new_stream(out_ctx, NULL); - - if (out_stream == NULL) { - av_log(NULL, AV_LOG_ERROR, "Couldn't create stream.\n"); - return NULL; - } - if (avcodec_parameters_copy(out_stream->codecpar, in_stream->codecpar) < 0) { - av_log(NULL, AV_LOG_ERROR, "Could not copy parameters to the output file.\n"); - return NULL; - } - out_stream->codecpar->codec_tag = 0; - return out_stream; -} - -int open_output_file_for_write(AVFormatContext *out_ctx, const char *out_path, AVDictionary **options) -{ - if (!(out_ctx->oformat->flags & AVFMT_NOFILE)) { - if (avio_open(&out_ctx->pb, out_path, AVIO_FLAG_WRITE) < 0) { - av_log(NULL, AV_LOG_ERROR, "Could not open file for write at %s.\n", out_path); - return 1; - } - } - - if (avformat_write_header(out_ctx, options) < 0) { - if (!(out_ctx->oformat->flags & AVFMT_NOFILE)) - avio_close(out_ctx->pb); - av_log(NULL, AV_LOG_ERROR, "Could not write headers to file at %s.\n", out_path); - return 1; - } - return 0; -} - -void process_packet(AVPacket *pkt, AVStream *in_stream, AVStream *out_stream) -{ - pkt->pts = av_rescale_q_rnd(pkt->pts, in_stream->time_base, out_stream->time_base, AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX); - pkt->dts = av_rescale_q_rnd(pkt->dts, in_stream->time_base, out_stream->time_base, AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX); - pkt->duration = av_rescale_q(pkt->duration, in_stream->time_base, out_stream->time_base); - pkt->pos = -1; -} - -type type_fromffmpeg(AVStream *stream) -{ - switch (stream->codecpar->codec_type) - { - case AVMEDIA_TYPE_VIDEO: - return video; - case AVMEDIA_TYPE_AUDIO: - return audio; - case AVMEDIA_TYPE_SUBTITLE: - return subtitle; - case AVMEDIA_TYPE_ATTACHMENT: - return attachment; - default: - return none; - } -} \ No newline at end of file diff --git a/back/src/Kyoo.Transcoder/src/info.c b/back/src/Kyoo.Transcoder/src/info.c deleted file mode 100644 index 84a8cb26..00000000 --- a/back/src/Kyoo.Transcoder/src/info.c +++ /dev/null @@ -1,116 +0,0 @@ -// -// Created by Anonymus Raccoon on 20/12/2019. -// - -#include -#include -#include "export.h" -#include "stream.h" -#include "helper.h" - -API int init() -{ - puts("Kyoo's transcoder initiated."); - return sizeof(stream); -} - -void write_to_outputs(AVFormatContext **output_list, AVFormatContext *in_ctx) -{ - AVPacket pkt; - - while (av_read_frame(in_ctx, &pkt) == 0) { - AVFormatContext *out_ctx; - - if ((unsigned)pkt.stream_index >= in_ctx->nb_streams) - continue; - out_ctx = output_list[pkt.stream_index]; - if (!out_ctx) { - av_packet_unref(&pkt); - continue; - } - process_packet(&pkt, in_ctx->streams[pkt.stream_index], out_ctx->streams[0]); - pkt.stream_index = 0; - if (av_interleaved_write_frame(out_ctx, &pkt) < 0) - av_log(NULL, AV_LOG_ERROR, "Error while writing a packet to the output file.\n"); - av_packet_unref(&pkt); - } - - for (unsigned i = 0; i < in_ctx->nb_streams; i++) { - AVFormatContext *out_ctx = output_list[i]; - - if (!out_ctx) - continue; - av_write_trailer(out_ctx); - if (!(out_ctx->flags & AVFMT_NOFILE)) - avio_closep(&out_ctx->pb); - avformat_free_context(out_ctx); - } -} - -bool list_empty(void **list, unsigned count) -{ - for (unsigned i = 0; i < count; i++) - if (list[i]) - return false; - return true; -} - -stream parse_stream(AVStream *stream, type stream_type, const char *path) -{ - const AVCodecParameters *codecpar = stream->codecpar; - AVDictionaryEntry *languageptr = av_dict_get(stream->metadata, "language", NULL, 0); - - return (struct stream){ - NULL, - languageptr ? strdup(languageptr->value) : NULL, - strdup(avcodec_get_name(codecpar->codec_id)), - stream->disposition & AV_DISPOSITION_DEFAULT, - stream->disposition & AV_DISPOSITION_FORCED, - strdup(path), - stream_type - }; -} - -API stream *extract_infos(const char *path, - const char *out_path, - unsigned *stream_count, - unsigned *track_count, - bool reextract) -{ - AVFormatContext *ctx = NULL; - AVFormatContext **output_list; - stream *streams; - - if (open_input_context(&ctx, path) != 0) - return NULL; - *stream_count = ctx->nb_streams; - *track_count = 0; - streams = calloc(ctx->nb_streams, sizeof(stream)); - output_list = calloc(ctx->nb_streams, sizeof(AVFormatContext *)); - - if (output_list && streams) { - extract_chapters(ctx, out_path); - for (unsigned i = 0; i < *stream_count; i++) { - AVStream *stream = ctx->streams[i]; - type stream_type = type_fromffmpeg(stream); - - if (stream_type == none) - continue; - *track_count += 1; - streams[i] = parse_stream(stream, stream_type, path); - if (stream_type == subtitle) - extract_track(&streams[i], out_path, stream, ctx, &output_list[i], reextract); - if (stream_type == attachment) - extract_attachment(&streams[i], out_path, stream); - } - } - if (!list_empty((void **)output_list, ctx->nb_streams)) - write_to_outputs(output_list, ctx); - avformat_close_input(&ctx); - if (!output_list) { - free(streams); - return NULL; - } - free(output_list); - return streams; -} \ No newline at end of file diff --git a/back/src/Kyoo.Transcoder/src/path_helper.c b/back/src/Kyoo.Transcoder/src/path_helper.c deleted file mode 100644 index e1b826bc..00000000 --- a/back/src/Kyoo.Transcoder/src/path_helper.c +++ /dev/null @@ -1,78 +0,0 @@ -// -// Created by Zoe Roux on 2019-12-29. -// - -#include "compatibility.h" -#include -#include -#include -#include -#include - - -char *path_getfilename(const char *path) -{ - const char *lastSlash = strrchr(path, '/'); - const char *name = lastSlash ? lastSlash + 1 : path; - const char *extension = strrchr(path, '.'); - size_t len = extension ? extension - name : 1024; - - return strndup(name, len); -} - -char *get_extension_from_codec(char *codec) -{ - if (!codec) - return NULL; - - if (!strcmp(codec, "subrip")) - return ".srt"; - if (!strcmp(codec, "ass")) - return ".ass"; - if (!strcmp(codec, "ttf")) - return ".ttf"; - - av_log(NULL, AV_LOG_ERROR, "Unsupported subtitle codec: %s.\n", codec); - return NULL; -} - -int path_mkdir(const char *path, int mode) -{ - int ret; - struct stat s; - - if (!path) - return -1; - -#if defined(_WIN32) || defined(WIN32) - (void)mode; - ret = mkdir(path); -#else - ret = mkdir(path, mode); -#endif - - if (ret < 0 && errno == EEXIST && stat(path, &s) == 0) { - if (S_ISDIR(s.st_mode)) - return 0; - } - return ret; -} - -int path_mkdir_p(const char *path, int mode) -{ - char buffer[PATH_MAX + 5]; - char *ptr = buffer + 1; // Skipping the first '/' - int ret; - - strcpy(buffer, path); - - while ((ptr = strchr(ptr, '/'))) { - *ptr = '\0'; - ret = path_mkdir(buffer, mode); - if (ret != 0) - return ret; - *ptr = '/'; - ptr++; - } - return path_mkdir(path, mode); -} \ No newline at end of file diff --git a/back/src/Kyoo.Transcoder/src/transmuxer.c b/back/src/Kyoo.Transcoder/src/transmuxer.c deleted file mode 100644 index 49f6297d..00000000 --- a/back/src/Kyoo.Transcoder/src/transmuxer.c +++ /dev/null @@ -1,133 +0,0 @@ -// -// Created by Anonymus Raccoon on 20/12/2019. -// - -#include "compatibility.h" -#include "export.h" -#include "transcoder.h" -#include "helper.h" -#include "path_helper.h" -#include - -static bool should_copy_to_transmuxed(enum AVMediaType codec_type) -{ - if (codec_type == AVMEDIA_TYPE_VIDEO) - return true; - if (codec_type == AVMEDIA_TYPE_AUDIO) - return true; - return false; -} - -static int *prepare_streammap(AVFormatContext *in_ctx, AVFormatContext *out_ctx) -{ - int *stream_map = malloc(sizeof(int) * in_ctx->nb_streams); - int stream_count = 0; - AVStream *stream; - - if (!stream_map) - return NULL; - for (unsigned i = 0; i < in_ctx->nb_streams; i++) { - stream = in_ctx->streams[i]; - if (should_copy_to_transmuxed(stream->codecpar->codec_type)) { - stream_map[i] = stream_count; - stream_count++; - if (!copy_stream_to_output(out_ctx, stream)) { - free(stream_map); - return NULL; - } - } else - stream_map[i] = -1; - } - return stream_map; -} - -static AVDictionary *create_options_context(const char *out_path) -{ - AVDictionary *options = NULL; - char *seg_path = av_malloc(sizeof(char) * strlen(out_path) + 22); - int folder_index; - - if (!seg_path) - return NULL; - folder_index = (int)(strrchr(out_path, '/') - out_path); - sprintf(seg_path, "%.*s/segments/", folder_index, out_path); - if (path_mkdir(seg_path, 0755) < 0) { - av_log(NULL, AV_LOG_ERROR, "Couldn't create segment output folder (%s). " - "Part of the output path does not exist or you don't have write rights.\n", seg_path); - return NULL; - } - strcat(seg_path, "%v-%03d.ts"); - av_dict_set(&options, "hls_segment_filename", seg_path, AV_DICT_DONT_STRDUP_VAL); - av_dict_set(&options, "hls_base_url", "segments/", 0); - av_dict_set(&options, "hls_list_size", "0", 0); - av_dict_set(&options, "streaming", "1", 0); - return options; -} - -static void write_to_output(AVFormatContext *in_ctx, - AVFormatContext *out_ctx, - const int *stream_map, - float *playable_duration) -{ - AVPacket pkt; - AVStream *istream; - AVStream *ostream; - unsigned index; - - while (av_read_frame(in_ctx, &pkt) == 0) { - index = pkt.stream_index; - if (index >= in_ctx->nb_streams || stream_map[index] < 0) { - av_packet_unref(&pkt); - continue; - } - istream = in_ctx->streams[index]; - ostream = out_ctx->streams[stream_map[index]]; - pkt.stream_index = stream_map[index]; - process_packet(&pkt, istream, ostream); - if (pkt.stream_index == 0) - *playable_duration += pkt.duration * (float)ostream->time_base.num / ostream->time_base.den; - if (av_interleaved_write_frame(out_ctx, &pkt) < 0) - av_log(NULL, AV_LOG_ERROR, "Error while writing a packet to the output file\n"); - av_packet_unref(&pkt); - } -} - -API int transmux(const char *path, const char *out_path, float *playable_duration) -{ - AVFormatContext *in_ctx = NULL; - AVFormatContext *out_ctx = NULL; - AVDictionary *options = NULL; - int ret = -1; - int *stream_map; - - *playable_duration = 0; - av_log_set_level(AV_LOG_LEVEL); - if (open_input_context(&in_ctx, path) != 0) { - av_log(NULL, AV_LOG_ERROR, "Could not open the input file for transmux\n"); - return -1; - } - if (avformat_alloc_output_context2(&out_ctx, NULL, NULL, out_path) < 0) { - av_log(NULL, AV_LOG_ERROR, "Could not create an output file for transmux\n"); - avformat_close_input(&in_ctx); - return -1; - } - stream_map = prepare_streammap(in_ctx, out_ctx); - options = create_options_context(out_path); - - av_dump_format(in_ctx, 0, path, 0); - av_dump_format(out_ctx, 0, out_path, 1); - - if (stream_map && open_output_file_for_write(out_ctx, out_path, &options) == 0) { - write_to_output(in_ctx, out_ctx, stream_map, playable_duration); - av_write_trailer(out_ctx); - if (out_ctx && !(out_ctx->oformat->flags & AVFMT_NOFILE)) - avio_close(out_ctx->pb); - ret = 0; - } - if (options) - av_dict_free(&options); - avformat_close_input(&in_ctx); - avformat_free_context(out_ctx); - free(stream_map); - return ret; -} \ No newline at end of file diff --git a/back/src/Kyoo.Transcoder/tests/.gitignore b/back/src/Kyoo.Transcoder/tests/.gitignore deleted file mode 100644 index 113a0d87..00000000 --- a/back/src/Kyoo.Transcoder/tests/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -segments/ -out.m3u8 -*.o -vgcore.* -out diff --git a/back/src/Kyoo.Transcoder/tests/test_main.c b/back/src/Kyoo.Transcoder/tests/test_main.c deleted file mode 100644 index fba69376..00000000 --- a/back/src/Kyoo.Transcoder/tests/test_main.c +++ /dev/null @@ -1,72 +0,0 @@ -// -// Created by anonymus-raccoon on 12/28/19. -// - -#include -#include -#include "transcoder.h" -#include "stream.h" - -const char *type_tostring(type t) -{ - switch (t) { - case video: - return "Video"; - case audio: - return "Audio"; - case subtitle: - return "Subtitle"; - case attachment: - return "Attachment"; - default: - return "???"; - } -} - -void av_dic_dump(AVDictionary *dic) -{ - AVDictionaryEntry *entry = NULL; - - if (!dic) - return; - while ((entry = av_dict_get(dic, "", entry, AV_DICT_IGNORE_SUFFIX))) - printf("%s: %s\n", entry->key, entry->value); - printf("Done\n"); - fflush(stdout); -} - - -int main(int argc, char **argv) -{ - unsigned stream_count = 0; - unsigned track_count = 0; - float playable_duration; - stream *streams; - - // Useless reference only to have the function on the binary to call it with a debugger. - av_dic_dump(NULL); - - if ((argc == 3 || argc == 4) && !strcmp(argv[1], "info")) { - streams = extract_infos(argv[2], argv[3] ? argv[3] : "./Extra", &stream_count, &track_count, true); - puts("Info extracted:"); - for (unsigned i = 0; i < track_count; i++) { - printf("%10s: %6s - %3s (%5s), D%d, F%d at %s\n", - type_tostring(streams[i].type), - streams[i].title, - streams[i].language != NULL ? streams[i].language : "X", - streams[i].codec, - streams[i].is_default, - streams[i].is_forced, - streams[i].path); - } - free_streams(streams, stream_count); - return 0; - } - else if (argc == 4 && !strcmp(argv[1], "transmux")) - return -transmux(argv[2], argv[3], &playable_duration); - else - printf("Usage:\n\ - %s info video_path - Test info prober\n\ - %s transmux video_path m3u8_output_file - Test transmuxing\n", argv[0], argv[0]); - return 0; -} diff --git a/back/tests/Kyoo.Tests/Transcoder/TranscoderTests.cs b/back/tests/Kyoo.Tests/Transcoder/TranscoderTests.cs deleted file mode 100644 index 3d0a38d3..00000000 --- a/back/tests/Kyoo.Tests/Transcoder/TranscoderTests.cs +++ /dev/null @@ -1,107 +0,0 @@ -// Kyoo - A portable and vast media library solution. -// Copyright (c) Kyoo. -// -// See AUTHORS.md and LICENSE file in the project root for full license information. -// -// Kyoo 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 -// any later version. -// -// Kyoo 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 Kyoo. If not, see . - -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Kyoo.Abstractions.Controllers; -using Kyoo.Abstractions.Models; -using Kyoo.Core.Models.Options; -using Microsoft.Extensions.Options; -using Moq; -using Xunit; -using Xunit.Abstractions; - -using KTranscoder = Kyoo.Core.Controllers.Transcoder; - -namespace Kyoo.Tests.Transcoder -{ - public class TranscoderTests - { - private readonly Mock _files; - private readonly ITranscoder _transcoder; - - public TranscoderTests(ITestOutputHelper output) - { - _files = new Mock(); - _transcoder = new KTranscoder( - _files.Object, - Options.Create(new BasicOptions()), - output.BuildLoggerFor() - ); - } - - [Fact] - public async Task ListFontsTest() - { - Episode episode = TestSample.Get(); - _files.Setup(x => x.ListFiles(It.IsAny(), System.IO.SearchOption.TopDirectoryOnly)) - .ReturnsAsync(new[] { "font.ttf", "font.TTF", "toto.ttf" }); - ICollection fonts = await _transcoder.ListFonts(episode); - List fontsFiles = fonts.Select(x => x.File).ToList(); - Assert.Equal(3, fonts.Count); - Assert.Contains("font.TTF", fontsFiles); - Assert.Contains("font.ttf", fontsFiles); - Assert.Contains("toto.ttf", fontsFiles); - } - - [Fact] - public async Task GetNoFontTest() - { - Episode episode = TestSample.Get(); - _files.Setup(x => x.GetExtraDirectory(It.IsAny())) - .ReturnsAsync("/path"); - _files.Setup(x => x.ListFiles(It.IsAny(), System.IO.SearchOption.TopDirectoryOnly)) - .ReturnsAsync(new[] { "font.ttf", "font.TTF", "toto.ttf" }); - Font font = await _transcoder.GetFont(episode, "toto.ttf"); - Assert.Null(font); - } - - [Fact] - public async Task GetFontTest() - { - Episode episode = TestSample.Get(); - _files.Setup(x => x.GetExtraDirectory(It.IsAny())) - .ReturnsAsync("/path"); - _files.Setup(x => x.ListFiles(It.IsAny(), System.IO.SearchOption.TopDirectoryOnly)) - .ReturnsAsync(new[] { "/path/font.ttf", "/path/font.TTF", "/path/toto.ttf" }); - Font font = await _transcoder.GetFont(episode, "toto"); - Assert.NotNull(font); - Assert.Equal("toto.ttf", font.File); - Assert.Equal("toto", font.Slug); - Assert.Equal("ttf", font.Format); - Assert.Equal("/path/toto.ttf", font.Path); - } - - [Fact] - public async Task GetFontNoExtensionTest() - { - Episode episode = TestSample.Get(); - _files.Setup(x => x.GetExtraDirectory(It.IsAny())) - .ReturnsAsync("/path"); - _files.Setup(x => x.ListFiles(It.IsAny(), System.IO.SearchOption.TopDirectoryOnly)) - .ReturnsAsync(new[] { "/path/font", "/path/toto.ttf" }); - Font font = await _transcoder.GetFont(episode, "font"); - Assert.NotNull(font); - Assert.Equal("font", font.File); - Assert.Equal("font", font.Slug); - Assert.Equal("", font.Format); - Assert.Equal("/path/font", font.Path); - } - } -} diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 53c9f06c..5dd99093 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -17,7 +17,6 @@ services: - ./back:/app - /app/out/ - kyoo:/kyoo - - ${LIBRARY_ROOT}:/video front: build: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index dddb7e13..8575399b 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -11,7 +11,6 @@ services: condition: service_healthy volumes: - kyoo:/kyoo - - ${LIBRARY_ROOT}:/video front: image: zoriya/kyoo_front:edge diff --git a/docker-compose.yml b/docker-compose.yml index 8ed6c818..77b0e42c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,6 @@ services: condition: service_healthy volumes: - kyoo:/kyoo - - ${LIBRARY_ROOT}:/video front: build: ./front