diff --git a/.classpath b/.classpath deleted file mode 100644 index 51769745..00000000 --- a/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..0377071f --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "gradle" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "daily" + - package-ecosystem: "github-actions" + directory: "/" # Location of package manifests + schedule: + interval: "weekly" \ No newline at end of file diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 00000000..d62e3abf --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,16 @@ +changelog: + exclude: + labels: + - ignore-for-release + authors: + - someuser + categories: + - title: Breaking Changes 🛠 + labels: + - breaking-change + - title: Exciting New Features 🎉 + labels: + - enhancement + - title: Other Changes + labels: + - "*" \ No newline at end of file diff --git a/.github/workflows/Android-CI-release.yml b/.github/workflows/Android-CI-release.yml new file mode 100644 index 00000000..c19673a3 --- /dev/null +++ b/.github/workflows/Android-CI-release.yml @@ -0,0 +1,56 @@ +name: Release + +on: + push: + tags: + - '*' + +jobs: + build: + name: Publish release + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Get the version + id: tagger + uses: jimschubert/query-tag-action@v2 + with: + skip-unshallow: 'true' + abbrev: false + commit-ish: HEAD + - name: Check pre-release + run: | + echo "tag=${{steps.tagger.outputs.tag}}" + if [[ ${{ steps.tagger.outputs.tag }} == *alpha* || ${{ steps.tagger.outputs.tag }} == *beta* ]] + then + prerelease=true + else + prerelease=false + fi + echo "PRE_RELEASE=$prerelease" >> $GITHUB_ENV + echo "prerelease=$prerelease" + - name: Install JDK ${{ matrix.java_version }} + uses: actions/setup-java@v3 + with: + distribution: 'adopt' + java-version: 11 + - name: Install Android SDK + uses: malinskiy/action-android/install-sdk@release/0.1.4 + - name: Build project + run: ./gradlew assembleRelease + env: + VERSION: ${{steps.tagger.outputs.tag}} + - name: Create Release + uses: softprops/action-gh-release@v1 + with: + tag_name: ${{steps.tagger.outputs.tag}} + prerelease: ${{ env.PRE_RELEASE }} + name: ${{steps.tagger.outputs.tag}} + generate_release_notes: true + files: | + ./libStream/build/outputs/aar/libStream*.aar + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml new file mode 100644 index 00000000..12db6309 --- /dev/null +++ b/.github/workflows/Android-CI.yml @@ -0,0 +1,35 @@ +name: CI + +on: + push: + branches: + - master + pull_request: + +jobs: + BuildTest: + name: Build and test JDK ${{ matrix.java_version }} + runs-on: macOS-latest + strategy: + matrix: + java_version: [11] + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install JDK ${{ matrix.java_version }} + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: ${{ matrix.java_version }} + - name: Install Android SDK + uses: malinskiy/action-android/install-sdk@release/0.1.2 + - name: Build project + run: ./gradlew assembleDebug +# - name: gradle check +# run: ./gradlew check +# - name: Archive Lint report +# uses: actions/upload-artifact@v3 +# if: ${{ always() }} +# with: +# name: Logcat-Lint-report +# path: sample/build/reports/lint-results*.html diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml new file mode 100644 index 00000000..6dfd6da5 --- /dev/null +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -0,0 +1,17 @@ +name: "Validate Gradle Wrapper" + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + validation: + name: "Validation" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: gradle/wrapper-validation-action@v1 diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml new file mode 100644 index 00000000..7192f323 --- /dev/null +++ b/.github/workflows/update-gradle-wrapper.yml @@ -0,0 +1,18 @@ +name: Update Gradle Wrapper + +on: + schedule: + - cron: "0 6 * * MON" + +jobs: + update-gradle-wrapper: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Update Gradle Wrapper + uses: gradle-update/update-gradle-wrapper-action@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + set-distribution-checksum: false diff --git a/.gitignore b/.gitignore index 12f6ddb2..9524e258 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,13 @@ -# built application files -*.apk -*.ap_ -*.dex -*.class -bin/ -gen/ -*.class -*.o -*.so -*.sh +*.iml +.gradle local.properties -custom_rules.xml -ant.properties -*~ \ No newline at end of file + +.idea/* +!.idea/codeStyles/ + +.DS_Store +build +captures + +.externalNativeBuild +.cxx diff --git a/.project b/.project deleted file mode 100644 index b3bcf810..00000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - libstreaming - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/AndroidManifest.xml b/AndroidManifest.xml deleted file mode 100644 index 9e2e14dc..00000000 --- a/AndroidManifest.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/README.md b/README.md index 21eb1997..8d738e07 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ * Android 4.0 or more recent is required. * Supported encoders include H.264, H.263, AAC and AMR. -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. +The first step you will need to achieve to start a net.majorkernelpanic.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. * 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). @@ -25,7 +25,7 @@ There are three ways on Android to get encoded data from the peripherals: ### 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**). +The **MediaRecorder** API was not intended for net.majorkernelpanic.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)) @@ -42,15 +42,15 @@ The **MediaCodec** API do not present the limitations I just mentionned, but has 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. +All the [**hw**](http://guigui.us/libstreaming/doc/net/majorkernelpanic/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/net.majorkernelpanic.streaming/hw/EncoderDebugger.html) class. -If streaming with that API fails, libstreaming fallbacks on streaming with the **MediaRecorder API**. +If net.majorkernelpanic.streaming with that API fails, libstreaming fallbacks on net.majorkernelpanic.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. +The [**gl**](http://guigui.us/libstreaming/doc/net/majorkernelpanic/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. +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/net.majorkernelpanic.streaming/MediaStream.html#setStreamingMethod(byte)) method. ### Packetization process @@ -65,7 +65,7 @@ If you are looking for a basic implementation of one of the RFC mentionned above 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. +The [**rtp**](http://guigui.us/libstreaming/doc/net/majorkernelpanic/net.majorkernelpanic.streaming/rtp/package-summary.html) package handles packetization of encoded data in RTP packets. # Using libstreaming in your app @@ -139,7 +139,7 @@ This example is extracted from [this simple android app](https://github.com/fyhe @Override public void onSessionError(int message, int streamType, Exception e) { - // Might happen if the streaming at the requested resolution is not supported + // Might happen if the net.majorkernelpanic.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); @@ -159,15 +159,15 @@ This example is extracted from [this simple android app](https://github.com/fyhe @Override public void surfaceDestroyed(SurfaceHolder holder) { - // Stops the streaming session + // Stops the net.majorkernelpanic.streaming session mSession.stop(); } ``` -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**. +The **SessionBuilder** simply facilitates the creation of **Session** objects. The call to **setSurfaceView** is needed for video net.majorkernelpanic.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, net.majorkernelpanic.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. +A **Session** object represents a net.majorkernelpanic.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. @@ -184,7 +184,7 @@ The method **getSessionDescription()** will return a SDP of the session in the f } Strinf sdp = mSession.getSessionDescription(); ... - // Blocks until streaming actually starts. + // Blocks until net.majorkernelpanic.streaming actually starts. try { mSession.syncStart(); } catch (Exception e) { @@ -203,7 +203,8 @@ Check out [this page of the wiki](https://github.com/fyhertz/libstreaming/wiki/U #### Add this to your manifest: ```xml - + + ``` If you decide to override **RtspServer** change the line above accordingly. @@ -239,5 +240,5 @@ context.stopService(new Intent(this,RtspServer.class)); # 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. +Visit [this github page](https://github.com/fyhertz/spydroid-ipcamera) to see how this net.majorkernelpanic.streaming stack can be used and how it performs. diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..6aaaf2a4 --- /dev/null +++ b/build.gradle @@ -0,0 +1,26 @@ +import org.gradle.internal.jvm.Jvm + +buildscript { + ext.kotlin_version = "1.6.20" + repositories { + google() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:7.1.3' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +println "Gradle uses Java ${Jvm.current()}" + +allprojects { + repositories { + google() + mavenCentral() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/build.xml b/build.xml deleted file mode 100644 index 7b3ed94b..00000000 --- a/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html index 647e7252..3ae5a876 100644 --- a/doc/allclasses-frame.html +++ b/doc/allclasses-frame.html @@ -12,46 +12,46 @@

