diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 31a434f5..9e2e14dc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -4,7 +4,7 @@ android:versionName="4.0" > + android:minSdkVersion="14" + android:targetSdkVersion="19" /> diff --git a/LICENSE b/LICENSE index 94a9ed02..d6456956 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,202 @@ - 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 -. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index 680fcd3b..21eb1997 100644 --- a/README.md +++ b/README.md @@ -4,26 +4,68 @@ **libstreaming** is an API that allows you, with only a few lines of code, to stream the camera and/or microphone of an android powered device using RTP over UDP. -* Supported encoders includes H.264, H.263, AAC and AMR -* Since version 2.0, a basic support for RTCP has been implemented. -* libstreaming also features a RTSP server for easy remote control of the phone camera and microphone. +* Android 4.0 or more recent is required. +* Supported encoders include H.264, H.263, AAC and AMR. -The full javadoc documentation of the API is available here: http://dallens.fr/majorkernelpanic/libstreaming/ +The first step you will need to achieve to start a streaming session to some peer is called 'signaling'. During this step you will contact the receiver and send a description of the incomming streams. You have three ways to do that with libstreaming. -## How it does it +* With the RTSP client: if you want to stream to a Wowza Media Server, it's the way to go. [The example 3](https://github.com/fyhertz/libstreaming-examples#example-3) illustrates that use case. +* With the RTSP server: in that case the phone will act as a RTSP server and wait for a RTSP client to request a stream. This use case is illustated in [the example 1](https://github.com/fyhertz/libstreaming-examples#example-1). +* Or you use libstreaming without using the RTSP protocol at all, and signal the session using SDP over a protocol you like. [The example 2](https://github.com/fyhertz/libstreaming-examples#example-2) illustrates that use case. -libstreaming uses various tricks to make streaming possible without the need of any native code. Access to the devices camera(s) and microphone is achieved by simply using a **MediaRecorder**, but configured to write to a **LocalSocket** instead of a regular file ( **MediaStream.java** ). Raw data from the peripheral are then processed in a thread doing syncronous read at the other end of the **LocalSocket**. Voila ! +The full javadoc documentation of the API is available here: http://guigui.us/libstreaming/doc -What the thread actually does is this: it waits for data from the peripheral and then packetizes it to make it fit into proper RTP packets that are then sent one by one on the network. The packetization algorithm that must be used for H.264, H.263, AMR and AAC are all specified in their respective RFC: +## How does it work? You should really read this, it's important! -* RFC 3984 for H.264 -* RFC 4629 for H.263 -* RFC 3267 for AMR -* RFC 3640 for AAC +There are three ways on Android to get encoded data from the peripherals: -Therefore, depending on the nature of the data, the packetizer will be one out of the four packetizers implemented in the rtp package of libstreaming: **H264Packetizer.java**, **H263Packetizer.java**, **AACADTSPacketizer.java** or **AMRNBPacketizer.java**. I took the time to add lots of comments in those files so if you are looking for a basic implementation of one of the RFC mentionned above, they might come in handy. +* With the **MediaRecorder** API and a simple hack. +* With the **MediaCodec** API and the buffer-to-buffer method which requires Android 4.1. +* With the **MediaCodec** API and the surface-to-buffer method which requires Android 4.3. -RTCP packets are also sent by this thread since version 2.0 of libstreaming. Only Sender Reports are implemented. +### Encoding with the MediaRecorder API + +The **MediaRecorder** API was not intended for streaming applications but can be used to retrieve encoded data from the peripherals of the phone. The trick is to configure a MediaRecorder instance to write to a **LocalSocket** instead of a regular file (see **MediaStream.java**). + +Edit: as of Android Lollipop using a **LocalSocket** is not possible anymore for security reasons. But using a [**ParcelFileDescriptor**](http://developer.android.com/reference/android/os/ParcelFileDescriptor.html) does the trick. More details in the file **MediaStream.java**! ([Thanks to those guys for the insight](http://stackoverflow.com/questions/26990816/mediarecorder-issue-on-android-lollipop)) + +This hack has some limitations: +* Lip sync can be approximative. +* The MediaRecorder internal buffers can lead to some important jitter. libstreaming tries to compensate that jitter. + +It's hard to tell how well this hack is going to work on a phone. It does work well on many devices though. + +### Encoding with the MediaCodec API + +The **MediaCodec** API do not present the limitations I just mentionned, but has its own issues. There are actually two ways to use the MediaCodec API: with buffers or with a surface. + +The buffer-to-buffer method uses calls to [**dequeueInputBuffer**](http://developer.android.com/reference/android/media/MediaCodec.html#dequeueInputBuffer(long)) and [**queueInputBuffer**](http://developer.android.com/reference/android/media/MediaCodec.html#queueInputBuffer(int, int, int, long, int)) to feed the encoder with raw data. +That seems easy right ? Well it's not, because video encoders that you get access to with this API are using different color formats and you need to support all of them. A list of those color formats is available [here](http://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html). Moreover, many encoders claim support for color formats they don't actually support properly or can present little glitches. + +All the [**hw**](http://guigui.us/libstreaming/doc/net/majorkernelpanic/streaming/hw/package-summary.html) package is dedicated to solving those issues. See in particular [**EncoderDebugger**](http://guigui.us/libstreaming/doc/net/majorkernelpanic/streaming/hw/EncoderDebugger.html) class. + +If streaming with that API fails, libstreaming fallbacks on streaming with the **MediaRecorder API**. + +The surface-to-buffer method uses the [createInputSurface()](http://developer.android.com/reference/android/media/MediaCodec.html#createInputSurface()) method. This method is probably the best way to encode raw video from the camera but it requires android 4.3 and up. + +The [**gl**](http://guigui.us/libstreaming/doc/net/majorkernelpanic/streaming/gl/package-summary.html) package is dedicated to using the MediaCodec API with a surface. + +It is not yet enabled by default in libstreaming but you can force it with the [**setStreamingMethod(byte)**](http://guigui.us/libstreaming/doc/net/majorkernelpanic/streaming/MediaStream.html#setStreamingMethod(byte)) method. + +### Packetization process + +Once raw data from the peripherals has been encoded, it is encapsulated in a proper RTP stream. The packetization algorithm that must be used depends on the format of the data (H.264, H.263, AMR and AAC) and are all specified in their respective RFC: + +* RFC 3984 for H.264: **H264Packetizer.java** +* RFC 4629 for H.263: **H263Packetizer.java** +* RFC 3267 for AMR: **AMRNBPacketizer.java** +* RFC 3640 for AAC: **AACADTSPacketizer.java** or **AACLATMPacketizer.java** + +If you are looking for a basic implementation of one of the RFC mentionned above, check the sources of corresponding class. + +RTCP packets are also sent to the receiver since version 2.0 of libstreaming. Only Sender Reports are implemented. They are actually needed for lip sync. + +The [**rtp**](http://guigui.us/libstreaming/doc/net/majorkernelpanic/streaming/rtp/package-summary.html) package handles packetization of encoded data in RTP packets. # Using libstreaming in your app @@ -36,32 +78,125 @@ RTCP packets are also sent by this thread since version 2.0 of libstreaming. Onl ``` -And if you intend to use multicasting, add this one to the list: - -```xml - -``` - ## How to stream H.264 and AAC +This example is extracted from [this simple android app](https://github.com/fyhertz/libstreaming-examples#example-2). This could be a part of an Activity, a Fragment or a Service. + ```java -Session session = SessionBuilder.getInstance() - .setSurfaceHolder(mSurfaceView.getHolder()) - .setContext(getApplicationContext()) - .setAudioEncoder(SessionBuilder.AUDIO_AAC) - .setVideoEncoder(SessionBuilder.VIDEO_H264) - .build(); + protected void onCreate(Bundle savedInstanceState) { + + ... + + mSession = SessionBuilder.getInstance() + .setCallback(this) + .setSurfaceView(mSurfaceView) + .setPreviewOrientation(90) + .setContext(getApplicationContext()) + .setAudioEncoder(SessionBuilder.AUDIO_NONE) + .setAudioQuality(new AudioQuality(16000, 32000)) + .setVideoEncoder(SessionBuilder.VIDEO_H264) + .setVideoQuality(new VideoQuality(320,240,20,500000)) + .build(); + + mSurfaceView.getHolder().addCallback(this); + + ... + + } + + public void onPreviewStarted() { + Log.d(TAG,"Preview started."); + } + + @Override + public void onSessionConfigured() { + Log.d(TAG,"Preview configured."); + // Once the stream is configured, you can get a SDP formated session description + // that you can send to the receiver of the stream. + // For example, to receive the stream in VLC, store the session description in a .sdp file + // and open it with VLC while streming. + Log.d(TAG, mSession.getSessionDescription()); + mSession.start(); + } + + @Override + public void onSessionStarted() { + Log.d(TAG,"Streaming session started."); + ... + } + + @Override + public void onSessionStopped() { + Log.d(TAG,"Streaming session stopped."); + ... + } + + @Override + public void onBitrateUpdate(long bitrate) { + // Informs you of the bandwidth consumption of the streams + Log.d(TAG,"Bitrate: "+bitrate); + } + + @Override + public void onSessionError(int message, int streamType, Exception e) { + // Might happen if the streaming at the requested resolution is not supported + // or if the preview surface is not ready... + // Check the Session class for a list of the possible errors. + Log.e(TAG, "An error occured", e); + } + + @Override + public void surfaceChanged(SurfaceHolder holder, int format, int width, + int height) { + + } + + @Override + public void surfaceCreated(SurfaceHolder holder) { + // Starts the preview of the Camera + mSession.startPreview(); + } + + @Override + public void surfaceDestroyed(SurfaceHolder holder) { + // Stops the streaming session + mSession.stop(); + } -session.setDestination(destination); -String sdp = session.getSessionDescription(); -session.start(); ``` -The **SessionBuilder** simply facilitates the creation of **Session** objects. The call to **setSurfaceHolder** is needed for video streaming, that should not come up as a surprise since Android requires a valid surface for recording video (It's an ennoying limitation of the **MediaRecorder** API). The call to **setContext** is optional but recommanded, it allows **H264Stream** objects and **AACStream** objects to store and recover data in the **SharedPreferences** of your app. Check the implementation of those two classes to find out exactly what data are stored. +The **SessionBuilder** simply facilitates the creation of **Session** objects. The call to **setSurfaceView** is needed for video streaming, that should not come up as a surprise since Android requires a valid surface for recording video (it's an annoying limitation of the **MediaRecorder** API). On Android 4.3, streaming with no **SurfaceView** is possible but not yet implemented. The call to **setContext(Context)** is necessary, it allows **H264Stream** objects and **AACStream** objects to store and recover data using **SharedPreferences**. + +A **Session** object represents a streaming session to some peer. It contains one or more **Stream** objects that are started (resp. stopped) when the **start()** (resp. **stop()**) method is invoked. + +The method **getSessionDescription()** will return a SDP of the session in the form of a String. Before calling it, you must make sure that the **Session** has been configured. After calling **configure()** or **startPreview()** on you Session instance, the callback **onSessionConfigured()** will be called. -**Session** objects represents a streaming session to some peer. It contains one or more **Stream** objects that are started (resp. stopped) when the start() (resp. stop()) method is invoked. The method **setDestination** allows you to specify the ip address to which RTP and RTCP packets will be sent. The method **getSessionDescription** will return a SDP of the session in the form of a String. +**In the example presented above, the Session instance is used in an asynchronous manner and calls to its methods do not block. You know when stuff is done when callbacks are called.** -The complete source code of this example is available here: https://github.com/fyhertz/libstreaming-examples +**You can also use a Session object in a synchronous manner like that:** + +```java + // Blocks until the all streams are configured + try { + mSession.syncConfigure(); + } catch (Exception e) { + ... + } + Strinf sdp = mSession.getSessionDescription(); + ... + // Blocks until streaming actually starts. + try { + mSession.syncStart(); + } catch (Exception e) { + ... + } + ... + mSession.syncStop(); +``` + +## How to use the RTSP client + +Check out [this page of the wiki](https://github.com/fyhertz/libstreaming/wiki/Using-libstreaming-with-Wowza-Media-Server) and the [example 3](https://github.com/fyhertz/libstreaming-examples#example-3). ## How to use the RTSP server @@ -102,18 +237,7 @@ context.startService(new Intent(this,RtspServer.class)); context.stopService(new Intent(this,RtspServer.class)); ``` -# Class diagramm - -![Class Diagram](http://dallens.fr/majorkernelpanic/libstreaming/ClassDiagram.png "Class diagram") - -*SessionBuilder* and *RtspServer* are the class that you will want to use directly, they make use of everything else in the streaming package. - # Spydroid-ipcamera Visit [this github page](https://github.com/fyhertz/spydroid-ipcamera) to see how this streaming stack can be used and how it performs. -Further information about Spydroid can be found on the google page of the project [here](https://spydroid-ipcamera.googlecode.com). -The app. is also available on google play [here](https://play.google.com/store/apps/details?id=net.majorkernelpanic.spydroid). - -# Licensing -This streaming stack is available under two licenses, the GPL and a commercial license. *If you are willing to integrate this project into a close source application, please contact me at fyhertz at gmail.com*. Thank you. \ No newline at end of file diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html index 3748072f..647e7252 100644 --- a/doc/allclasses-frame.html +++ b/doc/allclasses-frame.html @@ -2,13 +2,14 @@ - + All Classes - + + -

All Classes

+

