diff --git a/README.md b/README.md index 4a08e421..b5f7921d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ * 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 phones camera and microphone. +* libstreaming also features a RTSP server for easy remote control of the phone camera and microphone. The full javadoc documentation of the API is available here: http://libstreaming.majorkernelpanic.net/ @@ -57,7 +57,7 @@ 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**). 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 **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. **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. diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html index 686ddf16..be734996 100644 --- a/doc/allclasses-frame.html +++ b/doc/allclasses-frame.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/doc/allclasses-noframe.html b/doc/allclasses-noframe.html index 24723439..fec0f5cb 100644 --- a/doc/allclasses-noframe.html +++ b/doc/allclasses-noframe.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/doc/constant-values.html b/doc/constant-values.html index 0500e6b5..442f0580 100644 --- a/doc/constant-values.html +++ b/doc/constant-values.html @@ -2,12 +2,12 @@ - + Constant Field Values - + diff --git a/doc/deprecated-list.html b/doc/deprecated-list.html index a918bef1..0ba5254d 100644 --- a/doc/deprecated-list.html +++ b/doc/deprecated-list.html @@ -2,12 +2,12 @@ - + Deprecated List - + diff --git a/doc/help-doc.html b/doc/help-doc.html index 0098a08b..1098a290 100644 --- a/doc/help-doc.html +++ b/doc/help-doc.html @@ -2,12 +2,12 @@ - + API Help - + diff --git a/doc/index-all.html b/doc/index-all.html index f7ee9437..67342cf5 100644 --- a/doc/index-all.html +++ b/doc/index-all.html @@ -2,12 +2,12 @@ - + Index - + diff --git a/doc/index.html b/doc/index.html index 78ba6f65..67dffcf5 100644 --- a/doc/index.html +++ b/doc/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) diff --git a/doc/net/majorkernelpanic/streaming/MediaStream.html b/doc/net/majorkernelpanic/streaming/MediaStream.html index 7ee58c8b..c60e3723 100644 --- a/doc/net/majorkernelpanic/streaming/MediaStream.html +++ b/doc/net/majorkernelpanic/streaming/MediaStream.html @@ -2,12 +2,12 @@ - + MediaStream - + diff --git a/doc/net/majorkernelpanic/streaming/Session.html b/doc/net/majorkernelpanic/streaming/Session.html index 5e43335e..c3b78154 100644 --- a/doc/net/majorkernelpanic/streaming/Session.html +++ b/doc/net/majorkernelpanic/streaming/Session.html @@ -2,12 +2,12 @@ - + Session - + diff --git a/doc/net/majorkernelpanic/streaming/SessionBuilder.html b/doc/net/majorkernelpanic/streaming/SessionBuilder.html index 405514a1..036d2418 100644 --- a/doc/net/majorkernelpanic/streaming/SessionBuilder.html +++ b/doc/net/majorkernelpanic/streaming/SessionBuilder.html @@ -2,12 +2,12 @@ - + SessionBuilder - + diff --git a/doc/net/majorkernelpanic/streaming/Stream.html b/doc/net/majorkernelpanic/streaming/Stream.html index 7cf4408f..1f90dce6 100644 --- a/doc/net/majorkernelpanic/streaming/Stream.html +++ b/doc/net/majorkernelpanic/streaming/Stream.html @@ -2,12 +2,12 @@ - + Stream - + diff --git a/doc/net/majorkernelpanic/streaming/audio/AACStream.html b/doc/net/majorkernelpanic/streaming/audio/AACStream.html index 03e73d7a..b0648d54 100644 --- a/doc/net/majorkernelpanic/streaming/audio/AACStream.html +++ b/doc/net/majorkernelpanic/streaming/audio/AACStream.html @@ -2,12 +2,12 @@ - + AACStream - + diff --git a/doc/net/majorkernelpanic/streaming/audio/AMRNBStream.html b/doc/net/majorkernelpanic/streaming/audio/AMRNBStream.html index c26386ab..0a44156a 100644 --- a/doc/net/majorkernelpanic/streaming/audio/AMRNBStream.html +++ b/doc/net/majorkernelpanic/streaming/audio/AMRNBStream.html @@ -2,12 +2,12 @@ - + AMRNBStream - + diff --git a/doc/net/majorkernelpanic/streaming/audio/AudioStream.html b/doc/net/majorkernelpanic/streaming/audio/AudioStream.html index ceb635ec..e63db705 100644 --- a/doc/net/majorkernelpanic/streaming/audio/AudioStream.html +++ b/doc/net/majorkernelpanic/streaming/audio/AudioStream.html @@ -2,12 +2,12 @@ - + AudioStream - + diff --git a/doc/net/majorkernelpanic/streaming/audio/package-frame.html b/doc/net/majorkernelpanic/streaming/audio/package-frame.html index 0319dbe7..1700f01e 100644 --- a/doc/net/majorkernelpanic/streaming/audio/package-frame.html +++ b/doc/net/majorkernelpanic/streaming/audio/package-frame.html @@ -2,12 +2,12 @@ - + 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 9c191cbb..73a24959 100644 --- a/doc/net/majorkernelpanic/streaming/audio/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/audio/package-summary.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.audio - + diff --git a/doc/net/majorkernelpanic/streaming/audio/package-tree.html b/doc/net/majorkernelpanic/streaming/audio/package-tree.html index 3c4f1932..5c4f6e85 100644 --- a/doc/net/majorkernelpanic/streaming/audio/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/audio/package-tree.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.audio Class Hierarchy - + diff --git a/doc/net/majorkernelpanic/streaming/exceptions/AACNotSupportedException.html b/doc/net/majorkernelpanic/streaming/exceptions/AACNotSupportedException.html index f533a7b7..4805b7f2 100644 --- a/doc/net/majorkernelpanic/streaming/exceptions/AACNotSupportedException.html +++ b/doc/net/majorkernelpanic/streaming/exceptions/AACNotSupportedException.html @@ -2,12 +2,12 @@ - + AACNotSupportedException - + diff --git a/doc/net/majorkernelpanic/streaming/exceptions/package-frame.html b/doc/net/majorkernelpanic/streaming/exceptions/package-frame.html index 4b32f0d9..18338dbc 100644 --- a/doc/net/majorkernelpanic/streaming/exceptions/package-frame.html +++ b/doc/net/majorkernelpanic/streaming/exceptions/package-frame.html @@ -2,12 +2,12 @@ - + 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 d28024dd..f37ecaac 100644 --- a/doc/net/majorkernelpanic/streaming/exceptions/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/exceptions/package-summary.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.exceptions - + diff --git a/doc/net/majorkernelpanic/streaming/exceptions/package-tree.html b/doc/net/majorkernelpanic/streaming/exceptions/package-tree.html index 90b04fb9..4e5b9b8e 100644 --- a/doc/net/majorkernelpanic/streaming/exceptions/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/exceptions/package-tree.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.exceptions Class Hierarchy - + diff --git a/doc/net/majorkernelpanic/streaming/mp4/MP4Config.html b/doc/net/majorkernelpanic/streaming/mp4/MP4Config.html index d09d41d8..1971d7cc 100644 --- a/doc/net/majorkernelpanic/streaming/mp4/MP4Config.html +++ b/doc/net/majorkernelpanic/streaming/mp4/MP4Config.html @@ -2,12 +2,12 @@ - + MP4Config - + diff --git a/doc/net/majorkernelpanic/streaming/mp4/package-frame.html b/doc/net/majorkernelpanic/streaming/mp4/package-frame.html index 1d809819..765e3456 100644 --- a/doc/net/majorkernelpanic/streaming/mp4/package-frame.html +++ b/doc/net/majorkernelpanic/streaming/mp4/package-frame.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.mp4 - + diff --git a/doc/net/majorkernelpanic/streaming/mp4/package-summary.html b/doc/net/majorkernelpanic/streaming/mp4/package-summary.html index fda1cb0c..403ca32b 100644 --- a/doc/net/majorkernelpanic/streaming/mp4/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/mp4/package-summary.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.mp4 - + diff --git a/doc/net/majorkernelpanic/streaming/mp4/package-tree.html b/doc/net/majorkernelpanic/streaming/mp4/package-tree.html index 0f92ed71..07beec30 100644 --- a/doc/net/majorkernelpanic/streaming/mp4/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/mp4/package-tree.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.mp4 Class Hierarchy - + diff --git a/doc/net/majorkernelpanic/streaming/package-frame.html b/doc/net/majorkernelpanic/streaming/package-frame.html index 02b8684c..62347917 100644 --- a/doc/net/majorkernelpanic/streaming/package-frame.html +++ b/doc/net/majorkernelpanic/streaming/package-frame.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming - + diff --git a/doc/net/majorkernelpanic/streaming/package-summary.html b/doc/net/majorkernelpanic/streaming/package-summary.html index 0d89bf83..8145d1a1 100644 --- a/doc/net/majorkernelpanic/streaming/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/package-summary.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming - + diff --git a/doc/net/majorkernelpanic/streaming/package-tree.html b/doc/net/majorkernelpanic/streaming/package-tree.html index f9ee5316..1e262711 100644 --- a/doc/net/majorkernelpanic/streaming/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/package-tree.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming Class Hierarchy - + diff --git a/doc/net/majorkernelpanic/streaming/rtcp/SenderReport.html b/doc/net/majorkernelpanic/streaming/rtcp/SenderReport.html index 207cdd27..fad2d384 100644 --- a/doc/net/majorkernelpanic/streaming/rtcp/SenderReport.html +++ b/doc/net/majorkernelpanic/streaming/rtcp/SenderReport.html @@ -2,12 +2,12 @@ - + SenderReport - + diff --git a/doc/net/majorkernelpanic/streaming/rtcp/package-frame.html b/doc/net/majorkernelpanic/streaming/rtcp/package-frame.html index 979390a9..0a4d8641 100644 --- a/doc/net/majorkernelpanic/streaming/rtcp/package-frame.html +++ b/doc/net/majorkernelpanic/streaming/rtcp/package-frame.html @@ -2,12 +2,12 @@ - + 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 041d6a72..8a017b9b 100644 --- a/doc/net/majorkernelpanic/streaming/rtcp/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/rtcp/package-summary.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.rtcp - + diff --git a/doc/net/majorkernelpanic/streaming/rtcp/package-tree.html b/doc/net/majorkernelpanic/streaming/rtcp/package-tree.html index 0b8f6712..8feb9b4b 100644 --- a/doc/net/majorkernelpanic/streaming/rtcp/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/rtcp/package-tree.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.rtcp Class Hierarchy - + diff --git a/doc/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.html b/doc/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.html index f3cdecde..039d9fbb 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.html +++ b/doc/net/majorkernelpanic/streaming/rtp/AACADTSPacketizer.html @@ -2,12 +2,12 @@ - + AACADTSPacketizer - + diff --git a/doc/net/majorkernelpanic/streaming/rtp/AMRNBPacketizer.html b/doc/net/majorkernelpanic/streaming/rtp/AMRNBPacketizer.html index 30db5d8d..9bc7fc6a 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/AMRNBPacketizer.html +++ b/doc/net/majorkernelpanic/streaming/rtp/AMRNBPacketizer.html @@ -2,12 +2,12 @@ - + AMRNBPacketizer - + diff --git a/doc/net/majorkernelpanic/streaming/rtp/AbstractPacketizer.html b/doc/net/majorkernelpanic/streaming/rtp/AbstractPacketizer.html index 725a7f17..ad9cfc57 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/AbstractPacketizer.html +++ b/doc/net/majorkernelpanic/streaming/rtp/AbstractPacketizer.html @@ -2,12 +2,12 @@ - + AbstractPacketizer - + diff --git a/doc/net/majorkernelpanic/streaming/rtp/H263Packetizer.html b/doc/net/majorkernelpanic/streaming/rtp/H263Packetizer.html index 1276c248..e4798523 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/H263Packetizer.html +++ b/doc/net/majorkernelpanic/streaming/rtp/H263Packetizer.html @@ -2,12 +2,12 @@ - + H263Packetizer - + diff --git a/doc/net/majorkernelpanic/streaming/rtp/H264Packetizer.html b/doc/net/majorkernelpanic/streaming/rtp/H264Packetizer.html index ad76275b..4210636e 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/H264Packetizer.html +++ b/doc/net/majorkernelpanic/streaming/rtp/H264Packetizer.html @@ -2,12 +2,12 @@ - + H264Packetizer - + diff --git a/doc/net/majorkernelpanic/streaming/rtp/RtpSocket.html b/doc/net/majorkernelpanic/streaming/rtp/RtpSocket.html index 00563208..c9585479 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/RtpSocket.html +++ b/doc/net/majorkernelpanic/streaming/rtp/RtpSocket.html @@ -2,12 +2,12 @@ - + RtpSocket - + diff --git a/doc/net/majorkernelpanic/streaming/rtp/package-frame.html b/doc/net/majorkernelpanic/streaming/rtp/package-frame.html index b4be9987..f251ab22 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/package-frame.html +++ b/doc/net/majorkernelpanic/streaming/rtp/package-frame.html @@ -2,12 +2,12 @@ - + 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 c1cef984..45df40e5 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/rtp/package-summary.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.rtp - + diff --git a/doc/net/majorkernelpanic/streaming/rtp/package-tree.html b/doc/net/majorkernelpanic/streaming/rtp/package-tree.html index 4bb1cb39..fab7eeb4 100644 --- a/doc/net/majorkernelpanic/streaming/rtp/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/rtp/package-tree.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.rtp Class Hierarchy - + diff --git a/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.CallbackListener.html b/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.CallbackListener.html index e3d478d5..08098ca3 100644 --- a/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.CallbackListener.html +++ b/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.CallbackListener.html @@ -2,12 +2,12 @@ - + RtspServer.CallbackListener - + diff --git a/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.LocalBinder.html b/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.LocalBinder.html index 4e0a7fee..5fbcad1d 100644 --- a/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.LocalBinder.html +++ b/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.LocalBinder.html @@ -2,12 +2,12 @@ - + RtspServer.LocalBinder - + diff --git a/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.html b/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.html index bc4e830e..7d5e2927 100644 --- a/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.html +++ b/doc/net/majorkernelpanic/streaming/rtsp/RtspServer.html @@ -2,12 +2,12 @@ - + RtspServer - + diff --git a/doc/net/majorkernelpanic/streaming/rtsp/UriParser.html b/doc/net/majorkernelpanic/streaming/rtsp/UriParser.html index f71932d5..479d3101 100644 --- a/doc/net/majorkernelpanic/streaming/rtsp/UriParser.html +++ b/doc/net/majorkernelpanic/streaming/rtsp/UriParser.html @@ -2,12 +2,12 @@ - + UriParser - + diff --git a/doc/net/majorkernelpanic/streaming/rtsp/package-frame.html b/doc/net/majorkernelpanic/streaming/rtsp/package-frame.html index 5e5a83f2..c5aacc76 100644 --- a/doc/net/majorkernelpanic/streaming/rtsp/package-frame.html +++ b/doc/net/majorkernelpanic/streaming/rtsp/package-frame.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.rtsp - + diff --git a/doc/net/majorkernelpanic/streaming/rtsp/package-summary.html b/doc/net/majorkernelpanic/streaming/rtsp/package-summary.html index 0153e0a3..0916fb1f 100644 --- a/doc/net/majorkernelpanic/streaming/rtsp/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/rtsp/package-summary.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.rtsp - + diff --git a/doc/net/majorkernelpanic/streaming/rtsp/package-tree.html b/doc/net/majorkernelpanic/streaming/rtsp/package-tree.html index 1f13c371..2201ce7d 100644 --- a/doc/net/majorkernelpanic/streaming/rtsp/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/rtsp/package-tree.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.rtsp Class Hierarchy - + diff --git a/doc/net/majorkernelpanic/streaming/video/H263Stream.html b/doc/net/majorkernelpanic/streaming/video/H263Stream.html index 249104e7..9ee26d40 100644 --- a/doc/net/majorkernelpanic/streaming/video/H263Stream.html +++ b/doc/net/majorkernelpanic/streaming/video/H263Stream.html @@ -2,12 +2,12 @@ - + H263Stream - + diff --git a/doc/net/majorkernelpanic/streaming/video/H264Stream.html b/doc/net/majorkernelpanic/streaming/video/H264Stream.html index 466dd48d..669d870e 100644 --- a/doc/net/majorkernelpanic/streaming/video/H264Stream.html +++ b/doc/net/majorkernelpanic/streaming/video/H264Stream.html @@ -2,12 +2,12 @@ - + H264Stream - + diff --git a/doc/net/majorkernelpanic/streaming/video/VideoQuality.html b/doc/net/majorkernelpanic/streaming/video/VideoQuality.html index 0646fd65..a399d3c1 100644 --- a/doc/net/majorkernelpanic/streaming/video/VideoQuality.html +++ b/doc/net/majorkernelpanic/streaming/video/VideoQuality.html @@ -2,12 +2,12 @@ - + VideoQuality - + diff --git a/doc/net/majorkernelpanic/streaming/video/VideoStream.html b/doc/net/majorkernelpanic/streaming/video/VideoStream.html index 748502b8..f14dff93 100644 --- a/doc/net/majorkernelpanic/streaming/video/VideoStream.html +++ b/doc/net/majorkernelpanic/streaming/video/VideoStream.html @@ -2,12 +2,12 @@ - + VideoStream - + @@ -441,7 +441,7 @@