All Classes

diff --git a/doc/allclasses-noframe.html b/doc/allclasses-noframe.html index 89a8ef5f..c8f784a2 100644 --- a/doc/allclasses-noframe.html +++ b/doc/allclasses-noframe.html @@ -12,46 +12,46 @@

All Classes

diff --git a/doc/constant-values.html b/doc/constant-values.html index 22c46765..5c9c4ef4 100644 --- a/doc/constant-values.html +++ b/doc/constant-values.html @@ -82,7 +82,7 @@

net.majorkernelpanic.*

@@ -359,7 +359,7 @@

MODE_MEDIACODEC_API

Raw audio/video will be encoded using the MediaCodec API with buffers.
See Also:
-
Constant Field Values
+
Constant Field Values
@@ -373,7 +373,7 @@

MODE_MEDIACODEC_API_2

Raw audio/video will be encoded using the MediaCode API with a surface.
See Also:
-
Constant Field Values
+
Constant Field Values
@@ -387,7 +387,7 @@

PIPE_API_LS

A LocalSocket will be used to feed the MediaRecorder object
See Also:
-
Constant Field Values
+
Constant Field Values
@@ -401,7 +401,7 @@

PIPE_API_PFD

A ParcelFileDescriptor will be used to feed the MediaRecorder object
See Also:
-
Constant Field Values
+
Constant Field Values
@@ -440,7 +440,7 @@

setDestinationAddress

Sets the destination IP address of the stream.
Specified by:
-
setDestinationAddress in interface Stream
+
setDestinationAddress in interface Stream
Parameters:
dest - The destination address of the stream
@@ -460,7 +460,7 @@

setDestinationPorts

number will be used for RTCP.
Specified by:
-
setDestinationPorts in interface Stream
+
setDestinationPorts in interface Stream
Parameters:
dport - The destination port
@@ -477,7 +477,7 @@

setDestinationPorts

Sets the destination ports of the stream.
Specified by:
-
setDestinationPorts in interface Stream
+
setDestinationPorts in interface Stream
Parameters:
rtpPort - Destination port that will be used for RTP
rtcpPort - Destination port that will be used for RTCP
@@ -497,7 +497,7 @@

setOutputStream

be specified with this method.
Specified by:
-
setOutputStream in interface Stream
+
setOutputStream in interface Stream
@@ -512,7 +512,7 @@

setTimeToLive

Sets the Time To Live of packets sent over the network.
Specified by:
-
setTimeToLive in interface Stream
+
setTimeToLive in interface Stream
Parameters:
ttl - The time to live
Throws:
@@ -531,7 +531,7 @@

getDestinationPorts

one used for RTP and the second one is used for RTCP.
Specified by:
-
getDestinationPorts in interface Stream
+
getDestinationPorts in interface Stream
@@ -546,7 +546,7 @@

getLocalPorts