All Classes

  • AACADTSPacketizer
    • @@ -21,6 +22,7 @@

    All Classes

  • AudioStream
  • CameraInUseException
  • CodecManager
    • +
  • CodecManager
  • ConfNotSupportedException
  • EncoderDebugger
  • H263Packetizer
    • @@ -31,18 +33,19 @@

    All Classes

  • MediaCodecInputStream
  • MediaStream
  • MP4Config
    • +
  • MP4Parser
  • NV21Convertor
  • RtpSocket
  • RtspClient
    • -
  • RtspClient.Callback
    • +
  • RtspClient.Callback
  • RtspServer
    • -
  • RtspServer.CallbackListener
    • +
  • RtspServer.CallbackListener
  • SenderReport
  • Session
    • -
  • Session.Callback
    • +
  • Session.Callback
  • SessionBuilder
  • StorageUnavailableException
    • -
  • Stream
    • +
  • Stream
  • SurfaceManager
  • SurfaceView
  • TextureManager
    • diff --git a/doc/allclasses-noframe.html b/doc/allclasses-noframe.html index 734dc3ea..89a8ef5f 100644 --- a/doc/allclasses-noframe.html +++ b/doc/allclasses-noframe.html @@ -2,13 +2,14 @@ - + All Classes - + + -

    All Classes

    +

    All Classes

    • AACADTSPacketizer
      • @@ -21,6 +22,7 @@

      All Classes

    • AudioStream
    • CameraInUseException
    • CodecManager
      • +
    • CodecManager
    • ConfNotSupportedException
    • EncoderDebugger
    • H263Packetizer
      • @@ -31,18 +33,19 @@

      All Classes

    • MediaCodecInputStream
    • MediaStream
    • MP4Config
      • +
    • MP4Parser
    • NV21Convertor
    • RtpSocket
    • RtspClient
      • -
    • RtspClient.Callback
      • +
    • RtspClient.Callback
    • RtspServer
      • -
    • RtspServer.CallbackListener
      • +
    • RtspServer.CallbackListener
    • SenderReport
    • Session
      • -
    • Session.Callback
      • +
    • Session.Callback
    • SessionBuilder
    • StorageUnavailableException
      • -
    • Stream
      • +
    • Stream
    • SurfaceManager
    • SurfaceView
    • TextureManager
      • diff --git a/doc/constant-values.html b/doc/constant-values.html index bb2a3b27..22c46765 100644 --- a/doc/constant-values.html +++ b/doc/constant-values.html @@ -2,15 +2,20 @@ - + Constant Field Values - + + @@ -18,9 +23,11 @@
      JavaScript is disabled on your browser.
      -
      +
      - + +
      Skip navigation links
      +
        @@ -40,10 +47,10 @@
      - +
      @@ -74,7 +81,7 @@

      Contents

      net.majorkernelpanic.*

      • - +
        @@ -103,11 +110,25 @@

        net.majorkernelpanic.*

        + + + + + + + + + +
        net.majorkernelpanic.streaming.MediaStream 
        Modifier and Type MODE_MEDIARECORDER_API 1
        + +public static final bytePIPE_API_LS1
        + +public static final bytePIPE_API_PFD2
      • - +
        @@ -189,7 +210,7 @@

        net.majorkernelpanic.*

        net.majorkernelpanic.streaming.Session 
        Modifier and Type
      • - +
        @@ -252,7 +273,7 @@

        net.majorkernelpanic.*

        • -
        net.majorkernelpanic.streaming.SessionBuilder 
        Modifier and Type
        +
        @@ -273,7 +294,7 @@

        net.majorkernelpanic.*

        • -
        net.majorkernelpanic.streaming.audio.AACStream 
        Modifier and Type
        +
        @@ -292,7 +313,7 @@

        net.majorkernelpanic.*

        net.majorkernelpanic.streaming.gl.SurfaceManager 
        Modifier and Type
      • - +
        @@ -301,17 +322,31 @@

        net.majorkernelpanic.*

        + + + + + + + + + + - +
        net.majorkernelpanic.streaming.gl.SurfaceView 
        Modifier and Type
        + +public static final intASPECT_RATIO_PREVIEW1
        + +public static final intASPECT_RATIO_STRETCH0
        public static final java.lang.String TAG"GLSurfaceView""SurfaceView"
      • - +
        @@ -332,7 +367,7 @@

        net.majorkernelpanic.*

        • -
        net.majorkernelpanic.streaming.gl.TextureManager 
        Modifier and Type
        +
        @@ -351,7 +386,7 @@

        net.majorkernelpanic.*

        net.majorkernelpanic.streaming.hw.CodecManager 
        Modifier and Type
      • - +
        @@ -372,7 +407,7 @@

        net.majorkernelpanic.*

        • -
        net.majorkernelpanic.streaming.hw.EncoderDebugger 
        Modifier and Type
        +
        @@ -393,7 +428,7 @@

        net.majorkernelpanic.*

        • -
        net.majorkernelpanic.streaming.mp4.MP4Config 
        Modifier and Type
        +
        @@ -414,7 +449,7 @@

        net.majorkernelpanic.*

        • -
        net.majorkernelpanic.streaming.rtcp.SenderReport 
        Modifier and Type
        +
        @@ -433,7 +468,7 @@

        net.majorkernelpanic.*

        net.majorkernelpanic.streaming.rtp.AMRNBPacketizer 
        Modifier and Type
      • - +
        @@ -452,7 +487,7 @@

        net.majorkernelpanic.*

        net.majorkernelpanic.streaming.rtp.H263Packetizer 
        Modifier and Type
      • - +
        @@ -471,7 +506,7 @@

        net.majorkernelpanic.*

        net.majorkernelpanic.streaming.rtp.H264Packetizer 
        Modifier and Type
      • - +
        @@ -490,7 +525,7 @@

        net.majorkernelpanic.*

        net.majorkernelpanic.streaming.rtp.MediaCodecInputStream 
        Modifier and Type
      • - +
        @@ -519,13 +554,27 @@

        net.majorkernelpanic.*

        + + + + + + + + + +
        net.majorkernelpanic.streaming.rtp.RtpSocket 
        Modifier and Type TAG "RtpSocket"
        + +public static final intTRANSPORT_TCP1
        + +public static final intTRANSPORT_UDP0
      • - +
        @@ -568,11 +617,25 @@

        net.majorkernelpanic.*

        + + + + + + + + + +
        net.majorkernelpanic.streaming.rtsp.RtspClient 
        Modifier and Type TAG "RtspClient"
        + +public static final intTRANSPORT_TCP1
        + +public static final intTRANSPORT_UDP0
      • - +
        @@ -640,7 +703,7 @@

        net.majorkernelpanic.*

        net.majorkernelpanic.streaming.rtsp.RtspServer 
        Modifier and Type
      • - +
        @@ -661,7 +724,26 @@

        net.majorkernelpanic.*

        • -
        net.majorkernelpanic.streaming.rtsp.UriParser 
        Modifier and Type
        +
        + + + + + + + + + + + + + +
        net.majorkernelpanic.streaming.video.CodecManager 
        Modifier and TypeConstant FieldValue
        + +public static final java.lang.StringTAG"CodecManager"
        +
        • +
      • + @@ -680,7 +762,7 @@

        net.majorkernelpanic.*

        net.majorkernelpanic.streaming.video.H264Stream 
        Modifier and Type
      • - +
        @@ -701,9 +783,11 @@

        net.majorkernelpanic.*

        -
        +
        - + +
        Skip navigation links
        +
          @@ -723,10 +807,10 @@

          net.majorkernelpanic.*

        - +
        diff --git a/doc/deprecated-list.html b/doc/deprecated-list.html index fdb771e8..0313f15d 100644 --- a/doc/deprecated-list.html +++ b/doc/deprecated-list.html @@ -2,15 +2,20 @@ - + Deprecated List - + + @@ -18,9 +23,11 @@
        JavaScript is disabled on your browser.
        -
        +
        - + +
        Skip navigation links
        +
          @@ -40,10 +47,10 @@
        - +
        @@ -66,9 +73,11 @@

        Deprecated API

        Contents

        -
        +
        - + +
        Skip navigation links
        +
          @@ -88,10 +97,10 @@

          Contents

        - +
        diff --git a/doc/help-doc.html b/doc/help-doc.html index af856106..cbf11898 100644 --- a/doc/help-doc.html +++ b/doc/help-doc.html @@ -2,15 +2,20 @@ - + API Help - + + @@ -18,9 +23,11 @@
        JavaScript is disabled on your browser.
        -
        +
        - + +
        Skip navigation links
        +
          @@ -40,10 +47,10 @@
        - +
        @@ -165,11 +172,13 @@

        Constant Field Values

        The Constant Field Values page lists the static final fields and their values.

        -This help file applies to API documentation generated using the standard doclet.
        +This help file applies to API documentation generated using the standard doclet.
        -
        +
        - + +
        Skip navigation links
        +
          @@ -189,10 +198,10 @@

          Constant Field Values

        - +
        diff --git a/doc/index-all.html b/doc/index-all.html index 3b2de3b8..4834f59c 100644 --- a/doc/index-all.html +++ b/doc/index-all.html @@ -2,15 +2,20 @@ - + Index - - + + + @@ -18,19 +23,21 @@
        JavaScript is disabled on your browser.
        -
        +
        - + +
        Skip navigation links
        +
        @@ -39,11 +46,11 @@
      • Next
        • - +
        -
        A B C D E F G H I K M N O P R S T U V  +
        A B C D E F G H I K L M N O P R S T U V 

        A

        -
        AACADTSPacketizer - Class in net.majorkernelpanic.streaming.rtp
        +
        AACADTSPacketizer - Class in net.majorkernelpanic.streaming.rtp
        RFC 3640.
        -
        AACADTSPacketizer() - Constructor for class net.majorkernelpanic.streaming.rtp.AACADTSPacketizer
        +
        AACADTSPacketizer() - Constructor for class net.majorkernelpanic.streaming.rtp.AACADTSPacketizer
         
        -
        AACLATMPacketizer - Class in net.majorkernelpanic.streaming.rtp
        +
        AACLATMPacketizer - Class in net.majorkernelpanic.streaming.rtp
        RFC 3640.
        -
        AACLATMPacketizer() - Constructor for class net.majorkernelpanic.streaming.rtp.AACLATMPacketizer
        +
        AACLATMPacketizer() - Constructor for class net.majorkernelpanic.streaming.rtp.AACLATMPacketizer
         
        -
        AACStream - Class in net.majorkernelpanic.streaming.audio
        +
        AACStream - Class in net.majorkernelpanic.streaming.audio
        A class for streaming AAC from the camera of an android device using RTP.
        -
        AACStream() - Constructor for class net.majorkernelpanic.streaming.audio.AACStream
        +
        AACStream() - Constructor for class net.majorkernelpanic.streaming.audio.AACStream
         
        -
        AbstractPacketizer - Class in net.majorkernelpanic.streaming.rtp
        +
        AbstractPacketizer - Class in net.majorkernelpanic.streaming.rtp
        Each packetizer inherits from this one and therefore uses RTP and UDP.
        -
        AbstractPacketizer() - Constructor for class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        +
        AbstractPacketizer() - Constructor for class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
         
        -
        addAudioTrack(AudioStream) - Method in class net.majorkernelpanic.streaming.Session
        -
         
        -
        addCallbackListener(RtspServer.CallbackListener) - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        addCallbackListener(RtspServer.CallbackListener) - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        -
        See RtspServer.CallbackListener to check out what events will be fired once you set up a listener.
        +
        See RtspServer.CallbackListener to check out what events will be fired once you set up a listener.
        -
        addMediaCodecSurface(Surface) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
        -
         
        -
        addVideoTrack(VideoStream) - Method in class net.majorkernelpanic.streaming.Session
        +
        addMediaCodecSurface(Surface) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
         
        -
        AMRNBPacketizer - Class in net.majorkernelpanic.streaming.rtp
        +
        AMRNBPacketizer - Class in net.majorkernelpanic.streaming.rtp
        RFC 3267.
        -
        AMRNBPacketizer() - Constructor for class net.majorkernelpanic.streaming.rtp.AMRNBPacketizer
        +
        AMRNBPacketizer() - Constructor for class net.majorkernelpanic.streaming.rtp.AMRNBPacketizer
         
        -
        AMRNBStream - Class in net.majorkernelpanic.streaming.audio
        +
        AMRNBStream - Class in net.majorkernelpanic.streaming.audio
        A class for streaming AAC from the camera of an android device using RTP.
        -
        AMRNBStream() - Constructor for class net.majorkernelpanic.streaming.audio.AMRNBStream
        +
        AMRNBStream() - Constructor for class net.majorkernelpanic.streaming.audio.AMRNBStream
         
        -
        asyncDebug(Context, int, int) - Static method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        +
        ASPECT_RATIO_PREVIEW - Static variable in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        +
        The aspect ratio of the surface view will be equal + to the aspect ration of the camera preview.
        +
        +
        ASPECT_RATIO_STRETCH - Static variable in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        +
        The surface view will fill completely fill its parent.
        +
        +
        asyncDebug(Context, int, int) - Static method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
         
        -
        AUDIO_AAC - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        +
        AUDIO_AAC - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Can be used with SessionBuilder.setAudioEncoder(int).
        +
        Can be used with SessionBuilder.setAudioEncoder(int).
        -
        AUDIO_AMRNB - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        +
        AUDIO_AMRNB - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Can be used with SessionBuilder.setAudioEncoder(int).
        +
        Can be used with SessionBuilder.setAudioEncoder(int).
        -
        AUDIO_NONE - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        +
        AUDIO_NONE - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Can be used with SessionBuilder.setAudioEncoder(int).
        +
        Can be used with SessionBuilder.setAudioEncoder(int).
        -
        AUDIO_SAMPLING_RATES - Static variable in class net.majorkernelpanic.streaming.audio.AACStream
        +
        AUDIO_SAMPLING_RATES - Static variable in class net.majorkernelpanic.streaming.audio.AACStream
        There are 13 supported frequencies by ADTS.
        -
        AudioQuality - Class in net.majorkernelpanic.streaming.audio
        +
        AudioQuality - Class in net.majorkernelpanic.streaming.audio
        A class that represents the quality of an audio stream.
        -
        AudioQuality() - Constructor for class net.majorkernelpanic.streaming.audio.AudioQuality
        +
        AudioQuality() - Constructor for class net.majorkernelpanic.streaming.audio.AudioQuality
        Represents a quality for a video stream.
        -
        AudioQuality(int, int) - Constructor for class net.majorkernelpanic.streaming.audio.AudioQuality
        +
        AudioQuality(int, int) - Constructor for class net.majorkernelpanic.streaming.audio.AudioQuality
        Represents a quality for an audio stream.
        -
        AudioStream - Class in net.majorkernelpanic.streaming.audio
        +
        AudioStream - Class in net.majorkernelpanic.streaming.audio
        Don't use this class directly.
        -
        AudioStream() - Constructor for class net.majorkernelpanic.streaming.audio.AudioStream
        +
        AudioStream() - Constructor for class net.majorkernelpanic.streaming.audio.AudioStream
         
        -
        available() - Method in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
        +
        available() - Method in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
         
        - +

        B

        -
        bitRate - Variable in class net.majorkernelpanic.streaming.audio.AudioQuality
        +
        bitRate - Variable in class net.majorkernelpanic.streaming.audio.AudioQuality
         
        -
        bitrate - Variable in class net.majorkernelpanic.streaming.video.VideoQuality
        +
        bitrate - Variable in class net.majorkernelpanic.streaming.video.VideoQuality
         
        -
        build() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        build() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Creates a new Session.
        +
        Creates a new Session.
        - +

        C

        -
        CameraInUseException - Exception in net.majorkernelpanic.streaming.exceptions
        +
        CameraInUseException - Exception in net.majorkernelpanic.streaming.exceptions
         
        -
        CameraInUseException(String) - Constructor for exception net.majorkernelpanic.streaming.exceptions.CameraInUseException
        +
        CameraInUseException(String) - Constructor for exception net.majorkernelpanic.streaming.exceptions.CameraInUseException
         
        -
        changeFragmentShader(String) - Method in class net.majorkernelpanic.streaming.gl.TextureManager
        +
        changeFragmentShader(String) - Method in class net.majorkernelpanic.streaming.gl.TextureManager
        Replaces the fragment shader.
        -
        checkGlError(String) - Method in class net.majorkernelpanic.streaming.gl.TextureManager
        +
        checkGlError(String) - Method in class net.majorkernelpanic.streaming.gl.TextureManager
         
        -
        clone() - Method in class net.majorkernelpanic.streaming.audio.AudioQuality
        +
        clone() - Method in class net.majorkernelpanic.streaming.audio.AudioQuality
         
        -
        clone() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        clone() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns a new SessionBuilder with the same configuration.
        +
        Returns a new SessionBuilder with the same configuration.
        -
        clone() - Method in class net.majorkernelpanic.streaming.video.VideoQuality
        +
        clone() - Method in class net.majorkernelpanic.streaming.video.VideoQuality
        +
         
        +
        close() - Method in class net.majorkernelpanic.streaming.mp4.MP4Parser
         
        -
        close() - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        close() - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
         
        -
        close() - Method in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
        +
        close() - Method in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
         
        -
        close() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        close() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        Closes the underlying socket.
        -
        CodecManager - Class in net.majorkernelpanic.streaming.hw
        +
        CodecManager - Class in net.majorkernelpanic.streaming.hw
        +
         
        +
        CodecManager() - Constructor for class net.majorkernelpanic.streaming.hw.CodecManager
        +
         
        +
        CodecManager - Class in net.majorkernelpanic.streaming.video
         
        -
        CodecManager() - Constructor for class net.majorkernelpanic.streaming.hw.CodecManager
        +
        CodecManager() - Constructor for class net.majorkernelpanic.streaming.video.CodecManager
         
        -
        commitBuffer() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        commitBuffer() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        Puts the buffer back into the FIFO without sending the packet.
        -
        commitBuffer(int) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        commitBuffer(int) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        Sends the RTP packet over the network.
        -
        configure() - Method in class net.majorkernelpanic.streaming.audio.AACStream
        +
        configure() - Method in class net.majorkernelpanic.streaming.audio.AACStream
         
        -
        configure() - Method in class net.majorkernelpanic.streaming.audio.AMRNBStream
        +
        configure() - Method in class net.majorkernelpanic.streaming.audio.AMRNBStream
         
        -
        configure() - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        configure() - Method in class net.majorkernelpanic.streaming.MediaStream
        Configures the stream with the settings supplied with - setVideoQuality(net.majorkernelpanic.streaming.video.VideoQuality) - for a VideoStream and AudioStream.setAudioQuality(net.majorkernelpanic.streaming.audio.AudioQuality) - for a AudioStream.
        + setVideoQuality(net.majorkernelpanic.streaming.video.VideoQuality) + for a VideoStream and AudioStream.setAudioQuality(net.majorkernelpanic.streaming.audio.AudioQuality) + for a AudioStream.
        -
        configure() - Method in class net.majorkernelpanic.streaming.Session
        +
        configure() - Method in class net.majorkernelpanic.streaming.Session
        Configures all streams of the session.
        -
        configure() - Method in interface net.majorkernelpanic.streaming.Stream
        +
        configure() - Method in interface net.majorkernelpanic.streaming.Stream
        Configures the stream.
        -
        configure() - Method in class net.majorkernelpanic.streaming.video.H263Stream
        +
        configure() - Method in class net.majorkernelpanic.streaming.video.H263Stream
         
        -
        configure() - Method in class net.majorkernelpanic.streaming.video.H264Stream
        +
        configure() - Method in class net.majorkernelpanic.streaming.video.H264Stream
        Configures the stream.
        -
        configure() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        configure() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Configures the stream.
        -
        ConfNotSupportedException - Exception in net.majorkernelpanic.streaming.exceptions
        +
        ConfNotSupportedException - Exception in net.majorkernelpanic.streaming.exceptions
         
        -
        ConfNotSupportedException(String) - Constructor for exception net.majorkernelpanic.streaming.exceptions.ConfNotSupportedException
        +
        ConfNotSupportedException(String) - Constructor for exception net.majorkernelpanic.streaming.exceptions.ConfNotSupportedException
         
        -
        convert(byte[], ByteBuffer) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        convert(byte[], ByteBuffer) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        convert(byte[]) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        convert(byte[]) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        createTexture() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
        +
        createTexture() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
        Initializes GL state.
        - +

        D

        -
        debug(Context, int, int) - Static method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        +
        debug(Context, int, int) - Static method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
         
        -
        debug(SharedPreferences, int, int) - Static method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        +
        debug(SharedPreferences, int, int) - Static method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
         
        -
        DEFAULT_AUDIO_QUALITY - Static variable in class net.majorkernelpanic.streaming.audio.AudioQuality
        +
        DEFAULT_AUDIO_QUALITY - Static variable in class net.majorkernelpanic.streaming.audio.AudioQuality
        Default audio stream quality.
        -
        DEFAULT_RTSP_PORT - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        DEFAULT_RTSP_PORT - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Port used by default.
        -
        DEFAULT_VIDEO_QUALITY - Static variable in class net.majorkernelpanic.streaming.video.VideoQuality
        +
        DEFAULT_VIDEO_QUALITY - Static variable in class net.majorkernelpanic.streaming.video.VideoQuality
        Default video stream quality.
        -
        determineClosestSupportedResolution(Camera.Parameters, VideoQuality) - Static method in class net.majorkernelpanic.streaming.video.VideoQuality
        +
        determineClosestSupportedResolution(Camera.Parameters, VideoQuality) - Static method in class net.majorkernelpanic.streaming.video.VideoQuality
        Checks if the requested resolution is supported by the camera.
        -
        determineMaximumSupportedFramerate(Camera.Parameters) - Static method in class net.majorkernelpanic.streaming.video.VideoQuality
        +
        determineMaximumSupportedFramerate(Camera.Parameters) - Static method in class net.majorkernelpanic.streaming.video.VideoQuality
         
        -
        drawFrame() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
        +
        drawFrame() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
         
        - +

        E

        -
        EncoderDebugger - Class in net.majorkernelpanic.streaming.hw
        +
        EncoderDebugger - Class in net.majorkernelpanic.streaming.hw
        The purpose of this class is to detect and by-pass some bugs (or underspecified configuration) that encoders available through the MediaCodec API may have.
        -
        equals(AudioQuality) - Method in class net.majorkernelpanic.streaming.audio.AudioQuality
        +
        equals(AudioQuality) - Method in class net.majorkernelpanic.streaming.audio.AudioQuality
         
        -
        equals(VideoQuality) - Method in class net.majorkernelpanic.streaming.video.VideoQuality
        +
        equals(VideoQuality) - Method in class net.majorkernelpanic.streaming.video.VideoQuality
         
        -
        ERROR_BIND_FAILED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        ERROR_BIND_FAILED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Port already in use.
        -
        ERROR_CAMERA_ALREADY_IN_USE - Static variable in class net.majorkernelpanic.streaming.Session
        +
        ERROR_CAMERA_ALREADY_IN_USE - Static variable in class net.majorkernelpanic.streaming.Session
        Some app is already using a camera (Camera.open() has failed).
        -
        ERROR_CAMERA_HAS_NO_FLASH - Static variable in class net.majorkernelpanic.streaming.Session
        +
        ERROR_CAMERA_HAS_NO_FLASH - Static variable in class net.majorkernelpanic.streaming.Session
        The phone has no flash.
        -
        ERROR_CONFIGURATION_NOT_SUPPORTED - Static variable in class net.majorkernelpanic.streaming.Session
        +
        ERROR_CONFIGURATION_NOT_SUPPORTED - Static variable in class net.majorkernelpanic.streaming.Session
        -
        The phone may not support some streaming parameters that you are using (bit rate, frame rate...s).
        +
        The phone may not support some streaming parameters that you are trying to use (bit rate, frame rate, resolution...).
        -
        ERROR_CONNECTION_FAILED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        ERROR_CONNECTION_FAILED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
        Message sent when the connection to the RTSP server failed.
        -
        ERROR_CONNECTION_LOST - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        ERROR_CONNECTION_LOST - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
        Message sent when the connection with the RTSP server has been lost for some reason (for example, the user is going under a bridge).
        -
        ERROR_INVALID_SURFACE - Static variable in class net.majorkernelpanic.streaming.Session
        +
        ERROR_INVALID_SURFACE - Static variable in class net.majorkernelpanic.streaming.Session
        The supplied SurfaceView is not a valid surface, or has not been created yet.
        -
        ERROR_OTHER - Static variable in class net.majorkernelpanic.streaming.Session
        +
        ERROR_OTHER - Static variable in class net.majorkernelpanic.streaming.Session
        -
        Some other error occured !
        +
        Some other error occurred !
        -
        ERROR_START_FAILED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        ERROR_START_FAILED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        A stream could not be started.
        -
        ERROR_STORAGE_NOT_READY - Static variable in class net.majorkernelpanic.streaming.Session
        +
        ERROR_STORAGE_NOT_READY - Static variable in class net.majorkernelpanic.streaming.Session
        The internal storage of the phone is not ready.
        -
        ERROR_UNKNOWN_HOST - Static variable in class net.majorkernelpanic.streaming.Session
        +
        ERROR_UNKNOWN_HOST - Static variable in class net.majorkernelpanic.streaming.Session
        -
        The destination set with Session.setDestination(String) could not be resolved.
        +
        The destination set with Session.setDestination(String) could not be resolved.
        -
        ERROR_WRONG_CREDENTIALS - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        ERROR_WRONG_CREDENTIALS - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
        Message sent when the credentials are wrong.
        - +

        F

        -
        findDecodersForMimeType(String) - Static method in class net.majorkernelpanic.streaming.hw.CodecManager
        -
         
        -
        findEncodersForMimeType(String) - Static method in class net.majorkernelpanic.streaming.hw.CodecManager
        -
         
        -
        framerate - Variable in class net.majorkernelpanic.streaming.video.VideoQuality
        +
        findDecodersForMimeType(String) - Static method in class net.majorkernelpanic.streaming.hw.CodecManager
        +
        +
        Lists all decoders that claim to support a color format that we know how to use.
        +
        +
        findEncodersForMimeType(String) - Static method in class net.majorkernelpanic.streaming.hw.CodecManager
        +
        +
        Lists all encoders that claim to support a color format that we know how to use.
        +
        +
        framerate - Variable in class net.majorkernelpanic.streaming.video.VideoQuality
         
        - +

        G

        -
        getAudioEncoder() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getAspectRatio() - Method in class net.majorkernelpanic.streaming.gl.SurfaceView.ViewAspectRatioMeasurer
        +
         
        +
        getAudioEncoder() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns the audio encoder set with SessionBuilder.setAudioEncoder(int).
        +
        Returns the audio encoder set with SessionBuilder.setAudioEncoder(int).
        -
        getAudioQuality() - Method in class net.majorkernelpanic.streaming.audio.AudioStream
        +
        getAudioQuality() - Method in class net.majorkernelpanic.streaming.audio.AudioStream
        Returns the quality of the stream.
        -
        getAudioQuality() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getAudioQuality() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns the AudioQuality set with SessionBuilder.setAudioQuality(AudioQuality).
        +
        Returns the AudioQuality set with SessionBuilder.setAudioQuality(AudioQuality).
        -
        getAudioTrack() - Method in class net.majorkernelpanic.streaming.Session
        -
         
        -
        getB64PPS() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        +
        getAudioTrack() - Method in class net.majorkernelpanic.streaming.Session
        +
        +
        Returns the underlying AudioStream used by the Session.
        +
        +
        getB64PPS() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
         
        -
        getB64PPS() - Method in class net.majorkernelpanic.streaming.mp4.MP4Config
        +
        getB64PPS() - Method in class net.majorkernelpanic.streaming.mp4.MP4Config
         
        -
        getB64SPS() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        +
        getB64SPS() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
         
        -
        getB64SPS() - Method in class net.majorkernelpanic.streaming.mp4.MP4Config
        +
        getB64SPS() - Method in class net.majorkernelpanic.streaming.mp4.MP4Config
         
        -
        getBitrate() - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        getBitrate() - Method in class net.majorkernelpanic.streaming.MediaStream
        Returns an approximation of the bit rate consumed by the stream in bit per seconde.
        -
        getBitrate() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        getBitrate() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        -
        Returns an approximation of the bitrate of the RTP stream in bit per seconde.
        +
        Returns an approximation of the bitrate of the RTP stream in bits per second.
        -
        getBitrate() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        getBitrate() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Returns the bandwidth consumed by the RTSP server in bits per second.
        -
        getBitrate() - Method in class net.majorkernelpanic.streaming.Session
        +
        getBitrate() - Method in class net.majorkernelpanic.streaming.Session
        -
        Returns an approximation of the bandwidth consumed by the session in bit per seconde.
        +
        Returns an approximation of the bandwidth consumed by the session in bit per second.
        -
        getBitrate() - Method in interface net.majorkernelpanic.streaming.Stream
        +
        getBitrate() - Method in interface net.majorkernelpanic.streaming.Stream
        Returns an approximation of the bit rate consumed by the stream in bit per seconde.
        -
        getBufferSize() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        getBoxPos(String) - Method in class net.majorkernelpanic.streaming.mp4.MP4Parser
         
        -
        getCallback() - Method in class net.majorkernelpanic.streaming.Session
        +
        getBufferSize() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
         
        +
        getCallback() - Method in class net.majorkernelpanic.streaming.Session
        -
        Returns the Session.Callback interface that was set with - Session.setCallback(Callback) or null if none was set.
        +
        Returns the Session.Callback interface that was set with + Session.setCallback(Callback) or null if none was set.
        -
        getCamera() - Method in class net.majorkernelpanic.streaming.Session
        -
         
        -
        getCamera() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getCamera() - Method in class net.majorkernelpanic.streaming.Session
        -
        Returns the id of the Camera set with SessionBuilder.setCamera(int).
        +
        Returns the id of the camera currently selected.
        -
        getCamera() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        -
         
        -
        getContext() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getCamera() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        +
        Returns the id of the android.hardware.Camera set with SessionBuilder.setCamera(int).
        +
        +
        getCamera() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        +
        Returns the id of the camera currently selected.
        +
        +
        getContext() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns the context set with SessionBuilder.setContext(Context)
        +
        Returns the context set with SessionBuilder.setContext(Context)
        -
        getDestination() - Method in class net.majorkernelpanic.streaming.Session
        +
        getDestination() - Method in class net.majorkernelpanic.streaming.Session
        -
        Returns the destination set with Session.setDestination(String).
        +
        Returns the destination set with Session.setDestination(String).
        -
        getDestination() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getDestination() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns the destination ip address set with SessionBuilder.setDestination(String).
        +
        Returns the destination ip address set with SessionBuilder.setDestination(String).
        -
        getDestinationPorts() - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        getDestinationPorts() - Method in class net.majorkernelpanic.streaming.MediaStream
        Returns a pair of destination ports, the first one is the one used for RTP and the second one is used for RTCP.
        -
        getDestinationPorts() - Method in interface net.majorkernelpanic.streaming.Stream
        +
        getDestinationPorts() - Method in interface net.majorkernelpanic.streaming.Stream
        Returns a pair of destination ports, the first one is the one used for RTP and the second one is used for RTCP.
        -
        getEncoderColorFormat() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        +
        getEncoderColorFormat() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
         
        -
        getEncoderName() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        +
        getEncoderName() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
         
        -
        getErrorLog() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        +
        getErrorLog() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        -
        A log of all the errors that occured during the test.
        +
        A log of all the errors that occurred during the test.
        -
        getFlashState() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getFlashState() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns the flash state set with SessionBuilder.setFlashEnabled(boolean).
        +
        Returns the flash state set with SessionBuilder.setFlashEnabled(boolean).
        -
        getFlashState() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        getFlashState() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Indicates whether or not the flash of the phone is on.
        -
        getInstance() - Static method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getInstance() - Static method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns a reference to the SessionBuilder.
        +
        Returns a reference to the SessionBuilder.
        -
        getLastBufferInfo() - Method in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
        +
        getLastBufferInfo() - Method in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
         
        -
        getLocalPort() - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        getLocalPort() - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
         
        -
        getLocalPort() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        -
         
        -
        getLocalPorts() - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        getLocalPorts() - Method in class net.majorkernelpanic.streaming.MediaStream
        Returns a pair of source ports, the first one is the one used for RTP and the second one is used for RTCP.
        -
        getLocalPorts() - Method in interface net.majorkernelpanic.streaming.Stream
        +
        getLocalPorts() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
         
        +
        getLocalPorts() - Method in interface net.majorkernelpanic.streaming.Stream
        Returns a pair of source ports, the first one is the one used for RTP and the second one is used for RTCP.
        -
        getNV21Convertor() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        +
        getMeasuredHeight() - Method in class net.majorkernelpanic.streaming.gl.SurfaceView.ViewAspectRatioMeasurer
        +
        +
        Get the height measured in the latest call to measure().
        +
        +
        getMeasuredWidth() - Method in class net.majorkernelpanic.streaming.gl.SurfaceView.ViewAspectRatioMeasurer
        -
        This NV21Convertor will do the necessary work to feed properly the encoder.
        +
        Get the width measured in the latest call to measure().
        -
        getOrigin() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getNV21Convertor() - Method in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        -
        Returns the origin ip address set with SessionBuilder.setOrigin(String).
        +
        This NV21Convertor will do the necessary work to feed properly the encoder.
        -
        getPacketizer() - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        getOrigin() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns the packetizer associated with the MediaStream.
        +
        Returns the origin ip address set with SessionBuilder.setOrigin(String).
        -
        getPlanar() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        getPacketizer() - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        +
        Returns the packetizer associated with the MediaStream.
        +
        +
        getPlanar() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        getPort() - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        getPort() - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
         
        -
        getPort() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        getPort() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
         
        -
        getPort() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        getPort() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Returns the port used by the RTSP server.
        -
        getProfileLevel() - Method in class net.majorkernelpanic.streaming.mp4.MP4Config
        -
         
        -
        getRtcpSocket() - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        +
        getProfileLevel() - Method in class net.majorkernelpanic.streaming.mp4.MP4Config
         
        -
        getRtcpSocket() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        getRtpSocket() - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
         
        -
        getRtpSocket() - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        +
        getService() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer.LocalBinder
         
        -
        getService() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer.LocalBinder
        +
        getSession() - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
         
        -
        getSession() - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        -
         
        -
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.audio.AACStream
        +
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.audio.AACStream
        Returns a description of the stream using SDP.
        -
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.audio.AMRNBStream
        +
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.audio.AMRNBStream
        Returns a description of the stream using SDP.
        -
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.MediaStream
        Returns a description of the stream using SDP.
        -
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.Session
        +
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.Session
        Returns a Session Description that can be stored in a file or sent to a client with RTSP.
        -
        getSessionDescription() - Method in interface net.majorkernelpanic.streaming.Stream
        +
        getSessionDescription() - Method in interface net.majorkernelpanic.streaming.Stream
        Returns a description of the stream using SDP.
        -
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.video.H263Stream
        +
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.video.H263Stream
        Returns a description of the stream using SDP.
        -
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.video.H264Stream
        +
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.video.H264Stream
        Returns a description of the stream using SDP.
        -
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        getSessionDescription() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Returns a description of the stream using SDP.
        -
        getSliceHeigth() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        getSliceHeigth() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        getSSRC() - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        getSSRC() - Method in class net.majorkernelpanic.streaming.MediaStream
        -
        Returns the SSRC of the underlying RtpSocket.
        +
        Returns the SSRC of the underlying RtpSocket.
        -
        getSSRC() - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        getSSRC() - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
         
        -
        getSSRC() - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        +
        getSSRC() - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
         
        -
        getSSRC() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        getSSRC() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        Returns the SSRC of the stream.
        -
        getSSRC() - Method in interface net.majorkernelpanic.streaming.Stream
        +
        getSSRC() - Method in interface net.majorkernelpanic.streaming.Stream
        +
        +
        Returns the SSRC of the underlying RtpSocket.
        +
        +
        getStreamingMethod() - Method in class net.majorkernelpanic.streaming.MediaStream
        -
        Returns the SSRC of the underlying RtpSocket.
        +
        Returns the streaming method in use, call this after + MediaStream.configure() to get an accurate response.
        -
        getStride() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        getStride() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
         
        +
        getStsdBox() - Method in class net.majorkernelpanic.streaming.mp4.MP4Parser
         
        -
        getSurfaceTexture() - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        getSurfaceTexture() - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
         
        -
        getSurfaceTexture() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
        +
        getSurfaceTexture() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
         
        -
        getSurfaceView() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getSurfaceView() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns the SurfaceView set with SessionBuilder.setSurfaceView(SurfaceView).
        +
        Returns the SurfaceView set with SessionBuilder.setSurfaceView(SurfaceView).
        -
        getTextureId() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
        +
        getTextureId() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
         
        -
        getTimeToLive() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getTimeToLive() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns the time to live set with SessionBuilder.setTimeToLive(int).
        +
        Returns the time to live set with SessionBuilder.setTimeToLive(int).
        -
        getTrack(int) - Method in class net.majorkernelpanic.streaming.Session
        +
        getTrack(int) - Method in class net.majorkernelpanic.streaming.Session
         
        -
        getUVPanesReversed() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        getUVPanesReversed() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        getVideoEncoder() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getVideoEncoder() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns the video encoder set with SessionBuilder.setVideoEncoder(int).
        +
        Returns the video encoder set with SessionBuilder.setVideoEncoder(int).
        -
        getVideoQuality() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        getVideoQuality() - Method in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Returns the VideoQuality set with SessionBuilder.setVideoQuality(VideoQuality).
        +
        Returns the VideoQuality set with SessionBuilder.setVideoQuality(VideoQuality).
        -
        getVideoQuality() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        getVideoQuality() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Returns the quality of the stream.
        -
        getVideoTrack() - Method in class net.majorkernelpanic.streaming.Session
        -
         
        -
        getYPadding() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        getVideoTrack() - Method in class net.majorkernelpanic.streaming.Session
        +
        +
        Returns the underlying VideoStream used by the Session.
        +
        +
        getYPadding() - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        - +

        H

        -
        H263Packetizer - Class in net.majorkernelpanic.streaming.rtp
        +
        H263Packetizer - Class in net.majorkernelpanic.streaming.rtp
        RFC 4629.
        -
        H263Packetizer() - Constructor for class net.majorkernelpanic.streaming.rtp.H263Packetizer
        +
        H263Packetizer() - Constructor for class net.majorkernelpanic.streaming.rtp.H263Packetizer
         
        -
        H263Stream - Class in net.majorkernelpanic.streaming.video
        +
        H263Stream - Class in net.majorkernelpanic.streaming.video
        A class for streaming H.263 from the camera of an android device using RTP.
        -
        H263Stream() - Constructor for class net.majorkernelpanic.streaming.video.H263Stream
        +
        H263Stream() - Constructor for class net.majorkernelpanic.streaming.video.H263Stream
        Constructs the H.263 stream.
        -
        H263Stream(int) - Constructor for class net.majorkernelpanic.streaming.video.H263Stream
        +
        H263Stream(int) - Constructor for class net.majorkernelpanic.streaming.video.H263Stream
        Constructs the H.263 stream.
        -
        H264Packetizer - Class in net.majorkernelpanic.streaming.rtp
        +
        H264Packetizer - Class in net.majorkernelpanic.streaming.rtp
        RFC 3984.
        -
        H264Packetizer() - Constructor for class net.majorkernelpanic.streaming.rtp.H264Packetizer
        +
        H264Packetizer() - Constructor for class net.majorkernelpanic.streaming.rtp.H264Packetizer
         
        -
        H264Stream - Class in net.majorkernelpanic.streaming.video
        +
        H264Stream - Class in net.majorkernelpanic.streaming.video
        A class for streaming H.264 from the camera of an android device using RTP.
        -
        H264Stream() - Constructor for class net.majorkernelpanic.streaming.video.H264Stream
        +
        H264Stream() - Constructor for class net.majorkernelpanic.streaming.video.H264Stream
        Constructs the H.264 stream.
        -
        H264Stream(int) - Constructor for class net.majorkernelpanic.streaming.video.H264Stream
        +
        H264Stream(int) - Constructor for class net.majorkernelpanic.streaming.video.H264Stream
        Constructs the H.264 stream.
        - +

        I

        -
        InvalidSurfaceException - Exception in net.majorkernelpanic.streaming.exceptions
        +
        InvalidSurfaceException - Exception in net.majorkernelpanic.streaming.exceptions
         
        -
        InvalidSurfaceException(String) - Constructor for exception net.majorkernelpanic.streaming.exceptions.InvalidSurfaceException
        +
        InvalidSurfaceException(String) - Constructor for exception net.majorkernelpanic.streaming.exceptions.InvalidSurfaceException
         
        -
        isEnabled() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        isEnabled() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
         
        -
        isStreaming() - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        isStreaming() - Method in class net.majorkernelpanic.streaming.MediaStream
        -
        Indicates if the MediaStream is streaming.
        +
        Indicates if the MediaStream is streaming.
        -
        isStreaming() - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        isStreaming() - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
         
        -
        isStreaming() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        isStreaming() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Returns whether or not the RTSP server is streaming to some client(s).
        -
        isStreaming() - Method in class net.majorkernelpanic.streaming.Session
        +
        isStreaming() - Method in class net.majorkernelpanic.streaming.Session
        Indicates if a track is currently running.
        -
        isStreaming() - Method in interface net.majorkernelpanic.streaming.Stream
        +
        isStreaming() - Method in interface net.majorkernelpanic.streaming.Stream
         
        - +

        K

        -
        KEY_ENABLED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        KEY_ENABLED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Key used in the SharedPreferences to store whether the RTSP server is enabled or not.
        -
        KEY_PORT - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        KEY_PORT - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Key used in the SharedPreferences for the port used by the RTSP server.
        - + + + +

        L

        +
        +
        LocalBinder() - Constructor for class net.majorkernelpanic.streaming.rtsp.RtspServer.LocalBinder
        +
         
        +
        +

        M

        -
        makeCurrent() - Method in class net.majorkernelpanic.streaming.gl.SurfaceManager
        +
        makeCurrent() - Method in class net.majorkernelpanic.streaming.gl.SurfaceManager
         
        -
        markNextPacket() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        markNextPacket() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        Sets the marker in the RTP packet.
        -
        MediaCodecInputStream - Class in net.majorkernelpanic.streaming.rtp
        +
        measure(int, int) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView.ViewAspectRatioMeasurer
        +
        +
        Measure with the aspect ratio given at construction.
        +
        + After measuring, get the width and height with the SurfaceView.ViewAspectRatioMeasurer.getMeasuredWidth() + and SurfaceView.ViewAspectRatioMeasurer.getMeasuredHeight() methods, respectively.
        +
        +
        measure(int, int, double) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView.ViewAspectRatioMeasurer
        +
        +
        Measure with a specific aspect ratio
        +
        + After measuring, get the width and height with the SurfaceView.ViewAspectRatioMeasurer.getMeasuredWidth() + and SurfaceView.ViewAspectRatioMeasurer.getMeasuredHeight() methods, respectively.
        +
        +
        MediaCodecInputStream - Class in net.majorkernelpanic.streaming.rtp
        An InputStream that uses data from a MediaCodec.
        -
        MediaCodecInputStream(MediaCodec) - Constructor for class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
        +
        MediaCodecInputStream(MediaCodec) - Constructor for class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
         
        -
        MediaStream - Class in net.majorkernelpanic.streaming
        +
        MediaStream - Class in net.majorkernelpanic.streaming
        -
        A MediaRecorder that streams what it records using a packetizer from the rtp package.
        +
        A MediaRecorder that streams what it records using a packetizer from the RTP package.
        -
        MediaStream() - Constructor for class net.majorkernelpanic.streaming.MediaStream
        +
        MediaStream() - Constructor for class net.majorkernelpanic.streaming.MediaStream
         
        -
        MESSAGE_CONNECTION_RECOVERED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        MESSAGE_CONNECTION_RECOVERED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
        Message sent when the connection with the RTSP server has been reestablished.
        -
        MESSAGE_STREAMING_STARTED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        MESSAGE_STREAMING_STARTED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Streaming started.
        -
        MESSAGE_STREAMING_STOPPED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        MESSAGE_STREAMING_STOPPED - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Streaming stopped.
        -
        mMediaFormat - Variable in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
        +
        mMediaFormat - Variable in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
         
        -
        MODE_MEDIACODEC_API - Static variable in class net.majorkernelpanic.streaming.MediaStream
        +
        MODE_MEDIACODEC_API - Static variable in class net.majorkernelpanic.streaming.MediaStream
        -
        MediaStream uses the new MediaCodec API introduced in JB 4.1 to stream audio/video.
        +
        Raw audio/video will be encoded using the MediaCodec API with buffers.
        -
        MODE_MEDIACODEC_API_2 - Static variable in class net.majorkernelpanic.streaming.MediaStream
        +
        MODE_MEDIACODEC_API_2 - Static variable in class net.majorkernelpanic.streaming.MediaStream
        -
        MediaStream uses the new features of the MediaCodec API introduced in JB 4.3 to stream audio/video.
        +
        Raw audio/video will be encoded using the MediaCode API with a surface.
        -
        MODE_MEDIARECORDER_API - Static variable in class net.majorkernelpanic.streaming.MediaStream
        +
        MODE_MEDIARECORDER_API - Static variable in class net.majorkernelpanic.streaming.MediaStream
        -
        MediaStream forwards data to a packetizer through a LocalSocket.
        +
        Raw audio/video will be encoded using the MediaRecorder API.
        -
        MP4Config - Class in net.majorkernelpanic.streaming.mp4
        +
        MP4Config - Class in net.majorkernelpanic.streaming.mp4
        Finds SPS & PPS parameters in mp4 file.
        -
        MP4Config(String, String, String) - Constructor for class net.majorkernelpanic.streaming.mp4.MP4Config
        +
        MP4Config(String, String, String) - Constructor for class net.majorkernelpanic.streaming.mp4.MP4Config
         
        -
        MP4Config(String, String) - Constructor for class net.majorkernelpanic.streaming.mp4.MP4Config
        +
        MP4Config(String, String) - Constructor for class net.majorkernelpanic.streaming.mp4.MP4Config
         
        -
        MP4Config(byte[], byte[]) - Constructor for class net.majorkernelpanic.streaming.mp4.MP4Config
        +
        MP4Config(byte[], byte[]) - Constructor for class net.majorkernelpanic.streaming.mp4.MP4Config
         
        -
        MP4Config(String) - Constructor for class net.majorkernelpanic.streaming.mp4.MP4Config
        +
        MP4Config(String) - Constructor for class net.majorkernelpanic.streaming.mp4.MP4Config
        +
        +
        Finds SPS & PPS parameters inside a .mp4.
        +
        +
        MP4Parser - Class in net.majorkernelpanic.streaming.mp4
        -
        Finds sps & pps parameters inside a .mp4.
        +
        Parse an mp4 file.
        -
        MTU - Static variable in class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        MTU - Static variable in class net.majorkernelpanic.streaming.rtcp.SenderReport
         
        -
        MTU - Static variable in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        MTU - Static variable in class net.majorkernelpanic.streaming.rtp.RtpSocket
         
        - +

        N

        -
        net.majorkernelpanic.streaming - package net.majorkernelpanic.streaming
        +
        net.majorkernelpanic.streaming - package net.majorkernelpanic.streaming
         
        -
        net.majorkernelpanic.streaming.audio - package net.majorkernelpanic.streaming.audio
        +
        net.majorkernelpanic.streaming.audio - package net.majorkernelpanic.streaming.audio
         
        -
        net.majorkernelpanic.streaming.exceptions - package net.majorkernelpanic.streaming.exceptions
        +
        net.majorkernelpanic.streaming.exceptions - package net.majorkernelpanic.streaming.exceptions
         
        -
        net.majorkernelpanic.streaming.gl - package net.majorkernelpanic.streaming.gl
        +
        net.majorkernelpanic.streaming.gl - package net.majorkernelpanic.streaming.gl
         
        -
        net.majorkernelpanic.streaming.hw - package net.majorkernelpanic.streaming.hw
        +
        net.majorkernelpanic.streaming.hw - package net.majorkernelpanic.streaming.hw
         
        -
        net.majorkernelpanic.streaming.mp4 - package net.majorkernelpanic.streaming.mp4
        +
        net.majorkernelpanic.streaming.mp4 - package net.majorkernelpanic.streaming.mp4
         
        -
        net.majorkernelpanic.streaming.rtcp - package net.majorkernelpanic.streaming.rtcp
        +
        net.majorkernelpanic.streaming.rtcp - package net.majorkernelpanic.streaming.rtcp
         
        -
        net.majorkernelpanic.streaming.rtp - package net.majorkernelpanic.streaming.rtp
        +
        net.majorkernelpanic.streaming.rtp - package net.majorkernelpanic.streaming.rtp
         
        -
        net.majorkernelpanic.streaming.rtsp - package net.majorkernelpanic.streaming.rtsp
        +
        net.majorkernelpanic.streaming.rtsp - package net.majorkernelpanic.streaming.rtsp
         
        -
        net.majorkernelpanic.streaming.video - package net.majorkernelpanic.streaming.video
        +
        net.majorkernelpanic.streaming.video - package net.majorkernelpanic.streaming.video
         
        -
        NV21Convertor - Class in net.majorkernelpanic.streaming.hw
        +
        NV21Convertor - Class in net.majorkernelpanic.streaming.hw
        Converts from NV21 to YUV420 semi planar or planar.
        -
        NV21Convertor() - Constructor for class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        NV21Convertor() - Constructor for class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        - +

        O

        -
        onBind(Intent) - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        onBind(Intent) - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
         
        -
        onBitrareUpdate(long) - Method in interface net.majorkernelpanic.streaming.Session.Callback
        +
        onBitrateUpdate(long) - Method in interface net.majorkernelpanic.streaming.Session.Callback
        Called periodically to inform you on the bandwidth consumption of the streams when streaming.
        -
        onCreate() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        onCreate() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
         
        -
        onDestroy() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        onDestroy() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
         
        -
        onError(RtspServer, Exception, int) - Method in interface net.majorkernelpanic.streaming.rtsp.RtspServer.CallbackListener
        +
        onError(RtspServer, Exception, int) - Method in interface net.majorkernelpanic.streaming.rtsp.RtspServer.CallbackListener
        Called when an error occurs.
        -
        onFrameAvailable(SurfaceTexture) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        onFrameAvailable(SurfaceTexture) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
         
        -
        onMessage(RtspServer, int) - Method in interface net.majorkernelpanic.streaming.rtsp.RtspServer.CallbackListener
        +
        onMessage(RtspServer, int) - Method in interface net.majorkernelpanic.streaming.rtsp.RtspServer.CallbackListener
        Called when streaming starts/stops.
        -
        onPreviewStarted() - Method in interface net.majorkernelpanic.streaming.Session.Callback
        +
        onPreviewStarted() - Method in interface net.majorkernelpanic.streaming.Session.Callback
        -
        Called when the previw of the VideoStream +
        Called when the previw of the VideoStream has correctly been started.
        -
        onRtspUpdate(int, Exception) - Method in interface net.majorkernelpanic.streaming.rtsp.RtspClient.Callback
        +
        onRtspUpdate(int, Exception) - Method in interface net.majorkernelpanic.streaming.rtsp.RtspClient.Callback
         
        -
        onSessionConfigured() - Method in interface net.majorkernelpanic.streaming.Session.Callback
        +
        onSessionConfigured() - Method in interface net.majorkernelpanic.streaming.Session.Callback
        Called when the session has correctly been configured - after calling Session.configure().
        + after calling Session.configure().
        -
        onSessionError(int, int, Exception) - Method in interface net.majorkernelpanic.streaming.Session.Callback
        +
        onSessionError(int, int, Exception) - Method in interface net.majorkernelpanic.streaming.Session.Callback
        Called when some error occurs.
        -
        onSessionStarted() - Method in interface net.majorkernelpanic.streaming.Session.Callback
        +
        onSessionStarted() - Method in interface net.majorkernelpanic.streaming.Session.Callback
        Called when the streams of the session have correctly been started.
        -
        onSessionStopped() - Method in interface net.majorkernelpanic.streaming.Session.Callback
        +
        onSessionStopped() - Method in interface net.majorkernelpanic.streaming.Session.Callback
        Called when the stream of the session have been stopped.
        -
        onStartCommand(Intent, int, int) - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        onStartCommand(Intent, int, int) - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
         
        - +

        P

        -
        parse(String) - Static method in class net.majorkernelpanic.streaming.rtsp.UriParser
        +
        parse(String) - Static method in class net.majorkernelpanic.streaming.mp4.MP4Parser
        +
        +
        Parses the mp4 file.
        +
        +
        parse(String) - Static method in class net.majorkernelpanic.streaming.rtsp.UriParser
        Configures a Session according to the given URI.
        -
        parseQuality(String) - Static method in class net.majorkernelpanic.streaming.audio.AudioQuality
        +
        parseQuality(String) - Static method in class net.majorkernelpanic.streaming.audio.AudioQuality
         
        -
        parseQuality(String) - Static method in class net.majorkernelpanic.streaming.video.VideoQuality
        +
        parseQuality(String) - Static method in class net.majorkernelpanic.streaming.video.VideoQuality
         
        +
        PIPE_API_LS - Static variable in class net.majorkernelpanic.streaming.MediaStream
        +
        +
        A LocalSocket will be used to feed the MediaRecorder object
        +
        +
        PIPE_API_PFD - Static variable in class net.majorkernelpanic.streaming.MediaStream
        +
        +
        A ParcelFileDescriptor will be used to feed the MediaRecorder object
        +
        - +

        R

        -
        read() - Method in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
        +
        read() - Method in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
         
        -
        read(byte[], int, int) - Method in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
        +
        read(byte[], int, int) - Method in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
         
        -
        release() - Method in class net.majorkernelpanic.streaming.gl.SurfaceManager
        +
        release() - Method in class net.majorkernelpanic.streaming.gl.SurfaceManager
        Discards all resources held by this class, notably the EGL context.
        -
        release() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
        +
        release() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
         
        -
        release() - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        release() - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
         
        -
        release() - Method in class net.majorkernelpanic.streaming.Session
        +
        release() - Method in class net.majorkernelpanic.streaming.Session
        Deletes all existing tracks & release associated resources.
        -
        removeAudioTrack() - Method in class net.majorkernelpanic.streaming.Session
        -
         
        -
        removeCallbackListener(RtspServer.CallbackListener) - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        removeCallbackListener(RtspServer.CallbackListener) - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Removes the listener.
        -
        removeMediaCodecSurface() - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        removeMediaCodecSurface() - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
         
        -
        removeVideoTrack() - Method in class net.majorkernelpanic.streaming.Session
        -
         
        -
        requestBuffer() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        requestAspectRatio(double) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        +
        Requests a certain aspect ratio for the preview.
        +
        +
        requestBuffer() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        Returns an available buffer from the FIFO, it can then be modified.
        -
        reset() - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        reset() - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        Resets the reports (total number of bytes sent, number of packets sent, etc.)
        -
        resX - Variable in class net.majorkernelpanic.streaming.video.VideoQuality
        +
        resX - Variable in class net.majorkernelpanic.streaming.video.VideoQuality
         
        -
        resY - Variable in class net.majorkernelpanic.streaming.video.VideoQuality
        +
        resY - Variable in class net.majorkernelpanic.streaming.video.VideoQuality
         
        -
        RTP_HEADER_LENGTH - Static variable in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        RTP_HEADER_LENGTH - Static variable in class net.majorkernelpanic.streaming.rtp.RtpSocket
         
        -
        RtpSocket - Class in net.majorkernelpanic.streaming.rtp
        +
        RtpSocket - Class in net.majorkernelpanic.streaming.rtp
        A basic implementation of an RTP socket.
        -
        RtpSocket() - Constructor for class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        RtpSocket() - Constructor for class net.majorkernelpanic.streaming.rtp.RtpSocket
        This RTP socket implements a buffering mechanism relying on a FIFO of buffers and a Thread.
        -
        RtspClient - Class in net.majorkernelpanic.streaming.rtsp
        +
        RtspClient - Class in net.majorkernelpanic.streaming.rtsp
        RFC 2326.
        -
        RtspClient() - Constructor for class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        RtspClient() - Constructor for class net.majorkernelpanic.streaming.rtsp.RtspClient
         
        -
        RtspClient.Callback - Interface in net.majorkernelpanic.streaming.rtsp
        +
        RtspClient.Callback - Interface in net.majorkernelpanic.streaming.rtsp
        The callback interface you need to implement to know what's going on with the RTSP server (for example your Wowza Media Server).
        -
        RtspServer - Class in net.majorkernelpanic.streaming.rtsp
        +
        RtspServer - Class in net.majorkernelpanic.streaming.rtsp
        Implementation of a subset of the RTSP protocol (RFC 2326).
        -
        RtspServer() - Constructor for class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        RtspServer() - Constructor for class net.majorkernelpanic.streaming.rtsp.RtspServer
         
        -
        RtspServer.CallbackListener - Interface in net.majorkernelpanic.streaming.rtsp
        +
        RtspServer.CallbackListener - Interface in net.majorkernelpanic.streaming.rtsp
        Be careful: those callbacks won't necessarily be called from the ui thread !
        -
        RtspServer.LocalBinder - Class in net.majorkernelpanic.streaming.rtsp
        +
        RtspServer.LocalBinder - Class in net.majorkernelpanic.streaming.rtsp
        The Binder you obtain when a connection with the Service is established.
        -
        RtspServer.LocalBinder() - Constructor for class net.majorkernelpanic.streaming.rtsp.RtspServer.LocalBinder
        +
        run() - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
         
        -
        run() - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        run() - Method in class net.majorkernelpanic.streaming.rtp.AACADTSPacketizer
         
        -
        run() - Method in class net.majorkernelpanic.streaming.rtp.AACADTSPacketizer
        +
        run() - Method in class net.majorkernelpanic.streaming.rtp.AACLATMPacketizer
         
        -
        run() - Method in class net.majorkernelpanic.streaming.rtp.AACLATMPacketizer
        +
        run() - Method in class net.majorkernelpanic.streaming.rtp.AMRNBPacketizer
         
        -
        run() - Method in class net.majorkernelpanic.streaming.rtp.AMRNBPacketizer
        +
        run() - Method in class net.majorkernelpanic.streaming.rtp.H263Packetizer
         
        -
        run() - Method in class net.majorkernelpanic.streaming.rtp.H263Packetizer
        +
        run() - Method in class net.majorkernelpanic.streaming.rtp.H264Packetizer
         
        -
        run() - Method in class net.majorkernelpanic.streaming.rtp.H264Packetizer
        -
         
        -
        run() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        run() - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        The Thread sends the packets in the FIFO one by one at a constant rate.
        - +

        S

        -
        samplingRate - Variable in class net.majorkernelpanic.streaming.audio.AudioQuality
        +
        samplingRate - Variable in class net.majorkernelpanic.streaming.audio.AudioQuality
         
        -
        SenderReport - Class in net.majorkernelpanic.streaming.rtcp
        +
        SenderReport - Class in net.majorkernelpanic.streaming.rtcp
        Implementation of Sender Report RTCP packets.
        -
        SenderReport(int) - Constructor for class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        SenderReport(int) - Constructor for class net.majorkernelpanic.streaming.rtcp.SenderReport
         
        -
        SenderReport() - Constructor for class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        SenderReport() - Constructor for class net.majorkernelpanic.streaming.rtcp.SenderReport
         
        -
        SERVER_NAME - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        SERVER_NAME - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        The server name that will appear in responses.
        -
        Session - Class in net.majorkernelpanic.streaming
        +
        Session - Class in net.majorkernelpanic.streaming
        -
        You should instantiate this class with the SessionBuilder.
        +
        You should instantiate this class with the SessionBuilder.
        This is the class you will want to use to stream audio and or video to some peer using RTP.
        - It holds a VideoStream and a AudioStream together and provides - syncronous and asyncrounous functions to start and stop those steams.
        + It holds a VideoStream and a AudioStream together and provides + synchronous and asynchronous functions to start and stop those steams.
        -
        Session() - Constructor for class net.majorkernelpanic.streaming.Session
        +
        Session() - Constructor for class net.majorkernelpanic.streaming.Session
        Creates a streaming session that can be customized by adding tracks.
        -
        Session.Callback - Interface in net.majorkernelpanic.streaming
        +
        Session.Callback - Interface in net.majorkernelpanic.streaming
        The callback interface you need to implement to get some feedback Those will be called from the UI thread.
        -
        SessionBuilder - Class in net.majorkernelpanic.streaming
        +
        SessionBuilder - Class in net.majorkernelpanic.streaming
        -
        Call SessionBuilder.getInstance() to get access to the SessionBuilder.
        +
        Call SessionBuilder.getInstance() to get access to the SessionBuilder.
        -
        setAudioEncoder(int) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setAspectRatio(double) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView.ViewAspectRatioMeasurer
        +
         
        +
        setAspectRatioMode(int) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
         
        +
        setAudioEncoder(int) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        Sets the audio encoder.
        -
        setAudioQuality(AudioQuality) - Method in class net.majorkernelpanic.streaming.audio.AudioStream
        +
        setAudioQuality(AudioQuality) - Method in class net.majorkernelpanic.streaming.audio.AudioStream
         
        -
        setAudioQuality(AudioQuality) - Method in class net.majorkernelpanic.streaming.Session
        +
        setAudioQuality(AudioQuality) - Method in class net.majorkernelpanic.streaming.Session
        Sets the configuration of the stream.
        -
        setAudioQuality(AudioQuality) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setAudioQuality(AudioQuality) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        Sets the audio quality.
        -
        setAudioSource(int) - Method in class net.majorkernelpanic.streaming.audio.AudioStream
        +
        setAudioSource(int) - Method in class net.majorkernelpanic.streaming.audio.AudioStream
         
        -
        setCacheSize(long) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        setAuthorization(String, String) - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        +
        Set Basic authorization to access RTSP Stream
        +
        +
        setCacheSize(long) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        Sets the size of the FIFO in ms.
        -
        setCallback(RtspClient.Callback) - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        setCallback(RtspClient.Callback) - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        Sets the callback interface that will be called on status updates of the connection with the RTSP server.
        -
        setCallback(Session.Callback) - Method in class net.majorkernelpanic.streaming.Session
        +
        setCallback(Session.Callback) - Method in class net.majorkernelpanic.streaming.Session
        -
        Sets the callback interface that will be called by the Session.
        +
        Sets the callback interface that will be called by the Session.
        -
        setCallback(Session.Callback) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setCallback(Session.Callback) - Method in class net.majorkernelpanic.streaming.SessionBuilder
         
        -
        setCamera(int) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setCamera(int) - Method in class net.majorkernelpanic.streaming.SessionBuilder
         
        -
        setCamera(int) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        setCamera(int) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Sets the camera that will be used to capture video.
        -
        setClockFrequency(long) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        setClockFrequency(long) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        -
        Sets the clock frquency of the stream in Hz.
        +
        Sets the clock frequency of the stream in Hz.
        -
        setColorPanesReversed(boolean) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        setColorPanesReversed(boolean) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        setContext(Context) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setContext(Context) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        Access to the context is needed for the H264Stream class to store some stuff in the SharedPreferences.
        -
        setCredentials(String, String) - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        setCredentials(String, String) - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        -
        If authentication is enabled on the server, you need to call this with a valid username/password pair.
        +
        If authentication is enabled on the server, you need to call this with a valid login/password pair.
        -
        setDestination(InetAddress, int) - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        setDestination(InetAddress, int) - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
         
        -
        setDestination(InetAddress, int, int) - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        +
        setDestination(InetAddress, int, int) - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        Sets the destination of the stream.
        -
        setDestination(InetAddress, int, int) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        setDestination(InetAddress, int, int) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        Sets the destination address and to which the packets will be sent.
        -
        setDestination(String) - Method in class net.majorkernelpanic.streaming.Session
        +
        setDestination(String) - Method in class net.majorkernelpanic.streaming.Session
        The destination address for all the streams of the session.
        -
        setDestination(String) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setDestination(String) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        Sets the destination of the session.
        -
        setDestinationAddress(InetAddress) - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        setDestinationAddress(InetAddress) - Method in class net.majorkernelpanic.streaming.MediaStream
        -
        Sets the destination ip address of the stream.
        +
        Sets the destination IP address of the stream.
        -
        setDestinationAddress(InetAddress) - Method in interface net.majorkernelpanic.streaming.Stream
        +
        setDestinationAddress(InetAddress) - Method in interface net.majorkernelpanic.streaming.Stream
        Sets the destination ip address of the stream.
        -
        setDestinationPorts(int) - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        setDestinationPorts(int) - Method in class net.majorkernelpanic.streaming.MediaStream
        Sets the destination ports of the stream.
        -
        setDestinationPorts(int, int) - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        setDestinationPorts(int, int) - Method in class net.majorkernelpanic.streaming.MediaStream
        Sets the destination ports of the stream.
        -
        setDestinationPorts(int) - Method in interface net.majorkernelpanic.streaming.Stream
        +
        setDestinationPorts(int) - Method in interface net.majorkernelpanic.streaming.Stream
        Sets the destination ports of the stream.
        -
        setDestinationPorts(int, int) - Method in interface net.majorkernelpanic.streaming.Stream
        +
        setDestinationPorts(int, int) - Method in interface net.majorkernelpanic.streaming.Stream
        Sets the destination ports of the stream.
        -
        setEncoderColorFormat(int) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        setEncoderColorFormat(int) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        setFlashEnabled(boolean) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setFlashEnabled(boolean) - Method in class net.majorkernelpanic.streaming.SessionBuilder
         
        -
        setFlashState(boolean) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        setFlashState(boolean) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Turns the LED on or off if phone has one.
        -
        setInputStream(InputStream) - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        +
        setInputStream(InputStream) - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
         
        -
        setInterval(long) - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        setInterval(long) - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        Sets the temporal interval between two RTCP Sender Reports.
        -
        setOrigin(String) - Method in class net.majorkernelpanic.streaming.Session
        +
        setOrigin(String) - Method in class net.majorkernelpanic.streaming.Session
        The origin address of the session.
        -
        setOrigin(String) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setOrigin(String) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        Sets the origin of the session.
        -
        setPlanar(boolean) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        setOutputStream(OutputStream, byte) - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        +
        If a TCP is used as the transport protocol for the RTP session, + the output stream to which RTP packets will be written to must + be specified with this method.
        +
        +
        setOutputStream(OutputStream, byte) - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        +
        If a TCP is used as the transport protocol for the RTP session, + the output stream to which RTP packets will be written to must + be specified with this method.
        +
        +
        setOutputStream(OutputStream, byte) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        +
        If a TCP is used as the transport protocol for the RTP session, + the output stream to which RTP packets will be written to must + be specified with this method.
        +
        +
        setOutputStream(OutputStream, byte) - Method in interface net.majorkernelpanic.streaming.Stream
        +
        +
        If a TCP is used as the transport protocol for the RTP session, + the output stream to which RTP packets will be written to must + be specified with this method.
        +
        +
        setPlanar(boolean) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        setPort(int) - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        setPort(int) - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Sets the port for the RTSP server to use.
        -
        setPreferences(SharedPreferences) - Method in class net.majorkernelpanic.streaming.audio.AACStream
        +
        setPreferences(SharedPreferences) - Method in class net.majorkernelpanic.streaming.audio.AACStream
        -
        Some data (the actual sampling rate used by the phone and the AAC profile) needs to be stored once AACStream.getSessionDescription() is called.
        +
        Some data (the actual sampling rate used by the phone and the AAC profile) needs to be stored once AACStream.getSessionDescription() is called.
        -
        setPreferences(SharedPreferences) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        setPreferences(SharedPreferences) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        -
        Some data (SPS and PPS params) needs to be stored when getSessionDescription() is called
        +
        Some data (SPS and PPS params) needs to be stored when getSessionDescription() is called
        -
        setPresentationTime(long) - Method in class net.majorkernelpanic.streaming.gl.SurfaceManager
        +
        setPresentationTime(long) - Method in class net.majorkernelpanic.streaming.gl.SurfaceManager
        Sends the presentation time stamp to EGL.
        -
        setPreviewOrientation(int) - Method in class net.majorkernelpanic.streaming.Session
        +
        setPreviewOrientation(int) - Method in class net.majorkernelpanic.streaming.Session
        Sets the orientation of the preview.
        -
        setPreviewOrientation(int) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setPreviewOrientation(int) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        Sets the orientation of the preview.
        -
        setPreviewOrientation(int) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        setPreviewOrientation(int) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Sets the orientation of the preview.
        -
        setSamplingRate(int) - Method in class net.majorkernelpanic.streaming.rtp.AACADTSPacketizer
        +
        setSamplingRate(int) - Method in class net.majorkernelpanic.streaming.rtp.AACADTSPacketizer
         
        -
        setSamplingRate(int) - Method in class net.majorkernelpanic.streaming.rtp.AACLATMPacketizer
        +
        setSamplingRate(int) - Method in class net.majorkernelpanic.streaming.rtp.AACLATMPacketizer
         
        -
        setServerAddress(String, int) - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        setServerAddress(String, int) - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        Sets the destination address of the RTSP server.
        -
        setSession(Session) - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        setSession(Session) - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        -
        The Session that will be used to stream to the server.
        +
        The Session that will be used to stream to the server.
        -
        setSize(int, int) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        setSize(int, int) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        setSliceHeigth(int) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        setSliceHeigth(int) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        setSSRC(int) - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        setSSRC(int) - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
         
        -
        setSSRC(int) - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        +
        setSSRC(int) - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
         
        -
        setSSRC(int) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        setSSRC(int) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        Sets the SSRC of the stream.
        -
        setStreamingMethod(byte) - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        setStreamingMethod(byte) - Method in class net.majorkernelpanic.streaming.MediaStream
        -
        Sets the mode of the MediaStream.
        +
        Sets the streaming method that will be used.
        -
        setStreamParameters(byte[], byte[]) - Method in class net.majorkernelpanic.streaming.rtp.H264Packetizer
        +
        setStreamParameters(byte[], byte[]) - Method in class net.majorkernelpanic.streaming.rtp.H264Packetizer
         
        -
        setStreamPath(String) - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        setStreamPath(String) - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        The path to which the stream will be sent to.
        -
        setStride(int) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        setStride(int) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        setSurfaceView(SurfaceView) - Method in class net.majorkernelpanic.streaming.Session
        +
        setSurfaceView(SurfaceView) - Method in class net.majorkernelpanic.streaming.Session
        Sets a Surface to show a preview of recorded media (video).
        -
        setSurfaceView(SurfaceView) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setSurfaceView(SurfaceView) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        Sets the SurfaceView required to preview the video stream.
        -
        setSurfaceView(SurfaceView) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        setSurfaceView(SurfaceView) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Sets a Surface to show a preview of recorded media (video).
        -
        setTimeToLive(int) - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        setTimeToLive(int) - Method in class net.majorkernelpanic.streaming.MediaStream
        Sets the Time To Live of packets sent over the network.
        -
        setTimeToLive(int) - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        +
        setTimeToLive(int) - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
         
        -
        setTimeToLive(int) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        setTimeToLive(int) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        Sets the Time To Live of the UDP packets.
        -
        setTimeToLive(int) - Method in class net.majorkernelpanic.streaming.Session
        +
        setTimeToLive(int) - Method in class net.majorkernelpanic.streaming.Session
        Set the TTL of all packets sent during the session.
        -
        setTimeToLive(int) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setTimeToLive(int) - Method in class net.majorkernelpanic.streaming.SessionBuilder
         
        -
        setTimeToLive(int) - Method in interface net.majorkernelpanic.streaming.Stream
        +
        setTimeToLive(int) - Method in interface net.majorkernelpanic.streaming.Stream
        Sets the Time To Live of packets sent over the network.
        -
        setVideoEncoder(int) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setTransportMode(int) - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        +
        Call this with RtspClient.TRANSPORT_TCP or 0 to choose the + transport protocol that will be used to send RTP/RTCP packets.
        +
        +
        setVideoEncoder(int) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        Sets the default video encoder.
        -
        setVideoQuality(VideoQuality) - Method in class net.majorkernelpanic.streaming.Session
        +
        setVideoQuality(VideoQuality) - Method in class net.majorkernelpanic.streaming.Session
        Sets the configuration of the stream.
        -
        setVideoQuality(VideoQuality) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        +
        setVideoQuality(VideoQuality) - Method in class net.majorkernelpanic.streaming.SessionBuilder
        Sets the video stream quality.
        -
        setVideoQuality(VideoQuality) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        setVideoQuality(VideoQuality) - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Sets the configuration of the stream.
        -
        setYPadding(int) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
        +
        setYPadding(int) - Method in class net.majorkernelpanic.streaming.hw.NV21Convertor
         
        -
        start() - Method in class net.majorkernelpanic.streaming.audio.AACStream
        +
        SOFTWARE_ENCODERS - Static variable in class net.majorkernelpanic.streaming.video.CodecManager
        +
        +
        There currently is no way to know if an encoder is software or hardware from the MediaCodecInfo class, + so we need to maintain a list of known software encoders.
        +
        +
        start() - Method in class net.majorkernelpanic.streaming.audio.AACStream
         
        -
        start() - Method in class net.majorkernelpanic.streaming.audio.AMRNBStream
        +
        start() - Method in class net.majorkernelpanic.streaming.audio.AMRNBStream
        Starts the stream.
        -
        start() - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        start() - Method in class net.majorkernelpanic.streaming.MediaStream
        Starts the stream.
        -
        start() - Method in class net.majorkernelpanic.streaming.rtp.AACADTSPacketizer
        +
        start() - Method in class net.majorkernelpanic.streaming.rtp.AACADTSPacketizer
         
        -
        start() - Method in class net.majorkernelpanic.streaming.rtp.AACLATMPacketizer
        +
        start() - Method in class net.majorkernelpanic.streaming.rtp.AACLATMPacketizer
         
        -
        start() - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        +
        start() - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        Starts the packetizer.
        -
        start() - Method in class net.majorkernelpanic.streaming.rtp.AMRNBPacketizer
        +
        start() - Method in class net.majorkernelpanic.streaming.rtp.AMRNBPacketizer
         
        -
        start() - Method in class net.majorkernelpanic.streaming.rtp.H263Packetizer
        +
        start() - Method in class net.majorkernelpanic.streaming.rtp.H263Packetizer
         
        -
        start() - Method in class net.majorkernelpanic.streaming.rtp.H264Packetizer
        +
        start() - Method in class net.majorkernelpanic.streaming.rtp.H264Packetizer
         
        -
        start() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        start() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Starts (or restart if needed, if for example the configuration of the server has been modified) the RTSP server.
        -
        start() - Method in class net.majorkernelpanic.streaming.Session
        +
        start() - Method in class net.majorkernelpanic.streaming.Session
        -
        Asyncronously starts all streams of the session.
        +
        Asynchronously starts all streams of the session.
        -
        start() - Method in interface net.majorkernelpanic.streaming.Stream
        +
        start() - Method in interface net.majorkernelpanic.streaming.Stream
        Starts the stream.
        -
        start() - Method in class net.majorkernelpanic.streaming.video.H263Stream
        +
        start() - Method in class net.majorkernelpanic.streaming.video.H263Stream
        Starts the stream.
        -
        start() - Method in class net.majorkernelpanic.streaming.video.H264Stream
        +
        start() - Method in class net.majorkernelpanic.streaming.video.H264Stream
        Starts the stream.
        -
        start() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        start() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Starts the stream.
        -
        startGLThread() - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        startGLThread() - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
         
        -
        startPreview() - Method in class net.majorkernelpanic.streaming.Session
        -
         
        -
        startPreview() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        startPreview() - Method in class net.majorkernelpanic.streaming.Session
        +
        +
        Asynchronously starts the camera preview.
        +
        +
        startPreview() - Method in class net.majorkernelpanic.streaming.video.VideoStream
         
        -
        startStream() - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        startStream() - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        Connects to the RTSP server to publish the stream, and the effectively starts streaming.
        -
        stop() - Method in class net.majorkernelpanic.streaming.audio.AACStream
        +
        stop() - Method in class net.majorkernelpanic.streaming.audio.AACStream
        Stops the stream.
        -
        stop() - Method in class net.majorkernelpanic.streaming.MediaStream
        +
        stop() - Method in class net.majorkernelpanic.streaming.MediaStream
        Stops the stream.
        -
        stop() - Method in class net.majorkernelpanic.streaming.rtp.AACADTSPacketizer
        +
        stop() - Method in class net.majorkernelpanic.streaming.rtp.AACADTSPacketizer
         
        -
        stop() - Method in class net.majorkernelpanic.streaming.rtp.AACLATMPacketizer
        +
        stop() - Method in class net.majorkernelpanic.streaming.rtp.AACLATMPacketizer
         
        -
        stop() - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        +
        stop() - Method in class net.majorkernelpanic.streaming.rtp.AbstractPacketizer
        Stops the packetizer.
        -
        stop() - Method in class net.majorkernelpanic.streaming.rtp.AMRNBPacketizer
        +
        stop() - Method in class net.majorkernelpanic.streaming.rtp.AMRNBPacketizer
         
        -
        stop() - Method in class net.majorkernelpanic.streaming.rtp.H263Packetizer
        +
        stop() - Method in class net.majorkernelpanic.streaming.rtp.H263Packetizer
         
        -
        stop() - Method in class net.majorkernelpanic.streaming.rtp.H264Packetizer
        +
        stop() - Method in class net.majorkernelpanic.streaming.rtp.H264Packetizer
         
        -
        stop() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        stop() - Method in class net.majorkernelpanic.streaming.rtsp.RtspServer
        Stops the RTSP server but not the Android Service.
        -
        stop() - Method in class net.majorkernelpanic.streaming.Session
        +
        stop() - Method in class net.majorkernelpanic.streaming.Session
        Stops all existing streams.
        -
        stop() - Method in interface net.majorkernelpanic.streaming.Stream
        +
        stop() - Method in interface net.majorkernelpanic.streaming.Stream
        Stops the stream.
        -
        stop() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        stop() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Stops the stream.
        -
        stopPreview() - Method in class net.majorkernelpanic.streaming.Session
        -
         
        -
        stopPreview() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        stopPreview() - Method in class net.majorkernelpanic.streaming.Session
        +
        +
        Asynchronously stops the camera preview.
        +
        +
        stopPreview() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        Stops the preview.
        -
        stopStream() - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        stopStream() - Method in class net.majorkernelpanic.streaming.rtsp.RtspClient
        Stops the stream, and informs the RTSP server.
        -
        StorageUnavailableException - Exception in net.majorkernelpanic.streaming.exceptions
        +
        StorageUnavailableException - Exception in net.majorkernelpanic.streaming.exceptions
         
        -
        StorageUnavailableException(String) - Constructor for exception net.majorkernelpanic.streaming.exceptions.StorageUnavailableException
        +
        StorageUnavailableException(String) - Constructor for exception net.majorkernelpanic.streaming.exceptions.StorageUnavailableException
         
        -
        Stream - Interface in net.majorkernelpanic.streaming
        +
        Stream - Interface in net.majorkernelpanic.streaming
        An interface that represents a Stream.
        -
        STREAM_AUDIO - Static variable in class net.majorkernelpanic.streaming.Session
        +
        STREAM_AUDIO - Static variable in class net.majorkernelpanic.streaming.Session
        +
         
        +
        STREAM_VIDEO - Static variable in class net.majorkernelpanic.streaming.Session
         
        -
        STREAM_VIDEO - Static variable in class net.majorkernelpanic.streaming.Session
        +
        SUPPORTED_COLOR_FORMATS - Static variable in class net.majorkernelpanic.streaming.hw.CodecManager
         
        -
        SUPPORTED_COLOR_FORMATS - Static variable in class net.majorkernelpanic.streaming.hw.CodecManager
        +
        SUPPORTED_COLOR_FORMATS - Static variable in class net.majorkernelpanic.streaming.video.CodecManager
         
        -
        surfaceChanged(SurfaceHolder, int, int, int) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        surfaceChanged(SurfaceHolder, int, int, int) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
         
        -
        surfaceCreated(SurfaceHolder) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        surfaceCreated(SurfaceHolder) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
         
        -
        surfaceDestroyed(SurfaceHolder) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        surfaceDestroyed(SurfaceHolder) - Method in class net.majorkernelpanic.streaming.gl.SurfaceView
         
        -
        SurfaceManager - Class in net.majorkernelpanic.streaming.gl
        +
        SurfaceManager - Class in net.majorkernelpanic.streaming.gl
         
        -
        SurfaceManager(Surface, SurfaceManager) - Constructor for class net.majorkernelpanic.streaming.gl.SurfaceManager
        +
        SurfaceManager(Surface, SurfaceManager) - Constructor for class net.majorkernelpanic.streaming.gl.SurfaceManager
        Creates an EGL context and an EGL surface.
        -
        SurfaceManager(Surface) - Constructor for class net.majorkernelpanic.streaming.gl.SurfaceManager
        +
        SurfaceManager(Surface) - Constructor for class net.majorkernelpanic.streaming.gl.SurfaceManager
        Creates an EGL context and an EGL surface.
        -
        SurfaceView - Class in net.majorkernelpanic.streaming.gl
        -
         
        -
        SurfaceView(Context, AttributeSet) - Constructor for class net.majorkernelpanic.streaming.gl.SurfaceView
        -
         
        -
        swapBuffer() - Method in class net.majorkernelpanic.streaming.gl.SurfaceManager
        +
        SurfaceView - Class in net.majorkernelpanic.streaming.gl
        +
        +
        An enhanced SurfaceView in which the camera preview will be rendered.
        +
        +
        SurfaceView(Context, AttributeSet) - Constructor for class net.majorkernelpanic.streaming.gl.SurfaceView
         
        -
        switchCamera() - Method in class net.majorkernelpanic.streaming.Session
        +
        SurfaceView.ViewAspectRatioMeasurer - Class in net.majorkernelpanic.streaming.gl
        +
        +
        This class is a helper to measure views that require a specific aspect ratio.
        +
        +
        swapBuffer() - Method in class net.majorkernelpanic.streaming.gl.SurfaceManager
         
        -
        switchCamera() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        switchCamera() - Method in class net.majorkernelpanic.streaming.Session
        Switch between the front facing and the back facing camera of the phone.
        -
        syncConfigure() - Method in class net.majorkernelpanic.streaming.Session
        +
        switchCamera() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        -
        Does the same thing as Session.configure(), but in a syncronous manner.
        +
        Switch between the front facing and the back facing camera of the phone.
        -
        syncStart(int) - Method in class net.majorkernelpanic.streaming.Session
        +
        syncConfigure() - Method in class net.majorkernelpanic.streaming.Session
        -
        Starts a stream in a syncronous manner.
        +
        Does the same thing as Session.configure(), but in a synchronous manner.
        -
        syncStart() - Method in class net.majorkernelpanic.streaming.Session
        +
        syncStart(int) - Method in class net.majorkernelpanic.streaming.Session
        -
        Does the same thing as Session.start(), but in a syncronous manner.
        +
        Starts a stream in a synchronous manner.
        -
        syncStop() - Method in class net.majorkernelpanic.streaming.Session
        +
        syncStart() - Method in class net.majorkernelpanic.streaming.Session
        -
        Stops all existing streams in a syncronous manner.
        +
        Does the same thing as Session.start(), but in a synchronous manner.
        +
        +
        syncStop() - Method in class net.majorkernelpanic.streaming.Session
        +
        +
        Stops all existing streams in a synchronous manner.
        - +

        T

        -
        TAG - Static variable in class net.majorkernelpanic.streaming.audio.AACStream
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.audio.AACStream
        +
         
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.gl.SurfaceManager
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.gl.SurfaceManager
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.gl.SurfaceView
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.gl.SurfaceView
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.gl.TextureManager
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.gl.TextureManager
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.hw.CodecManager
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.hw.CodecManager
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.hw.EncoderDebugger
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.hw.EncoderDebugger
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.mp4.MP4Config
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.mp4.MP4Config
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.rtp.AMRNBPacketizer
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.rtp.AMRNBPacketizer
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.rtp.H263Packetizer
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.rtp.H263Packetizer
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.rtp.H264Packetizer
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.rtp.H264Packetizer
        +
        TAG - Variable in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
         
        -
        TAG - Variable in class net.majorkernelpanic.streaming.rtp.MediaCodecInputStream
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.rtp.RtpSocket
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspServer
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.rtsp.UriParser
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.rtsp.UriParser
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.Session
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.Session
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.video.CodecManager
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.video.H264Stream
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.video.H264Stream
         
        -
        TAG - Static variable in class net.majorkernelpanic.streaming.video.VideoQuality
        +
        TAG - Static variable in class net.majorkernelpanic.streaming.video.VideoQuality
         
        -
        TextureManager - Class in net.majorkernelpanic.streaming.gl
        +
        TextureManager - Class in net.majorkernelpanic.streaming.gl
        Code for rendering a texture onto a surface using OpenGL ES 2.0.
        -
        TextureManager() - Constructor for class net.majorkernelpanic.streaming.gl.TextureManager
        +
        TextureManager() - Constructor for class net.majorkernelpanic.streaming.gl.TextureManager
         
        -
        toggleFlash() - Method in class net.majorkernelpanic.streaming.Session
        -
         
        -
        toggleFlash() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        +
        toggleFlash() - Method in class net.majorkernelpanic.streaming.Session
        +
        +
        Toggles the LED of the phone if it has one.
        +
        +
        toggleFlash() - Method in class net.majorkernelpanic.streaming.video.VideoStream
        -
        Toggle the LED of the phone if it has one.
        +
        Toggles the LED of the phone if it has one.
        -
        trackExists(int) - Method in class net.majorkernelpanic.streaming.Session
        +
        toString() - Method in class net.majorkernelpanic.streaming.video.VideoQuality
        +
         
        +
        trackExists(int) - Method in class net.majorkernelpanic.streaming.Session
         
        +
        TRANSPORT_TCP - Static variable in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        +
        Use this to use TCP for the transport protocol.
        +
        +
        TRANSPORT_TCP - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        +
        Use this to use TCP for the transport protocol.
        +
        +
        TRANSPORT_UDP - Static variable in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        +
        Use this to use UDP for the transport protocol.
        +
        +
        TRANSPORT_UDP - Static variable in class net.majorkernelpanic.streaming.rtsp.RtspClient
        +
        +
        Use this to use UDP for the transport protocol.
        +
        - +

        U

        -
        update(int, long, long) - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        +
        update(int, long) - Method in class net.majorkernelpanic.streaming.rtcp.SenderReport
        Updates the number of packets sent, and the total amount of data sent.
        -
        updateFrame() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
        +
        updateFrame() - Method in class net.majorkernelpanic.streaming.gl.TextureManager
         
        -
        updateTimestamp(long) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        +
        updateTimestamp(long) - Method in class net.majorkernelpanic.streaming.rtp.RtpSocket
        Overwrites the timestamp in the packet.
        -
        UriParser - Class in net.majorkernelpanic.streaming.rtsp
        +
        UriParser - Class in net.majorkernelpanic.streaming.rtsp
        This class parses URIs received by the RTSP server and configures a Session accordingly.
        -
        UriParser() - Constructor for class net.majorkernelpanic.streaming.rtsp.UriParser
        +
        UriParser() - Constructor for class net.majorkernelpanic.streaming.rtsp.UriParser
         
        - +

        V

        -
        VIDEO_H263 - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        +
        VIDEO_H263 - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Can be used with SessionBuilder.setVideoEncoder(int).
        +
        Can be used with SessionBuilder.setVideoEncoder(int).
        -
        VIDEO_H264 - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        +
        VIDEO_H264 - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Can be used with SessionBuilder.setVideoEncoder(int).
        +
        Can be used with SessionBuilder.setVideoEncoder(int).
        -
        VIDEO_NONE - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        +
        VIDEO_NONE - Static variable in class net.majorkernelpanic.streaming.SessionBuilder
        -
        Can be used with SessionBuilder.setVideoEncoder(int).
        +
        Can be used with SessionBuilder.setVideoEncoder(int).
        -
        VideoQuality - Class in net.majorkernelpanic.streaming.video
        +
        VideoQuality - Class in net.majorkernelpanic.streaming.video
        A class that represents the quality of a video stream.
        -
        VideoQuality() - Constructor for class net.majorkernelpanic.streaming.video.VideoQuality
        +
        VideoQuality() - Constructor for class net.majorkernelpanic.streaming.video.VideoQuality
        Represents a quality for a video stream.
        -
        VideoQuality(int, int) - Constructor for class net.majorkernelpanic.streaming.video.VideoQuality
        +
        VideoQuality(int, int) - Constructor for class net.majorkernelpanic.streaming.video.VideoQuality
        Represents a quality for a video stream.
        -
        VideoQuality(int, int, int, int) - Constructor for class net.majorkernelpanic.streaming.video.VideoQuality
        +
        VideoQuality(int, int, int, int) - Constructor for class net.majorkernelpanic.streaming.video.VideoQuality
        Represents a quality for a video stream.
        -
        VideoStream - Class in net.majorkernelpanic.streaming.video
        +
        VideoStream - Class in net.majorkernelpanic.streaming.video
        Don't use this class directly.
        -
        VideoStream() - Constructor for class net.majorkernelpanic.streaming.video.VideoStream
        +
        VideoStream() - Constructor for class net.majorkernelpanic.streaming.video.VideoStream
        Don't use this class directly.
        -
        VideoStream(int) - Constructor for class net.majorkernelpanic.streaming.video.VideoStream
        +
        VideoStream(int) - Constructor for class net.majorkernelpanic.streaming.video.VideoStream
        Don't use this class directly
        +
        ViewAspectRatioMeasurer() - Constructor for class net.majorkernelpanic.streaming.gl.SurfaceView.ViewAspectRatioMeasurer
        +
         
        -A B C D E F G H I K M N O P R S T U V 
        +A B C D E F G H I K L M N O P R S T U V 
        -
        +
        - + +
        Skip navigation links
        +
        @@ -1531,11 +1694,11 @@

        V

      • Next
        • - +
        diff --git a/doc/index.html b/doc/index.html index c22861e7..30ded234 100644 --- a/doc/index.html +++ b/doc/index.html @@ -2,17 +2,22 @@ - + Generated Documentation (Untitled) -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        - - -
        - - - - - -
        -
        - - - -
        - -
        -
        -
          -
        • Summary: 
          • -
        • Nested | 
          • -
        • Field | 
          • -
        • Constr | 
          • -
        • Method
          • -
        -
          -
        • Detail: 
          • -
        • Field | 
          • -
        • Constr | 
          • -
        • Method
          • -
        -
        - - -
        - - -
        -
        net.majorkernelpanic.streaming.audio
        -

        Class AACNotSupportedException

        -
        -
        -
          -
        • java.lang.Object
          • -
        • -
            -
          • java.lang.Throwable
            • -
          • -
              -
            • java.lang.Exception
              • -
            • -
                -
              • java.lang.RuntimeException
                • -
              • -
                  -
                • net.majorkernelpanic.streaming.audio.AACNotSupportedException
                  • -
                -
                • -
              -
              • -
            -
            • -
          -
          • -
        -
        -
          -
        • -
          -
          All Implemented Interfaces:
          -
          java.io.Serializable
          -
          -
          -
          -
          public class AACNotSupportedException