java.io.IOException
Prepare the VideoStream, you can then call MediaStream.start(). - The underlying Camera will be opened and configured whaen you call this method so don't forget to deal with the RuntimeExceptions ! + The underlying Camera will be opened and configured when you call this method so don't forget to deal with the RuntimeExceptions ! Camera.open, Camera.setParameter, Camera.unlock may throw one !

diff --git a/doc/net/majorkernelpanic/streaming/video/package-frame.html b/doc/net/majorkernelpanic/streaming/video/package-frame.html index 5af75b6c..b6ee3381 100644 --- a/doc/net/majorkernelpanic/streaming/video/package-frame.html +++ b/doc/net/majorkernelpanic/streaming/video/package-frame.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.video - + diff --git a/doc/net/majorkernelpanic/streaming/video/package-summary.html b/doc/net/majorkernelpanic/streaming/video/package-summary.html index 22be385b..d58e72b9 100644 --- a/doc/net/majorkernelpanic/streaming/video/package-summary.html +++ b/doc/net/majorkernelpanic/streaming/video/package-summary.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.video - + diff --git a/doc/net/majorkernelpanic/streaming/video/package-tree.html b/doc/net/majorkernelpanic/streaming/video/package-tree.html index b7814720..783897ac 100644 --- a/doc/net/majorkernelpanic/streaming/video/package-tree.html +++ b/doc/net/majorkernelpanic/streaming/video/package-tree.html @@ -2,12 +2,12 @@ - + net.majorkernelpanic.streaming.video Class Hierarchy - + diff --git a/doc/overview-frame.html b/doc/overview-frame.html index 7f2d281c..a0544f08 100644 --- a/doc/overview-frame.html +++ b/doc/overview-frame.html @@ -2,12 +2,12 @@ - + Overview List - + diff --git a/doc/overview-summary.html b/doc/overview-summary.html index cc24f507..6d223f5d 100644 --- a/doc/overview-summary.html +++ b/doc/overview-summary.html @@ -2,12 +2,12 @@ - + Overview - + diff --git a/doc/overview-tree.html b/doc/overview-tree.html index 1fa1f9f4..b40ad9c2 100644 --- a/doc/overview-tree.html +++ b/doc/overview-tree.html @@ -2,12 +2,12 @@ - + Class Hierarchy - + diff --git a/doc/serialized-form.html b/doc/serialized-form.html index eb7c47e2..37b69c9e 100644 --- a/doc/serialized-form.html +++ b/doc/serialized-form.html @@ -2,12 +2,12 @@ - + Serialized Form - + diff --git a/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java b/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java index 7a89aaae..ae06d436 100644 --- a/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java +++ b/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java @@ -36,7 +36,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.majorkernelpanic.http.TinyHttpServer; import net.majorkernelpanic.streaming.Session; import net.majorkernelpanic.streaming.SessionBuilder; import android.app.Service; @@ -260,6 +259,22 @@ protected void postError(Exception exception, int id) { } } + /** + * By default the RTSP uses {@link UriParser} to parse the URI requested by the client + * but you can change that behavior by override this method. + * @param uri The uri that the client has requested + * @param client The socket associated to the client + * @return A proper session + */ + protected Session handleRequest(String uri, Socket client) throws IllegalStateException, IOException { + Session session = UriParser.parse(uri); + session.setOrigin(client.getLocalAddress()); + if (session.getDestination()==null) { + session.setDestination(client.getInetAddress()); + } + return session; + } + class RequestListener extends Thread implements Runnable { private final ServerSocket mServer; @@ -391,12 +406,9 @@ public Response processRequest(Request request) throws IllegalStateException, IO if (request.method.equalsIgnoreCase("DESCRIBE")) { // Parse the requested URI and configure the session - mSession = UriParser.parse(request.uri); + mSession = handleRequest(request.uri, mClient); mSessions.put(mSession, null); - mSession.setOrigin(mClient.getLocalAddress()); - if (mSession.getDestination()==null) { - mSession.setDestination(mClient.getInetAddress()); - } + String requestContent = mSession.getSessionDescription(); String requestAttributes = "Content-Base: "+mClient.getLocalAddress().getHostAddress()+":"+mClient.getLocalPort()+"/\r\n" + diff --git a/src/net/majorkernelpanic/streaming/video/VideoStream.java b/src/net/majorkernelpanic/streaming/video/VideoStream.java index b49b2483..8baaf4ed 100644 --- a/src/net/majorkernelpanic/streaming/video/VideoStream.java +++ b/src/net/majorkernelpanic/streaming/video/VideoStream.java @@ -196,7 +196,7 @@ public synchronized void stop() { /** * Prepare the VideoStream, you can then call {@link #start()}. - * The underlying Camera will be opened and configured whaen you call this method so don't forget to deal with the RuntimeExceptions ! + * The underlying Camera will be opened and configured when you call this method so don't forget to deal with the RuntimeExceptions ! * Camera.open, Camera.setParameter, Camera.unlock may throw one ! */ public void prepare() throws IllegalStateException, IOException {