one used for RTP and the second one is used for RTCP.
Specified by:
-
getLocalPorts in interface Stream
+
getLocalPorts in interface Stream
@@ -557,19 +557,19 @@

getLocalPorts

  • setStreamingMethod

    public void setStreamingMethod(byte mode)
    -
    Sets the streaming method that will be used. +
    Sets the net.majorkernelpanic.streaming method that will be used. - If the mode is set to MODE_MEDIARECORDER_API, raw audio/video will be encoded + If the mode is set to MODE_MEDIARECORDER_API, raw audio/video will be encoded using the MediaRecorder API.
    - If the mode is set to MODE_MEDIACODEC_API or to MODE_MEDIACODEC_API_2, + If the mode is set to MODE_MEDIACODEC_API or to MODE_MEDIACODEC_API_2, audio/video will be encoded with using the MediaCodec.
    - The MODE_MEDIACODEC_API_2 mode only concerns VideoStream, it makes + The MODE_MEDIACODEC_API_2 mode only concerns VideoStream, it makes use of the createInputSurface() method of the MediaCodec API (Android 4.3 is needed there).
    Parameters:
    -
    mode - Can be MODE_MEDIARECORDER_API, MODE_MEDIACODEC_API or MODE_MEDIACODEC_API_2
    +
    mode - Can be MODE_MEDIARECORDER_API, MODE_MEDIACODEC_API or MODE_MEDIACODEC_API_2
    • @@ -580,8 +580,8 @@

    setStreamingMethod

  • getStreamingMethod

    public byte getStreamingMethod()
    -
    Returns the streaming method in use, call this after - configure() to get an accurate response.
    +
    Returns the net.majorkernelpanic.streaming method in use, call this after + configure() to get an accurate response.
    • @@ -590,8 +590,8 @@

    getStreamingMethod

     @@ -619,12 +619,12 @@

    getBitrate

  • isStreaming

    public boolean isStreaming()
    -
    Indicates if the MediaStream is streaming.
    +
    Indicates if the MediaStream is net.majorkernelpanic.streaming.
    Specified by:
    -
    isStreaming in interface Stream
    +
    isStreaming in interface Stream
    Returns:
    -
    A boolean indicating if the MediaStream is streaming
    +
    A boolean indicating if the MediaStream is net.majorkernelpanic.streaming
    • @@ -638,12 +638,12 @@

    configure

    throws java.lang.IllegalStateException, java.io.IOException
    Configures the stream with the settings supplied with - VideoStream.setVideoQuality(net.majorkernelpanic.streaming.video.VideoQuality) - for a VideoStream and AudioStream.setAudioQuality(net.majorkernelpanic.streaming.audio.AudioQuality) - for a AudioStream.
    + VideoStream.setVideoQuality(net.majorkernelpanic.net.majorkernelpanic.streaming.video.VideoQuality) + for a VideoStream and AudioStream.setAudioQuality(net.majorkernelpanic.net.majorkernelpanic.streaming.audio.AudioQuality) + for a AudioStream.
    Specified by:
    -
    configure in interface Stream
    +
    configure in interface Stream
    Throws:
    java.lang.IllegalStateException
    java.io.IOException
    @@ -662,7 +662,7 @@

    start

    Starts the stream.
    Specified by:
    -
    start in interface Stream
    +
    start in interface Stream
    Throws:
    java.lang.IllegalStateException
    java.io.IOException
    @@ -679,7 +679,7 @@

    stop

    Stops the stream.
    Specified by:
    -
    stop in interface Stream
    +
    stop in interface Stream
    @@ -691,12 +691,12 @@

    stop

    getSessionDescription

    public abstract java.lang.String getSessionDescription()
    Returns a description of the stream using SDP. - This method can only be called after Stream.configure().
    + This method can only be called after Stream.configure().
    Specified by:
    -
    getSessionDescription in interface Stream
    +
    getSessionDescription in interface Stream
    Throws:
    -
    java.lang.IllegalStateException - Thrown when Stream.configure() was not called.
    +
    java.lang.IllegalStateException - Thrown when Stream.configure() was not called.
    @@ -707,10 +707,10 @@

    getSessionDescription

  • getSSRC

    public int getSSRC()
    -
    Returns the SSRC of the underlying RtpSocket.
    +
    Returns the SSRC of the underlying RtpSocket.
    Specified by:
    -
    getSSRC in interface Stream
    +
    getSSRC in interface Stream
    Returns:
    the SSRC of the stream
    @@ -744,10 +744,10 @@

    getSSRC

    @@ -211,11 +211,11 @@

    onSessionError

  • onPreviewStarted

    void onPreviewStarted()
    -
    Called when the previw of the VideoStream +
    Called when the previw of the VideoStream has correctly been started. If an error occurs while starting the preview, - onSessionError(int, int, Exception) will be - called instead of onPreviewStarted().
    + onSessionError(int, int, Exception) will be + called instead of onPreviewStarted().
    • @@ -226,10 +226,10 @@

    onPreviewStarted

    onSessionConfigured

    void onSessionConfigured()
    Called when the session has correctly been configured - after calling Session.configure(). - If an error occurs while configuring the Session, - onSessionError(int, int, Exception) will be - called instead of onSessionConfigured().
    + after calling Session.configure(). + If an error occurs while configuring the Session, + onSessionError(int, int, Exception) will be + called instead of onSessionConfigured(). @@ -240,9 +240,9 @@

    onSessionConfigured

    onSessionStarted

    void onSessionStarted()
    Called when the streams of the session have correctly been started. - If an error occurs while starting the Session, - onSessionError(int, int, Exception) will be - called instead of onSessionStarted().
    + If an error occurs while starting the Session, + onSessionError(int, int, Exception) will be + called instead of onSessionStarted(). @@ -282,11 +282,11 @@

    onSessionStopped

    @@ -110,19 +110,19 @@

    Class Session


    public class Session
 extends java.lang.Object
    -
    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 + It holds a VideoStream and a AudioStream together and provides synchronous and asynchronous functions to start and stop those steams. - You should implement a callback interface Session.Callback to receive notifications and error reports.
    + You should implement a callback interface Session.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 RtspClient. + If you want to stream to a RTSP server, you will need an instance of this class and hand it to a RtspClient. If you don't use the RTSP protocol, you will still need to send a session description to the receiver for him to be able to decode your audio/video streams. You can obtain this session description by calling - configure() or syncConfigure() to configure the session with its parameters - (audio samplingrate, video resolution) and then getSessionDescription().
    + configure() or syncConfigure() to configure the session with its parameters + (audio samplingrate, video resolution) and then getSessionDescription().
    See the example 2 here: https://github.com/fyhertz/libstreaming-examples to see an example of how to get a SDP.
    @@ -149,7 +149,7 @@

    Nested Class Summary

    static interface  -Session.Callback +Session.Callback
    The callback interface you need to implement to get some feedback Those will be called from the UI thread.
    @@ -171,57 +171,57 @@

    Field Summary

    static int -ERROR_CAMERA_ALREADY_IN_USE +ERROR_CAMERA_ALREADY_IN_USE
    Some app is already using a camera (Camera.open() has failed).
    static int -ERROR_CAMERA_HAS_NO_FLASH +ERROR_CAMERA_HAS_NO_FLASH
    The phone has no flash.
    static int -ERROR_CONFIGURATION_NOT_SUPPORTED -
    The phone may not support some streaming parameters that you are trying to use (bit rate, frame rate, resolution...).
    +ERROR_CONFIGURATION_NOT_SUPPORTED +
    The phone may not support some net.majorkernelpanic.streaming parameters that you are trying to use (bit rate, frame rate, resolution...).
    static int -ERROR_INVALID_SURFACE +ERROR_INVALID_SURFACE
    The supplied SurfaceView is not a valid surface, or has not been created yet.
    static int -ERROR_OTHER +ERROR_OTHER
    Some other error occurred !
    static int -ERROR_STORAGE_NOT_READY +ERROR_STORAGE_NOT_READY
    The internal storage of the phone is not ready.
    static int -ERROR_UNKNOWN_HOST -
    The destination set with setDestination(String) could not be resolved.
    +ERROR_UNKNOWN_HOST +
    The destination set with setDestination(String) could not be resolved.
    static int -STREAM_AUDIO  +STREAM_AUDIO  static int -STREAM_VIDEO  +STREAM_VIDEO  static java.lang.String -TAG  +TAG  @@ -238,8 +238,8 @@

    Constructor Summary

    Constructor and Description -Session() -
    Creates a streaming session that can be customized by adding tracks.
    +Session() +
    Creates a net.majorkernelpanic.streaming session that can be customized by adding tracks.
    @@ -259,180 +259,180 @@

    Method Summary

    void -configure() +configure()
    Configures all streams of the session.
    -AudioStream -getAudioTrack() -
    Returns the underlying AudioStream used by the Session.
    +AudioStream +getAudioTrack() +
    Returns the underlying AudioStream used by the Session.
    long -getBitrate() +getBitrate()
    Returns an approximation of the bandwidth consumed by the session in bit per second.
    -Session.Callback -getCallback() -
    Returns the Session.Callback interface that was set with - setCallback(Callback) or null if none was set.
    +Session.Callback +getCallback() +
    Returns the Session.Callback interface that was set with + setCallback(Callback) or null if none was set.
    int -getCamera() +getCamera()
    Returns the id of the camera currently selected.
    java.lang.String -getDestination() -
    Returns the destination set with setDestination(String).
    +getDestination() +
    Returns the destination set with setDestination(String).
    java.lang.String -getSessionDescription() +getSessionDescription()
    Returns a Session Description that can be stored in a file or sent to a client with RTSP.
    -Stream -getTrack(int id)  +Stream +getTrack(int id)  -VideoStream -getVideoTrack() -
    Returns the underlying VideoStream used by the Session.
    +VideoStream +getVideoTrack() +
    Returns the underlying VideoStream used by the Session.
    boolean -isStreaming() +isStreaming()
    Indicates if a track is currently running.
    void -release() +release()
    Deletes all existing tracks & release associated resources.
    void -setAudioQuality(AudioQuality quality) +setAudioQuality(AudioQuality quality)
    Sets the configuration of the stream.
    void -setCallback(Session.Callback callback) -
    Sets the callback interface that will be called by the Session.
    +setCallback(Session.Callback callback) +
    Sets the callback interface that will be called by the Session.
    void -setDestination(java.lang.String destination) +setDestination(java.lang.String destination)
    The destination address for all the streams of the session.
    void -setOrigin(java.lang.String origin) +setOrigin(java.lang.String origin)
    The origin address of the session.
    void -setPreviewOrientation(int orientation) +setPreviewOrientation(int orientation)
    Sets the orientation of the preview.
    void -setSurfaceView(SurfaceView view) +setSurfaceView(SurfaceView view)
    Sets a Surface to show a preview of recorded media (video).
    void -setTimeToLive(int ttl) +setTimeToLive(int ttl)
    Set the TTL of all packets sent during the session.
    void -setVideoQuality(VideoQuality quality) +setVideoQuality(VideoQuality quality)
    Sets the configuration of the stream.
    void -start() +start()
    Asynchronously starts all streams of the session.
    void -startPreview() +startPreview()
    Asynchronously starts the camera preview.
    void -stop() +stop()
    Stops all existing streams.
    void -stopPreview() +stopPreview()
    Asynchronously stops the camera preview.
    void -switchCamera() +switchCamera()
    Switch between the front facing and the back facing camera of the phone.
    void -syncConfigure() -
    Does the same thing as configure(), but in a synchronous manner.
    +syncConfigure() +
    Does the same thing as configure(), but in a synchronous manner.
    void -syncStart() -
    Does the same thing as start(), but in a synchronous manner.
    +syncStart() +
    Does the same thing as start(), but in a synchronous manner.
    void -syncStart(int id) +syncStart(int id)
    Starts a stream in a synchronous manner.
    void -syncStop() +syncStop()
    Stops all existing streams in a synchronous manner.
    void -toggleFlash() +toggleFlash()
    Toggles the LED of the phone if it has one.
    boolean -trackExists(int id)  +trackExists(int id)  @@ -478,7 +478,7 @@

    STREAM_VIDEO

    public static final int STREAM_VIDEO
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    @@ -491,7 +491,7 @@

    STREAM_AUDIO

    public static final int STREAM_AUDIO
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    @@ -505,7 +505,7 @@

    ERROR_CAMERA_ALREADY_IN_USE

    Some app is already using a camera (Camera.open() has failed).
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    @@ -516,10 +516,10 @@

    ERROR_CAMERA_ALREADY_IN_USE

  • ERROR_CONFIGURATION_NOT_SUPPORTED

    public static final int ERROR_CONFIGURATION_NOT_SUPPORTED
    -
    The phone may not support some streaming parameters that you are trying to use (bit rate, frame rate, resolution...).
    +
    The phone may not support some net.majorkernelpanic.streaming parameters that you are trying to use (bit rate, frame rate, resolution...).
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    • @@ -535,7 +535,7 @@

    ERROR_STORAGE_NOT_READY

    See H264Stream and AACStream to find out why libstreaming would want to something like that.
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    @@ -549,7 +549,7 @@

    ERROR_CAMERA_HAS_NO_FLASH

    The phone has no flash.
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    @@ -563,7 +563,7 @@

    ERROR_INVALID_SURFACE

    The supplied SurfaceView is not a valid surface, or has not been created yet.
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    @@ -574,12 +574,12 @@

    ERROR_INVALID_SURFACE

  • ERROR_UNKNOWN_HOST

    public static final int ERROR_UNKNOWN_HOST
    -
    The destination set with setDestination(String) could not be resolved. +
    The destination set with setDestination(String) could not be resolved. May mean that the phone has no access to the internet, or that the DNS server could not resolved the host name.
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    • @@ -593,7 +593,7 @@

    ERROR_OTHER

    Some other error occurred !
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    @@ -612,7 +612,7 @@

    Constructor Detail

  • Session

    public Session()
    -
    Creates a streaming session that can be customized by adding tracks.
    +
    Creates a net.majorkernelpanic.streaming session that can be customized by adding tracks.
    • @@ -629,8 +629,8 @@

    Method Detail

    @@ -639,21 +639,21 @@

    getAudioTrack

     - +

    • setCallback

      -
      public void setCallback(Session.Callback callback)
      -
      Sets the callback interface that will be called by the Session.
      +
      public void setCallback(Session.Callback callback)
      +
      Sets the callback interface that will be called by the Session.
      Parameters:
      -
      callback - The implementation of the Session.Callback interface
      +
      callback - The implementation of the Session.Callback interface
    @@ -702,32 +702,32 @@

    setTimeToLive

    - +

    • setVideoQuality

      -
      public void setVideoQuality(VideoQuality quality)
      +
      public void setVideoQuality(VideoQuality quality)
      Sets the configuration of the stream.
      You can call this method at any time and changes will take - effect next time you call configure().
      + effect next time you call configure().
      Parameters:
      quality - Quality of the stream
    - +

    • setSurfaceView

      -
      public void setSurfaceView(SurfaceView view)
      +
      public void setSurfaceView(SurfaceView view)
      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 start() or startPreview().
      + effect next time you call start() or startPreview().
    @@ -739,23 +739,23 @@

    setPreviewOrientation

    public void setPreviewOrientation(int orientation)
    Sets the orientation of the preview.
    You can call this method at any time and changes will take - effect next time you call     configure().
    + effect next time you call configure().
    Parameters:
    orientation - The orientation of the preview
    - + @@ -796,7 +796,7 @@

    getSessionDescription

  • getDestination

    public java.lang.String getDestination()
    -
    Returns the destination set with setDestination(String).
    +
    Returns the destination set with setDestination(String).
    • @@ -836,22 +836,22 @@

    configure

  • syncConfigure

    public void syncConfigure()