-extends java.lang.RuntimeException
          -
          See Also:
          Serialized Form
          -
          • -
        -
        -
        -
          -
        • - -
            -
          • - - -

            Constructor Summary

            -
        net.majorkernelpanic.streaming.video.VideoQuality 
        Modifier and Type
        - - - - - - - -
        Constructors 
        Constructor and Description
        AACNotSupportedException() 
        -
        • -
      - -
        -
      • - - -

        Method Summary

        -
          -
        • - - -

          Methods inherited from class java.lang.Throwable

          -addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString
          • -
        -
          -
        • - - -

          Methods inherited from class java.lang.Object

          -equals, getClass, hashCode, notify, notifyAll, wait, wait, wait
          • -
        -
        • -
      - -
    -
    -
    -
      -
    • - -
        -
      • - - -

        Constructor Detail

        - - - -
          -
        • -

          AACNotSupportedException

          -
          public AACNotSupportedException()
          -
          • -
        -
        • -
      -
      • -
    -
    -
- - -
- - - - - -
-
- - - -
- -
-
-
    -
  • Summary: 
    • -
  • Nested | 
    • -
  • Field | 
    • -
  • Constr | 
    • -
  • Method
    • -
-
    -
  • Detail: 
    • -
  • Field | 
    • -
  • Constr | 
    • -
  • Method
    • -
-
- - -
- - - diff --git a/doc/net/majorkernelpanic/streaming/audio/AACStream.html b/doc/net/majorkernelpanic/streaming/audio/AACStream.html index 3b8d12a0..f4fcffee 100644 --- a/doc/net/majorkernelpanic/streaming/audio/AACStream.html +++ b/doc/net/majorkernelpanic/streaming/audio/AACStream.html @@ -2,25 +2,38 @@ - + AACStream - + + -
+
- + +
Skip navigation links
+
    @@ -35,15 +48,15 @@
-
+
- + +
Skip navigation links
+
    @@ -35,15 +48,15 @@
-
+
- + +
Skip navigation links
+
    @@ -35,15 +48,15 @@
-
+
- + +
Skip navigation links
+
    @@ -35,15 +48,15 @@

net.majorkernelpanic.streaming.audio

diff --git a/doc/net/majorkernelpanic/streaming/audio/package-summary.html b/doc/net/majorkernelpanic/streaming/audio/package-summary.html index 04cd4416..8f3693ad 100644 --- a/doc/net/majorkernelpanic/streaming/audio/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/audio/package-summary.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.audio - + + @@ -18,9 +23,11 @@
JavaScript is disabled on your browser.
-
+
- + +
Skip navigation links
+
    @@ -35,15 +42,15 @@
- +
@@ -67,7 +74,7 @@

Package net.majorkernelpanic.streaming.au
  • - +
    @@ -104,9 +111,11 @@

    Package net.majorkernelpanic.streaming.au -
    +
    - + +
    Skip navigation links
    +
      @@ -121,15 +130,15 @@

      Package net.majorkernelpanic.streaming.au

    - +
    diff --git a/doc/net/majorkernelpanic/streaming/audio/package-tree.html b/doc/net/majorkernelpanic/streaming/audio/package-tree.html index 927f1c98..9131a032 100644 --- a/doc/net/majorkernelpanic/streaming/audio/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/audio/package-tree.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.audio Class Hierarchy - + + @@ -18,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + +
    Skip navigation links
    +
      @@ -40,10 +47,10 @@
    - +

    Hierarchy For Package net.majorkernelpanic.streaming.audio

    -Package Hierarchies: +Package Hierarchies: @@ -73,13 +80,13 @@

    Class Hierarchy

    • java.lang.Object
        -
      • net.majorkernelpanic.streaming.audio.AudioQuality
        • -
      • net.majorkernelpanic.streaming.MediaStream (implements net.majorkernelpanic.streaming.Stream) +
      • net.majorkernelpanic.streaming.audio.AudioQuality
        • +
      • net.majorkernelpanic.streaming.MediaStream (implements net.majorkernelpanic.streaming.Stream) @@ -89,9 +96,11 @@

        Class Hierarchy

    -
    +
    - + +
    Skip navigation links
    +
      @@ -111,10 +120,10 @@

      Class Hierarchy

    - +
    diff --git a/doc/net/majorkernelpanic/streaming/exceptions/CameraInUseException.html b/doc/net/majorkernelpanic/streaming/exceptions/CameraInUseException.html index 641c3776..5b4fc1aa 100644 --- a/doc/net/majorkernelpanic/streaming/exceptions/CameraInUseException.html +++ b/doc/net/majorkernelpanic/streaming/exceptions/CameraInUseException.html @@ -2,15 +2,20 @@ - + CameraInUseException - + + @@ -18,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +42,15 @@
    @@ -18,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +42,15 @@
    @@ -18,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +42,15 @@
    @@ -18,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +42,15 @@

    net.majorkernelpanic.streaming.exceptions

    diff --git a/doc/net/majorkernelpanic/streaming/exceptions/package-summary.html b/doc/net/majorkernelpanic/streaming/exceptions/package-summary.html index 9bd4d248..126ca205 100644 --- a/doc/net/majorkernelpanic/streaming/exceptions/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/exceptions/package-summary.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.exceptions - + + @@ -18,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +42,15 @@
    - +
    @@ -67,7 +74,7 @@

    Package net.majorkernelpanic.streaming.ex
    • -

    Class Summary 
    Class
    +
    @@ -96,9 +103,11 @@

    Package net.majorkernelpanic.streaming.ex -
    +
    - + +
    Skip navigation links
    +
      @@ -113,15 +122,15 @@

      Package net.majorkernelpanic.streaming.ex

    - +
    diff --git a/doc/net/majorkernelpanic/streaming/exceptions/package-tree.html b/doc/net/majorkernelpanic/streaming/exceptions/package-tree.html index 7f2c3752..3d2fd853 100644 --- a/doc/net/majorkernelpanic/streaming/exceptions/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/exceptions/package-tree.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.exceptions Class Hierarchy - + + @@ -18,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + +
    Skip navigation links
    +
      @@ -40,10 +47,10 @@
    - +

    Hierarchy For Package net.majorkernelpanic.streaming.exceptions

    -Package Hierarchies: +Package Hierarchies: @@ -79,14 +86,14 @@

    Class Hierarchy

    @@ -98,9 +105,11 @@

    Class Hierarchy

    -
    +
    - + +
    Skip navigation links
    +
      @@ -120,10 +129,10 @@

      Class Hierarchy

    - +
    diff --git a/doc/net/majorkernelpanic/streaming/gl/SurfaceManager.html b/doc/net/majorkernelpanic/streaming/gl/SurfaceManager.html index 051f9aef..1081e283 100644 --- a/doc/net/majorkernelpanic/streaming/gl/SurfaceManager.html +++ b/doc/net/majorkernelpanic/streaming/gl/SurfaceManager.html @@ -2,25 +2,38 @@ - + SurfaceManager - + + -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +48,15 @@
    + + + + + +
    + + +
    Skip navigation links
    + + + + +
    +
    + + + +
    + +
    +
    +
      +
    • Summary: 
      • +
    • Nested | 
      • +
    • Field | 
      • +
    • Constr | 
      • +
    • Method
      • +
    + +
    + + +
    + + +
    +
    net.majorkernelpanic.streaming.gl
    +

    Class SurfaceView.ViewAspectRatioMeasurer

    +
    +
    +
      +
    • java.lang.Object
      • +
    • +
        +
      • net.majorkernelpanic.streaming.gl.SurfaceView.ViewAspectRatioMeasurer
        • +
      +
      • +
    +
    +
      +
    • +
      +
      Enclosing class:
      +
      SurfaceView
      +
      +
      +
      +
      public class SurfaceView.ViewAspectRatioMeasurer