-                   throws CameraInUseException,
-                          StorageUnavailableException,
-                          ConfNotSupportedException,
-                          InvalidSurfaceException,
+                   throws CameraInUseException,
+                          StorageUnavailableException,
+                          ConfNotSupportedException,
+                          InvalidSurfaceException,
                           java.lang.RuntimeException,
                           java.io.IOException
    -
    Does the same thing as configure(), but in a synchronous manner.
    +
    Does the same thing as configure(), but in a synchronous manner.
    Throws exceptions in addition to calling a callback - Session.Callback.onSessionError(int, int, Exception) when + Session.Callback.onSessionError(int, int, Exception) when an error occurs.
    Throws:
    -
    CameraInUseException
    -
    StorageUnavailableException
    -
    ConfNotSupportedException
    -
    InvalidSurfaceException
    +
    CameraInUseException
    +
    StorageUnavailableException
    +
    ConfNotSupportedException
    +
    InvalidSurfaceException
    java.lang.RuntimeException
    java.io.IOException
    @@ -874,10 +874,10 @@

    start

  • syncStart

    public void syncStart(int id)
-               throws CameraInUseException,
-                      StorageUnavailableException,
-                      ConfNotSupportedException,
-                      InvalidSurfaceException,
+               throws CameraInUseException,
+                      StorageUnavailableException,
+                      ConfNotSupportedException,
+                      InvalidSurfaceException,
                       java.net.UnknownHostException,
                       java.io.IOException
    Starts a stream in a synchronous manner.
    @@ -886,10 +886,10 @@

    syncStart

    Parameters:
    id - The id of the stream to start
    Throws:
    -
    CameraInUseException
    -
    StorageUnavailableException
    -
    ConfNotSupportedException
    -
    InvalidSurfaceException
    +
    CameraInUseException
    +
    StorageUnavailableException
    +
    ConfNotSupportedException
    +
    InvalidSurfaceException
    java.net.UnknownHostException
    java.io.IOException
    • @@ -902,20 +902,20 @@

    syncStart

  • syncStart

    public void syncStart()