+extends java.lang.Object
      +
      This class is a helper to measure views that require a specific aspect ratio.
      +
      +
      Author:
      +
      Jesper Borgstrup
      +
      +
      • +
    +
    +
    +
      +
    • + +
        +
      • + + +

        Constructor Summary

        +

    Exception Summary 
    Exception
    + + + + + + + +
    Constructors 
    Constructor and Description
    ViewAspectRatioMeasurer() 
    +
    • +
+ +
    +
  • + + +

    Method Summary

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    All Methods Instance Methods Concrete Methods 
    Modifier and TypeMethod and Description
    doublegetAspectRatio() 
    intgetMeasuredHeight() +
    Get the height measured in the latest call to measure().
    +
    intgetMeasuredWidth() +
    Get the width measured in the latest call to measure().
    +
    voidmeasure(int widthMeasureSpec, + int heightMeasureSpec) +
    Measure with the aspect ratio given at construction.
    +
    + After measuring, get the width and height with the getMeasuredWidth() + and getMeasuredHeight() methods, respectively.
    +
    voidmeasure(int widthMeasureSpec, + int heightMeasureSpec, + double aspectRatio) +
    Measure with a specific aspect ratio
    +
    + After measuring, get the width and height with the getMeasuredWidth() + and getMeasuredHeight() methods, respectively.
    +
    voidsetAspectRatio(double aspectRatio) 
    +
      +
    • + + +

      Methods inherited from class java.lang.Object

      +equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +
    +
    • +
+ + +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        ViewAspectRatioMeasurer

        +
        public ViewAspectRatioMeasurer()
        +
        • +
      +
      • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        setAspectRatio

        +
        public void setAspectRatio(double aspectRatio)
        +
        • +
      + + + +
        +
      • +

        getAspectRatio

        +
        public double getAspectRatio()
        +
        • +
      + + + +
        +
      • +

        measure

        +
        public void measure(int widthMeasureSpec,
+                    int heightMeasureSpec)
        +
        Measure with the aspect ratio given at construction.
        +
        + After measuring, get the width and height with the getMeasuredWidth() + and getMeasuredHeight() methods, respectively.
        +
        +
        Parameters:
        +
        widthMeasureSpec - The width MeasureSpec passed in your View.onMeasure() method
        +
        heightMeasureSpec - The height MeasureSpec passed in your View.onMeasure() method
        +
        +
        • +
      + + + +
        +
      • +

        measure

        +
        public void measure(int widthMeasureSpec,
+                    int heightMeasureSpec,
+                    double aspectRatio)
        +
        Measure with a specific aspect ratio
        +
        + After measuring, get the width and height with the getMeasuredWidth() + and getMeasuredHeight() methods, respectively.
        +
        +
        Parameters:
        +
        widthMeasureSpec - The width MeasureSpec passed in your View.onMeasure() method
        +
        heightMeasureSpec - The height MeasureSpec passed in your View.onMeasure() method
        +
        aspectRatio - The aspect ratio to calculate measurements in respect to
        +
        +
        • +
      + + + +
        +
      • +

        getMeasuredWidth

        +
        public int getMeasuredWidth()
        +
        Get the width measured in the latest call to measure().
        +
        • +
      + + + +
        +
      • +

        getMeasuredHeight

        +
        public int getMeasuredHeight()
        +
        Get the height measured in the latest call to measure().
        +
        • +
      +
      • +
    +
    • +
+
+

+ + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+
+
    +
  • Summary: 
    • +
  • Nested | 
    • +
  • Field | 
    • +
  • Constr | 
    • +
  • Method
    • +
+ +
+ + +
+ + + diff --git a/doc/net/majorkernelpanic/streaming/gl/SurfaceView.html b/doc/net/majorkernelpanic/streaming/gl/SurfaceView.html index 8eb96f75..420821e8 100644 --- a/doc/net/majorkernelpanic/streaming/gl/SurfaceView.html +++ b/doc/net/majorkernelpanic/streaming/gl/SurfaceView.html @@ -2,25 +2,38 @@ - + SurfaceView - + + -
+
- + +
Skip navigation links
+
    @@ -35,15 +48,15 @@
-
+
- + +
Skip navigation links
+
    @@ -35,15 +48,15 @@

net.majorkernelpanic.streaming.gl

diff --git a/doc/net/majorkernelpanic/streaming/gl/package-summary.html b/doc/net/majorkernelpanic/streaming/gl/package-summary.html index 60cc5506..5b0e1e80 100644 --- a/doc/net/majorkernelpanic/streaming/gl/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/gl/package-summary.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.gl - + + @@ -18,9 +23,11 @@
JavaScript is disabled on your browser.
-
+
- + +
Skip navigation links
+
    @@ -35,15 +42,15 @@
- +
@@ -67,7 +74,7 @@

Package net.majorkernelpanic.streaming.gl
  • - +
    @@ -80,9 +87,11 @@

    Package net.majorkernelpanic.streaming.gl

    - + - +
    Class Summary 
    Class
    SurfaceView  +
    An enhanced SurfaceView in which the camera preview will be rendered.
    +
    TextureManager
    Code for rendering a texture onto a surface using OpenGL ES 2.0.
    @@ -94,9 +103,11 @@

    Package net.majorkernelpanic.streaming.gl -
    +
    - + +
    Skip navigation links
    +
      @@ -111,15 +122,15 @@

      Package net.majorkernelpanic.streaming.gl

    - +
    diff --git a/doc/net/majorkernelpanic/streaming/gl/package-tree.html b/doc/net/majorkernelpanic/streaming/gl/package-tree.html index 6f8aab95..546a83fc 100644 --- a/doc/net/majorkernelpanic/streaming/gl/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/gl/package-tree.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.gl Class Hierarchy - + + @@ -18,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + +
    Skip navigation links
    +
      @@ -40,10 +47,10 @@
    - +

    Hierarchy For Package net.majorkernelpanic.streaming.gl

    -Package Hierarchies: +Package Hierarchies: @@ -73,25 +80,24 @@

    Class Hierarchy

    • java.lang.Object
        -
      • net.majorkernelpanic.streaming.gl.SurfaceManager
        • -
      • net.majorkernelpanic.streaming.gl.TextureManager
        • -
      • android.view.View (implements android.view.accessibility.AccessibilityEventSource, android.graphics.drawable.Drawable.Callback, android.view.KeyEvent.Callback) -
          +
        • net.majorkernelpanic.streaming.gl.SurfaceManager
        • android.view.SurfaceView
            -
          • net.majorkernelpanic.streaming.gl.SurfaceView (implements java.lang.Runnable, android.view.SurfaceHolder.Callback, android.graphics.SurfaceTexture.OnFrameAvailableListener)
            • -
          -
          • +
        • net.majorkernelpanic.streaming.gl.SurfaceView (implements java.lang.Runnable)
        • +
      • net.majorkernelpanic.streaming.gl.SurfaceView.ViewAspectRatioMeasurer
        • +
      • net.majorkernelpanic.streaming.gl.TextureManager
    -
    +
    - + +
    Skip navigation links
    +
      @@ -111,10 +117,10 @@

      Class Hierarchy

    - +
    diff --git a/doc/net/majorkernelpanic/streaming/hw/CodecManager.html b/doc/net/majorkernelpanic/streaming/hw/CodecManager.html index 2a4a1691..49600fdd 100644 --- a/doc/net/majorkernelpanic/streaming/hw/CodecManager.html +++ b/doc/net/majorkernelpanic/streaming/hw/CodecManager.html @@ -2,25 +2,38 @@ - + CodecManager - + + -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +48,15 @@
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +48,15 @@
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +48,15 @@

    net.majorkernelpanic.streaming.hw

    diff --git a/doc/net/majorkernelpanic/streaming/hw/package-summary.html b/doc/net/majorkernelpanic/streaming/hw/package-summary.html index 0ea9d1d7..ee61109a 100644 --- a/doc/net/majorkernelpanic/streaming/hw/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/hw/package-summary.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.hw - + + @@ -18,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +42,15 @@
    - +
    @@ -67,7 +74,7 @@

    Package net.majorkernelpanic.streaming.hw
    • - +
      @@ -97,9 +104,11 @@

      Package net.majorkernelpanic.streaming.hw -
      +
      - + +
      Skip navigation links
      +
        @@ -114,15 +123,15 @@

        Package net.majorkernelpanic.streaming.hw

      - +
      diff --git a/doc/net/majorkernelpanic/streaming/hw/package-tree.html b/doc/net/majorkernelpanic/streaming/hw/package-tree.html index 648332d3..df8bac81 100644 --- a/doc/net/majorkernelpanic/streaming/hw/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/hw/package-tree.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.hw Class Hierarchy - + + @@ -18,9 +23,11 @@
      JavaScript is disabled on your browser.
      -
      +
      - + +
      Skip navigation links
      +
        @@ -40,10 +47,10 @@
      - +

      Hierarchy For Package net.majorkernelpanic.streaming.hw

      -Package Hierarchies: +Package Hierarchies: @@ -73,17 +80,19 @@

      Class Hierarchy

      -
      +
      - + +
      Skip navigation links
      +
        @@ -103,10 +112,10 @@

        Class Hierarchy

      - +
      diff --git a/doc/net/majorkernelpanic/streaming/mp4/MP4Config.html b/doc/net/majorkernelpanic/streaming/mp4/MP4Config.html index c6e14259..af1eb840 100644 --- a/doc/net/majorkernelpanic/streaming/mp4/MP4Config.html +++ b/doc/net/majorkernelpanic/streaming/mp4/MP4Config.html @@ -2,25 +2,38 @@ - + MP4Config - + + -
      +
      - + +
      Skip navigation links
      +
        @@ -35,15 +48,15 @@
      + + + + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      +
      +
        +
      • Summary: 
        • +
      • Nested | 
        • +
      • Field | 
        • +
      • Constr | 
        • +
      • Method
        • +
      +
        +
      • Detail: 
        • +
      • Field | 
        • +
      • Constr | 
        • +
      • Method
        • +
      +
      + + +
      + + +
      +
      net.majorkernelpanic.streaming.mp4
      +

      Class MP4Parser

      +
      +
      +
        +
      • java.lang.Object
        • +
      • +
          +
        • net.majorkernelpanic.streaming.mp4.MP4Parser
          • +
        +
        • +
      +
      +
        +
      • +
        +
        +
        public class MP4Parser
+extends java.lang.Object
        +
        Parse an mp4 file. + An mp4 file contains a tree where each node has a name and a size. + This class is used by H264Stream.java to determine the SPS and PPS parameters of a short video recorded by the phone.
        +
        • +
      +
      +
      +
        +
      • + +
          +
        • + + +

          Method Summary

          +

      Class Summary 
      Class
      + + + + + + + + + + + + + + + + + + + + + +
      All Methods Static Methods Instance Methods Concrete Methods 
      Modifier and TypeMethod and Description
      voidclose() 
      longgetBoxPos(java.lang.String box) 
      net.majorkernelpanic.streaming.mp4.StsdBoxgetStsdBox() 
      static MP4Parserparse(java.lang.String path) +
      Parses the mp4 file.
      +
      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +
      +
      • +
    + + +
    +
    +
      +
    • + +
        +
      • + + +

        Method Detail

        + + + +
          +
        • +

          parse

          +
          public static MP4Parser parse(java.lang.String path)
+                       throws java.io.IOException
          +
          Parses the mp4 file.
          +
          +
          Throws:
          +
          java.io.IOException
          +
          +
          • +
        + + + +
          +
        • +

          close

          +
          public void close()
          +
          • +
        + + + +
          +
        • +

          getBoxPos

          +
          public long getBoxPos(java.lang.String box)
+               throws java.io.IOException
          +
          +
          Throws:
          +
          java.io.IOException
          +
          +
          • +
        + + + +
          +
        • +

          getStsdBox

          +
          public net.majorkernelpanic.streaming.mp4.StsdBox getStsdBox()
+                                                      throws java.io.IOException
          +
          +
          Throws:
          +
          java.io.IOException
          +
          +
          • +
        +
        • +
      +
      • +
    +
    +

    + + +
    + + +
    Skip navigation links
    + + + + +
    +
    + + + +
    + +
    +
    +
      +
    • Summary: 
      • +
    • Nested | 
      • +
    • Field | 
      • +
    • Constr | 
      • +
    • Method
      • +
    +
      +
    • Detail: 
      • +
    • Field | 
      • +
    • Constr | 
      • +
    • Method
      • +
    +
    + + +
    + + + diff --git a/doc/net/majorkernelpanic/streaming/mp4/package-frame.html b/doc/net/majorkernelpanic/streaming/mp4/package-frame.html index 5d297f75..8da5a08b 100644 --- a/doc/net/majorkernelpanic/streaming/mp4/package-frame.html +++ b/doc/net/majorkernelpanic/streaming/mp4/package-frame.html @@ -2,10 +2,11 @@ - + net.majorkernelpanic.streaming.mp4 - + +

    net.majorkernelpanic.streaming.mp4

    @@ -13,6 +14,7 @@

    Classes

    diff --git a/doc/net/majorkernelpanic/streaming/mp4/package-summary.html b/doc/net/majorkernelpanic/streaming/mp4/package-summary.html index d1c68b7d..07917492 100644 --- a/doc/net/majorkernelpanic/streaming/mp4/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/mp4/package-summary.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.mp4 - + + @@ -18,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +42,15 @@
    - +
    @@ -67,7 +74,7 @@

    Package net.majorkernelpanic.streaming.mp
    • - +
      @@ -80,15 +87,23 @@

      Package net.majorkernelpanic.streaming.mp
      Finds SPS & PPS parameters in mp4 file.

      + + + +
      Class Summary 
      Class
      MP4Parser +
      Parse an mp4 file.
      +
    -
    +
    - + +
    Skip navigation links
    +
      @@ -103,15 +118,15 @@

      Package net.majorkernelpanic.streaming.mp

    - +
    diff --git a/doc/net/majorkernelpanic/streaming/mp4/package-tree.html b/doc/net/majorkernelpanic/streaming/mp4/package-tree.html index 28a3a4a3..428a6983 100644 --- a/doc/net/majorkernelpanic/streaming/mp4/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/mp4/package-tree.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.mp4 Class Hierarchy - + + @@ -18,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + +
    Skip navigation links
    +
      @@ -40,10 +47,10 @@
    - +

    Hierarchy For Package net.majorkernelpanic.streaming.mp4

    -Package Hierarchies: +Package Hierarchies: @@ -73,15 +80,18 @@

    Class Hierarchy

    • java.lang.Object
        -
      • net.majorkernelpanic.streaming.mp4.MP4Config
        • +
      • net.majorkernelpanic.streaming.mp4.MP4Config
        • +
      • net.majorkernelpanic.streaming.mp4.MP4Parser
    -
    +
    - + +
    Skip navigation links
    +
      @@ -101,10 +111,10 @@

      Class Hierarchy

    - +
    diff --git a/doc/net/majorkernelpanic/streaming/package-frame.html b/doc/net/majorkernelpanic/streaming/package-frame.html index de69a2a4..9835b689 100644 --- a/doc/net/majorkernelpanic/streaming/package-frame.html +++ b/doc/net/majorkernelpanic/streaming/package-frame.html @@ -2,18 +2,19 @@ - + net.majorkernelpanic.streaming - + +

    net.majorkernelpanic.streaming

    Interfaces

    Classes

      diff --git a/doc/net/majorkernelpanic/streaming/package-summary.html b/doc/net/majorkernelpanic/streaming/package-summary.html index e227dbd3..816273ac 100644 --- a/doc/net/majorkernelpanic/streaming/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/package-summary.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming - + + @@ -18,9 +23,11 @@
      JavaScript is disabled on your browser.
      -
      +
      - + +
      Skip navigation links
      +
        @@ -35,15 +42,15 @@
      - +
      @@ -67,7 +74,7 @@

      Package net.majorkernelpanic.streaming
      • - +
        @@ -91,7 +98,7 @@

        Package net.majorkernelpanic.streaming
      • -

        • Interface Summary 
        Interface
        +
        @@ -101,7 +108,7 @@

        Package net.majorkernelpanic.streaming

        @@ -111,13 +118,13 @@

        Package net.majorkernelpanic.streaming It holds a VideoStream and a AudioStream together and provides - syncronous and asyncrounous functions to start and stop those steams. + synchronous and asynchronous functions to start and stop those steams.

        @@ -126,9 +133,11 @@

        Package net.majorkernelpanic.streaming -
        +
        - + +
        Skip navigation links
        +
          @@ -143,15 +152,15 @@

          Package net.majorkernelpanic.streaming
          - +
          diff --git a/doc/net/majorkernelpanic/streaming/package-tree.html b/doc/net/majorkernelpanic/streaming/package-tree.html index d399fc5a..f3f1bebe 100644 --- a/doc/net/majorkernelpanic/streaming/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/package-tree.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming Class Hierarchy - + + @@ -18,9 +23,11 @@
          JavaScript is disabled on your browser.
          -
          +
          - + +
          Skip navigation links
          +
            @@ -40,10 +47,10 @@
          - +

          Hierarchy For Package net.majorkernelpanic.streaming

          -Package Hierarchies: +Package Hierarchies: @@ -73,22 +80,24 @@

          Class Hierarchy

          • java.lang.Object

          Interface Hierarchy

          -
          +
          - + +
          Skip navigation links
          +
            @@ -108,10 +117,10 @@

            Interface Hierarchy

          - +
          diff --git a/doc/net/majorkernelpanic/streaming/rtcp/SenderReport.html b/doc/net/majorkernelpanic/streaming/rtcp/SenderReport.html index cfc8b519..dcbb64d7 100644 --- a/doc/net/majorkernelpanic/streaming/rtcp/SenderReport.html +++ b/doc/net/majorkernelpanic/streaming/rtcp/SenderReport.html @@ -2,25 +2,38 @@ - + SenderReport - + + -
          +
          - + +
          Skip navigation links
          +
            @@ -35,15 +48,15 @@
            -
          • Prev Class
            • -
          • Next Class
            • +
          • Prev Class
            • +
          • Next Class

          net.majorkernelpanic.streaming.rtcp

          diff --git a/doc/net/majorkernelpanic/streaming/rtcp/package-summary.html b/doc/net/majorkernelpanic/streaming/rtcp/package-summary.html index b3a84792..2495bdbd 100644 --- a/doc/net/majorkernelpanic/streaming/rtcp/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/rtcp/package-summary.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.rtcp - + + @@ -18,9 +23,11 @@
          JavaScript is disabled on your browser.
          -
          +
          - + +
          Skip navigation links
          +
            @@ -35,15 +42,15 @@
          - +
          @@ -67,7 +74,7 @@

          Package net.majorkernelpanic.streaming.rt
          • -

        Class Summary 
        ClassMediaStream -
        A MediaRecorder that streams what it records using a packetizer from the rtp package.
        +
        A MediaRecorder that streams what it records using a packetizer from the RTP package.
        SessionBuilder -
        Call SessionBuilder.getInstance() to get access to the SessionBuilder.
        +
        Call SessionBuilder.getInstance() to get access to the SessionBuilder.
        +
        @@ -86,9 +93,11 @@

        Package net.majorkernelpanic.streaming.rt -
        +
        - + +
        Skip navigation links
        +
          @@ -103,15 +112,15 @@

          Package net.majorkernelpanic.streaming.rt

        - +
        diff --git a/doc/net/majorkernelpanic/streaming/rtcp/package-tree.html b/doc/net/majorkernelpanic/streaming/rtcp/package-tree.html index c176caf3..e19f0879 100644 --- a/doc/net/majorkernelpanic/streaming/rtcp/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/rtcp/package-tree.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.rtcp Class Hierarchy - + + @@ -18,9 +23,11 @@
        JavaScript is disabled on your browser.
        -
        +
        - + +
        Skip navigation links
        +
          @@ -40,10 +47,10 @@
        - +

        Hierarchy For Package net.majorkernelpanic.streaming.rtcp

        -Package Hierarchies: +Package Hierarchies: @@ -73,15 +80,17 @@

        Class Hierarchy

        -
        +
        - + +
        Skip navigation links
        +
          @@ -101,10 +110,10 @@

          Class Hierarchy

        - +
        diff --git a/doc/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.html b/doc/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.html index bd7364c2..b73e4dfe 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.html +++ b/doc/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.html @@ -2,25 +2,38 @@ - + AACADTSPacketizer - + + -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@
        - - - - - -
        - - - - - -

        Class Summary 
        Class
        - - - - - - - - - - - - - -
        - - - - - - - - - - - -
        Overview  Package   Class  Tree  Deprecated  Index  Help 
        -        		 - -
        - PREV CLASS  - NEXT CLASS - FRAMES   - NO FRAMES   -  - - - -
        - SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD
        - - - -
        - -

        - -net.majorkernelpanic.streaming.rtp -
        -Class RtpSocket.Statistics

        -
        -java.lang.Object
-  extended by net.majorkernelpanic.streaming.rtp.RtpSocket.Statistics
-
        -
        -
        Enclosing class:
        RtpSocket
        -
        -
        -
        -
        public static class RtpSocket.Statistics
        extends java.lang.Object
        - - -

        -Computes the proper rate at which packets are sent. -

        - -

        -

        - -

        - - - - - - - - - - - -
        -Field Summary
        -static java.lang.StringTAG - -
        -           
        -  - - - - - - - - - - -
        -Constructor Summary
        RtpSocket.Statistics(int count, - int period) - -
        -           
        -  - - - - - - - - - - - - - - - -
        -Method Summary
        - longaverage() - -
        -           
        - voidpush(long value) - -
        -           
        -  - - - - - - - -
        Methods inherited from class java.lang.Object
        equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        -  -

        - - - - - - - - -
        -Field Detail
        - -

        -TAG

        -
        -public static final java.lang.String TAG
        -
        -
        -
        See Also:
        Constant Field Values
        -
        - - - - - - - - -
        -Constructor Detail
        - -

        -RtpSocket.Statistics

        -
        -public RtpSocket.Statistics(int count,
-                            int period)
        -
        -
        - - - - - - - - -
        -Method Detail
        - -

        -push

        -
        -public void push(long value)
        -
        -
        -
        -
        -
        -
        - -

        -average

        -
        -public long average()
        -
        -
        -
        -
        -
        - -
        - - - - - - - - - - - - - - - - - - - -
        - - - - - - - - - - - -
        Overview  Package   Class  Tree  Deprecated  Index  Help 
        -        		 - -
        - PREV CLASS  - NEXT CLASS - FRAMES   - NO FRAMES   -  - - - -
        - SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD
        - - - -
        - - - diff --git a/doc/net/majorkernelpanic/streaming/rtp/RtpSocket.html b/doc/net/majorkernelpanic/streaming/rtp/RtpSocket.html index cd506807..ac20aafe 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/RtpSocket.html +++ b/doc/net/majorkernelpanic/streaming/rtp/RtpSocket.html @@ -2,25 +2,38 @@ - + RtpSocket - + + -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +48,15 @@

        net.majorkernelpanic.streaming.rtp

        diff --git a/doc/net/majorkernelpanic/streaming/rtp/package-summary.html b/doc/net/majorkernelpanic/streaming/rtp/package-summary.html index b6d22bfe..09cfeb1b 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/rtp/package-summary.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.rtp - + + @@ -18,9 +23,11 @@
        JavaScript is disabled on your browser.
        -
        +
        - + +
        Skip navigation links
        +
          @@ -35,15 +42,15 @@
        - +
        @@ -67,7 +74,7 @@

        Package net.majorkernelpanic.streaming.rt
        • - +
          @@ -128,9 +135,11 @@

          Package net.majorkernelpanic.streaming.rt -
          +
          - + +
          Skip navigation links
          +
            @@ -145,15 +154,15 @@

            Package net.majorkernelpanic.streaming.rt

          - +
          diff --git a/doc/net/majorkernelpanic/streaming/rtp/package-tree.html b/doc/net/majorkernelpanic/streaming/rtp/package-tree.html index ca3f11f6..b6c6d1b8 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/rtp/package-tree.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.rtp Class Hierarchy - + + @@ -18,9 +23,11 @@
          JavaScript is disabled on your browser.
          -
          +
          - + +
          Skip navigation links
          +
            @@ -40,10 +47,10 @@
          - +

          Hierarchy For Package net.majorkernelpanic.streaming.rtp

          -Package Hierarchies: +Package Hierarchies: @@ -73,29 +80,31 @@

          Class Hierarchy

          • java.lang.Object
              -
            • net.majorkernelpanic.streaming.rtp.AbstractPacketizer +
            • net.majorkernelpanic.streaming.rtp.AbstractPacketizer
                -
              • net.majorkernelpanic.streaming.rtp.AACADTSPacketizer (implements java.lang.Runnable)
                • -
              • net.majorkernelpanic.streaming.rtp.AACLATMPacketizer (implements java.lang.Runnable)
                • -
              • net.majorkernelpanic.streaming.rtp.AMRNBPacketizer (implements java.lang.Runnable)
                • -
              • net.majorkernelpanic.streaming.rtp.H263Packetizer (implements java.lang.Runnable)
                • -
              • net.majorkernelpanic.streaming.rtp.H264Packetizer (implements java.lang.Runnable)
                • +
              • net.majorkernelpanic.streaming.rtp.AACADTSPacketizer (implements java.lang.Runnable)
                • +
              • net.majorkernelpanic.streaming.rtp.AACLATMPacketizer (implements java.lang.Runnable)
                • +
              • net.majorkernelpanic.streaming.rtp.AMRNBPacketizer (implements java.lang.Runnable)
                • +
              • net.majorkernelpanic.streaming.rtp.H263Packetizer (implements java.lang.Runnable)
                • +
              • net.majorkernelpanic.streaming.rtp.H264Packetizer (implements java.lang.Runnable)
            • java.io.InputStream (implements java.io.Closeable)
              • -
            • net.majorkernelpanic.streaming.rtp.RtpSocket (implements java.lang.Runnable)
              • +
            • net.majorkernelpanic.streaming.rtp.RtpSocket (implements java.lang.Runnable)
          -
          +
          - + +
          Skip navigation links
          +
            @@ -115,10 +124,10 @@

            Class Hierarchy

          - +
          diff --git a/doc/net/majorkernelpanic/streaming/rtsp/RtspClient.Callback.html b/doc/net/majorkernelpanic/streaming/rtsp/RtspClient.Callback.html index 28eb8c6f..9e6d4853 100644 --- a/doc/net/majorkernelpanic/streaming/rtsp/RtspClient.Callback.html +++ b/doc/net/majorkernelpanic/streaming/rtsp/RtspClient.Callback.html @@ -2,25 +2,38 @@ - + RtspClient.Callback - + + -
          +
          - + +
          Skip navigation links
          +
            @@ -35,15 +48,15 @@
          -
          +
          - + +
          Skip navigation links
          +
            @@ -35,15 +48,15 @@
          -
          +
          - + +
          Skip navigation links
          +
            @@ -35,15 +48,15 @@
          -
          +
          - + +
          Skip navigation links
          +
            @@ -35,15 +48,15 @@
          -
          +
          - + +
          Skip navigation links
          +
            @@ -35,15 +48,15 @@
          -
          +
          - + +
          Skip navigation links
          +
            @@ -35,15 +48,15 @@

          net.majorkernelpanic.streaming.rtsp

          Interfaces

          Classes

            diff --git a/doc/net/majorkernelpanic/streaming/rtsp/package-summary.html b/doc/net/majorkernelpanic/streaming/rtsp/package-summary.html index 72e2184b..aa99d24c 100644 --- a/doc/net/majorkernelpanic/streaming/rtsp/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/rtsp/package-summary.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.rtsp - + + @@ -18,9 +23,11 @@
            JavaScript is disabled on your browser.
            -
            +
            - + +
            Skip navigation links
            +
              @@ -35,15 +42,15 @@
            - +
            @@ -67,7 +74,7 @@

            Package net.majorkernelpanic.streaming.rt
            • -

          Class Summary 
          Class
          +
          @@ -91,7 +98,7 @@

          Package net.majorkernelpanic.streaming.rt

          Interface Summary 
          Interface
        • - +
          @@ -122,9 +129,11 @@

          Package net.majorkernelpanic.streaming.rt -
          +
          - + +
          Skip navigation links
          +
            @@ -139,15 +148,15 @@

            Package net.majorkernelpanic.streaming.rt

          - +
          diff --git a/doc/net/majorkernelpanic/streaming/rtsp/package-tree.html b/doc/net/majorkernelpanic/streaming/rtsp/package-tree.html index 718ab605..00d3cd30 100644 --- a/doc/net/majorkernelpanic/streaming/rtsp/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/rtsp/package-tree.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.rtsp Class Hierarchy - + + @@ -18,9 +23,11 @@
          JavaScript is disabled on your browser.
          -
          +
          - + +
          Skip navigation links
          +
            @@ -40,10 +47,10 @@
          - +

          Hierarchy For Package net.majorkernelpanic.streaming.rtsp

          -Package Hierarchies: +Package Hierarchies: @@ -73,39 +80,33 @@

          Class Hierarchy

          • java.lang.Object
              -
            • android.os.Binder (implements android.os.IBinder) +
            • Binder
              • -
            • android.content.Context -
                -
              • android.content.ContextWrapper +
              • net.majorkernelpanic.streaming.rtsp.RtspClient
                • +
              • Service
                  -
                • android.app.Service (implements android.content.ComponentCallbacks2) -
                  • -
                -
                • -
              -
              • -
            • net.majorkernelpanic.streaming.rtsp.RtspClient
              • -
            • net.majorkernelpanic.streaming.rtsp.UriParser
              • +
            • net.majorkernelpanic.streaming.rtsp.UriParser

          Interface Hierarchy

          -
          +
          - + +
          Skip navigation links
          +
            @@ -125,10 +126,10 @@

            Interface Hierarchy

          - +
          diff --git a/doc/net/majorkernelpanic/streaming/video/CodecManager.html b/doc/net/majorkernelpanic/streaming/video/CodecManager.html index 4cd22775..d05284ca 100644 --- a/doc/net/majorkernelpanic/streaming/video/CodecManager.html +++ b/doc/net/majorkernelpanic/streaming/video/CodecManager.html @@ -2,15 +2,20 @@ - + CodecManager - + + @@ -18,9 +23,11 @@
          JavaScript is disabled on your browser.
          -
          +
          - + +
          Skip navigation links
          +
            @@ -35,15 +42,15 @@
          - - -
          - - - - - -
          -
          - - - -
          - -
          -
          -
            -
          • Summary: 
            • -
          • Nested | 
            • -
          • Field | 
            • -
          • Constr | 
            • -
          • Method
            • -
          - -
          - - -
          - - -
          -
          net.majorkernelpanic.streaming.video
          -

          Class ColorFormatTranslator

          -
          -
          -
            -
          • java.lang.Object
            • -
          • -
              -
            • net.majorkernelpanic.streaming.video.ColorFormatTranslator
              • -
            -
            • -
          -
          -
            -
          • -
            -
            -
            public class ColorFormatTranslator