-               throws CameraInUseException,
-                      StorageUnavailableException,
-                      ConfNotSupportedException,
-                      InvalidSurfaceException,
+               throws CameraInUseException,
+                      StorageUnavailableException,
+                      ConfNotSupportedException,
+                      InvalidSurfaceException,
                       java.net.UnknownHostException,
                       java.io.IOException
    -
    Does the same thing as start(), but in a synchronous manner.
    +
    Does the same thing as start(), but in a synchronous manner.
    Throws exceptions in addition to calling a callback.
    Throws:
    -
    CameraInUseException
    -
    StorageUnavailableException
    -
    ConfNotSupportedException
    -
    InvalidSurfaceException
    +
    CameraInUseException
    +
    StorageUnavailableException
    +
    ConfNotSupportedException
    +
    InvalidSurfaceException
    java.net.UnknownHostException
    java.io.IOException
    @@ -949,9 +949,9 @@

    syncStop

    startPreview

    public void startPreview()
    Asynchronously starts the camera preview.
    - You should of course pass a SurfaceView to setSurfaceView(SurfaceView) - before calling this method. Otherwise, the Session.Callback.onSessionError(int, int, Exception) - callback will be called with ERROR_INVALID_SURFACE.
    + You should of course pass a SurfaceView to setSurfaceView(SurfaceView) + before calling this method. Otherwise, the Session.Callback.onSessionError(int, int, Exception) + callback will be called with ERROR_INVALID_SURFACE.
    • @@ -972,9 +972,9 @@

    stopPreview

    switchCamera

    public void switchCamera()
    Switch between the front facing and the back facing camera of the phone.
    - If     startPreview() has been called, the preview will be briefly interrupted.
    - If start() has been called, the stream will be briefly interrupted.
    - To find out which camera is currently selected, use getCamera()
    + If startPreview() has been called, the preview will be briefly interrupted.
    + If start() has been called, the stream will be briefly interrupted.
    + To find out which camera is currently selected, use getCamera() @@ -998,7 +998,7 @@

    toggleFlash

    public void toggleFlash()
    Toggles the LED of the phone if it has one. You can get the current state of the flash with - getVideoTrack() and VideoStream.getFlashState().
    + getVideoTrack() and VideoStream.getFlashState(). @@ -1026,7 +1026,7 @@

    trackExists

     @@ -1056,11 +1056,11 @@

    getTrack

    @@ -110,7 +110,7 @@

    Class SessionBuilder


    public class SessionBuilder
 extends java.lang.Object
    -
    Call getInstance() to get access to the SessionBuilder.
    +
    Call getInstance() to get access to the SessionBuilder.
    @@ -131,42 +131,42 @@

    Field Summary

    static int -AUDIO_AAC -
    Can be used with setAudioEncoder(int).
    +AUDIO_AAC +
    Can be used with setAudioEncoder(int).
    static int -AUDIO_AMRNB -
    Can be used with setAudioEncoder(int).
    +AUDIO_AMRNB +
    Can be used with setAudioEncoder(int).
    static int -AUDIO_NONE -
    Can be used with setAudioEncoder(int).
    +AUDIO_NONE +
    Can be used with setAudioEncoder(int).
    static java.lang.String -TAG  +TAG  static int -VIDEO_H263 -
    Can be used with setVideoEncoder(int).
    +VIDEO_H263 +
    Can be used with setVideoEncoder(int).
    static int -VIDEO_H264 -
    Can be used with setVideoEncoder(int).
    +VIDEO_H264 +
    Can be used with setVideoEncoder(int).
    static int -VIDEO_NONE -
    Can be used with setVideoEncoder(int).
    +VIDEO_NONE +
    Can be used with setVideoEncoder(int).
    @@ -185,156 +185,156 @@

    Method Summary

    Method and Description -Session -build() -
    Creates a new Session.
    +Session +build() +
    Creates a new Session.
    -SessionBuilder -clone() -
    Returns a new SessionBuilder with the same configuration.
    +SessionBuilder +clone() +
    Returns a new SessionBuilder with the same configuration.
    int -getAudioEncoder() -
    Returns the audio encoder set with setAudioEncoder(int).
    +getAudioEncoder() +
    Returns the audio encoder set with setAudioEncoder(int).
    -AudioQuality -getAudioQuality() -
    Returns the AudioQuality set with setAudioQuality(AudioQuality).
    +AudioQuality +getAudioQuality() +
    Returns the AudioQuality set with setAudioQuality(AudioQuality).
    int -getCamera() -
    Returns the id of the android.hardware.Camera set with setCamera(int).
    +getCamera() +
    Returns the id of the android.hardware.Camera set with setCamera(int).
    Context -getContext() -
    Returns the context set with setContext(Context)
    +getContext() +
    Returns the context set with setContext(Context)
    java.lang.String -getDestination() -
    Returns the destination ip address set with setDestination(String).
    +getDestination() +
    Returns the destination ip address set with setDestination(String).
    boolean -getFlashState() -
    Returns the flash state set with setFlashEnabled(boolean).
    +getFlashState() +
    Returns the flash state set with setFlashEnabled(boolean).
    -static SessionBuilder -getInstance() -
    Returns a reference to the SessionBuilder.
    +static SessionBuilder +getInstance() +
    Returns a reference to the SessionBuilder.
    java.lang.String -getOrigin() -
    Returns the origin ip address set with setOrigin(String).
    +getOrigin() +
    Returns the origin ip address set with setOrigin(String).
    -SurfaceView -getSurfaceView() -
    Returns the SurfaceView set with setSurfaceView(SurfaceView).
    +SurfaceView +getSurfaceView() +
    Returns the SurfaceView set with setSurfaceView(SurfaceView).
    int -getTimeToLive() -
    Returns the time to live set with setTimeToLive(int).
    +getTimeToLive() +
    Returns the time to live set with setTimeToLive(int).
    int -getVideoEncoder() -
    Returns the video encoder set with setVideoEncoder(int).
    +getVideoEncoder() +
    Returns the video encoder set with setVideoEncoder(int).
    -VideoQuality -getVideoQuality() -
    Returns the VideoQuality set with setVideoQuality(VideoQuality).
    +VideoQuality +getVideoQuality() +
    Returns the VideoQuality set with setVideoQuality(VideoQuality).
    -SessionBuilder -setAudioEncoder(int encoder) +SessionBuilder +setAudioEncoder(int encoder)
    Sets the audio encoder.
    -SessionBuilder -setAudioQuality(AudioQuality quality) +SessionBuilder +setAudioQuality(AudioQuality quality)
    Sets the audio quality.
    -SessionBuilder -setCallback(Session.Callback callback)  +SessionBuilder +setCallback(Session.Callback callback)  -SessionBuilder -setCamera(int camera)  +SessionBuilder +setCamera(int camera)  -SessionBuilder -setContext(Context context) +SessionBuilder +setContext(Context context)
    Access to the context is needed for the H264Stream class to store some stuff in the SharedPreferences.
    -SessionBuilder -setDestination(java.lang.String destination) +SessionBuilder +setDestination(java.lang.String destination)
    Sets the destination of the session.
    -SessionBuilder -setFlashEnabled(boolean enabled)  +SessionBuilder +setFlashEnabled(boolean enabled)  -SessionBuilder -setOrigin(java.lang.String origin) +SessionBuilder +setOrigin(java.lang.String origin)
    Sets the origin of the session.
    -SessionBuilder -setPreviewOrientation(int orientation) +SessionBuilder +setPreviewOrientation(int orientation)
    Sets the orientation of the preview.
    -SessionBuilder -setSurfaceView(SurfaceView surfaceView) +SessionBuilder +setSurfaceView(SurfaceView surfaceView)
    Sets the SurfaceView required to preview the video stream.
    -SessionBuilder -setTimeToLive(int ttl)  +SessionBuilder +setTimeToLive(int ttl)  -SessionBuilder -setVideoEncoder(int encoder) +SessionBuilder +setVideoEncoder(int encoder)
    Sets the default video encoder.
    -SessionBuilder -setVideoQuality(VideoQuality quality) +SessionBuilder +setVideoQuality(VideoQuality quality)
    Sets the video stream quality.
    @@ -369,7 +369,7 @@

    TAG

    public static final java.lang.String TAG
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    @@ -380,10 +380,10 @@

    TAG

  • VIDEO_NONE

    public static final int VIDEO_NONE
    -
    Can be used with setVideoEncoder(int).
    +
    Can be used with setVideoEncoder(int).
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    • @@ -394,10 +394,10 @@

    VIDEO_NONE

  • VIDEO_H264

    public static final int VIDEO_H264
    -
    Can be used with setVideoEncoder(int).
    +
    Can be used with setVideoEncoder(int).
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    • @@ -408,10 +408,10 @@

    VIDEO_H264

  • VIDEO_H263

    public static final int VIDEO_H263
    -
    Can be used with setVideoEncoder(int).
    +
    Can be used with setVideoEncoder(int).
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    • @@ -422,10 +422,10 @@

    VIDEO_H263

  • AUDIO_NONE

    public static final int AUDIO_NONE
    -
    Can be used with setAudioEncoder(int).
    +
    Can be used with setAudioEncoder(int).
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    • @@ -436,10 +436,10 @@

    AUDIO_NONE

  • AUDIO_AMRNB

    public static final int AUDIO_AMRNB
    -
    Can be used with setAudioEncoder(int).
    +
    Can be used with setAudioEncoder(int).
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    • @@ -450,10 +450,10 @@

    AUDIO_AMRNB

  • AUDIO_AAC

    public static final int AUDIO_AAC
    -
    Can be used with setAudioEncoder(int).
    +
    Can be used with setAudioEncoder(int).
    See Also:
    -
    Constant Field Values
    +
    Constant Field Values
    • @@ -471,11 +471,11 @@

    Method Detail

    @@ -485,8 +485,8 @@

    getInstance

    @@ -653,7 +653,7 @@

    getDestination

  • getOrigin

    public java.lang.String getOrigin()
    -
    Returns the origin ip address set with setOrigin(String).
    +
    Returns the origin ip address set with setOrigin(String).
    • @@ -663,7 +663,7 @@

    getOrigin

  • getAudioEncoder

    public int getAudioEncoder()
    -
    Returns the audio encoder set with setAudioEncoder(int).
    +
    Returns the audio encoder set with setAudioEncoder(int).
    • @@ -673,7 +673,7 @@

    getAudioEncoder

  • getCamera

    public int getCamera()
    -
    Returns the id of the android.hardware.Camera set with setCamera(int).
    +
    Returns the id of the android.hardware.Camera set with setCamera(int).
    • @@ -683,7 +683,7 @@

    getCamera

  • getVideoEncoder

    public int getVideoEncoder()
    -
    Returns the video encoder set with setVideoEncoder(int).
    +
    Returns the video encoder set with setVideoEncoder(int).
    • @@ -692,8 +692,8 @@

    getVideoEncoder

     @@ -702,8 +702,8 @@

    getVideoQuality

     @@ -713,7 +713,7 @@

    getAudioQuality

  • getFlashState

    public boolean getFlashState()
    -
    Returns the flash state set with setFlashEnabled(boolean).
    +
    Returns the flash state set with setFlashEnabled(boolean).
    • @@ -722,8 +722,8 @@

    getFlashState

     @@ -733,7 +733,7 @@

    getSurfaceView

  • getTimeToLive

    public int getTimeToLive()
    -
    Returns the time to live set with setTimeToLive(int).
    +
    Returns the time to live set with setTimeToLive(int).
    • @@ -742,8 +742,8 @@

    getTimeToLive

     @@ -399,14 +399,14 @@

    getSessionDescription

    public java.lang.String getSessionDescription()
                                        throws java.lang.IllegalStateException
    Returns a description of the stream using SDP. It can then be included in an SDP file. - Will fail if called when streaming.
    + Will fail if called when net.majorkernelpanic.streaming.
    Specified by:
    -
    getSessionDescription in interface Stream
    +
    getSessionDescription in interface Stream
    Specified by:
    -
    getSessionDescription in class MediaStream
    +
    getSessionDescription in class MediaStream
    Throws:
    -
    java.lang.IllegalStateException - Thrown when Stream.configure() was not called.
    +
    java.lang.IllegalStateException - Thrown when Stream.configure() was not called.
    @@ -438,10 +438,10 @@

    getSessionDescription

    @@ -162,7 +162,7 @@

    Constructor Summary

    Constructor and Description -AMRNBStream()  +AMRNBStream()  @@ -181,39 +181,39 @@

    Method Summary

    void -configure() +configure()
    Configures the stream with the settings supplied with - VideoStream.setVideoQuality(net.majorkernelpanic.streaming.video.VideoQuality) - for a VideoStream and AudioStream.setAudioQuality(net.majorkernelpanic.streaming.audio.AudioQuality) - for a AudioStream.
    + VideoStream.setVideoQuality(net.majorkernelpanic.net.majorkernelpanic.streaming.video.VideoQuality) + for a VideoStream and AudioStream.setAudioQuality(net.majorkernelpanic.net.majorkernelpanic.streaming.audio.AudioQuality) + for a AudioStream.
    java.lang.String -getSessionDescription() +getSessionDescription()
    Returns a description of the stream using SDP.
    void -start() +start()
    Starts the stream.
    @@ -342,11 +342,11 @@

    getSessionDescription

    @@ -131,17 +131,17 @@

    Field Summary

    int -bitRate  +bitRate  -static AudioQuality -DEFAULT_AUDIO_QUALITY +static AudioQuality +DEFAULT_AUDIO_QUALITY
    Default audio stream quality.
    int -samplingRate  +samplingRate  @@ -158,12 +158,12 @@

    Constructor Summary

    Constructor and Description -AudioQuality() +AudioQuality()
    Represents a quality for a video stream.
    -AudioQuality(int samplingRate, +AudioQuality(int samplingRate, int bitRate)
    Represents a quality for an audio stream.
    @@ -184,16 +184,16 @@

    Method Summary

    Method and Description -AudioQuality -clone()  +AudioQuality +clone()  boolean -equals(AudioQuality quality)  +equals(AudioQuality quality)  -static AudioQuality -parseQuality(java.lang.String str)  +static AudioQuality +parseQuality(java.lang.String str) 
    @@ -137,11 +137,11 @@

    Class AudioStream

    Field Summary

    @@ -157,7 +157,7 @@

    Constructor Summary

    Constructor and Description -AudioStream()  +AudioStream()  @@ -175,26 +175,26 @@

    Method Summary

    Method and Description -AudioQuality -getAudioQuality() +AudioQuality +getAudioQuality()
    Returns the quality of the stream.
    void -setAudioQuality(AudioQuality quality)  +setAudioQuality(AudioQuality quality)  void -setAudioSource(int audioSource)  +setAudioSource(int audioSource)  - +

    • setAudioQuality

      -
      public void setAudioQuality(AudioQuality quality)
      +
      public void setAudioQuality(AudioQuality quality)
    @@ -258,7 +258,7 @@

    setAudioQuality

     @@ -289,11 +289,11 @@

    getAudioQuality