-extends java.lang.Object
            -
            • -
          -
          -
          -
            -
          • - -
              -
            • - - -

              Constructor Summary

              -

          Class Summary 
          Class
          - - - - - - - -
          Constructors 
          Constructor and Description
          ColorFormatTranslator(int inputColorFormat, - int outputColorFormat, - int width, - int height) 
          -
          • -
        - -
          -
        • - - -

          Method Summary

          - - - - - - - - - - - - - - - - - - - - - - -
          Methods 
          Modifier and TypeMethod and Description
          intgetBufferSize() 
          intgetUVStride() 
          intgetYStride() 
          byte[]translate(byte[] buffer) 
          -
            -
          • - - -

            Methods inherited from class java.lang.Object

            -equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
            • -
          -
          • -
        -

        • -
      -

      -
      -
        -
      • - -
          -
        • - - -

          Constructor Detail

          - - - -
            -
          • -

            ColorFormatTranslator

            -
            public ColorFormatTranslator(int inputColorFormat,
-                     int outputColorFormat,
-                     int width,
-                     int height)
            -
            • -
          -
          • -
        - -
          -
        • - - -

          Method Detail

          - - - -
            -
          • -

            getBufferSize

            -
            public int getBufferSize()
            -
            • -
          - - - -
            -
          • -

            getUVStride

            -
            public int getUVStride()
            -
            • -
          - - - -
            -
          • -

            getYStride

            -
            public int getYStride()
            -
            • -
          - - - -
            -
          • -

            translate

            -
            public byte[] translate(byte[] buffer)
            -
            • -
          -
          • -
        -
        • -
      -
      -
    - - -
    - - - - - -
    -
    - - - -
    - -
    -
    -
      -
    • Summary: 
      • -
    • Nested | 
      • -
    • Field | 
      • -
    • Constr | 
      • -
    • Method
      • -
    - -
    - - -
    - - - diff --git a/doc/net/majorkernelpanic/streaming/video/H263Stream.html b/doc/net/majorkernelpanic/streaming/video/H263Stream.html index eaddd8cf..84380c4a 100644 --- a/doc/net/majorkernelpanic/streaming/video/H263Stream.html +++ b/doc/net/majorkernelpanic/streaming/video/H263Stream.html @@ -2,25 +2,38 @@ - + H263Stream - + + -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +48,15 @@
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +48,15 @@
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +48,15 @@
    -
    +
    - + +
    Skip navigation links
    +
      @@ -35,15 +48,15 @@

    net.majorkernelpanic.streaming.video

    Classes

      +
    • CodecManager
    • H263Stream
    • H264Stream
    • VideoQuality
      • diff --git a/doc/net/majorkernelpanic/streaming/video/package-summary.html b/doc/net/majorkernelpanic/streaming/video/package-summary.html index 21487461..0e4938d1 100644 --- a/doc/net/majorkernelpanic/streaming/video/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/video/package-summary.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.video - + + @@ -18,9 +23,11 @@
      JavaScript is disabled on your browser.
      -
      +
      - + +
      Skip navigation links
      +
        @@ -35,15 +42,15 @@
      - +
      @@ -67,7 +74,7 @@

      Package net.majorkernelpanic.streaming.vi
      • - +
        @@ -75,24 +82,28 @@

        Package net.majorkernelpanic.streaming.vi

        + + + + - + - + - +
        Class Summary 
        Class
        CodecManager 
        H263Stream
        A class for streaming H.263 from the camera of an android device using RTP.
        H264Stream
        A class for streaming H.264 from the camera of an android device using RTP.
        VideoQuality
        A class that represents the quality of a video stream.
        VideoStream
        Don't use this class directly.
        @@ -104,9 +115,11 @@

        Package net.majorkernelpanic.streaming.vi -
        +
        - + +
        Skip navigation links
        +
          @@ -121,15 +134,15 @@

          Package net.majorkernelpanic.streaming.vi

        - +
        diff --git a/doc/net/majorkernelpanic/streaming/video/package-tree.html b/doc/net/majorkernelpanic/streaming/video/package-tree.html index 29bb66e4..69f9de58 100644 --- a/doc/net/majorkernelpanic/streaming/video/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/video/package-tree.html @@ -2,15 +2,20 @@ - + net.majorkernelpanic.streaming.video Class Hierarchy - + + @@ -18,9 +23,11 @@
        JavaScript is disabled on your browser.
        -
        +
        - + +
        Skip navigation links
        +
          @@ -40,10 +47,10 @@
        - +

        Hierarchy For Package net.majorkernelpanic.streaming.video

        -Package Hierarchies: +Package Hierarchies: @@ -73,25 +80,28 @@

        Class Hierarchy

        -
        +
        - + +
        Skip navigation links
        +
          @@ -111,10 +121,10 @@

          Class Hierarchy

        - +
        diff --git a/doc/overview-frame.html b/doc/overview-frame.html index a1ecfc00..fa0d2a2b 100644 --- a/doc/overview-frame.html +++ b/doc/overview-frame.html @@ -2,13 +2,14 @@ - + Overview List - + + -
        All Classes
        +
        All Classes

        Packages

          diff --git a/doc/overview-summary.html b/doc/overview-summary.html index 9418f45b..757c436c 100644 --- a/doc/overview-summary.html +++ b/doc/overview-summary.html @@ -2,15 +2,20 @@ - + Overview - + + @@ -18,9 +23,11 @@
          JavaScript is disabled on your browser.
          -
          +
          - + +
          Skip navigation links
          +
            @@ -40,10 +47,10 @@
          - +
          @@ -113,9 +120,11 @@

      -
      +
      - + +
      Skip navigation links
      +
        @@ -135,10 +144,10 @@
      - +
      diff --git a/doc/overview-tree.html b/doc/overview-tree.html index d51c4133..710ff40d 100644 --- a/doc/overview-tree.html +++ b/doc/overview-tree.html @@ -2,15 +2,20 @@ - + Class Hierarchy - + + @@ -18,9 +23,11 @@
      JavaScript is disabled on your browser.
      -
      +
      - + +
      Skip navigation links
      +
        @@ -40,10 +47,10 @@
      - +

      Hierarchy For All Packages

      -Package Hierarchies: +Package Hierarchies:
      -
      +
      - + +
      Skip navigation links
      +
        @@ -207,10 +207,10 @@

        Interface Hierarchy

      - +
      diff --git a/doc/resources/inherit.gif b/doc/resources/inherit.gif deleted file mode 100644 index c814867a..00000000 Binary files a/doc/resources/inherit.gif and /dev/null differ diff --git a/doc/serialized-form.html b/doc/serialized-form.html index f3b40b7a..4faeda5d 100644 --- a/doc/serialized-form.html +++ b/doc/serialized-form.html @@ -2,15 +2,20 @@ - + Serialized Form - + + @@ -18,9 +23,11 @@
      JavaScript is disabled on your browser.
      -
      +
      - + +
      Skip navigation links
      +
        @@ -40,10 +47,10 @@
      - +
      @@ -110,9 +117,11 @@

      Class +
      - + +
      Skip navigation links
      +
      - +
      diff --git a/doc/stylesheet.css b/doc/stylesheet.css index 51dd0b89..0aeaa97f 100644 --- a/doc/stylesheet.css +++ b/doc/stylesheet.css @@ -1,50 +1,474 @@ /* Javadoc style sheet */ - -/* Define colors, fonts and other style attributes here to override the defaults */ - -/* Page background color */ -body { background-color: #FFFFFF; color:#000000 } - -/* - #B0DAFF Light blue text - #1279C6 Blue background - #04469D Darker blue background - #E86F00 Orange Text - #F1F1F1 Ligher gray -*/ - -/* Headings */ -h1 { font-size: 145%; color:#E86F00; } -h2 { font-size: 145%; color:#E86F00; } - - -/* Links */ -a:link{color:#1279C6; text-decoration:none; } -a:visited {color:#1279C6; text-decoration:none; } -/*a:focus {font-weight:bold; color:#04469D; text-decoration:underline; }*/ -a:hover {font-weight:bold; color:#1279C6; text-decoration:underline; } - -/* HR and table borders*/ -hr{border-style: solid; } -table{border-style: solid; } -th{border-style: none; } - -/* Table colors */ -.TableHeadingColor { background: #1279C6; color:#FFFFFF; } -.TableSubHeadingColor { background: #1279C6; color:#FFFFFF; } -.TableRowColor { background: #FFFFFF; color:#000000; } - -/* Font used in left-hand frame lists */ -.FrameTitleFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif; color:#E86F00 } -.FrameHeadingFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#E86F00 } -.FrameItemFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#E86F00 } - -/* Navigation bar fonts and colors */ -.NavBarCell1 { background-color:#1279C6; color:#000000} -.NavBarCell1Rev { background-color:#04469D; color:#FFFFFF} -.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} -.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} - -.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000} -.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000} - +/* +Overall document style +*/ +body { + background-color:#ffffff; + color:#353833; + font-family:Arial, Helvetica, sans-serif; + font-size:76%; + margin:0; +} +a:link, a:visited { + text-decoration:none; + color:#4c6b87; +} +a:hover, a:focus { + text-decoration:none; + color:#bb7a2a; +} +a:active { + text-decoration:none; + color:#4c6b87; +} +a[name] { + color:#353833; +} +a[name]:hover { + text-decoration:none; + color:#353833; +} +pre { + font-size:1.3em; +} +h1 { + font-size:1.8em; +} +h2 { + font-size:1.5em; +} +h3 { + font-size:1.4em; +} +h4 { + font-size:1.3em; +} +h5 { + font-size:1.2em; +} +h6 { + font-size:1.1em; +} +ul { + list-style-type:disc; +} +code, tt { + font-size:1.2em; +} +dt code { + font-size:1.2em; +} +table tr td dt code { + font-size:1.2em; + vertical-align:top; +} +sup { + font-size:.6em; +} +/* +Document title and Copyright styles +*/ +.clear { + clear:both; + height:0px; + overflow:hidden; +} +.aboutLanguage { + float:right; + padding:0px 21px; + font-size:.8em; + z-index:200; + margin-top:-7px; +} +.legalCopy { + margin-left:.5em; +} +.bar a, .bar a:link, .bar a:visited, .bar a:active { + color:#FFFFFF; + text-decoration:none; +} +.bar a:hover, .bar a:focus { + color:#bb7a2a; +} +.tab { + background-color:#0066FF; + background-image:url(resources/titlebar.gif); + background-position:left top; + background-repeat:no-repeat; + color:#ffffff; + padding:8px; + width:5em; + font-weight:bold; +} +/* +Navigation bar styles +*/ +.bar { + background-image:url(resources/background.gif); + background-repeat:repeat-x; + color:#FFFFFF; + padding:.8em .5em .4em .8em; + height:auto;/*height:1.8em;*/ + font-size:1em; + margin:0; +} +.topNav { + background-image:url(resources/background.gif); + background-repeat:repeat-x; + color:#FFFFFF; + float:left; + padding:0; + width:100%; + clear:right; + height:2.8em; + padding-top:10px; + overflow:hidden; +} +.bottomNav { + margin-top:10px; + background-image:url(resources/background.gif); + background-repeat:repeat-x; + color:#FFFFFF; + float:left; + padding:0; + width:100%; + clear:right; + height:2.8em; + padding-top:10px; + overflow:hidden; +} +.subNav { + background-color:#dee3e9; + border-bottom:1px solid #9eadc0; + float:left; + width:100%; + overflow:hidden; +} +.subNav div { + clear:left; + float:left; + padding:0 0 5px 6px; +} +ul.navList, ul.subNavList { + float:left; + margin:0 25px 0 0; + padding:0; +} +ul.navList li{ + list-style:none; + float:left; + padding:3px 6px; +} +ul.subNavList li{ + list-style:none; + float:left; + font-size:90%; +} +.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited { + color:#FFFFFF; + text-decoration:none; +} +.topNav a:hover, .bottomNav a:hover { + text-decoration:none; + color:#bb7a2a; +} +.navBarCell1Rev { + background-image:url(resources/tab.gif); + background-color:#a88834; + color:#FFFFFF; + margin: auto 5px; + border:1px solid #c9aa44; +} +/* +Page header and footer styles +*/ +.header, .footer { + clear:both; + margin:0 20px; + padding:5px 0 0 0; +} +.indexHeader { + margin:10px; + position:relative; +} +.indexHeader h1 { + font-size:1.3em; +} +.title { + color:#2c4557; + margin:10px 0; +} +.subTitle { + margin:5px 0 0 0; +} +.header ul { + margin:0 0 25px 0; + padding:0; +} +.footer ul { + margin:20px 0 5px 0; +} +.header ul li, .footer ul li { + list-style:none; + font-size:1.2em; +} +/* +Heading styles +*/ +div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { + background-color:#dee3e9; + border-top:1px solid #9eadc0; + border-bottom:1px solid #9eadc0; + margin:0 0 6px -8px; + padding:2px 5px; +} +ul.blockList ul.blockList ul.blockList li.blockList h3 { + background-color:#dee3e9; + border-top:1px solid #9eadc0; + border-bottom:1px solid #9eadc0; + margin:0 0 6px -8px; + padding:2px 5px; +} +ul.blockList ul.blockList li.blockList h3 { + padding:0; + margin:15px 0; +} +ul.blockList li.blockList h2 { + padding:0px 0 20px 0; +} +/* +Page layout container styles +*/ +.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { + clear:both; + padding:10px 20px; + position:relative; +} +.indexContainer { + margin:10px; + position:relative; + font-size:1.0em; +} +.indexContainer h2 { + font-size:1.1em; + padding:0 0 3px 0; +} +.indexContainer ul { + margin:0; + padding:0; +} +.indexContainer ul li { + list-style:none; +} +.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt { + font-size:1.1em; + font-weight:bold; + margin:10px 0 0 0; + color:#4E4E4E; +} +.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd { + margin:10px 0 10px 20px; +} +.serializedFormContainer dl.nameValue dt { + margin-left:1px; + font-size:1.1em; + display:inline; + font-weight:bold; +} +.serializedFormContainer dl.nameValue dd { + margin:0 0 0 1px; + font-size:1.1em; + display:inline; +} +/* +List styles +*/ +ul.horizontal li { + display:inline; + font-size:0.9em; +} +ul.inheritance { + margin:0; + padding:0; +} +ul.inheritance li { + display:inline; + list-style:none; +} +ul.inheritance li ul.inheritance { + margin-left:15px; + padding-left:15px; + padding-top:1px; +} +ul.blockList, ul.blockListLast { + margin:10px 0 10px 0; + padding:0; +} +ul.blockList li.blockList, ul.blockListLast li.blockList { + list-style:none; + margin-bottom:25px; +} +ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { + padding:0px 20px 5px 10px; + border:1px solid #9eadc0; + background-color:#f9f9f9; +} +ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList { + padding:0 0 5px 8px; + background-color:#ffffff; + border:1px solid #9eadc0; + border-top:none; +} +ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { + margin-left:0; + padding-left:0; + padding-bottom:15px; + border:none; + border-bottom:1px solid #9eadc0; +} +ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { + list-style:none; + border-bottom:none; + padding-bottom:0; +} +table tr td dl, table tr td dl dt, table tr td dl dd { + margin-top:0; + margin-bottom:1px; +} +/* +Table styles +*/ +.contentContainer table, .classUseContainer table, .constantValuesContainer table { + border-bottom:1px solid #9eadc0; + width:100%; +} +.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table { + width:100%; +} +.contentContainer .description table, .contentContainer .details table { + border-bottom:none; +} +.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{ + vertical-align:top; + padding-right:20px; +} +.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast, +.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast, +.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne, +.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne { + padding-right:3px; +} +.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption { + position:relative; + text-align:left; + background-repeat:no-repeat; + color:#FFFFFF; + font-weight:bold; + clear:none; + overflow:hidden; + padding:0px; + margin:0px; +} +caption a:link, caption a:hover, caption a:active, caption a:visited { + color:#FFFFFF; +} +.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span { + white-space:nowrap; + padding-top:8px; + padding-left:8px; + display:block; + float:left; + background-image:url(resources/titlebar.gif); + height:18px; +} +.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd { + width:10px; + background-image:url(resources/titlebar_end.gif); + background-repeat:no-repeat; + background-position:top right; + position:relative; + float:left; +} +ul.blockList ul.blockList li.blockList table { + margin:0 0 12px 0px; + width:100%; +} +.tableSubHeadingColor { + background-color: #EEEEFF; +} +.altColor { + background-color:#eeeeef; +} +.rowColor { + background-color:#ffffff; +} +.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td { + text-align:left; + padding:3px 3px 3px 7px; +} +th.colFirst, th.colLast, th.colOne, .constantValuesContainer th { + background:#dee3e9; + border-top:1px solid #9eadc0; + border-bottom:1px solid #9eadc0; + text-align:left; + padding:3px 3px 3px 7px; +} +td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { + font-weight:bold; +} +td.colFirst, th.colFirst { + border-left:1px solid #9eadc0; + white-space:nowrap; +} +td.colLast, th.colLast { + border-right:1px solid #9eadc0; +} +td.colOne, th.colOne { + border-right:1px solid #9eadc0; + border-left:1px solid #9eadc0; +} +table.overviewSummary { + padding:0px; + margin-left:0px; +} +table.overviewSummary td.colFirst, table.overviewSummary th.colFirst, +table.overviewSummary td.colOne, table.overviewSummary th.colOne { + width:25%; + vertical-align:middle; +} +table.packageSummary td.colFirst, table.overviewSummary th.colFirst { + width:25%; + vertical-align:middle; +} +/* +Content styles +*/ +.description pre { + margin-top:0; +} +.deprecatedContent { + margin:0; + padding:10px 0; +} +.docSummary { + padding:0; +} +/* +Formatting effect styles +*/ +.sourceLineNo { + color:green; + padding:0 30px 0 0; +} +h1.hidden { + visibility:hidden; + overflow:hidden; + font-size:.9em; +} +.block { + display:block; + margin:3px 0 0 0; +} +.strong { + font-weight:bold; +} diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..c5152961 --- /dev/null +++ b/pom.xml @@ -0,0 +1,80 @@ + + + + 4.0.0 + + net.majorkernelpanic + libstreaming + libstreaming + 3.0 + apklib + libstreaming is an API that allows you, with only a few lines of code, to stream the camera and/or microphone of an android powered device using RTP over UDP. + https://github.com/fyhertz/libstreaming + 2013 + + + https://github.com/fyhertz/libstreaming + scm:git:git://github.com/fyhertz/libstreaming + + + + + fyhertz + fyhertz@gmail.com + fyhertz + + developer + + + + + + + GNU General Public License Version 3 + http://www.gnu.org/licenses/gpl.html + repo + + + + + GitHub Issues + https://github.com/fyhertz/libstreaming/issues + + + + + com.google.android + android + 4.3_r2 + provided + + + + + src + test + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + + + 18 + + + true + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + + + + diff --git a/project.properties b/project.properties index 7002f279..4af4b084 100644 --- a/project.properties +++ b/project.properties @@ -8,5 +8,5 @@ # project structure. # Project target. -target=android-18 +target=android-24 android.library=true diff --git a/res/.gitkeep b/res/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/net/majorkernelpanic/streaming/MediaStream.java b/src/net/majorkernelpanic/streaming/MediaStream.java index 5d114dc5..519b9e21 100644 --- a/src/net/majorkernelpanic/streaming/MediaStream.java +++ b/src/net/majorkernelpanic/streaming/MediaStream.java @@ -1,29 +1,27 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming; import java.io.IOException; +import java.io.OutputStream; import java.net.InetAddress; import java.util.Random; - import net.majorkernelpanic.streaming.audio.AudioStream; import net.majorkernelpanic.streaming.rtp.AbstractPacketizer; import net.majorkernelpanic.streaming.video.VideoStream; @@ -33,46 +31,70 @@ import android.net.LocalServerSocket; import android.net.LocalSocket; import android.net.LocalSocketAddress; +import android.os.Build; +import android.os.ParcelFileDescriptor; import android.util.Log; /** - * A MediaRecorder that streams what it records using a packetizer from the rtp package. + * A MediaRecorder that streams what it records using a packetizer from the RTP package. * You can't use this class directly ! */ public abstract class MediaStream implements Stream { protected static final String TAG = "MediaStream"; - - /** MediaStream forwards data to a packetizer through a LocalSocket. */ + + /** Raw audio/video will be encoded using the MediaRecorder API. */ public static final byte MODE_MEDIARECORDER_API = 0x01; - /** MediaStream uses the new MediaCodec API introduced in JB 4.1 to stream audio/video. */ + /** Raw audio/video will be encoded using the MediaCodec API with buffers. */ public static final byte MODE_MEDIACODEC_API = 0x02; - /** MediaStream uses the new features of the MediaCodec API introduced in JB 4.3 to stream audio/video. */ + /** Raw audio/video will be encoded using the MediaCode API with a surface. */ public static final byte MODE_MEDIACODEC_API_2 = 0x05; + /** A LocalSocket will be used to feed the MediaRecorder object */ + public static final byte PIPE_API_LS = 0x01; + + /** A ParcelFileDescriptor will be used to feed the MediaRecorder object */ + public static final byte PIPE_API_PFD = 0x02; + /** Prefix that will be used for all shared preferences saved by libstreaming */ protected static final String PREF_PREFIX = "libstreaming-"; - /** The packetizer that will read the output of the camera and send RTP packets over the networkd. */ + /** The packetizer that will read the output of the camera and send RTP packets over the networked. */ protected AbstractPacketizer mPacketizer = null; protected static byte sSuggestedMode = MODE_MEDIARECORDER_API; protected byte mMode, mRequestedMode; + /** + * Starting lollipop the LocalSocket API cannot be used to feed a MediaRecorder object. + * You can force what API to use to create the pipe that feeds it with this constant + * by using {@link #PIPE_API_LS} and {@link #PIPE_API_PFD}. + */ + protected final static byte sPipeApi; + protected boolean mStreaming = false, mConfigured = false; - protected int mRtpPort = 0, mRtcpPort = 0; + protected int mRtpPort = 0, mRtcpPort = 0; + protected byte mChannelIdentifier = 0; + protected OutputStream mOutputStream = null; protected InetAddress mDestination; + + protected ParcelFileDescriptor[] mParcelFileDescriptors; + protected ParcelFileDescriptor mParcelRead; + protected ParcelFileDescriptor mParcelWrite; + protected LocalSocket mReceiver, mSender = null; private LocalServerSocket mLss = null; - private int mSocketId, mTTL = 64; + private int mSocketId; + + private int mTTL = 64; protected MediaRecorder mMediaRecorder; protected MediaCodec mMediaCodec; static { - // We determine wether or not the MediaCodec API should be used + // We determine whether or not the MediaCodec API should be used try { Class.forName("android.media.MediaCodec"); // Will be set to MODE_MEDIACODEC_API at some point... @@ -82,6 +104,14 @@ public abstract class MediaStream implements Stream { sSuggestedMode = MODE_MEDIARECORDER_API; Log.i(TAG,"Phone does not support the MediaCodec API"); } + + // Starting lollipop, the LocalSocket API cannot be used anymore to feed + // a MediaRecorder object for security reasons + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT_WATCH) { + sPipeApi = PIPE_API_PFD; + } else { + sPipeApi = PIPE_API_LS; + } } public MediaStream() { @@ -90,7 +120,7 @@ public MediaStream() { } /** - * Sets the destination ip address of the stream. + * Sets the destination IP address of the stream. * @param dest The destination address of the stream */ public void setDestinationAddress(InetAddress dest) { @@ -123,8 +153,20 @@ public void setDestinationPorts(int dport) { public void setDestinationPorts(int rtpPort, int rtcpPort) { mRtpPort = rtpPort; mRtcpPort = rtcpPort; + mOutputStream = null; } + /** + * If a TCP is used as the transport protocol for the RTP session, + * the output stream to which RTP packets will be written to must + * be specified with this method. + */ + public void setOutputStream(OutputStream stream, byte channelIdentifier) { + mOutputStream = stream; + mChannelIdentifier = channelIdentifier; + } + + /** * Sets the Time To Live of packets sent over the network. * @param ttl The time to live @@ -150,21 +192,35 @@ public int[] getDestinationPorts() { * one used for RTP and the second one is used for RTCP. **/ public int[] getLocalPorts() { - return new int[] { - this.mPacketizer.getRtpSocket().getLocalPort(), - this.mPacketizer.getRtcpSocket().getLocalPort() - }; + return mPacketizer.getRtpSocket().getLocalPorts(); } /** - * Sets the mode of the {@link MediaStream}. - * If the mode is set to {@link #MODE_MEDIARECORDER_API}, video is forwarded to a UDP socket. - * @param mode Either {@link #MODE_MEDIARECORDER_API} or {@link #MODE_MEDIACODEC_API} + * Sets the streaming method that will be used. + * + * If the mode is set to {@link #MODE_MEDIARECORDER_API}, raw audio/video will be encoded + * using the MediaRecorder API.
      + * + * If the mode is set to {@link #MODE_MEDIACODEC_API} or to {@link #MODE_MEDIACODEC_API_2}, + * audio/video will be encoded with using the MediaCodec.
      + * + * The {@link #MODE_MEDIACODEC_API_2} mode only concerns {@link VideoStream}, it makes + * use of the createInputSurface() method of the MediaCodec API (Android 4.3 is needed there).
      + * + * @param mode Can be {@link #MODE_MEDIARECORDER_API}, {@link #MODE_MEDIACODEC_API} or {@link #MODE_MEDIACODEC_API_2} */ - public void setStreamingMethod(byte mode) throws IllegalStateException { + public void setStreamingMethod(byte mode) { mRequestedMode = mode; } + /** + * Returns the streaming method in use, call this after + * {@link #configure()} to get an accurate response. + */ + public byte getStreamingMethod() { + return mMode; + } + /** * Returns the packetizer associated with the {@link MediaStream}. * @return The packetizer @@ -196,6 +252,10 @@ public boolean isStreaming() { */ public synchronized void configure() throws IllegalStateException, IOException { if (mStreaming) throw new IllegalStateException("Can't be called while streaming."); + if (mPacketizer != null) { + mPacketizer.setDestination(mDestination, mRtpPort, mRtcpPort); + mPacketizer.getRtpSocket().setOutputStream(mOutputStream, mChannelIdentifier); + } mMode = mRequestedMode; mConfigured = true; } @@ -250,7 +310,7 @@ public synchronized void stop() { /** * Returns a description of the stream using SDP. * This method can only be called after {@link Stream#configure()}. - * @throws IllegalStateException Thrown when {@link Stream#configure()} wa not called. + * @throws IllegalStateException Thrown when {@link Stream#configure()} was not called. */ public abstract String getSessionDescription(); @@ -264,43 +324,70 @@ public int getSSRC() { protected void createSockets() throws IOException { - final String LOCAL_ADDR = "net.majorkernelpanic.streaming-"; - - for (int i=0;i<10;i++) { - try { - mSocketId = new Random().nextInt(); - mLss = new LocalServerSocket(LOCAL_ADDR+mSocketId); - break; - } catch (IOException e1) {} + if (sPipeApi == PIPE_API_LS) { + + final String LOCAL_ADDR = "net.majorkernelpanic.streaming-"; + + for (int i=0;i<10;i++) { + try { + mSocketId = new Random().nextInt(); + mLss = new LocalServerSocket(LOCAL_ADDR+mSocketId); + break; + } catch (IOException e1) {} + } + + mReceiver = new LocalSocket(); + mReceiver.connect( new LocalSocketAddress(LOCAL_ADDR+mSocketId)); + mReceiver.setReceiveBufferSize(500000); + mReceiver.setSoTimeout(3000); + mSender = mLss.accept(); + mSender.setSendBufferSize(500000); + + } else { + Log.e(TAG, "parcelFileDescriptors createPipe version = Lollipop"); + mParcelFileDescriptors = ParcelFileDescriptor.createPipe(); + mParcelRead = new ParcelFileDescriptor(mParcelFileDescriptors[0]); + mParcelWrite = new ParcelFileDescriptor(mParcelFileDescriptors[1]); } - - mReceiver = new LocalSocket(); - mReceiver.connect( new LocalSocketAddress(LOCAL_ADDR+mSocketId)); - mReceiver.setReceiveBufferSize(500000); - mReceiver.setSoTimeout(3000); - mSender = mLss.accept(); - mSender.setSendBufferSize(500000); } protected void closeSockets() { - try { - mReceiver.close(); - } catch (Exception e) { - e.printStackTrace(); - } - try { - mSender.close(); - } catch (Exception e) { - e.printStackTrace(); - } - try { - mLss.close(); - } catch (Exception e) { - e.printStackTrace(); + if (sPipeApi == PIPE_API_LS) { + try { + mReceiver.close(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + mSender.close(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + mLss.close(); + } catch (Exception e) { + e.printStackTrace(); + } + mLss = null; + mSender = null; + mReceiver = null; + + } else { + try { + if (mParcelRead != null) { + mParcelRead.close(); + } + } catch (Exception e) { + e.printStackTrace(); + } + try { + if (mParcelWrite != null) { + mParcelWrite.close(); + } + } catch (Exception e) { + e.printStackTrace(); + } } - mLss = null; - mSender = null; - mReceiver = null; } } diff --git a/src/net/majorkernelpanic/streaming/Session.java b/src/net/majorkernelpanic/streaming/Session.java index a861d678..45161404 100644 --- a/src/net/majorkernelpanic/streaming/Session.java +++ b/src/net/majorkernelpanic/streaming/Session.java @@ -1,21 +1,19 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming; @@ -23,8 +21,7 @@ import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.concurrent.Semaphore; - +import java.util.concurrent.CountDownLatch; import net.majorkernelpanic.streaming.audio.AudioQuality; import net.majorkernelpanic.streaming.audio.AudioStream; import net.majorkernelpanic.streaming.exceptions.CameraInUseException; @@ -35,6 +32,7 @@ import net.majorkernelpanic.streaming.rtsp.RtspClient; import net.majorkernelpanic.streaming.video.VideoQuality; import net.majorkernelpanic.streaming.video.VideoStream; +import android.hardware.Camera.CameraInfo; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -44,7 +42,7 @@ * This is the class you will want to use to stream audio and or video to some peer using RTP.
      * * It holds a {@link VideoStream} and a {@link AudioStream} together and provides - * syncronous and asyncrounous functions to start and stop those steams. + * synchronous and asynchronous functions to start and stop those steams. * You should implement a callback interface {@link Callback} to receive notifications and error reports.
      * * If you want to stream to a RTSP server, you will need an instance of this class and hand it to a {@link RtspClient}. @@ -72,12 +70,12 @@ public class Session { /** Some app is already using a camera (Camera.open() has failed). */ public final static int ERROR_CAMERA_ALREADY_IN_USE = 0x00; - /** The phone may not support some streaming parameters that you are using (bit rate, frame rate...s). */ + /** The phone may not support some streaming parameters that you are trying to use (bit rate, frame rate, resolution...). */ public final static int ERROR_CONFIGURATION_NOT_SUPPORTED = 0x01; /** * The internal storage of the phone is not ready. - * Libstreaming tried to store a test file on the sdcard but couldn't. + * libstreaming tried to store a test file on the sdcard but couldn't. * See H264Stream and AACStream to find out why libstreaming would want to something like that. */ public final static int ERROR_STORAGE_NOT_READY = 0x02; @@ -96,7 +94,7 @@ public class Session { public final static int ERROR_UNKNOWN_HOST = 0x05; /** - * Some other error occured ! + * Some other error occurred ! */ public final static int ERROR_OTHER = 0x06; @@ -110,6 +108,7 @@ public class Session { private Callback mCallback; private Handler mMainHandler; + private Handler mHandler; /** @@ -117,19 +116,14 @@ public class Session { */ public Session() { long uptime = System.currentTimeMillis(); + + HandlerThread thread = new HandlerThread("net.majorkernelpanic.streaming.Session"); + thread.start(); + + mHandler = new Handler(thread.getLooper()); mMainHandler = new Handler(Looper.getMainLooper()); mTimestamp = (uptime/1000)<<32 & (((uptime-((uptime/1000)*1000))>>32)/1000); // NTP timestamp mOrigin = "127.0.0.1"; - - final Semaphore signal = new Semaphore(0); - new HandlerThread("net.majorkernelpanic.streaming.Session"){ - @Override - protected void onLooperPrepared() { - mHandler = new Handler(); - signal.release(); - } - }.start(); - signal.acquireUninterruptibly(); } /** @@ -142,7 +136,7 @@ public interface Callback { * Called periodically to inform you on the bandwidth * consumption of the streams when streaming. */ - public void onBitrareUpdate(long bitrate); + public void onBitrateUpdate(long bitrate); /** Called when some error occurs. */ public void onSessionError(int reason, int streamType, Exception e); @@ -178,34 +172,40 @@ public interface Callback { } - public void addAudioTrack(AudioStream track) { + /** You probably don't need to use that directly, use the {@link SessionBuilder}. */ + void addAudioTrack(AudioStream track) { removeAudioTrack(); mAudioStream = track; } - public void addVideoTrack(VideoStream track) { + /** You probably don't need to use that directly, use the {@link SessionBuilder}. */ + void addVideoTrack(VideoStream track) { removeVideoTrack(); mVideoStream = track; } - public void removeAudioTrack() { + /** You probably don't need to use that directly, use the {@link SessionBuilder}. */ + void removeAudioTrack() { if (mAudioStream != null) { mAudioStream.stop(); mAudioStream = null; } } - public void removeVideoTrack() { + /** You probably don't need to use that directly, use the {@link SessionBuilder}. */ + void removeVideoTrack() { if (mVideoStream != null) { mVideoStream.stopPreview(); mVideoStream = null; } } + /** Returns the underlying {@link AudioStream} used by the {@link Session}. */ public AudioStream getAudioTrack() { return mAudioStream; } + /** Returns the underlying {@link VideoStream} used by the {@link Session}. */ public VideoStream getVideoTrack() { return mVideoStream; } @@ -220,7 +220,7 @@ public void setCallback(Callback callback) { /** * The origin address of the session. - * It appears in the sessionn description. + * It appears in the session description. * @param origin The origin address */ public void setOrigin(String origin) { @@ -228,7 +228,7 @@ public void setOrigin(String origin) { } /** - * The destination address for all the streams of the session. + * The destination address for all the streams of the session.
      * Changes will be taken into account the next time you start the session. * @param destination The destination address */ @@ -237,7 +237,7 @@ public void setDestination(String destination) { } /** - * Set the TTL of all packets sent during the session. + * Set the TTL of all packets sent during the session.
      * Changes will be taken into account the next time you start the session. * @param ttl The Time To Live */ @@ -246,8 +246,9 @@ public void setTimeToLive(int ttl) { } /** - * Sets the configuration of the stream. You can call this method at any time - * and changes will take effect next time you call {@link #configure()}. + * Sets the configuration of the stream.
      + * You can call this method at any time and changes will take + * effect next time you call {@link #configure()}. * @param quality Quality of the stream */ public void setVideoQuality(VideoQuality quality) { @@ -257,8 +258,9 @@ public void setVideoQuality(VideoQuality quality) { } /** - * Sets a Surface to show a preview of recorded media (video). - * You can call this method at any time and changes will take effect next time you call {@link #start()} or {@link #startPreview()}. + * Sets a Surface to show a preview of recorded media (video).
      + * You can call this method at any time and changes will take + * effect next time you call {@link #start()} or {@link #startPreview()}. */ public void setSurfaceView(final SurfaceView view) { mHandler.post(new Runnable() { @@ -272,8 +274,9 @@ public void run() { } /** - * Sets the orientation of the preview. You can call this method at any time - * and changes will take effect next time you call {@link #configure()}. + * Sets the orientation of the preview.
      + * You can call this method at any time and changes will take + * effect next time you call {@link #configure()}. * @param orientation The orientation of the preview */ public void setPreviewOrientation(int orientation) { @@ -281,10 +284,11 @@ public void setPreviewOrientation(int orientation) { mVideoStream.setPreviewOrientation(orientation); } } - + /** - * Sets the configuration of the stream. You can call this method at any time - * and changes will take effect next time you call {@link #configure()}. + * Sets the configuration of the stream.
      + * You can call this method at any time and changes will take + * effect next time you call {@link #configure()}. * @param quality Quality of the stream */ public void setAudioQuality(AudioQuality quality) { @@ -337,7 +341,7 @@ public String getDestination() { return mDestination; } - /** Returns an approximation of the bandwidth consumed by the session in bit per seconde. */ + /** Returns an approximation of the bandwidth consumed by the session in bit per second. */ public long getBitrate() { long sum = 0; if (mAudioStream != null) sum += mAudioStream.getBitrate(); @@ -347,10 +351,7 @@ public long getBitrate() { /** Indicates if a track is currently running. */ public boolean isStreaming() { - if ( (mAudioStream!=null && mAudioStream.isStreaming()) || (mVideoStream!=null && mVideoStream.isStreaming()) ) - return true; - else - return false; + return (mAudioStream!=null && mAudioStream.isStreaming()) || (mVideoStream!=null && mVideoStream.isStreaming()); } /** @@ -368,7 +369,7 @@ public void run() { } /** - * Does the same thing as {@link #configure()}, but in a syncronous manner. + * Does the same thing as {@link #configure()}, but in a synchronous manner.
      * Throws exceptions in addition to calling a callback * {@link Callback#onSessionError(int, int, Exception)} when * an error occurs. @@ -411,7 +412,7 @@ public void syncConfigure() } /** - * Asyncronously starts all streams of the session. + * Asynchronously starts all streams of the session. **/ public void start() { mHandler.post(new Runnable() { @@ -425,7 +426,7 @@ public void run() { } /** - * Starts a stream in a syncronous manner. + * Starts a stream in a synchronous manner.
      * Throws exceptions in addition to calling a callback. * @param id The id of the stream to start **/ @@ -436,7 +437,7 @@ public void syncStart(int id) InvalidSurfaceException, UnknownHostException, IOException { - + Stream stream = id==0 ? mAudioStream : mVideoStream; if (stream!=null && !stream.isStreaming()) { try { @@ -477,7 +478,7 @@ public void syncStart(int id) } /** - * Does the same thing as {@link #start()}, but in a syncronous manner. + * Does the same thing as {@link #start()}, but in a synchronous manner.
      * Throws exceptions in addition to calling a callback. **/ public void syncStart() @@ -512,7 +513,7 @@ public void run() { } /** - * Stops one stream in a syncronous manner. + * Stops one stream in a synchronous manner. * @param id The id of the stream to stop **/ private void syncStop(final int id) { @@ -521,23 +522,29 @@ private void syncStop(final int id) { stream.stop(); } } - - /** Stops all existing streams in a syncronous manner. */ + + /** Stops all existing streams in a synchronous manner. */ public void syncStop() { syncStop(0); syncStop(1); postSessionStopped(); - } + } + /** + * Asynchronously starts the camera preview.
      + * You should of course pass a {@link SurfaceView} to {@link #setSurfaceView(SurfaceView)} + * before calling this method. Otherwise, the {@link Callback#onSessionError(int, int, Exception)} + * callback will be called with {@link #ERROR_INVALID_SURFACE}. + */ public void startPreview() { mHandler.post(new Runnable() { @Override public void run() { if (mVideoStream != null) { try { - mVideoStream.configure(); mVideoStream.startPreview(); postPreviewStarted(); + mVideoStream.configure(); } catch (CameraInUseException e) { postError(ERROR_CAMERA_ALREADY_IN_USE , STREAM_VIDEO, e); } catch (ConfNotSupportedException e) { @@ -556,6 +563,9 @@ public void run() { }); } + /** + * Asynchronously stops the camera preview. + */ public void stopPreview() { mHandler.post(new Runnable() { @Override @@ -567,6 +577,11 @@ public void run() { }); } + /** Switch between the front facing and the back facing camera of the phone.
      + * If {@link #startPreview()} has been called, the preview will be briefly interrupted.
      + * If {@link #start()} has been called, the stream will be briefly interrupted.
      + * To find out which camera is currently selected, use {@link #getCamera()} + **/ public void switchCamera() { mHandler.post(new Runnable() { @Override @@ -591,11 +606,21 @@ public void run() { }); } + /** + * Returns the id of the camera currently selected.
      + * It can be either {@link CameraInfo#CAMERA_FACING_BACK} or + * {@link CameraInfo#CAMERA_FACING_FRONT}. + */ public int getCamera() { return mVideoStream != null ? mVideoStream.getCamera() : 0; } + /** + * Toggles the LED of the phone if it has one. + * You can get the current state of the flash with + * {@link Session#getVideoTrack()} and {@link VideoStream#getFlashState()}. + **/ public void toggleFlash() { mHandler.post(new Runnable() { @Override @@ -678,7 +703,7 @@ private void postBitRate(final long bitrate) { @Override public void run() { if (mCallback != null) { - mCallback.onBitrareUpdate(bitrate); + mCallback.onBitrateUpdate(bitrate); } } }); diff --git a/src/net/majorkernelpanic/streaming/SessionBuilder.java b/src/net/majorkernelpanic/streaming/SessionBuilder.java index 1ba39c41..030d2156 100644 --- a/src/net/majorkernelpanic/streaming/SessionBuilder.java +++ b/src/net/majorkernelpanic/streaming/SessionBuilder.java @@ -1,28 +1,25 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming; import java.io.IOException; import java.net.InetAddress; - import net.majorkernelpanic.streaming.audio.AACStream; import net.majorkernelpanic.streaming.audio.AMRNBStream; import net.majorkernelpanic.streaming.audio.AudioQuality; @@ -310,4 +307,4 @@ public SessionBuilder clone() { .setCallback(mCallback); } -} \ No newline at end of file +} diff --git a/src/net/majorkernelpanic/streaming/Stream.java b/src/net/majorkernelpanic/streaming/Stream.java index 09e2e8af..24c32915 100644 --- a/src/net/majorkernelpanic/streaming/Stream.java +++ b/src/net/majorkernelpanic/streaming/Stream.java @@ -1,26 +1,25 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming; import java.io.IOException; +import java.io.OutputStream; import java.net.InetAddress; /** @@ -74,6 +73,13 @@ public interface Stream { * @param rtcpPort Destination port that will be used for RTCP */ public void setDestinationPorts(int rtpPort, int rtcpPort); + + /** + * If a TCP is used as the transport protocol for the RTP session, + * the output stream to which RTP packets will be written to must + * be specified with this method. + */ + public void setOutputStream(OutputStream stream, byte channelIdentifier); /** * Returns a pair of source ports, the first one is the diff --git a/src/net/majorkernelpanic/streaming/audio/AACStream.java b/src/net/majorkernelpanic/streaming/audio/AACStream.java index 58a80508..b189fcb7 100644 --- a/src/net/majorkernelpanic/streaming/audio/AACStream.java +++ b/src/net/majorkernelpanic/streaming/audio/AACStream.java @@ -1,21 +1,19 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.audio; @@ -26,7 +24,6 @@ import java.lang.reflect.Field; import java.net.InetAddress; import java.nio.ByteBuffer; - import net.majorkernelpanic.streaming.SessionBuilder; import net.majorkernelpanic.streaming.rtp.AACADTSPacketizer; import net.majorkernelpanic.streaming.rtp.AACLATMPacketizer; @@ -123,8 +120,8 @@ public void setPreferences(SharedPreferences prefs) { @Override public synchronized void start() throws IllegalStateException, IOException { - configure(); if (!mStreaming) { + configure(); super.start(); } } @@ -150,9 +147,10 @@ public synchronized void configure() throws IllegalStateException, IOException { mPacketizer = new AACADTSPacketizer(); } else { mPacketizer = new AACLATMPacketizer(); - } + } + mPacketizer.setDestination(mDestination, mRtpPort, mRtcpPort); + mPacketizer.getRtpSocket().setOutputStream(mOutputStream, mChannelIdentifier); } - if (mMode == MODE_MEDIARECORDER_API) { @@ -172,7 +170,7 @@ public synchronized void configure() throws IllegalStateException, IOException { mProfile = 2; // AAC LC mChannel = 1; - mConfig = mProfile<<11 | mSamplingRateIndex<<7 | mChannel<<3; + mConfig = (mProfile & 0x1F) << 11 | (mSamplingRateIndex & 0x0F) << 7 | (mChannel & 0x0F) << 3; mSessionDescription = "m=audio "+String.valueOf(getDestinationPorts()[0])+" RTP/AVP 96\r\n" + "a=rtpmap:96 mpeg4-generic/"+mQuality.samplingRate+"\r\n"+ @@ -240,7 +238,6 @@ public void run() { mThread.start(); // The packetizer encapsulates this stream in an RTP stream and send it over the network - mPacketizer.setDestination(mDestination, mRtpPort, mRtcpPort); mPacketizer.setInputStream(inputStream); mPacketizer.start(); @@ -292,14 +289,12 @@ private void testADTS() throws IllegalStateException, IOException { String key = PREF_PREFIX+"aac-"+mQuality.samplingRate; - if (mSettings!=null) { - if (mSettings.contains(key)) { - String[] s = mSettings.getString(key, "").split(","); - mQuality.samplingRate = Integer.valueOf(s[0]); - mConfig = Integer.valueOf(s[1]); - mChannel = Integer.valueOf(s[2]); - return; - } + if (mSettings!=null && mSettings.contains(key)) { + String[] s = mSettings.getString(key, "").split(","); + mQuality.samplingRate = Integer.valueOf(s[0]); + mConfig = Integer.valueOf(s[1]); + mChannel = Integer.valueOf(s[2]); + return; } final String TESTFILE = Environment.getExternalStorageDirectory().getPath()+"/spydroid-test.adts"; @@ -354,7 +349,7 @@ private void testADTS() throws IllegalStateException, IOException { mQuality.samplingRate = AUDIO_SAMPLING_RATES[mSamplingRateIndex]; // 5 bits for the object type / 4 bits for the sampling rate / 4 bits for the channel / padding - mConfig = mProfile<<11 | mSamplingRateIndex<<7 | mChannel<<3; + mConfig = (mProfile & 0x1F) << 11 | (mSamplingRateIndex & 0x0F) << 7 | (mChannel & 0x0F) << 3; Log.i(TAG,"MPEG VERSION: " + ( (buffer[0]&0x08) >> 3 ) ); Log.i(TAG,"PROTECTION: " + (buffer[0]&0x01) ); diff --git a/src/net/majorkernelpanic/streaming/audio/AMRNBStream.java b/src/net/majorkernelpanic/streaming/audio/AMRNBStream.java index 561c3efb..4897bfad 100644 --- a/src/net/majorkernelpanic/streaming/audio/AMRNBStream.java +++ b/src/net/majorkernelpanic/streaming/audio/AMRNBStream.java @@ -1,28 +1,25 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.audio; import java.io.IOException; import java.lang.reflect.Field; - import net.majorkernelpanic.streaming.SessionBuilder; import net.majorkernelpanic.streaming.rtp.AMRNBPacketizer; import android.media.MediaRecorder; @@ -60,18 +57,18 @@ public AMRNBStream() { * Starts the stream. */ public synchronized void start() throws IllegalStateException, IOException { - configure(); if (!mStreaming) { + configure(); super.start(); } } - + public synchronized void configure() throws IllegalStateException, IOException { super.configure(); mMode = MODE_MEDIARECORDER_API; mQuality = mRequestedQuality.clone(); } - + /** * Returns a description of the stream using SDP. It can then be included in an SDP file. */ diff --git a/src/net/majorkernelpanic/streaming/audio/AudioQuality.java b/src/net/majorkernelpanic/streaming/audio/AudioQuality.java index b0ce5fc3..30a1ef00 100644 --- a/src/net/majorkernelpanic/streaming/audio/AudioQuality.java +++ b/src/net/majorkernelpanic/streaming/audio/AudioQuality.java @@ -1,27 +1,25 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.audio; /** - * A class that represents the quality of an audio stream. + * A class that represents the quality of an audio stream. */ public class AudioQuality { @@ -46,7 +44,7 @@ public AudioQuality(int samplingRate, int bitRate) { public boolean equals(AudioQuality quality) { if (quality==null) return false; - return (quality.samplingRate == this.samplingRate & + return (quality.samplingRate == this.samplingRate && quality.bitRate == this.bitRate); } diff --git a/src/net/majorkernelpanic/streaming/audio/AudioStream.java b/src/net/majorkernelpanic/streaming/audio/AudioStream.java index e41359a7..297a0daf 100644 --- a/src/net/majorkernelpanic/streaming/audio/AudioStream.java +++ b/src/net/majorkernelpanic/streaming/audio/AudioStream.java @@ -1,29 +1,30 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.audio; +import java.io.FileDescriptor; import java.io.IOException; +import java.io.InputStream; import net.majorkernelpanic.streaming.MediaStream; import android.media.MediaRecorder; +import android.os.ParcelFileDescriptor; import android.util.Log; /** @@ -80,25 +81,39 @@ protected void encodeWithMediaRecorder() throws IOException { mMediaRecorder.setAudioSamplingRate(mQuality.samplingRate); mMediaRecorder.setAudioEncodingBitRate(mQuality.bitRate); - // We write the ouput of the camera in a local socket instead of a file ! + // We write the output of the camera in a local socket instead of a file ! // This one little trick makes streaming feasible quiet simply: data from the camera // can then be manipulated at the other end of the socket - mMediaRecorder.setOutputFile(mSender.getFileDescriptor()); + FileDescriptor fd = null; + if (sPipeApi == PIPE_API_PFD) { + fd = mParcelWrite.getFileDescriptor(); + } else { + fd = mSender.getFileDescriptor(); + } + mMediaRecorder.setOutputFile(fd); + mMediaRecorder.setOutputFile(fd); mMediaRecorder.prepare(); mMediaRecorder.start(); - try { - // mReceiver.getInputStream contains the data from the camera - // the mPacketizer encapsulates this stream in an RTP stream and send it over the network - mPacketizer.setDestination(mDestination, mRtpPort, mRtcpPort); - mPacketizer.setInputStream(mReceiver.getInputStream()); - mPacketizer.start(); - mStreaming = true; - } catch (IOException e) { - stop(); - throw new IOException("Something happened with the local sockets :/ Start failed !"); + InputStream is = null; + + if (sPipeApi == PIPE_API_PFD) { + is = new ParcelFileDescriptor.AutoCloseInputStream(mParcelRead); + } else { + try { + // mReceiver.getInputStream contains the data from the camera + is = mReceiver.getInputStream(); + } catch (IOException e) { + stop(); + throw new IOException("Something happened with the local sockets :/ Start failed !"); + } } + + // the mPacketizer encapsulates this stream in an RTP stream and send it over the network + mPacketizer.setInputStream(is); + mPacketizer.start(); + mStreaming = true; } diff --git a/src/net/majorkernelpanic/streaming/exceptions/CameraInUseException.java b/src/net/majorkernelpanic/streaming/exceptions/CameraInUseException.java index f6d19229..23bf2f54 100644 --- a/src/net/majorkernelpanic/streaming/exceptions/CameraInUseException.java +++ b/src/net/majorkernelpanic/streaming/exceptions/CameraInUseException.java @@ -1,21 +1,19 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.exceptions; diff --git a/src/net/majorkernelpanic/streaming/exceptions/ConfNotSupportedException.java b/src/net/majorkernelpanic/streaming/exceptions/ConfNotSupportedException.java index ffa8a113..e1f94df4 100644 --- a/src/net/majorkernelpanic/streaming/exceptions/ConfNotSupportedException.java +++ b/src/net/majorkernelpanic/streaming/exceptions/ConfNotSupportedException.java @@ -1,21 +1,19 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.exceptions; diff --git a/src/net/majorkernelpanic/streaming/exceptions/InvalidSurfaceException.java b/src/net/majorkernelpanic/streaming/exceptions/InvalidSurfaceException.java index 45cd5b16..288c76a4 100644 --- a/src/net/majorkernelpanic/streaming/exceptions/InvalidSurfaceException.java +++ b/src/net/majorkernelpanic/streaming/exceptions/InvalidSurfaceException.java @@ -1,21 +1,19 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.exceptions; diff --git a/src/net/majorkernelpanic/streaming/exceptions/StorageUnavailableException.java b/src/net/majorkernelpanic/streaming/exceptions/StorageUnavailableException.java index 05742d41..e26c79e3 100644 --- a/src/net/majorkernelpanic/streaming/exceptions/StorageUnavailableException.java +++ b/src/net/majorkernelpanic/streaming/exceptions/StorageUnavailableException.java @@ -1,21 +1,19 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.exceptions; diff --git a/src/net/majorkernelpanic/streaming/gl/SurfaceManager.java b/src/net/majorkernelpanic/streaming/gl/SurfaceManager.java index 02bf54ac..2b9cc6b7 100644 --- a/src/net/majorkernelpanic/streaming/gl/SurfaceManager.java +++ b/src/net/majorkernelpanic/streaming/gl/SurfaceManager.java @@ -1,34 +1,17 @@ -/* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * - * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) - * - * Spydroid 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 source code 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 source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - /* * Based on the work of fadden * * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * + * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/net/majorkernelpanic/streaming/gl/SurfaceView.java b/src/net/majorkernelpanic/streaming/gl/SurfaceView.java index b5b0eb2f..94f995e5 100644 --- a/src/net/majorkernelpanic/streaming/gl/SurfaceView.java +++ b/src/net/majorkernelpanic/streaming/gl/SurfaceView.java @@ -1,57 +1,98 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.gl; import java.util.concurrent.Semaphore; - -import android.annotation.SuppressLint; +import net.majorkernelpanic.streaming.MediaStream; +import net.majorkernelpanic.streaming.video.VideoStream; import android.content.Context; import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture.OnFrameAvailableListener; +import android.os.Handler; import android.util.AttributeSet; import android.util.Log; import android.view.Surface; import android.view.SurfaceHolder; -@SuppressLint("NewApi") +/** + * An enhanced SurfaceView in which the camera preview will be rendered. + * This class was needed for two reasons.
      + * + * First, it allows to use to feed MediaCodec with the camera preview + * using the surface-to-buffer method while rendering it in a surface + * visible to the user. To force the surface-to-buffer method in + * libstreaming, call {@link MediaStream#setStreamingMethod(byte)} + * with {@link MediaStream#MODE_MEDIACODEC_API_2}.
      + * + * Second, it allows to force the aspect ratio of the SurfaceView + * to match the aspect ratio of the camera preview, so that the + * preview do not appear distorted to the user of your app. To do + * that, call {@link SurfaceView#setAspectRatioMode(int)} with + * {@link SurfaceView#ASPECT_RATIO_PREVIEW} after creating your + * {@link SurfaceView}.
      + * + */ public class SurfaceView extends android.view.SurfaceView implements Runnable, OnFrameAvailableListener, SurfaceHolder.Callback { - public final static String TAG = "GLSurfaceView"; + public final static String TAG = "SurfaceView"; + /** + * The aspect ratio of the surface view will be equal + * to the aspect ration of the camera preview. + **/ + public static final int ASPECT_RATIO_PREVIEW = 0x01; + + /** The surface view will fill completely fill its parent. */ + public static final int ASPECT_RATIO_STRETCH = 0x00; + private Thread mThread = null; + private Handler mHandler = null; private boolean mFrameAvailable = false; private boolean mRunning = true; + private int mAspectRatioMode = ASPECT_RATIO_STRETCH; + // The surface in which the preview is rendered private SurfaceManager mViewSurfaceManager = null; + + // The input surface of the MediaCodec private SurfaceManager mCodecSurfaceManager = null; - private TextureManager mTextureManager = null; - private Semaphore mLock = new Semaphore(0); - private Object mSyncObject = new Object(); + // Handles the rendering of the SurfaceTexture we got + // from the camera, onto a Surface + private TextureManager mTextureManager = null; + + private final Semaphore mLock = new Semaphore(0); + private final Object mSyncObject = new Object(); + // Allows to force the aspect ratio of the preview + private ViewAspectRatioMeasurer mVARM = new ViewAspectRatioMeasurer(); + public SurfaceView(Context context, AttributeSet attrs) { super(context, attrs); + mHandler = new Handler(); getHolder().addCallback(this); } + public void setAspectRatioMode(int mode) { + mAspectRatioMode = mode; + } + public SurfaceTexture getSurfaceTexture() { return mTextureManager.getSurfaceTexture(); } @@ -61,7 +102,7 @@ public void addMediaCodecSurface(Surface surface) { mCodecSurfaceManager = new SurfaceManager(surface,mViewSurfaceManager); } } - + public void removeMediaCodecSurface() { synchronized (mSyncObject) { if (mCodecSurfaceManager != null) { @@ -70,7 +111,7 @@ public void removeMediaCodecSurface() { } } } - + public void startGLThread() { Log.d(TAG,"Thread started."); if (mTextureManager == null) { @@ -83,7 +124,7 @@ public void startGLThread() { mLock.acquireUninterruptibly(); } } - + @Override public void run() { @@ -105,7 +146,7 @@ public void run() { mTextureManager.updateFrame(); mTextureManager.drawFrame(); mViewSurfaceManager.swapBuffer(); - + if (mCodecSurfaceManager != null) { mCodecSurfaceManager.makeCurrent(); mTextureManager.drawFrame(); @@ -115,7 +156,7 @@ public void run() { mCodecSurfaceManager.setPresentationTime(ts); mCodecSurfaceManager.swapBuffer(); } - + } else { Log.e(TAG,"No frame received !"); } @@ -153,4 +194,135 @@ public void surfaceDestroyed(SurfaceHolder holder) { mRunning = false; } + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + if (mVARM.getAspectRatio() > 0 && mAspectRatioMode == ASPECT_RATIO_PREVIEW) { + mVARM.measure(widthMeasureSpec, heightMeasureSpec); + setMeasuredDimension(mVARM.getMeasuredWidth(), mVARM.getMeasuredHeight()); + } else { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } + } + + /** + * Requests a certain aspect ratio for the preview. You don't have to call this yourself, + * the {@link VideoStream} will do it when it's needed. + */ + public void requestAspectRatio(double aspectRatio) { + if (mVARM.getAspectRatio() != aspectRatio) { + mVARM.setAspectRatio(aspectRatio); + mHandler.post(new Runnable() { + @Override + public void run() { + if (mAspectRatioMode == ASPECT_RATIO_PREVIEW) { + requestLayout(); + } + } + }); + } + } + + /** + * This class is a helper to measure views that require a specific aspect ratio. + * @author Jesper Borgstrup + */ + public class ViewAspectRatioMeasurer { + + private double aspectRatio; + + public void setAspectRatio(double aspectRatio) { + this.aspectRatio = aspectRatio; + } + + public double getAspectRatio() { + return this.aspectRatio; + } + + /** + * Measure with the aspect ratio given at construction.
      + *
      + * After measuring, get the width and height with the {@link #getMeasuredWidth()} + * and {@link #getMeasuredHeight()} methods, respectively. + * @param widthMeasureSpec The width MeasureSpec passed in your View.onMeasure() method + * @param heightMeasureSpec The height MeasureSpec passed in your View.onMeasure() method + */ + public void measure(int widthMeasureSpec, int heightMeasureSpec) { + measure(widthMeasureSpec, heightMeasureSpec, this.aspectRatio); + } + + /** + * Measure with a specific aspect ratio
      + *
      + * After measuring, get the width and height with the {@link #getMeasuredWidth()} + * and {@link #getMeasuredHeight()} methods, respectively. + * @param widthMeasureSpec The width MeasureSpec passed in your View.onMeasure() method + * @param heightMeasureSpec The height MeasureSpec passed in your View.onMeasure() method + * @param aspectRatio The aspect ratio to calculate measurements in respect to + */ + public void measure(int widthMeasureSpec, int heightMeasureSpec, double aspectRatio) { + int widthMode = MeasureSpec.getMode( widthMeasureSpec ); + int widthSize = widthMode == MeasureSpec.UNSPECIFIED ? Integer.MAX_VALUE : MeasureSpec.getSize( widthMeasureSpec ); + int heightMode = MeasureSpec.getMode( heightMeasureSpec ); + int heightSize = heightMode == MeasureSpec.UNSPECIFIED ? Integer.MAX_VALUE : MeasureSpec.getSize( heightMeasureSpec ); + + if ( heightMode == MeasureSpec.EXACTLY && widthMode == MeasureSpec.EXACTLY ) { + /* + * Possibility 1: Both width and height fixed + */ + measuredWidth = widthSize; + measuredHeight = heightSize; + + } else if ( heightMode == MeasureSpec.EXACTLY ) { + /* + * Possibility 2: Width dynamic, height fixed + */ + measuredWidth = (int) Math.min( widthSize, heightSize * aspectRatio ); + measuredHeight = (int) (measuredWidth / aspectRatio); + + } else if ( widthMode == MeasureSpec.EXACTLY ) { + /* + * Possibility 3: Width fixed, height dynamic + */ + measuredHeight = (int) Math.min( heightSize, widthSize / aspectRatio ); + measuredWidth = (int) (measuredHeight * aspectRatio); + + } else { + /* + * Possibility 4: Both width and height dynamic + */ + if ( widthSize > heightSize * aspectRatio ) { + measuredHeight = heightSize; + measuredWidth = (int)( measuredHeight * aspectRatio ); + } else { + measuredWidth = widthSize; + measuredHeight = (int) (measuredWidth / aspectRatio); + } + + } + } + + private Integer measuredWidth = null; + /** + * Get the width measured in the latest call to measure(). + */ + public int getMeasuredWidth() { + if ( measuredWidth == null ) { + throw new IllegalStateException( "You need to run measure() before trying to get measured dimensions" ); + } + return measuredWidth; + } + + private Integer measuredHeight = null; + /** + * Get the height measured in the latest call to measure(). + */ + public int getMeasuredHeight() { + if ( measuredHeight == null ) { + throw new IllegalStateException( "You need to run measure() before trying to get measured dimensions" ); + } + return measuredHeight; + } + + } + } diff --git a/src/net/majorkernelpanic/streaming/gl/TextureManager.java b/src/net/majorkernelpanic/streaming/gl/TextureManager.java index 3e637e2c..26534266 100644 --- a/src/net/majorkernelpanic/streaming/gl/TextureManager.java +++ b/src/net/majorkernelpanic/streaming/gl/TextureManager.java @@ -1,34 +1,17 @@ -/* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * - * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) - * - * Spydroid 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 source code 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 source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - /* * Based on the work of fadden * * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * + * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -41,7 +24,6 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; - import android.annotation.SuppressLint; import android.graphics.SurfaceTexture; import android.opengl.GLES11Ext; diff --git a/src/net/majorkernelpanic/streaming/hw/CodecManager.java b/src/net/majorkernelpanic/streaming/hw/CodecManager.java index 6a816339..37107e28 100644 --- a/src/net/majorkernelpanic/streaming/hw/CodecManager.java +++ b/src/net/majorkernelpanic/streaming/hw/CodecManager.java @@ -1,30 +1,30 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * + * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This file is part of Spydroid (http://code.google.com/p/spydroid-ipcamera/) + * http://www.apache.org/licenses/LICENSE-2.0 * - * Spydroid 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 source code 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 source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.hw; import java.util.ArrayList; - +import java.util.HashSet; +import java.util.Set; import android.annotation.SuppressLint; import android.media.MediaCodecInfo; import android.media.MediaCodecList; +import android.util.Log; @SuppressLint("InlinedApi") public class CodecManager { @@ -51,11 +51,15 @@ public Codec(String name, Integer[] formats) { public Integer[] formats; } + /** + * Lists all encoders that claim to support a color format that we know how to use. + * @return A list of those encoders + */ @SuppressLint("NewApi") public synchronized static Codec[] findEncodersForMimeType(String mimeType) { if (sEncoders != null) return sEncoders; - ArrayList encoders = new ArrayList(); + ArrayList encoders = new ArrayList<>(); // We loop through the encoders, apparently this can take up to a sec (testes on a GS3) for(int j = MediaCodecList.getCodecCount() - 1; j >= 0; j--){ @@ -65,36 +69,43 @@ public synchronized static Codec[] findEncodersForMimeType(String mimeType) { String[] types = codecInfo.getSupportedTypes(); for (int i = 0; i < types.length; i++) { if (types[i].equalsIgnoreCase(mimeType)) { - MediaCodecInfo.CodecCapabilities capabilities = codecInfo.getCapabilitiesForType(mimeType); - - ArrayList formats = new ArrayList(); - - // And through the color formats supported - for (int k = 0; k < capabilities.colorFormats.length; k++) { - int format = capabilities.colorFormats[k]; - - for (int l=0;l formats = new HashSet<>(); + + // And through the color formats supported + for (int k = 0; k < capabilities.colorFormats.length; k++) { + int format = capabilities.colorFormats[k]; + + for (int l=0;l decoders = new ArrayList(); + ArrayList decoders = new ArrayList<>(); // We loop through the decoders, apparently this can take up to a sec (testes on a GS3) for(int j = MediaCodecList.getCodecCount() - 1; j >= 0; j--){ @@ -104,31 +115,32 @@ public synchronized static Codec[] findDecodersForMimeType(String mimeType) { String[] types = codecInfo.getSupportedTypes(); for (int i = 0; i < types.length; i++) { if (types[i].equalsIgnoreCase(mimeType)) { - MediaCodecInfo.CodecCapabilities capabilities = codecInfo.getCapabilitiesForType(mimeType); - - ArrayList formats = new ArrayList(); - - // And through the color formats supported - for (int k = 0; k < capabilities.colorFormats.length; k++) { - int format = capabilities.colorFormats[k]; - - for (int l=0;l formats = new HashSet<>(); + + // And through the color formats supported + for (int k = 0; k < capabilities.colorFormats.length; k++) { + int format = capabilities.colorFormats[k]; + + for (int l=0;l *
        - * U and V panes reversed - * Some padding is needed after the Y pane - * stride!=width or slice-height!=height + *
      • U and V panes reversed
        • + *
      • Some padding is needed after the Y pane
        • + *
      • stride!=width or slice-height!=height
        • *
      */ @SuppressLint("NewApi") @@ -68,12 +66,12 @@ public class EncoderDebugger { private static final boolean VERBOSE = false; /** Will be incremented every time this test is modified. */ - private static final int VERSION = 2; + private static final int VERSION = 3; - /** Bitrate that will be used with the encoder. */ + /** Bit rate that will be used with the encoder. */ private final static int BITRATE = 1000000; - /** Framerate that will be used to test the encoder. */ + /** Frame rate that will be used to test the encoder. */ private final static int FRAMERATE = 20; private final static String MIME_TYPE = "video/avc"; @@ -97,8 +95,10 @@ public synchronized static void asyncDebug(final Context context, final int widt new Thread(new Runnable() { @Override public void run() { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - debug(prefs, width, height); + try { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + debug(prefs, width, height); + } catch (Exception e) {} } }).start(); } @@ -135,7 +135,7 @@ public NV21Convertor getNV21Convertor() { return mNV21; } - /** A log of all the errors that occured during the test. */ + /** A log of all the errors that occurred during the test. */ public String getErrorLog() { return mErrorLog; } @@ -158,11 +158,11 @@ private void reset() { } private void debug() { - + // If testing the phone again is not needed, // we just restore the result from the shared preferences if (!checkTestNeeded()) { - String resolution = mWidth+"x"+mHeight+"-"; + String resolution = mWidth+"x"+mHeight+"-"; boolean success = mPreferences.getBoolean(PREF_PREFIX+resolution+"success",false); if (!success) { @@ -183,18 +183,28 @@ private void debug() { return; } + if (VERBOSE) Log.d(TAG, ">>>> Testing the phone for resolution "+mWidth+"x"+mHeight); + // Builds a list of available encoders and decoders we may be able to use // because they support some nice color formats Codec[] encoders = CodecManager.findEncodersForMimeType(MIME_TYPE); Codec[] decoders = CodecManager.findDecodersForMimeType(MIME_TYPE); + int count = 0, n = 1; + for (int i=0;i> Test "+(n++)+"/"+count+": "+mEncoderName+" with color format "+mEncoderColorFormat+" at "+mWidth+"x"+mHeight); + // Converts from NV21 to YUV420 with the specified parameters mNV21.setSize(mWidth, mHeight); mNV21.setSliceHeigth(mHeight); @@ -211,8 +221,10 @@ private void debug() { // Starts the encoder configureEncoder(); searchSPSandPPS(); + + if (VERBOSE) Log.v(TAG, "SPS and PPS in b64: SPS="+mB64SPS+", PPS="+mB64PPS); - // Feeds the encoder with an image repeatidly to produce some NAL units + // Feeds the encoder with an image repeatedly to produce some NAL units encode(); // We now try to decode the NALs with decoders available on the phone @@ -223,10 +235,16 @@ private void debug() { mDecoderColorFormat = decoders[k].formats[l]; try { configureDecoder(); - decode(); + } catch (Exception e) { + if (VERBOSE) Log.d(TAG, mDecoderName+" can't be used with "+mDecoderColorFormat+" at "+mWidth+"x"+mHeight); + releaseDecoder(); + break; + } + try { + decode(true); if (VERBOSE) Log.d(TAG, mDecoderName+" successfully decoded the NALs (color format "+mDecoderColorFormat+")"); decoded = true; - } catch (RuntimeException e) { + } catch (Exception e) { if (VERBOSE) Log.e(TAG, mDecoderName+" failed to decode the NALs"); e.printStackTrace(); } finally { @@ -247,11 +265,11 @@ private void debug() { int padding; if ((padding = checkPaddingNeeded())>0) { if (padding<4096) { + if (VERBOSE) Log.d(TAG, "Some padding is needed: "+padding); mNV21.setYPadding(padding); createTestImage(); mData = mNV21.convert(mInitialImage); encodeDecode(); - if (VERBOSE) Log.d(TAG, "Some padding is needed: "+padding); } else { // TODO: try again with a different sliceHeight // TODO: try again with the "slice-height" param @@ -278,7 +296,7 @@ private void debug() { PrintWriter pw = new PrintWriter(sw); e.printStackTrace(pw); String stack = sw.toString(); String str = "Encoder "+mEncoderName+" cannot be used with color format "+mEncoderColorFormat; - if (VERBOSE) Log.e(TAG, str); + if (VERBOSE) Log.e(TAG, str, e); mErrorLog += str + "\n" + stack; e.printStackTrace(); } finally { @@ -455,13 +473,11 @@ private void convertToNV21(int k) { if (sliceHeight0) { - colorFormat = format.getInteger(MediaFormat.KEY_COLOR_FORMAT); - } + if (format.containsKey(MediaFormat.KEY_COLOR_FORMAT) && format.getInteger(MediaFormat.KEY_COLOR_FORMAT)>0) { + colorFormat = format.getInteger(MediaFormat.KEY_COLOR_FORMAT); } } } @@ -503,9 +519,9 @@ private void convertToNV21(int k) { /** * Instantiates and starts the encoder. + * @throws IOException The encoder cannot be configured */ - private void configureEncoder() { - if (VERBOSE) Log.v(TAG, "Testing "+mEncoderName+" with color format "+mEncoderColorFormat+" at "+mWidth+"x"+mHeight); + private void configureEncoder() throws IOException { mEncoder = MediaCodec.createByCodecName(mEncoderName); MediaFormat mediaFormat = MediaFormat.createVideoFormat(MIME_TYPE, mWidth, mHeight); mediaFormat.setInteger(MediaFormat.KEY_BIT_RATE, BITRATE); @@ -529,8 +545,9 @@ private void releaseEncoder() { /** * Instantiates and starts the decoder. + * @throws IOException The decoder cannot be configured */ - private void configureDecoder() { + private void configureDecoder() throws IOException { byte[] prefix = new byte[] {0x00,0x00,0x00,0x01}; ByteBuffer csd0 = ByteBuffer.allocate(4+mSPS.length+4+mPPS.length); @@ -658,7 +675,7 @@ private long searchSPSandPPS() { elapsed = timestamp() - now; } - check(mPPS != null & mSPS != null, "Could not determine the SPS & PPS."); + check(mPPS != null && mSPS != null, "Could not determine the SPS & PPS."); mB64PPS = Base64.encodeToString(mPPS, 0, mPPS.length, Base64.NO_WRAP); mB64SPS = Base64.encodeToString(mSPS, 0, mSPS.length, Base64.NO_WRAP); @@ -707,7 +724,11 @@ private long encode() { } - private long decode() { + /** + * @param withPrefix If set to true, the decoder will be fed with NALs preceeded with 0x00000001. + * @return How long it took to decode all the NALs + */ + private long decode(boolean withPrefix) { int n = 0, i = 0, j = 0; long elapsed = 0, now = timestamp(); int decInputIndex = 0, decOutputIndex = 0; @@ -723,9 +744,20 @@ private long decode() { if (decInputIndex>=0) { int l1 = decInputBuffers[decInputIndex].capacity(); int l2 = mVideo[i].length; - check(l1>=l2, "The decoder input buffer is not big enough."); decInputBuffers[decInputIndex].clear(); - decInputBuffers[decInputIndex].put(mVideo[i],0,mVideo[i].length); + + if ((withPrefix && hasPrefix(mVideo[i])) || (!withPrefix && !hasPrefix(mVideo[i]))) { + check(l1>=l2, "The decoder input buffer is not big enough (nal="+l2+", capacity="+l1+")."); + decInputBuffers[decInputIndex].put(mVideo[i],0,mVideo[i].length); + } else if (withPrefix && !hasPrefix(mVideo[i])) { + check(l1>=l2+4, "The decoder input buffer is not big enough (nal="+(l2+4)+", capacity="+l1+")."); + decInputBuffers[decInputIndex].put(new byte[] {0,0,0,1}); + decInputBuffers[decInputIndex].put(mVideo[i],0,mVideo[i].length); + } else if (!withPrefix && hasPrefix(mVideo[i])) { + check(l1>=l2-4, "The decoder input buffer is not big enough (nal="+(l2-4)+", capacity="+l1+")."); + decInputBuffers[decInputIndex].put(mVideo[i],4,mVideo[i].length-4); + } + mDecoder.queueInputBuffer(decInputIndex, 0, l2, timestamp(), 0); i++; } else { @@ -765,11 +797,22 @@ private long decode() { } - private void encodeDecode() { + /** + * Makes sure the NAL has a header or not. + * @param withPrefix If set to true, the NAL will be preceded with 0x00000001. + */ + private boolean hasPrefix(byte[] nal) { + return nal[0] == 0 && nal[1] == 0 && nal[2] == 0 && nal[3] == 0x01; + } + + /** + * @throws IOException The decoder cannot be configured. + */ + private void encodeDecode() throws IOException { encode(); try { configureDecoder(); - decode(); + decode(true); } finally { releaseDecoder(); } diff --git a/src/net/majorkernelpanic/streaming/hw/NV21Convertor.java b/src/net/majorkernelpanic/streaming/hw/NV21Convertor.java index 01559ba1..4498a76a 100644 --- a/src/net/majorkernelpanic/streaming/hw/NV21Convertor.java +++ b/src/net/majorkernelpanic/streaming/hw/NV21Convertor.java @@ -1,28 +1,26 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * + * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This file is part of Spydroid (http://code.google.com/p/spydroid-ipcamera/) + * http://www.apache.org/licenses/LICENSE-2.0 * - * Spydroid 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 source code 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 source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.hw; import java.nio.ByteBuffer; - import android.media.MediaCodecInfo; +import android.util.Log; /** * Converts from NV21 to YUV420 semi planar or planar. @@ -106,7 +104,8 @@ public boolean getUVPanesReversed() { public void convert(byte[] data, ByteBuffer buffer) { byte[] result = convert(data); - buffer.put(result, 0, result.length); + int min = buffer.capacity() < data.length?buffer.capacity() : data.length; + buffer.put(result, 0, min); } public byte[] convert(byte[] data) { diff --git a/src/net/majorkernelpanic/streaming/mp4/MP4Config.java b/src/net/majorkernelpanic/streaming/mp4/MP4Config.java index 65e4fc5d..4ab7ac54 100644 --- a/src/net/majorkernelpanic/streaming/mp4/MP4Config.java +++ b/src/net/majorkernelpanic/streaming/mp4/MP4Config.java @@ -1,27 +1,25 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.mp4; + import java.io.FileNotFoundException; import java.io.IOException; - import android.util.Base64; import android.util.Log; @@ -54,7 +52,7 @@ public MP4Config(byte[] sps, byte[] pps) { } /** - * Finds sps & pps parameters inside a .mp4. + * Finds SPS & PPS parameters inside a .mp4. * @param path Path to the file to analyze * @throws IOException * @throws FileNotFoundException @@ -63,12 +61,9 @@ public MP4Config (String path) throws IOException, FileNotFoundException { StsdBox stsdBox; - // We open the mp4 file - mp4Parser = new MP4Parser(path); - - // We parse it + // We open the mp4 file and parse it try { - mp4Parser.parse(); + mp4Parser = MP4Parser.parse(path); } catch (IOException ignore) { // Maybe enough of the file has been parsed and we can get the stsd box } @@ -78,10 +73,9 @@ public MP4Config (String path) throws IOException, FileNotFoundException { mPPS = stsdBox.getB64PPS(); mSPS = stsdBox.getB64SPS(); mProfilLevel = stsdBox.getProfileLevel(); - - // We're done ! - mp4Parser.close(); + mp4Parser.close(); + } public String getProfileLevel() { @@ -98,4 +92,4 @@ public String getB64SPS() { return mSPS; } -} \ No newline at end of file +} diff --git a/src/net/majorkernelpanic/streaming/mp4/MP4Parser.java b/src/net/majorkernelpanic/streaming/mp4/MP4Parser.java index 6acb3c7e..fa4ea112 100644 --- a/src/net/majorkernelpanic/streaming/mp4/MP4Parser.java +++ b/src/net/majorkernelpanic/streaming/mp4/MP4Parser.java @@ -1,31 +1,29 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.mp4; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.util.HashMap; - import android.util.Base64; import android.util.Log; @@ -34,93 +32,97 @@ * An mp4 file contains a tree where each node has a name and a size. * This class is used by H264Stream.java to determine the SPS and PPS parameters of a short video recorded by the phone. */ -class MP4Parser { +public class MP4Parser { private static final String TAG = "MP4Parser"; - private HashMap boxes = new HashMap(); - private final RandomAccessFile file; - private long pos = 0; + private HashMap mBoxes = new HashMap<>(); + private final RandomAccessFile mFile; + private long mPos = 0; - public MP4Parser(final String path) throws IOException, FileNotFoundException { - this.file = new RandomAccessFile(new File(path), "r"); - } /** Parses the mp4 file. **/ - public void parse() throws IOException { - long length = 0; - try { - length = file.length(); - } catch (IOException e) { - throw new IOException("Wrong size"); - } - + public static MP4Parser parse(String path) throws IOException { + return new MP4Parser(path); + } + + private MP4Parser(final String path) throws IOException, FileNotFoundException { + mFile = new RandomAccessFile(new File(path), "r"); try { - parse("",length); - } catch (IOException e) { + parse("",mFile.length()); + } catch (Exception e) { + e.printStackTrace(); throw new IOException("Parse error: malformed mp4 file"); - } + } } - - /** Close the file opened when creating the MP4Parser. **/ + public void close() { try { - file.close(); - } catch (IOException ignore) {} + mFile.close(); + } catch (Exception e) {}; } - + public long getBoxPos(String box) throws IOException { - Long r = boxes.get(box); + Long r = mBoxes.get(box); if (r==null) throw new IOException("Box not found: "+box); - return boxes.get(box); + return mBoxes.get(box); } public StsdBox getStsdBox() throws IOException { try { - return new StsdBox(file,getBoxPos("/moov/trak/mdia/minf/stbl/stsd")); + return new StsdBox(mFile,getBoxPos("/moov/trak/mdia/minf/stbl/stsd")); } catch (IOException e) { throw new IOException("stsd box could not be found"); } } private void parse(String path, long len) throws IOException { - byte[] buffer = new byte[8]; - String name=""; + ByteBuffer byteBuffer; long sum = 0, newlen = 0; - if(!path.equals("")) - boxes.put(path, pos-8); - + byte[] buffer = new byte[8]; + String name = ""; + + if(!path.equals("")) mBoxes.put(path, mPos-8); while (sum name: "+name+" newlen: "+newlen+" pos: "+pos); + + Log.d(TAG, "Atom -> name: "+name+" position: "+mPos+", length: "+newlen); sum += newlen; parse(path+'/'+name,newlen); } else { if( len < 8){ - file.seek(file.getFilePointer() - 8 + len); + mFile.seek(mFile.getFilePointer() - 8 + len); sum += len-8; } else { - int skipped = file.skipBytes((int)(len-8)); + int skipped = mFile.skipBytes((int)(len-8)); if (skipped < ((int)(len-8))) { throw new IOException(); } - pos += len-8; + mPos += len-8; sum += len-8; } } @@ -189,7 +191,7 @@ private boolean findSPSandPPS() { * You may find really useful information about this box * in the document ISO-IEC 14496-15, part 5.2.4.1.1 * The box's structure is described there - * + * 
       		 *  aligned(8) class AVCDecoderConfigurationRecord {
 		 *		unsigned int(8) configurationVersion = 1;
 		 *		unsigned int(8) AVCProfileIndication;
@@ -209,9 +211,7 @@ private boolean findSPSandPPS() {
 		 *			bit(8*pictureParameterSetLength) pictureParameterSetNALUnit;
 		 *		}
 		 *	}
-		 *
-		 *  
-		 *  
+		 *
      */ try { diff --git a/src/net/majorkernelpanic/streaming/rtcp/SenderReport.java b/src/net/majorkernelpanic/streaming/rtcp/SenderReport.java index 5b770c69..118d109a 100644 --- a/src/net/majorkernelpanic/streaming/rtcp/SenderReport.java +++ b/src/net/majorkernelpanic/streaming/rtcp/SenderReport.java @@ -1,31 +1,31 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtcp; +import static net.majorkernelpanic.streaming.rtp.RtpSocket.TRANSPORT_TCP; +import static net.majorkernelpanic.streaming.rtp.RtpSocket.TRANSPORT_UDP; import java.io.IOException; +import java.io.OutputStream; import java.net.DatagramPacket; import java.net.InetAddress; import java.net.MulticastSocket; import java.nio.channels.IllegalSelectorException; - import android.os.SystemClock; import android.util.Log; @@ -36,21 +36,29 @@ public class SenderReport { public static final int MTU = 1500; + private static final int PACKET_LENGTH = 28; + private MulticastSocket usock; private DatagramPacket upack; - private byte[] buffer = new byte[MTU]; - private int ssrc, port = -1; - private int octetCount = 0, packetCount = 0; + private int mTransport; + private OutputStream mOutputStream = null; + private byte[] mBuffer = new byte[MTU]; + private int mSSRC, mPort = -1; + private int mOctetCount = 0, mPacketCount = 0; private long interval, delta, now, oldnow; + private byte mTcpHeader[]; public SenderReport(int ssrc) throws IOException { super(); - this.ssrc = ssrc; + this.mSSRC = ssrc; } public SenderReport() { + mTransport = TRANSPORT_UDP; + mTcpHeader = new byte[] {'$',0,0,PACKET_LENGTH}; + /* Version(2) Padding(0) */ /* ^ ^ PT = 0 */ /* | | ^ */ @@ -58,13 +66,13 @@ public SenderReport() { /* | |--------------------- */ /* | || */ /* | || */ - buffer[0] = (byte) Integer.parseInt("10000000",2); + mBuffer[0] = (byte) Integer.parseInt("10000000",2); /* Packet Type PT */ - buffer[1] = (byte) 200; + mBuffer[1] = (byte) 200; /* Byte 2,3 -> Length */ - setLong(28/4-1, 2, 4); + setLong(PACKET_LENGTH/4-1, 2, 4); /* Byte 4,5,6,7 -> SSRC */ /* Byte 8,9,10,11 -> NTP timestamp hb */ @@ -76,11 +84,12 @@ public SenderReport() { try { usock = new MulticastSocket(); } catch (IOException e) { + // Very unlikely to happen. Means that all UDP ports are already being used throw new RuntimeException(e.getMessage()); } - upack = new DatagramPacket(buffer, 1); + upack = new DatagramPacket(mBuffer, 1); - // By default we sent one report every 5 secconde + // By default we sent one report every 3 secconde interval = 3000; } @@ -91,7 +100,7 @@ public void close() { /** * Sets the temporal interval between two RTCP Sender Reports. - * Default interval is set to 5 secondes. + * Default interval is set to 3 seconds. * Set 0 to disable RTCP. * @param interval The interval in milliseconds */ @@ -102,44 +111,56 @@ public void setInterval(long interval) { /** * Updates the number of packets sent, and the total amount of data sent. * @param length The length of the packet + * @param rtpts + * The RTP timestamp. * @throws IOException **/ - public void update(int length, long ntpts, long rtpts) throws IOException { - packetCount += 1; - octetCount += length; - setLong(packetCount, 20, 24); - setLong(octetCount, 24, 28); + public void update(int length, long rtpts) throws IOException { + mPacketCount += 1; + mOctetCount += length; + setLong(mPacketCount, 20, 24); + setLong(mOctetCount, 24, 28); now = SystemClock.elapsedRealtime(); delta += oldnow != 0 ? now-oldnow : 0; oldnow = now; - if (interval>0) { - if (delta>=interval) { - // We send a Sender Report - send(ntpts,rtpts); - delta = 0; - } + if (interval>0 && delta>=interval) { + // We send a Sender Report + send(System.nanoTime(), rtpts); + delta = 0; } } public void setSSRC(int ssrc) { - this.ssrc = ssrc; + this.mSSRC = ssrc; setLong(ssrc,4,8); - packetCount = 0; - octetCount = 0; - setLong(packetCount, 20, 24); - setLong(octetCount, 24, 28); + mPacketCount = 0; + mOctetCount = 0; + setLong(mPacketCount, 20, 24); + setLong(mOctetCount, 24, 28); } public void setDestination(InetAddress dest, int dport) { - port = dport; + mTransport = TRANSPORT_UDP; + mPort = dport; upack.setPort(dport); upack.setAddress(dest); } + /** + * If a TCP is used as the transport protocol for the RTP session, + * the output stream to which RTP packets will be written to must + * be specified with this method. + */ + public void setOutputStream(OutputStream os, byte channelIdentifier) { + mTransport = TRANSPORT_TCP; + mOutputStream = os; + mTcpHeader[1] = channelIdentifier; + } + public int getPort() { - return port; + return mPort; } public int getLocalPort() { @@ -147,36 +168,52 @@ public int getLocalPort() { } public int getSSRC() { - return ssrc; + return mSSRC; } /** * Resets the reports (total number of bytes sent, number of packets sent, etc.) */ public void reset() { - packetCount = 0; - octetCount = 0; - setLong(packetCount, 20, 24); - setLong(octetCount, 24, 28); + mPacketCount = 0; + mOctetCount = 0; + setLong(mPacketCount, 20, 24); + setLong(mOctetCount, 24, 28); delta = now = oldnow = 0; } private void setLong(long n, int begin, int end) { for (end--; end >= begin; end--) { - buffer[end] = (byte) (n % 256); + mBuffer[end] = (byte) (n % 256); n >>= 8; } } - /** Sends the RTCP packet over the network. */ + /** + * Sends the RTCP packet over the network. + * + * @param ntpts + * the NTP timestamp. + * @param rtpts + * the RTP timestamp. + */ private void send(long ntpts, long rtpts) throws IOException { long hb = ntpts/1000000000; long lb = ( ( ntpts - hb*1000000000 ) * 4294967296L )/1000000000; setLong(hb, 8, 12); setLong(lb, 12, 16); setLong(rtpts, 16, 20); - upack.setLength(28); - usock.send(upack); + if (mTransport == TRANSPORT_UDP) { + upack.setLength(PACKET_LENGTH); + usock.send(upack); + } else { + synchronized (mOutputStream) { + try { + mOutputStream.write(mTcpHeader); + mOutputStream.write(mBuffer, 0, PACKET_LENGTH); + } catch (Exception e) {} + } + } } diff --git a/src/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.java b/src/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.java index 355f7a60..dc2f20f2 100644 --- a/src/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.java +++ b/src/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.java @@ -1,27 +1,24 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtp; import java.io.IOException; - import net.majorkernelpanic.streaming.audio.AACStream; import android.os.SystemClock; import android.util.Log; @@ -82,7 +79,7 @@ public void run() { // marker bit in the RTP header is 1 on the last fragment of an Access // Unit, and 0 on all other fragments." RFC 3640 - // Adts header fields that we need to parse + // ADTS header fields that we need to parse boolean protection; int frameLength, sum, length, nbau, nbpk, samplingRateIndex, profile; long oldtime = SystemClock.elapsedRealtime(), now = oldtime; diff --git a/src/net/majorkernelpanic/streaming/rtp/AACLATMPacketizer.java b/src/net/majorkernelpanic/streaming/rtp/AACLATMPacketizer.java index 7222554f..6f74c72e 100644 --- a/src/net/majorkernelpanic/streaming/rtp/AACLATMPacketizer.java +++ b/src/net/majorkernelpanic/streaming/rtp/AACLATMPacketizer.java @@ -1,27 +1,24 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtp; import java.io.IOException; - import android.annotation.SuppressLint; import android.media.MediaCodec.BufferInfo; import android.os.SystemClock; diff --git a/src/net/majorkernelpanic/streaming/rtp/AMRNBPacketizer.java b/src/net/majorkernelpanic/streaming/rtp/AMRNBPacketizer.java index 3c3bfa7f..0b9073d0 100644 --- a/src/net/majorkernelpanic/streaming/rtp/AMRNBPacketizer.java +++ b/src/net/majorkernelpanic/streaming/rtp/AMRNBPacketizer.java @@ -1,27 +1,24 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtp; import java.io.IOException; - import android.util.Log; /** @@ -30,7 +27,7 @@ * * AMR Streaming over RTP. * - * Must be fed with an InputStream containing raw amr nb + * Must be fed with an InputStream containing raw AMR NB * Stream must begin with a 6 bytes long header: "#!AMR\n", it will be skipped * */ @@ -78,7 +75,7 @@ public void run() { try { - // Skip raw amr header + // Skip raw AMR header fill(header,0,AMR_HEADER_LENGTH); if (header[5] != '\n') { diff --git a/src/net/majorkernelpanic/streaming/rtp/AbstractPacketizer.java b/src/net/majorkernelpanic/streaming/rtp/AbstractPacketizer.java index 3c6ab5e2..33b5d77f 100644 --- a/src/net/majorkernelpanic/streaming/rtp/AbstractPacketizer.java +++ b/src/net/majorkernelpanic/streaming/rtp/AbstractPacketizer.java @@ -1,30 +1,28 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtp; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.net.InetAddress; import java.util.Random; - import net.majorkernelpanic.streaming.rtcp.SenderReport; /** @@ -56,11 +54,6 @@ public RtpSocket getRtpSocket() { return socket; } - public SenderReport getRtcpSocket() { - return socket.getRtcpSocket(); - } - - public void setSSRC(int ssrc) { socket.setSSRC(ssrc); } @@ -72,7 +65,7 @@ public int getSSRC() { public void setInputStream(InputStream is) { this.is = is; } - + public void setTimeToLive(int ttl) throws IOException { socket.setTimeToLive(ttl); } diff --git a/src/net/majorkernelpanic/streaming/rtp/H263Packetizer.java b/src/net/majorkernelpanic/streaming/rtp/H263Packetizer.java index 94c1653c..751f0cae 100644 --- a/src/net/majorkernelpanic/streaming/rtp/H263Packetizer.java +++ b/src/net/majorkernelpanic/streaming/rtp/H263Packetizer.java @@ -1,27 +1,24 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtp; import java.io.IOException; - import android.util.Log; /** diff --git a/src/net/majorkernelpanic/streaming/rtp/H264Packetizer.java b/src/net/majorkernelpanic/streaming/rtp/H264Packetizer.java index 994643a1..38fd270e 100644 --- a/src/net/majorkernelpanic/streaming/rtp/H264Packetizer.java +++ b/src/net/majorkernelpanic/streaming/rtp/H264Packetizer.java @@ -1,27 +1,24 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtp; import java.io.IOException; - import android.annotation.SuppressLint; import android.util.Log; @@ -43,7 +40,7 @@ public class H264Packetizer extends AbstractPacketizer implements Runnable { private int naluLength = 0; private long delay = 0, oldtime = 0; private Statistics stats = new Statistics(); - private byte[] sps = null, pps = null; + private byte[] sps = null, pps = null, stapa = null; byte[] header = new byte[5]; private int count = 0; private int streamType = 1; @@ -77,10 +74,31 @@ public void stop() { public void setStreamParameters(byte[] pps, byte[] sps) { this.pps = pps; this.sps = sps; + + // A STAP-A NAL (NAL type 24) containing the sps and pps of the stream + if (pps != null && sps != null) { + // STAP-A NAL header + NALU 1 (SPS) size + NALU 2 (PPS) size = 5 bytes + stapa = new byte[sps.length + pps.length + 5]; + + // STAP-A NAL header is 24 + stapa[0] = 24; + + // Write NALU 1 size into the array (NALU 1 is the SPS). + stapa[1] = (byte) (sps.length >> 8); + stapa[2] = (byte) (sps.length & 0xFF); + + // Write NALU 2 size into the array (NALU 2 is the PPS). + stapa[sps.length + 3] = (byte) (pps.length >> 8); + stapa[sps.length + 4] = (byte) (pps.length & 0xFF); + + // Write NALU 1 into the array, then write NALU 2 into the array. + System.arraycopy(sps, 0, stapa, 3, sps.length); + System.arraycopy(pps, 0, stapa, 5 + sps.length, pps.length); + } } public void run() { - long duration = 0, delta2 = 0; + long duration = 0; Log.d(TAG,"H264 packetizer started !"); stats.reset(); count = 0; @@ -101,27 +119,6 @@ public void run() { send(); // We measure how long it took to receive NAL units from the phone duration = System.nanoTime() - oldtime; - - // Every 3 secondes, we send two packets containing NALU type 7 (sps) and 8 (pps) - // Those should allow the H264 stream to be decoded even if no SDP was sent to the decoder. - delta2 += duration/1000000; - if (delta2>3000) { - delta2 = 0; - if (sps != null) { - buffer = socket.requestBuffer(); - socket.markNextPacket(); - socket.updateTimestamp(ts); - System.arraycopy(sps, 0, buffer, rtphl, sps.length); - super.send(rtphl+sps.length); - } - if (pps != null) { - buffer = socket.requestBuffer(); - socket.updateTimestamp(ts); - socket.markNextPacket(); - System.arraycopy(pps, 0, buffer, rtphl, pps.length); - super.send(rtphl+pps.length); - } - } stats.push(duration); // Computes the average duration of a NAL unit @@ -174,6 +171,7 @@ private void send() throws IOException, InterruptedException { // Parses the NAL unit type type = header[4]&0x1F; + // The stream already contains NAL unit type 7 or 8, we don't need // to add them to the stream ourselves if (type == 7 || type == 8) { @@ -185,6 +183,16 @@ private void send() throws IOException, InterruptedException { } } + // We send two packets containing NALU type 7 (SPS) and 8 (PPS) + // Those should allow the H264 stream to be decoded even if no SDP was sent to the decoder. + if (type == 5 && sps != null && pps != null) { + buffer = socket.requestBuffer(); + socket.markNextPacket(); + socket.updateTimestamp(ts); + System.arraycopy(stapa, 0, buffer, rtphl, stapa.length); + super.send(rtphl+stapa.length); + } + //Log.d(TAG,"- Nal unit length: " + naluLength + " delay: "+delay/1000000+" type: "+type); // Small NAL unit => Single NAL unit @@ -272,4 +280,4 @@ private void resync() throws IOException { } -} \ No newline at end of file +} diff --git a/src/net/majorkernelpanic/streaming/rtp/MediaCodecInputStream.java b/src/net/majorkernelpanic/streaming/rtp/MediaCodecInputStream.java index b77e0f69..dc5c68af 100644 --- a/src/net/majorkernelpanic/streaming/rtp/MediaCodecInputStream.java +++ b/src/net/majorkernelpanic/streaming/rtp/MediaCodecInputStream.java @@ -1,21 +1,19 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtp; @@ -23,7 +21,6 @@ import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; - import android.annotation.SuppressLint; import android.media.MediaCodec; import android.media.MediaCodec.BufferInfo; diff --git a/src/net/majorkernelpanic/streaming/rtp/RtpSocket.java b/src/net/majorkernelpanic/streaming/rtp/RtpSocket.java index 9f239ce4..d6af39a3 100644 --- a/src/net/majorkernelpanic/streaming/rtp/RtpSocket.java +++ b/src/net/majorkernelpanic/streaming/rtp/RtpSocket.java @@ -1,32 +1,30 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtp; import java.io.IOException; +import java.io.OutputStream; import java.net.DatagramPacket; import java.net.InetAddress; import java.net.MulticastSocket; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; - import net.majorkernelpanic.streaming.rtcp.SenderReport; import android.os.SystemClock; import android.util.Log; @@ -41,6 +39,12 @@ public class RtpSocket implements Runnable { public static final String TAG = "RtpSocket"; + /** Use this to use UDP for the transport protocol. */ + public final static int TRANSPORT_UDP = 0x00; + + /** Use this to use TCP for the transport protocol. */ + public final static int TRANSPORT_TCP = 0x01; + public static final int RTP_HEADER_LENGTH = 12; public static final int MTU = 1300; @@ -54,12 +58,15 @@ public class RtpSocket implements Runnable { private Semaphore mBufferRequested, mBufferCommitted; private Thread mThread; + private int mTransport; private long mCacheSize; private long mClock = 0; private long mOldTimestamp = 0; private int mSsrc, mSeq = 0, mPort = -1; private int mBufferCount, mBufferIn, mBufferOut; private int mCount = 0; + private byte mTcpHeader[]; + protected OutputStream mOutputStream = null; private AverageBitrate mAverageBitrate; @@ -69,12 +76,14 @@ public class RtpSocket implements Runnable { */ public RtpSocket() { - mCacheSize = 00; - mBufferCount = 300; // TODO: reajust that when the FIFO is full + mCacheSize = 0; + mBufferCount = 300; // TODO: readjust that when the FIFO is full mBuffers = new byte[mBufferCount][]; mPackets = new DatagramPacket[mBufferCount]; mReport = new SenderReport(); mAverageBitrate = new AverageBitrate(); + mTransport = TRANSPORT_UDP; + mTcpHeader = new byte[] {'$',0,0,0}; resetFifo(); @@ -139,7 +148,7 @@ public int getSSRC() { return mSsrc; } - /** Sets the clock frquency of the stream in Hz. */ + /** Sets the clock frequency of the stream in Hz. */ public void setClockFrequency(long clock) { mClock = clock; } @@ -156,24 +165,41 @@ public void setTimeToLive(int ttl) throws IOException { /** Sets the destination address and to which the packets will be sent. */ public void setDestination(InetAddress dest, int dport, int rtcpPort) { - mPort = dport; - for (int i=0;i30) mSocket.send(mPackets[mBufferOut]); + if (mCount++>30) { + if (mTransport == TRANSPORT_UDP) { + mSocket.send(mPackets[mBufferOut]); + } else { + sendTCP(); + } + } if (++mBufferOut>=mBufferCount) mBufferOut = 0; mBufferRequested.release(); } @@ -281,6 +313,19 @@ public void run() { resetFifo(); } + private void sendTCP() { + synchronized (mOutputStream) { + int len = mPackets[mBufferOut].getLength(); + Log.d(TAG,"sent "+len); + mTcpHeader[2] = (byte) (len>>8); + mTcpHeader[3] = (byte) (len&0xFF); + try { + mOutputStream.write(mTcpHeader); + mOutputStream.write(mBuffers[mBufferOut], 0, len); + } catch (Exception e) {} + } + } + private void setLong(byte[] buffer, long n, int begin, int end) { for (end--; end >= begin; end--) { buffer[end] = (byte) (n % 256); diff --git a/src/net/majorkernelpanic/streaming/rtsp/RtcpDeinterleaver.java b/src/net/majorkernelpanic/streaming/rtsp/RtcpDeinterleaver.java new file mode 100644 index 00000000..cb599195 --- /dev/null +++ b/src/net/majorkernelpanic/streaming/rtsp/RtcpDeinterleaver.java @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * + * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.majorkernelpanic.streaming.rtsp; + +import java.io.IOException; +import java.io.InputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; + +class RtcpDeinterleaver extends InputStream implements Runnable { + + public final static String TAG = "RtcpDeinterleaver"; + + private IOException mIOException; + private InputStream mInputStream; + private PipedInputStream mPipedInputStream; + private PipedOutputStream mPipedOutputStream; + private byte[] mBuffer; + + public RtcpDeinterleaver(InputStream inputStream) { + mInputStream = inputStream; + mPipedInputStream = new PipedInputStream(4096); + try { + mPipedOutputStream = new PipedOutputStream(mPipedInputStream); + } catch (IOException e) {} + mBuffer = new byte[1024]; + new Thread(this).start(); + } + + @Override + public void run() { + try { + while (true) { + int len = mInputStream.read(mBuffer, 0, 1024); + mPipedOutputStream.write(mBuffer, 0, len); + } + } catch (IOException e) { + try { + mPipedInputStream.close(); + } catch (IOException ignore) {} + mIOException = e; + } + } + + @Override + public int read(byte[] buffer) throws IOException { + if (mIOException != null) { + throw mIOException; + } + return mPipedInputStream.read(buffer); + } + + @Override + public int read(byte[] buffer, int offset, int length) throws IOException { + if (mIOException != null) { + throw mIOException; + } + return mPipedInputStream.read(buffer, offset, length); + } + + @Override + public int read() throws IOException { + if (mIOException != null) { + throw mIOException; + } + return mPipedInputStream.read(); + } + + @Override + public void close() throws IOException { + mInputStream.close(); + } + +} diff --git a/src/net/majorkernelpanic/streaming/rtsp/RtspClient.java b/src/net/majorkernelpanic/streaming/rtsp/RtspClient.java index ad95821b..d0e6e065 100644 --- a/src/net/majorkernelpanic/streaming/rtsp/RtspClient.java +++ b/src/net/majorkernelpanic/streaming/rtsp/RtspClient.java @@ -1,25 +1,24 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * + * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This file is part of Spydroid (http://code.google.com/p/spydroid-ipcamera/) + * http://www.apache.org/licenses/LICENSE-2.0 * - * Spydroid 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 source code 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 source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtsp; +import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -34,9 +33,9 @@ import java.util.concurrent.Semaphore; import java.util.regex.Matcher; import java.util.regex.Pattern; - import net.majorkernelpanic.streaming.Session; import net.majorkernelpanic.streaming.Stream; +import net.majorkernelpanic.streaming.rtp.RtpSocket; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -58,6 +57,12 @@ public class RtspClient { /** Message sent when the credentials are wrong. */ public final static int ERROR_WRONG_CREDENTIALS = 0x03; + /** Use this to use UDP for the transport protocol. */ + public final static int TRANSPORT_UDP = RtpSocket.TRANSPORT_UDP; + + /** Use this to use TCP for the transport protocol. */ + public final static int TRANSPORT_TCP = RtpSocket.TRANSPORT_TCP; + /** * Message sent when the connection with the RTSP server has been lost for * some reason (for example, the user is going under a bridge). @@ -72,7 +77,7 @@ public class RtspClient { * reconnect as long as {@link #stopStream()} is not called. */ public final static int MESSAGE_CONNECTION_RECOVERED = 0x05; - + private final static int STATE_STARTED = 0x00; private final static int STATE_STARTING = 0x01; private final static int STATE_STOPPING = 0x02; @@ -86,6 +91,7 @@ private class Parameters { public String path; public Session session; public int port; + public int transport; public Parameters clone() { Parameters params = new Parameters(); @@ -95,6 +101,7 @@ public Parameters clone() { params.path = path; params.session = session; params.port = port; + params.transport = transport; return params; } } @@ -102,13 +109,13 @@ public Parameters clone() { private Parameters mTmpParameters; private Parameters mParameters; - + + private int mCSeq; private Socket mSocket; private String mSessionID; private String mAuthorization; private BufferedReader mBufferedReader; private OutputStream mOutputStream; - private int mCSeq; private Callback mCallback; private Handler mMainHandler; private Handler mHandler; @@ -126,6 +133,7 @@ public RtspClient() { mTmpParameters = new Parameters(); mTmpParameters.port = 1935; mTmpParameters.path = "/"; + mTmpParameters.transport = TRANSPORT_UDP; mAuthorization = null; mCallback = null; mMainHandler = new Handler(Looper.getMainLooper()); @@ -175,9 +183,9 @@ public void setServerAddress(String host, int port) { } /** - * If authentication is enabled on the server, you need to call this with a valid username/password pair. + * If authentication is enabled on the server, you need to call this with a valid login/password pair. * Only implements Digest Access Authentication according to RFC 2069. - * @param username The username + * @param username The login * @param password The password */ public void setCredentials(String username, String password) { @@ -193,13 +201,22 @@ public void setStreamPath(String path) { mTmpParameters.path = path; } + /** + * Call this with {@link #TRANSPORT_TCP} or {@value #TRANSPORT_UDP} to choose the + * transport protocol that will be used to send RTP/RTCP packets. + * Not ready yet ! + */ + public void setTransportMode(int mode) { + mTmpParameters.transport = mode; + } + public boolean isStreaming() { - return mState==STATE_STARTED|mState==STATE_STARTING; + return mState==STATE_STARTED||mState==STATE_STARTING; } /** * Connects to the RTSP server to publish the stream, and the effectively starts streaming. - * You need to call {@link #setServerAddress(String, int)} and optionnally {@link #setSession(Session)} + * You need to call {@link #setServerAddress(String, int)} and optionally {@link #setSession(Session)} * and {@link #setCredentials(String, String)} before calling this. * Should be called of the main thread ! */ @@ -230,16 +247,18 @@ public void run() { tryConnection(); } catch (Exception e) { postError(ERROR_CONNECTION_FAILED, e); - abord(); + abort(); return; } - + try { mParameters.session.syncStart(); mState = STATE_STARTED; - mHandler.post(mConnectionMonitor); + if (mParameters.transport == TRANSPORT_UDP) { + mHandler.post(mConnectionMonitor); + } } catch (Exception e) { - abord(); + abort(); } } @@ -259,7 +278,7 @@ public void run() { } if (mState != STATE_STOPPED) { mState = STATE_STOPPING; - abord(); + abort(); } } }); @@ -270,7 +289,7 @@ public void release() { mHandler.getLooper().quit(); } - private void abord() { + private void abort() { try { sendRequestTeardown(); } catch (Exception ignore) {} @@ -286,7 +305,7 @@ private void tryConnection() throws IOException { mCSeq = 0; mSocket = new Socket(mParameters.host, mParameters.port); mBufferedReader = new BufferedReader(new InputStreamReader(mSocket.getInputStream())); - mOutputStream = mSocket.getOutputStream(); + mOutputStream = new BufferedOutputStream(mSocket.getOutputStream()); sendRequestAnnounce(); sendRequestSetup(); sendRequestRecord(); @@ -301,11 +320,12 @@ private void sendRequestAnnounce() throws IllegalStateException, SocketException String request = "ANNOUNCE rtsp://"+mParameters.host+":"+mParameters.port+mParameters.path+" RTSP/1.0\r\n" + "CSeq: " + (++mCSeq) + "\r\n" + "Content-Length: " + body.length() + "\r\n" + - "Content-Type: application/sdp \r\n\r\n" + + "Content-Type: application/sdp\r\n\r\n" + body; Log.i(TAG,request.substring(0, request.indexOf("\r\n"))); mOutputStream.write(request.getBytes("UTF-8")); + mOutputStream.flush(); Response response = Response.parseResponse(mBufferedReader); if (response.headers.containsKey("server")) { @@ -314,12 +334,14 @@ private void sendRequestAnnounce() throws IllegalStateException, SocketException Log.v(TAG,"RTSP server name unknown"); } - try { - Matcher m = Response.rexegSession.matcher(response.headers.get("session")); - m.find(); - mSessionID = m.group(1); - } catch (Exception e) { - throw new IOException("Invalid response from server. Session id: "+mSessionID); + if (response.headers.containsKey("session")) { + try { + Matcher m = Response.rexegSession.matcher(response.headers.get("session")); + m.find(); + mSessionID = m.group(1); + } catch (Exception e) { + throw new IOException("Invalid response from server. Session id: "+mSessionID); + } } if (response.status == 401) { @@ -341,19 +363,20 @@ private void sendRequestAnnounce() throws IllegalStateException, SocketException String hash2 = computeMd5Hash("ANNOUNCE"+":"+uri); String hash3 = computeMd5Hash(hash1+":"+m.group(2)+":"+hash2); - mAuthorization = "Digest username=\""+mParameters.username+"\",realm=\""+realm+"\",nonce=\""+nonce+"\",uri=\""+uri+"\",response=\""+hash3+"\"\r\n"; + mAuthorization = "Digest username=\""+mParameters.username+"\",realm=\""+realm+"\",nonce=\""+nonce+"\",uri=\""+uri+"\",response=\""+hash3+"\""; request = "ANNOUNCE rtsp://"+mParameters.host+":"+mParameters.port+mParameters.path+" RTSP/1.0\r\n" + "CSeq: " + (++mCSeq) + "\r\n" + "Content-Length: " + body.length() + "\r\n" + - "Authorization: " + mAuthorization + + "Authorization: " + mAuthorization + "\r\n" + "Session: " + mSessionID + "\r\n" + - "Content-Type: application/sdp \r\n\r\n" + + "Content-Type: application/sdp\r\n\r\n" + body; Log.i(TAG,request.substring(0, request.indexOf("\r\n"))); mOutputStream.write(request.getBytes("UTF-8")); + mOutputStream.flush(); response = Response.parseResponse(mBufferedReader); if (response.status == 401) throw new RuntimeException("Bad credentials !"); @@ -371,23 +394,41 @@ private void sendRequestSetup() throws IllegalStateException, SocketException, I for (int i=0;i<2;i++) { Stream stream = mParameters.session.getTrack(i); if (stream != null) { + String params = mParameters.transport==TRANSPORT_TCP ? + ("TCP;interleaved="+2*i+"-"+(2*i+1)) : ("UDP;unicast;client_port="+(5000+2*i)+"-"+(5000+2*i+1)+";mode=receive"); String request = "SETUP rtsp://"+mParameters.host+":"+mParameters.port+mParameters.path+"/trackID="+i+" RTSP/1.0\r\n" + - "Transport: RTP/AVP/UDP;unicast;client_port="+(5000+2*i)+"-"+(5000+2*i+1)+";mode=receive\r\n" + + "Transport: RTP/AVP/"+params+"\r\n" + addHeaders(); Log.i(TAG,request.substring(0, request.indexOf("\r\n"))); mOutputStream.write(request.getBytes("UTF-8")); + mOutputStream.flush(); Response response = Response.parseResponse(mBufferedReader); Matcher m; - try { - m = Response.rexegTransport.matcher(response.headers.get("transport")); m.find(); - stream.setDestinationPorts(Integer.parseInt(m.group(3)), Integer.parseInt(m.group(4))); - Log.d(TAG, "Setting destination ports: "+Integer.parseInt(m.group(3))+", "+Integer.parseInt(m.group(4))); - } catch (Exception e) { - e.printStackTrace(); - int[] ports = stream.getDestinationPorts(); - Log.d(TAG,"Server did not specify ports, using default ports: "+ports[0]+"-"+ports[1]); + + if (response.headers.containsKey("session")) { + try { + m = Response.rexegSession.matcher(response.headers.get("session")); + m.find(); + mSessionID = m.group(1); + } catch (Exception e) { + throw new IOException("Invalid response from server. Session id: "+mSessionID); + } + } + + if (mParameters.transport == TRANSPORT_UDP) { + try { + m = Response.rexegTransport.matcher(response.headers.get("transport")); m.find(); + stream.setDestinationPorts(Integer.parseInt(m.group(3)), Integer.parseInt(m.group(4))); + Log.d(TAG, "Setting destination ports: "+Integer.parseInt(m.group(3))+", "+Integer.parseInt(m.group(4))); + } catch (Exception e) { + e.printStackTrace(); + int[] ports = stream.getDestinationPorts(); + Log.d(TAG,"Server did not specify ports, using default ports: "+ports[0]+"-"+ports[1]); + } + } else { + stream.setOutputStream(mOutputStream, (byte)(2*i)); } } } @@ -398,10 +439,11 @@ private void sendRequestSetup() throws IllegalStateException, SocketException, I */ private void sendRequestRecord() throws IllegalStateException, SocketException, IOException { String request = "RECORD rtsp://"+mParameters.host+":"+mParameters.port+mParameters.path+" RTSP/1.0\r\n" + - "Range: npt=0.000-" + + "Range: npt=0.000-\r\n" + addHeaders(); Log.i(TAG,request.substring(0, request.indexOf("\r\n"))); mOutputStream.write(request.getBytes("UTF-8")); + mOutputStream.flush(); Response.parseResponse(mBufferedReader); } @@ -412,6 +454,7 @@ private void sendRequestTeardown() throws IOException { String request = "TEARDOWN rtsp://"+mParameters.host+":"+mParameters.port+mParameters.path+" RTSP/1.0\r\n" + addHeaders(); Log.i(TAG,request.substring(0, request.indexOf("\r\n"))); mOutputStream.write(request.getBytes("UTF-8")); + mOutputStream.flush(); } /** @@ -421,6 +464,7 @@ private void sendRequestOption() throws IOException { String request = "OPTIONS rtsp://"+mParameters.host+":"+mParameters.port+mParameters.path+" RTSP/1.0\r\n" + addHeaders(); Log.i(TAG,request.substring(0, request.indexOf("\r\n"))); mOutputStream.write(request.getBytes("UTF-8")); + mOutputStream.flush(); Response.parseResponse(mBufferedReader); } @@ -428,8 +472,9 @@ private String addHeaders() { return "CSeq: " + (++mCSeq) + "\r\n" + "Content-Length: 0\r\n" + "Session: " + mSessionID + "\r\n" + - (mAuthorization != null ? "Authorization: " + mAuthorization + "\r\n":""); - } + // For some reason you may have to remove last "\r\n" in the next line to make the RTSP client work with your wowza server :/ + (mAuthorization != null ? "Authorization: " + mAuthorization + "\r\n":"") + "\r\n"; + } /** * If the connection with the RTSP server is lost, we try to reconnect to it as @@ -467,7 +512,7 @@ public void run() { mHandler.post(mConnectionMonitor); postMessage(MESSAGE_CONNECTION_RECOVERED); } catch (Exception e) { - abord(); + abort(); } } catch (IOException e) { mHandler.postDelayed(mRetryConnection,1000); @@ -537,14 +582,14 @@ static class Response { public int status; - public HashMap headers = new HashMap(); + public HashMap headers = new HashMap<>(); - /** Parse the method, uri & headers of a RTSP request */ + /** Parse the method, URI & headers of a RTSP request */ public static Response parseResponse(BufferedReader input) throws IOException, IllegalStateException, SocketException { Response response = new Response(); String line; Matcher matcher; - // Parsing request method & uri + // Parsing request method & URI if ((line = input.readLine())==null) throw new SocketException("Connection lost"); matcher = regexStatus.matcher(line); matcher.find(); @@ -552,7 +597,7 @@ public static Response parseResponse(BufferedReader input) throws IOException, I // Parsing headers of the request while ( (line = input.readLine()) != null) { - //Log.e(TAG,"l: "+line.length()+"c: "+line); + //Log.e(TAG,"l: "+line.length()+", c: "+line); if (line.length()>3) { matcher = rexegHeader.matcher(line); matcher.find(); diff --git a/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java b/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java index 4696f973..08bea87a 100644 --- a/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java +++ b/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java @@ -1,21 +1,19 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtsp; @@ -35,7 +33,6 @@ import java.util.WeakHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; - import net.majorkernelpanic.streaming.Session; import net.majorkernelpanic.streaming.SessionBuilder; import android.app.Service; @@ -46,6 +43,7 @@ import android.os.Binder; import android.os.IBinder; import android.preference.PreferenceManager; +import android.util.Base64; import android.util.Log; /** @@ -88,12 +86,16 @@ public class RtspServer extends Service { protected SharedPreferences mSharedPreferences; protected boolean mEnabled = true; protected int mPort = DEFAULT_RTSP_PORT; - protected WeakHashMap mSessions = new WeakHashMap(2); + protected WeakHashMap mSessions = new WeakHashMap<>(2); private RequestListener mListenerThread; private final IBinder mBinder = new LocalBinder(); private boolean mRestart = false; - private final LinkedList mListeners = new LinkedList(); + private final LinkedList mListeners = new LinkedList<>(); + + /** Credentials for Basic Auth */ + private String mUsername; + private String mPassword; public RtspServer() { @@ -116,7 +118,7 @@ public interface CallbackListener { */ public void addCallbackListener(CallbackListener listener) { synchronized (mListeners) { - if (mListeners.size() > 0) { + if (!mListeners.isEmpty()) { for (CallbackListener cl : mListeners) { if (cl == listener) return; } @@ -148,7 +150,18 @@ public void setPort(int port) { Editor editor = mSharedPreferences.edit(); editor.putString(KEY_PORT, String.valueOf(port)); editor.commit(); - } + } + + /** + * Set Basic authorization to access RTSP Stream + * @param username username + * @param password password + */ + public void setAuthorization(String username, String password) + { + mUsername = username; + mPassword = password; + } /** * Starts (or restart if needed, if for example the configuration @@ -175,8 +188,8 @@ public void stop() { try { mListenerThread.kill(); for ( Session session : mSessions.keySet() ) { - if ( session != null ) { - if (session.isStreaming()) session.stop(); + if ( session != null && session.isStreaming() ) { + session.stop(); } } } catch (Exception e) { @@ -189,8 +202,8 @@ public void stop() { /** Returns whether or not the RTSP server is streaming to some client(s). */ public boolean isStreaming() { for ( Session session : mSessions.keySet() ) { - if ( session != null ) { - if (session.isStreaming()) return true; + if ( session != null && session.isStreaming() ) { + return true; } } return false; @@ -204,8 +217,8 @@ public boolean isEnabled() { public long getBitrate() { long bitrate = 0; for ( Session session : mSessions.keySet() ) { - if ( session != null ) { - if (session.isStreaming()) bitrate += session.getBitrate(); + if ( session != null && session.isStreaming() ) { + bitrate += session.getBitrate(); } } return bitrate; @@ -269,7 +282,7 @@ public IBinder onBind(Intent intent) { protected void postMessage(int id) { synchronized (mListeners) { - if (mListeners.size() > 0) { + if (!mListeners.isEmpty()) { for (CallbackListener cl : mListeners) { cl.onMessage(this, id); } @@ -279,7 +292,7 @@ protected void postMessage(int id) { protected void postError(Exception exception, int id) { synchronized (mListeners) { - if (mListeners.size() > 0) { + if (!mListeners.isEmpty()) { for (CallbackListener cl : mListeners) { cl.onError(this, exception, id); } @@ -428,143 +441,179 @@ public void run() { public Response processRequest(Request request) throws IllegalStateException, IOException { Response response = new Response(request); - /* ********************************************************************************** */ - /* ********************************* Method DESCRIBE ******************************** */ - /* ********************************************************************************** */ - if (request.method.equalsIgnoreCase("DESCRIBE")) { - - // Parse the requested URI and configure the session - mSession = handleRequest(request.uri, mClient); - mSessions.put(mSession, null); - mSession.syncConfigure(); - - String requestContent = mSession.getSessionDescription(); - String requestAttributes = - "Content-Base: "+mClient.getLocalAddress().getHostAddress()+":"+mClient.getLocalPort()+"/\r\n" + - "Content-Type: application/sdp\r\n"; - - response.attributes = requestAttributes; - response.content = requestContent; - - // If no exception has been thrown, we reply with OK - response.status = Response.STATUS_OK; - - } - - /* ********************************************************************************** */ - /* ********************************* Method OPTIONS ********************************* */ - /* ********************************************************************************** */ - else if (request.method.equalsIgnoreCase("OPTIONS")) { - response.status = Response.STATUS_OK; - response.attributes = "Public: DESCRIBE,SETUP,TEARDOWN,PLAY,PAUSE\r\n"; - response.status = Response.STATUS_OK; - } - - /* ********************************************************************************** */ - /* ********************************** Method SETUP ********************************** */ - /* ********************************************************************************** */ - else if (request.method.equalsIgnoreCase("SETUP")) { - Pattern p; Matcher m; - int p2, p1, ssrc, trackId, src[]; - String destination; - - p = Pattern.compile("trackID=(\\w+)",Pattern.CASE_INSENSITIVE); - m = p.matcher(request.uri); - - if (!m.find()) { - response.status = Response.STATUS_BAD_REQUEST; - return response; - } - - trackId = Integer.parseInt(m.group(1)); - - if (!mSession.trackExists(trackId)) { - response.status = Response.STATUS_NOT_FOUND; - return response; - } - - p = Pattern.compile("client_port=(\\d+)-(\\d+)",Pattern.CASE_INSENSITIVE); - m = p.matcher(request.headers.get("transport")); - - if (!m.find()) { - int[] ports = mSession.getTrack(trackId).getDestinationPorts(); - p1 = ports[0]; - p2 = ports[1]; - } - else { - p1 = Integer.parseInt(m.group(1)); - p2 = Integer.parseInt(m.group(2)); - } - - ssrc = mSession.getTrack(trackId).getSSRC(); - src = mSession.getTrack(trackId).getLocalPorts(); - destination = mSession.getDestination(); - - mSession.getTrack(trackId).setDestinationPorts(p1, p2); - - boolean streaming = isStreaming(); - mSession.syncStart(trackId); - if (!streaming && isStreaming()) { - postMessage(MESSAGE_STREAMING_STARTED); - } - - response.attributes = "Transport: RTP/AVP/UDP;"+(InetAddress.getByName(destination).isMulticastAddress()?"multicast":"unicast")+ - ";destination="+mSession.getDestination()+ - ";client_port="+p1+"-"+p2+ - ";server_port="+src[0]+"-"+src[1]+ - ";ssrc="+Integer.toHexString(ssrc)+ - ";mode=play\r\n" + - "Session: "+ "1185d20035702ca" + "\r\n" + - "Cache-Control: no-cache\r\n"; - response.status = Response.STATUS_OK; - - // If no exception has been thrown, we reply with OK - response.status = Response.STATUS_OK; - - } - - /* ********************************************************************************** */ - /* ********************************** Method PLAY *********************************** */ - /* ********************************************************************************** */ - else if (request.method.equalsIgnoreCase("PLAY")) { - String requestAttributes = "RTP-Info: "; - if (mSession.trackExists(0)) requestAttributes += "url=rtsp://"+mClient.getLocalAddress().getHostAddress()+":"+mClient.getLocalPort()+"/trackID="+0+";seq=0,"; - if (mSession.trackExists(1)) requestAttributes += "url=rtsp://"+mClient.getLocalAddress().getHostAddress()+":"+mClient.getLocalPort()+"/trackID="+1+";seq=0,"; - requestAttributes = requestAttributes.substring(0, requestAttributes.length()-1) + "\r\nSession: 1185d20035702ca\r\n"; - - response.attributes = requestAttributes; - - // If no exception has been thrown, we reply with OK - response.status = Response.STATUS_OK; - - } - - /* ********************************************************************************** */ - /* ********************************** Method PAUSE ********************************** */ - /* ********************************************************************************** */ - else if (request.method.equalsIgnoreCase("PAUSE")) { - response.status = Response.STATUS_OK; - } - - /* ********************************************************************************** */ - /* ********************************* Method TEARDOWN ******************************** */ - /* ********************************************************************************** */ - else if (request.method.equalsIgnoreCase("TEARDOWN")) { - response.status = Response.STATUS_OK; - } - - /* ********************************************************************************** */ - /* ********************************* Unknown method ? ******************************* */ - /* ********************************************************************************** */ - else { - Log.e(TAG,"Command unknown: "+request); - response.status = Response.STATUS_BAD_REQUEST; - } - + //Ask for authorization unless this is an OPTIONS request + if(!isAuthorized(request) && !request.method.equalsIgnoreCase("OPTIONS")) + { + response.attributes = "WWW-Authenticate: Basic realm=\""+SERVER_NAME+"\"\r\n"; + response.status = Response.STATUS_UNAUTHORIZED; + } + else + { + /* ********************************************************************************** */ + /* ********************************* Method DESCRIBE ******************************** */ + /* ********************************************************************************** */ + if (request.method.equalsIgnoreCase("DESCRIBE")) { + + // Parse the requested URI and configure the session + mSession = handleRequest(request.uri, mClient); + mSessions.put(mSession, null); + mSession.syncConfigure(); + + String requestContent = mSession.getSessionDescription(); + String requestAttributes = + "Content-Base: " + mClient.getLocalAddress().getHostAddress() + ":" + mClient.getLocalPort() + "/\r\n" + + "Content-Type: application/sdp\r\n"; + + response.attributes = requestAttributes; + response.content = requestContent; + + // If no exception has been thrown, we reply with OK + response.status = Response.STATUS_OK; + + } + + /* ********************************************************************************** */ + /* ********************************* Method OPTIONS ********************************* */ + /* ********************************************************************************** */ + else if (request.method.equalsIgnoreCase("OPTIONS")) { + response.status = Response.STATUS_OK; + response.attributes = "Public: DESCRIBE,SETUP,TEARDOWN,PLAY,PAUSE\r\n"; + response.status = Response.STATUS_OK; + } + + /* ********************************************************************************** */ + /* ********************************** Method SETUP ********************************** */ + /* ********************************************************************************** */ + else if (request.method.equalsIgnoreCase("SETUP")) { + Pattern p; + Matcher m; + int p2, p1, ssrc, trackId, src[]; + String destination; + + p = Pattern.compile("trackID=(\\w+)", Pattern.CASE_INSENSITIVE); + m = p.matcher(request.uri); + + if (!m.find()) { + response.status = Response.STATUS_BAD_REQUEST; + return response; + } + + trackId = Integer.parseInt(m.group(1)); + + if (!mSession.trackExists(trackId)) { + response.status = Response.STATUS_NOT_FOUND; + return response; + } + + p = Pattern.compile("client_port=(\\d+)(?:-(\\d+))?", Pattern.CASE_INSENSITIVE); + m = p.matcher(request.headers.get("transport")); + + if (!m.find()) { + int[] ports = mSession.getTrack(trackId).getDestinationPorts(); + p1 = ports[0]; + p2 = ports[1]; + } else { + p1 = Integer.parseInt(m.group(1)); + if (m.group(2) == null) { + p2 = p1+1; + } else { + p2 = Integer.parseInt(m.group(2)); + } + } + + ssrc = mSession.getTrack(trackId).getSSRC(); + src = mSession.getTrack(trackId).getLocalPorts(); + destination = mSession.getDestination(); + + mSession.getTrack(trackId).setDestinationPorts(p1, p2); + + boolean streaming = isStreaming(); + mSession.syncStart(trackId); + if (!streaming && isStreaming()) { + postMessage(MESSAGE_STREAMING_STARTED); + } + + response.attributes = "Transport: RTP/AVP/UDP;" + (InetAddress.getByName(destination).isMulticastAddress() ? "multicast" : "unicast") + + ";destination=" + mSession.getDestination() + + ";client_port=" + p1 + "-" + p2 + + ";server_port=" + src[0] + "-" + src[1] + + ";ssrc=" + Integer.toHexString(ssrc) + + ";mode=play\r\n" + + "Session: " + "1185d20035702ca" + "\r\n" + + "Cache-Control: no-cache\r\n"; + response.status = Response.STATUS_OK; + + // If no exception has been thrown, we reply with OK + response.status = Response.STATUS_OK; + + } + + /* ********************************************************************************** */ + /* ********************************** Method PLAY *********************************** */ + /* ********************************************************************************** */ + else if (request.method.equalsIgnoreCase("PLAY")) { + String requestAttributes = "RTP-Info: "; + if (mSession.trackExists(0)) + requestAttributes += "url=rtsp://" + mClient.getLocalAddress().getHostAddress() + ":" + mClient.getLocalPort() + "/trackID=" + 0 + ";seq=0,"; + if (mSession.trackExists(1)) + requestAttributes += "url=rtsp://" + mClient.getLocalAddress().getHostAddress() + ":" + mClient.getLocalPort() + "/trackID=" + 1 + ";seq=0,"; + requestAttributes = requestAttributes.substring(0, requestAttributes.length() - 1) + "\r\nSession: 1185d20035702ca\r\n"; + + response.attributes = requestAttributes; + + // If no exception has been thrown, we reply with OK + response.status = Response.STATUS_OK; + + } + + /* ********************************************************************************** */ + /* ********************************** Method PAUSE ********************************** */ + /* ********************************************************************************** */ + else if (request.method.equalsIgnoreCase("PAUSE")) { + response.status = Response.STATUS_OK; + } + + /* ********************************************************************************** */ + /* ********************************* Method TEARDOWN ******************************** */ + /* ********************************************************************************** */ + else if (request.method.equalsIgnoreCase("TEARDOWN")) { + response.status = Response.STATUS_OK; + } + + /* ********************************************************************************** */ + /* ********************************* Unknown method ? ******************************* */ + /* ********************************************************************************** */ + else { + Log.e(TAG, "Command unknown: " + request); + response.status = Response.STATUS_BAD_REQUEST; + } + } return response; } + /** + * Check if the request is authorized + * @param request + * @return true or false + */ + private boolean isAuthorized(Request request) + { + String auth = request.headers.get("authorization"); + if(mUsername == null || mPassword == null || mUsername.isEmpty()) + return true; + + if(auth != null && !auth.isEmpty()) + { + String received = auth.substring(auth.lastIndexOf(" ")+1); + String local = mUsername+":"+mPassword; + String localEncoded = Base64.encodeToString(local.getBytes(),Base64.NO_WRAP); + if(localEncoded.equals(received)) + return true; + } + + return false; + } } static class Request { @@ -576,7 +625,7 @@ static class Request { public String method; public String uri; - public HashMap headers = new HashMap(); + public HashMap headers = new HashMap<>(); /** Parse the method, uri & headers of a RTSP request */ public static Request parseRequest(BufferedReader input) throws IOException, IllegalStateException, SocketException { @@ -611,6 +660,7 @@ static class Response { // Status code definitions public static final String STATUS_OK = "200 OK"; public static final String STATUS_BAD_REQUEST = "400 Bad Request"; + public static final String STATUS_UNAUTHORIZED = "401 Unauthorized"; public static final String STATUS_NOT_FOUND = "404 Not Found"; public static final String STATUS_INTERNAL_SERVER_ERROR = "500 Internal Server Error"; diff --git a/src/net/majorkernelpanic/streaming/rtsp/UriParser.java b/src/net/majorkernelpanic/streaming/rtsp/UriParser.java index 23535286..58bd250b 100644 --- a/src/net/majorkernelpanic/streaming/rtsp/UriParser.java +++ b/src/net/majorkernelpanic/streaming/rtsp/UriParser.java @@ -1,21 +1,19 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.rtsp; @@ -30,19 +28,16 @@ import java.io.IOException; import java.net.InetAddress; import java.net.URI; +import java.net.URLEncoder; import java.net.UnknownHostException; -import java.util.Iterator; -import java.util.List; - +import java.util.Set; import net.majorkernelpanic.streaming.MediaStream; import net.majorkernelpanic.streaming.Session; import net.majorkernelpanic.streaming.SessionBuilder; import net.majorkernelpanic.streaming.audio.AudioQuality; import net.majorkernelpanic.streaming.video.VideoQuality; -import org.apache.http.NameValuePair; -import org.apache.http.client.utils.URLEncodedUtils; - +import android.content.ContentValues; import android.hardware.Camera.CameraInfo; /** @@ -51,7 +46,7 @@ public class UriParser { public final static String TAG = "UriParser"; - + /** * Configures a Session according to the given URI. * Here are some examples of URIs that can be used to configure a Session: @@ -64,45 +59,62 @@ public class UriParser { * @throws IOException * @return A Session configured according to the URI */ - public static Session parse(String uri) throws IllegalStateException, IOException { + public static Session parse(String uri) throws IllegalStateException, IOException { SessionBuilder builder = SessionBuilder.getInstance().clone(); byte audioApi = 0, videoApi = 0; - List params = URLEncodedUtils.parse(URI.create(uri),"UTF-8"); + String query = URI.create(uri).getQuery(); + String[] queryParams = query == null ? new String[0] : query.split("&"); + ContentValues params = new ContentValues(); + for(String param:queryParams) + { + String[] keyValue = param.split("="); + String value = ""; + try { + value = keyValue[1]; + }catch(ArrayIndexOutOfBoundsException e){} + + params.put( + URLEncoder.encode(keyValue[0], "UTF-8"), // Name + URLEncoder.encode(value, "UTF-8") // Value + ); + + } + if (params.size()>0) { builder.setAudioEncoder(AUDIO_NONE).setVideoEncoder(VIDEO_NONE); - + Set paramKeys=params.keySet(); // Those parameters must be parsed first or else they won't necessarily be taken into account - for (Iterator it = params.iterator();it.hasNext();) { - NameValuePair param = it.next(); + for(String paramName: paramKeys) { + String paramValue = params.getAsString(paramName); // FLASH ON/OFF - if (param.getName().equalsIgnoreCase("flash")) { - if (param.getValue().equalsIgnoreCase("on")) + if (paramName.equalsIgnoreCase("flash")) { + if (paramValue.equalsIgnoreCase("on")) builder.setFlashEnabled(true); - else + else builder.setFlashEnabled(false); } // CAMERA -> the client can choose between the front facing camera and the back facing camera - else if (param.getName().equalsIgnoreCase("camera")) { - if (param.getValue().equalsIgnoreCase("back")) + else if (paramName.equalsIgnoreCase("camera")) { + if (paramValue.equalsIgnoreCase("back")) builder.setCamera(CameraInfo.CAMERA_FACING_BACK); - else if (param.getValue().equalsIgnoreCase("front")) + else if (paramValue.equalsIgnoreCase("front")) builder.setCamera(CameraInfo.CAMERA_FACING_FRONT); } // MULTICAST -> the stream will be sent to a multicast group // The default mutlicast address is 228.5.6.7, but the client can specify another - else if (param.getName().equalsIgnoreCase("multicast")) { - if (param.getValue()!=null) { + else if (paramName.equalsIgnoreCase("multicast")) { + if (paramValue!=null) { try { - InetAddress addr = InetAddress.getByName(param.getValue()); + InetAddress addr = InetAddress.getByName(paramValue); if (!addr.isMulticastAddress()) { throw new IllegalStateException("Invalid multicast address !"); } - builder.setDestination(param.getValue()); + builder.setDestination(paramValue); } catch (UnknownHostException e) { throw new IllegalStateException("Invalid multicast address !"); } @@ -114,40 +126,40 @@ else if (param.getName().equalsIgnoreCase("multicast")) { } // UNICAST -> the client can use this to specify where he wants the stream to be sent - else if (param.getName().equalsIgnoreCase("unicast")) { - if (param.getValue()!=null) { - builder.setDestination(param.getValue()); - } + else if (paramName.equalsIgnoreCase("unicast")) { + if (paramValue!=null) { + builder.setDestination(paramValue); + } } - + // VIDEOAPI -> can be used to specify what api will be used to encode video (the MediaRecorder API or the MediaCodec API) - else if (param.getName().equalsIgnoreCase("videoapi")) { - if (param.getValue()!=null) { - if (param.getValue().equalsIgnoreCase("mr")) { + else if (paramName.equalsIgnoreCase("videoapi")) { + if (paramValue!=null) { + if (paramValue.equalsIgnoreCase("mr")) { videoApi = MediaStream.MODE_MEDIARECORDER_API; - } else if (param.getValue().equalsIgnoreCase("mc")) { + } else if (paramValue.equalsIgnoreCase("mc")) { videoApi = MediaStream.MODE_MEDIACODEC_API; } - } + } } - + // AUDIOAPI -> can be used to specify what api will be used to encode audio (the MediaRecorder API or the MediaCodec API) - else if (param.getName().equalsIgnoreCase("audioapi")) { - if (param.getValue()!=null) { - if (param.getValue().equalsIgnoreCase("mr")) { + else if (paramName.equalsIgnoreCase("audioapi")) { + if (paramValue!=null) { + if (paramValue.equalsIgnoreCase("mr")) { audioApi = MediaStream.MODE_MEDIARECORDER_API; - } else if (param.getValue().equalsIgnoreCase("mc")) { + } else if (paramValue.equalsIgnoreCase("mc")) { audioApi = MediaStream.MODE_MEDIACODEC_API; } - } - } + } + } // TTL -> the client can modify the time to live of packets // By default ttl=64 - else if (param.getName().equalsIgnoreCase("ttl")) { - if (param.getValue()!=null) { + else if (paramName.equalsIgnoreCase("ttl")) { + if (paramValue!=null) { try { - int ttl = Integer.parseInt(param.getValue()); + int ttl = Integer.parseInt(paramValue); if (ttl<0) throw new IllegalStateException(); builder.setTimeToLive(ttl); } catch (Exception e) { @@ -157,26 +169,26 @@ else if (param.getName().equalsIgnoreCase("ttl")) { } // H.264 - else if (param.getName().equalsIgnoreCase("h264")) { - VideoQuality quality = VideoQuality.parseQuality(param.getValue()); + else if (paramName.equalsIgnoreCase("h264")) { + VideoQuality quality = VideoQuality.parseQuality(paramValue); builder.setVideoQuality(quality).setVideoEncoder(VIDEO_H264); } // H.263 - else if (param.getName().equalsIgnoreCase("h263")) { - VideoQuality quality = VideoQuality.parseQuality(param.getValue()); + else if (paramName.equalsIgnoreCase("h263")) { + VideoQuality quality = VideoQuality.parseQuality(paramValue); builder.setVideoQuality(quality).setVideoEncoder(VIDEO_H263); } // AMR - else if (param.getName().equalsIgnoreCase("amrnb") || param.getName().equalsIgnoreCase("amr")) { - AudioQuality quality = AudioQuality.parseQuality(param.getValue()); + else if (paramName.equalsIgnoreCase("amrnb") || paramName.equalsIgnoreCase("amr")) { + AudioQuality quality = AudioQuality.parseQuality(paramValue); builder.setAudioQuality(quality).setAudioEncoder(AUDIO_AMRNB); } // AAC - else if (param.getName().equalsIgnoreCase("aac")) { - AudioQuality quality = AudioQuality.parseQuality(param.getValue()); + else if (paramName.equalsIgnoreCase("aac")) { + AudioQuality quality = AudioQuality.parseQuality(paramValue); builder.setAudioQuality(quality).setAudioEncoder(AUDIO_AAC); } @@ -191,15 +203,15 @@ else if (param.getName().equalsIgnoreCase("aac")) { } Session session = builder.build(); - + if (videoApi>0 && session.getVideoTrack() != null) { session.getVideoTrack().setStreamingMethod(videoApi); } - + if (audioApi>0 && session.getAudioTrack() != null) { session.getAudioTrack().setStreamingMethod(audioApi); } - + return session; } diff --git a/src/net/majorkernelpanic/streaming/video/CodecManager.java b/src/net/majorkernelpanic/streaming/video/CodecManager.java new file mode 100644 index 00000000..90a923fa --- /dev/null +++ b/src/net/majorkernelpanic/streaming/video/CodecManager.java @@ -0,0 +1,262 @@ +/* + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * + * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.majorkernelpanic.streaming.video; + +import java.util.ArrayList; +import java.util.HashMap; +import android.annotation.SuppressLint; +import android.media.MediaCodecInfo; +import android.media.MediaCodecList; +import android.os.Build; +import android.util.Log; +import android.util.SparseArray; + +@SuppressLint("InlinedApi") +public class CodecManager { + + public final static String TAG = "CodecManager"; + + public static final int[] SUPPORTED_COLOR_FORMATS = { + MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Planar, + MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420SemiPlanar + }; + + /** + * There currently is no way to know if an encoder is software or hardware from the MediaCodecInfo class, + * so we need to maintain a list of known software encoders. + */ + public static final String[] SOFTWARE_ENCODERS = { + "OMX.google.h264.encoder" + }; + + /** + * Contains a list of encoders and color formats that we may use with a {@link CodecManager.Translator}. + */ + static class Codecs { + /** A hardware encoder supporting a color format we can use. */ + public String hardwareCodec; + public int hardwareColorFormat; + /** A software encoder supporting a color format we can use. */ + public String softwareCodec; + public int softwareColorFormat; + } + + /** + * Contains helper functions to choose an encoder and a color format. + */ + static class Selector { + + private static HashMap>> sHardwareCodecs = new HashMap<>(); + private static HashMap>> sSoftwareCodecs = new HashMap<>(); + + /** + * Determines the most appropriate encoder to compress the video from the Camera + */ + public static Codecs findCodecsFormMimeType(String mimeType, boolean tryColorFormatSurface) { + findSupportedColorFormats(mimeType); + SparseArray> hardwareCodecs = sHardwareCodecs.get(mimeType); + SparseArray> softwareCodecs = sSoftwareCodecs.get(mimeType); + Codecs list = new Codecs(); + + // On devices running 4.3, we need an encoder supporting the color format used to work with a Surface + if (Build.VERSION.SDK_INT>=18 && tryColorFormatSurface) { + int colorFormatSurface = MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface; + try { + // We want a hardware encoder + list.hardwareCodec = hardwareCodecs.get(colorFormatSurface).get(0); + list.hardwareColorFormat = colorFormatSurface; + } catch (Exception e) {} + try { + // We want a software encoder + list.softwareCodec = softwareCodecs.get(colorFormatSurface).get(0); + list.softwareColorFormat = colorFormatSurface; + } catch (Exception e) {} + + if (list.hardwareCodec != null) { + Log.v(TAG,"Choosen primary codec: "+list.hardwareCodec+" with color format: "+list.hardwareColorFormat); + } else { + Log.e(TAG,"No supported hardware codec found !"); + } + if (list.softwareCodec != null) { + Log.v(TAG,"Choosen secondary codec: "+list.hardwareCodec+" with color format: "+list.hardwareColorFormat); + } else { + Log.e(TAG,"No supported software codec found !"); + } + return list; + } + + for (int i=0;i> softwareCodecs = new SparseArray>(); + SparseArray> hardwareCodecs = new SparseArray>(); + + if (sSoftwareCodecs.containsKey(mimeType)) { + return; + } + + Log.v(TAG,"Searching supported color formats for mime type \""+mimeType+"\"..."); + + // We loop through the encoders, apparently this can take up to a sec (testes on a GS3) + for(int j = MediaCodecList.getCodecCount() - 1; j >= 0; j--){ + MediaCodecInfo codecInfo = MediaCodecList.getCodecInfoAt(j); + if (!codecInfo.isEncoder()) continue; + + String[] types = codecInfo.getSupportedTypes(); + for (int i = 0; i < types.length; i++) { + if (types[i].equalsIgnoreCase(mimeType)) { + MediaCodecInfo.CodecCapabilities capabilities = codecInfo.getCapabilitiesForType(mimeType); + + boolean software = false; + for (int k=0;k()); + softwareCodecs.get(format).add(codecInfo.getName()); + } else { + if (hardwareCodecs.get(format) == null) hardwareCodecs.put(format, new ArrayList()); + hardwareCodecs.get(format).add(codecInfo.getName()); + } + } + + } + } + } + + // Logs the supported color formats on the phone + StringBuilder e = new StringBuilder(); + e.append("Supported color formats on this phone: "); + for (int i=0;i supportedFpsRanges = parameters.getSupportedPreviewFpsRange(); for (Iterator it = supportedFpsRanges.iterator(); it.hasNext();) { int[] interval = it.next(); - supportedFpsRangesStr += interval[0]+"-"+interval[1]+"fps"+(it.hasNext()?", ":""); - if (interval[1]/1000>maxFps[1]) { + // Intervals are returned as integers, for example "29970" means "29.970" FPS. + supportedFpsRangesStr += interval[0]/1000+"-"+interval[1]/1000+"fps"+(it.hasNext()?", ":""); + if (interval[1]>maxFps[1] || (interval[0]>maxFps[0] && interval[1]==maxFps[1])) { maxFps = interval; } } diff --git a/src/net/majorkernelpanic/streaming/video/VideoStream.java b/src/net/majorkernelpanic/streaming/video/VideoStream.java index 3a65c458..a30e4015 100644 --- a/src/net/majorkernelpanic/streaming/video/VideoStream.java +++ b/src/net/majorkernelpanic/streaming/video/VideoStream.java @@ -1,31 +1,29 @@ /* - * Copyright (C) 2011-2014 GUIGUI Simon, fyhertz@gmail.com - * + * Copyright (C) 2011-2015 GUIGUI Simon, fyhertz@gmail.com + * * This file is part of libstreaming (https://github.com/fyhertz/libstreaming) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Spydroid 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 source code 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this source code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.majorkernelpanic.streaming.video; +import java.io.FileDescriptor; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; - import net.majorkernelpanic.streaming.MediaStream; import net.majorkernelpanic.streaming.Stream; import net.majorkernelpanic.streaming.exceptions.CameraInUseException; @@ -46,6 +44,7 @@ import android.media.MediaFormat; import android.media.MediaRecorder; import android.os.Looper; +import android.os.ParcelFileDescriptor; import android.util.Log; import android.view.Surface; import android.view.SurfaceHolder; @@ -74,7 +73,8 @@ public abstract class VideoStream extends MediaStream { protected boolean mSurfaceReady = false; protected boolean mUnlocked = false; protected boolean mPreviewStarted = false; - + protected boolean mUpdated = false; + protected String mMimeType; protected String mEncoderName; protected int mEncoderColorFormat; @@ -135,6 +135,11 @@ public void switchCamera() throws RuntimeException, IOException { if (streaming) start(); } + /** + * Returns the id of the camera currently selected. + * Can be either {@link CameraInfo#CAMERA_FACING_BACK} or + * {@link CameraInfo#CAMERA_FACING_FRONT}. + */ public int getCamera() { return mCameraId; } @@ -148,7 +153,7 @@ public synchronized void setSurfaceView(SurfaceView view) { if (mSurfaceHolderCallback != null && mSurfaceView != null && mSurfaceView.getHolder() != null) { mSurfaceView.getHolder().removeCallback(mSurfaceHolderCallback); } - if (mSurfaceView.getHolder() != null) { + if (mSurfaceView != null && mSurfaceView.getHolder() != null) { mSurfaceHolderCallback = new Callback() { @Override public void surfaceDestroyed(SurfaceHolder holder) { @@ -204,7 +209,10 @@ public synchronized void setFlashState(boolean state) { } } - /** Toggle the LED of the phone if it has one. */ + /** + * Toggles the LED of the phone if it has one. + * You can get the current state of the flash with {@link VideoStream#getFlashState()}. + */ public synchronized void toggleFlash() { setFlashState(!mFlashEnabled); } @@ -220,16 +228,19 @@ public boolean getFlashState() { */ public void setPreviewOrientation(int orientation) { mRequestedOrientation = orientation; + mUpdated = false; } - /** * Sets the configuration of the stream. You can call this method at any time * and changes will take effect next time you call {@link #configure()}. * @param videoQuality Quality of the stream */ public void setVideoQuality(VideoQuality videoQuality) { - mRequestedQuality = videoQuality.clone(); + if (!mRequestedQuality.equals(videoQuality)) { + mRequestedQuality = videoQuality.clone(); + mUpdated = false; + } } /** @@ -258,8 +269,8 @@ public synchronized void configure() throws IllegalStateException, IOException { /** * Starts the stream. - * This will also open the camera and dispay the preview - * if {@link #startPreview()} has not aready been called. + * This will also open the camera and display the preview + * if {@link #startPreview()} has not already been called. */ public synchronized void start() throws IllegalStateException, IOException { if (!mPreviewStarted) mCameraOpenedManually = false; @@ -293,20 +304,12 @@ public synchronized void stop() { public synchronized void startPreview() throws CameraInUseException, InvalidSurfaceException, - ConfNotSupportedException, RuntimeException { mCameraOpenedManually = true; if (!mPreviewStarted) { createCamera(); updateCamera(); - try { - mCamera.startPreview(); - mPreviewStarted = true; - } catch (RuntimeException e) { - destroyCamera(); - throw e; - } } } @@ -321,7 +324,7 @@ public synchronized void stopPreview() { /** * Video encoding is done by a MediaRecorder. */ - protected void encodeWithMediaRecorder() throws IOException { + protected void encodeWithMediaRecorder() throws IOException, ConfNotSupportedException { Log.d(TAG,"Video encoded using the MediaRecorder API"); @@ -348,10 +351,16 @@ protected void encodeWithMediaRecorder() throws IOException { // The bandwidth actually consumed is often above what was requested mMediaRecorder.setVideoEncodingBitRate((int)(mRequestedQuality.bitrate*0.8)); - // We write the ouput of the camera in a local socket instead of a file ! + // We write the output of the camera in a local socket instead of a file ! // This one little trick makes streaming feasible quiet simply: data from the camera // can then be manipulated at the other end of the socket - mMediaRecorder.setOutputFile(mSender.getFileDescriptor()); + FileDescriptor fd = null; + if (sPipeApi == PIPE_API_PFD) { + fd = mParcelWrite.getFileDescriptor(); + } else { + fd = mSender.getFileDescriptor(); + } + mMediaRecorder.setOutputFile(fd); mMediaRecorder.prepare(); mMediaRecorder.start(); @@ -360,8 +369,15 @@ protected void encodeWithMediaRecorder() throws IOException { throw new ConfNotSupportedException(e.getMessage()); } + InputStream is = null; + + if (sPipeApi == PIPE_API_PFD) { + is = new ParcelFileDescriptor.AutoCloseInputStream(mParcelRead); + } else { + is = mReceiver.getInputStream(); + } + // This will skip the MPEG4 header if this step fails we can't stream anything :( - InputStream is = mReceiver.getInputStream(); try { byte buffer[] = new byte[4]; // Skip all atoms preceding mdat atom @@ -377,8 +393,7 @@ protected void encodeWithMediaRecorder() throws IOException { } // The packetizer encapsulates the bit stream in an RTP stream and send it over the network - mPacketizer.setDestination(mDestination, mRtpPort, mRtcpPort); - mPacketizer.setInputStream(mReceiver.getInputStream()); + mPacketizer.setInputStream(is); mPacketizer.start(); mStreaming = true; @@ -411,7 +426,7 @@ protected void encodeWithMediaCodecMethod1() throws RuntimeException, IOExceptio createCamera(); updateCamera(); - // Estimates the framerate of the camera + // Estimates the frame rate of the camera measureFramerate(); // Starts the preview if needed @@ -452,7 +467,8 @@ public void onPreviewFrame(byte[] data, Camera camera) { int bufferIndex = mMediaCodec.dequeueInputBuffer(500000); if (bufferIndex>=0) { inputBuffers[bufferIndex].clear(); - convertor.convert(data, inputBuffers[bufferIndex]); + if (data == null) Log.e(TAG,"Symptom of the \"Callback buffer was to small\" problem..."); + else convertor.convert(data, inputBuffers[bufferIndex]); mMediaCodec.queueInputBuffer(bufferIndex, 0, inputBuffers[bufferIndex].position(), now, 0); } else { Log.e(TAG,"No buffer available !"); @@ -462,12 +478,11 @@ public void onPreviewFrame(byte[] data, Camera camera) { } } }; - + for (int i=0;i<10;i++) mCamera.addCallbackBuffer(new byte[convertor.getBufferSize()]); mCamera.setPreviewCallbackWithBuffer(callback); // The packetizer encapsulates the bit stream in an RTP stream and send it over the network - mPacketizer.setDestination(mDestination, mRtpPort, mRtcpPort); mPacketizer.setInputStream(new MediaCodecInputStream(mMediaCodec)); mPacketizer.start(); @@ -477,7 +492,7 @@ public void onPreviewFrame(byte[] data, Camera camera) { /** * Video encoding is done by a MediaCodec. - * But here we will use the buffer-to-surface methode + * But here we will use the buffer-to-surface method */ @SuppressLint({ "InlinedApi", "NewApi" }) protected void encodeWithMediaCodecMethod2() throws RuntimeException, IOException { @@ -488,7 +503,7 @@ protected void encodeWithMediaCodecMethod2() throws RuntimeException, IOExceptio createCamera(); updateCamera(); - // Estimates the framerate of the camera + // Estimates the frame rate of the camera measureFramerate(); EncoderDebugger debugger = EncoderDebugger.debug(mSettings, mQuality.resX, mQuality.resY); @@ -505,7 +520,6 @@ protected void encodeWithMediaCodecMethod2() throws RuntimeException, IOExceptio mMediaCodec.start(); // The packetizer encapsulates the bit stream in an RTP stream and send it over the network - mPacketizer.setDestination(mDestination, mRtpPort, mRtcpPort); mPacketizer.setInputStream(new MediaCodecInputStream(mMediaCodec)); mPacketizer.start(); @@ -556,6 +570,7 @@ protected synchronized void createCamera() throws RuntimeException { if (mCamera == null) { openCamera(); + mUpdated = false; mUnlocked = false; mCamera.setErrorCallback(new Camera.ErrorCallback() { @Override @@ -577,7 +592,7 @@ public void onError(int error, Camera camera) { try { // If the phone has a flash, we turn it on/off according to mFlashEnabled - // setRecordingHint(true) is a very nice optimisation if you plane to only use the Camera for recording + // setRecordingHint(true) is a very nice optimization if you plane to only use the Camera for recording Parameters parameters = mCamera.getParameters(); if (parameters.getFlashMode()!=null) { parameters.setFlashMode(mFlashEnabled?Parameters.FLASH_MODE_TORCH:Parameters.FLASH_MODE_OFF); @@ -623,6 +638,10 @@ protected synchronized void destroyCamera() { } protected synchronized void updateCamera() throws RuntimeException { + + // The camera is already correctly configured + if (mUpdated) return; + if (mPreviewStarted) { mPreviewStarted = false; mCamera.stopPreview(); @@ -631,6 +650,10 @@ protected synchronized void updateCamera() throws RuntimeException { Parameters parameters = mCamera.getParameters(); mQuality = VideoQuality.determineClosestSupportedResolution(parameters, mQuality); int[] max = VideoQuality.determineMaximumSupportedFramerate(parameters); + + double ratio = (double)mQuality.resX/(double)mQuality.resY; + mSurfaceView.requestAspectRatio(ratio); + parameters.setPreviewFormat(mCameraImageFormat); parameters.setPreviewSize(mQuality.resX, mQuality.resY); parameters.setPreviewFpsRange(max[0], max[1]); @@ -640,6 +663,7 @@ protected synchronized void updateCamera() throws RuntimeException { mCamera.setDisplayOrientation(mOrientation); mCamera.startPreview(); mPreviewStarted = true; + mUpdated = true; } catch (RuntimeException e) { destroyCamera(); throw e; @@ -673,7 +697,7 @@ protected void unlockCamera() { /** * Computes the average frame rate at which the preview callback is called. - * We will then use this average framerate with the MediaCodec. + * We will then use this average frame rate with the MediaCodec. * Blocks the thread in which this function is called. */ private void measureFramerate() {