From b0dace54d75dfc0f972ab004c2d5dd239d2879c1 Mon Sep 17 00:00:00 2001
From: Schoumi <anthony@mob-dev.fr>
Date: Thu, 16 Jun 2022 12:34:41 +0200
Subject: [PATCH 1/5] Upgrade RTMP-RTSP from 1.8.2 (custom) to 2.1.9 (standard)
   -> breaks orientation at the moment Upgrade gradle plugin version

---
 .idea/gradle.xml                              |    1 -
 .idea/jarRepositories.xml                     |    5 +
 .idea/misc.xml                                |    7 +
 app/build.gradle                              |    7 +-
 app/src/main/AndroidManifest.xml              |    3 +-
 .../peertubelive/activity/StreamActivity.kt   |    8 +-
 app/src/main/res/layout/stream.xml            |    2 +-
 build.gradle                                  |   12 +-
 encoder/build.gradle                          |   11 +-
 encoder/src/main/AndroidManifest.xml          |    2 +-
 .../java/com/pedro/encoder/BaseEncoder.java   |  178 ++-
 .../com/pedro/encoder/EncoderCallback.java    |   18 +-
 .../main/java/com/pedro/encoder/Frame.java    |   16 +
 .../main/java/com/pedro/encoder/GetFrame.java |   21 +
 .../com/pedro/encoder/audio/AudioEncoder.java |  134 ++-
 .../com/pedro/encoder/audio/GetAacData.java   |   16 +
 .../input/audio/AudioPostProcessEffect.java   |   54 +-
 .../input/audio/CustomAudioEffect.java        |   16 +
 .../input/audio/GetMicrophoneData.java        |   16 +
 .../input/audio/MicrophoneManager.java        |  164 ++-
 .../input/audio/MicrophoneManagerManual.java  |   29 +-
 .../encoder/input/audio/MicrophoneMode.java   |   21 +
 .../encoder/input/audio/NoAudioEffect.java    |   16 +
 .../encoder/input/decoder/AudioDecoder.java   |  228 ++--
 .../input/decoder/AudioDecoderInterface.java  |   16 +
 .../encoder/input/decoder/BaseDecoder.java    |  216 ++++
 .../input/decoder/LoopFileInterface.java      |   16 +
 .../encoder/input/decoder/VideoDecoder.java   |  180 +--
 .../input/decoder/VideoDecoderInterface.java  |   16 +
 .../encoder/input/gl/AndroidViewSprite.java   |  157 +++
 .../pedro/encoder/input/gl/FilterAction.java  |   24 +
 .../com/pedro/encoder/input/gl/Sprite.java    |   16 +
 .../input/gl/SpriteGestureController.java     |   87 +-
 .../encoder/input/gl/SurfaceManager.java      |  142 ++-
 .../pedro/encoder/input/gl/TextureLoader.java |   16 +
 .../input/gl/render/BaseRenderOffScreen.java  |   16 +
 .../encoder/input/gl/render/CameraRender.java |   22 +-
 .../encoder/input/gl/render/MainRender.kt     |  177 +++
 .../input/gl/render/ManagerRender.java        |  158 ++-
 .../input/gl/render/RenderHandler.java        |   16 +
 .../encoder/input/gl/render/ScreenRender.java |   80 +-
 .../input/gl/render/SimpleCameraRender.java   |   30 +-
 .../render/filters/AnalogTVFilterRender.java  |   16 +
 .../filters/AndroidViewFilterRender.java      |  253 ++--
 .../gl/render/filters/BaseFilterRender.java   |   16 +
 .../filters/BasicDeformationFilterRender.java |   16 +
 .../gl/render/filters/BeautyFilterRender.java |   16 +
 .../gl/render/filters/BlackFilterRender.java  |   16 +
 .../gl/render/filters/BlurFilterRender.java   |   16 +
 .../filters/BrightnessFilterRender.java       |   16 +
 .../render/filters/CartoonFilterRender.java   |   16 +
 .../gl/render/filters/ChromaFilterRender.java |  173 +++
 .../gl/render/filters/CircleFilterRender.java |   16 +
 .../gl/render/filters/ColorFilterRender.java  |   16 +
 .../render/filters/ContrastFilterRender.java  |   16 +
 .../render/filters/DuotoneFilterRender.java   |   16 +
 .../render/filters/EarlyBirdFilterRender.java |   16 +
 .../filters/EdgeDetectionFilterRender.java    |   16 +
 .../render/filters/ExposureFilterRender.java  |   16 +
 .../gl/render/filters/FireFilterRender.java   |   16 +
 .../gl/render/filters/GammaFilterRender.java  |   16 +
 .../gl/render/filters/GlitchFilterRender.java |   16 +
 .../render/filters/GreyScaleFilterRender.java |   16 +
 .../filters/HalftoneLinesFilterRender.java    |   16 +
 .../render/filters/Image70sFilterRender.java  |   16 +
 .../render/filters/LamoishFilterRender.java   |   16 +
 .../gl/render/filters/MoneyFilterRender.java  |   16 +
 .../render/filters/NegativeFilterRender.java  |   16 +
 .../gl/render/filters/NoFilterRender.java     |   16 +
 .../render/filters/PixelatedFilterRender.java |   16 +
 .../filters/PolygonizationFilterRender.java   |   16 +
 .../filters/RGBSaturationFilterRender.java    |   16 +
 .../render/filters/RainbowFilterRender.java   |   16 +
 .../gl/render/filters/RippleFilterRender.java |   16 +
 .../render/filters/RotationFilterRender.java  |   42 +
 .../filters/SaturationFilterRender.java       |   16 +
 .../gl/render/filters/SepiaFilterRender.java  |   16 +
 .../render/filters/SharpnessFilterRender.java |   16 +
 .../gl/render/filters/SnowFilterRender.java   |   16 +
 .../gl/render/filters/SwirlFilterRender.java  |   16 +
 .../filters/TemperatureFilterRender.java      |   16 +
 .../gl/render/filters/ZebraFilterRender.java  |   16 +
 .../object/BaseObjectFilterRender.java        |   16 +
 .../filters/object/GifObjectFilterRender.java |   16 +
 .../object/ImageObjectFilterRender.java       |   16 +
 .../filters/object/SurfaceFilterRender.java   |   38 +-
 .../object/TextObjectFilterRender.java        |   41 +
 .../input/video/Camera1ApiManager.java        |  345 +++++-
 .../input/video/Camera2ApiManager.java        |  747 ++++++++++--
 .../encoder/input/video/CameraCallbacks.java  |   24 +
 .../encoder/input/video/CameraHelper.java     |   34 +
 .../input/video/CameraOpenException.java      |   16 +
 .../encoder/input/video/FaceDetectorUtil.java |   82 --
 .../pedro/encoder/input/video/FpsLimiter.java |   16 +
 .../encoder/input/video/GetCameraData.java    |   16 +
 .../com/pedro/encoder/utils/CodecUtil.java    |  295 +++--
 .../pedro/encoder/utils/FaceDetectorUtil.java |   75 ++
 .../com/pedro/encoder/utils/FaceParsed.java   |   56 +
 .../java/com/pedro/encoder/utils/PCMUtil.java |   16 +
 .../encoder/utils/gl/GifStreamObject.java     |   16 +
 .../com/pedro/encoder/utils/gl/GlUtil.java    |   55 +-
 .../encoder/utils/gl/ImageStreamObject.java   |   16 +
 .../encoder/utils/gl/SizeCalculator.java      |  131 ++-
 .../encoder/utils/gl/StreamObjectBase.java    |   16 +
 .../encoder/utils/gl/TextStreamObject.java    |   16 +
 .../pedro/encoder/utils/gl/TranslateTo.java   |   16 +
 .../encoder/utils/gl/gif/GifHeaderParser.java |   12 +-
 .../pedro/encoder/utils/yuv/NV21Utils.java    |   16 +
 .../com/pedro/encoder/utils/yuv/YUVUtil.java  |   16 +
 .../pedro/encoder/utils/yuv/YV12Utils.java    |   16 +
 .../encoder/video/FormatVideoEncoder.java     |   16 +
 .../com/pedro/encoder/video/GetVideoData.java |   18 +-
 .../com/pedro/encoder/video/VideoEncoder.java |  294 ++---
 encoder/src/main/res/raw/chroma_fragment.glsl |   22 +
 gradle/wrapper/gradle-wrapper.properties      |    2 +-
 rtmp/.gitignore                               |    2 +-
 rtmp/build.gradle                             |   12 +-
 rtmp/src/main/AndroidManifest.xml             |    2 +-
 .../com/github/faucamp/simplertmp/Crypto.java |   67 --
 .../simplertmp/DefaultRtmpPublisher.java      |   53 -
 .../faucamp/simplertmp/RtmpPublisher.java     |   62 -
 .../com/github/faucamp/simplertmp/Util.java   |  195 ---
 .../faucamp/simplertmp/amf/AmfArray.java      |   67 --
 .../faucamp/simplertmp/amf/AmfBoolean.java    |   49 -
 .../faucamp/simplertmp/amf/AmfData.java       |   31 -
 .../faucamp/simplertmp/amf/AmfDecoder.java    |   51 -
 .../github/faucamp/simplertmp/amf/AmfMap.java |   53 -
 .../faucamp/simplertmp/amf/AmfNull.java       |   34 -
 .../faucamp/simplertmp/amf/AmfNumber.java     |   62 -
 .../faucamp/simplertmp/amf/AmfObject.java     |  109 --
 .../faucamp/simplertmp/amf/AmfString.java     |  130 --
 .../faucamp/simplertmp/amf/AmfType.java       |   39 -
 .../faucamp/simplertmp/amf/AmfUndefined.java  |   34 -
 .../simplertmp/io/ChunkStreamInfo.java        |   91 --
 .../faucamp/simplertmp/io/RtmpConnection.java |  695 -----------
 .../faucamp/simplertmp/io/RtmpDecoder.java    |   96 --
 .../simplertmp/io/RtmpSessionInfo.java        |   83 --
 .../simplertmp/io/WindowAckRequired.java      |   40 -
 .../faucamp/simplertmp/packets/Abort.java     |   59 -
 .../simplertmp/packets/Acknowledgement.java   |   75 --
 .../faucamp/simplertmp/packets/Audio.java     |   25 -
 .../faucamp/simplertmp/packets/Command.java   |   94 --
 .../simplertmp/packets/ContentData.java       |   56 -
 .../faucamp/simplertmp/packets/Data.java      |   71 --
 .../faucamp/simplertmp/packets/Handshake.java |  225 ----
 .../simplertmp/packets/RtmpHeader.java        |  413 -------
 .../simplertmp/packets/RtmpPacket.java        |   53 -
 .../simplertmp/packets/SetChunkSize.java      |   57 -
 .../simplertmp/packets/SetPeerBandwidth.java  |  118 --
 .../simplertmp/packets/UserControl.java       |  252 ----
 .../packets/VariableBodyRtmpPacket.java       |   78 --
 .../faucamp/simplertmp/packets/Video.java     |   25 -
 .../simplertmp/packets/WindowAckSize.java     |   66 --
 .../java/com/pedro/rtmp/amf/AmfVersion.kt     |   24 +
 .../java/com/pedro/rtmp/amf/v0/AmfBoolean.kt  |   49 +
 .../java/com/pedro/rtmp/amf/v0/AmfData.kt     |   76 ++
 .../com/pedro/rtmp/amf/v0/AmfEcmaArray.kt     |   83 ++
 .../java/com/pedro/rtmp/amf/v0/AmfNull.kt     |   48 +
 .../java/com/pedro/rtmp/amf/v0/AmfNumber.kt   |   54 +
 .../java/com/pedro/rtmp/amf/v0/AmfObject.kt   |  130 ++
 .../com/pedro/rtmp/amf/v0/AmfObjectEnd.kt     |   54 +
 .../com/pedro/rtmp/amf/v0/AmfStrictArray.kt   |   75 ++
 .../java/com/pedro/rtmp/amf/v0/AmfString.kt   |   63 +
 .../java/com/pedro/rtmp/amf/v0/AmfType.kt     |   36 +
 .../com/pedro/rtmp/amf/v0/AmfUndefined.kt     |   48 +
 .../java/com/pedro/rtmp/amf/v3/Amf3Array.kt   |   40 +
 .../java/com/pedro/rtmp/amf/v3/Amf3Data.kt    |   78 ++
 .../com/pedro/rtmp/amf/v3/Amf3Dictionary.kt   |   40 +
 .../java/com/pedro/rtmp/amf/v3/Amf3Double.kt  |   48 +
 .../java/com/pedro/rtmp/amf/v3/Amf3False.kt   |   38 +
 .../java/com/pedro/rtmp/amf/v3/Amf3Integer.kt |   40 +
 .../java/com/pedro/rtmp/amf/v3/Amf3Null.kt    |   38 +
 .../java/com/pedro/rtmp/amf/v3/Amf3Object.kt  |   40 +
 .../java/com/pedro/rtmp/amf/v3/Amf3String.kt  |   40 +
 .../java/com/pedro/rtmp/amf/v3/Amf3True.kt    |   38 +
 .../java/com/pedro/rtmp/amf/v3/Amf3Type.kt    |   27 +
 .../com/pedro/rtmp/amf/v3/Amf3Undefined.kt    |   38 +
 .../main/java/com/pedro/rtmp/flv/FlvPacket.kt |   23 +
 .../main/java/com/pedro/rtmp/flv/FlvType.kt   |   24 +
 .../com/pedro/rtmp/flv/audio/AacPacket.kt     |   87 ++
 .../com/pedro/rtmp/flv/audio/AudioFormat.kt   |   27 +
 .../pedro/rtmp/flv/audio/AudioObjectType.kt   |   25 +
 .../rtmp/flv/audio/AudioPacketCallback.kt     |   26 +
 .../com/pedro/rtmp/flv/audio/AudioSize.kt     |   24 +
 .../pedro/rtmp/flv/audio/AudioSoundRate.kt    |   25 +
 .../pedro/rtmp/flv/audio/AudioSoundType.kt    |   24 +
 .../rtmp/flv/audio/AudioSpecificConfig.kt     |   73 ++
 .../com/pedro/rtmp/flv/video/H264Packet.kt    |  178 +++
 .../com/pedro/rtmp/flv/video/ProfileIop.kt    |   24 +
 .../com/pedro/rtmp/flv/video/VideoDataType.kt |   24 +
 .../com/pedro/rtmp/flv/video/VideoFormat.kt   |   25 +
 .../com/pedro/rtmp/flv/video/VideoNalType.kt  |   25 +
 .../rtmp/flv/video/VideoPacketCallback.kt     |   26 +
 .../rtmp/flv/video/VideoSpecificConfig.kt     |   65 +
 .../com/pedro/rtmp/rtmp/CommandsManager.kt    |  313 +++++
 .../java/com/pedro/rtmp/rtmp/Handshake.kt     |  172 +++
 .../java/com/pedro/rtmp/rtmp/RtmpClient.kt    |  529 +++++++++
 .../java/com/pedro/rtmp/rtmp/RtmpSender.kt    |  205 ++++
 .../pedro/rtmp/rtmp/chunk/ChunkStreamId.kt    |   29 +
 .../com/pedro/rtmp/rtmp/chunk/ChunkType.kt    |   82 ++
 .../java/com/pedro/rtmp/rtmp/message/Abort.kt |   49 +
 .../rtmp/rtmp/message/Acknowledgement.kt      |   49 +
 .../com/pedro/rtmp/rtmp/message/Aggregate.kt  |   41 +
 .../java/com/pedro/rtmp/rtmp/message/Audio.kt |   47 +
 .../pedro/rtmp/rtmp/message/BasicHeader.kt    |   96 ++
 .../pedro/rtmp/rtmp/message/MessageType.kt    |  134 +++
 .../com/pedro/rtmp/rtmp/message/RtmpHeader.kt |  167 +++
 .../pedro/rtmp/rtmp/message/RtmpMessage.kt    |  146 +++
 .../pedro/rtmp/rtmp/message/SetChunkSize.kt   |   49 +
 .../rtmp/rtmp/message/SetPeerBandwidth.kt     |   57 +
 .../java/com/pedro/rtmp/rtmp/message/Video.kt |   47 +
 .../rtmp/message/WindowAcknowledgementSize.kt |   53 +
 .../rtmp/rtmp/message/command/Command.kt      |   92 ++
 .../rtmp/rtmp/message/command/CommandAmf0.kt  |   30 +
 .../rtmp/rtmp/message/command/CommandAmf3.kt  |   30 +
 .../pedro/rtmp/rtmp/message/control/Event.kt  |   22 +
 .../pedro/rtmp/rtmp/message/control/Type.kt   |  135 +++
 .../rtmp/rtmp/message/control/UserControl.kt  |   72 ++
 .../com/pedro/rtmp/rtmp/message/data/Data.kt  |   81 ++
 .../pedro/rtmp/rtmp/message/data/DataAmf0.kt  |   30 +
 .../pedro/rtmp/rtmp/message/data/DataAmf3.kt  |   30 +
 .../rtmp/rtmp/message/shared/SharedObject.kt  |   40 +
 .../rtmp/message/shared/SharedObjectAmf0.kt   |   26 +
 .../rtmp/message/shared/SharedObjectAmf3.kt   |   26 +
 .../java/com/pedro/rtmp/utils/AuthUtil.kt     |  146 +++
 .../com/pedro/rtmp/utils/BitrateManager.kt    |   39 +
 .../pedro/rtmp/utils/CommandSessionHistory.kt |   55 +
 .../pedro/rtmp/utils/ConnectCheckerRtmp.kt    |   30 +
 .../java/com/pedro/rtmp/utils/RtmpConfig.kt   |   26 +
 .../com/pedro/rtmp/utils/TLSSocketFactory.kt  |   84 ++
 .../main/java/com/pedro/rtmp/utils/Utils.kt   |   96 ++
 .../com/pedro/rtmp/utils/socket/RtmpSocket.kt |   42 +
 .../com/pedro/rtmp/utils/socket/TcpSocket.kt  |   73 ++
 .../rtmp/utils/socket/TcpTunneledSocket.kt    |  160 +++
 .../java/net/ossrs/rtmp/BitrateManager.java   |   27 -
 .../net/ossrs/rtmp/ConnectCheckerRtmp.java    |   22 -
 .../java/net/ossrs/rtmp/CreateSSLSocket.java  |   31 -
 .../main/java/net/ossrs/rtmp/ProfileIop.java  |   11 -
 .../java/net/ossrs/rtmp/SrsAllocator.java     |  116 --
 .../main/java/net/ossrs/rtmp/SrsFlvMuxer.java | 1048 -----------------
 .../java/net/ossrs/rtmp/TLSSocketFactory.java |   78 --
 .../test/java/android/media/MediaCodec.java   |   39 +
 rtmp/src/test/java/android/util/Base64.java   |   28 +
 rtmp/src/test/java/android/util/Log.java      |   53 +
 .../java/com/pedro/rtmp/utils/AuthUtilTest.kt |   38 +
 .../java/com/pedro/rtmp/utils/SocketTest.kt   |   15 +
 rtplibrary/build.gradle                       |    9 +-
 rtplibrary/src/main/AndroidManifest.xml       |    2 +-
 .../pedro/rtplibrary/base/Camera1Base.java    |  477 ++++++--
 .../pedro/rtplibrary/base/Camera2Base.java    |  522 +++++---
 .../pedro/rtplibrary/base/DisplayBase.java    |  255 ++--
 .../pedro/rtplibrary/base/FromFileBase.java   |  343 ++++--
 .../pedro/rtplibrary/base/OnlyAudioBase.java  |  221 +++-
 .../com/pedro/rtplibrary/base/StreamBase.kt   |  529 +++++++++
 .../base/recording/BaseRecordController.java  |   87 ++
 .../base/recording/RecordController.java      |   33 +
 .../rtplibrary/multiple/MultiRtpCamera1.java  |  496 ++++++++
 .../rtplibrary/multiple/MultiRtpCamera2.java  |  496 ++++++++
 .../rtplibrary/multiple/MultiRtpDisplay.java  |  425 +++++++
 .../multiple/MultiRtpOnlyAudio.java           |  398 +++++++
 .../pedro/rtplibrary/multiple/RtpType.java    |   24 +
 .../network/AdapterBitrateParser.java         |   16 +
 .../pedro/rtplibrary/rtmp/RtmpCamera1.java    |  133 ++-
 .../pedro/rtplibrary/rtmp/RtmpCamera2.java    |  144 ++-
 .../pedro/rtplibrary/rtmp/RtmpDisplay.java    |  124 +-
 .../pedro/rtplibrary/rtmp/RtmpFromFile.java   |  129 +-
 .../pedro/rtplibrary/rtmp/RtmpOnlyAudio.java  |  111 +-
 .../com/pedro/rtplibrary/rtmp/RtmpStream.kt   |  147 +++
 .../pedro/rtplibrary/rtsp/RtspCamera1.java    |   55 +-
 .../pedro/rtplibrary/rtsp/RtspCamera2.java    |   67 +-
 .../pedro/rtplibrary/rtsp/RtspDisplay.java    |   54 +-
 .../pedro/rtplibrary/rtsp/RtspFromFile.java   |   55 +-
 .../pedro/rtplibrary/rtsp/RtspOnlyAudio.java  |   48 +-
 .../com/pedro/rtplibrary/rtsp/RtspStream.kt   |  124 ++
 .../util/AndroidMuxerRecordController.java    |  152 +++
 .../pedro/rtplibrary/util/BitrateAdapter.java |   79 +-
 .../com/pedro/rtplibrary/util/Filter.java     |   61 +
 .../pedro/rtplibrary/util/FpsListener.java    |   16 +
 .../rtplibrary/util/RecordController.java     |  144 ---
 .../util/SensorRotationManager.java           |   16 +
 .../rtplibrary/util/sources/AudioManager.kt   |  139 +++
 .../pedro/rtplibrary/util/sources/NoSource.kt |   19 +
 .../rtplibrary/util/sources/VideoManager.kt   |  411 +++++++
 .../rtplibrary/view/AspectRatioMode.java      |   37 +
 .../com/pedro/rtplibrary/view/Filter.java     |   37 -
 .../pedro/rtplibrary/view/GlInterface.java    |  109 +-
 .../rtplibrary/view/GlStreamInterface.kt      |  244 ++++
 .../rtplibrary/view/LightOpenGlView.java      |   99 +-
 .../rtplibrary/view/OffScreenGlThread.java    |  214 +++-
 .../com/pedro/rtplibrary/view/OpenGlView.java |  117 +-
 .../pedro/rtplibrary/view/OpenGlViewBase.java |  101 +-
 .../rtplibrary/view/TakePhotoCallback.java    |   16 +
 rtplibrary/src/main/res/values/attrs.xml      |    2 -
 rtsp/build.gradle                             |   17 +-
 rtsp/src/main/AndroidManifest.xml             |    2 +-
 .../com/pedro/rtsp/rtcp/BaseSenderReport.java |  136 ---
 .../com/pedro/rtsp/rtcp/BaseSenderReport.kt   |  152 +++
 .../com/pedro/rtsp/rtcp/SenderReportTcp.java  |   48 -
 .../com/pedro/rtsp/rtcp/SenderReportTcp.kt    |   57 +
 .../com/pedro/rtsp/rtcp/SenderReportUdp.java  |   67 --
 .../com/pedro/rtsp/rtcp/SenderReportUdp.kt    |   76 ++
 .../com/pedro/rtsp/rtp/packets/AacPacket.java |   55 -
 .../com/pedro/rtsp/rtp/packets/AacPacket.kt   |   65 +
 .../rtsp/rtp/packets/AudioPacketCallback.java |   11 -
 .../rtsp/rtp/packets/AudioPacketCallback.kt   |   26 +
 .../pedro/rtsp/rtp/packets/BasePacket.java    |   75 --
 .../com/pedro/rtsp/rtp/packets/BasePacket.kt  |   85 ++
 .../pedro/rtsp/rtp/packets/H264Packet.java    |  134 ---
 .../com/pedro/rtsp/rtp/packets/H264Packet.kt  |  169 +++
 .../pedro/rtsp/rtp/packets/H265Packet.java    |  142 ---
 .../com/pedro/rtsp/rtp/packets/H265Packet.kt  |  144 +++
 .../rtsp/rtp/packets/VideoPacketCallback.java |   11 -
 .../rtsp/rtp/packets/VideoPacketCallback.kt   |   26 +
 .../pedro/rtsp/rtp/sockets/BaseRtpSocket.java |   27 -
 .../pedro/rtsp/rtp/sockets/BaseRtpSocket.kt   |   49 +
 .../pedro/rtsp/rtp/sockets/RtpSocketTcp.java  |   51 -
 .../pedro/rtsp/rtp/sockets/RtpSocketTcp.kt    |   60 +
 .../pedro/rtsp/rtp/sockets/RtpSocketUdp.java  |   69 --
 .../pedro/rtsp/rtp/sockets/RtpSocketUdp.kt    |   76 ++
 .../main/java/com/pedro/rtsp/rtsp/Body.java   |  104 --
 .../com/pedro/rtsp/rtsp/CommandsManager.java  |  435 -------
 .../java/com/pedro/rtsp/rtsp/Protocol.java    |    9 -
 .../main/java/com/pedro/rtsp/rtsp/Protocol.kt |   24 +
 .../java/com/pedro/rtsp/rtsp/RtpFrame.java    |   77 --
 .../main/java/com/pedro/rtsp/rtsp/RtpFrame.kt |   54 +
 .../java/com/pedro/rtsp/rtsp/RtspClient.java  |  330 ------
 .../java/com/pedro/rtsp/rtsp/RtspClient.kt    |  433 +++++++
 .../java/com/pedro/rtsp/rtsp/RtspSender.java  |  213 ----
 .../java/com/pedro/rtsp/rtsp/RtspSender.kt    |  231 ++++
 .../java/com/pedro/rtsp/rtsp/VideoCodec.java  |    9 -
 .../java/com/pedro/rtsp/rtsp/VideoCodec.kt    |   24 +
 .../com/pedro/rtsp/rtsp/commands/Command.kt   |   22 +
 .../pedro/rtsp/rtsp/commands/CommandParser.kt |  134 +++
 .../rtsp/rtsp/commands/CommandsManager.kt     |  275 +++++
 .../com/pedro/rtsp/rtsp/commands/Method.kt    |   24 +
 .../com/pedro/rtsp/rtsp/commands/SdpBody.kt   |   71 ++
 .../java/com/pedro/rtsp/utils/AuthUtil.java   |   36 -
 .../java/com/pedro/rtsp/utils/AuthUtil.kt     |   40 +
 .../com/pedro/rtsp/utils/BitrateManager.java  |   27 -
 .../com/pedro/rtsp/utils/BitrateManager.kt    |   39 +
 .../pedro/rtsp/utils/ConnectCheckerRtsp.java  |   20 -
 .../pedro/rtsp/utils/ConnectCheckerRtsp.kt    |   30 +
 .../com/pedro/rtsp/utils/CreateSSLSocket.java |   31 -
 .../com/pedro/rtsp/utils/CreateSSLSocket.kt   |   52 +
 .../java/com/pedro/rtsp/utils/Extensions.kt   |   54 +
 .../com/pedro/rtsp/utils/RtpConstants.java    |   17 -
 .../java/com/pedro/rtsp/utils/RtpConstants.kt |   39 +
 .../pedro/rtsp/utils/TLSSocketFactory.java    |   77 --
 .../com/pedro/rtsp/utils/TLSSocketFactory.kt  |   86 ++
 rtsp/src/test/java/android/util/Base64.java   |   28 +
 rtsp/src/test/java/android/util/Log.java      |   53 +
 .../java/com/pedro/rtsp/rtp/AacPacketTest.kt  |   64 +
 .../java/com/pedro/rtsp/rtp/H264PacketTest.kt |  119 ++
 .../java/com/pedro/rtsp/rtp/H265PacketTest.kt |  121 ++
 .../com/pedro/rtsp/rtsp/CommandParserTest.kt  |  101 ++
 .../java/com/pedro/rtsp/rtsp/SdpBodyTest.kt   |   83 ++
 .../java/com/pedro/rtsp/utils/AuthUtilTest.kt |   34 +
 .../pedro/rtsp/utils/BitrateManagerTest.kt    |   57 +
 .../com/pedro/rtsp/utils/ExtensionsTest.kt    |   74 ++
 359 files changed, 20543 insertions(+), 9362 deletions(-)
 create mode 100644 encoder/src/main/java/com/pedro/encoder/GetFrame.java
 create mode 100644 encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneMode.java
 create mode 100644 encoder/src/main/java/com/pedro/encoder/input/decoder/BaseDecoder.java
 create mode 100644 encoder/src/main/java/com/pedro/encoder/input/gl/AndroidViewSprite.java
 create mode 100644 encoder/src/main/java/com/pedro/encoder/input/gl/FilterAction.java
 create mode 100644 encoder/src/main/java/com/pedro/encoder/input/gl/render/MainRender.kt
 create mode 100644 encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ChromaFilterRender.java
 create mode 100644 encoder/src/main/java/com/pedro/encoder/input/video/CameraCallbacks.java
 delete mode 100644 encoder/src/main/java/com/pedro/encoder/input/video/FaceDetectorUtil.java
 create mode 100644 encoder/src/main/java/com/pedro/encoder/utils/FaceDetectorUtil.java
 create mode 100644 encoder/src/main/java/com/pedro/encoder/utils/FaceParsed.java
 create mode 100644 encoder/src/main/res/raw/chroma_fragment.glsl
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/Crypto.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/DefaultRtmpPublisher.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/RtmpPublisher.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/Util.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfArray.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfBoolean.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfData.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfDecoder.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfMap.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfNull.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfNumber.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfObject.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfString.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfType.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfUndefined.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/io/ChunkStreamInfo.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpConnection.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpDecoder.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpSessionInfo.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/io/WindowAckRequired.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Abort.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Acknowledgement.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Audio.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Command.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/ContentData.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Data.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Handshake.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/RtmpHeader.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/RtmpPacket.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/SetChunkSize.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/SetPeerBandwidth.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/UserControl.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/VariableBodyRtmpPacket.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Video.java
 delete mode 100644 rtmp/src/main/java/com/github/faucamp/simplertmp/packets/WindowAckSize.java
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/AmfVersion.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfBoolean.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfData.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfEcmaArray.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfNull.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfNumber.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfObject.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfObjectEnd.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfStrictArray.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfString.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfType.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfUndefined.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Array.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Data.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Dictionary.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Double.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3False.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Integer.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Null.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Object.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3String.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3True.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Type.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Undefined.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/FlvPacket.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/FlvType.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/audio/AacPacket.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioFormat.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioObjectType.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioPacketCallback.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSize.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSoundRate.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSoundType.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSpecificConfig.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/video/H264Packet.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/video/ProfileIop.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoDataType.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoFormat.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoNalType.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoPacketCallback.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoSpecificConfig.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManager.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/Handshake.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpSender.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/chunk/ChunkStreamId.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/chunk/ChunkType.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Abort.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Acknowledgement.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Aggregate.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Audio.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/BasicHeader.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/MessageType.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/RtmpHeader.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/RtmpMessage.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/SetChunkSize.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/SetPeerBandwidth.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Video.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/WindowAcknowledgementSize.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/Command.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/CommandAmf0.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/CommandAmf3.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/Event.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/Type.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/UserControl.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/Data.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/DataAmf0.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/DataAmf3.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObject.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObjectAmf0.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObjectAmf3.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/utils/AuthUtil.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/utils/BitrateManager.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/utils/CommandSessionHistory.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/utils/ConnectCheckerRtmp.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/utils/RtmpConfig.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/utils/TLSSocketFactory.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/utils/Utils.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/utils/socket/RtmpSocket.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/utils/socket/TcpSocket.kt
 create mode 100644 rtmp/src/main/java/com/pedro/rtmp/utils/socket/TcpTunneledSocket.kt
 delete mode 100644 rtmp/src/main/java/net/ossrs/rtmp/BitrateManager.java
 delete mode 100644 rtmp/src/main/java/net/ossrs/rtmp/ConnectCheckerRtmp.java
 delete mode 100644 rtmp/src/main/java/net/ossrs/rtmp/CreateSSLSocket.java
 delete mode 100644 rtmp/src/main/java/net/ossrs/rtmp/ProfileIop.java
 delete mode 100644 rtmp/src/main/java/net/ossrs/rtmp/SrsAllocator.java
 delete mode 100644 rtmp/src/main/java/net/ossrs/rtmp/SrsFlvMuxer.java
 delete mode 100644 rtmp/src/main/java/net/ossrs/rtmp/TLSSocketFactory.java
 create mode 100644 rtmp/src/test/java/android/media/MediaCodec.java
 create mode 100644 rtmp/src/test/java/android/util/Base64.java
 create mode 100644 rtmp/src/test/java/android/util/Log.java
 create mode 100644 rtmp/src/test/java/com/pedro/rtmp/utils/AuthUtilTest.kt
 create mode 100644 rtmp/src/test/java/com/pedro/rtmp/utils/SocketTest.kt
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/base/StreamBase.kt
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/base/recording/BaseRecordController.java
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/base/recording/RecordController.java
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpCamera1.java
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpCamera2.java
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpDisplay.java
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpOnlyAudio.java
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/RtpType.java
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpStream.kt
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspStream.kt
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/util/AndroidMuxerRecordController.java
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/util/Filter.java
 delete mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/util/RecordController.java
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/AudioManager.kt
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/NoSource.kt
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/VideoManager.kt
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/view/AspectRatioMode.java
 delete mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/view/Filter.java
 create mode 100644 rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlStreamInterface.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtcp/BaseSenderReport.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtcp/BaseSenderReport.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportTcp.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportTcp.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportUdp.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportUdp.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AacPacket.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AacPacket.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AudioPacketCallback.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AudioPacketCallback.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/BasePacket.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/BasePacket.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H264Packet.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H264Packet.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H265Packet.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H265Packet.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/VideoPacketCallback.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/packets/VideoPacketCallback.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/BaseRtpSocket.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/BaseRtpSocket.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketTcp.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketTcp.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketUdp.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketUdp.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/Body.java
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/CommandsManager.java
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/Protocol.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/Protocol.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/RtpFrame.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/RtpFrame.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspSender.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspSender.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/VideoCodec.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/VideoCodec.kt
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/Command.kt
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/CommandParser.kt
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/CommandsManager.kt
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/Method.kt
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/SdpBody.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/AuthUtil.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/AuthUtil.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/BitrateManager.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/BitrateManager.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/ConnectCheckerRtsp.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/ConnectCheckerRtsp.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/CreateSSLSocket.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/CreateSSLSocket.kt
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/Extensions.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/RtpConstants.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/RtpConstants.kt
 delete mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/TLSSocketFactory.java
 create mode 100644 rtsp/src/main/java/com/pedro/rtsp/utils/TLSSocketFactory.kt
 create mode 100644 rtsp/src/test/java/android/util/Base64.java
 create mode 100644 rtsp/src/test/java/android/util/Log.java
 create mode 100644 rtsp/src/test/java/com/pedro/rtsp/rtp/AacPacketTest.kt
 create mode 100644 rtsp/src/test/java/com/pedro/rtsp/rtp/H264PacketTest.kt
 create mode 100644 rtsp/src/test/java/com/pedro/rtsp/rtp/H265PacketTest.kt
 create mode 100644 rtsp/src/test/java/com/pedro/rtsp/rtsp/CommandParserTest.kt
 create mode 100644 rtsp/src/test/java/com/pedro/rtsp/rtsp/SdpBodyTest.kt
 create mode 100644 rtsp/src/test/java/com/pedro/rtsp/utils/AuthUtilTest.kt
 create mode 100644 rtsp/src/test/java/com/pedro/rtsp/utils/BitrateManagerTest.kt
 create mode 100644 rtsp/src/test/java/com/pedro/rtsp/utils/ExtensionsTest.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0025d46..13fab39 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -19,7 +19,6 @@
             <option value="$PROJECT_DIR$/rtsp" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 2370474..35ffc9d 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
       <option name="name" value="maven" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 98de6fa..9bbb4ab 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,6 +5,13 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/layout/stream.xml" value="0.1983695652173913" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 5cc28c2..a50af2b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,13 +5,13 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "31.0.0"
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "fr.mobdev.peertubelive"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 32
         versionCode 2
         versionName "1.1"
 
@@ -39,6 +39,7 @@ android {
     buildFeatures {
         dataBinding true
     }
+    namespace 'fr.mobdev.peertubelive'
 
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index df0657c..b6b3aab 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="fr.mobdev.peertubelive">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt b/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt
index 78aa662..ad52aa5 100644
--- a/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt
+++ b/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt
@@ -32,8 +32,8 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import com.pedro.encoder.input.video.CameraHelper
+import com.pedro.rtmp.utils.ConnectCheckerRtmp
 import com.pedro.rtplibrary.rtmp.RtmpCamera2
-import net.ossrs.rtmp.ConnectCheckerRtmp
 import fr.mobdev.peertubelive.R
 import fr.mobdev.peertubelive.databinding.StreamBinding
 import fr.mobdev.peertubelive.manager.InstanceManager.EXTRA_DATA
@@ -271,6 +271,10 @@ class StreamActivity : AppCompatActivity() {
         binding.flash.visibility = View.VISIBLE
 
         val connectChecker : ConnectCheckerRtmp = object : ConnectCheckerRtmp {
+            override fun onConnectionStartedRtmp(rtmpUrl: String) {
+
+            }
+
             override fun onConnectionSuccessRtmp() {
                 runOnUiThread {
                     Toast.makeText(binding.root.context, "Connection success", Toast.LENGTH_SHORT).show();
@@ -347,7 +351,7 @@ class StreamActivity : AppCompatActivity() {
 
 //start stream
 
-        if (rtmpCamera2.prepareAudio() && rtmpCamera2.prepareVideo(width,height,30, (width*height*30*0.076).toInt(),false,CameraHelper.getCameraOrientation(this))) {
+        if (rtmpCamera2.prepareAudio() && rtmpCamera2.prepareVideo(width,height,30, (width*height*30*0.076).toInt(),CameraHelper.getCameraOrientation(this))) {
             rtmpCamera2.startStream(streamData.url+"/"+streamData.key)
         } else {
             /**This device cant init encoders, this could be for 2 reasons: The encoder selected doesnt support any configuration setted or your device hasnt a H264 or AAC encoder (in this case you can see log error valid encoder not found) */
diff --git a/app/src/main/res/layout/stream.xml b/app/src/main/res/layout/stream.xml
index 3a77940..494f555 100644
--- a/app/src/main/res/layout/stream.xml
+++ b/app/src/main/res/layout/stream.xml
@@ -41,7 +41,7 @@
                 android:layout_height="0dp"
                 android:id="@+id/surfaceView"
                 app:keepAspectRatio="true"
-                app:aspectRatioMode="adjust_rotate"
+                app:aspectRatioMode="adjust"
                 app:AAEnabled="false"
                 app:numFilters="1"
                 app:isFlipHorizontal="false"
diff --git a/build.gradle b/build.gradle
index 4a75747..3993d21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.6.21'
+    ext.rtsp_version_name = '2.1.9'
+    ext.rtsp_version_code = 219
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5'
+        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.4.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,7 +20,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
 }
diff --git a/encoder/build.gradle b/encoder/build.gradle
index fc032a0..e20d370 100644
--- a/encoder/build.gradle
+++ b/encoder/build.gradle
@@ -1,11 +1,13 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 32
 
   defaultConfig {
     minSdkVersion 16
-    targetSdkVersion 30
+    targetSdkVersion 32
   }
   buildTypes {
     release {
@@ -13,8 +15,11 @@ android {
       consumerProguardFiles 'proguard-rules.pro'
     }
   }
+  namespace 'com.pedro.encoder'
+
 }
 
 dependencies {
-  api 'androidx.annotation:annotation:1.2.0'
+  api 'androidx.annotation:annotation:1.3.0'
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
diff --git a/encoder/src/main/AndroidManifest.xml b/encoder/src/main/AndroidManifest.xml
index d21c457..cc947c5 100644
--- a/encoder/src/main/AndroidManifest.xml
+++ b/encoder/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.pedro.encoder" />
+<manifest />
diff --git a/encoder/src/main/java/com/pedro/encoder/BaseEncoder.java b/encoder/src/main/java/com/pedro/encoder/BaseEncoder.java
index c830f5e..b82fde0 100644
--- a/encoder/src/main/java/com/pedro/encoder/BaseEncoder.java
+++ b/encoder/src/main/java/com/pedro/encoder/BaseEncoder.java
@@ -1,37 +1,145 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder;
 
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.os.Build;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.util.Log;
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import com.pedro.encoder.utils.CodecUtil;
 import java.nio.ByteBuffer;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
 
 /**
  * Created by pedro on 18/09/19.
  */
 public abstract class BaseEncoder implements EncoderCallback {
 
-  private static final String TAG = "BaseEncoder";
-  private MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
+  protected String TAG = "BaseEncoder";
+  private final MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
+  private HandlerThread handlerThread;
+  protected BlockingQueue<Frame> queue = new ArrayBlockingQueue<>(80);
   protected MediaCodec codec;
-  protected long presentTimeUs;
+  protected static long presentTimeUs;
   protected volatile boolean running = false;
   protected boolean isBufferMode = true;
   protected CodecUtil.Force force = CodecUtil.Force.FIRST_COMPATIBLE_FOUND;
+  private MediaCodec.Callback callback;
+  private long oldTimeStamp = 0L;
+  protected boolean shouldReset = true;
+
+  public void restart() {
+    start(false);
+    initCodec();
+  }
 
   public void start() {
+    if (presentTimeUs == 0) {
+      presentTimeUs = System.nanoTime() / 1000;
+    }
     start(true);
+    initCodec();
   }
 
+  private void initCodec() {
+    handlerThread = new HandlerThread(TAG);
+    handlerThread.start();
+    Handler handler = new Handler(handlerThread.getLooper());
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      createAsyncCallback();
+      codec.setCallback(callback, handler);
+      codec.start();
+    } else {
+      codec.start();
+      handler.post(new Runnable() {
+        @Override
+        public void run() {
+          while (running) {
+            try {
+              getDataFromEncoder();
+            } catch (IllegalStateException e) {
+              Log.i(TAG, "Encoding error", e);
+              reloadCodec();
+            }
+          }
+        }
+      });
+    }
+    running = true;
+  }
+
+  public abstract void reset();
+
   public abstract void start(boolean resetTs);
 
   protected abstract void stopImp();
 
+  protected void fixTimeStamp(MediaCodec.BufferInfo info) {
+    if (oldTimeStamp > info.presentationTimeUs) {
+      info.presentationTimeUs = oldTimeStamp;
+    } else {
+      oldTimeStamp = info.presentationTimeUs;
+    }
+  }
+
+  private void reloadCodec() {
+    //Sometimes encoder crash, we will try recover it. Reset encoder a time if crash
+    if (shouldReset) {
+      Log.e(TAG, "Encoder crashed, trying to recover it");
+      reset();
+    }
+  }
+
   public void stop() {
+    stop(true);
+  }
+
+  public void stop(boolean resetTs) {
+    if (resetTs) {
+      presentTimeUs = 0;
+    }
     running = false;
     stopImp();
+    if (handlerThread != null) {
+      if (handlerThread.getLooper() != null) {
+        if (handlerThread.getLooper().getThread() != null) {
+          handlerThread.getLooper().getThread().interrupt();
+        }
+        handlerThread.getLooper().quit();
+      }
+      handlerThread.quit();
+      if (codec != null) {
+        try {
+          codec.flush();
+        } catch (IllegalStateException ignored) { }
+      }
+      //wait for thread to die for 500ms.
+      try {
+        handlerThread.getLooper().getThread().join(500);
+      } catch (Exception ignored) { }
+    }
+    queue.clear();
+    queue = new ArrayBlockingQueue<>(80);
     try {
       codec.stop();
       codec.release();
@@ -39,18 +147,19 @@ public abstract class BaseEncoder implements EncoderCallback {
     } catch (IllegalStateException | NullPointerException e) {
       codec = null;
     }
+    oldTimeStamp = 0L;
   }
 
   protected abstract MediaCodecInfo chooseEncoder(String mime);
 
-  protected void getDataFromEncoder(Frame frame) throws IllegalStateException {
+  protected void getDataFromEncoder() throws IllegalStateException {
     if (isBufferMode) {
       int inBufferIndex = codec.dequeueInputBuffer(0);
       if (inBufferIndex >= 0) {
-        inputAvailable(codec, inBufferIndex, frame);
+        inputAvailable(codec, inBufferIndex);
       }
     }
-    for (; running; ) {
+    while (running) {
       int outBufferIndex = codec.dequeueOutputBuffer(bufferInfo, 0);
       if (outBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
         MediaFormat mediaFormat = codec.getOutputFormat();
@@ -65,16 +174,22 @@ public abstract class BaseEncoder implements EncoderCallback {
 
   protected abstract Frame getInputFrame() throws InterruptedException;
 
+  protected abstract long calculatePts(Frame frame, long presentTimeUs);
+
   private void processInput(@NonNull ByteBuffer byteBuffer, @NonNull MediaCodec mediaCodec,
-      int inBufferIndex, Frame frame) throws IllegalStateException {
+      int inBufferIndex) throws IllegalStateException {
     try {
-      if (frame == null) frame = getInputFrame();
+      Frame frame = getInputFrame();
+      while (frame == null) frame = getInputFrame();
       byteBuffer.clear();
-      byteBuffer.put(frame.getBuffer(), frame.getOffset(), frame.getSize());
-      long pts = System.nanoTime() / 1000 - presentTimeUs;
-      mediaCodec.queueInputBuffer(inBufferIndex, 0, frame.getSize(), pts, 0);
+      int size = Math.max(0, Math.min(frame.getSize(), byteBuffer.remaining()) - frame.getOffset());
+      byteBuffer.put(frame.getBuffer(), frame.getOffset(), size);
+      long pts = calculatePts(frame, presentTimeUs);
+      mediaCodec.queueInputBuffer(inBufferIndex, 0, size, pts, 0);
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
+    } catch (NullPointerException | IndexOutOfBoundsException e) {
+      Log.i(TAG, "Encoding error", e);
     }
   }
 
@@ -100,7 +215,7 @@ public abstract class BaseEncoder implements EncoderCallback {
   }
 
   @Override
-  public void inputAvailable(@NonNull MediaCodec mediaCodec, int inBufferIndex, Frame frame)
+  public void inputAvailable(@NonNull MediaCodec mediaCodec, int inBufferIndex)
       throws IllegalStateException {
     ByteBuffer byteBuffer;
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -108,7 +223,7 @@ public abstract class BaseEncoder implements EncoderCallback {
     } else {
       byteBuffer = mediaCodec.getInputBuffers()[inBufferIndex];
     }
-    processInput(byteBuffer, mediaCodec, inBufferIndex, frame);
+    processInput(byteBuffer, mediaCodec, inBufferIndex);
   }
 
   @Override
@@ -122,4 +237,41 @@ public abstract class BaseEncoder implements EncoderCallback {
     }
     processOutput(byteBuffer, mediaCodec, outBufferIndex, bufferInfo);
   }
+
+  @RequiresApi(api = Build.VERSION_CODES.M)
+  private void createAsyncCallback() {
+    callback = new MediaCodec.Callback() {
+      @Override
+      public void onInputBufferAvailable(@NonNull MediaCodec mediaCodec, int inBufferIndex) {
+        try {
+          inputAvailable(mediaCodec, inBufferIndex);
+        } catch (IllegalStateException e) {
+          Log.i(TAG, "Encoding error", e);
+          reloadCodec();
+        }
+      }
+
+      @Override
+      public void onOutputBufferAvailable(@NonNull MediaCodec mediaCodec, int outBufferIndex,
+          @NonNull MediaCodec.BufferInfo bufferInfo) {
+        try {
+          outputAvailable(mediaCodec, outBufferIndex, bufferInfo);
+        } catch (IllegalStateException e) {
+          Log.i(TAG, "Encoding error", e);
+          reloadCodec();
+        }
+      }
+
+      @Override
+      public void onError(@NonNull MediaCodec mediaCodec, @NonNull MediaCodec.CodecException e) {
+        Log.e(TAG, "Error", e);
+      }
+
+      @Override
+      public void onOutputFormatChanged(@NonNull MediaCodec mediaCodec,
+          @NonNull MediaFormat mediaFormat) {
+        formatChanged(mediaCodec, mediaFormat);
+      }
+    };
+  }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/EncoderCallback.java b/encoder/src/main/java/com/pedro/encoder/EncoderCallback.java
index e657528..49e1d59 100644
--- a/encoder/src/main/java/com/pedro/encoder/EncoderCallback.java
+++ b/encoder/src/main/java/com/pedro/encoder/EncoderCallback.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder;
 
 import android.media.MediaCodec;
@@ -8,7 +24,7 @@ import androidx.annotation.NonNull;
  * Created by pedro on 18/09/19.
  */
 public interface EncoderCallback {
-  void inputAvailable(@NonNull MediaCodec mediaCodec, int inBufferIndex, Frame frame)
+  void inputAvailable(@NonNull MediaCodec mediaCodec, int inBufferIndex)
       throws IllegalStateException;
 
   void outputAvailable(@NonNull MediaCodec mediaCodec, int outBufferIndex,
diff --git a/encoder/src/main/java/com/pedro/encoder/Frame.java b/encoder/src/main/java/com/pedro/encoder/Frame.java
index f2edf56..46b43cd 100644
--- a/encoder/src/main/java/com/pedro/encoder/Frame.java
+++ b/encoder/src/main/java/com/pedro/encoder/Frame.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder;
 
 import android.graphics.ImageFormat;
diff --git a/encoder/src/main/java/com/pedro/encoder/GetFrame.java b/encoder/src/main/java/com/pedro/encoder/GetFrame.java
new file mode 100644
index 0000000..ff862ce
--- /dev/null
+++ b/encoder/src/main/java/com/pedro/encoder/GetFrame.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder;
+
+public interface GetFrame {
+  Frame getInputFrame();
+}
diff --git a/encoder/src/main/java/com/pedro/encoder/audio/AudioEncoder.java b/encoder/src/main/java/com/pedro/encoder/audio/AudioEncoder.java
index f98c688..8b6d161 100644
--- a/encoder/src/main/java/com/pedro/encoder/audio/AudioEncoder.java
+++ b/encoder/src/main/java/com/pedro/encoder/audio/AudioEncoder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.audio;
 
 import android.media.MediaCodec;
@@ -7,11 +23,10 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import com.pedro.encoder.BaseEncoder;
 import com.pedro.encoder.Frame;
+import com.pedro.encoder.GetFrame;
 import com.pedro.encoder.input.audio.GetMicrophoneData;
 import com.pedro.encoder.utils.CodecUtil;
-import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -22,15 +37,18 @@ import java.util.List;
 
 public class AudioEncoder extends BaseEncoder implements GetMicrophoneData {
 
-  private static final String TAG = "AudioEncoder";
-
-  private GetAacData getAacData;
+  private final GetAacData getAacData;
   private int bitRate = 64 * 1024;  //in kbps
   private int sampleRate = 32000; //in hz
+  private int maxInputSize = 0;
   private boolean isStereo = true;
+  private GetFrame getFrame;
+  private long bytesRead = 0;
+  private boolean tsModeBuffer = false;
 
   public AudioEncoder(GetAacData getAacData) {
     this.getAacData = getAacData;
+    TAG = "AudioEncoder";
   }
 
   /**
@@ -38,31 +56,19 @@ public class AudioEncoder extends BaseEncoder implements GetMicrophoneData {
    */
   public boolean prepareAudioEncoder(int bitRate, int sampleRate, boolean isStereo,
       int maxInputSize) {
+    this.bitRate = bitRate;
     this.sampleRate = sampleRate;
+    this.maxInputSize = maxInputSize;
+    this.isStereo = isStereo;
     isBufferMode = true;
     try {
-      List<MediaCodecInfo> encoders = new ArrayList<>();
-      if (force == CodecUtil.Force.HARDWARE) {
-        encoders = CodecUtil.getAllHardwareEncoders(CodecUtil.AAC_MIME);
-      } else if (force == CodecUtil.Force.SOFTWARE) {
-        encoders = CodecUtil.getAllSoftwareEncoders(CodecUtil.AAC_MIME);
-      }
-
-      if (force == CodecUtil.Force.FIRST_COMPATIBLE_FOUND) {
-        MediaCodecInfo encoder = chooseEncoder(CodecUtil.AAC_MIME);
-        if (encoder != null) {
-          codec = MediaCodec.createByCodecName(encoder.getName());
-        } else {
-          Log.e(TAG, "Valid encoder not found");
-          return false;
-        }
+      MediaCodecInfo encoder = chooseEncoder(CodecUtil.AAC_MIME);
+      if (encoder != null) {
+        Log.i(TAG, "Encoder selected " + encoder.getName());
+        codec = MediaCodec.createByCodecName(encoder.getName());
       } else {
-        if (encoders.isEmpty()) {
-          Log.e(TAG, "Valid encoder not found");
-          return false;
-        } else {
-          codec = MediaCodec.createByCodecName(encoders.get(0).getName());
-        }
+        Log.e(TAG, "Valid encoder not found");
+        return false;
       }
 
       int channelCount = (isStereo) ? 2 : 1;
@@ -76,41 +82,65 @@ public class AudioEncoder extends BaseEncoder implements GetMicrophoneData {
       running = false;
       Log.i(TAG, "prepared");
       return true;
-    } catch (IOException | IllegalStateException e) {
+    } catch (Exception e) {
       Log.e(TAG, "Create AudioEncoder failed.", e);
+      this.stop();
       return false;
     }
   }
 
+  public void setGetFrame(GetFrame getFrame) {
+    this.getFrame = getFrame;
+  }
+
   /**
    * Prepare encoder with default parameters
    */
   public boolean prepareAudioEncoder() {
-    return prepareAudioEncoder(bitRate, sampleRate, isStereo, 0);
+    return prepareAudioEncoder(bitRate, sampleRate, isStereo, maxInputSize);
   }
 
   @Override
   public void start(boolean resetTs) {
-    presentTimeUs = System.nanoTime() / 1000;
-    codec.start();
-    running = true;
+    shouldReset = resetTs;
     Log.i(TAG, "started");
   }
 
   @Override
   protected void stopImp() {
+    bytesRead = 0;
     Log.i(TAG, "stopped");
   }
 
+  @Override
+  public void reset() {
+    stop(false);
+    prepareAudioEncoder(bitRate, sampleRate, isStereo, maxInputSize);
+    restart();
+  }
+
   @Override
   protected Frame getInputFrame() throws InterruptedException {
-    return null;
+    return getFrame != null ? getFrame.getInputFrame() : queue.take();
+  }
+
+  @Override
+  protected long calculatePts(Frame frame, long presentTimeUs) {
+    long pts;
+    if (tsModeBuffer) {
+      int channels = isStereo ? 2 : 1;
+      pts = 1000000 * bytesRead / 2 / channels / sampleRate;
+      bytesRead += frame.getSize();
+    } else {
+      pts = System.nanoTime() / 1000 - presentTimeUs;
+    }
+    return pts;
   }
 
   @Override
   protected void checkBuffer(@NonNull ByteBuffer byteBuffer,
       @NonNull MediaCodec.BufferInfo bufferInfo) {
-
+    fixTimeStamp(bufferInfo);
   }
 
   @Override
@@ -123,39 +153,45 @@ public class AudioEncoder extends BaseEncoder implements GetMicrophoneData {
    * Set custom PCM data.
    * Use it after prepareAudioEncoder(int sampleRate, int channel).
    * Used too with microphone.
-   *
    */
   @Override
   public void inputPCMData(Frame frame) {
-    if (running) {
-      try {
-        getDataFromEncoder(frame);
-      } catch (IllegalStateException e) {
-        Log.i(TAG, "Encoding error", e);
-      }
-    } else {
+    if (running && !queue.offer(frame)) {
       Log.i(TAG, "frame discarded");
     }
   }
 
   @Override
   protected MediaCodecInfo chooseEncoder(String mime) {
-    List<MediaCodecInfo> mediaCodecInfoList = CodecUtil.getAllEncoders(mime);
-    for (MediaCodecInfo mediaCodecInfo : mediaCodecInfoList) {
-      String name = mediaCodecInfo.getName().toLowerCase();
-      if (!name.contains("omx.google")) return mediaCodecInfo;
-    }
-    if (mediaCodecInfoList.size() > 0) {
-      return mediaCodecInfoList.get(0);
+    List<MediaCodecInfo> mediaCodecInfoList;
+    if (force == CodecUtil.Force.HARDWARE) {
+      mediaCodecInfoList = CodecUtil.getAllHardwareEncoders(CodecUtil.AAC_MIME);
+    } else if (force == CodecUtil.Force.SOFTWARE) {
+      mediaCodecInfoList = CodecUtil.getAllSoftwareEncoders(CodecUtil.AAC_MIME);
     } else {
-      return null;
+      //Priority: hardware > software
+      mediaCodecInfoList = CodecUtil.getAllEncoders(CodecUtil.AAC_MIME, true);
     }
+
+    Log.i(TAG, mediaCodecInfoList.size() + " encoders found");
+    if (mediaCodecInfoList.isEmpty()) return null;
+    else return mediaCodecInfoList.get(0);
   }
 
   public void setSampleRate(int sampleRate) {
     this.sampleRate = sampleRate;
   }
 
+  public boolean isTsModeBuffer() {
+    return tsModeBuffer;
+  }
+
+  public void setTsModeBuffer(boolean tsModeBuffer) {
+    if (!isRunning()) {
+      this.tsModeBuffer = tsModeBuffer;
+    }
+  }
+
   @Override
   public void formatChanged(@NonNull MediaCodec mediaCodec, @NonNull MediaFormat mediaFormat) {
     getAacData.onAudioFormat(mediaFormat);
diff --git a/encoder/src/main/java/com/pedro/encoder/audio/GetAacData.java b/encoder/src/main/java/com/pedro/encoder/audio/GetAacData.java
index 15a7991..94f99d0 100644
--- a/encoder/src/main/java/com/pedro/encoder/audio/GetAacData.java
+++ b/encoder/src/main/java/com/pedro/encoder/audio/GetAacData.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.audio;
 
 import android.media.MediaCodec;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/audio/AudioPostProcessEffect.java b/encoder/src/main/java/com/pedro/encoder/input/audio/AudioPostProcessEffect.java
index 08ca5e6..9921b50 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/audio/AudioPostProcessEffect.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/audio/AudioPostProcessEffect.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.audio;
 
 import android.media.audiofx.AcousticEchoCanceler;
@@ -13,7 +29,7 @@ public class AudioPostProcessEffect {
 
   private final String TAG = "AudioPostProcessEffect";
 
-  private int microphoneId;
+  private final int microphoneId;
   private AcousticEchoCanceler acousticEchoCanceler = null;
   private AutomaticGainControl automaticGainControl = null;
   private NoiseSuppressor noiseSuppressor = null;
@@ -25,11 +41,13 @@ public class AudioPostProcessEffect {
   public void enableAutoGainControl() {
     if (AutomaticGainControl.isAvailable() && automaticGainControl == null) {
       automaticGainControl = AutomaticGainControl.create(microphoneId);
-      automaticGainControl.setEnabled(true);
-      Log.i(TAG, "AutoGainControl enabled");
-    } else {
-      Log.e(TAG, "This device don't support AutoGainControl");
+      if (automaticGainControl != null) {
+        automaticGainControl.setEnabled(true);
+        Log.i(TAG, "AutoGainControl enabled");
+        return;
+      }
     }
+    Log.e(TAG, "This device doesn't implement AutoGainControl");
   }
 
   public void releaseAutoGainControl() {
@@ -43,11 +61,13 @@ public class AudioPostProcessEffect {
   public void enableEchoCanceler() {
     if (AcousticEchoCanceler.isAvailable() && acousticEchoCanceler == null) {
       acousticEchoCanceler = AcousticEchoCanceler.create(microphoneId);
-      acousticEchoCanceler.setEnabled(true);
-      Log.i(TAG, "EchoCanceler enabled");
-    } else {
-      Log.e(TAG, "This device don't support EchoCanceler");
+      if (acousticEchoCanceler != null) {
+        acousticEchoCanceler.setEnabled(true);
+        Log.i(TAG, "EchoCanceler enabled");
+        return;
+      }
     }
+    Log.e(TAG, "This device doesn't implement EchoCanceler");
   }
 
   public void releaseEchoCanceler() {
@@ -61,11 +81,13 @@ public class AudioPostProcessEffect {
   public void enableNoiseSuppressor() {
     if (NoiseSuppressor.isAvailable() && noiseSuppressor == null) {
       noiseSuppressor = NoiseSuppressor.create(microphoneId);
-      noiseSuppressor.setEnabled(true);
-      Log.i(TAG, "NoiseSuppressor enabled");
-    } else {
-      Log.e(TAG, "This device don't support NoiseSuppressor");
+      if (noiseSuppressor != null) {
+        noiseSuppressor.setEnabled(true);
+        Log.i(TAG, "NoiseSuppressor enabled");
+        return;
+      }
     }
+    Log.e(TAG, "This device doesn't implement NoiseSuppressor");
   }
 
   public void releaseNoiseSuppressor() {
@@ -75,4 +97,10 @@ public class AudioPostProcessEffect {
       noiseSuppressor = null;
     }
   }
+
+  public void release() {
+    releaseAutoGainControl();
+    releaseEchoCanceler();
+    releaseNoiseSuppressor();
+  }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/audio/CustomAudioEffect.java b/encoder/src/main/java/com/pedro/encoder/input/audio/CustomAudioEffect.java
index 9ec8ce2..eeeb48f 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/audio/CustomAudioEffect.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/audio/CustomAudioEffect.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.audio;
 
 public abstract class CustomAudioEffect {
diff --git a/encoder/src/main/java/com/pedro/encoder/input/audio/GetMicrophoneData.java b/encoder/src/main/java/com/pedro/encoder/input/audio/GetMicrophoneData.java
index 5c62af5..a966f5c 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/audio/GetMicrophoneData.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/audio/GetMicrophoneData.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.audio;
 
 import com.pedro.encoder.Frame;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneManager.java b/encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneManager.java
index aa2376d..724e0cf 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneManager.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneManager.java
@@ -1,5 +1,22 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.audio;
 
+import android.annotation.SuppressLint;
 import android.media.AudioFormat;
 import android.media.AudioPlaybackCaptureConfiguration;
 import android.media.AudioRecord;
@@ -16,28 +33,29 @@ import java.nio.ByteBuffer;
  * Created by pedro on 19/01/17.
  */
 
+@SuppressLint("MissingPermission")
 public class MicrophoneManager {
 
   private final String TAG = "MicrophoneManager";
-  private static final int BUFFER_SIZE = 4096;
+  private int BUFFER_SIZE = 0;
   protected AudioRecord audioRecord;
-  private GetMicrophoneData getMicrophoneData;
-  private ByteBuffer pcmBuffer = ByteBuffer.allocateDirect(BUFFER_SIZE);
-  private byte[] pcmBufferMuted = new byte[BUFFER_SIZE];
+  private final GetMicrophoneData getMicrophoneData;
+  protected byte[] pcmBuffer = new byte[BUFFER_SIZE];
+  protected byte[] pcmBufferMuted = new byte[BUFFER_SIZE];
   protected boolean running = false;
   private boolean created = false;
-
   //default parameters for microphone
   private int sampleRate = 32000; //hz
-  private int audioFormat = AudioFormat.ENCODING_PCM_16BIT;
+  private final int audioFormat = AudioFormat.ENCODING_PCM_16BIT;
   private int channel = AudioFormat.CHANNEL_IN_STEREO;
-  private boolean muted = false;
+  protected boolean muted = false;
   private AudioPostProcessEffect audioPostProcessEffect;
-  HandlerThread handlerThread;
-  private CustomAudioEffect customAudioEffect = new NoAudioEffect();
+  protected HandlerThread handlerThread;
+  protected CustomAudioEffect customAudioEffect = new NoAudioEffect();
 
   public MicrophoneManager(GetMicrophoneData getMicrophoneData) {
     this.getMicrophoneData = getMicrophoneData;
+    getPcmBufferSize();
   }
 
   public void setCustomAudioEffect(CustomAudioEffect customAudioEffect) {
@@ -55,61 +73,86 @@ public class MicrophoneManager {
   /**
    * Create audio record with params and default audio source
    */
-  public void createMicrophone(int sampleRate, boolean isStereo, boolean echoCanceler,
+  public boolean createMicrophone(int sampleRate, boolean isStereo, boolean echoCanceler,
       boolean noiseSuppressor) {
-    createMicrophone(MediaRecorder.AudioSource.DEFAULT, sampleRate, isStereo, echoCanceler, noiseSuppressor);
+    return createMicrophone(MediaRecorder.AudioSource.DEFAULT, sampleRate, isStereo, echoCanceler,
+        noiseSuppressor);
   }
 
   /**
    * Create audio record with params and selected audio source
-   * @param audioSource - the recording source. See {@link MediaRecorder.AudioSource} for the recording source definitions.
+   *
+   * @param audioSource - the recording source. See {@link MediaRecorder.AudioSource} for the
+   * recording source definitions.
    */
-  public void createMicrophone(int audioSource, int sampleRate, boolean isStereo, boolean echoCanceler,
-                               boolean noiseSuppressor) {
-    this.sampleRate = sampleRate;
-    if (!isStereo) channel = AudioFormat.CHANNEL_IN_MONO;
-    audioRecord =
-            new AudioRecord(audioSource, sampleRate, channel, audioFormat,
-                    getPcmBufferSize());
-    audioPostProcessEffect = new AudioPostProcessEffect(audioRecord.getAudioSessionId());
-    if (echoCanceler) audioPostProcessEffect.enableEchoCanceler();
-    if (noiseSuppressor) audioPostProcessEffect.enableNoiseSuppressor();
-    String chl = (isStereo) ? "Stereo" : "Mono";
-    Log.i(TAG, "Microphone created, " + sampleRate + "hz, " + chl);
-    created = true;
+  public boolean createMicrophone(int audioSource, int sampleRate, boolean isStereo,
+      boolean echoCanceler, boolean noiseSuppressor) {
+    try {
+      this.sampleRate = sampleRate;
+      channel = isStereo ? AudioFormat.CHANNEL_IN_STEREO : AudioFormat.CHANNEL_IN_MONO;
+      audioRecord = new AudioRecord(audioSource, sampleRate, channel, audioFormat, getMaxInputSize() * 5);
+      audioPostProcessEffect = new AudioPostProcessEffect(audioRecord.getAudioSessionId());
+      if (echoCanceler) audioPostProcessEffect.enableEchoCanceler();
+      if (noiseSuppressor) audioPostProcessEffect.enableNoiseSuppressor();
+      String chl = (isStereo) ? "Stereo" : "Mono";
+      if (audioRecord.getState() != AudioRecord.STATE_INITIALIZED) {
+        throw new IllegalArgumentException("Some parameters specified is not valid");
+      }
+      Log.i(TAG, "Microphone created, " + sampleRate + "hz, " + chl);
+      created = true;
+    } catch (IllegalArgumentException e) {
+      Log.e(TAG, "create microphone error", e);
+    }
+    return created;
   }
 
   /**
-   * Create audio record with params and AudioPlaybackCaptureConfig used for capturing internal audio
-   * Notice that you should granted {@link android.Manifest.permission#RECORD_AUDIO} before calling this!
-   *
-   * @param config - AudioPlaybackCaptureConfiguration received from {@link android.media.projection.MediaProjection}
+   * Create audio record with params and AudioPlaybackCaptureConfig used for capturing internal
+   * audio
+   * Notice that you should granted {@link android.Manifest.permission#RECORD_AUDIO} before calling
+   * this!
    *
+   * @param config - AudioPlaybackCaptureConfiguration received from {@link
+   * android.media.projection.MediaProjection}
    * @see AudioPlaybackCaptureConfiguration.Builder#Builder(MediaProjection)
    * @see "https://developer.android.com/guide/topics/media/playback-capture"
    * @see "https://medium.com/@debuggingisfun/android-10-audio-capture-77dd8e9070f9"
    */
-  public void createInternalMicrophone(AudioPlaybackCaptureConfiguration config, int sampleRate, boolean isStereo) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      this.sampleRate = sampleRate;
-      if (!isStereo) channel = AudioFormat.CHANNEL_IN_MONO;
-      audioRecord = new AudioRecord.Builder()
-              .setAudioPlaybackCaptureConfig(config)
-              .setAudioFormat(new AudioFormat.Builder()
-                      .setEncoding(audioFormat)
-                      .setSampleRate(sampleRate)
-                      .setChannelMask(channel)
-                      .build())
-              .setBufferSizeInBytes(getPcmBufferSize())
-              .build();
-
-      audioPostProcessEffect = new AudioPostProcessEffect(audioRecord.getAudioSessionId());
-      String chl = (isStereo) ? "Stereo" : "Mono";
-      Log.i(TAG, "Internal microphone created, " + sampleRate + "hz, " + chl);
-      created = true;
-    } else createMicrophone(sampleRate, isStereo, false, false);
+  public boolean createInternalMicrophone(AudioPlaybackCaptureConfiguration config, int sampleRate,
+      boolean isStereo, boolean echoCanceler, boolean noiseSuppressor) {
+    try {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        this.sampleRate = sampleRate;
+        channel = isStereo ? AudioFormat.CHANNEL_IN_STEREO : AudioFormat.CHANNEL_IN_MONO;
+        audioRecord = new AudioRecord.Builder().setAudioPlaybackCaptureConfig(config)
+            .setAudioFormat(new AudioFormat.Builder().setEncoding(audioFormat)
+                .setSampleRate(sampleRate)
+                .setChannelMask(channel)
+                .build())
+            .setBufferSizeInBytes(getMaxInputSize() * 5)
+            .build();
+        audioPostProcessEffect = new AudioPostProcessEffect(audioRecord.getAudioSessionId());
+        if (echoCanceler) audioPostProcessEffect.enableEchoCanceler();
+        if (noiseSuppressor) audioPostProcessEffect.enableNoiseSuppressor();
+        String chl = (isStereo) ? "Stereo" : "Mono";
+        if (audioRecord.getState() != AudioRecord.STATE_INITIALIZED) {
+          throw new IllegalArgumentException("Some parameters specified is not valid");
+        }
+        Log.i(TAG, "Internal microphone created, " + sampleRate + "hz, " + chl);
+        created = true;
+      } else {
+        return createMicrophone(sampleRate, isStereo, echoCanceler, noiseSuppressor);
+      }
+    } catch (IllegalArgumentException e) {
+      Log.e(TAG, "create microphone error", e);
+    }
+    return created;
   }
 
+  public boolean createInternalMicrophone(AudioPlaybackCaptureConfiguration config, int sampleRate,
+      boolean isStereo) {
+    return createInternalMicrophone(config, sampleRate, isStereo, false, false);
+  }
 
   /**
    * Start record and get data
@@ -126,8 +169,6 @@ public class MicrophoneManager {
           Frame frame = read();
           if (frame != null) {
             getMicrophoneData.inputPCMData(frame);
-          } else {
-            running = false;
           }
         }
       }
@@ -160,14 +201,10 @@ public class MicrophoneManager {
   /**
    * @return Object with size and PCM buffer data
    */
-  private Frame read() {
-    pcmBuffer.rewind();
-    int size = audioRecord.read(pcmBuffer, pcmBuffer.remaining());
-    if (size <= 0) {
-      return null;
-    }
-    return new Frame(muted ? pcmBufferMuted : customAudioEffect.process(pcmBuffer.array()),
-        muted ? 0 : pcmBuffer.arrayOffset(), size);
+  protected Frame read() {
+    int size = audioRecord.read(pcmBuffer, 0, pcmBuffer.length);
+    if (size < 0) return null;
+    return new Frame(muted ? pcmBufferMuted : customAudioEffect.process(pcmBuffer), 0, size);
   }
 
   /**
@@ -190,8 +227,7 @@ public class MicrophoneManager {
       audioRecord = null;
     }
     if (audioPostProcessEffect != null) {
-      audioPostProcessEffect.releaseEchoCanceler();
-      audioPostProcessEffect.releaseNoiseSuppressor();
+      audioPostProcessEffect.release();
     }
     Log.i(TAG, "Microphone stopped");
   }
@@ -199,10 +235,10 @@ public class MicrophoneManager {
   /**
    * Get PCM buffer size
    */
-  private int getPcmBufferSize() {
-    int pcmBufSize =
-        AudioRecord.getMinBufferSize(sampleRate, channel, AudioFormat.ENCODING_PCM_16BIT);
-    return pcmBufSize * 5;
+  private void getPcmBufferSize() {
+    BUFFER_SIZE = AudioRecord.getMinBufferSize(sampleRate, channel, audioFormat);
+    pcmBuffer = new byte[BUFFER_SIZE];
+    pcmBufferMuted = new byte[BUFFER_SIZE];
   }
 
   public int getMaxInputSize() {
diff --git a/encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneManagerManual.java b/encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneManagerManual.java
index a97a40b..25f2321 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneManagerManual.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneManagerManual.java
@@ -1,15 +1,33 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.audio;
 
 import android.os.HandlerThread;
 import android.util.Log;
 
+import com.pedro.encoder.Frame;
+import com.pedro.encoder.GetFrame;
 import java.nio.ByteBuffer;
 
 /**
  * Similar to MicrophoneManager but samples are not read automatically.
  * The owner must manually call read(...) as often as samples are needed.
  */
-public class MicrophoneManagerManual extends MicrophoneManager {
+public class MicrophoneManagerManual extends MicrophoneManager implements GetFrame {
 
   private final String TAG = "MicMM";
 
@@ -54,4 +72,13 @@ public class MicrophoneManagerManual extends MicrophoneManager {
     handlerThread = new HandlerThread("nothing");
     super.stop();
   }
+
+  public GetFrame getGetFrame() {
+    return this;
+  }
+
+  @Override
+  public Frame getInputFrame() {
+    return read();
+  }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneMode.java b/encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneMode.java
new file mode 100644
index 0000000..99de57d
--- /dev/null
+++ b/encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneMode.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.audio;
+
+public enum MicrophoneMode {
+  SYNC, ASYNC, BUFFER
+}
diff --git a/encoder/src/main/java/com/pedro/encoder/input/audio/NoAudioEffect.java b/encoder/src/main/java/com/pedro/encoder/input/audio/NoAudioEffect.java
index 90078e6..a04c691 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/audio/NoAudioEffect.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/audio/NoAudioEffect.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.audio;
 
 public class NoAudioEffect extends CustomAudioEffect {
diff --git a/encoder/src/main/java/com/pedro/encoder/input/decoder/AudioDecoder.java b/encoder/src/main/java/com/pedro/encoder/input/decoder/AudioDecoder.java
index d2a03b3..f8a536e 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/decoder/AudioDecoder.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/decoder/AudioDecoder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.decoder;
 
 import android.media.MediaCodec;
@@ -6,160 +22,110 @@ import android.media.MediaFormat;
 import android.util.Log;
 import com.pedro.encoder.Frame;
 import com.pedro.encoder.input.audio.GetMicrophoneData;
+import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.encoder.utils.PCMUtil;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 
 /**
  * Created by pedro on 20/06/17.
  */
-public class AudioDecoder {
-
-  private final String TAG = "AudioDecoder";
+public class AudioDecoder extends BaseDecoder {
 
   private AudioDecoderInterface audioDecoderInterface;
-  private LoopFileInterface loopFileInterface;
-  private MediaExtractor audioExtractor;
-  private MediaCodec audioDecoder;
-  private MediaCodec.BufferInfo audioInfo = new MediaCodec.BufferInfo();
-  private boolean decoding;
-  private Thread thread;
   private GetMicrophoneData getMicrophoneData;
-  private MediaFormat audioFormat;
-  private String mime = "";
   private int sampleRate;
   private boolean isStereo;
   private int channels = 1;
   private int size = 2048;
   private byte[] pcmBuffer = new byte[size];
   private byte[] pcmBufferMuted = new byte[11];
-  private static boolean loopMode = false;
   private boolean muted = false;
-  private long duration;
-  private volatile long seekTime = 0;
-  private volatile long startMs = 0;
 
   public AudioDecoder(GetMicrophoneData getMicrophoneData,
       AudioDecoderInterface audioDecoderInterface, LoopFileInterface loopFileInterface) {
+    super(loopFileInterface);
+    TAG = "AudioDecoder";
     this.getMicrophoneData = getMicrophoneData;
     this.audioDecoderInterface = audioDecoderInterface;
-    this.loopFileInterface = loopFileInterface;
   }
 
-  public boolean initExtractor(String filePath) throws IOException {
-    decoding = false;
-    audioExtractor = new MediaExtractor();
-    audioExtractor.setDataSource(filePath);
+  @Override
+  protected boolean extract(MediaExtractor audioExtractor) {
+    size = 2048;
+    running = false;
     for (int i = 0; i < audioExtractor.getTrackCount() && !mime.startsWith("audio/"); i++) {
-      audioFormat = audioExtractor.getTrackFormat(i);
-      mime = audioFormat.getString(MediaFormat.KEY_MIME);
+      mediaFormat = audioExtractor.getTrackFormat(i);
+      mime = mediaFormat.getString(MediaFormat.KEY_MIME);
       if (mime.startsWith("audio/")) {
         audioExtractor.selectTrack(i);
       } else {
-        audioFormat = null;
+        mediaFormat = null;
       }
     }
-    if (audioFormat != null) {
-      channels = audioFormat.getInteger(MediaFormat.KEY_CHANNEL_COUNT);
+    if (mediaFormat != null) {
+      channels = mediaFormat.getInteger(MediaFormat.KEY_CHANNEL_COUNT);
       isStereo = channels >= 2;
-      sampleRate = audioFormat.getInteger(MediaFormat.KEY_SAMPLE_RATE);
-      duration = audioFormat.getLong(MediaFormat.KEY_DURATION);
-      if (channels >= 2) {
-        pcmBuffer = new byte[2048 * channels];
-      }
+      sampleRate = mediaFormat.getInteger(MediaFormat.KEY_SAMPLE_RATE);
+      duration = mediaFormat.getLong(MediaFormat.KEY_DURATION);
+      fixBuffer();
       return true;
       //audio decoder not supported
     } else {
       mime = "";
-      audioFormat = null;
+      mediaFormat = null;
       return false;
     }
   }
 
+  private void fixBuffer() {
+    if (channels >= 2) {
+      size *= channels;
+    }
+    pcmBuffer = new byte[size];
+  }
+
   public boolean prepareAudio() {
-    try {
-      audioDecoder = MediaCodec.createDecoderByType(mime);
-      audioDecoder.configure(audioFormat, null, null, 0);
-      return true;
-    } catch (IOException e) {
-      Log.e(TAG, "Prepare decoder error:", e);
-      return false;
-    }
+    return prepare(null);
   }
 
-  public void start() {
-    decoding = true;
-    audioDecoder.start();
-    thread = new Thread(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          decodeAudio();
-        } catch (IllegalStateException e) {
-          Log.i(TAG, "Decoding error", e);
-        }
-      }
-    });
-    thread.start();
+  public void reset() {
+    resetCodec(null);
   }
 
-  public void stop() {
-    decoding = false;
-    seekTime = 0;
-    if (thread != null) {
-      thread.interrupt();
-      try {
-        thread.join(100);
-      } catch (InterruptedException e) {
-        thread.interrupt();
-      }
-      thread = null;
-    }
-    try {
-      audioDecoder.stop();
-      audioDecoder.release();
-      audioDecoder = null;
-    } catch (IllegalStateException | NullPointerException e) {
-      audioDecoder = null;
-    }
-    if (audioExtractor != null) {
-      audioExtractor.release();
-      audioExtractor = null;
-    }
-  }
-
-  private void decodeAudio() throws IllegalStateException {
-    ByteBuffer[] inputBuffers = audioDecoder.getInputBuffers();
-    ByteBuffer[] outputBuffers = audioDecoder.getOutputBuffers();
+  @Override
+  protected void decode() {
+    ByteBuffer[] inputBuffers = codec.getInputBuffers();
+    ByteBuffer[] outputBuffers = codec.getOutputBuffers();
     startMs = System.currentTimeMillis();
-    while (decoding) {
-      int inIndex = audioDecoder.dequeueInputBuffer(10000);
+    while (running) {
+      int inIndex = codec.dequeueInputBuffer(10000);
       if (inIndex >= 0) {
         ByteBuffer buffer = inputBuffers[inIndex];
-        int sampleSize = audioExtractor.readSampleData(buffer, 0);
+        int sampleSize = extractor.readSampleData(buffer, 0);
         if (sampleSize < 0) {
-          audioDecoder.queueInputBuffer(inIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
+          codec.queueInputBuffer(inIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
         } else {
-          audioDecoder.queueInputBuffer(inIndex, 0, sampleSize, audioExtractor.getSampleTime(), 0);
-          audioExtractor.advance();
+          codec.queueInputBuffer(inIndex, 0, sampleSize, extractor.getSampleTime(), 0);
+          extractor.advance();
         }
 
-        int outIndex = audioDecoder.dequeueOutputBuffer(audioInfo, 10000);
+        int outIndex = codec.dequeueOutputBuffer(bufferInfo, 10000);
         switch (outIndex) {
           case MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED:
-            outputBuffers = audioDecoder.getOutputBuffers();
+            outputBuffers = codec.getOutputBuffers();
             break;
           case MediaCodec.INFO_OUTPUT_FORMAT_CHANGED:
           case MediaCodec.INFO_TRY_AGAIN_LATER:
             break;
           default:
-            //needed for fix decode speed
-            while (audioExtractor.getSampleTime() / 1000
-                > System.currentTimeMillis() - startMs + seekTime) {
+            long extractorTs = extractor.getSampleTime() / 1000;
+            long currentTs = System.currentTimeMillis() - startMs + seekTime;
+            if (extractorTs > currentTs) {
               try {
-                Thread.sleep(10);
+                long sleepTime = extractorTs - currentTs;
+                Thread.sleep(sleepTime);
               } catch (InterruptedException e) {
-                if (thread != null) thread.interrupt();
+                Thread.currentThread().interrupt();
                 return;
               }
             }
@@ -167,13 +133,13 @@ public class AudioDecoder {
             //This buffer is PCM data
             if (muted) {
               outBuffer.get(pcmBufferMuted, 0,
-                  outBuffer.remaining() <= pcmBufferMuted.length ? outBuffer.remaining()
-                      : pcmBufferMuted.length);
+                  Math.min(outBuffer.remaining(), pcmBufferMuted.length));
               getMicrophoneData.inputPCMData(new Frame(pcmBufferMuted, 0, pcmBufferMuted.length));
             } else {
-              outBuffer.get(pcmBuffer, 0,
-                  outBuffer.remaining() <= pcmBuffer.length ? outBuffer.remaining()
-                      : pcmBuffer.length);
+              if (pcmBuffer.length < outBuffer.remaining()) {
+                pcmBuffer = new byte[outBuffer.remaining()];
+              }
+              outBuffer.get(pcmBuffer, 0, Math.min(outBuffer.remaining(), pcmBuffer.length));
               if (channels > 2) { //downgrade to stereo
                 byte[] bufferStereo = PCMUtil.pcmToStereo(pcmBuffer, channels);
                 getMicrophoneData.inputPCMData(new Frame(bufferStereo, 0, bufferStereo.length));
@@ -181,42 +147,54 @@ public class AudioDecoder {
                 getMicrophoneData.inputPCMData(new Frame(pcmBuffer, 0, pcmBuffer.length));
               }
             }
-            audioDecoder.releaseOutputBuffer(outIndex, false);
+            codec.releaseOutputBuffer(outIndex, false);
             break;
         }
+      }
 
-        // All decoded frames have been rendered, we can stop playing now
-        if ((audioInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
-          seekTime = 0;
-          Log.i(TAG, "end of file out");
-          if (loopMode) {
-            loopFileInterface.onReset(false);
-          } else {
-            audioDecoderInterface.onAudioDecoderFinished();
-          }
+      // All decoded frames have been rendered, we can stop playing now
+      if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+        seekTime = 0;
+        Log.i(TAG, "end of file out");
+        running = false;
+        if (loopMode) {
+          loopFileInterface.onReset(false);
+        } else {
+          audioDecoderInterface.onAudioDecoderFinished();
         }
       }
     }
   }
 
-  public double getTime() {
-    if (decoding) {
-      return audioExtractor.getSampleTime() / 10E5;
+  /**
+   * This method should be called after prepare.
+   * Get max output size to set max input size in encoder.
+   */
+  public int getOutsize() {
+    if (!(mime.equals(CodecUtil.AAC_MIME) || mime.equals(CodecUtil.OPUS_MIME) || mime.equals(
+        CodecUtil.VORBIS_MIME))) {
+      Log.i(TAG, "fixing input size");
+      try {
+        if (running) {
+          return codec.getOutputBuffers()[0].remaining();
+        } else {
+          if (codec != null) {
+            codec.start();
+            int outSize = codec.getOutputBuffers()[0].remaining();
+            stopDecoder();
+            if (prepare(null)) return outSize;
+          }
+          return 0;
+        }
+      } catch (Exception e) {
+        return 0;
+      }
     } else {
+      Log.i(TAG, "default input size");
       return 0;
     }
   }
 
-  public void moveTo(double time) {
-    audioExtractor.seekTo((long) (time * 10E5), MediaExtractor.SEEK_TO_CLOSEST_SYNC);
-    seekTime = audioExtractor.getSampleTime() / 1000;
-    startMs = System.currentTimeMillis();
-  }
-
-  public void setLoopMode(boolean loopMode) {
-    this.loopMode = loopMode;
-  }
-
   public void mute() {
     muted = true;
   }
@@ -236,8 +214,4 @@ public class AudioDecoder {
   public boolean isStereo() {
     return isStereo;
   }
-
-  public double getDuration() {
-    return duration / 10E5;
-  }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/decoder/AudioDecoderInterface.java b/encoder/src/main/java/com/pedro/encoder/input/decoder/AudioDecoderInterface.java
index 96eb58b..594b15a 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/decoder/AudioDecoderInterface.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/decoder/AudioDecoderInterface.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.decoder;
 
 /**
diff --git a/encoder/src/main/java/com/pedro/encoder/input/decoder/BaseDecoder.java b/encoder/src/main/java/com/pedro/encoder/input/decoder/BaseDecoder.java
new file mode 100644
index 0000000..34daa17
--- /dev/null
+++ b/encoder/src/main/java/com/pedro/encoder/input/decoder/BaseDecoder.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.decoder;
+
+import android.content.Context;
+import android.content.res.AssetFileDescriptor;
+import android.media.MediaCodec;
+import android.media.MediaDataSource;
+import android.media.MediaExtractor;
+import android.media.MediaFormat;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.util.Log;
+import android.view.Surface;
+import androidx.annotation.RequiresApi;
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.util.Map;
+
+public abstract class BaseDecoder {
+
+  protected static String TAG = "BaseDecoder";
+  protected LoopFileInterface loopFileInterface;
+  protected MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
+  protected MediaExtractor extractor;
+  protected MediaCodec codec;
+  protected volatile boolean running = false;
+  protected MediaFormat mediaFormat;
+  private HandlerThread handlerThread;
+  protected String mime = "";
+  protected boolean loopMode = false;
+  protected volatile long seekTime = 0;
+  protected volatile long startMs = 0;
+  protected long duration;
+
+  public BaseDecoder(LoopFileInterface loopFileInterface) {
+    this.loopFileInterface = loopFileInterface;
+  }
+
+  public boolean initExtractor(String filePath) throws IOException {
+    extractor = new MediaExtractor();
+    extractor.setDataSource(filePath);
+    return extract(extractor);
+  }
+
+  public boolean initExtractor(FileDescriptor fileDescriptor) throws IOException {
+    extractor = new MediaExtractor();
+    extractor.setDataSource(fileDescriptor);
+    return extract(extractor);
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.N)
+  public boolean initExtractor(AssetFileDescriptor assetFileDescriptor) throws IOException {
+    extractor = new MediaExtractor();
+    extractor.setDataSource(assetFileDescriptor);
+    return extract(extractor);
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.M)
+  public boolean initExtractor(MediaDataSource mediaDataSource) throws IOException {
+    extractor = new MediaExtractor();
+    extractor.setDataSource(mediaDataSource);
+    return extract(extractor);
+  }
+
+  public boolean initExtractor(String filePath, Map<String, String> headers) throws IOException {
+    extractor = new MediaExtractor();
+    extractor.setDataSource(filePath, headers);
+    return extract(extractor);
+  }
+
+  public boolean initExtractor(FileDescriptor fileDescriptor, long offset, long length)
+      throws IOException {
+    extractor = new MediaExtractor();
+    extractor.setDataSource(fileDescriptor, offset, length);
+    return extract(extractor);
+  }
+
+  public boolean initExtractor(Context context, Uri uri, Map<String, String> headers)
+      throws IOException {
+    extractor = new MediaExtractor();
+    extractor.setDataSource(context, uri, headers);
+    return extract(extractor);
+  }
+
+  public void start() {
+    Log.i(TAG, "start decoder");
+    running = true;
+    handlerThread = new HandlerThread(TAG);
+    handlerThread.start();
+    Handler handler = new Handler(handlerThread.getLooper());
+    codec.start();
+    handler.post(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          decode();
+        } catch (IllegalStateException e) {
+          Log.i(TAG, "Decoding error", e);
+        } catch (NullPointerException e) {
+          Log.i(TAG, "Decoder maybe was stopped");
+          Log.i(TAG, "Decoding error", e);
+        }
+      }
+    });
+  }
+
+  public void stop() {
+    Log.i(TAG, "stop decoder");
+    running = false;
+    stopDecoder();
+    if (extractor != null) {
+      extractor.release();
+      extractor = null;
+      mime = "";
+    }
+  }
+
+  protected boolean prepare(Surface surface) {
+    try {
+      codec = MediaCodec.createDecoderByType(mime);
+      codec.configure(mediaFormat, surface, null, 0);
+      return true;
+    } catch (IOException e) {
+      Log.e(TAG, "Prepare decoder error:", e);
+      return false;
+    }
+  }
+
+  protected void resetCodec(Surface surface) {
+    boolean wasRunning = running;
+    stopDecoder();
+    if (extractor != null) seekTime = extractor.getSampleTime() / 1000;
+    prepare(surface);
+    if (wasRunning) {
+      start();
+    }
+  }
+
+  protected void stopDecoder() {
+    running = false;
+    seekTime = 0;
+    if (handlerThread != null) {
+      if (handlerThread.getLooper() != null) {
+        if (handlerThread.getLooper().getThread() != null) {
+          handlerThread.getLooper().getThread().interrupt();
+        }
+        handlerThread.getLooper().quit();
+      }
+      handlerThread.quit();
+      if (codec != null) {
+        try {
+          codec.flush();
+        } catch (IllegalStateException ignored) { }
+      }
+      //wait for thread to die for 500ms.
+      try {
+        handlerThread.getLooper().getThread().join(500);
+      } catch (Exception ignored) { }
+      handlerThread = null;
+    }
+    try {
+      codec.stop();
+      codec.release();
+      codec = null;
+    } catch (IllegalStateException | NullPointerException e) {
+      codec = null;
+    }
+  }
+
+  public void moveTo(double time) {
+    extractor.seekTo((long) (time * 10E5), MediaExtractor.SEEK_TO_CLOSEST_SYNC);
+    seekTime = extractor.getSampleTime() / 1000;
+    startMs = System.currentTimeMillis();
+  }
+
+  public void setLoopMode(boolean loopMode) {
+    this.loopMode = loopMode;
+  }
+
+  public boolean isLoopMode() {
+    return loopMode;
+  }
+
+  public double getDuration() {
+    return duration / 10E5;
+  }
+
+  public double getTime() {
+    if (running) {
+      return extractor.getSampleTime() / 10E5;
+    } else {
+      return 0;
+    }
+  }
+
+  protected abstract boolean extract(MediaExtractor extractor);
+
+  protected abstract void decode();
+}
diff --git a/encoder/src/main/java/com/pedro/encoder/input/decoder/LoopFileInterface.java b/encoder/src/main/java/com/pedro/encoder/input/decoder/LoopFileInterface.java
index acf1b92..45f2200 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/decoder/LoopFileInterface.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/decoder/LoopFileInterface.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.decoder;
 
 /**
diff --git a/encoder/src/main/java/com/pedro/encoder/input/decoder/VideoDecoder.java b/encoder/src/main/java/com/pedro/encoder/input/decoder/VideoDecoder.java
index 4d50169..1e6af00 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/decoder/VideoDecoder.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/decoder/VideoDecoder.java
@@ -1,178 +1,130 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.decoder;
 
 import android.media.MediaCodec;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
+import android.os.Build;
 import android.util.Log;
 import android.view.Surface;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 
 /**
  * Created by pedro on 20/06/17.
  */
-public class VideoDecoder {
-
-  private final String TAG = "VideoDecoder";
+public class VideoDecoder extends BaseDecoder {
 
   private VideoDecoderInterface videoDecoderInterface;
-  private LoopFileInterface loopFileInterface;
-  private MediaExtractor videoExtractor;
-  private MediaCodec videoDecoder;
-  private MediaCodec.BufferInfo videoInfo = new MediaCodec.BufferInfo();
-  private boolean decoding;
-  private Thread thread;
-  private MediaFormat videoFormat;
-  private String mime = "";
   private int width;
   private int height;
-  private long duration;
-  private static boolean loopMode = false;
-  private volatile long seekTime = 0;
-  private volatile long startMs = 0;
 
   public VideoDecoder(VideoDecoderInterface videoDecoderInterface,
       LoopFileInterface loopFileInterface) {
+    super(loopFileInterface);
+    TAG = "VideoDecoder";
     this.videoDecoderInterface = videoDecoderInterface;
-    this.loopFileInterface = loopFileInterface;
   }
 
-  public boolean initExtractor(String filePath) throws IOException {
-    decoding = false;
-    videoExtractor = new MediaExtractor();
-    videoExtractor.setDataSource(filePath);
+  @Override
+  protected boolean extract(MediaExtractor videoExtractor) {
+    running = false;
     for (int i = 0; i < videoExtractor.getTrackCount() && !mime.startsWith("video/"); i++) {
-      videoFormat = videoExtractor.getTrackFormat(i);
-      mime = videoFormat.getString(MediaFormat.KEY_MIME);
+      mediaFormat = videoExtractor.getTrackFormat(i);
+      mime = mediaFormat.getString(MediaFormat.KEY_MIME);
       if (mime.startsWith("video/")) {
         videoExtractor.selectTrack(i);
       } else {
-        videoFormat = null;
+        mediaFormat = null;
       }
     }
-    if (videoFormat != null) {
-      width = videoFormat.getInteger(MediaFormat.KEY_WIDTH);
-      height = videoFormat.getInteger(MediaFormat.KEY_HEIGHT);
-      duration = videoFormat.getLong(MediaFormat.KEY_DURATION);
+    if (mediaFormat != null) {
+      width = mediaFormat.getInteger(MediaFormat.KEY_WIDTH);
+      height = mediaFormat.getInteger(MediaFormat.KEY_HEIGHT);
+      duration = mediaFormat.getLong(MediaFormat.KEY_DURATION);
       return true;
       //video decoder not supported
     } else {
       mime = "";
-      videoFormat = null;
+      mediaFormat = null;
       return false;
     }
   }
 
   public boolean prepareVideo(Surface surface) {
-    try {
-      videoDecoder = MediaCodec.createDecoderByType(mime);
-      videoDecoder.configure(videoFormat, surface, null, 0);
-      return true;
-    } catch (IOException e) {
-      Log.e(TAG, "Prepare decoder error:", e);
-      return false;
-    }
+    return prepare(surface);
   }
 
-  public void start() {
-    decoding = true;
-    videoDecoder.start();
-    thread = new Thread(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          decodeVideo();
-        } catch (IllegalStateException e) {
-          Log.i(TAG, "Decoding error", e);
-        }
-      }
-    });
-    thread.start();
+  public void reset(Surface surface) {
+    resetCodec(surface);
   }
 
-  public void stop() {
-    decoding = false;
-    seekTime = 0;
-    if (thread != null) {
-      thread.interrupt();
-      try {
-        thread.join(100);
-      } catch (InterruptedException e) {
-        thread.interrupt();
-      }
-      thread = null;
-    }
-    try {
-      videoDecoder.stop();
-      videoDecoder.release();
-      videoDecoder = null;
-    } catch (IllegalStateException | NullPointerException e) {
-      videoDecoder = null;
-    }
-    if (videoExtractor != null) {
-      videoExtractor.release();
-      videoExtractor = null;
-    }
-  }
-
-  private void decodeVideo() throws IllegalStateException {
-    ByteBuffer[] inputBuffers = videoDecoder.getInputBuffers();
+  @Override
+  protected void decode() {
+    ByteBuffer[] inputBuffers = codec.getInputBuffers();
     startMs = System.currentTimeMillis();
-    while (decoding) {
-      int inIndex = videoDecoder.dequeueInputBuffer(10000);
+    while (running) {
+      int inIndex = codec.dequeueInputBuffer(10000);
       if (inIndex >= 0) {
         ByteBuffer buffer = inputBuffers[inIndex];
-        int sampleSize = videoExtractor.readSampleData(buffer, 0);
+        int sampleSize = extractor.readSampleData(buffer, 0);
         if (sampleSize < 0) {
-          videoDecoder.queueInputBuffer(inIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
+          codec.queueInputBuffer(inIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
         } else {
-          videoDecoder.queueInputBuffer(inIndex, 0, sampleSize, videoExtractor.getSampleTime(), 0);
-          videoExtractor.advance();
+          codec.queueInputBuffer(inIndex, 0, sampleSize, extractor.getSampleTime(), 0);
+          extractor.advance();
         }
       }
-      int outIndex = videoDecoder.dequeueOutputBuffer(videoInfo, 10000);
+      int outIndex = codec.dequeueOutputBuffer(bufferInfo, 10000);
       if (outIndex >= 0) {
-        while (videoExtractor.getSampleTime() / 1000
-            > System.currentTimeMillis() - startMs + seekTime) {
+        long extractorTs = extractor.getSampleTime() / 1000;
+        long currentTs = System.currentTimeMillis() - startMs + seekTime;
+        if (extractorTs > currentTs) {
           try {
-            Thread.sleep(10);
+            long sleepTime = extractorTs - currentTs;
+            Thread.sleep(sleepTime);
           } catch (InterruptedException e) {
-            if (thread != null) thread.interrupt();
+            Thread.currentThread().interrupt();
             return;
           }
         }
-        videoDecoder.releaseOutputBuffer(outIndex, videoInfo.size != 0);
+        codec.releaseOutputBuffer(outIndex, bufferInfo.size != 0);
       }
-      if ((videoInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
-        seekTime = 0;
-        Log.i(TAG, "end of file out");
-        if (loopMode) {
-          loopFileInterface.onReset(true);
-        } else {
-          videoDecoderInterface.onVideoDecoderFinished();
-        }
+    }
+    if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+      seekTime = 0;
+      Log.i(TAG, "end of file out");
+      running = false;
+      if (loopMode) {
+        loopFileInterface.onReset(true);
+      } else {
+        videoDecoderInterface.onVideoDecoderFinished();
       }
     }
   }
 
-  public double getTime() {
-    if (decoding) {
-      return videoExtractor.getSampleTime() / 10E5;
+  public void changeOutputSurface(Surface surface) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      codec.setOutputSurface(surface);
     } else {
-      return 0;
+      reset(surface);
     }
   }
 
-  public void moveTo(double time) {
-    videoExtractor.seekTo((long) (time * 10E5), MediaExtractor.SEEK_TO_CLOSEST_SYNC);
-    seekTime = videoExtractor.getSampleTime() / 1000;
-    startMs = System.currentTimeMillis();
-  }
-
-  public void setLoopMode(boolean loopMode) {
-    this.loopMode = loopMode;
-  }
-
   public int getWidth() {
     return width;
   }
@@ -180,8 +132,4 @@ public class VideoDecoder {
   public int getHeight() {
     return height;
   }
-
-  public double getDuration() {
-    return duration / 10E5;
-  }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/decoder/VideoDecoderInterface.java b/encoder/src/main/java/com/pedro/encoder/input/decoder/VideoDecoderInterface.java
index e3c2eb4..9873a91 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/decoder/VideoDecoderInterface.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/decoder/VideoDecoderInterface.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.decoder;
 
 /**
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/AndroidViewSprite.java b/encoder/src/main/java/com/pedro/encoder/input/gl/AndroidViewSprite.java
new file mode 100644
index 0000000..188d35a
--- /dev/null
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/AndroidViewSprite.java
@@ -0,0 +1,157 @@
+package com.pedro.encoder.input.gl;
+
+import android.graphics.PointF;
+import android.view.View;
+
+import com.pedro.encoder.utils.gl.TranslateTo;
+
+/**
+ * Created by pedro on 3/2/22.
+ */
+public class AndroidViewSprite {
+
+  private PointF scale;
+  private PointF position;
+  private PointF rotationAxis;
+  private int rotation;
+  private View view;
+
+  public AndroidViewSprite() {
+    reset();
+  }
+
+  public void setView(View view) {
+    this.view = view;
+    rotationAxis = new PointF(view.getMeasuredWidth() / 2f, view.getMeasuredHeight() / 2f);
+  }
+
+  /**
+   * @param deltaX Position x in percent
+   * @param deltaY Position x in percent
+   */
+  public void translate(float deltaX, float deltaY) {
+    position.x = deltaX;
+    position.y = deltaY;
+  }
+
+  /**
+   * @param translation Predefined position
+   */
+  public void translate(TranslateTo translation) {
+    switch (translation) {
+      case CENTER:
+        this.position.x = 50f - scale.x / 2f;
+        this.position.y = 50f - scale.x / 2f;
+        break;
+      case BOTTOM:
+        this.position.x = 50f - scale.x / 2f;
+        this.position.y = 100f - scale.y;
+        break;
+      case TOP:
+        this.position.x = 50f - scale.x / 2f;
+        this.position.y = 0f;
+        break;
+      case LEFT:
+        this.position.x = 0f;
+        this.position.y = 50f - scale.y / 2f;
+        break;
+      case RIGHT:
+        this.position.x = 100f - scale.x;
+        this.position.y = 50f - scale.y / 2f;
+        break;
+      case TOP_LEFT:
+        this.position.x = 0f;
+        this.position.y = 0f;
+        break;
+      case TOP_RIGHT:
+        this.position.x = 100f - scale.x;
+        this.position.y = 0f;
+        break;
+      case BOTTOM_LEFT:
+        this.position.x = 0f;
+        this.position.y = 100f - scale.y;
+        break;
+      case BOTTOM_RIGHT:
+        this.position.x = 100f - scale.x;
+        this.position.y = 100f - scale.y;
+        break;
+      default:
+        break;
+    }
+  }
+
+  /**
+   * @param deltaX Scale x in percent
+   * @param deltaY Scale y in percent
+   */
+  public void scale(float deltaX, float deltaY) {
+    //keep old position
+    position.x /= deltaX / scale.x;
+    position.y /= deltaY / scale.y;
+    //set new scale.
+    scale = new PointF(deltaX, deltaY);
+  }
+
+  /**
+   * @return Scale in percent
+   */
+  public PointF getScale() {
+    return scale;
+  }
+
+  /**
+   * @return Position in percent
+   */
+  public PointF getTranslation() {
+    return position;
+  }
+
+  public int getRotation() {
+    return rotation;
+  }
+
+  public PointF getRotationAxis() {
+    return rotationAxis;
+  }
+
+  public void setRotation(int rotation) {
+    if (rotation < 0) {
+      this.rotation = 0;
+    } else if (rotation > 360) {
+      this.rotation = 360;
+    } else {
+      this.rotation = rotation;
+    }
+  }
+
+  public void reset() {
+    scale = new PointF(0f, 0f);
+    position = new PointF(0f, 0f);
+  }
+
+  /**
+   * Traduce position in percent to work with canvas.
+   */
+  public PointF getCanvasPosition(float previewX, float previewY) {
+    return new PointF(previewX * position.x / 100f, previewY * position.y / 100f);
+  }
+
+  /**
+   * Traduce scale in percent to work with canvas.
+   */
+  public PointF getCanvasScale(float previewX, float previewY) {
+    float scaleFactorX = 100f * (float) view.getWidth() / previewX;
+    float scaleFactorY = 100f * (float) view.getHeight() / previewY;
+    return new PointF(scale.x / scaleFactorX, scale.y / scaleFactorY);
+  }
+
+  /**
+   * Calculate default scale if none is indicated after load the filter.
+   */
+  public void calculateDefaultScale(float previewX, float previewY) {
+    if (scale.x == 0f && scale.y == 0f) {
+      scale.x = 100f * (float) view.getWidth() / previewX;
+      scale.y = 100f * (float) view.getHeight() / previewY;
+    }
+  }
+}
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/FilterAction.java b/encoder/src/main/java/com/pedro/encoder/input/gl/FilterAction.java
new file mode 100644
index 0000000..c696bb9
--- /dev/null
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/FilterAction.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl;
+
+/**
+ * Created by pedro on 21/9/21.
+ */
+public enum FilterAction {
+  SET, SET_INDEX, ADD, ADD_INDEX, CLEAR, REMOVE, REMOVE_INDEX
+}
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/Sprite.java b/encoder/src/main/java/com/pedro/encoder/input/gl/Sprite.java
index b4125c3..b1c8e07 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/Sprite.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/Sprite.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl;
 
 import android.graphics.PointF;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/SpriteGestureController.java b/encoder/src/main/java/com/pedro/encoder/input/gl/SpriteGestureController.java
index c26ee45..5e83ede 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/SpriteGestureController.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/SpriteGestureController.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl;
 
 import android.graphics.PointF;
@@ -5,6 +21,8 @@ import android.os.Build;
 import androidx.annotation.RequiresApi;
 import android.view.MotionEvent;
 import android.view.View;
+import com.pedro.encoder.input.gl.render.filters.AndroidViewFilterRender;
+import com.pedro.encoder.input.gl.render.filters.BaseFilterRender;
 import com.pedro.encoder.input.gl.render.filters.object.BaseObjectFilterRender;
 import com.pedro.encoder.input.video.CameraHelper;
 
@@ -16,6 +34,7 @@ import com.pedro.encoder.input.video.CameraHelper;
 public class SpriteGestureController {
 
   private BaseObjectFilterRender baseObjectFilterRender;
+  private AndroidViewFilterRender androidViewFilterRender;
   private float lastDistance;
   private boolean preventMoveOutside = true;
 
@@ -26,12 +45,27 @@ public class SpriteGestureController {
     this.baseObjectFilterRender = sprite;
   }
 
-  public BaseObjectFilterRender getBaseObjectFilterRender() {
-    return baseObjectFilterRender;
+  public SpriteGestureController(AndroidViewFilterRender sprite) {
+    this.androidViewFilterRender = sprite;
+  }
+
+  public BaseFilterRender getFilterRender() {
+    return androidViewFilterRender == null ? baseObjectFilterRender : androidViewFilterRender;
   }
 
   public void setBaseObjectFilterRender(BaseObjectFilterRender baseObjectFilterRender) {
     this.baseObjectFilterRender = baseObjectFilterRender;
+    this.androidViewFilterRender = null;
+  }
+
+  public void setBaseObjectFilterRender(AndroidViewFilterRender androidViewFilterRender) {
+    this.androidViewFilterRender = androidViewFilterRender;
+    this.baseObjectFilterRender = null;
+  }
+
+  public void stopListener() {
+    this.androidViewFilterRender = null;
+    this.baseObjectFilterRender = null;
   }
 
   public void setPreventMoveOutside(boolean preventMoveOutside) {
@@ -39,22 +73,34 @@ public class SpriteGestureController {
   }
 
   public boolean spriteTouched(View view, MotionEvent motionEvent) {
-    if (baseObjectFilterRender == null) return false;
+    if (baseObjectFilterRender == null && androidViewFilterRender == null) return false;
     float xPercent = motionEvent.getX() * 100 / view.getWidth();
     float yPercent = motionEvent.getY() * 100 / view.getHeight();
-    PointF scale = baseObjectFilterRender.getScale();
-    PointF position = baseObjectFilterRender.getPosition();
+    PointF scale;
+    PointF position;
+    if (baseObjectFilterRender != null) {
+      scale = baseObjectFilterRender.getScale();
+      position = baseObjectFilterRender.getPosition();
+    } else {
+      scale = androidViewFilterRender.getScale();
+      position = androidViewFilterRender.getPosition();
+    }
     boolean xTouched = xPercent >= position.x && xPercent <= position.x + scale.x;
     boolean yTouched = yPercent >= position.y && yPercent <= position.y + scale.y;
     return xTouched && yTouched;
   }
 
   public void moveSprite(View view, MotionEvent motionEvent) {
-    if (baseObjectFilterRender == null) return;
+    if (baseObjectFilterRender == null && androidViewFilterRender == null) return;
     if (motionEvent.getPointerCount() == 1) {
       float xPercent = motionEvent.getX() * 100 / view.getWidth();
       float yPercent = motionEvent.getY() * 100 / view.getHeight();
-      PointF scale = baseObjectFilterRender.getScale();
+      PointF scale;
+      if (baseObjectFilterRender != null) {
+        scale = baseObjectFilterRender.getScale();
+      } else {
+        scale = androidViewFilterRender.getScale();
+      }
       if (preventMoveOutside) {
         float x = xPercent - scale.x / 2.0F;
         float y = yPercent - scale.y / 2.0F;
@@ -70,22 +116,39 @@ public class SpriteGestureController {
         if (y + scale.y > 100.0F) {
           y = 100.0F - scale.y;
         }
-        baseObjectFilterRender.setPosition(x, y);
+        if (baseObjectFilterRender != null) {
+          baseObjectFilterRender.setPosition(x, y);
+        } else {
+          androidViewFilterRender.setPosition(x, y);
+        }
       } else {
-        baseObjectFilterRender.setPosition(xPercent - scale.x / 2f, yPercent - scale.y / 2f);
+        if (baseObjectFilterRender != null) {
+          baseObjectFilterRender.setPosition(xPercent - scale.x / 2f, yPercent - scale.y / 2f);
+        } else {
+          androidViewFilterRender.setPosition(xPercent - scale.x / 2f, yPercent - scale.y / 2f);
+        }
       }
     }
   }
 
   public void scaleSprite(MotionEvent motionEvent) {
-    if (baseObjectFilterRender == null) return;
+    if (baseObjectFilterRender == null && androidViewFilterRender == null) return;
     if (motionEvent.getPointerCount() > 1) {
       float distance = CameraHelper.getFingerSpacing(motionEvent);
       float percent = distance >= lastDistance ? 1 : -1;
-      PointF scale = baseObjectFilterRender.getScale();
+      PointF scale;
+      if (baseObjectFilterRender != null) {
+        scale = baseObjectFilterRender.getScale();
+      } else {
+        scale = androidViewFilterRender.getScale();
+      }
       scale.x += percent;
       scale.y += percent;
-      baseObjectFilterRender.setScale(scale.x, scale.y);
+      if (baseObjectFilterRender != null) {
+        baseObjectFilterRender.setScale(scale.x, scale.y);
+      } else {
+        androidViewFilterRender.setScale(scale.x, scale.y);
+      }
       lastDistance = distance;
     }
   }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/SurfaceManager.java b/encoder/src/main/java/com/pedro/encoder/input/gl/SurfaceManager.java
index a85e754..1a65c9c 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/SurfaceManager.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/SurfaceManager.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl;
 
 import android.opengl.EGL14;
@@ -19,45 +35,29 @@ import com.pedro.encoder.utils.gl.GlUtil;
 @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
 public class SurfaceManager {
 
+  private static final String TAG = "SurfaceManager";
+
   private static final int EGL_RECORDABLE_ANDROID = 0x3142;
 
-  private EGLContext eglContext = null;
-  private EGLSurface eglSurface = null;
-  private EGLDisplay eglDisplay = null;
+  private EGLContext eglContext = EGL14.EGL_NO_CONTEXT;
+  private EGLSurface eglSurface = EGL14.EGL_NO_SURFACE;
+  private EGLDisplay eglDisplay = EGL14.EGL_NO_DISPLAY;
+  private volatile boolean isReady = false;
 
-  /**
-   * Creates an EGL context and an EGL surface.
-   */
-  public SurfaceManager(Surface surface, SurfaceManager manager) {
-    eglSetup(surface, manager.eglContext);
-  }
-
-  /**
-   * Creates an EGL context and an EGL surface.
-   */
-  public SurfaceManager(Surface surface, EGLContext eglContext) {
-    eglSetup(surface, eglContext);
-  }
-
-  /**
-   * Creates an EGL context and an EGL surface.
-   */
-  public SurfaceManager(Surface surface) {
-    eglSetup(surface, null);
-  }
-
-  public SurfaceManager() {
-    eglSetup(null, null);
+  public boolean isReady() {
+    return isReady;
   }
 
   public void makeCurrent() {
     if (!EGL14.eglMakeCurrent(eglDisplay, eglSurface, eglSurface, eglContext)) {
-      Log.e("Error", "eglMakeCurrent failed");
+      Log.e(TAG, "eglMakeCurrent failed");
     }
   }
 
   public void swapBuffer() {
-    EGL14.eglSwapBuffers(eglDisplay, eglSurface);
+    if (!EGL14.eglSwapBuffers(eglDisplay, eglSurface)) {
+      Log.e(TAG, "eglSwapBuffers failed");
+    }
   }
 
   /**
@@ -71,7 +71,11 @@ public class SurfaceManager {
   /**
    * Prepares EGL.  We want a GLES 2.0 context and a surface that supports recording.
    */
-  private void eglSetup(Surface surface, EGLContext eglSharedContext) {
+  public void eglSetup(int width, int height, Surface surface, EGLContext eglSharedContext) {
+    if (isReady) {
+      Log.e(TAG, "already ready, ignored");
+      return;
+    }
     eglDisplay = EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);
     if (eglDisplay == EGL14.EGL_NO_DISPLAY) {
       throw new RuntimeException("unable to get EGL14 display");
@@ -83,23 +87,43 @@ public class SurfaceManager {
 
     // Configure EGL for recording and OpenGL ES 2.0.
     int[] attribList;
-    if (eglSharedContext == null) {
+    if (eglSharedContext == null && surface == null) {
+      attribList = new int[]{
+              EGL14.EGL_RED_SIZE, 8, EGL14.EGL_GREEN_SIZE, 8, EGL14.EGL_BLUE_SIZE, 8,
+              EGL14.EGL_SURFACE_TYPE, EGL14.EGL_PBUFFER_BIT,
+              EGL14.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT,
+              /* AA https://stackoverflow.com/questions/27035893/antialiasing-in-opengl-es-2-0 */
+              //EGL14.EGL_SAMPLE_BUFFERS, 1 /* true */,
+              //EGL14.EGL_SAMPLES, 4, /* increase to more smooth limit of your GPU */
+              EGL14.EGL_NONE
+      };
+    } else if (eglSharedContext == null) {
+      attribList = new int[]{
+              EGL14.EGL_RED_SIZE, 8, EGL14.EGL_GREEN_SIZE, 8, EGL14.EGL_BLUE_SIZE, 8,
+              EGL14.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT,
+              /* AA https://stackoverflow.com/questions/27035893/antialiasing-in-opengl-es-2-0 */
+              //EGL14.EGL_SAMPLE_BUFFERS, 1 /* true */,
+              //EGL14.EGL_SAMPLES, 4, /* increase to more smooth limit of your GPU */
+              EGL14.EGL_NONE
+      };
+    } else if (surface == null) {
       attribList = new int[] {
-          EGL14.EGL_RED_SIZE, 8, EGL14.EGL_GREEN_SIZE, 8, EGL14.EGL_BLUE_SIZE, 8,
-          EGL14.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT,
-          /* AA https://stackoverflow.com/questions/27035893/antialiasing-in-opengl-es-2-0 */
-          //EGL14.EGL_SAMPLE_BUFFERS, 1 /* true */,
-          //EGL14.EGL_SAMPLES, 4, /* increase to more smooth limit of your GPU */
-          EGL14.EGL_NONE
+              EGL14.EGL_RED_SIZE, 8, EGL14.EGL_GREEN_SIZE, 8, EGL14.EGL_BLUE_SIZE, 8,
+              EGL14.EGL_SURFACE_TYPE, EGL14.EGL_PBUFFER_BIT,
+              EGL14.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT, EGL_RECORDABLE_ANDROID, 1,
+              /* AA https://stackoverflow.com/questions/27035893/antialiasing-in-opengl-es-2-0 */
+              //EGL14.EGL_SAMPLE_BUFFERS, 1 /* true */,
+              //EGL14.EGL_SAMPLES, 4, /* increase to more smooth limit of your GPU */
+              EGL14.EGL_NONE
       };
     } else {
       attribList = new int[] {
-          EGL14.EGL_RED_SIZE, 8, EGL14.EGL_GREEN_SIZE, 8, EGL14.EGL_BLUE_SIZE, 8,
-          EGL14.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT, EGL_RECORDABLE_ANDROID, 1,
-          /* AA https://stackoverflow.com/questions/27035893/antialiasing-in-opengl-es-2-0 */
-          //EGL14.EGL_SAMPLE_BUFFERS, 1 /* true */,
-          //EGL14.EGL_SAMPLES, 4, /* increase to more smooth limit of your GPU */
-          EGL14.EGL_NONE
+              EGL14.EGL_RED_SIZE, 8, EGL14.EGL_GREEN_SIZE, 8, EGL14.EGL_BLUE_SIZE, 8,
+              EGL14.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT, EGL_RECORDABLE_ANDROID, 1,
+              /* AA https://stackoverflow.com/questions/27035893/antialiasing-in-opengl-es-2-0 */
+              //EGL14.EGL_SAMPLE_BUFFERS, 1 /* true */,
+              //EGL14.EGL_SAMPLES, 4, /* increase to more smooth limit of your GPU */
+              EGL14.EGL_NONE
       };
     }
     EGLConfig[] configs = new EGLConfig[1];
@@ -119,7 +143,7 @@ public class SurfaceManager {
     // Create a window surface, and attach it to the Surface we received.
     if (surface == null) {
       int[] surfaceAttribs = {
-          EGL14.EGL_WIDTH, 1, EGL14.EGL_HEIGHT, 1, EGL14.EGL_NONE
+          EGL14.EGL_WIDTH, width, EGL14.EGL_HEIGHT, height, EGL14.EGL_NONE
       };
       eglSurface = EGL14.eglCreatePbufferSurface(eglDisplay, configs[0], surfaceAttribs, 0);
     } else {
@@ -129,6 +153,28 @@ public class SurfaceManager {
       eglSurface = EGL14.eglCreateWindowSurface(eglDisplay, configs[0], surface, surfaceAttribs, 0);
     }
     GlUtil.checkEglError("eglCreateWindowSurface");
+    isReady = true;
+    Log.i(TAG, "GL initialized");
+  }
+
+  public void eglSetup(Surface surface, SurfaceManager manager) {
+    eglSetup(2, 2, surface, manager.eglContext);
+  }
+
+  public void eglSetup(int width, int height, SurfaceManager manager) {
+    eglSetup(width, height, null, manager.eglContext);
+  }
+
+  public void eglSetup(Surface surface, EGLContext eglContext) {
+    eglSetup(2, 2, surface, eglContext);
+  }
+
+  public void eglSetup(Surface surface) {
+    eglSetup(2, 2, surface, null);
+  }
+
+  public void eglSetup() {
+    eglSetup(2, 2, null, null);
   }
 
   /**
@@ -142,10 +188,14 @@ public class SurfaceManager {
       EGL14.eglDestroyContext(eglDisplay, eglContext);
       EGL14.eglReleaseThread();
       EGL14.eglTerminate(eglDisplay);
+      Log.i(TAG, "GL released");
+      eglDisplay = EGL14.EGL_NO_DISPLAY;
+      eglContext = EGL14.EGL_NO_CONTEXT;
+      eglSurface = EGL14.EGL_NO_SURFACE;
+      isReady = false;
+    } else {
+      Log.e(TAG, "GL already released");
     }
-    eglDisplay = EGL14.EGL_NO_DISPLAY;
-    eglContext = EGL14.EGL_NO_CONTEXT;
-    eglSurface = EGL14.EGL_NO_SURFACE;
   }
 
   public EGLContext getEglContext() {
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/TextureLoader.java b/encoder/src/main/java/com/pedro/encoder/input/gl/TextureLoader.java
index f863eb7..ff0dcf2 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/TextureLoader.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/TextureLoader.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl;
 
 import android.graphics.Bitmap;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/BaseRenderOffScreen.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/BaseRenderOffScreen.java
index b3b245c..fa5e7d2 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/BaseRenderOffScreen.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/BaseRenderOffScreen.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/CameraRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/CameraRender.java
index 755cab1..3522502 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/CameraRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/CameraRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render;
 
 import android.content.Context;
@@ -63,7 +79,7 @@ public class CameraRender extends BaseRenderOffScreen {
     uSTMatrixHandle = GLES20.glGetUniformLocation(program, "uSTMatrix");
 
     //camera texture
-    GlUtil.createExternalTextures(1, textureID, 0);
+    GlUtil.createExternalTextures(textureID.length, textureID, 0);
     surfaceTexture = new SurfaceTexture(textureID[0]);
     surfaceTexture.setDefaultBufferSize(width, height);
     surface = new Surface(surfaceTexture);
@@ -107,8 +123,8 @@ public class CameraRender extends BaseRenderOffScreen {
   @Override
   public void release() {
     GLES20.glDeleteProgram(program);
-    surfaceTexture = null;
-    surface = null;
+    surfaceTexture.release();
+    surface.release();
   }
 
   public void updateTexImage() {
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/MainRender.kt b/encoder/src/main/java/com/pedro/encoder/input/gl/render/MainRender.kt
new file mode 100644
index 0000000..42a2920
--- /dev/null
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/MainRender.kt
@@ -0,0 +1,177 @@
+package com.pedro.encoder.input.gl.render
+
+import android.content.Context
+import android.graphics.SurfaceTexture
+import android.os.Build
+import android.view.Surface
+import androidx.annotation.RequiresApi
+import com.pedro.encoder.input.gl.FilterAction
+import com.pedro.encoder.input.gl.render.filters.BaseFilterRender
+
+/**
+ * Created by pedro on 20/3/22.
+ */
+@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+class MainRender {
+  private val cameraRender = CameraRender()
+  private val screenRender = ScreenRender()
+  private var width = 0
+  private var height = 0
+  private var previewWidth = 0
+  private var previewHeight = 0
+  private var context: Context? = null
+  private var filterRenders: MutableList<BaseFilterRender> = ArrayList()
+
+  fun initGl(context: Context, encoderWidth: Int, encoderHeight: Int, previewWidth: Int, previewHeight: Int) {
+    this.context = context
+    width = encoderWidth
+    height = encoderHeight
+    this.previewWidth = previewWidth
+    this.previewHeight = previewHeight
+    cameraRender.initGl(width, height, context, previewWidth, previewHeight)
+    screenRender.setStreamSize(encoderWidth, encoderHeight)
+    screenRender.setTexId(cameraRender.texId)
+    screenRender.initGl(context)
+  }
+
+  fun drawOffScreen() {
+    cameraRender.draw()
+    for (baseFilterRender in filterRenders) baseFilterRender.draw()
+  }
+
+  fun drawScreen(width: Int, height: Int, keepAspectRatio: Boolean, mode: Int, rotation: Int,
+    flipStreamVertical: Boolean, flipStreamHorizontal: Boolean) {
+    screenRender.draw(width, height, keepAspectRatio, mode, rotation, flipStreamVertical,
+      flipStreamHorizontal)
+  }
+
+  fun drawScreenEncoder(width: Int, height: Int, isPortrait: Boolean, rotation: Int,
+    flipStreamVertical: Boolean, flipStreamHorizontal: Boolean) {
+    screenRender.drawEncoder(width, height, isPortrait, rotation, flipStreamVertical,
+      flipStreamHorizontal)
+  }
+
+  fun drawScreenPreview(width: Int, height: Int, isPortrait: Boolean, keepAspectRatio: Boolean,
+    mode: Int, rotation: Int, flipStreamVertical: Boolean, flipStreamHorizontal: Boolean) {
+    screenRender.drawPreview(width, height, isPortrait, keepAspectRatio, mode, rotation,
+      flipStreamVertical, flipStreamHorizontal)
+  }
+
+  fun release() {
+    cameraRender.release()
+    for (baseFilterRender in filterRenders) baseFilterRender.release()
+    filterRenders.clear()
+    screenRender.release()
+  }
+
+  private fun setFilter(position: Int, baseFilterRender: BaseFilterRender) {
+    val id = filterRenders[position].previousTexId
+    val renderHandler = filterRenders[position].renderHandler
+    filterRenders[position].release()
+    filterRenders[position] = baseFilterRender
+    filterRenders[position].previousTexId = id
+    filterRenders[position].initGl(width, height, context, previewWidth, previewHeight)
+    filterRenders[position].renderHandler = renderHandler
+  }
+
+  private fun addFilter(baseFilterRender: BaseFilterRender) {
+    filterRenders.add(baseFilterRender)
+    baseFilterRender.initGl(width, height, context, previewWidth, previewHeight)
+    baseFilterRender.initFBOLink()
+    reOrderFilters()
+  }
+
+  private fun addFilter(position: Int, baseFilterRender: BaseFilterRender) {
+    filterRenders.add(position, baseFilterRender)
+    baseFilterRender.initGl(width, height, context, previewWidth, previewHeight)
+    baseFilterRender.initFBOLink()
+    reOrderFilters()
+  }
+
+  private fun clearFilters() {
+    for (baseFilterRender in filterRenders) {
+      baseFilterRender.release()
+    }
+    filterRenders.clear()
+    reOrderFilters()
+  }
+
+  private fun removeFilter(position: Int) {
+    filterRenders.removeAt(position).release()
+    reOrderFilters()
+  }
+
+  private fun removeFilter(baseFilterRender: BaseFilterRender) {
+    baseFilterRender.release()
+    filterRenders.remove(baseFilterRender)
+    reOrderFilters()
+  }
+
+  private fun reOrderFilters() {
+    for (i in filterRenders.indices) {
+      val texId = if (i == 0) cameraRender.texId else filterRenders[i - 1].texId
+      filterRenders[i].previousTexId = texId
+    }
+    val texId = if (filterRenders.isEmpty()) {
+      cameraRender.texId
+    } else {
+      filterRenders[filterRenders.size - 1].texId
+    }
+    screenRender.setTexId(texId)
+  }
+
+  fun setFilterAction(filterAction: FilterAction?, position: Int, baseFilterRender: BaseFilterRender) {
+    when (filterAction) {
+      FilterAction.SET -> if (filterRenders.size > 0) {
+        setFilter(position, baseFilterRender)
+      } else {
+        addFilter(baseFilterRender)
+      }
+      FilterAction.SET_INDEX -> setFilter(position, baseFilterRender)
+      FilterAction.ADD -> addFilter(baseFilterRender)
+      FilterAction.ADD_INDEX -> addFilter(position, baseFilterRender)
+      FilterAction.CLEAR -> clearFilters()
+      FilterAction.REMOVE -> removeFilter(baseFilterRender)
+      FilterAction.REMOVE_INDEX -> removeFilter(position)
+      else -> {}
+    }
+  }
+
+  fun filtersCount(): Int {
+    return filterRenders.size
+  }
+
+  fun setPreviewSize(previewWidth: Int, previewHeight: Int) {
+    for (i in filterRenders.indices) {
+      filterRenders[i].setPreviewSize(previewWidth, previewHeight)
+    }
+  }
+
+  fun enableAA(AAEnabled: Boolean) {
+    screenRender.isAAEnabled = AAEnabled
+  }
+
+  fun isAAEnabled(): Boolean {
+    return screenRender.isAAEnabled
+  }
+
+  fun updateFrame() {
+    cameraRender.updateTexImage()
+  }
+
+  fun getSurfaceTexture(): SurfaceTexture {
+    return cameraRender.surfaceTexture
+  }
+
+  fun getSurface(): Surface {
+    return cameraRender.surface
+  }
+
+  fun setCameraRotation(rotation: Int) {
+    cameraRender.setRotation(rotation)
+  }
+
+  fun setCameraFlip(isFlipHorizontal: Boolean, isFlipVertical: Boolean) {
+    cameraRender.setFlip(isFlipHorizontal, isFlipVertical)
+  }
+}
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java
index e3b9ad6..29c2f3f 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render;
 
 import android.content.Context;
@@ -5,8 +21,9 @@ import android.graphics.SurfaceTexture;
 import android.os.Build;
 import android.view.Surface;
 import androidx.annotation.RequiresApi;
+
+import com.pedro.encoder.input.gl.FilterAction;
 import com.pedro.encoder.input.gl.render.filters.BaseFilterRender;
-import com.pedro.encoder.input.gl.render.filters.NoFilterRender;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,13 +34,12 @@ import java.util.List;
 @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
 public class ManagerRender {
 
-  //Increase it to render more than 1 filter and set filter by position.
-  // You must modify it before create your rtmp or rtsp object.
-  public static int numFilters = 1;
+  //Set filter limit. If the number is 0 or less you can add infinity filters
+  public static int numFilters = 0;
 
-  private CameraRender cameraRender;
-  private List<BaseFilterRender> baseFilterRender = new ArrayList<>(numFilters);
-  private ScreenRender screenRender;
+  private final CameraRender cameraRender;
+  private final List<BaseFilterRender> filterRenders;
+  private final ScreenRender screenRender;
 
   private int width;
   private int height;
@@ -32,8 +48,8 @@ public class ManagerRender {
   private Context context;
 
   public ManagerRender() {
+    filterRenders = new ArrayList<>();
     cameraRender = new CameraRender();
-    for (int i = 0; i < numFilters; i++) baseFilterRender.add(new NoFilterRender());
     screenRender = new ScreenRender();
   }
 
@@ -45,33 +61,26 @@ public class ManagerRender {
     this.previewWidth = previewWidth;
     this.previewHeight = previewHeight;
     cameraRender.initGl(width, height, context, previewWidth, previewHeight);
-    for (int i = 0; i < numFilters; i++) {
-      int textId = i == 0 ? cameraRender.getTexId() : baseFilterRender.get(i - 1).getTexId();
-      baseFilterRender.get(i).setPreviousTexId(textId);
-      baseFilterRender.get(i).initGl(width, height, context, previewWidth, previewHeight);
-      baseFilterRender.get(i).initFBOLink();
-    }
     screenRender.setStreamSize(encoderWidth, encoderHeight);
-    screenRender.setTexId(baseFilterRender.get(numFilters - 1).getTexId());
+    screenRender.setTexId(cameraRender.getTexId());
     screenRender.initGl(context);
   }
 
   public void drawOffScreen() {
     cameraRender.draw();
-    for (BaseFilterRender baseFilterRender : baseFilterRender) baseFilterRender.draw();
+    for (BaseFilterRender baseFilterRender : filterRenders) baseFilterRender.draw();
   }
 
   public void drawScreen(int width, int height, boolean keepAspectRatio, int mode, int rotation,
-      boolean isPreview) {
-    screenRender.draw(width, height, keepAspectRatio, mode, rotation, isPreview);
+      boolean flipStreamVertical, boolean flipStreamHorizontal) {
+    screenRender.draw(width, height, keepAspectRatio, mode, rotation, flipStreamVertical,
+        flipStreamHorizontal);
   }
 
   public void release() {
     cameraRender.release();
-    for (int i = 0; i < this.baseFilterRender.size(); i++) {
-      this.baseFilterRender.get(i).release();
-      this.baseFilterRender.set(i, new NoFilterRender());
-    }
+    for (BaseFilterRender baseFilterRender : filterRenders) baseFilterRender.release();
+    filterRenders.clear();
     screenRender.release();
   }
 
@@ -95,14 +104,99 @@ public class ManagerRender {
     return cameraRender.getSurface();
   }
 
-  public void setFilter(int position, BaseFilterRender baseFilterRender) {
-    final int id = this.baseFilterRender.get(position).getPreviousTexId();
-    final RenderHandler renderHandler = this.baseFilterRender.get(position).getRenderHandler();
-    this.baseFilterRender.get(position).release();
-    this.baseFilterRender.set(position, baseFilterRender);
-    this.baseFilterRender.get(position).setPreviousTexId(id);
-    this.baseFilterRender.get(position).initGl(width, height, context, previewWidth, previewHeight);
-    this.baseFilterRender.get(position).setRenderHandler(renderHandler);
+  private void setFilter(int position, BaseFilterRender baseFilterRender) {
+    final int id = filterRenders.get(position).getPreviousTexId();
+    final RenderHandler renderHandler = filterRenders.get(position).getRenderHandler();
+    filterRenders.get(position).release();
+    filterRenders.set(position, baseFilterRender);
+    filterRenders.get(position).setPreviousTexId(id);
+    filterRenders.get(position).initGl(width, height, context, previewWidth, previewHeight);
+    filterRenders.get(position).setRenderHandler(renderHandler);
+  }
+
+  private void addFilter(BaseFilterRender baseFilterRender) {
+    filterRenders.add(baseFilterRender);
+    baseFilterRender.initGl(width, height, context, previewWidth, previewHeight);
+    baseFilterRender.initFBOLink();
+    reOrderFilters();
+  }
+
+  private void addFilter(int position, BaseFilterRender baseFilterRender) {
+    filterRenders.add(position, baseFilterRender);
+    baseFilterRender.initGl(width, height, context, previewWidth, previewHeight);
+    baseFilterRender.initFBOLink();
+    reOrderFilters();
+  }
+
+  private void clearFilters() {
+    for (BaseFilterRender baseFilterRender: filterRenders) {
+      baseFilterRender.release();
+    }
+    filterRenders.clear();
+    reOrderFilters();
+  }
+
+  private void removeFilter(int position) {
+    filterRenders.remove(position).release();
+    reOrderFilters();
+  }
+
+  private void removeFilter(BaseFilterRender baseFilterRender) {
+    baseFilterRender.release();
+    filterRenders.remove(baseFilterRender);
+    reOrderFilters();
+  }
+
+  private void reOrderFilters() {
+    for (int i = 0; i < filterRenders.size(); i++) {
+      int texId = i == 0 ? cameraRender.getTexId() : filterRenders.get(i - 1).getTexId();
+      filterRenders.get(i).setPreviousTexId(texId);
+    }
+    int texId = filterRenders.isEmpty() ? cameraRender.getTexId() :
+        filterRenders.get(filterRenders.size() - 1).getTexId();
+    screenRender.setTexId(texId);
+  }
+
+  public void setFilterAction(FilterAction filterAction,  int position, BaseFilterRender baseFilterRender) {
+    switch (filterAction) {
+      case SET:
+        if (filterRenders.size() > 0) {
+          setFilter(position, baseFilterRender);
+        } else {
+          addFilter(baseFilterRender);
+        }
+        break;
+      case SET_INDEX:
+        setFilter(position, baseFilterRender);
+        break;
+      case ADD:
+        if (numFilters > 0 && filterRenders.size() >= numFilters) {
+          throw new RuntimeException("limit of filters(" + numFilters + ") exceeded");
+        }
+        addFilter(baseFilterRender);
+        break;
+      case ADD_INDEX:
+        if (numFilters > 0 && filterRenders.size() >= numFilters) {
+          throw new RuntimeException("limit of filters(" + numFilters + ") exceeded");
+        }
+        addFilter(position, baseFilterRender);
+        break;
+      case CLEAR:
+        clearFilters();
+        break;
+      case REMOVE:
+        removeFilter(baseFilterRender);
+        break;
+      case REMOVE_INDEX:
+        removeFilter(position);
+        break;
+      default:
+        break;
+    }
+  }
+
+  public int filtersCount() {
+    return filterRenders.size();
   }
 
   public void setCameraRotation(int rotation) {
@@ -114,8 +208,8 @@ public class ManagerRender {
   }
 
   public void setPreviewSize(int previewWidth, int previewHeight) {
-    for (int i = 0; i < this.baseFilterRender.size(); i++) {
-      this.baseFilterRender.get(i).setPreviewSize(previewWidth, previewHeight);
+    for (int i = 0; i < filterRenders.size(); i++) {
+      filterRenders.get(i).setPreviewSize(previewWidth, previewHeight);
     }
   }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/RenderHandler.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/RenderHandler.java
index d40bac4..2f4f669 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/RenderHandler.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/RenderHandler.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render;
 
 /**
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
index f667d2d..a2ede8d 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render;
 
 import android.content.Context;
@@ -22,11 +38,11 @@ public class ScreenRender {
 
   //rotation matrix
   private final float[] squareVertexData = {
-          // X, Y, Z, U, V
-          -1f, -1f, 0f, 0f, 0f, //bottom left
-          1f, -1f, 0f, 1f, 0f, //bottom right
-          -1f, 1f, 0f, 0f, 1f, //top left
-          1f, 1f, 0f, 1f, 1f, //top right
+      // X, Y, Z, U, V
+      -1f, -1f, 0f, 0f, 0f, //bottom left
+      1f, -1f, 0f, 1f, 0f, //bottom right
+      -1f, 1f, 0f, 0f, 1f, //top left
+      1f, 1f, 0f, 1f, 1f, //top right
   };
 
   private FloatBuffer squareVertex;
@@ -48,20 +64,18 @@ public class ScreenRender {
 
   private int streamWidth;
   private int streamHeight;
-  private boolean isPortrait;
 
   public ScreenRender() {
     squareVertex =
-            ByteBuffer.allocateDirect(squareVertexData.length * BaseRenderOffScreen.FLOAT_SIZE_BYTES)
-                    .order(ByteOrder.nativeOrder())
-                    .asFloatBuffer();
+        ByteBuffer.allocateDirect(squareVertexData.length * BaseRenderOffScreen.FLOAT_SIZE_BYTES)
+            .order(ByteOrder.nativeOrder())
+            .asFloatBuffer();
     squareVertex.put(squareVertexData).position(0);
     Matrix.setIdentityM(MVPMatrix, 0);
     Matrix.setIdentityM(STMatrix, 0);
   }
 
   public void initGl(Context context) {
-    isPortrait = CameraHelper.isPortrait(context);
     GlUtil.checkGlError("initGl start");
     String vertexShader = GlUtil.getStringFromRaw(context, R.raw.simple_vertex);
     String fragmentShader = GlUtil.getStringFromRaw(context, R.raw.fxaa);
@@ -78,15 +92,47 @@ public class ScreenRender {
   }
 
   public void draw(int width, int height, boolean keepAspectRatio, int mode, int rotation,
-                   boolean isPreview) {
+      boolean flipStreamVertical, boolean flipStreamHorizontal) {
     GlUtil.checkGlError("drawScreen start");
 
-    if (mode == 2 || mode == 3) { //stream rotation is enabled
-      SizeCalculator.updateMatrix(rotation, width, height, isPreview, isPortrait, MVPMatrix);
-    }
+    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical, MVPMatrix);
     SizeCalculator.calculateViewPort(keepAspectRatio, mode, width, height, streamWidth,
-            streamHeight);
+        streamHeight);
 
+    draw(width, height);
+  }
+
+  public void drawEncoder(int width, int height, boolean isPortrait, int rotation,
+      boolean flipStreamVertical, boolean flipStreamHorizontal) {
+    GlUtil.checkGlError("drawScreen start");
+
+    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical, MVPMatrix);
+    SizeCalculator.calculateViewPortEncoder(width, height, isPortrait);
+
+    draw(width, height);
+  }
+
+  public void drawPreview(int width, int height, boolean isPortrait, boolean keepAspectRatio,
+      int mode, int rotation, boolean flipStreamVertical, boolean flipStreamHorizontal) {
+    GlUtil.checkGlError("drawScreen start");
+
+    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical, MVPMatrix);
+    float factor = (float) streamWidth / (float) streamHeight;
+    int w;
+    int h;
+    if (factor >= 1f) {
+      w = isPortrait ? streamHeight : streamWidth;
+      h = isPortrait ? streamWidth : streamHeight;
+    } else {
+      w = isPortrait ? streamWidth : streamHeight;
+      h = isPortrait ? streamHeight : streamWidth;
+    }
+    SizeCalculator.calculateViewPort(keepAspectRatio, mode, width, height, w, h);
+
+    draw(width, height);
+  }
+
+  private void draw(int width, int height) {
     GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     GLES20.glClear(GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
 
@@ -94,12 +140,12 @@ public class ScreenRender {
 
     squareVertex.position(BaseRenderOffScreen.SQUARE_VERTEX_DATA_POS_OFFSET);
     GLES20.glVertexAttribPointer(aPositionHandle, 3, GLES20.GL_FLOAT, false,
-            BaseRenderOffScreen.SQUARE_VERTEX_DATA_STRIDE_BYTES, squareVertex);
+        BaseRenderOffScreen.SQUARE_VERTEX_DATA_STRIDE_BYTES, squareVertex);
     GLES20.glEnableVertexAttribArray(aPositionHandle);
 
     squareVertex.position(BaseRenderOffScreen.SQUARE_VERTEX_DATA_UV_OFFSET);
     GLES20.glVertexAttribPointer(aTextureHandle, 2, GLES20.GL_FLOAT, false,
-            BaseRenderOffScreen.SQUARE_VERTEX_DATA_STRIDE_BYTES, squareVertex);
+        BaseRenderOffScreen.SQUARE_VERTEX_DATA_STRIDE_BYTES, squareVertex);
     GLES20.glEnableVertexAttribArray(aTextureHandle);
 
     GLES20.glUniformMatrix4fv(uMVPMatrixHandle, 1, false, MVPMatrix, 0);
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
index 7893ef9..574a16f 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render;
 
 import android.content.Context;
@@ -49,7 +65,6 @@ public class SimpleCameraRender {
   private Surface surface;
   private int streamWidth;
   private int streamHeight;
-  private boolean isPortrait;
 
   public SimpleCameraRender() {
     Matrix.setIdentityM(MVPMatrix, 0);
@@ -86,13 +101,11 @@ public class SimpleCameraRender {
   }
 
   public void drawFrame(int width, int height, boolean keepAspectRatio, int mode, int rotation,
-      boolean isPreview) {
+      boolean flipStreamVertical, boolean flipStreamHorizontal) {
     GlUtil.checkGlError("drawFrame start");
     surfaceTexture.getTransformMatrix(STMatrix);
 
-    if (mode == 2 || mode == 3) { //stream rotation is enabled
-      SizeCalculator.updateMatrix(rotation, width, height, isPreview, isPortrait, MVPMatrix);
-    }
+    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical, MVPMatrix);
     SizeCalculator.calculateViewPort(keepAspectRatio, mode, width, height, streamWidth,
         streamHeight);
 
@@ -125,7 +138,6 @@ public class SimpleCameraRender {
    * Initializes GL state.  Call this after the EGL surface has been created and made current.
    */
   public void initGl(Context context, int streamWidth, int streamHeight) {
-    isPortrait = CameraHelper.isPortrait(context);
     this.streamWidth = streamWidth;
     this.streamHeight = streamHeight;
     GlUtil.checkGlError("initGl start");
@@ -139,7 +151,7 @@ public class SimpleCameraRender {
     uSTMatrixHandle = GLES20.glGetUniformLocation(program, "uSTMatrix");
 
     //camera texture
-    GlUtil.createExternalTextures(1, texturesID, 0);
+    GlUtil.createExternalTextures(texturesID.length, texturesID, 0);
     textureID = texturesID[0];
 
     surfaceTexture = new SurfaceTexture(textureID);
@@ -150,8 +162,8 @@ public class SimpleCameraRender {
 
   public void release() {
     GLES20.glDeleteProgram(program);
-    surfaceTexture = null;
-    surface = null;
+    surfaceTexture.release();
+    surface.release();
   }
 
   public void setFlip(boolean isFlipHorizontal, boolean isFlipVertical) {
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/AnalogTVFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/AnalogTVFilterRender.java
index 6d4f9a9..4bc69b2 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/AnalogTVFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/AnalogTVFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/AndroidViewFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/AndroidViewFilterRender.java
index 38371ba..54ed28d 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/AndroidViewFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/AndroidViewFilterRender.java
@@ -1,8 +1,25 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.PointF;
 import android.graphics.PorterDuff;
 import android.graphics.SurfaceTexture;
 import android.opengl.GLES11Ext;
@@ -15,10 +32,13 @@ import android.view.Surface;
 import android.view.View;
 import androidx.annotation.RequiresApi;
 import com.pedro.encoder.R;
+import com.pedro.encoder.input.gl.AndroidViewSprite;
 import com.pedro.encoder.utils.gl.GlUtil;
 import com.pedro.encoder.utils.gl.TranslateTo;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * Created by pedro on 4/02/18.
@@ -44,16 +64,21 @@ public class AndroidViewFilterRender extends BaseFilterRender {
   private int uSamplerHandle = -1;
   private int uSamplerViewHandle = -1;
 
-  private int[] viewId = new int[1];
+  private int[] viewId = new int[] { -1, -1 };
   private View view;
-  private SurfaceTexture surfaceTexture;
-  private Surface surface;
-  private Handler mainHandler;
+  //Use 2 surfaces to avoid block render thread
+  private SurfaceTexture surfaceTexture, surfaceTexture2;
+  private Surface surface, surface2;
+  private final Handler mainHandler;
+  private boolean running = false;
+  private ExecutorService thread = null;
+  private boolean hardwareMode = true;
+  private final AndroidViewSprite sprite;
+  private volatile Status renderingStatus = Status.DONE1;
 
-  private int rotation;
-  private float positionX, positionY;
-  private float scaleX = 1f, scaleY = 1f;
-  private float viewX, viewY;
+  private enum Status {
+    RENDER1, RENDER2, DONE1, DONE2
+  }
 
   public AndroidViewFilterRender() {
     squareVertex = ByteBuffer.allocateDirect(squareVertexDataFilter.length * FLOAT_SIZE_BYTES)
@@ -62,6 +87,7 @@ public class AndroidViewFilterRender extends BaseFilterRender {
     squareVertex.put(squareVertexDataFilter).position(0);
     Matrix.setIdentityM(MVPMatrix, 0);
     Matrix.setIdentityM(STMatrix, 0);
+    sprite = new AndroidViewSprite();
     mainHandler = new Handler(Looper.getMainLooper());
   }
 
@@ -78,31 +104,37 @@ public class AndroidViewFilterRender extends BaseFilterRender {
     uSamplerHandle = GLES20.glGetUniformLocation(program, "uSampler");
     uSamplerViewHandle = GLES20.glGetUniformLocation(program, "uSamplerView");
 
-    GlUtil.createExternalTextures(1, viewId, 0);
+    GlUtil.createExternalTextures(viewId.length, viewId, 0);
     surfaceTexture = new SurfaceTexture(viewId[0]);
+    surfaceTexture2 = new SurfaceTexture(viewId[1]);
     surface = new Surface(surfaceTexture);
+    surface2 = new Surface(surfaceTexture2);
   }
 
   @Override
   protected void drawFilter() {
-    surfaceTexture.setDefaultBufferSize(getPreviewWidth(), getPreviewHeight());
-    if (view != null) {
-      mainHandler.post(new Runnable() {
-        @Override
-        public void run() {
-          Canvas canvas = surface.lockCanvas(null);
-          canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-          canvas.translate(positionX, positionY);
-          canvas.rotate(rotation, viewX / 2f, viewY / 2f);
-          float scaleFactorX = (float) getPreviewWidth() / (float) view.getWidth();
-          float scaleFactorY = (float) getPreviewHeight() / (float) view.getHeight();
-          canvas.scale(scaleX * scaleFactorX, scaleY * scaleFactorY);
-          view.draw(canvas);
-          surface.unlockCanvasAndPost(canvas);
-        }
-      });
+    final Status status = renderingStatus;
+    switch (status) {
+      case DONE1:
+        surfaceTexture.setDefaultBufferSize(getPreviewWidth(), getPreviewHeight());
+        surfaceTexture.updateTexImage();
+        renderingStatus = Status.RENDER2;
+        break;
+      case DONE2:
+        surfaceTexture2.setDefaultBufferSize(getPreviewWidth(), getPreviewHeight());
+        surfaceTexture2.updateTexImage();
+        renderingStatus = Status.RENDER1;
+        break;
+      case RENDER1:
+        surfaceTexture2.setDefaultBufferSize(getPreviewWidth(), getPreviewHeight());
+        surfaceTexture2.updateTexImage();
+        break;
+      case RENDER2:
+      default:
+        surfaceTexture.setDefaultBufferSize(getPreviewWidth(), getPreviewHeight());
+        surfaceTexture.updateTexImage();
+        break;
     }
-    surfaceTexture.updateTexImage();
 
     GLES20.glUseProgram(program);
 
@@ -125,12 +157,27 @@ public class AndroidViewFilterRender extends BaseFilterRender {
     //android view
     GLES20.glUniform1i(uSamplerViewHandle, 5);
     GLES20.glActiveTexture(GLES20.GL_TEXTURE5);
-    GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, viewId[0]);
+
+    switch (status) {
+      case DONE2:
+      case RENDER1:
+        GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, viewId[1]);
+        break;
+      case RENDER2:
+      case DONE1:
+      default:
+        GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, viewId[0]);
+        break;
+    }
   }
 
   @Override
   public void release() {
+    stopRender();
     GLES20.glDeleteProgram(program);
+    viewId = new int[] { -1, -1 };
+    surfaceTexture.release();
+    surfaceTexture2.release();
   }
 
   public View getView() {
@@ -138,11 +185,12 @@ public class AndroidViewFilterRender extends BaseFilterRender {
   }
 
   public void setView(final View view) {
+    stopRender();
     this.view = view;
     if (view != null) {
       view.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
-      viewX = view.getMeasuredWidth();
-      viewY = view.getMeasuredHeight();
+      sprite.setView(view);
+      startRender();
     }
   }
 
@@ -152,68 +200,105 @@ public class AndroidViewFilterRender extends BaseFilterRender {
    * @param y Position in percent
    */
   public void setPosition(float x, float y) {
-    int previewX = getPreviewWidth();
-    int previewY = getPreviewHeight();
-    this.positionX = previewX * x / 100f;
-    this.positionY = previewY * y / 100f;
+    sprite.translate(x, y);
   }
 
   public void setPosition(TranslateTo positionTo) {
-    int previewX = getPreviewWidth();
-    int previewY = getPreviewHeight();
-    switch (positionTo) {
-      case TOP:
-        this.positionX = previewX / 2f - (viewX / 2f);
-        this.positionY = 0f;
-        break;
-      case LEFT:
-        this.positionX = 0;
-        this.positionY = previewY / 2f - (viewY / 2f);
-        break;
-      case RIGHT:
-        this.positionX = previewX - viewX;
-        this.positionY = previewY / 2f - (viewY / 2f);
-        break;
-      case BOTTOM:
-        this.positionX = previewX / 2f - (viewX / 2f);
-        this.positionY = previewY - viewY;
-        break;
-      case CENTER:
-        this.positionX = previewX / 2f - (viewX / 2f);
-        this.positionY = previewY / 2f - (viewY / 2f);
-        break;
-      case TOP_RIGHT:
-        this.positionX = previewX - viewX;
-        this.positionY = 0;
-        break;
-      case BOTTOM_LEFT:
-        this.positionX = 0;
-        this.positionY = previewY - viewY;
-        break;
-      case BOTTOM_RIGHT:
-        this.positionX = previewX - viewX;
-        this.positionY = previewY - viewY;
-        break;
-      case TOP_LEFT:
-      default:
-        this.positionX = 0;
-        this.positionY = 0;
-        break;
-    }
+    sprite.translate(positionTo);
   }
 
   public void setRotation(int rotation) {
-    if (rotation < 0) {
-      this.rotation = 0;
-    } else if (rotation > 360) {
-      this.rotation = 360;
-    } else {
-      this.rotation = rotation;
-    }
+    sprite.setRotation(rotation);
   }
 
   public void setScale(float scaleX, float scaleY) {
-    this.scaleX = scaleX;
-    this.scaleY = scaleY;
+    sprite.scale(scaleX, scaleY);
   }
-}
+
+  public PointF getScale() {
+    return sprite.getScale();
+  }
+
+  public PointF getPosition() {
+    return sprite.getTranslation();
+  }
+
+  public int getRotation() {
+    return sprite.getRotation();
+  }
+
+  public boolean isHardwareMode() {
+    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && hardwareMode;
+  }
+
+  /**
+   * Draw in surface using hardware canvas. True by default
+   */
+  public void setHardwareMode(boolean hardwareMode) {
+    this.hardwareMode = hardwareMode;
+  }
+
+  private void startRender() {
+    running = true;
+    thread = Executors.newSingleThreadExecutor();
+    thread.execute(() -> {
+      while (running) {
+        final Status status = renderingStatus;
+        if (status == Status.RENDER1 || status == Status.RENDER2) {
+          final Canvas canvas;
+          try {
+            if (isHardwareMode()) {
+              canvas = status == Status.RENDER1 ? surface.lockHardwareCanvas() : surface2.lockHardwareCanvas();
+            } else {
+              canvas = status == Status.RENDER1 ? surface.lockCanvas(null) : surface2.lockCanvas(null);
+            }
+          } catch (IllegalStateException e) {
+            continue;
+          }
+
+          sprite.calculateDefaultScale(getPreviewWidth(), getPreviewHeight());
+          PointF canvasPosition = sprite.getCanvasPosition(getPreviewWidth(), getPreviewHeight());
+          PointF canvasScale = sprite.getCanvasScale(getPreviewWidth(), getPreviewHeight());
+          PointF rotationAxis = sprite.getRotationAxis();
+          int rotation = sprite.getRotation();
+
+          canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
+          canvas.translate(canvasPosition.x, canvasPosition.y);
+          canvas.scale(canvasScale.x, canvasScale.y);
+          canvas.rotate(rotation, rotationAxis.x, rotationAxis.y);
+          try {
+            view.draw(canvas);
+            if (status == Status.RENDER1) {
+              surface.unlockCanvasAndPost(canvas);
+              renderingStatus = Status.DONE1;
+            } else {
+              surface2.unlockCanvasAndPost(canvas);
+              renderingStatus = Status.DONE2;
+            }
+            //Sometimes draw could crash if you don't use main thread. Ensuring you can render always
+          } catch (Exception e) {
+            mainHandler.post(() -> {
+              view.draw(canvas);
+              if (status == Status.RENDER1) {
+                surface.unlockCanvasAndPost(canvas);
+                renderingStatus = Status.DONE1;
+              } else {
+                surface2.unlockCanvasAndPost(canvas);
+                renderingStatus = Status.DONE2;
+              }
+            });
+          }
+        }
+      }
+    });
+  }
+
+  private void stopRender() {
+    running = false;
+    if (thread != null) {
+      thread.shutdownNow();
+      thread = null;
+    }
+    renderingStatus = Status.DONE1;
+  }
+}
\ No newline at end of file
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BaseFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BaseFilterRender.java
index b289bd2..172c8e4 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BaseFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BaseFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BasicDeformationFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BasicDeformationFilterRender.java
index fe09d45..4414822 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BasicDeformationFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BasicDeformationFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BeautyFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BeautyFilterRender.java
index f9f0ab2..a8ef7a5 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BeautyFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BeautyFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BlackFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BlackFilterRender.java
index e71db41..6887b7e 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BlackFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BlackFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BlurFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BlurFilterRender.java
index 5b2e88d..86cf0ce 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BlurFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BlurFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BrightnessFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BrightnessFilterRender.java
index 74f870c..5be6b6c 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BrightnessFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/BrightnessFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/CartoonFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/CartoonFilterRender.java
index 6b6175c..fd7ceb0 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/CartoonFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/CartoonFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ChromaFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ChromaFilterRender.java
new file mode 100644
index 0000000..910b924
--- /dev/null
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ChromaFilterRender.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.opengl.GLES20;
+import android.opengl.Matrix;
+import android.os.Build;
+
+import androidx.annotation.RequiresApi;
+
+import com.pedro.encoder.R;
+import com.pedro.encoder.input.gl.Sprite;
+import com.pedro.encoder.input.gl.TextureLoader;
+import com.pedro.encoder.utils.gl.GlUtil;
+import com.pedro.encoder.utils.gl.ImageStreamObject;
+import com.pedro.encoder.utils.gl.StreamObjectBase;
+import com.pedro.encoder.utils.gl.TranslateTo;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
+@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+public class ChromaFilterRender extends BaseFilterRender {
+
+    //rotation matrix
+    private final float[] squareVertexDataFilter = {
+        // X, Y, Z, U, V
+        -1f, -1f, 0f, 0f, 0f, //bottom left
+        1f, -1f, 0f, 1f, 0f, //bottom right
+        -1f, 1f, 0f, 0f, 1f, //top left
+        1f, 1f, 0f, 1f, 1f, //top right
+    };
+
+    private int program = -1;
+    private int aPositionHandle = -1;
+    private int aTextureHandle = -1;
+    private int aTextureObjectHandle = -1;
+    private int uMVPMatrixHandle = -1;
+    private int uSTMatrixHandle = -1;
+    private int uSamplerHandle = -1;
+    private int uObjectHandle = -1;
+    private int uSensitiveHandle = -1;
+
+    private FloatBuffer squareVertexObject;
+
+    protected int[] streamObjectTextureId = new int[] { -1 };
+    protected TextureLoader textureLoader = new TextureLoader();
+    protected StreamObjectBase streamObject;
+    private Sprite sprite;
+    protected boolean shouldLoad = false;
+    private float sensitive = 0.8f;
+
+    public ChromaFilterRender() {
+        streamObject = new ImageStreamObject();
+        squareVertex = ByteBuffer.allocateDirect(squareVertexDataFilter.length * FLOAT_SIZE_BYTES)
+            .order(ByteOrder.nativeOrder())
+            .asFloatBuffer();
+        squareVertex.put(squareVertexDataFilter).position(0);
+        sprite = new Sprite();
+        float[] vertices = sprite.getTransformedVertices();
+        squareVertexObject = ByteBuffer.allocateDirect(vertices.length * FLOAT_SIZE_BYTES)
+            .order(ByteOrder.nativeOrder())
+            .asFloatBuffer();
+        squareVertexObject.put(vertices).position(0);
+        Matrix.setIdentityM(MVPMatrix, 0);
+        Matrix.setIdentityM(STMatrix, 0);
+    }
+
+    @Override
+    protected void initGlFilter(Context context) {
+        String vertexShader = GlUtil.getStringFromRaw(context, R.raw.object_vertex);
+        String fragmentShader = GlUtil.getStringFromRaw(context, R.raw.chroma_fragment);
+
+        program = GlUtil.createProgram(vertexShader, fragmentShader);
+        aPositionHandle = GLES20.glGetAttribLocation(program, "aPosition");
+        aTextureHandle = GLES20.glGetAttribLocation(program, "aTextureCoord");
+        aTextureObjectHandle = GLES20.glGetAttribLocation(program, "aTextureObjectCoord");
+        uMVPMatrixHandle = GLES20.glGetUniformLocation(program, "uMVPMatrix");
+        uSTMatrixHandle = GLES20.glGetUniformLocation(program, "uSTMatrix");
+        uSamplerHandle = GLES20.glGetUniformLocation(program, "uSampler");
+        uObjectHandle = GLES20.glGetUniformLocation(program, "uObject");
+        uSensitiveHandle = GLES20.glGetUniformLocation(program, "uSensitive");
+    }
+
+    @Override
+    protected void drawFilter() {
+        if (shouldLoad) {
+            releaseTexture();
+            streamObjectTextureId = textureLoader.load(streamObject.getBitmaps());
+            shouldLoad = false;
+        }
+
+        GLES20.glUseProgram(program);
+
+        squareVertex.position(SQUARE_VERTEX_DATA_POS_OFFSET);
+        GLES20.glVertexAttribPointer(aPositionHandle, 3, GLES20.GL_FLOAT, false,
+            SQUARE_VERTEX_DATA_STRIDE_BYTES, squareVertex);
+        GLES20.glEnableVertexAttribArray(aPositionHandle);
+
+        squareVertex.position(SQUARE_VERTEX_DATA_UV_OFFSET);
+        GLES20.glVertexAttribPointer(aTextureHandle, 2, GLES20.GL_FLOAT, false,
+            SQUARE_VERTEX_DATA_STRIDE_BYTES, squareVertex);
+        GLES20.glEnableVertexAttribArray(aTextureHandle);
+
+        squareVertexObject.position(SQUARE_VERTEX_DATA_POS_OFFSET);
+        GLES20.glVertexAttribPointer(aTextureObjectHandle, 2, GLES20.GL_FLOAT, false,
+            2 * FLOAT_SIZE_BYTES, squareVertexObject);
+        GLES20.glEnableVertexAttribArray(aTextureObjectHandle);
+
+        GLES20.glUniformMatrix4fv(uMVPMatrixHandle, 1, false, MVPMatrix, 0);
+        GLES20.glUniformMatrix4fv(uSTMatrixHandle, 1, false, STMatrix, 0);
+        //Sampler
+        GLES20.glUniform1i(uSamplerHandle, 4);
+        GLES20.glActiveTexture(GLES20.GL_TEXTURE4);
+        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, previousTexId);
+        //Object
+        GLES20.glUniform1i(uObjectHandle, 0);
+        GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
+
+        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, streamObjectTextureId[0]);
+        GLES20.glUniform1f(uSensitiveHandle, sensitive);
+    }
+
+    @Override
+    public void release() {
+        GLES20.glDeleteProgram(program);
+        releaseTexture();
+        sprite.reset();
+    }
+
+    private void releaseTexture() {
+        GLES20.glDeleteTextures(streamObjectTextureId.length, streamObjectTextureId, 0);
+        streamObjectTextureId = new int[] { -1 };
+    }
+
+    private void setScale(float scaleX, float scaleY) {
+        sprite.scale(scaleX, scaleY);
+        squareVertexObject.put(sprite.getTransformedVertices()).position(0);
+    }
+
+    private void setPosition(TranslateTo positionTo) {
+        sprite.translate(positionTo);
+        squareVertexObject.put(sprite.getTransformedVertices()).position(0);
+    }
+
+    public void setImage(Bitmap bitmap) {
+        ((ImageStreamObject) streamObject).load(bitmap);
+        shouldLoad = true;
+        setScale(100f, 100f);
+        setPosition(TranslateTo.CENTER);
+    }
+
+    public void setSensitive(float sensitive) {
+        this.sensitive = sensitive;
+    }
+}
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/CircleFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/CircleFilterRender.java
index 7754a8c..e5a220d 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/CircleFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/CircleFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ColorFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ColorFilterRender.java
index 93e0c0b..2772042 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ColorFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ColorFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ContrastFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ContrastFilterRender.java
index 33bf042..6233ce1 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ContrastFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ContrastFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/DuotoneFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/DuotoneFilterRender.java
index afed198..62121cd 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/DuotoneFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/DuotoneFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/EarlyBirdFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/EarlyBirdFilterRender.java
index b373008..df0cfba 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/EarlyBirdFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/EarlyBirdFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/EdgeDetectionFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/EdgeDetectionFilterRender.java
index 6263d67..913f095 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/EdgeDetectionFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/EdgeDetectionFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ExposureFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ExposureFilterRender.java
index 0cccab4..d65af82 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ExposureFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ExposureFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/FireFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/FireFilterRender.java
index d1f6d7a..6f4fed4 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/FireFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/FireFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GammaFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GammaFilterRender.java
index 9c71e38..1107435 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GammaFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GammaFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GlitchFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GlitchFilterRender.java
index 987396f..976ff24 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GlitchFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GlitchFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GreyScaleFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GreyScaleFilterRender.java
index bc1608c..c0ab5e1 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GreyScaleFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/GreyScaleFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/HalftoneLinesFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/HalftoneLinesFilterRender.java
index f401026..3fbe42f 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/HalftoneLinesFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/HalftoneLinesFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/Image70sFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/Image70sFilterRender.java
index 01815d3..c0ab042 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/Image70sFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/Image70sFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/LamoishFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/LamoishFilterRender.java
index 4cd9db1..04313ca 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/LamoishFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/LamoishFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/MoneyFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/MoneyFilterRender.java
index 06f90b2..ed26b91 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/MoneyFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/MoneyFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/NegativeFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/NegativeFilterRender.java
index cde1abb..9d37441 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/NegativeFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/NegativeFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/NoFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/NoFilterRender.java
index 266413e..55b4e51 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/NoFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/NoFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/PixelatedFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/PixelatedFilterRender.java
index fd8f870..fc44213 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/PixelatedFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/PixelatedFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/PolygonizationFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/PolygonizationFilterRender.java
index 680cb1b..806eb30 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/PolygonizationFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/PolygonizationFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RGBSaturationFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RGBSaturationFilterRender.java
index ac1b2d6..0d22924 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RGBSaturationFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RGBSaturationFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RainbowFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RainbowFilterRender.java
index ee1edae..4b3b849 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RainbowFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RainbowFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RippleFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RippleFilterRender.java
index 7d0c32d..25e69d1 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RippleFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RippleFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RotationFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RotationFilterRender.java
index 77fe94a..6d631e3 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RotationFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/RotationFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
@@ -6,6 +22,7 @@ import android.opengl.Matrix;
 import android.os.Build;
 import androidx.annotation.RequiresApi;
 import com.pedro.encoder.R;
+import com.pedro.encoder.input.video.CameraHelper;
 import com.pedro.encoder.utils.gl.GlUtil;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -97,9 +114,34 @@ public class RotationFilterRender extends BaseFilterRender {
     this.rotation = rotation;
     //Set rotation
     Matrix.setRotateM(rotationMatrix, 0, rotation, 0, 0, 1.0f);
+    Matrix.scaleM(rotationMatrix, 0, 1f, 1f, 0f);
     //Translation
     //Matrix.translateM(rotationMatrix, 0, 0f, 0f, 0f);
     // Combine the rotation matrix with the projection and camera view
     Matrix.multiplyMM(MVPMatrix, 0, rotationMatrix, 0, MVPMatrix, 0);
   }
+
+  /**
+   * Keep aspect ratio if you rotate 90º or 270º.
+   * @param rotation value
+   * @param width width of stream (prepareVideo method) if you are streaming or preview (startPreview method) if you aren't streaming.
+   * @param height height of stream (prepareVideo method) if you are streaming or preview (startPreview method) if you aren't streaming.
+   */
+  public void setRotationFixed(int rotation, int width, int height, boolean isPortrait) {
+    this.rotation = rotation;
+    //Set rotation
+    Matrix.setRotateM(rotationMatrix, 0, rotation, 0, 0, 1.0f);
+    if (rotation == 90 || rotation == 270) {
+      float value = (float) height / (float) width;
+      if (isPortrait) {
+        Matrix.scaleM(rotationMatrix, 0, value, 1f, 0f);
+      } else {
+        Matrix.scaleM(rotationMatrix, 0, 1f, value, 0f);
+      }
+    } else {
+      Matrix.scaleM(rotationMatrix, 0, 1f, 1f, 0f);
+    }
+    // Combine the rotation matrix with the projection and camera view
+    Matrix.multiplyMM(MVPMatrix, 0, rotationMatrix, 0, MVPMatrix, 0);
+  }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SaturationFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SaturationFilterRender.java
index cdd2376..fb4f13a 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SaturationFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SaturationFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SepiaFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SepiaFilterRender.java
index 98de0d1..fabf8cb 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SepiaFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SepiaFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SharpnessFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SharpnessFilterRender.java
index 993fb8f..b47a854 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SharpnessFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SharpnessFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SnowFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SnowFilterRender.java
index 75d664e..4ce595c 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SnowFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SnowFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SwirlFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SwirlFilterRender.java
index 39d4117..813815b 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SwirlFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/SwirlFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/TemperatureFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/TemperatureFilterRender.java
index c6ae672..fae1d11 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/TemperatureFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/TemperatureFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ZebraFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ZebraFilterRender.java
index e48bfd0..650a550 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ZebraFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/ZebraFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/BaseObjectFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/BaseObjectFilterRender.java
index 1b2aa02..9ed5803 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/BaseObjectFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/BaseObjectFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters.object;
 
 import android.content.Context;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/GifObjectFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/GifObjectFilterRender.java
index b6d15d1..8295136 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/GifObjectFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/GifObjectFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters.object;
 
 import android.opengl.GLES20;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/ImageObjectFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/ImageObjectFilterRender.java
index b9d89aa..720da39 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/ImageObjectFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/ImageObjectFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters.object;
 
 import android.graphics.Bitmap;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/SurfaceFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/SurfaceFilterRender.java
index 4ff01ad..88816e8 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/SurfaceFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/SurfaceFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters.object;
 
 import android.content.Context;
@@ -8,6 +24,9 @@ import android.opengl.GLES20;
 import android.opengl.Matrix;
 import android.os.Build;
 import androidx.annotation.RequiresApi;
+
+import android.os.Handler;
+import android.os.Looper;
 import android.view.Surface;
 import com.pedro.encoder.R;
 import com.pedro.encoder.input.gl.Sprite;
@@ -25,7 +44,7 @@ import java.nio.FloatBuffer;
 public class SurfaceFilterRender extends BaseObjectFilterRender {
 
   public interface SurfaceReadyCallback {
-    void surfaceReady();
+    void surfaceReady(SurfaceTexture surfaceTexture);
   }
 
   //rotation matrix
@@ -92,11 +111,18 @@ public class SurfaceFilterRender extends BaseObjectFilterRender {
     uSamplerSurfaceHandle = GLES20.glGetUniformLocation(program, "uSamplerSurface");
     uAlphaHandle = GLES20.glGetUniformLocation(program, "uAlpha");
 
-    GlUtil.createExternalTextures(1, surfaceId, 0);
+    GlUtil.createExternalTextures(surfaceId.length, surfaceId, 0);
     surfaceTexture = new SurfaceTexture(surfaceId[0]);
     surfaceTexture.setDefaultBufferSize(getWidth(), getHeight());
     surface = new Surface(surfaceTexture);
-    if (surfaceReadyCallback != null) surfaceReadyCallback.surfaceReady();
+    if (surfaceReadyCallback != null) {
+      new Handler(Looper.getMainLooper()).post(new Runnable() {
+        @Override
+        public void run() {
+          surfaceReadyCallback.surfaceReady(surfaceTexture);
+        }
+      });
+    }
   }
 
   @Override
@@ -142,10 +168,16 @@ public class SurfaceFilterRender extends BaseObjectFilterRender {
     surface.release();
   }
 
+  /**
+   * This texture must be renderer using an api called on main thread to avoid possible errors
+   */
   public SurfaceTexture getSurfaceTexture() {
     return surfaceTexture;
   }
 
+  /**
+   * This surface must be renderer using an api called on main thread to avoid possible errors
+   */
   public Surface getSurface() {
     return surface;
   }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/TextObjectFilterRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/TextObjectFilterRender.java
index 30de193..f564136 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/TextObjectFilterRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/filters/object/TextObjectFilterRender.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.gl.render.filters.object;
 
 import android.graphics.Typeface;
@@ -13,6 +29,11 @@ import com.pedro.encoder.utils.gl.TextStreamObject;
 @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
 public class TextObjectFilterRender extends BaseObjectFilterRender {
 
+  private String text;
+  private float textSize;
+  private int textColor;
+  private Typeface typeface;
+
   public TextObjectFilterRender() {
     super();
     streamObject = new TextStreamObject();
@@ -31,7 +52,27 @@ public class TextObjectFilterRender extends BaseObjectFilterRender {
   }
 
   public void setText(String text, float textSize, int textColor, Typeface typeface) {
+    this.text = text;
+    this.textSize = textSize;
+    this.textColor = textColor;
+    this.typeface = typeface;
     ((TextStreamObject) streamObject).load(text, textSize, textColor, typeface);
     shouldLoad = true;
   }
+
+  public void addText(String text) {
+    setText(this.text + text, textSize, textColor, typeface);
+  }
+
+  public void updateColor(int textColor) {
+    setText(this.text + text, textSize, textColor, typeface);
+  }
+
+  public void updateTypeface(Typeface typeface) {
+    setText(this.text + text, textSize, textColor, typeface);
+  }
+
+  public void updateTextSize(float textSize) {
+    setText(this.text + text, textSize, textColor, typeface);
+  }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java b/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java
index 03d5118..75fabe4 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java
@@ -1,8 +1,25 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.video;
 
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.ImageFormat;
+import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
 import android.hardware.Camera;
 import android.media.CamcorderProfile;
@@ -10,9 +27,11 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.TextureView;
+import android.view.View;
 
 import com.pedro.encoder.Frame;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -39,10 +58,11 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
   private GetCameraData getCameraData;
   private boolean running = false;
   private boolean lanternEnable = false;
+  private boolean videoStabilizationEnable = false;
+  private boolean autoFocusEnabled = false;
   private int cameraSelect;
-  private boolean isFrontCamera = false;
+  private CameraHelper.Facing facing = CameraHelper.Facing.BACK;
   private boolean isPortrait = false;
-  private int cameraFacing = Camera.CameraInfo.CAMERA_FACING_BACK;
   private Context context;
 
   //default parameters for camera
@@ -55,12 +75,17 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
   private List<Camera.Size> previewSizeBack;
   private List<Camera.Size> previewSizeFront;
   private float distance;
+  private CameraCallbacks cameraCallbacks;
+  private final int focusAreaSize = 100;
 
   //Face detector
   public interface FaceDetectorCallback {
-    void onGetFaces(Camera.Face[] faces);
+    void onGetFaces(Camera.Face[] faces, Rect scaleSensor, int sensorOrientation);
   }
 
+  private final int sensorOrientation = 0;
+  //Value obtained from Camera.Face documentation api about bounds
+  private final Rect faceSensorScale = new Rect(-1000, -1000, 1000, 1000);
   private FaceDetectorCallback faceDetectorCallback;
 
   public Camera1ApiManager(SurfaceView surfaceView, GetCameraData getCameraData) {
@@ -106,23 +131,36 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
     return height;
   }
 
+  public void setCameraFacing(CameraHelper.Facing cameraFacing) {
+    facing = cameraFacing;
+  }
+
+  public void setCameraSelect(int cameraFacing) {
+    cameraSelect = cameraFacing;
+  }
+
   public void start(CameraHelper.Facing cameraFacing, int width, int height, int fps) {
     int facing = cameraFacing == CameraHelper.Facing.BACK ? Camera.CameraInfo.CAMERA_FACING_BACK
         : Camera.CameraInfo.CAMERA_FACING_FRONT;
     this.width = width;
     this.height = height;
     this.fps = fps;
-    this.cameraFacing = facing;
     cameraSelect =
         facing == Camera.CameraInfo.CAMERA_FACING_BACK ? selectCameraBack() : selectCameraFront();
     start();
   }
 
+  public void start(int facing, int width, int height, int fps) {
+    this.width = width;
+    this.height = height;
+    this.fps = fps;
+    cameraSelect = facing;
+    selectCamera(facing);
+    start();
+  }
+
   public void start(int width, int height, int fps) {
-    CameraHelper.Facing facing =
-        cameraFacing == Camera.CameraInfo.CAMERA_FACING_BACK ? CameraHelper.Facing.BACK
-            : CameraHelper.Facing.FRONT;
-    start(facing, width, height, fps);
+    start(cameraSelect, width, height, fps);
   }
 
   private void start() {
@@ -134,23 +172,27 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
       camera = Camera.open(cameraSelect);
       Camera.CameraInfo info = new Camera.CameraInfo();
       Camera.getCameraInfo(cameraSelect, info);
-      isFrontCamera = info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT;
+      facing = info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT ? CameraHelper.Facing.FRONT : CameraHelper.Facing.BACK;
       isPortrait = context.getResources().getConfiguration().orientation
           == Configuration.ORIENTATION_PORTRAIT;
       Camera.Parameters parameters = camera.getParameters();
       parameters.setPreviewSize(width, height);
       parameters.setPreviewFormat(imageFormat);
       int[] range = adaptFpsRange(fps, parameters.getSupportedPreviewFpsRange());
+      Log.i(TAG, "fps: " + range[0] + " - " + range[1]);
       parameters.setPreviewFpsRange(range[0], range[1]);
 
       List<String> supportedFocusModes = parameters.getSupportedFocusModes();
       if (supportedFocusModes != null && !supportedFocusModes.isEmpty()) {
         if (supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) {
           parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
+          autoFocusEnabled = true;
         } else if (supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) {
           parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
+          autoFocusEnabled = true;
         } else {
           parameters.setFocusMode(supportedFocusModes.get(0));
+          autoFocusEnabled = false;
         }
       }
       camera.setParameters(parameters);
@@ -168,8 +210,13 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
       }
       camera.startPreview();
       running = true;
+      if (cameraCallbacks != null) {
+        cameraCallbacks.onCameraOpened();
+        cameraCallbacks.onCameraChanged(facing);
+      }
       Log.i(TAG, width + "X" + height);
     } catch (IOException e) {
+      if (cameraCallbacks != null) cameraCallbacks.onCameraError(e.getMessage());
       Log.e(TAG, "Error", e);
     }
   }
@@ -183,6 +230,54 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
     }
   }
 
+  public void setZoom(int level) {
+    try {
+      if (camera != null && running && camera.getParameters() != null && camera.getParameters()
+          .isZoomSupported()) {
+        android.hardware.Camera.Parameters params = camera.getParameters();
+        int maxZoom = params.getMaxZoom();
+        if (level > maxZoom) level = maxZoom;
+        else if (level < getMinZoom()) level = getMinZoom();
+        params.setZoom(level);
+        camera.setParameters(params);
+      }
+    } catch (Exception e) {
+      Log.e(TAG, "Error", e);
+    }
+  }
+
+  public int getZoom() {
+    try {
+      if (camera != null && running && camera.getParameters() != null && camera.getParameters()
+          .isZoomSupported()) {
+        android.hardware.Camera.Parameters params = camera.getParameters();
+        return params.getZoom();
+      } else {
+        return getMinZoom();
+      }
+    } catch (Exception e) {
+      Log.e(TAG, "Error", e);
+      return getMinZoom();
+    }
+  }
+
+  public int getMaxZoom() {
+    try {
+      if (camera != null && running && camera.getParameters() != null && camera.getParameters()
+          .isZoomSupported()) {
+        android.hardware.Camera.Parameters params = camera.getParameters();
+        return params.getMaxZoom();
+      } else {
+        return getMinZoom();
+      }
+    } catch (Exception e) {
+      Log.e(TAG, "Error", e);
+      return getMinZoom();
+    }
+  }
+
+  public int getMinZoom() { return 0; }
+
   public void setZoom(MotionEvent event) {
     try {
       if (camera != null && running && camera.getParameters() != null && camera.getParameters()
@@ -211,6 +306,40 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
     }
   }
 
+  public void setExposure(int value) {
+    if (camera != null && camera.getParameters() != null) {
+      android.hardware.Camera.Parameters params = camera.getParameters();
+      if (value > params.getMaxExposureCompensation()) value = params.getMaxExposureCompensation();
+      else if (value < params.getMinExposureCompensation()) value = params.getMinExposureCompensation();
+      params.setExposureCompensation(value);
+      camera.setParameters(params);
+    }
+  }
+
+  public int getExposure() {
+    if (camera != null && camera.getParameters() != null) {
+      android.hardware.Camera.Parameters params = camera.getParameters();
+      return params.getExposureCompensation();
+    }
+    return 0;
+  }
+
+  public int getMaxExposure() {
+    if (camera != null && camera.getParameters() != null) {
+      android.hardware.Camera.Parameters params = camera.getParameters();
+      return params.getMaxExposureCompensation();
+    }
+    return 0;
+  }
+
+  public int getMinExposure() {
+    if (camera != null && camera.getParameters() != null) {
+      android.hardware.Camera.Parameters params = camera.getParameters();
+      return params.getMinExposureCompensation();
+    }
+    return 0;
+  }
+
   private int selectCameraBack() {
     return selectCamera(Camera.CameraInfo.CAMERA_FACING_BACK);
   }
@@ -250,10 +379,15 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
     int measure = Math.abs(closestRange[0] - expectedFps) + Math.abs(closestRange[1] - expectedFps);
     for (int[] range : fpsRanges) {
       if (range[0] <= expectedFps && range[1] >= expectedFps) {
-        int curMeasure = Math.abs(range[0] - expectedFps) + Math.abs(range[1] - expectedFps);
+        int curMeasure = Math.abs(((range[0] + range[1]) / 2) - expectedFps);
         if (curMeasure < measure) {
           closestRange = range;
           measure = curMeasure;
+        } else if (curMeasure == measure) {
+          if (Math.abs(range[0] - expectedFps) < Math.abs(closestRange[1] - expectedFps)) {
+            closestRange = range;
+            measure = curMeasure;
+          }
         }
       }
     }
@@ -262,10 +396,22 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
 
   @Override
   public void onPreviewFrame(byte[] data, Camera camera) {
-    getCameraData.inputYUVData(new Frame(data, rotation, isFrontCamera && isPortrait, imageFormat));
+    getCameraData.inputYUVData(new Frame(data, rotation, facing == CameraHelper.Facing.FRONT && isPortrait, imageFormat));
     camera.addCallbackBuffer(yuvBuffer);
   }
 
+  public Camera.Size getCameraSize(int width, int height) {
+    if (camera != null) {
+      return camera.new Size(width, height);
+    } else {
+      camera = Camera.open(cameraSelect);
+      Camera.Size size = camera.new Size(width, height);
+      camera.release();
+      camera = null;
+      return size;
+    }
+  }
+
   /**
    * See: https://developer.android.com/reference/android/graphics/ImageFormat.html to know name of
    * constant values
@@ -335,8 +481,8 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
     }
   }
 
-  public boolean isFrontCamera() {
-    return isFrontCamera;
+  public CameraHelper.Facing getCameraFacing() {
+    return facing;
   }
 
   public void switchCamera() throws CameraOpenException {
@@ -351,8 +497,6 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
             throw new CameraOpenException("This camera resolution cant be opened");
           }
           stop();
-          cameraFacing = cameraFacing == Camera.CameraInfo.CAMERA_FACING_BACK
-              ? Camera.CameraInfo.CAMERA_FACING_FRONT : Camera.CameraInfo.CAMERA_FACING_BACK;
           start();
           return;
         }
@@ -360,6 +504,20 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
     }
   }
 
+  public void switchCamera(int cameraId) throws CameraOpenException {
+    if (camera != null) {
+      int oldCamera = cameraSelect;
+      cameraSelect = cameraId;
+      if (!checkCanOpen()) {
+        cameraSelect = oldCamera;
+        throw new CameraOpenException("This camera resolution cant be opened");
+      }
+      stop();
+      start();
+      return;
+    }
+  }
+
   private boolean checkCanOpen() {
     List<Camera.Size> previews;
     if (cameraSelect == selectCameraBack()) {
@@ -399,6 +557,23 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
     }
   }
 
+  public List<int[]> getSupportedFps() {
+    List<int[]> supportedFps;
+    if (camera != null) {
+      supportedFps = camera.getParameters().getSupportedPreviewFpsRange();
+    } else {
+      camera = Camera.open(cameraSelect);
+      supportedFps = camera.getParameters().getSupportedPreviewFpsRange();
+      camera.release();
+      camera = null;
+    }
+    for (int[] range : supportedFps) {
+      range[0] /= 1000;
+      range[1] /= 1000;
+    }
+    return supportedFps;
+  }
+
   /**
    * @required: <uses-permission android:name="android.permission.FLASHLIGHT"/>
    */
@@ -410,6 +585,76 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
       lanternEnable = false;
     }
   }
+  
+  private Camera.AutoFocusCallback autoFocusTakePictureCallback = new Camera.AutoFocusCallback() {
+    @Override
+    public void onAutoFocus(boolean success, Camera camera) {
+      if (success) {
+        Log.i(TAG, "tapToFocus success");
+      } else {
+        Log.e(TAG, "tapToFocus failed");
+      }
+    }
+  };
+
+  public void tapToFocus(View view, MotionEvent event) {
+    if (camera != null && camera.getParameters() != null) {
+      Camera.Parameters parameters = camera.getParameters();
+      if (parameters.getMaxNumMeteringAreas() > 0) {
+        Rect rect = calculateFocusArea(event.getX(), event.getY(), view.getWidth(), view.getHeight());
+        parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
+        List<Camera.Area> meteringAreas = new ArrayList<>();
+        meteringAreas.add(new Camera.Area(rect, 800));
+        parameters.setFocusAreas(meteringAreas);
+        try {
+          camera.setParameters(parameters);
+        }catch (Exception e) {
+          Log.i(TAG, "tapToFocus error: " + e.getMessage());
+        }
+      }
+      camera.autoFocus(autoFocusTakePictureCallback);
+    }
+  }
+
+  public void enableAutoFocus() {
+    if (camera != null) {
+      Camera.Parameters parameters = camera.getParameters();
+      List<String> supportedFocusModes = parameters.getSupportedFocusModes();
+      if (supportedFocusModes != null && !supportedFocusModes.isEmpty()) {
+        if (supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) {
+          parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
+          autoFocusEnabled = true;
+        } else if (supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) {
+          parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
+          autoFocusEnabled = true;
+        } else {
+          autoFocusEnabled = false;
+          parameters.setFocusMode(supportedFocusModes.get(0));
+        }
+      }
+      camera.setParameters(parameters);
+    }
+  }
+
+  public void disableAutoFocus() {
+    if (camera != null) {
+      Camera.Parameters parameters = camera.getParameters();
+      List<String> supportedFocusModes = parameters.getSupportedFocusModes();
+      if (supportedFocusModes != null && !supportedFocusModes.isEmpty()) {
+        if (supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_INFINITY)) {
+          parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_INFINITY);
+        } else {
+          parameters.setFocusMode(supportedFocusModes.get(0));
+        }
+      }
+      autoFocusEnabled = false;
+      camera.setParameters(parameters);
+    }
+  }
+
+  public boolean isAutoFocusEnabled() {
+    return autoFocusEnabled;
+  }
 
   public void enableRecordingHint() {
     if (camera != null) {
@@ -427,11 +672,20 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
     }
   }
 
-  public void enableFaceDetection(FaceDetectorCallback faceDetectorCallback) {
-    if (camera != null) {
-      this.faceDetectorCallback = faceDetectorCallback;
-      camera.setFaceDetectionListener(this);
-      camera.startFaceDetection();
+  public boolean enableFaceDetection(FaceDetectorCallback faceDetectorCallback) {
+    try {
+      if (camera != null) {
+        this.faceDetectorCallback = faceDetectorCallback;
+        camera.setFaceDetectionListener(this);
+        camera.startFaceDetection();
+        return true;
+      } else {
+        Log.e(TAG, "face detection called with camera stopped");
+        return false;
+      }
+    } catch (IllegalArgumentException e) {
+      Log.e(TAG, "face detection unsupported");
+      return false;
     }
   }
 
@@ -443,12 +697,61 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
     }
   }
 
+  public boolean enableVideoStabilization() {
+    if (camera != null) {
+      Camera.Parameters parameters = camera.getParameters();
+      if (parameters.isVideoStabilizationSupported()) {
+        parameters.setVideoStabilization(true);
+        videoStabilizationEnable = true;
+      }
+    }
+    return videoStabilizationEnable;
+  }
+
+  public void disableVideoStabilization() {
+    if (camera != null) {
+      Camera.Parameters parameters = camera.getParameters();
+      if (parameters.isVideoStabilizationSupported()) {
+        parameters.setVideoStabilization(false);
+        videoStabilizationEnable = false;
+      }
+    }
+  }
+
+  public boolean isVideoStabilizationEnabled() {
+    return videoStabilizationEnable;
+  }
+
+  public void setCameraCallbacks(CameraCallbacks cameraCallbacks) {
+    this.cameraCallbacks = cameraCallbacks;
+  }
+
   public boolean isFaceDetectionEnabled() {
     return faceDetectorCallback != null;
   }
 
   @Override
   public void onFaceDetection(Camera.Face[] faces, Camera camera) {
-    if (faceDetectorCallback != null) faceDetectorCallback.onGetFaces(faces);
+    if (faceDetectorCallback != null) faceDetectorCallback.onGetFaces(faces, faceSensorScale, sensorOrientation);
+  }
+
+  private Rect calculateFocusArea(float x, float y, float previewWidth, float previewHeight) {
+    int left = clamp((int) (x / previewWidth * 2000f - 1000f), focusAreaSize);
+    int top = clamp((int) (y / previewHeight * 2000f - 1000f), focusAreaSize);
+    return new Rect(left, top, left + focusAreaSize, top + focusAreaSize);
+  }
+
+  private int clamp(int touchCoordinateInCameraReper, int focusAreaSize) {
+    int result;
+    if (Math.abs(touchCoordinateInCameraReper) + focusAreaSize / 2 > 1000){
+      if (touchCoordinateInCameraReper > 0){
+        result = 1000 - focusAreaSize / 2;
+      } else {
+        result = -1000 + focusAreaSize / 2;
+      }
+    } else{
+      result = touchCoordinateInCameraReper - focusAreaSize / 2;
+    }
+    return result;
   }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java b/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java
index cf15f4b..550efa2 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.video;
 
 import android.annotation.SuppressLint;
@@ -14,23 +30,30 @@ import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
 import android.hardware.camera2.TotalCaptureResult;
 import android.hardware.camera2.params.Face;
+import android.hardware.camera2.params.MeteringRectangle;
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.util.Log;
+import android.util.Range;
 import android.util.Size;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.SurfaceView;
 import android.view.TextureView;
+
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.Semaphore;
 
 import static android.hardware.camera2.CameraMetadata.LENS_FACING_FRONT;
+import static com.pedro.encoder.input.video.CameraHelper.*;
 
 /**
  * Created by pedro on 4/03/17.
@@ -58,20 +81,27 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
   private Handler cameraHandler;
   private CameraCaptureSession cameraCaptureSession;
   private boolean prepared = false;
-  private int cameraId = -1;
-  private boolean isFrontCamera = false;
-  private CameraCharacteristics cameraCharacteristics;
+  private String cameraId = null;
+  private CameraHelper.Facing facing = Facing.BACK;
   private CaptureRequest.Builder builderInputSurface;
   private float fingerSpacing = 0;
-  private float zoomLevel = 1.0f;
+  private float zoomLevel = 0f;
   private boolean lanternEnable = false;
+  private boolean videoStabilizationEnable = false;
+  private boolean opticalVideoStabilizationEnable = false;
+  private boolean autoFocusEnabled = true;
   private boolean running = false;
+  private int fps = 30;
+  private final Semaphore semaphore = new Semaphore(0);
+  private CameraCallbacks cameraCallbacks;
 
   //Face detector
   public interface FaceDetectorCallback {
-    void onGetFaces(Face[] faces);
+    void onGetFaces(Face[] faces, Rect scaleSensor, int sensorOrientation);
   }
 
+  private int sensorOrientation = 0;
+  private Rect faceSensorScale;
   private FaceDetectorCallback faceDetectorCallback;
   private boolean faceDetectionEnabled = false;
   private int faceDetectionMode;
@@ -80,26 +110,30 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
     cameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
   }
 
-  public void prepareCamera(SurfaceView surfaceView, Surface surface) {
+  public void prepareCamera(SurfaceView surfaceView, Surface surface, int fps) {
     this.surfaceView = surfaceView;
     this.surfaceEncoder = surface;
+    this.fps = fps;
     prepared = true;
   }
 
-  public void prepareCamera(TextureView textureView, Surface surface) {
+  public void prepareCamera(TextureView textureView, Surface surface, int fps) {
     this.textureView = textureView;
     this.surfaceEncoder = surface;
+    this.fps = fps;
     prepared = true;
   }
 
-  public void prepareCamera(Surface surface) {
+  public void prepareCamera(Surface surface, int fps) {
     this.surfaceEncoder = surface;
+    this.fps = fps;
     prepared = true;
   }
 
-  public void prepareCamera(SurfaceTexture surfaceTexture, int width, int height) {
+  public void prepareCamera(SurfaceTexture surfaceTexture, int width, int height, int fps) {
     surfaceTexture.setDefaultBufferSize(width, height);
     this.surfaceEncoder = new Surface(surfaceTexture);
+    this.fps = fps;
     prepared = true;
   }
 
@@ -112,7 +146,7 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
       final List<Surface> listSurfaces = new ArrayList<>();
       Surface preview = addPreviewSurface();
       if (preview != null) listSurfaces.add(preview);
-      if (surfaceEncoder != null) listSurfaces.add(surfaceEncoder);
+      if (surfaceEncoder != preview && surfaceEncoder != null) listSurfaces.add(surfaceEncoder);
 
       cameraDevice.createCaptureSession(listSurfaces, new CameraCaptureSession.StateCallback() {
         @Override
@@ -130,20 +164,24 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
           } catch (CameraAccessException | NullPointerException e) {
             Log.e(TAG, "Error", e);
           } catch (IllegalStateException e) {
-            reOpenCamera(cameraId != -1 ? cameraId : 0);
+            reOpenCamera(cameraId != null ? cameraId : "0");
           }
         }
 
         @Override
         public void onConfigureFailed(@NonNull CameraCaptureSession cameraCaptureSession) {
           cameraCaptureSession.close();
+          if (cameraCallbacks != null) cameraCallbacks.onCameraError("Configuration failed");
           Log.e(TAG, "Configuration failed");
         }
-      }, null);
-    } catch (CameraAccessException e) {
+      }, cameraHandler);
+    } catch (CameraAccessException | IllegalArgumentException e) {
+      if (cameraCallbacks != null) {
+        cameraCallbacks.onCameraError("Create capture session failed: " + e.getMessage());
+      }
       Log.e(TAG, "Error", e);
     } catch (IllegalStateException e) {
-      reOpenCamera(cameraId != -1 ? cameraId : 0);
+      reOpenCamera(cameraId != null ? cameraId : "0");
     }
   }
 
@@ -162,6 +200,8 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
     try {
       builderInputSurface = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
       for (Surface surface : surfaces) if (surface != null) builderInputSurface.addTarget(surface);
+      setModeAuto(builderInputSurface);
+      adaptFpsRange(fps, builderInputSurface);
       return builderInputSurface.build();
     } catch (CameraAccessException | IllegalStateException e) {
       Log.e(TAG, "Error", e);
@@ -169,11 +209,75 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
     }
   }
 
+  private void setModeAuto(CaptureRequest.Builder builderInputSurface) {
+    try {
+      builderInputSurface.set(CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO);
+    } catch (Exception ignored) { }
+  }
+
+  private void adaptFpsRange(int expectedFps, CaptureRequest.Builder builderInputSurface) {
+    List<Range<Integer>> fpsRanges = getSupportedFps(null, Facing.BACK);
+    if (fpsRanges != null && fpsRanges.size() > 0) {
+      Range<Integer> closestRange = fpsRanges.get(0);
+      int measure = Math.abs(closestRange.getLower() - expectedFps) + Math.abs(
+          closestRange.getUpper() - expectedFps);
+      for (Range<Integer> range : fpsRanges) {
+        if (CameraHelper.discardCamera2Fps(range, facing)) continue;
+        if (range.getLower() <= expectedFps && range.getUpper() >= expectedFps) {
+          int curMeasure = Math.abs(((range.getLower() + range.getUpper()) / 2) - expectedFps);
+          if (curMeasure < measure) {
+            closestRange = range;
+            measure = curMeasure;
+          } else if (curMeasure == measure) {
+            if (Math.abs(range.getUpper() - expectedFps) < Math.abs(closestRange.getUpper() - expectedFps)) {
+              closestRange = range;
+              measure = curMeasure;
+            }
+          }
+        }
+      }
+      Log.i(TAG, "fps: " + closestRange.getLower() + " - " + closestRange.getUpper());
+      builderInputSurface.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, closestRange);
+    }
+  }
+
+  public List<Range<Integer>> getSupportedFps(Size size, Facing facing) {
+    try {
+      CameraCharacteristics characteristics = null;
+      try {
+        characteristics = getCharacteristicsForFacing(cameraManager, facing);
+      } catch (CameraAccessException ignored) { }
+      if (characteristics == null) return null;
+      Range<Integer>[] fpsSupported = characteristics.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES);
+      if (size != null) {
+        StreamConfigurationMap streamConfigurationMap =
+            characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+        List<Range<Integer>> list = new ArrayList<>();
+        long fd = streamConfigurationMap.getOutputMinFrameDuration(SurfaceTexture.class, size);
+        int maxFPS = (int)(10f / Float.parseFloat("0." + fd));
+        for (Range<Integer> r : fpsSupported) {
+          if (r.getUpper() <= maxFPS) {
+            list.add(r);
+          }
+        }
+        return list;
+      } else {
+        return Arrays.asList(fpsSupported);
+      }
+    } catch (IllegalStateException e) {
+      Log.e(TAG, "Error", e);
+      return null;
+    }
+  }
+
   public int getLevelSupported() {
     try {
-      cameraCharacteristics = cameraManager.getCameraCharacteristics("0");
-      return cameraCharacteristics.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
-    } catch (CameraAccessException | IllegalStateException e) {
+      CameraCharacteristics characteristics = getCameraCharacteristics();
+      if (characteristics == null) return -1;
+      Integer level = characteristics.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
+      if (level == null) return -1;
+      return level;
+    } catch (IllegalStateException e) {
       Log.e(TAG, "Error", e);
       return -1;
     }
@@ -184,72 +288,281 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
   }
 
   public void openCameraBack() {
-    openCameraFacing(CameraHelper.Facing.BACK);
+    openCameraFacing(Facing.BACK);
   }
 
   public void openCameraFront() {
-    openCameraFacing(CameraHelper.Facing.FRONT);
+    openCameraFacing(Facing.FRONT);
   }
 
   public void openLastCamera() {
-    if (cameraId == -1) {
+    if (cameraId == null) {
       openCameraBack();
     } else {
       openCameraId(cameraId);
     }
   }
 
-  public Size[] getCameraResolutionsBack() {
+  public void setCameraFacing(CameraHelper.Facing cameraFacing) {
     try {
-      cameraCharacteristics = cameraManager.getCameraCharacteristics("0");
-      if (cameraCharacteristics.get(CameraCharacteristics.LENS_FACING)
-          != CameraCharacteristics.LENS_FACING_BACK) {
-        cameraCharacteristics = cameraManager.getCameraCharacteristics("1");
+      String cameraId = getCameraIdForFacing(cameraManager, cameraFacing);
+      if (cameraId != null) {
+        facing = cameraFacing;
+        this.cameraId = cameraId;
       }
-      StreamConfigurationMap streamConfigurationMap =
-          cameraCharacteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-      return streamConfigurationMap.getOutputSizes(SurfaceTexture.class);
     } catch (CameraAccessException e) {
       Log.e(TAG, "Error", e);
-      return new Size[0];
     }
   }
 
+  public void setCameraId(String cameraId) {
+    this.cameraId = cameraId;
+  }
+
+  public CameraHelper.Facing getCameraFacing() {
+    return facing;
+  }
+
+  public Size[] getCameraResolutionsBack() {
+    return getCameraResolutions(Facing.BACK);
+  }
+
   public Size[] getCameraResolutionsFront() {
+    return getCameraResolutions(Facing.FRONT);
+  }
+
+  public Size[] getCameraResolutions(Facing facing) {
     try {
-      cameraCharacteristics = cameraManager.getCameraCharacteristics("0");
-      if (cameraCharacteristics.get(CameraCharacteristics.LENS_FACING)
-          != CameraCharacteristics.LENS_FACING_FRONT) {
-        cameraCharacteristics = cameraManager.getCameraCharacteristics("1");
+      CameraCharacteristics characteristics = getCharacteristicsForFacing(cameraManager, facing);
+      if (characteristics == null) {
+        return new Size[0];
       }
+
       StreamConfigurationMap streamConfigurationMap =
-          cameraCharacteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-      return streamConfigurationMap.getOutputSizes(SurfaceTexture.class);
-    } catch (CameraAccessException e) {
+          characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+      if (streamConfigurationMap == null) return new Size[0];
+      Size[] outputSizes = streamConfigurationMap.getOutputSizes(SurfaceTexture.class);
+      return outputSizes != null ? outputSizes : new Size[0];
+    } catch (CameraAccessException | NullPointerException e) {
       Log.e(TAG, "Error", e);
       return new Size[0];
     }
   }
 
+  @Nullable
   public CameraCharacteristics getCameraCharacteristics() {
-    return cameraCharacteristics;
+    try {
+      return cameraId != null ? cameraManager.getCameraCharacteristics(cameraId) : null;
+    } catch (CameraAccessException e) {
+      Log.e(TAG, "Error", e);
+      return null;
+    }
+  }
+
+  public boolean enableVideoStabilization() {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return false;
+    int[] modes = characteristics.get(CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES);
+    List<Integer> videoStabilizationList = new ArrayList<>();
+    for (int vsMode : modes) {
+      videoStabilizationList.add(vsMode);
+    }
+    if (!videoStabilizationList.contains(CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE_ON)) {
+      Log.e(TAG, "video stabilization unsupported");
+      return false;
+    }
+
+    if (builderInputSurface != null) {
+      builderInputSurface.set(CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE,
+          CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE_ON);
+      videoStabilizationEnable = true;
+    }
+    return videoStabilizationEnable;
+  }
+
+  public void disableVideoStabilization() {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return;
+    int[] modes = characteristics.get(CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES);
+    List<Integer> videoStabilizationList = new ArrayList<>();
+    for (int vsMode : modes) {
+      videoStabilizationList.add(vsMode);
+    }
+    if (!videoStabilizationList.contains(CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE_ON)) {
+      Log.e(TAG, "video stabilization unsupported");
+      return;
+    }
+    if (builderInputSurface != null) {
+      builderInputSurface.set(CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE,
+          CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE_OFF);
+      videoStabilizationEnable = false;
+    }
+  }
+
+  public boolean isVideoStabilizationEnabled() {
+    return videoStabilizationEnable;
+  }
+
+  public boolean enableOpticalVideoStabilization() {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return false;
+
+    int[] opticalStabilizationModes = characteristics.get(CameraCharacteristics.LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION);
+    List<Integer> opticalStabilizationList = new ArrayList<>();
+    for (int vsMode : opticalStabilizationModes) {
+      opticalStabilizationList.add(vsMode);
+    }
+
+    if (!opticalStabilizationList.contains(CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE_ON)) {
+      Log.e(TAG, "OIS video stabilization unsupported");
+      return false;
+    }
+    if (builderInputSurface != null) {
+      builderInputSurface.set(CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE,
+              CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE_ON);
+      opticalVideoStabilizationEnable = true;
+    }
+    return opticalVideoStabilizationEnable;
+  }
+
+  public void disableOpticalVideoStabilization() {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return;
+    int[] modes = characteristics.get(CameraCharacteristics.LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION);
+    List<Integer> videoStabilizationList = new ArrayList<>();
+    for (int vsMode : modes) {
+      videoStabilizationList.add(vsMode);
+    }
+    if (!videoStabilizationList.contains(CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE_ON)) {
+      Log.e(TAG, "OIS video stabilization unsupported");
+      return;
+    }
+    if (builderInputSurface != null) {
+      builderInputSurface.set(CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE,
+              CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE_OFF);
+      opticalVideoStabilizationEnable = false;
+    }
+  }
+
+  public boolean isOpticalStabilizationEnabled() {
+    return opticalVideoStabilizationEnable;
+  }
+
+  public void setFocusDistance(float distance) {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return;
+    if (builderInputSurface != null) {
+      try {
+        if (distance < 0) distance = 0f; //avoid invalid value
+        builderInputSurface.set(CaptureRequest.LENS_FOCUS_DISTANCE, distance);
+        cameraCaptureSession.setRepeatingRequest(builderInputSurface.build(),
+            faceDetectionEnabled ? cb : null, null);
+      } catch (Exception e) {
+        Log.e(TAG, "Error", e);
+      }
+    }
+  }
+
+  public void setExposure(int value) {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return;
+    Range<Integer> supportedExposure =
+        characteristics.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE);
+    if (supportedExposure != null && builderInputSurface != null) {
+      if (value > supportedExposure.getUpper()) value = supportedExposure.getUpper();
+      if (value < supportedExposure.getLower()) value = supportedExposure.getLower();
+      try {
+        builderInputSurface.set(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION, value);
+        cameraCaptureSession.setRepeatingRequest(builderInputSurface.build(),
+            faceDetectionEnabled ? cb : null, null);
+      } catch (Exception e) {
+        Log.e(TAG, "Error", e);
+      }
+    }
+  }
+
+  public int getExposure() {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return 0;
+    if (builderInputSurface != null) {
+      try {
+        return builderInputSurface.get(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION);
+      } catch (Exception e) {
+        Log.e(TAG, "Error", e);
+      }
+    }
+    return 0;
+  }
+
+
+
+  public int getMaxExposure() {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return 0;
+    Range<Integer> supportedExposure =
+        characteristics.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE);
+    if (supportedExposure != null) {
+      return supportedExposure.getUpper();
+    }
+    return 0;
+  }
+
+  public int getMinExposure() {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return 0;
+    Range<Integer> supportedExposure =
+        characteristics.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE);
+    if (supportedExposure != null) {
+      return supportedExposure.getLower();
+    }
+    return 0;
+  }
+
+  public void tapToFocus(MotionEvent event) {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return;
+    int pointerId = event.getPointerId(0);
+    int pointerIndex = event.findPointerIndex(pointerId);
+    // Get the pointer's current position
+    float x = event.getX(pointerIndex);
+    float y = event.getY(pointerIndex);
+
+    Rect touchRect = new Rect((int) (x - 100), (int) (y - 100),
+        (int) (x + 100), (int) (y + 100));
+    MeteringRectangle focusArea = new MeteringRectangle(touchRect, MeteringRectangle.METERING_WEIGHT_DONT_CARE);
+    if (builderInputSurface != null) {
+      try {
+        //cancel any existing AF trigger (repeated touches, etc.)
+        builderInputSurface.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_CANCEL);
+        builderInputSurface.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_OFF);
+        cameraCaptureSession.setRepeatingRequest(builderInputSurface.build(),
+            faceDetectionEnabled ? cb : null, null);
+        builderInputSurface.set(CaptureRequest.CONTROL_AF_REGIONS, new MeteringRectangle[]{focusArea});
+        builderInputSurface.set(CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO);
+        builderInputSurface.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_AUTO);
+        builderInputSurface.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_START);
+        cameraCaptureSession.setRepeatingRequest(builderInputSurface.build(),
+            faceDetectionEnabled ? cb : null, null);
+      } catch (Exception e) {
+        Log.e(TAG, "Error", e);
+      }
+    }
   }
 
   /**
    * Select camera facing
    *
-   * @param cameraFacing - CameraCharacteristics.LENS_FACING_FRONT, CameraCharacteristics.LENS_FACING_BACK,
+   * @param selectedCameraFacing - CameraCharacteristics.LENS_FACING_FRONT,
+   * CameraCharacteristics.LENS_FACING_BACK,
    * CameraCharacteristics.LENS_FACING_EXTERNAL
    */
-  public void openCameraFacing(CameraHelper.Facing cameraFacing) {
-    int facing = cameraFacing == CameraHelper.Facing.BACK ? CameraMetadata.LENS_FACING_BACK
-        : CameraMetadata.LENS_FACING_FRONT;
+  public void openCameraFacing(Facing selectedCameraFacing) {
     try {
-      cameraCharacteristics = cameraManager.getCameraCharacteristics("0");
-      if (cameraCharacteristics.get(CameraCharacteristics.LENS_FACING) == facing) {
-        openCameraId(0);
+      String cameraId = getCameraIdForFacing(cameraManager, selectedCameraFacing);
+      if (cameraId != null) {
+        openCameraId(cameraId);
       } else {
-        openCameraId(cameraManager.getCameraIdList().length - 1);
+        Log.e(TAG, "Camera not supported"); // TODO maybe we want to throw some exception here?
       }
     } catch (CameraAccessException e) {
       Log.e(TAG, "Error", e);
@@ -257,8 +570,11 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
   }
 
   public boolean isLanternSupported() {
-    return (cameraCharacteristics != null ? cameraCharacteristics.get(
-        CameraCharacteristics.FLASH_INFO_AVAILABLE) : false);
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return false;
+    Boolean available = characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE);
+    if (available == null) return false;
+    return available;
   }
 
   public boolean isLanternEnabled() {
@@ -269,8 +585,7 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
    * @required: <uses-permission android:name="android.permission.FLASHLIGHT"/>
    */
   public void enableLantern() throws Exception {
-    if ((cameraCharacteristics != null) && cameraCharacteristics.get(
-        CameraCharacteristics.FLASH_INFO_AVAILABLE)) {
+    if (isLanternSupported()) {
       if (builderInputSurface != null) {
         try {
           builderInputSurface.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_TORCH);
@@ -291,8 +606,11 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
    * @required: <uses-permission android:name="android.permission.FLASHLIGHT"/>
    */
   public void disableLantern() {
-    if ((cameraCharacteristics != null) && cameraCharacteristics.get(
-        CameraCharacteristics.FLASH_INFO_AVAILABLE)) {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return;
+    Boolean available = characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE);
+    if (available == null) return;
+    if (available) {
       if (builderInputSurface != null) {
         try {
           builderInputSurface.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_OFF);
@@ -306,29 +624,107 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
     }
   }
 
-  public void enableFaceDetection(FaceDetectorCallback faceDetectorCallback) {
-    int[] fd = cameraCharacteristics.get(
-        CameraCharacteristics.STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES);
-    int maxFD = cameraCharacteristics.get(CameraCharacteristics.STATISTICS_INFO_MAX_FACE_COUNT);
-    if (fd.length > 0) {
-      List<Integer> fdList = new ArrayList<>();
-      for (int FaceD : fd) {
-        fdList.add(FaceD);
+  public void enableAutoFocus() {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return;
+    int[] supportedFocusModes =
+        characteristics.get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
+    if (supportedFocusModes != null) {
+      List<Integer> focusModesList = new ArrayList<>();
+      for (int i : supportedFocusModes) focusModesList.add(i);
+      if (builderInputSurface != null) {
+        try {
+          if (!focusModesList.isEmpty()) {
+            //cancel any existing AF trigger
+            builderInputSurface.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_CANCEL);
+            builderInputSurface.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_OFF);
+            cameraCaptureSession.setRepeatingRequest(builderInputSurface.build(),
+                faceDetectionEnabled ? cb : null, null);
+            if (focusModesList.contains(CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE)) {
+              builderInputSurface.set(CaptureRequest.CONTROL_AF_MODE,
+                  CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
+              cameraCaptureSession.setRepeatingRequest(builderInputSurface.build(),
+                  faceDetectionEnabled ? cb : null, null);
+              autoFocusEnabled = true;
+            } else if (focusModesList.contains(CaptureRequest.CONTROL_AF_MODE_AUTO)) {
+              builderInputSurface.set(CaptureRequest.CONTROL_AF_MODE,
+                  CaptureRequest.CONTROL_AF_MODE_AUTO);
+              cameraCaptureSession.setRepeatingRequest(builderInputSurface.build(),
+                  faceDetectionEnabled ? cb : null, null);
+              autoFocusEnabled = true;
+            } else {
+              builderInputSurface.set(CaptureRequest.CONTROL_AF_MODE, focusModesList.get(0));
+              cameraCaptureSession.setRepeatingRequest(builderInputSurface.build(),
+                  faceDetectionEnabled ? cb : null, null);
+              autoFocusEnabled = false;
+            }
+          }
+        } catch (Exception e) {
+          Log.e(TAG, "Error", e);
+        }
       }
-      if (maxFD > 0) {
-        this.faceDetectorCallback = faceDetectorCallback;
-        faceDetectionEnabled = true;
-        faceDetectionMode = Collections.max(fdList);
-        setFaceDetect(builderInputSurface, faceDetectionMode);
-        prepareFaceDetectionCallback();
-      } else {
-        Log.e(TAG, "No face detection");
-      }
-    } else {
-      Log.e(TAG, "No face detection");
     }
   }
 
+  public void disableAutoFocus() {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return;
+    int[] supportedFocusModes =
+        characteristics.get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
+    if (supportedFocusModes != null) {
+      if (builderInputSurface != null) {
+        for (int mode : supportedFocusModes) {
+          try {
+            if (mode == CaptureRequest.CONTROL_AF_MODE_OFF) {
+              builderInputSurface.set(CaptureRequest.CONTROL_AF_MODE,
+                  CaptureRequest.CONTROL_AF_MODE_OFF);
+              cameraCaptureSession.setRepeatingRequest(builderInputSurface.build(),
+                  faceDetectionEnabled ? cb : null, null);
+              autoFocusEnabled = false;
+              return;
+            }
+          } catch (Exception e) {
+            Log.e(TAG, "Error", e);
+          }
+        }
+      }
+    }
+  }
+
+  public boolean isAutoFocusEnabled() {
+    return autoFocusEnabled;
+  }
+
+  public boolean enableFaceDetection(FaceDetectorCallback faceDetectorCallback) {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) {
+      Log.e(TAG, "face detection called with camera stopped");
+      return false;
+    }
+    faceSensorScale = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
+    sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
+    int[] fd = characteristics.get(CameraCharacteristics.STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES);
+    if (fd == null || fd.length == 0) {
+      Log.e(TAG, "face detection unsupported");
+      return false;
+    }
+    Integer maxFD = characteristics.get(CameraCharacteristics.STATISTICS_INFO_MAX_FACE_COUNT);
+    if (maxFD == null || maxFD <= 0) {
+      Log.e(TAG, "face detection unsupported");
+      return false;
+    }
+    List<Integer> fdList = new ArrayList<>();
+    for (int FaceD : fd) {
+      fdList.add(FaceD);
+    }
+    this.faceDetectorCallback = faceDetectorCallback;
+    faceDetectionEnabled = true;
+    faceDetectionMode = Collections.max(fdList);
+    setFaceDetect(builderInputSurface, faceDetectionMode);
+    prepareFaceDetectionCallback();
+    return true;
+  }
+
   public void disableFaceDetection() {
     if (faceDetectionEnabled) {
       faceDetectorCallback = null;
@@ -348,6 +744,10 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
     }
   }
 
+  public void setCameraCallbacks(CameraCallbacks cameraCallbacks) {
+    this.cameraCallbacks = cameraCallbacks;
+  }
+
   private void prepareFaceDetectionCallback() {
     try {
       cameraCaptureSession.stopRepeating();
@@ -366,25 +766,33 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
             @NonNull CaptureRequest request, @NonNull TotalCaptureResult result) {
           Face[] faces = result.get(CaptureResult.STATISTICS_FACES);
           if (faceDetectorCallback != null) {
-            faceDetectorCallback.onGetFaces(faces);
+            faceDetectorCallback.onGetFaces(faces, faceSensorScale, sensorOrientation);
           }
         }
       };
 
   @SuppressLint("MissingPermission")
-  public void openCameraId(Integer cameraId) {
+  public void openCameraId(String cameraId) {
     this.cameraId = cameraId;
     if (prepared) {
       HandlerThread cameraHandlerThread = new HandlerThread(TAG + " Id = " + cameraId);
       cameraHandlerThread.start();
       cameraHandler = new Handler(cameraHandlerThread.getLooper());
       try {
-        cameraManager.openCamera(cameraId.toString(), this, cameraHandler);
-        cameraCharacteristics = cameraManager.getCameraCharacteristics(Integer.toString(cameraId));
+        cameraManager.openCamera(cameraId, this, cameraHandler);
+        semaphore.acquireUninterruptibly();
+        CameraCharacteristics cameraCharacteristics = cameraManager.getCameraCharacteristics(cameraId);
         running = true;
-        isFrontCamera =
-            (LENS_FACING_FRONT == cameraCharacteristics.get(CameraCharacteristics.LENS_FACING));
+        Integer facing = cameraCharacteristics.get(CameraCharacteristics.LENS_FACING);
+        if (facing == null) return;
+        this.facing = LENS_FACING_FRONT == facing ? CameraHelper.Facing.FRONT : CameraHelper.Facing.BACK;
+        if (cameraCallbacks != null) {
+          cameraCallbacks.onCameraChanged(this.facing);
+        }
       } catch (CameraAccessException | SecurityException e) {
+        if (cameraCallbacks != null) {
+          cameraCallbacks.onCameraError("Open camera " + cameraId + " failed");
+        }
         Log.e(TAG, "Error", e);
       }
     } else {
@@ -392,58 +800,117 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
     }
   }
 
+  public String[] getCamerasAvailable() {
+    try {
+      return cameraManager.getCameraIdList();
+    } catch (CameraAccessException e) {
+      return null;
+    }
+  }
+
   public boolean isRunning() {
     return running;
   }
 
   public void switchCamera() {
-    int cameraId = cameraDevice == null ? 0 : Integer.parseInt(cameraDevice.getId()) == 1 ? 0 : 1;
-    reOpenCamera(cameraId);
+    try {
+      String cameraId;
+      if (cameraDevice == null || facing == Facing.FRONT) {
+        cameraId = getCameraIdForFacing(cameraManager, Facing.BACK);
+      } else {
+        cameraId = getCameraIdForFacing(cameraManager, Facing.FRONT);
+      }
+      if (cameraId == null) cameraId = "0";
+      reOpenCamera(cameraId);
+    } catch (CameraAccessException e) {
+      Log.e(TAG, "Error", e);
+    }
   }
 
-  private void reOpenCamera(int cameraId) {
+  public void reOpenCamera(String cameraId) {
     if (cameraDevice != null) {
       closeCamera(false);
       if (textureView != null) {
-        prepareCamera(textureView, surfaceEncoder);
+        prepareCamera(textureView, surfaceEncoder, fps);
       } else if (surfaceView != null) {
-        prepareCamera(surfaceView, surfaceEncoder);
+        prepareCamera(surfaceView, surfaceEncoder, fps);
       } else {
-        prepareCamera(surfaceEncoder);
+        prepareCamera(surfaceEncoder, fps);
       }
       openCameraId(cameraId);
     }
   }
 
-  public float getMaxZoom() {
-    return (cameraCharacteristics != null ? cameraCharacteristics.get(
-        CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) : 1);
+  public Range<Float> getZoomRange() {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return new Range<>(1f, 1f);
+    Range<Float> zoomRanges = null;
+    //only camera limited or better support this feature.
+    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R &&
+        getLevelSupported() != CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY) {
+      zoomRanges = characteristics.get(CameraCharacteristics.CONTROL_ZOOM_RATIO_RANGE);
+    }
+    if (zoomRanges == null) {
+      Float maxZoom = characteristics.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM);
+      if (maxZoom == null) maxZoom = 1f;
+      zoomRanges = new Range<>(1f, maxZoom);
+    }
+    return zoomRanges;
   }
 
   public Float getZoom() {
     return zoomLevel;
   }
 
-  public void setZoom(Float level) {
-    try {
-      float maxZoom = getMaxZoom();
-      Rect m = cameraCharacteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
+  public float[] getOpticalZooms() {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return null;
+    return characteristics.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS);
+  }
 
-      if ((level <= maxZoom) && (level >= 1)) {
-        zoomLevel = level;
-        int minW = (int) (m.width() / (maxZoom * 10));
-        int minH = (int) (m.height() / (maxZoom * 10));
-        int difW = m.width() - minW;
-        int difH = m.height() - minH;
-        int cropW = (int) (difW / 10 * level);
-        int cropH = (int) (difH / 10 * level);
-        cropW -= cropW & 3;
-        cropH -= cropH & 3;
-        Rect zoom = new Rect(cropW, cropH, m.width() - cropW, m.height() - cropH);
-        builderInputSurface.set(CaptureRequest.SCALER_CROP_REGION, zoom);
+  public void setOpticalZoom(float level) {
+    CameraCharacteristics characteristics = getCameraCharacteristics();
+    if (characteristics == null) return;
+    if (builderInputSurface != null) {
+      try {
+        builderInputSurface.set(CaptureRequest.LENS_FOCAL_LENGTH, level);
         cameraCaptureSession.setRepeatingRequest(builderInputSurface.build(),
             faceDetectionEnabled ? cb : null, null);
+      } catch (Exception e) {
+        Log.e(TAG, "Error", e);
       }
+    }
+  }
+
+  public void setZoom(float level) {
+    try {
+      Range<Float> zoomRange = getZoomRange();
+      //Avoid out range level
+      if (level <= zoomRange.getLower()) level = zoomRange.getLower();
+      else if (level > zoomRange.getUpper()) level = zoomRange.getUpper();
+
+      CameraCharacteristics characteristics = getCameraCharacteristics();
+      if (characteristics == null) return;
+
+      if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R &&
+          getLevelSupported() != CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY) {
+        builderInputSurface.set(CaptureRequest.CONTROL_ZOOM_RATIO, level);
+      } else {
+        Rect rect = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
+        if (rect == null) return;
+        //This ratio is the ratio of cropped Rect to Camera's original(Maximum) Rect
+        float ratio = 1f / level;
+        //croppedWidth and croppedHeight are the pixels cropped away, not pixels after cropped
+        int croppedWidth = rect.width() - Math.round((float) rect.width() * ratio);
+        int croppedHeight = rect.height() - Math.round((float) rect.height() * ratio);
+        //Finally, zoom represents the zoomed visible area
+        Rect zoom = new Rect(croppedWidth / 2, croppedHeight / 2, rect.width() - croppedWidth / 2,
+            rect.height() - croppedHeight / 2);
+        builderInputSurface.set(CaptureRequest.SCALER_CROP_REGION, zoom);
+      }
+      cameraCaptureSession.setRepeatingRequest(builderInputSurface.build(),
+          faceDetectionEnabled ? cb : null, null);
+      zoomLevel = level;
     } catch (CameraAccessException e) {
       Log.e(TAG, "Error", e);
     }
@@ -451,26 +918,23 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
 
   public void setZoom(MotionEvent event) {
     float currentFingerSpacing;
-
     if (event.getPointerCount() > 1) {
-      // Multi touch logic
-      currentFingerSpacing = CameraHelper.getFingerSpacing(event);
+      currentFingerSpacing = getFingerSpacing(event);
+      float delta = 0.1f;
       if (fingerSpacing != 0) {
-        if (currentFingerSpacing > fingerSpacing && getMaxZoom() > zoomLevel) {
-          zoomLevel += 0.1f;
-        } else if (currentFingerSpacing < fingerSpacing && zoomLevel > 1) {
-          zoomLevel -= 0.1f;
+        float newLevel = zoomLevel;
+        if (currentFingerSpacing > fingerSpacing) {
+          newLevel += delta;
+        } else if (currentFingerSpacing < fingerSpacing) {
+          newLevel -= delta;
         }
-        setZoom(zoomLevel);
+        //This method avoid out of range
+        setZoom(newLevel);
       }
       fingerSpacing = currentFingerSpacing;
     }
   }
 
-  public boolean isFrontCamera() {
-    return isFrontCamera;
-  }
-
   private void resetCameraValues() {
     lanternEnable = false;
     zoomLevel = 1.0f;
@@ -481,11 +945,16 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
       try {
         cameraCaptureSession.stopRepeating();
         surfaceEncoder = null;
-        CaptureRequest captureRequest = drawSurface(Collections.singletonList(addPreviewSurface()));
-        if (captureRequest != null) {
-          cameraCaptureSession.setRepeatingRequest(captureRequest, null, cameraHandler);
+        Surface preview = addPreviewSurface();
+        if (preview != null) {
+          CaptureRequest captureRequest = drawSurface(Collections.singletonList(preview));
+          if (captureRequest != null) {
+            cameraCaptureSession.setRepeatingRequest(captureRequest, null, cameraHandler);
+          }
+        } else {
+          Log.e(TAG, "preview surface is null");
         }
-      } catch (CameraAccessException e) {
+      } catch (CameraAccessException | IllegalStateException e) {
         Log.e(TAG, "Error", e);
       }
     }
@@ -497,7 +966,6 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
 
   public void closeCamera(boolean resetSurface) {
     resetCameraValues();
-    cameraCharacteristics = null;
     if (cameraCaptureSession != null) {
       cameraCaptureSession.close();
       cameraCaptureSession = null;
@@ -522,18 +990,59 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
   public void onOpened(@NonNull CameraDevice cameraDevice) {
     this.cameraDevice = cameraDevice;
     startPreview(cameraDevice);
+    semaphore.release();
+    if (cameraCallbacks != null) cameraCallbacks.onCameraOpened();
     Log.i(TAG, "Camera opened");
   }
 
   @Override
   public void onDisconnected(@NonNull CameraDevice cameraDevice) {
     cameraDevice.close();
+    semaphore.release();
+    if (cameraCallbacks != null) cameraCallbacks.onCameraDisconnected();
     Log.i(TAG, "Camera disconnected");
   }
 
   @Override
   public void onError(@NonNull CameraDevice cameraDevice, int i) {
     cameraDevice.close();
-    Log.e(TAG, "Open failed");
+    semaphore.release();
+    if (cameraCallbacks != null) cameraCallbacks.onCameraError("Open camera failed: " + i);
+    Log.e(TAG, "Open failed: " + i);
+  }
+
+  @Nullable
+  private String getCameraIdForFacing(CameraManager cameraManager, CameraHelper.Facing facing)
+      throws CameraAccessException {
+    int selectedFacing = getFacing(facing);
+    for (String cameraId : cameraManager.getCameraIdList()) {
+      Integer cameraFacing =
+          cameraManager.getCameraCharacteristics(cameraId).get(CameraCharacteristics.LENS_FACING);
+      if (cameraFacing != null && cameraFacing == selectedFacing) {
+        return cameraId;
+      }
+    }
+    return null;
+  }
+
+  @Nullable
+  public String getCameraIdForFacing(CameraHelper.Facing facing) {
+    try {
+      return getCameraIdForFacing(cameraManager, facing);
+    } catch (Exception e) {
+      return null;
+    }
+  }
+
+  @Nullable
+  private CameraCharacteristics getCharacteristicsForFacing(CameraManager cameraManager,
+      CameraHelper.Facing facing) throws CameraAccessException {
+    String cameraId = getCameraIdForFacing(cameraManager, facing);
+    return cameraId != null ? cameraManager.getCameraCharacteristics(cameraId) : null;
+  }
+
+  private static int getFacing(CameraHelper.Facing facing) {
+    return facing == CameraHelper.Facing.BACK ? CameraMetadata.LENS_FACING_BACK
+        : CameraMetadata.LENS_FACING_FRONT;
   }
 }
\ No newline at end of file
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/CameraCallbacks.java b/encoder/src/main/java/com/pedro/encoder/input/video/CameraCallbacks.java
new file mode 100644
index 0000000..86fb075
--- /dev/null
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/CameraCallbacks.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.video;
+
+public interface CameraCallbacks {
+  void onCameraChanged(CameraHelper.Facing facing);
+  void onCameraError(String error);
+  void onCameraOpened();
+  void onCameraDisconnected();
+}
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/CameraHelper.java b/encoder/src/main/java/com/pedro/encoder/input/video/CameraHelper.java
index 550c511..5c70f11 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/video/CameraHelper.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/CameraHelper.java
@@ -1,10 +1,30 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.video;
 
 import android.content.Context;
+import android.os.Build;
+import android.util.Range;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.WindowManager;
 
+import androidx.annotation.RequiresApi;
+
 /**
  * Created by pedro on 17/12/18.
  */
@@ -54,6 +74,20 @@ public class CameraHelper {
     return (float) Math.sqrt(x * x + y * y);
   }
 
+  /**
+   * Method to fix camera2 quality related with fps range.
+   * Add a device if needed.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+  public static boolean discardCamera2Fps(Range<Integer> range, Facing facing) {
+    //On Google pixel 4a, 30 and 15 fps ranges produce quality problems with camera2 using facing back.
+    //Build.MODEL.equalsIgnoreCase("Pixel 4") maybe necessary in future.
+    if (Build.MODEL.equalsIgnoreCase("Pixel 4a")) {
+      return facing == Facing.BACK && (range.getUpper() == 30 || range.getUpper() == 15);
+    }
+    return false;
+  }
+
   public enum Facing {
     BACK, FRONT
   }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/CameraOpenException.java b/encoder/src/main/java/com/pedro/encoder/input/video/CameraOpenException.java
index 4283124..60e33f6 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/video/CameraOpenException.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/CameraOpenException.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.video;
 
 /**
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/FaceDetectorUtil.java b/encoder/src/main/java/com/pedro/encoder/input/video/FaceDetectorUtil.java
deleted file mode 100644
index 7e6a4e5..0000000
--- a/encoder/src/main/java/com/pedro/encoder/input/video/FaceDetectorUtil.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.pedro.encoder.input.video;
-
-import android.graphics.Matrix;
-import android.graphics.PointF;
-import android.graphics.RectF;
-import android.hardware.Camera;
-import android.hardware.camera2.params.Face;
-import android.os.Build;
-import androidx.annotation.RequiresApi;
-import android.view.View;
-
-/**
- * Created by pedro on 17/10/18.
- */
-
-public class FaceDetectorUtil {
-
-  public class FaceParsed {
-    private PointF position;
-    private PointF scale;
-
-    public FaceParsed(PointF position, PointF scale) {
-      this.position = position;
-      this.scale = scale;
-    }
-
-    public PointF getPosition() {
-      return position;
-    }
-
-    public void setPosition(PointF position) {
-      this.position = position;
-    }
-
-    public PointF getScale() {
-      return scale;
-    }
-
-    public void setScale(PointF scale) {
-      this.scale = scale;
-    }
-  }
-
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-  public FaceParsed camera2Parse(Face face, View view, PointF scale, int rotation,
-      boolean isFrontCamera) {
-    //Parse face
-    RectF rect = new RectF(face.getBounds());
-    Matrix matrix = new Matrix();
-    matrix.setScale(isFrontCamera ? -1 : 1, 1);
-    matrix.postRotate(rotation);
-    matrix.postScale(1f, 1f);
-    matrix.postTranslate(view.getWidth(), view.getHeight());
-    matrix.mapRect(rect);
-    return getFace(rect, scale, view);
-  }
-
-  public FaceParsed camera1Parse(Camera.Face face, View view, PointF scale, int rotation,
-      boolean isFrontCamera) {
-    //Parse face
-    RectF rect = new RectF(face.rect);
-    Matrix matrix = new Matrix();
-    matrix.setScale(isFrontCamera ? -1 : 1, 1);
-    matrix.postRotate(rotation);
-    matrix.postScale(view.getWidth() / 2000f, view.getHeight() / 2000f);
-    matrix.postTranslate(view.getWidth() / 2f, view.getHeight() / 2f);
-    matrix.mapRect(rect);
-    return getFace(rect, scale, view);
-  }
-
-  private FaceParsed getFace(RectF rectF, PointF scale, View view) {
-    //Position
-    float posX = rectF.centerX() * 100 / view.getWidth();
-    float posY = rectF.centerY() * 100 / view.getHeight();
-    PointF positionParsed = new PointF(posX - scale.x / 2, posY - scale.y / 2);
-    //Scale
-    float scaleX = rectF.width() * 100 / view.getWidth();
-    float scaleY = rectF.height() * 100 / view.getHeight();
-    PointF scaleParsed = new PointF(scaleX, scaleY);
-    return new FaceParsed(positionParsed, scaleParsed);
-  }
-}
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/FpsLimiter.java b/encoder/src/main/java/com/pedro/encoder/input/video/FpsLimiter.java
index df99edb..de20a37 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/video/FpsLimiter.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/FpsLimiter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.video;
 
 /**
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/GetCameraData.java b/encoder/src/main/java/com/pedro/encoder/input/video/GetCameraData.java
index 6c4f666..53456bc 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/video/GetCameraData.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/GetCameraData.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.input.video;
 
 import com.pedro.encoder.Frame;
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/CodecUtil.java b/encoder/src/main/java/com/pedro/encoder/utils/CodecUtil.java
index 78fce54..26f1872 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/CodecUtil.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/CodecUtil.java
@@ -1,8 +1,27 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils;
 
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
 import android.os.Build;
+
+import androidx.annotation.RequiresApi;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -18,6 +37,8 @@ public class CodecUtil {
   public static final String H264_MIME = "video/avc";
   public static final String H265_MIME = "video/hevc";
   public static final String AAC_MIME = "audio/mp4a-latm";
+  public static final String VORBIS_MIME = "audio/ogg";
+  public static final String OPUS_MIME = "audio/opus";
 
   public enum Force {
     FIRST_COMPATIBLE_FOUND, SOFTWARE, HARDWARE
@@ -27,110 +48,134 @@ public class CodecUtil {
     List<MediaCodecInfo> mediaCodecInfoList = getAllCodecs(false);
     List<String> infos = new ArrayList<>();
     for (MediaCodecInfo mediaCodecInfo : mediaCodecInfoList) {
-      String info = "----------------\n";
-      info += "Name: " + mediaCodecInfo.getName() + "\n";
+      StringBuilder info = new StringBuilder("----------------\n");
+      info.append("Name: ")
+          .append(mediaCodecInfo.getName())
+          .append("\n");
       for (String type : mediaCodecInfo.getSupportedTypes()) {
-        info += "Type: " + type + "\n";
+        info.append("Type: ")
+            .append(type)
+            .append("\n");
         MediaCodecInfo.CodecCapabilities codecCapabilities =
             mediaCodecInfo.getCapabilitiesForType(type);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-          info += "Max instances: " + codecCapabilities.getMaxSupportedInstances() + "\n";
+          info.append("Max instances: ")
+              .append(codecCapabilities.getMaxSupportedInstances())
+              .append("\n");
         }
         if (mediaCodecInfo.isEncoder()) {
-          info += "----- Encoder info -----\n";
+          info.append("----- Encoder info -----\n");
           MediaCodecInfo.EncoderCapabilities encoderCapabilities = null;
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             encoderCapabilities = codecCapabilities.getEncoderCapabilities();
-            info += "Complexity range: "
-                + encoderCapabilities.getComplexityRange().getLower()
-                + " - "
-                + encoderCapabilities.getComplexityRange().getUpper()
-                + "\n";
+            info.append("Complexity range: ")
+                .append(encoderCapabilities.getComplexityRange().getLower())
+                .append(" - ")
+                .append(encoderCapabilities.getComplexityRange().getUpper())
+                .append("\n");
           }
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            info += "Quality range: "
-                + encoderCapabilities.getQualityRange().getLower()
-                + " - "
-                + encoderCapabilities.getQualityRange().getUpper()
-                + "\n";
+            info.append("Quality range: ")
+                .append(encoderCapabilities.getQualityRange().getLower())
+                .append(" - ")
+                .append(encoderCapabilities.getQualityRange().getUpper())
+                .append("\n");
           }
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            info += "CBR supported: " + encoderCapabilities.isBitrateModeSupported(
-                MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR) + "\n";
-            info += "VBR supported: " + encoderCapabilities.isBitrateModeSupported(
-                MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_VBR) + "\n";
-            info += "CQ supported: " + encoderCapabilities.isBitrateModeSupported(
-                MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CQ) + "\n";
+            info.append("CBR supported: ")
+                .append(encoderCapabilities.isBitrateModeSupported(MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR))
+                .append("\n")
+                .append("VBR supported: ")
+                .append(encoderCapabilities.isBitrateModeSupported(MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_VBR))
+                .append("\n")
+                .append("CQ supported: ")
+                .append(encoderCapabilities.isBitrateModeSupported(MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CQ))
+                .append("\n");
           }
-          info += "----- -----\n";
+          info.append("----- -----\n");
         } else {
-          info += "----- Decoder info -----\n";
-          info += "----- -----\n";
+          info.append("----- Decoder info -----\n")
+              .append("----- -----\n");
         }
 
         if (codecCapabilities.colorFormats != null && codecCapabilities.colorFormats.length > 0) {
-          info += "----- Video info -----\n";
-          info += "Supported colors: \n";
-          for (int color : codecCapabilities.colorFormats) info += color + "\n";
+          info.append("----- Video info -----\n")
+              .append("Supported colors: \n");
+          for (int color : codecCapabilities.colorFormats)
+            info.append(color)
+                .append("\n");
           for (MediaCodecInfo.CodecProfileLevel profile : codecCapabilities.profileLevels)
-            info += "Profile: " + profile.profile + ", level: " + profile.level + "\n";
+            info.append("Profile: ")
+                .append(profile.profile)
+                .append(", level: ")
+                .append(profile.level)
+                .append("\n");
           MediaCodecInfo.VideoCapabilities videoCapabilities = null;
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             videoCapabilities = codecCapabilities.getVideoCapabilities();
 
-            info += "Bitrate range: "
-                + videoCapabilities.getBitrateRange().getLower()
-                + " - "
-                + videoCapabilities.getBitrateRange().getUpper()
-                + "\n";
-            info += "Frame rate range: "
-                + videoCapabilities.getSupportedFrameRates().getLower()
-                + " - "
-                + videoCapabilities.getSupportedFrameRates().getUpper()
-                + "\n";
-            info += "Width range: "
-                + videoCapabilities.getSupportedWidths().getLower()
-                + " - "
-                + videoCapabilities.getSupportedWidths().getUpper()
-                + "\n";
-            info += "Height range: "
-                + videoCapabilities.getSupportedHeights().getLower()
-                + " - "
-                + videoCapabilities.getSupportedHeights().getUpper()
-                + "\n";
+            info.append("Bitrate range: ")
+                .append(videoCapabilities.getBitrateRange().getLower())
+                .append(" - ")
+                .append(videoCapabilities.getBitrateRange().getUpper())
+                .append("\n")
+                .append("Frame rate range: ")
+                .append(videoCapabilities.getSupportedFrameRates().getLower())
+                .append(" - ")
+                .append(videoCapabilities.getSupportedFrameRates().getUpper())
+                .append("\n")
+                .append("Width range: ")
+                .append(videoCapabilities.getSupportedWidths().getLower())
+                .append(" - ")
+                .append(videoCapabilities.getSupportedWidths().getUpper())
+                .append("\n")
+                .append("Height range: ")
+                .append(videoCapabilities.getSupportedHeights().getLower())
+                .append(" - ")
+                .append(videoCapabilities.getSupportedHeights().getUpper())
+                .append("\n");
           }
-          info += "----- -----\n";
+          info.append("----- -----\n");
         } else {
-          info += "----- Audio info -----\n";
+          info.append("----- Audio info -----\n");
           for (MediaCodecInfo.CodecProfileLevel profile : codecCapabilities.profileLevels)
-            info += "Profile: " + profile.profile + ", level: " + profile.level + "\n";
+            info.append("Profile: ")
+                .append(profile.profile)
+                .append(", level: ")
+                .append(profile.level)
+                .append("\n");
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             MediaCodecInfo.AudioCapabilities audioCapabilities =
                 codecCapabilities.getAudioCapabilities();
 
-            info += "Bitrate range: "
-                + audioCapabilities.getBitrateRange().getLower()
-                + " - "
-                + audioCapabilities.getBitrateRange().getUpper()
-                + "\n";
-            info += "Channels supported: " + audioCapabilities.getMaxInputChannelCount() + "\n";
+            info.append("Bitrate range: ")
+                .append(audioCapabilities.getBitrateRange().getLower())
+                .append(" - ")
+                .append(audioCapabilities.getBitrateRange().getUpper())
+                .append("\n")
+                .append("Channels supported: ")
+                .append(audioCapabilities.getMaxInputChannelCount())
+                .append("\n");
             try {
               if (audioCapabilities.getSupportedSampleRates() != null
                   && audioCapabilities.getSupportedSampleRates().length > 0) {
-                info += "Supported sample rate: \n";
-                for (int sr : audioCapabilities.getSupportedSampleRates()) info += sr + "\n";
+                info.append("Supported sample rate: \n");
+                for (int sr : audioCapabilities.getSupportedSampleRates())
+                  info.append(sr)
+                      .append("\n");
               }
-            } catch (Exception e) {
-            }
+            } catch (Exception ignored) { }
           }
-          info += "----- -----\n";
+          info.append("----- -----\n");
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-          info += "Max instances: " + codecCapabilities.getMaxSupportedInstances() + "\n";
+          info.append("Max instances: ")
+              .append(codecCapabilities.getMaxSupportedInstances())
+              .append("\n");
         }
       }
-      info += "----------------\n";
-      infos.add(info);
+      info.append("----------------\n");
+      infos.add(info.toString());
     }
     return infos;
   }
@@ -151,18 +196,30 @@ public class CodecUtil {
     return filterBroken ? filterBrokenCodecs(mediaCodecInfoList) : mediaCodecInfoList;
   }
 
-  public static List<MediaCodecInfo> getAllHardwareEncoders(String mime) {
+  public static List<MediaCodecInfo> getAllHardwareEncoders(String mime, boolean cbrPriority) {
     List<MediaCodecInfo> mediaCodecInfoList = getAllEncoders(mime);
     List<MediaCodecInfo> mediaCodecInfoHardware = new ArrayList<>();
+    List<MediaCodecInfo> mediaCodecInfoHardwareCBR = new ArrayList<>();
     for (MediaCodecInfo mediaCodecInfo : mediaCodecInfoList) {
       if (isHardwareAccelerated(mediaCodecInfo)) {
         mediaCodecInfoHardware.add(mediaCodecInfo);
+        if (cbrPriority &&Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
+            && isCBRModeSupported(mediaCodecInfo, mime)) {
+          mediaCodecInfoHardwareCBR.add(mediaCodecInfo);
+        }
       }
     }
+    mediaCodecInfoHardware.removeAll(mediaCodecInfoHardwareCBR);
+    mediaCodecInfoHardware.addAll(0, mediaCodecInfoHardwareCBR);
     return mediaCodecInfoHardware;
   }
 
-  public static List<MediaCodecInfo> getAllHardwareDecoders(String mime) {
+  public static List<MediaCodecInfo> getAllHardwareEncoders(String mime) {
+    return getAllHardwareEncoders(mime, false);
+  }
+
+
+    public static List<MediaCodecInfo> getAllHardwareDecoders(String mime) {
     List<MediaCodecInfo> mediaCodecInfoList = getAllDecoders(mime);
     List<MediaCodecInfo> mediaCodecInfoHardware = new ArrayList<>();
     for (MediaCodecInfo mediaCodecInfo : mediaCodecInfoList) {
@@ -173,18 +230,30 @@ public class CodecUtil {
     return mediaCodecInfoHardware;
   }
 
-  public static List<MediaCodecInfo> getAllSoftwareEncoders(String mime) {
+  public static List<MediaCodecInfo> getAllSoftwareEncoders(String mime, boolean cbrPriority) {
     List<MediaCodecInfo> mediaCodecInfoList = getAllEncoders(mime);
     List<MediaCodecInfo> mediaCodecInfoSoftware = new ArrayList<>();
+    List<MediaCodecInfo> mediaCodecInfoSoftwareCBR = new ArrayList<>();
     for (MediaCodecInfo mediaCodecInfo : mediaCodecInfoList) {
       if (isSoftwareOnly(mediaCodecInfo)) {
         mediaCodecInfoSoftware.add(mediaCodecInfo);
+        if (cbrPriority &&Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
+            && isCBRModeSupported(mediaCodecInfo, mime)) {
+          mediaCodecInfoSoftwareCBR.add(mediaCodecInfo);
+        }
       }
     }
+    mediaCodecInfoSoftware.removeAll(mediaCodecInfoSoftwareCBR);
+    mediaCodecInfoSoftware.addAll(0, mediaCodecInfoSoftwareCBR);
     return mediaCodecInfoSoftware;
   }
 
-  public static List<MediaCodecInfo> getAllSoftwareDecoders(String mime) {
+  public static List<MediaCodecInfo> getAllSoftwareEncoders(String mime) {
+    return getAllSoftwareEncoders(mime, false);
+  }
+
+
+    public static List<MediaCodecInfo> getAllSoftwareDecoders(String mime) {
     List<MediaCodecInfo> mediaCodecInfoList = getAllDecoders(mime);
     List<MediaCodecInfo> mediaCodecInfoSoftware = new ArrayList<>();
     for (MediaCodecInfo mediaCodecInfo : mediaCodecInfoList) {
@@ -196,7 +265,7 @@ public class CodecUtil {
   }
 
   /**
-   * choose the video encoder by mime.
+   * choose encoder by mime.
    */
   public static List<MediaCodecInfo> getAllEncoders(String mime) {
     List<MediaCodecInfo> mediaCodecInfoList = new ArrayList<>();
@@ -215,9 +284,26 @@ public class CodecUtil {
     return mediaCodecInfoList;
   }
 
-  /**
-   * choose the video encoder by mime.
-   */
+  public static List<MediaCodecInfo> getAllEncoders(String mime, boolean hardwarePriority, boolean cbrPriority) {
+    List<MediaCodecInfo> mediaCodecInfoList = new ArrayList<>();
+    if (hardwarePriority) {
+      mediaCodecInfoList.addAll(getAllHardwareEncoders(mime, cbrPriority));
+      mediaCodecInfoList.addAll(getAllSoftwareEncoders(mime, cbrPriority));
+    } else {
+      mediaCodecInfoList.addAll(getAllEncoders(mime));
+    }
+    return mediaCodecInfoList;
+  }
+
+  public static List<MediaCodecInfo> getAllEncoders(String mime, boolean hardwarePriority) {
+    return getAllEncoders(mime, hardwarePriority, false);
+  }
+
+
+
+    /**
+     * choose decoder by mime.
+     */
   public static List<MediaCodecInfo> getAllDecoders(String mime) {
     List<MediaCodecInfo> mediaCodecInfoList = new ArrayList<>();
     List<MediaCodecInfo> mediaCodecInfos = getAllCodecs(true);
@@ -235,6 +321,17 @@ public class CodecUtil {
     return mediaCodecInfoList;
   }
 
+  public static List<MediaCodecInfo> getAllDecoders(String mime, boolean hardwarePriority) {
+    List<MediaCodecInfo> mediaCodecInfoList = new ArrayList<>();
+    if (hardwarePriority) {
+      mediaCodecInfoList.addAll(getAllHardwareDecoders(mime));
+      mediaCodecInfoList.addAll(getAllSoftwareDecoders(mime));
+    } else {
+      mediaCodecInfoList.addAll(getAllDecoders(mime));
+    }
+    return mediaCodecInfoList;
+  }
+
   /* Adapted from google/ExoPlayer
    * https://github.com/google/ExoPlayer/commit/48555550d7fcf6953f2382466818c74092b26355
    */
@@ -252,7 +349,9 @@ public class CodecUtil {
    */
   private static boolean isSoftwareOnly(MediaCodecInfo mediaCodecInfo) {
     if (Build.VERSION.SDK_INT >= 29) {
-      return mediaCodecInfo.isSoftwareOnly();
+      //mediaCodecInfo.isSoftwareOnly() is not working on emulators.
+      //Use !mediaCodecInfo.isHardwareAccelerated() to make sure that all codecs are classified as software or hardware
+      return !mediaCodecInfo.isHardwareAccelerated();
     }
     String name = mediaCodecInfo.getName().toLowerCase();
     if (name.startsWith("arc.")) { // App Runtime for Chrome (ARC) codecs
@@ -267,6 +366,16 @@ public class CodecUtil {
         || (!name.startsWith("omx.") && !name.startsWith("c2."));
   }
 
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+  public static boolean isCBRModeSupported(MediaCodecInfo mediaCodecInfo, String mime) {
+    MediaCodecInfo.CodecCapabilities codecCapabilities =
+        mediaCodecInfo.getCapabilitiesForType(mime);
+    MediaCodecInfo.EncoderCapabilities encoderCapabilities =
+        codecCapabilities.getEncoderCapabilities();
+    return encoderCapabilities.isBitrateModeSupported(
+        MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR);
+  }
+
   /**
    * Filter broken codecs by name and device model.
    *
@@ -279,11 +388,27 @@ public class CodecUtil {
    */
   private static List<MediaCodecInfo> filterBrokenCodecs(List<MediaCodecInfo> codecs) {
     List<MediaCodecInfo> listFilter = new ArrayList<>();
+    List<MediaCodecInfo> listLowPriority = new ArrayList<>();
+    List<MediaCodecInfo> listUltraLowPriority = new ArrayList<>();
     for (MediaCodecInfo mediaCodecInfo : codecs) {
       if (isValid(mediaCodecInfo.getName())) {
-        listFilter.add(mediaCodecInfo);
+        CodecPriority priority = checkCodecPriority(mediaCodecInfo.getName());
+        switch (priority) {
+          case ULTRA_LOW:
+            listUltraLowPriority.add(mediaCodecInfo);
+            break;
+          case LOW:
+            listLowPriority.add(mediaCodecInfo);
+            break;
+          case NORMAL:
+          default:
+            listFilter.add(mediaCodecInfo);
+            break;
+        }
       }
     }
+    listFilter.addAll(listLowPriority);
+    listFilter.addAll(listUltraLowPriority);
     return listFilter;
   }
 
@@ -291,6 +416,26 @@ public class CodecUtil {
    * For now, none broken codec reported.
    */
   private static boolean isValid(String name) {
+    //This encoder is invalid and produce errors (Only found in AVD API 16)
+    if (name.equalsIgnoreCase("aacencoder")) return false;
     return true;
   }
+
+  private enum CodecPriority {
+    NORMAL, LOW, ULTRA_LOW
+  }
+
+  /**
+   * Few devices have codecs that is not working properly in few cases like using AWS MediaLive or YouTube
+   * but it is still usable in most of cases.
+   * @return priority level.
+   */
+  private static CodecPriority checkCodecPriority(String name) {
+    //maybe only broke on samsung with Android 12+ using YouTube and AWS MediaLive
+    // but set as ultra low priority in all cases.
+    if (name.equalsIgnoreCase("c2.sec.aac.encoder")) return CodecPriority.ULTRA_LOW;
+    //broke on few devices using YouTube and AWS MediaLive
+    else if (name.equalsIgnoreCase("omx.google.aac.encoder")) return CodecPriority.LOW;
+    else return CodecPriority.NORMAL;
+  }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/FaceDetectorUtil.java b/encoder/src/main/java/com/pedro/encoder/utils/FaceDetectorUtil.java
new file mode 100644
index 0000000..99ab5f5
--- /dev/null
+++ b/encoder/src/main/java/com/pedro/encoder/utils/FaceDetectorUtil.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils;
+
+import android.graphics.Matrix;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.hardware.Camera;
+import android.hardware.camera2.params.Face;
+import android.os.Build;
+import androidx.annotation.RequiresApi;
+
+import com.pedro.encoder.input.video.CameraHelper;
+
+/**
+ * Created by pedro on 17/10/18.
+ */
+
+public class FaceDetectorUtil {
+
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+  public static FaceParsed camera2Parse(Face face, Rect scaleSensor, int sensorOrientation, int rotation, CameraHelper.Facing facing) {
+    return cameraParse(face.getBounds(), scaleSensor, sensorOrientation, rotation, facing, 100);
+  }
+
+  public static FaceParsed camera1Parse(Camera.Face face, Rect scaleSensor, int sensorOrientation, int rotation, CameraHelper.Facing facing) {
+    return cameraParse(face.rect, scaleSensor, sensorOrientation, rotation, facing, 50);
+  }
+
+  /**
+   * Parse bounds from camera1 and camera2 api to scale and position used in OpenGlView filters.
+   */
+  private static FaceParsed cameraParse(Rect face, Rect scaleSensor, int sensorOrientation, int streamRotation,
+    CameraHelper.Facing facing, float translate) {
+    // Face Detection Matrix
+    Matrix matrix = new Matrix();
+    // Need mirror for front camera.
+    matrix.setScale(facing == CameraHelper.Facing.FRONT ? -1 : 1, 1);
+    matrix.postRotate(streamRotation);
+    // 100f because we are doing scale value by percent to work with filters.
+    float s1 = 100f / scaleSensor.width();
+    float s2 = 100f / scaleSensor.height();
+    // Camera2 sensor could be rotated. We need check it and fix.
+    if (sensorOrientation == 90 || sensorOrientation == 270) {
+      matrix.postScale(s2, s1);
+    } else {
+      matrix.postScale(s1, s2);
+    }
+    matrix.postTranslate(translate, translate);
+
+    Rect uRect = new Rect(face);
+    RectF rectF = new RectF(uRect);
+    matrix.mapRect(rectF);
+    uRect = new Rect((int) rectF.left, (int) rectF.top, (int) rectF.right, (int) rectF.bottom);
+    // Filter is draw from top left corner. Move position from center to corner.
+    PointF positionParsed = new PointF(uRect.centerX() - uRect.width() / 2f, uRect.centerY()  - uRect.height() / 2f);
+    PointF sizeParsed = new PointF(uRect.width(), uRect.height());
+    return new FaceParsed(positionParsed, sizeParsed);
+  }
+}
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/FaceParsed.java b/encoder/src/main/java/com/pedro/encoder/utils/FaceParsed.java
new file mode 100644
index 0000000..3f95893
--- /dev/null
+++ b/encoder/src/main/java/com/pedro/encoder/utils/FaceParsed.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils;
+
+import android.graphics.PointF;
+
+/**
+ * Created by pedro on 18/04/21.
+ */
+public class FaceParsed {
+  private PointF position;
+  private PointF scale;
+
+  public FaceParsed(PointF position, PointF scale) {
+    this.position = position;
+    this.scale = scale;
+  }
+
+  public PointF getPosition() {
+    return position;
+  }
+
+  public void setPosition(PointF position) {
+    this.position = position;
+  }
+
+  public PointF getScale() {
+    return scale;
+  }
+
+  public void setScale(PointF scale) {
+    this.scale = scale;
+  }
+
+  @Override
+  public String toString() {
+    return "FaceParsed{" +
+        "position=" + position +
+        ", scale=" + scale +
+        '}';
+  }
+}
\ No newline at end of file
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/PCMUtil.java b/encoder/src/main/java/com/pedro/encoder/utils/PCMUtil.java
index 5613041..a704706 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/PCMUtil.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/PCMUtil.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils;
 
 /**
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/gl/GifStreamObject.java b/encoder/src/main/java/com/pedro/encoder/utils/gl/GifStreamObject.java
index 7547795..61ea95f 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/gl/GifStreamObject.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/gl/GifStreamObject.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils.gl;
 
 import android.graphics.Bitmap;
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/gl/GlUtil.java b/encoder/src/main/java/com/pedro/encoder/utils/gl/GlUtil.java
index 48cdc43..985bdf9 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/gl/GlUtil.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/gl/GlUtil.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils.gl;
 
 import android.content.Context;
@@ -8,8 +24,8 @@ import android.opengl.EGL14;
 import android.opengl.GLES11Ext;
 import android.opengl.GLES20;
 import android.os.Build;
-import androidx.annotation.RequiresApi;
 import android.util.Log;
+import androidx.annotation.RequiresApi;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -71,11 +87,11 @@ public class GlUtil {
     return program;
   }
 
-  public static void createTextures(int cantidad, int[] texturesId, int position) {
-    GLES20.glGenTextures(cantidad, texturesId, position);
-    for (int i = 0; i < cantidad; i++) {
-      GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + position + i);
-      GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texturesId[position + i]);
+  public static void createTextures(int quantity, int[] texturesId, int offset) {
+    GLES20.glGenTextures(quantity, texturesId, offset);
+    for (int i = offset; i < quantity; i++) {
+      GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + i);
+      GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texturesId[i]);
       GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
       GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
       GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_S,
@@ -85,11 +101,11 @@ public class GlUtil {
     }
   }
 
-  public static void createExternalTextures(int cantidad, int[] texturesId, int position) {
-    GLES20.glGenTextures(cantidad, texturesId, position);
-    for (int i = 0; i < cantidad; i++) {
-      GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + position + i);
-      GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, texturesId[position + i]);
+  public static void createExternalTextures(int quantity, int[] texturesId, int offset) {
+    GLES20.glGenTextures(quantity, texturesId, offset);
+    for (int i = offset; i < quantity; i++) {
+      GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + i);
+      GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, texturesId[i]);
       GLES20.glTexParameterf(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MIN_FILTER,
           GLES20.GL_LINEAR);
       GLES20.glTexParameterf(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MAG_FILTER,
@@ -123,32 +139,29 @@ public class GlUtil {
   public static void checkGlError(String op) {
     int error = GLES20.glGetError();
     if (error != GLES20.GL_NO_ERROR) {
-      Log.e(TAG, op + ": glError " + error);
-      throw new RuntimeException(op + ": glError " + error);
+      throw new RuntimeException(op + ". GL error: " + error);
     }
   }
 
   public static void checkEglError(String msg) {
     int error = EGL14.eglGetError();
     if (error != EGL14.EGL_SUCCESS) {
-      throw new RuntimeException(msg + ": EGL error: 0x" + Integer.toHexString(error));
+      throw new RuntimeException(msg + ". EGL error: " + error);
     }
   }
 
-  public static Bitmap getBitmap(int originalWidth, int originalHeight, int finalWidth,
-      int finalHeight) {
+  public static Bitmap getBitmap(int streamWidth, int streamHeight) {
     //Get opengl buffer
-    ByteBuffer buffer = ByteBuffer.allocateDirect(originalWidth * originalHeight * 4);
-    GLES20.glReadPixels(0, 0, originalWidth, originalHeight, GLES20.GL_RGBA,
+    ByteBuffer buffer = ByteBuffer.allocateDirect(streamWidth * streamHeight * 4);
+    GLES20.glReadPixels(0, 0, streamWidth, streamHeight, GLES20.GL_RGBA,
         GLES20.GL_UNSIGNED_BYTE, buffer);
     //Create bitmap preview resolution
-    Bitmap bitmap = Bitmap.createBitmap(originalWidth, originalHeight, Bitmap.Config.ARGB_8888);
+    Bitmap bitmap = Bitmap.createBitmap(streamWidth, streamHeight, Bitmap.Config.ARGB_8888);
     //Set buffer to bitmap
     bitmap.copyPixelsFromBuffer(buffer);
     //Scale to stream resolution
-    bitmap = Bitmap.createScaledBitmap(bitmap, finalWidth, finalHeight, false);
     //Flip vertical
-    return flipVerticalBitmap(bitmap, finalWidth, finalHeight);
+    return flipVerticalBitmap(bitmap, streamWidth, streamHeight);
   }
 
   private static Bitmap flipVerticalBitmap(Bitmap bitmap, int width, int height) {
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/gl/ImageStreamObject.java b/encoder/src/main/java/com/pedro/encoder/utils/gl/ImageStreamObject.java
index fa0d7e2..743120f 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/gl/ImageStreamObject.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/gl/ImageStreamObject.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils.gl;
 
 import android.graphics.Bitmap;
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java b/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
index c75df66..064f09f 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
@@ -1,8 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils.gl;
 
+import android.graphics.Point;
 import android.graphics.PointF;
 import android.opengl.GLES20;
 import android.opengl.Matrix;
+import android.util.Pair;
 
 /**
  * Created by pedro on 22/03/19.
@@ -11,50 +29,105 @@ import android.opengl.Matrix;
 public class SizeCalculator {
 
   public static void calculateViewPort(boolean keepAspectRatio, int mode, int previewWidth,
-                                       int previewHeight, int streamWidth, int streamHeight) {
-    if (keepAspectRatio) {
-      if (previewWidth > previewHeight) { //landscape
-        if (mode == 0) { //adjust
-          int realWidth = previewHeight * streamWidth / streamHeight;
-          GLES20.glViewport((previewWidth - realWidth) / 2, 0, realWidth, previewHeight);
-        } else { //fill
-          int realHeight = previewWidth * streamHeight / streamWidth;
-          GLES20.glViewport(0, -((realHeight - previewWidth) / 2), previewWidth, realHeight);
-        }
-      } else { //portrait
-        if (mode == 0) { //adjust
-          int realHeight = previewWidth * streamHeight / streamWidth;
-          GLES20.glViewport(0, (previewHeight - realHeight) / 2, previewWidth, realHeight);
-        } else { //fill
-          int realWidth = previewHeight * streamWidth / streamHeight;
-          GLES20.glViewport(-((realWidth - previewWidth) / 2), 0, realWidth, previewHeight);
-        }
+      int previewHeight, int streamWidth, int streamHeight) {
+    Pair<Point, Point> pair =
+        getViewport(keepAspectRatio, mode, previewWidth, previewHeight, streamWidth, streamHeight);
+    GLES20.glViewport(pair.first.x, pair.first.y, pair.second.x, pair.second.y);
+  }
+
+  public static void calculateViewPortEncoder(int streamWidth, int streamHeight, boolean isPortrait) {
+    Pair<Point, Point> pair;
+    float factor = (float) streamWidth / (float) streamHeight;
+    if (factor >= 1f) {
+      if (isPortrait) {
+        int width = (int) (streamHeight / factor);
+        int oX = (streamWidth - width) / 2;
+        pair = new Pair<>(new Point(oX, 0), new Point(width, streamHeight));
+      } else {
+        pair = new Pair<>(new Point(0, 0), new Point(streamWidth, streamHeight));
       }
     } else {
-      GLES20.glViewport(0, 0, previewHeight, previewWidth);
+      if (isPortrait) {
+        pair = new Pair<>(new Point(0, 0), new Point(streamWidth, streamHeight));
+      } else {
+        int height = (int) (streamWidth * factor);
+        int oY = (streamHeight - height) / 2;
+        pair = new Pair<>(new Point(0, oY), new Point(streamWidth, height));
+      }
+    }
+    GLES20.glViewport(pair.first.x, pair.first.y, pair.second.x, pair.second.y);
+  }
+
+  public static Pair<Point, Point> getViewport(boolean keepAspectRatio, int mode, int previewWidth,
+      int previewHeight, int streamWidth, int streamHeight) {
+    if (keepAspectRatio) {
+      float streamAspectRatio = (float) streamWidth / (float) streamHeight;
+      float previewAspectRatio = (float) previewWidth / (float) previewHeight;
+      int xo = 0;
+      int yo = 0;
+      int xf = previewWidth;
+      int yf = previewHeight;
+      if ((streamAspectRatio > 1f
+          && previewAspectRatio > 1f
+          && streamAspectRatio > previewAspectRatio) || (streamAspectRatio < 1f
+          && previewAspectRatio < 1
+          && streamAspectRatio > previewAspectRatio) || (streamAspectRatio > 1f
+          && previewAspectRatio < 1f)) {
+        if (mode == 0) {
+          yf = streamHeight * previewWidth / streamWidth;
+          yo = (yf - previewHeight) / -2;
+        } else {
+          xf = streamWidth * previewHeight / streamHeight;
+          xo = (xf - previewWidth) / -2;
+        }
+      } else if ((streamAspectRatio > 1f
+          && previewAspectRatio > 1f
+          && streamAspectRatio < previewAspectRatio) || (streamAspectRatio < 1f
+          && previewAspectRatio < 1f
+          && streamAspectRatio < previewAspectRatio) || (streamAspectRatio < 1f
+          && previewAspectRatio > 1f)) {
+        if (mode == 0 || mode == 2) {
+          xf = streamWidth * previewHeight / streamHeight;
+          xo = (xf - previewWidth) / -2;
+        } else {
+          yf = streamHeight * previewWidth / streamWidth;
+          yo = (yf - previewHeight) / -2;
+        }
+      }
+      return new Pair<>(new Point(xo, yo), new Point(xf, yf));
+    } else {
+      return new Pair<>(new Point(0, 0), new Point(previewWidth, previewHeight));
     }
   }
 
-  public static void updateMatrix(int rotation, int width, int height, boolean isPreview,
-                                  boolean isPortrait, float[] MVPMatrix) {
+  public static void processMatrix(int rotation, boolean flipStreamHorizontal,
+      boolean flipStreamVertical, float[] MVPMatrix) {
+    PointF scale = new PointF(1f, 1f);
+
+    float xFlip = flipStreamHorizontal ? -1f : 1f;
+    float yFlip = flipStreamVertical ? -1f : 1f;
+    scale = new PointF(scale.x * xFlip, scale.y * yFlip);
+
+    updateMatrix(rotation, scale, MVPMatrix);
+  }
+
+  private static void updateMatrix(int rotation, PointF scale, float[] MVPMatrix) {
     Matrix.setIdentityM(MVPMatrix, 0);
-    PointF scale = getScale(rotation, width, height, isPortrait, isPreview);
     Matrix.scaleM(MVPMatrix, 0, scale.x, scale.y, 1f);
-    if (!isPreview && !isPortrait) rotation += 90;
     Matrix.rotateM(MVPMatrix, 0, rotation, 0f, 0f, -1f);
   }
 
   private static PointF getScale(int rotation, int width, int height, boolean isPortrait,
-                                 boolean isPreview) {
+      boolean isPreview) {
     float scaleX = 1f;
     float scaleY = 1f;
     if (!isPreview) {
-      if (isPortrait && rotation != 90 && rotation != 270) { //portrait
+      if (isPortrait && rotation != 0 && rotation != 180) { //portrait
         final float adjustedWidth = width * (width / (float) height);
-        scaleX = adjustedWidth / height;
-        //} else if (!isPortrait && rotation != 90 && rotation != 270) { //landscape
-        //  final float adjustedWidth = height * (height / (float) width);
-        //  scaleX = adjustedWidth / width;
+        scaleY = adjustedWidth / height;
+      } else if (!isPortrait && rotation != 90 && rotation != 270) { //landscape
+        final float adjustedWidth = height * (height / (float) width);
+        scaleX = adjustedWidth / width;
       }
     }
     return new PointF(scaleX, scaleY);
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/gl/StreamObjectBase.java b/encoder/src/main/java/com/pedro/encoder/utils/gl/StreamObjectBase.java
index 9b7000e..2f278d6 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/gl/StreamObjectBase.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/gl/StreamObjectBase.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils.gl;
 
 import android.graphics.Bitmap;
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/gl/TextStreamObject.java b/encoder/src/main/java/com/pedro/encoder/utils/gl/TextStreamObject.java
index c96113b..e200005 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/gl/TextStreamObject.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/gl/TextStreamObject.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils.gl;
 
 import android.graphics.Bitmap;
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/gl/TranslateTo.java b/encoder/src/main/java/com/pedro/encoder/utils/gl/TranslateTo.java
index 45b4df3..0358697 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/gl/TranslateTo.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/gl/TranslateTo.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils.gl;
 
 /**
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/gl/gif/GifHeaderParser.java b/encoder/src/main/java/com/pedro/encoder/utils/gl/gif/GifHeaderParser.java
index 9503edb..d095bd7 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/gl/gif/GifHeaderParser.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/gl/gif/GifHeaderParser.java
@@ -148,11 +148,11 @@ public class GifHeaderParser {
             // Application extension.
             case 0xff:
               readBlock();
-              String app = "";
+              StringBuilder app = new StringBuilder();
               for (int i = 0; i < 11; i++) {
-                app += (char) block[i];
+                app.append((char) block[i]);
               }
-              if (app.equals("NETSCAPE2.0")) {
+              if (app.toString().equals("NETSCAPE2.0")) {
                 readNetscapeExt();
               } else {
                 // Don't care.
@@ -275,11 +275,11 @@ public class GifHeaderParser {
    * Reads GIF file header information.
    */
   private void readHeader() {
-    String id = "";
+    StringBuilder id = new StringBuilder();
     for (int i = 0; i < 6; i++) {
-      id += (char) read();
+      id.append((char) read());
     }
-    if (!id.startsWith("GIF")) {
+    if (!id.toString().startsWith("GIF")) {
       header.status = GifDecoder.STATUS_FORMAT_ERROR;
       return;
     }
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/yuv/NV21Utils.java b/encoder/src/main/java/com/pedro/encoder/utils/yuv/NV21Utils.java
index 198d9af..9ea6d11 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/yuv/NV21Utils.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/yuv/NV21Utils.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils.yuv;
 
 /**
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/yuv/YUVUtil.java b/encoder/src/main/java/com/pedro/encoder/utils/yuv/YUVUtil.java
index 37b5430..e1be55f 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/yuv/YUVUtil.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/yuv/YUVUtil.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils.yuv;
 
 import android.graphics.Bitmap;
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/yuv/YV12Utils.java b/encoder/src/main/java/com/pedro/encoder/utils/yuv/YV12Utils.java
index c287289..55721e4 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/yuv/YV12Utils.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/yuv/YV12Utils.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.utils.yuv;
 
 /**
diff --git a/encoder/src/main/java/com/pedro/encoder/video/FormatVideoEncoder.java b/encoder/src/main/java/com/pedro/encoder/video/FormatVideoEncoder.java
index bd5b412..70cb9e1 100644
--- a/encoder/src/main/java/com/pedro/encoder/video/FormatVideoEncoder.java
+++ b/encoder/src/main/java/com/pedro/encoder/video/FormatVideoEncoder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.video;
 
 import android.media.MediaCodecInfo;
diff --git a/encoder/src/main/java/com/pedro/encoder/video/GetVideoData.java b/encoder/src/main/java/com/pedro/encoder/video/GetVideoData.java
index 1596f65..4121441 100644
--- a/encoder/src/main/java/com/pedro/encoder/video/GetVideoData.java
+++ b/encoder/src/main/java/com/pedro/encoder/video/GetVideoData.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.video;
 
 import android.media.MediaCodec;
@@ -11,8 +27,6 @@ import java.nio.ByteBuffer;
 
 public interface GetVideoData {
 
-  void onSpsPps(ByteBuffer sps, ByteBuffer pps);
-
   void onSpsPpsVps(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps);
 
   void getVideoData(ByteBuffer h264Buffer, MediaCodec.BufferInfo info);
diff --git a/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java b/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java
index a3e14bc..56b5911 100644
--- a/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java
+++ b/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.encoder.video;
 
 import android.graphics.ImageFormat;
@@ -6,25 +22,23 @@ import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.util.Log;
 import android.util.Pair;
 import android.view.Surface;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
+
 import com.pedro.encoder.BaseEncoder;
 import com.pedro.encoder.Frame;
 import com.pedro.encoder.input.video.FpsLimiter;
 import com.pedro.encoder.input.video.GetCameraData;
 import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.encoder.utils.yuv.YUVUtil;
-import java.io.IOException;
+
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
 
 /**
  * Created by pedro on 19/01/17.
@@ -33,10 +47,11 @@ import java.util.concurrent.BlockingQueue;
 
 public class VideoEncoder extends BaseEncoder implements GetCameraData {
 
-  private static final String TAG = "VideoEncoder";
-  private GetVideoData getVideoData;
+  private final GetVideoData getVideoData;
   private boolean spsPpsSetted = false;
-  private boolean hardwareRotation = false;
+  private boolean forceKey = false;
+  //video data necessary to send after requestKeyframe.
+  private ByteBuffer oldSps, oldPps, oldVps;
 
   //surface to buffer encoder
   private Surface inputSurface;
@@ -48,36 +63,35 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
   private int rotation = 90;
   private int iFrameInterval = 2;
   //for disable video
-  private FpsLimiter fpsLimiter = new FpsLimiter();
+  private final FpsLimiter fpsLimiter = new FpsLimiter();
   private String type = CodecUtil.H264_MIME;
   private FormatVideoEncoder formatVideoEncoder = FormatVideoEncoder.YUV420Dynamical;
   private int avcProfile = -1;
   private int avcProfileLevel = -1;
-  private HandlerThread handlerThread;
-  private BlockingQueue<Frame> queue = new ArrayBlockingQueue<>(80);
 
   public VideoEncoder(GetVideoData getVideoData) {
     this.getVideoData = getVideoData;
+    TAG = "VideoEncoder";
   }
 
   public boolean prepareVideoEncoder(int width, int height, int fps, int bitRate, int rotation,
-       boolean hardwareRotation, int iFrameInterval, FormatVideoEncoder formatVideoEncoder) {
-    return prepareVideoEncoder(width, height, fps, bitRate, rotation, hardwareRotation,
-      iFrameInterval, formatVideoEncoder, -1, -1);
+      int iFrameInterval, FormatVideoEncoder formatVideoEncoder) {
+    return prepareVideoEncoder(width, height, fps, bitRate, rotation, iFrameInterval,
+        formatVideoEncoder, -1, -1);
   }
 
   /**
    * Prepare encoder with custom parameters
    */
   public boolean prepareVideoEncoder(int width, int height, int fps, int bitRate, int rotation,
-      boolean hardwareRotation, int iFrameInterval, FormatVideoEncoder formatVideoEncoder,
-      int avcProfile, int avcProfileLevel) {
+      int iFrameInterval, FormatVideoEncoder formatVideoEncoder, int avcProfile,
+      int avcProfileLevel) {
     this.width = width;
     this.height = height;
     this.fps = fps;
     this.bitRate = bitRate;
     this.rotation = rotation;
-    this.hardwareRotation = hardwareRotation;
+    this.iFrameInterval = iFrameInterval;
     this.formatVideoEncoder = formatVideoEncoder;
     this.avcProfile = avcProfile;
     this.avcProfileLevel = avcProfileLevel;
@@ -85,6 +99,7 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
     MediaCodecInfo encoder = chooseEncoder(type);
     try {
       if (encoder != null) {
+        Log.i(TAG, "Encoder selected " + encoder.getName());
         codec = MediaCodec.createByCodecName(encoder.getName());
         if (this.formatVideoEncoder == FormatVideoEncoder.YUV420Dynamical) {
           this.formatVideoEncoder = chooseColorDynamically(encoder);
@@ -101,14 +116,13 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
       //if you dont use mediacodec rotation you need swap width and height in rotation 90 or 270
       // for correct encoding resolution
       String resolution;
-      //if (!hardwareRotation && (rotation == 90 || rotation == 270)) {
-      //  resolution = height + "x" + width;
-      //  videoFormat = MediaFormat.createVideoFormat(type, height, width);
-      //} else {
-
+      if ((rotation == 90 || rotation == 270)) {
+        resolution = height + "x" + width;
+        videoFormat = MediaFormat.createVideoFormat(type, height, width);
+      } else {
         resolution = width + "x" + height;
         videoFormat = MediaFormat.createVideoFormat(type, width, height);
-      //}
+      }
       Log.i(TAG, "Prepare video info: " + this.formatVideoEncoder.name() + ", " + resolution);
       videoFormat.setInteger(MediaFormat.KEY_COLOR_FORMAT,
           this.formatVideoEncoder.getFormatCodec());
@@ -116,13 +130,23 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
       videoFormat.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
       videoFormat.setInteger(MediaFormat.KEY_FRAME_RATE, fps);
       videoFormat.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, iFrameInterval);
-      if (hardwareRotation) {
-        videoFormat.setInteger("rotation-degrees", rotation);
+      //Set CBR mode if supported by encoder.
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && CodecUtil.isCBRModeSupported(encoder, type)) {
+        Log.i(TAG, "set bitrate mode CBR");
+        videoFormat.setInteger(MediaFormat.KEY_BITRATE_MODE,
+            MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR);
+      } else {
+        Log.i(TAG, "bitrate mode CBR not supported using default mode");
       }
+      // Rotation by encoder.
+      // Removed because this is ignored by most encoders, producing different results on different devices
+      //  videoFormat.setInteger(MediaFormat.KEY_ROTATION, rotation);
 
-      if (this.avcProfile > 0 && this.avcProfileLevel > 0) {
+      if (this.avcProfile > 0) {
         // MediaFormat.KEY_PROFILE, API > 21
         videoFormat.setInteger("profile", this.avcProfile);
+      }
+      if (this.avcProfileLevel > 0) {
         // MediaFormat.KEY_LEVEL, API > 23
         videoFormat.setInteger("level", this.avcProfileLevel);
       }
@@ -135,68 +159,44 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
       }
       Log.i(TAG, "prepared");
       return true;
-    } catch (IOException | IllegalStateException e) {
+    } catch (Exception e) {
       Log.e(TAG, "Create VideoEncoder failed.", e);
+      this.stop();
       return false;
     }
   }
 
   @Override
   public void start(boolean resetTs) {
+    forceKey = false;
+    shouldReset = resetTs;
     spsPpsSetted = false;
     if (resetTs) {
-      presentTimeUs = System.nanoTime() / 1000;
       fpsLimiter.setFPS(fps);
     }
     if (formatVideoEncoder != FormatVideoEncoder.SURFACE) {
       YUVUtil.preAllocateBuffers(width * height * 3 / 2);
     }
-    handlerThread = new HandlerThread(TAG);
-    handlerThread.start();
-    Handler handler = new Handler(handlerThread.getLooper());
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-      createAsyncCallback();
-      codec.setCallback(callback, handler);
-      codec.start();
-    } else {
-      codec.start();
-      handler.post(new Runnable() {
-        @Override
-        public void run() {
-          while (running) {
-            try {
-              getDataFromEncoder(null);
-            } catch (IllegalStateException e) {
-              Log.i(TAG, "Encoding error", e);
-            }
-          }
-        }
-      });
-    }
-    running = true;
     Log.i(TAG, "started");
   }
 
   @Override
   protected void stopImp() {
-    if (handlerThread != null) {
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-        handlerThread.quitSafely();
-      } else {
-        handlerThread.quit();
-      }
-    }
-    queue.clear();
     spsPpsSetted = false;
+    if (inputSurface != null) inputSurface.release();
     inputSurface = null;
+    oldSps = null;
+    oldPps = null;
+    oldVps = null;
     Log.i(TAG, "stopped");
   }
 
+  @Override
   public void reset() {
-    stop();
-    prepareVideoEncoder(width, height, fps, bitRate, rotation, hardwareRotation, iFrameInterval,
-        formatVideoEncoder, avcProfile, avcProfileLevel);
-    start(false);
+    stop(false);
+    prepareVideoEncoder(width, height, fps, bitRate, rotation, iFrameInterval, formatVideoEncoder,
+        avcProfile, avcProfileLevel);
+    restart();
   }
 
   private FormatVideoEncoder chooseColorDynamically(MediaCodecInfo mediaCodecInfo) {
@@ -214,7 +214,7 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
    * Prepare encoder with default parameters
    */
   public boolean prepareVideoEncoder() {
-    return prepareVideoEncoder(width, height, fps, bitRate, rotation, false, iFrameInterval,
+    return prepareVideoEncoder(width, height, fps, bitRate, rotation, iFrameInterval,
         formatVideoEncoder, avcProfile, avcProfileLevel);
   }
 
@@ -233,14 +233,20 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
   }
 
   @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-  public void forceSyncFrame() {
+  public void requestKeyframe() {
     if (isRunning()) {
-      Bundle bundle = new Bundle();
-      bundle.putInt(MediaCodec.PARAMETER_KEY_REQUEST_SYNC_FRAME, 0);
-      try {
-        codec.setParameters(bundle);
-      } catch (IllegalStateException e) {
-        Log.e(TAG, "encoder need be running", e);
+      if (spsPpsSetted) {
+        Bundle bundle = new Bundle();
+        bundle.putInt(MediaCodec.PARAMETER_KEY_REQUEST_SYNC_FRAME, 0);
+        try {
+          codec.setParameters(bundle);
+          getVideoData.onSpsPpsVps(oldSps, oldPps, oldVps);
+        } catch (IllegalStateException e) {
+          Log.e(TAG, "encoder need be running", e);
+        }
+      } else {
+        //You need wait until encoder generate first frame.
+        forceKey = true;
       }
     }
   }
@@ -261,10 +267,6 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
     return height;
   }
 
-  public boolean isHardwareRotation() {
-    return hardwareRotation;
-  }
-
   public int getRotation() {
     return rotation;
   }
@@ -273,6 +275,10 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
     this.fps = fps;
   }
 
+  public void setRotation(int rotation) {
+    this.rotation = rotation;
+  }
+
   public int getFps() {
     return fps;
   }
@@ -299,12 +305,17 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
   private void sendSPSandPPS(MediaFormat mediaFormat) {
     //H265
     if (type.equals(CodecUtil.H265_MIME)) {
-      List<ByteBuffer> byteBufferList =
-          extractVpsSpsPpsFromH265(mediaFormat.getByteBuffer("csd-0"));
-      getVideoData.onSpsPpsVps(byteBufferList.get(1), byteBufferList.get(2), byteBufferList.get(0));
+      List<ByteBuffer> byteBufferList = extractVpsSpsPpsFromH265(mediaFormat.getByteBuffer("csd-0"));
+      oldSps = byteBufferList.get(1);
+      oldPps = byteBufferList.get(2);
+      oldVps = byteBufferList.get(0);
+      getVideoData.onSpsPpsVps(oldSps, oldPps, oldVps);
       //H264
     } else {
-      getVideoData.onSpsPps(mediaFormat.getByteBuffer("csd-0"), mediaFormat.getByteBuffer("csd-1"));
+      oldSps = mediaFormat.getByteBuffer("csd-0");
+      oldPps = mediaFormat.getByteBuffer("csd-1");
+      oldVps = null;
+      getVideoData.onSpsPpsVps(oldSps, oldPps, oldVps);
     }
   }
 
@@ -315,14 +326,17 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
   protected MediaCodecInfo chooseEncoder(String mime) {
     List<MediaCodecInfo> mediaCodecInfoList;
     if (force == CodecUtil.Force.HARDWARE) {
-      mediaCodecInfoList = CodecUtil.getAllHardwareEncoders(mime);
+      mediaCodecInfoList = CodecUtil.getAllHardwareEncoders(mime, true);
     } else if (force == CodecUtil.Force.SOFTWARE) {
-      mediaCodecInfoList = CodecUtil.getAllSoftwareEncoders(mime);
+      mediaCodecInfoList = CodecUtil.getAllSoftwareEncoders(mime, true);
     } else {
-      mediaCodecInfoList = CodecUtil.getAllEncoders(mime);
+      //Priority: hardware CBR > hardware > software CBR > software
+      mediaCodecInfoList = CodecUtil.getAllEncoders(mime, true, true);
     }
+
+    Log.i(TAG, mediaCodecInfoList.size() + " encoders found");
     for (MediaCodecInfo mci : mediaCodecInfoList) {
-      Log.i(TAG, String.format("VideoEncoder %s", mci.getName()));
+      Log.i(TAG, "Encoder " + mci.getName());
       MediaCodecInfo.CodecCapabilities codecCapabilities = mci.getCapabilitiesForType(mime);
       for (int color : codecCapabilities.colorFormats) {
         Log.i(TAG, "Color supported: " + color);
@@ -344,7 +358,6 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
    * decode sps and pps if the encoder never call to MediaCodec.INFO_OUTPUT_FORMAT_CHANGED
    */
   private Pair<ByteBuffer, ByteBuffer> decodeSpsPpsFromBuffer(ByteBuffer outputBuffer, int length) {
-    byte[] mSPS = null, mPPS = null;
     byte[] csd = new byte[length];
     outputBuffer.get(csd, 0, length);
     int i = 0;
@@ -362,13 +375,11 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
       i++;
     }
     if (spsIndex != -1 && ppsIndex != -1) {
-      mSPS = new byte[ppsIndex];
-      System.arraycopy(csd, spsIndex, mSPS, 0, ppsIndex);
-      mPPS = new byte[length - ppsIndex];
-      System.arraycopy(csd, ppsIndex, mPPS, 0, length - ppsIndex);
-    }
-    if (mSPS != null && mPPS != null) {
-      return new Pair<>(ByteBuffer.wrap(mSPS), ByteBuffer.wrap(mPPS));
+      byte[] sps = new byte[ppsIndex];
+      System.arraycopy(csd, spsIndex, sps, 0, ppsIndex);
+      byte[] pps = new byte[length - ppsIndex];
+      System.arraycopy(csd, ppsIndex, pps, 0, length - ppsIndex);
+      return new Pair<>(ByteBuffer.wrap(sps), ByteBuffer.wrap(pps));
     }
     return null;
   }
@@ -386,7 +397,9 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
     int spsPosition = -1;
     int ppsPosition = -1;
     int contBufferInitiation = 0;
-    byte[] csdArray = csd0byteBuffer.array();
+    int length = csd0byteBuffer.remaining();
+    byte[] csdArray = new byte[length];
+    csd0byteBuffer.get(csdArray, 0, length);
     for (int i = 0; i < csdArray.length; i++) {
       if (contBufferInitiation == 3 && csdArray[i] == 1) {
         if (vpsPosition == -1) {
@@ -424,21 +437,27 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
   @Override
   protected Frame getInputFrame() throws InterruptedException {
     Frame frame = queue.take();
+    if (frame == null) return null;
     if (fpsLimiter.limitFPS()) return getInputFrame();
     byte[] buffer = frame.getBuffer();
     boolean isYV12 = frame.getFormat() == ImageFormat.YV12;
-    if (!hardwareRotation) {
-      int orientation = frame.isFlip() ? frame.getOrientation() + 180 : frame.getOrientation();
-      if (orientation >= 360) orientation -= 360;
-      buffer = isYV12 ? YUVUtil.rotateYV12(buffer, width, height, orientation)
-          : YUVUtil.rotateNV21(buffer, width, height, orientation);
-    }
+
+    int orientation = frame.isFlip() ? frame.getOrientation() + 180 : frame.getOrientation();
+    if (orientation >= 360) orientation -= 360;
+    buffer = isYV12 ? YUVUtil.rotateYV12(buffer, width, height, orientation)
+        : YUVUtil.rotateNV21(buffer, width, height, orientation);
+
     buffer = isYV12 ? YUVUtil.YV12toYUV420byColor(buffer, width, height, formatVideoEncoder)
         : YUVUtil.NV21toYUV420byColor(buffer, width, height, formatVideoEncoder);
     frame.setBuffer(buffer);
     return frame;
   }
 
+  @Override
+  protected long calculatePts(Frame frame, long presentTimeUs) {
+    return System.nanoTime() / 1000 - presentTimeUs;
+  }
+
   @Override
   public void formatChanged(@NonNull MediaCodec mediaCodec, @NonNull MediaFormat mediaFormat) {
     getVideoData.onVideoFormat(mediaFormat);
@@ -449,59 +468,46 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
   @Override
   protected void checkBuffer(@NonNull ByteBuffer byteBuffer,
       @NonNull MediaCodec.BufferInfo bufferInfo) {
-    if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
-      if (!spsPpsSetted) {
-        Pair<ByteBuffer, ByteBuffer> buffers =
-            decodeSpsPpsFromBuffer(byteBuffer.duplicate(), bufferInfo.size);
-        if (buffers != null) {
-          getVideoData.onSpsPps(buffers.first, buffers.second);
-          spsPpsSetted = true;
-        }
+    if (forceKey && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+      forceKey = false;
+      requestKeyframe();
+    }
+    fixTimeStamp(bufferInfo);
+    if (!spsPpsSetted && type.equals(CodecUtil.H264_MIME)) {
+      Log.i(TAG, "formatChanged not called, doing manual sps/pps extraction...");
+      Pair<ByteBuffer, ByteBuffer> buffers = decodeSpsPpsFromBuffer(byteBuffer.duplicate(), bufferInfo.size);
+      if (buffers != null) {
+        Log.i(TAG, "manual sps/pps extraction success");
+        oldSps = buffers.first;
+        oldPps = buffers.second;
+        oldVps = null;
+        getVideoData.onSpsPpsVps(oldSps, oldPps, oldVps);
+        spsPpsSetted = true;
+      } else {
+        Log.e(TAG, "manual sps/pps extraction failed");
       }
+    } else if (!spsPpsSetted && type.equals(CodecUtil.H265_MIME)) {
+      Log.i(TAG, "formatChanged not called, doing manual vps/sps/pps extraction...");
+      List<ByteBuffer> byteBufferList = extractVpsSpsPpsFromH265(byteBuffer);
+      if (byteBufferList.size() == 3) {
+        Log.i(TAG, "manual vps/sps/pps extraction success");
+        oldSps = byteBufferList.get(1);
+        oldPps = byteBufferList.get(2);
+        oldVps = byteBufferList.get(0);
+        getVideoData.onSpsPpsVps(oldSps, oldPps, oldVps);
+        spsPpsSetted = true;
+      } else {
+        Log.e(TAG, "manual vps/sps/pps extraction failed");
+      }
+    }
+    if (formatVideoEncoder == FormatVideoEncoder.SURFACE) {
+      bufferInfo.presentationTimeUs = System.nanoTime() / 1000 - presentTimeUs;
     }
   }
 
   @Override
   protected void sendBuffer(@NonNull ByteBuffer byteBuffer,
       @NonNull MediaCodec.BufferInfo bufferInfo) {
-    bufferInfo.presentationTimeUs = System.nanoTime() / 1000 - presentTimeUs;
     getVideoData.getVideoData(byteBuffer, bufferInfo);
   }
-
-  private MediaCodec.Callback callback;
-
-  @RequiresApi(api = Build.VERSION_CODES.M)
-  private void createAsyncCallback() {
-    callback = new MediaCodec.Callback() {
-      @Override
-      public void onInputBufferAvailable(@NonNull MediaCodec mediaCodec, int inBufferIndex) {
-        try {
-          inputAvailable(mediaCodec, inBufferIndex, null);
-        } catch (IllegalStateException e) {
-          Log.i(TAG, "Encoding error", e);
-        }
-      }
-
-      @Override
-      public void onOutputBufferAvailable(@NonNull MediaCodec mediaCodec, int outBufferIndex,
-          @NonNull MediaCodec.BufferInfo bufferInfo) {
-        try {
-          outputAvailable(mediaCodec, outBufferIndex, bufferInfo);
-        } catch (IllegalStateException e) {
-          Log.i(TAG, "Encoding error", e);
-        }
-      }
-
-      @Override
-      public void onError(@NonNull MediaCodec mediaCodec, @NonNull MediaCodec.CodecException e) {
-        Log.e(TAG, "Error", e);
-      }
-
-      @Override
-      public void onOutputFormatChanged(@NonNull MediaCodec mediaCodec,
-          @NonNull MediaFormat mediaFormat) {
-        formatChanged(mediaCodec, mediaFormat);
-      }
-    };
-  }
 }
\ No newline at end of file
diff --git a/encoder/src/main/res/raw/chroma_fragment.glsl b/encoder/src/main/res/raw/chroma_fragment.glsl
new file mode 100644
index 0000000..c65932f
--- /dev/null
+++ b/encoder/src/main/res/raw/chroma_fragment.glsl
@@ -0,0 +1,22 @@
+precision mediump float;
+
+uniform sampler2D uSampler;
+uniform sampler2D uObject;
+uniform float uSensitive;
+
+varying vec2 vTextureCoord;
+varying vec2 vTextureObjectCoord;
+
+void main() {
+    vec4 samplerPixel = texture2D(uSampler, vTextureCoord);
+    vec4 objectPixel = texture2D(uObject, vTextureObjectCoord);
+
+    float maxrb = max(samplerPixel.r, samplerPixel.b);
+    float k = clamp((samplerPixel.g - maxrb) * uSensitive, 0.0, 1.0);
+
+    float dg = samplerPixel.g;
+    samplerPixel.g = min(samplerPixel.g, maxrb * 0.9);
+    samplerPixel += dg - samplerPixel.g;
+
+    gl_FragColor = vec4(mix(samplerPixel, objectPixel, k).rgb, 1.0);
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 69f08a3..60306e3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/rtmp/.gitignore b/rtmp/.gitignore
index 796b96d..3543521 100644
--- a/rtmp/.gitignore
+++ b/rtmp/.gitignore
@@ -1 +1 @@
-/build
+/build
diff --git a/rtmp/build.gradle b/rtmp/build.gradle
index 4f56f3c..565cdeb 100644
--- a/rtmp/build.gradle
+++ b/rtmp/build.gradle
@@ -1,19 +1,25 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 32
 
   defaultConfig {
     minSdkVersion 16
-    targetSdkVersion 30
+    targetSdkVersion 32
   }
   buildTypes {
     release {
       minifyEnabled false
     }
   }
+  namespace 'com.pedro.rtmp'
+
 }
 
 dependencies {
-  api 'androidx.annotation:annotation:1.2.0'
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+  testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+  testImplementation 'junit:junit:4.13.2'
 }
diff --git a/rtmp/src/main/AndroidManifest.xml b/rtmp/src/main/AndroidManifest.xml
index 733158c..7d51409 100644
--- a/rtmp/src/main/AndroidManifest.xml
+++ b/rtmp/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="net.ossrs.rtmp" />
+<manifest />
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/Crypto.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/Crypto.java
deleted file mode 100644
index faafee8..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/Crypto.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.github.faucamp.simplertmp;
-
-import android.util.Log;
-
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-
-/**
- * Some helper utilities for SHA256, mostly (used during handshake)
- * This is separated in order to be more easily replaced on platforms that
- * do not have the javax.crypto.* and/or java.security.* packages
- *
- * This implementation is directly inspired by the RTMPHandshake class of the
- * Red5  Open Source Flash Server project
- *
- * @author francois
- */
-public class Crypto {
-
-  private static final String TAG = "Crypto";
-
-  private Mac hmacSHA256;
-
-  public Crypto() {
-    try {
-      hmacSHA256 = Mac.getInstance("HmacSHA256");
-    } catch (SecurityException e) {
-      Log.e(TAG, "Security exception when getting HMAC", e);
-    } catch (NoSuchAlgorithmException e) {
-      Log.e(TAG, "HMAC SHA256 does not exist");
-    }
-  }
-
-  /**
-   * Calculates an HMAC SHA256 hash using a default key length.
-   *
-   * @return hmac hashed bytes
-   */
-  public byte[] calculateHmacSHA256(byte[] input, byte[] key) {
-    byte[] output = null;
-    try {
-      hmacSHA256.init(new SecretKeySpec(key, "HmacSHA256"));
-      output = hmacSHA256.doFinal(input);
-    } catch (InvalidKeyException e) {
-      Log.e(TAG, "Invalid key", e);
-    }
-    return output;
-  }
-
-  /**
-   * Calculates an HMAC SHA256 hash using a set key length.
-   *
-   * @return hmac hashed bytes
-   */
-  public byte[] calculateHmacSHA256(byte[] input, byte[] key, int length) {
-    byte[] output = null;
-    try {
-      hmacSHA256.init(new SecretKeySpec(key, 0, length, "HmacSHA256"));
-      output = hmacSHA256.doFinal(input);
-    } catch (InvalidKeyException e) {
-      Log.e(TAG, "Invalid key", e);
-    }
-    return output;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/DefaultRtmpPublisher.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/DefaultRtmpPublisher.java
deleted file mode 100644
index 4e62594..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/DefaultRtmpPublisher.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.github.faucamp.simplertmp;
-
-import com.github.faucamp.simplertmp.io.RtmpConnection;
-import net.ossrs.rtmp.ConnectCheckerRtmp;
-
-/**
- * Srs implementation of an RTMP publisher
- *
- * @author francois, leoma, pedro
- */
-public class DefaultRtmpPublisher implements RtmpPublisher {
-
-  private RtmpConnection rtmpConnection;
-
-  public DefaultRtmpPublisher(ConnectCheckerRtmp connectCheckerRtmp) {
-    rtmpConnection = new RtmpConnection(connectCheckerRtmp);
-  }
-
-  @Override
-  public boolean connect(String url) {
-    return rtmpConnection.connect(url);
-  }
-
-  @Override
-  public boolean publish(String publishType) {
-    return rtmpConnection.publish(publishType);
-  }
-
-  @Override
-  public void close() {
-    rtmpConnection.close();
-  }
-
-  @Override
-  public void publishVideoData(byte[] data, int size, int dts) {
-    rtmpConnection.publishVideoData(data, size, dts);
-  }
-
-  @Override
-  public void publishAudioData(byte[] data, int size, int dts) {
-    rtmpConnection.publishAudioData(data, size, dts);
-  }
-
-  @Override
-  public void setVideoResolution(int width, int height) {
-    rtmpConnection.setVideoResolution(width, height);
-  }
-
-  @Override
-  public void setAuthorization(String user, String password) {
-    rtmpConnection.setAuthorization(user, password);
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/RtmpPublisher.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/RtmpPublisher.java
deleted file mode 100644
index bad9ee0..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/RtmpPublisher.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.github.faucamp.simplertmp;
-
-/**
- * Simple RTMP publisher, using vanilla Java networking (no NIO)
- * This was created primarily to address a NIO bug in Android 2.2 when
- * used with Apache Mina, but also to provide an easy-to-use way to access
- * RTMP streams
- *
- * @author francois, leo
- */
-public interface RtmpPublisher {
-  /**
-   * Issues an RTMP "connect" command and wait for the response.
-   *
-   * @param url specify the RTMP url
-   * @return If succeeded return true else return false
-   */
-  boolean connect(String url);
-
-  /**
-   * Issues an RTMP "publish" command and write the media content stream packets (audio and video).
-   *
-   * @param publishType specify the way to publish raw RTMP packets among "live", "record" and
-   * "append"
-   * @return If succeeded return true else return false
-   * @throws IllegalStateException if the client is not connected to a RTMP server
-   */
-  boolean publish(String publishType);
-
-  /**
-   * Stop and close the current RTMP streaming client.
-   */
-  void close();
-
-  /**
-   * publish a video content packet to server
-   *
-   * @param data video stream byte array
-   * @param size video stream byte size (not the whole length of byte array)
-   * @param dts video stream decoding timestamp
-   */
-  void publishVideoData(byte[] data, int size, int dts);
-
-  /**
-   * publish an audio content packet to server
-   *
-   * @param data audio stream byte array
-   * @param size audio stream byte size (not the whole length of byte array)
-   * @param dts audio stream decoding timestamp
-   */
-  void publishAudioData(byte[] data, int size, int dts);
-
-  /**
-   * set video resolution
-   *
-   * @param width video width
-   * @param height video height
-   */
-  void setVideoResolution(int width, int height);
-
-  void setAuthorization(String user, String password);
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/Util.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/Util.java
deleted file mode 100644
index 6cf6e3f..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/Util.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.github.faucamp.simplertmp;
-
-import android.util.Base64;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.MessageDigest;
-
-/**
- * Misc utility method
- *
- * @author francois, pedro
- */
-public class Util {
-
-  private static final String HEXES = "0123456789ABCDEF";
-
-  public static void writeUnsignedInt32(OutputStream out, int value) throws IOException {
-    out.write((byte) (value >>> 24));
-    out.write((byte) (value >>> 16));
-    out.write((byte) (value >>> 8));
-    out.write((byte) value);
-  }
-
-  public static int readUnsignedInt32(InputStream in) throws IOException {
-    return ((in.read() & 0xff) << 24) | ((in.read() & 0xff) << 16) | ((in.read() & 0xff) << 8) | (in
-        .read() & 0xff);
-  }
-
-  public static int readUnsignedInt24(InputStream in) throws IOException {
-    return ((in.read() & 0xff) << 16) | ((in.read() & 0xff) << 8) | (in.read() & 0xff);
-  }
-
-  public static int readUnsignedInt16(InputStream in) throws IOException {
-    return ((in.read() & 0xff) << 8) | (in.read() & 0xff);
-  }
-
-  public static void writeUnsignedInt24(OutputStream out, int value) throws IOException {
-    out.write((byte) (value >>> 16));
-    out.write((byte) (value >>> 8));
-    out.write((byte) value);
-  }
-
-  public static void writeUnsignedInt16(OutputStream out, int value) throws IOException {
-    out.write((byte) (value >>> 8));
-    out.write((byte) value);
-  }
-
-  public static int toUnsignedInt32(byte[] bytes) {
-    return (((int) bytes[0] & 0xff) << 24) | (((int) bytes[1] & 0xff) << 16) | (((int) bytes[2]
-        & 0xff) << 8) | ((int) bytes[3] & 0xff);
-  }
-
-  public static int toUnsignedInt32LittleEndian(byte[] bytes) {
-    return ((bytes[3] & 0xff) << 24)
-        | ((bytes[2] & 0xff) << 16)
-        | ((bytes[1] & 0xff) << 8)
-        | (bytes[0] & 0xff);
-  }
-
-  public static void writeUnsignedInt32LittleEndian(OutputStream out, int value)
-      throws IOException {
-    out.write((byte) value);
-    out.write((byte) (value >>> 8));
-    out.write((byte) (value >>> 16));
-    out.write((byte) (value >>> 24));
-  }
-
-  public static int toUnsignedInt24(byte[] bytes) {
-    return ((bytes[1] & 0xff) << 16) | ((bytes[2] & 0xff) << 8) | (bytes[3] & 0xff);
-  }
-
-  public static int toUnsignedInt16(byte[] bytes) {
-    return ((bytes[2] & 0xff) << 8) | (bytes[3] & 0xff);
-  }
-
-  public static String toHexString(byte[] raw) {
-    if (raw == null) {
-      return null;
-    }
-    final StringBuilder hex = new StringBuilder(2 * raw.length);
-    for (final byte b : raw) {
-      hex.append(HEXES.charAt((b & 0xF0) >> 4)).append(HEXES.charAt((b & 0x0F)));
-    }
-    return hex.toString();
-  }
-
-  public static String toHexString(byte b) {
-    return new StringBuilder().append(HEXES.charAt((b & 0xF0) >> 4))
-        .append(HEXES.charAt((b & 0x0F)))
-        .toString();
-  }
-
-  /**
-   * Reads bytes from the specified inputstream into the specified target buffer until it is filled up
-   */
-  public static void readBytesUntilFull(InputStream in, byte[] targetBuffer) throws IOException {
-    int totalBytesRead = 0;
-    int read;
-    final int targetBytes = targetBuffer.length;
-    do {
-      read = in.read(targetBuffer, totalBytesRead, (targetBytes - totalBytesRead));
-      if (read != -1) {
-        totalBytesRead += read;
-      } else {
-        throw new IOException("Unexpected EOF reached before read buffer was filled");
-      }
-    } while (totalBytesRead < targetBytes);
-  }
-
-  public static byte[] toByteArray(double d) {
-    long l = Double.doubleToRawLongBits(d);
-    return new byte[] {
-        (byte) ((l >> 56) & 0xff), (byte) ((l >> 48) & 0xff), (byte) ((l >> 40) & 0xff),
-        (byte) ((l >> 32) & 0xff), (byte) ((l >> 24) & 0xff), (byte) ((l >> 16) & 0xff),
-        (byte) ((l >> 8) & 0xff), (byte) (l & 0xff),
-    };
-  }
-
-  public static byte[] unsignedInt32ToByteArray(int value) throws IOException {
-    return new byte[] {
-        (byte) (value >>> 24), (byte) (value >>> 16), (byte) (value >>> 8), (byte) value
-    };
-  }
-
-  public static double readDouble(InputStream in) throws IOException {
-    long bits =
-        ((long) (in.read() & 0xff) << 56)
-            | ((long) (in.read() & 0xff) << 48)
-            | ((long) (in.read()
-            & 0xff) << 40)
-            | ((long) (in.read() & 0xff) << 32)
-            | ((in.read() & 0xff) << 24)
-            | ((in.read() & 0xff) << 16)
-            | ((in.read() & 0xff) << 8)
-            | (in.read() & 0xff);
-    return Double.longBitsToDouble(bits);
-  }
-
-  public static void writeDouble(OutputStream out, double d) throws IOException {
-    long l = Double.doubleToRawLongBits(d);
-    out.write(new byte[] {
-        (byte) ((l >> 56) & 0xff), (byte) ((l >> 48) & 0xff), (byte) ((l >> 40) & 0xff),
-        (byte) ((l >> 32) & 0xff), (byte) ((l >> 24) & 0xff), (byte) ((l >> 16) & 0xff),
-        (byte) ((l >> 8) & 0xff), (byte) (l & 0xff)
-    });
-  }
-
-  public static String getSalt(String description) {
-    String salt = null;
-    String data[] = description.split("&");
-    for (String s : data) {
-      if (s.contains("salt=")) {
-        salt = s.substring(5);
-        break;
-      }
-    }
-    return salt;
-  }
-
-  public static String getChallenge(String description) {
-    String challenge = null;
-    String data[] = description.split("&");
-    for (String s : data) {
-      if (s.contains("challenge=")) {
-        challenge = s.substring(10);
-        break;
-      }
-    }
-    return challenge;
-  }
-
-  public static String getOpaque(String description) {
-    String opaque = "";
-    String data[] = description.split("&");
-    for (String s : data) {
-      if (s.contains("opaque=")) {
-        opaque = s.substring(7);
-        break;
-      }
-    }
-    return opaque;
-  }
-
-  public static String stringToMD5BASE64(String s) {
-    try {
-      MessageDigest md = MessageDigest.getInstance("MD5");
-      md.update(s.getBytes("UTF-8"), 0, s.length());
-      byte[] md5hash = md.digest();
-      return Base64.encodeToString(md5hash, Base64.NO_WRAP);
-    } catch (Exception e) {
-      return null;
-    }
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfArray.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfArray.java
deleted file mode 100644
index 7a8bc9b..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfArray.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.github.faucamp.simplertmp.amf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.github.faucamp.simplertmp.Util;
-
-/**
- * AMF Array
- *
- * @author francois
- */
-public class AmfArray implements AmfData {
-
-  private List<AmfData> items;
-  private int size = -1;
-
-  @Override
-  public void writeTo(OutputStream out) {
-    throw new UnsupportedOperationException("Not supported yet.");
-  }
-
-  @Override
-  public void readFrom(InputStream in) throws IOException {
-    // Skip data type byte (we assume it's already read)
-    int length = Util.readUnsignedInt32(in);
-    size = 5; // 1 + 4
-    items = new ArrayList<>(length);
-    for (int i = 0; i < length; i++) {
-      AmfData dataItem = AmfDecoder.readFrom(in);
-      size += dataItem.getSize();
-      items.add(dataItem);
-    }
-  }
-
-  @Override
-  public int getSize() {
-    if (size == -1) {
-      size = 5; // 1 + 4
-      if (items != null) {
-        for (AmfData dataItem : items) {
-          size += dataItem.getSize();
-        }
-      }
-    }
-    return size;
-  }
-
-  /** @return the amount of items in this the array */
-  public int getLength() {
-    return items != null ? items.size() : 0;
-  }
-
-  public List<AmfData> getItems() {
-    if (items == null) {
-      items = new ArrayList<>();
-    }
-    return items;
-  }
-
-  public void addItem(AmfData dataItem) {
-    getItems().add(this);
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfBoolean.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfBoolean.java
deleted file mode 100644
index 6ddb39b..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfBoolean.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.github.faucamp.simplertmp.amf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author francois
- */
-public class AmfBoolean implements AmfData {
-
-  private boolean value;
-
-  public boolean isValue() {
-    return value;
-  }
-
-  public void setValue(boolean value) {
-    this.value = value;
-  }
-
-  public AmfBoolean(boolean value) {
-    this.value = value;
-  }
-
-  public AmfBoolean() {
-  }
-
-  @Override
-  public void writeTo(OutputStream out) throws IOException {
-    out.write(AmfType.BOOLEAN.getValue());
-    out.write(value ? 0x01 : 0x00);
-  }
-
-  @Override
-  public void readFrom(InputStream in) throws IOException {
-    value = in.read() == 0x01;
-  }
-
-  public static boolean readBooleanFrom(InputStream in) throws IOException {
-    // Skip data type byte (we assume it's already read)
-    return in.read() == 0x01;
-  }
-
-  @Override
-  public int getSize() {
-    return 2;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfData.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfData.java
deleted file mode 100644
index a8b5d52..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfData.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.faucamp.simplertmp.amf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Base AMF data object. All other AMF data type instances derive from this
- * (including AmfObject)
- *
- * @author francois
- */
-public interface AmfData {
-
-  /**
-   * Write/Serialize this AMF data intance (Object/string/integer etc) to
-   * the specified OutputStream
-   */
-  void writeTo(OutputStream out) throws IOException;
-
-  /**
-   * Read and parse bytes from the specified input stream to populate this
-   * AMFData instance (deserialize)
-   *
-   * @return the amount of bytes read
-   */
-  void readFrom(InputStream in) throws IOException;
-
-  /** @return the amount of bytes required for this object */
-  int getSize();
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfDecoder.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfDecoder.java
deleted file mode 100644
index 4ff7784..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfDecoder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.github.faucamp.simplertmp.amf;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author francois
- */
-public class AmfDecoder {
-
-  public static AmfData readFrom(InputStream in) throws IOException {
-
-    byte amfTypeByte = (byte) in.read();
-    AmfType amfType = AmfType.valueOf(amfTypeByte);
-
-    AmfData amfData;
-    if (amfType != null) {
-      switch (amfType) {
-        case NUMBER:
-          amfData = new AmfNumber();
-          break;
-        case BOOLEAN:
-          amfData = new AmfBoolean();
-          break;
-        case STRING:
-          amfData = new AmfString();
-          break;
-        case OBJECT:
-          amfData = new AmfObject();
-          break;
-        case NULL:
-          return new AmfNull();
-        case UNDEFINED:
-          return new AmfUndefined();
-        case ECMA_MAP:
-          amfData = new AmfMap();
-          break;
-        case STRICT_ARRAY:
-          amfData = new AmfArray();
-          break;
-        default:
-          throw new IOException("Unknown/unimplemented AMF data type: " + amfType);
-      }
-    } else {
-      throw new IOException("Unknown AMF data type");
-    }
-
-    amfData.readFrom(in);
-    return amfData;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfMap.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfMap.java
deleted file mode 100644
index af33b94..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfMap.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.github.faucamp.simplertmp.amf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-import com.github.faucamp.simplertmp.Util;
-
-/**
- * AMF map; that is, an "object"-like structure of key/value pairs, but with
- * an array-like size indicator at the start (which is seemingly always 0)
- *
- * @author francois
- */
-public class AmfMap extends AmfObject {
-
-  @Override
-  public void writeTo(OutputStream out) throws IOException {
-    // Begin the map/object/array/whatever exactly this is
-    out.write(AmfType.ECMA_MAP.getValue());
-
-    // Write the "array size"
-    Util.writeUnsignedInt32(out, properties.size());
-
-    // Write key/value pairs in this object
-    for (Map.Entry<String, AmfData> entry : properties.entrySet()) {
-      // The key must be a STRING type, and thus the "type-definition" byte is implied (not included in message)
-      AmfString.writeStringTo(out, entry.getKey(), true);
-      entry.getValue().writeTo(out);
-    }
-
-    // End the object
-    out.write(OBJECT_END_MARKER);
-  }
-
-  @Override
-  public void readFrom(InputStream in) throws IOException {
-    // Skip data type byte (we assume it's already read)
-    int length = Util.readUnsignedInt32(in); // Seems this is always 0
-    super.readFrom(in);
-    size += 4; // Add the bytes read for parsing the array size (length)
-  }
-
-  @Override
-  public int getSize() {
-    if (size == -1) {
-      size = super.getSize();
-      size += 4; // array length bytes
-    }
-    return size;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfNull.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfNull.java
deleted file mode 100644
index 7df4bbb..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfNull.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.github.faucamp.simplertmp.amf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author francois
- */
-public class AmfNull implements AmfData {
-
-  @Override
-  public void writeTo(OutputStream out) throws IOException {
-    out.write(AmfType.NULL.getValue());
-  }
-
-  @Override
-  public void readFrom(InputStream in) {
-    // Skip data type byte (we assume it's already read)
-  }
-
-  public static void writeNullTo(OutputStream out) throws IOException {
-    out.write(AmfType.NULL.getValue());
-  }
-
-  @Override
-  public int getSize() {
-    return 1;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfNumber.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfNumber.java
deleted file mode 100644
index 0fad4f7..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfNumber.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.github.faucamp.simplertmp.amf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import com.github.faucamp.simplertmp.Util;
-
-/**
- * AMF0 Number data type
- *
- * @author francois
- */
-public class AmfNumber implements AmfData {
-
-  private double value;
-  /** Size of an AMF number, in bytes (including type bit) */
-  public static final int SIZE = 9;
-
-  public AmfNumber(double value) {
-    this.value = value;
-  }
-
-  public AmfNumber() {
-  }
-
-  public double getValue() {
-    return value;
-  }
-
-  public void setValue(double value) {
-    this.value = value;
-  }
-
-  @Override
-  public void writeTo(OutputStream out) throws IOException {
-    out.write(AmfType.NUMBER.getValue());
-    Util.writeDouble(out, value);
-  }
-
-  @Override
-  public void readFrom(InputStream in) throws IOException {
-    // Skip data type byte (we assume it's already read)
-    value = Util.readDouble(in);
-  }
-
-  public static double readNumberFrom(InputStream in) throws IOException {
-    // Skip data type byte
-    in.read();
-    return Util.readDouble(in);
-  }
-
-  public static void writeNumberTo(OutputStream out, double number) throws IOException {
-    out.write(AmfType.NUMBER.getValue());
-    Util.writeDouble(out, number);
-  }
-
-  @Override
-  public int getSize() {
-    return SIZE;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfObject.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfObject.java
deleted file mode 100644
index 20dbfdf..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfObject.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.github.faucamp.simplertmp.amf;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * AMF object
- *
- * @author francois
- */
-public class AmfObject implements AmfData {
-
-  Map<String, AmfData> properties = new LinkedHashMap<String, AmfData>();
-  protected int size = -1;
-  /** Byte sequence that marks the end of an AMF object */
-  protected static final byte[] OBJECT_END_MARKER = new byte[] { 0x00, 0x00, 0x09 };
-
-  public AmfObject() {
-  }
-
-  public AmfData getProperty(String key) {
-    return properties.get(key);
-  }
-
-  public void setProperty(String key, AmfData value) {
-    properties.put(key, value);
-  }
-
-  public void setProperty(String key, boolean value) {
-    properties.put(key, new AmfBoolean(value));
-  }
-
-  public void setProperty(String key, String value) {
-    properties.put(key, new AmfString(value, false));
-  }
-
-  public void setProperty(String key, int value) {
-    properties.put(key, new AmfNumber(value));
-  }
-
-  public void setProperty(String key, double value) {
-    properties.put(key, new AmfNumber(value));
-  }
-
-  @Override
-  public void writeTo(OutputStream out) throws IOException {
-    // Begin the object
-    out.write(AmfType.OBJECT.getValue());
-
-    // Write key/value pairs in this object
-    for (Map.Entry<String, AmfData> entry : properties.entrySet()) {
-      // The key must be a STRING type, and thus the "type-definition" byte is implied (not included in message)
-      AmfString.writeStringTo(out, entry.getKey(), true);
-      entry.getValue().writeTo(out);
-    }
-
-    // End the object
-    out.write(OBJECT_END_MARKER);
-  }
-
-  @Override
-  public void readFrom(InputStream in) throws IOException {
-    // Skip data type byte (we assume it's already read)
-    size = 1;
-    InputStream markInputStream = in.markSupported() ? in : new BufferedInputStream(in);
-
-    while (true) {
-      // Look for the 3-byte object end marker [0x00 0x00 0x09]
-      markInputStream.mark(3);
-      byte[] endMarker = new byte[3];
-      markInputStream.read(endMarker);
-
-      if (endMarker[0] == OBJECT_END_MARKER[0]
-          && endMarker[1] == OBJECT_END_MARKER[1]
-          && endMarker[2] == OBJECT_END_MARKER[2]) {
-        // End marker found
-        size += 3;
-        return;
-      } else {
-        // End marker not found; reset the stream to the marked position and read an AMF property
-        markInputStream.reset();
-        // Read the property key...
-        String key = AmfString.readStringFrom(in, true);
-        size += AmfString.sizeOf(key, true);
-        // ...and the property value
-        AmfData value = AmfDecoder.readFrom(markInputStream);
-        size += value.getSize();
-        properties.put(key, value);
-      }
-    }
-  }
-
-  @Override
-  public int getSize() {
-    if (size == -1) {
-      size = 1; // object marker
-      for (Map.Entry<String, AmfData> entry : properties.entrySet()) {
-        size += AmfString.sizeOf(entry.getKey(), true);
-        size += entry.getValue().getSize();
-      }
-      size += 3; // end of object marker
-    }
-    return size;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfString.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfString.java
deleted file mode 100644
index 580e73a..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfString.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.github.faucamp.simplertmp.amf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.String;
-
-import android.util.Log;
-
-import com.github.faucamp.simplertmp.Util;
-
-/**
- * @author francois
- */
-public class AmfString implements AmfData {
-
-  private static final String TAG = "AmfString";
-
-  private String value;
-  private boolean key;
-  private int size = -1;
-
-  public AmfString() {
-  }
-
-  public AmfString(String value, boolean isKey) {
-    this.value = value;
-    this.key = isKey;
-  }
-
-  public AmfString(String value) {
-    this(value, false);
-  }
-
-  public AmfString(boolean isKey) {
-    this.key = isKey;
-  }
-
-  public String getValue() {
-    return value;
-  }
-
-  public void setValue(String value) {
-    this.value = value;
-  }
-
-  public boolean isKey() {
-    return key;
-  }
-
-  public void setKey(boolean key) {
-    this.key = key;
-  }
-
-  @Override
-  public void writeTo(OutputStream out) throws IOException {
-    // Strings are ASCII encoded
-    byte[] byteValue = this.value.getBytes("ASCII");
-    // Write the STRING data type definition (except if this String is used as a key)
-    if (!key) {
-      out.write(AmfType.STRING.getValue());
-    }
-    // Write 2 bytes indicating string length
-    Util.writeUnsignedInt16(out, byteValue.length);
-    // Write string
-    out.write(byteValue);
-  }
-
-  @Override
-  public void readFrom(InputStream in) throws IOException {
-    // Skip data type byte (we assume it's already read)
-    int length = Util.readUnsignedInt16(in);
-    size = 3 + length; // 1 + 2 + length
-    // Read string value
-    byte[] byteValue = new byte[length];
-    Util.readBytesUntilFull(in, byteValue);
-    value = new String(byteValue, "ASCII");
-  }
-
-  public static String readStringFrom(InputStream in, boolean isKey) throws IOException {
-    if (!isKey) {
-      // Read past the data type byte
-      in.read();
-    }
-    int length = Util.readUnsignedInt16(in);
-    // Read string value
-    byte[] byteValue = new byte[length];
-    Util.readBytesUntilFull(in, byteValue);
-    return new String(byteValue, "ASCII");
-  }
-
-  public static void writeStringTo(OutputStream out, String string, boolean isKey)
-      throws IOException {
-    // Strings are ASCII encoded
-    byte[] byteValue = string.getBytes("ASCII");
-    // Write the STRING data type definition (except if this String is used as a key)
-    if (!isKey) {
-      out.write(AmfType.STRING.getValue());
-    }
-    // Write 2 bytes indicating string length
-    Util.writeUnsignedInt16(out, byteValue.length);
-    // Write string
-    out.write(byteValue);
-  }
-
-  @Override
-  public int getSize() {
-    if (size == -1) {
-      try {
-        size = (isKey() ? 0 : 1) + 2 + value.getBytes("ASCII").length;
-      } catch (UnsupportedEncodingException ex) {
-        Log.e(TAG, "AmfString.getSize(): caught exception", ex);
-        throw new RuntimeException(ex);
-      }
-    }
-    return size;
-  }
-
-  /** @return the byte size of the resulting AMF string of the specified value */
-  public static int sizeOf(String string, boolean isKey) {
-    try {
-      int size = (isKey ? 0 : 1) + 2 + string.getBytes("ASCII").length;
-      return size;
-    } catch (UnsupportedEncodingException ex) {
-      Log.e(TAG, "AmfString.SizeOf(): caught exception", ex);
-      throw new RuntimeException(ex);
-    }
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfType.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfType.java
deleted file mode 100644
index 7549555..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.faucamp.simplertmp.amf;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * AMF0 data type enum
- *
- * @author francois
- */
-public enum AmfType {
-
-  /** Number (encoded as IEEE 64-bit double precision floating point number) */
-  NUMBER(0x00), /** Boolean (Encoded as a single byte of value 0x00 or 0x01) */
-  BOOLEAN(0x01), /** String (ASCII encoded) */
-  STRING(0x02), /** Object - set of key/value pairs */
-  OBJECT(0x03), NULL(0x05), UNDEFINED(0x06), ECMA_MAP(0x08), STRICT_ARRAY(0x0A);
-
-  private byte value;
-  private static final Map<Byte, AmfType> quickLookupMap = new HashMap<>();
-
-  static {
-    for (AmfType amfType : AmfType.values()) {
-      quickLookupMap.put(amfType.getValue(), amfType);
-    }
-  }
-
-  private AmfType(int intValue) {
-    this.value = (byte) intValue;
-  }
-
-  public byte getValue() {
-    return value;
-  }
-
-  public static AmfType valueOf(byte amfTypeByte) {
-    return quickLookupMap.get(amfTypeByte);
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfUndefined.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfUndefined.java
deleted file mode 100644
index 3be2179..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/amf/AmfUndefined.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.github.faucamp.simplertmp.amf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author leoma
- */
-public class AmfUndefined implements AmfData {
-
-  @Override
-  public void writeTo(OutputStream out) throws IOException {
-    out.write(AmfType.UNDEFINED.getValue());
-  }
-
-  @Override
-  public void readFrom(InputStream in) {
-    // Skip data type byte (we assume it's already read)
-  }
-
-  public static void writeUndefinedTo(OutputStream out) throws IOException {
-    out.write(AmfType.UNDEFINED.getValue());
-  }
-
-  @Override
-  public int getSize() {
-    return 1;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/io/ChunkStreamInfo.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/io/ChunkStreamInfo.java
deleted file mode 100644
index 8c52c3f..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/io/ChunkStreamInfo.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.github.faucamp.simplertmp.io;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import com.github.faucamp.simplertmp.Util;
-import com.github.faucamp.simplertmp.packets.RtmpHeader;
-
-/**
- * Chunk stream channel information
- *
- * @author francois, leo
- */
-public class ChunkStreamInfo {
-
-  public static final byte RTMP_CID_PROTOCOL_CONTROL = 0x02;
-  public static final byte RTMP_CID_OVER_CONNECTION = 0x03;
-  public static final byte RTMP_CID_OVER_CONNECTION2 = 0x04;
-  public static final byte RTMP_CID_OVER_STREAM = 0x05;
-  public static final byte RTMP_CID_VIDEO = 0x06;
-  public static final byte RTMP_CID_AUDIO = 0x07;
-  private RtmpHeader prevHeaderRx;
-  private RtmpHeader prevHeaderTx;
-  private static long sessionBeginTimestamp;
-  private long realLastTimestamp = System.nanoTime() / 1000000;  // Do not use wall time!
-  private ByteArrayOutputStream baos = new ByteArrayOutputStream(1024 * 128);
-
-  /** @return the previous header that was received on this channel, or <code>null</code> if no previous header was received */
-  public RtmpHeader prevHeaderRx() {
-    return prevHeaderRx;
-  }
-
-  /** Sets the previous header that was received on this channel, or <code>null</code> if no previous header was sent */
-  public void setPrevHeaderRx(RtmpHeader previousHeader) {
-    this.prevHeaderRx = previousHeader;
-  }
-
-  /** @return the previous header that was transmitted on this channel */
-  public RtmpHeader getPrevHeaderTx() {
-    return prevHeaderTx;
-  }
-
-  public boolean canReusePrevHeaderTx(RtmpHeader.MessageType forMessageType) {
-    return (prevHeaderTx != null && prevHeaderTx.getMessageType() == forMessageType);
-  }
-
-  /** Sets the previous header that was transmitted on this channel */
-  public void setPrevHeaderTx(RtmpHeader prevHeaderTx) {
-    this.prevHeaderTx = prevHeaderTx;
-  }
-
-  /** Sets the session beginning timestamp for all chunks */
-  public static void markSessionTimestampTx() {
-    sessionBeginTimestamp = System.nanoTime() / 1000000;
-  }
-
-  /** Utility method for calculating & synchronizing transmitted timestamps */
-  public long markAbsoluteTimestampTx() {
-    return System.nanoTime() / 1000000 - sessionBeginTimestamp;
-  }
-
-  /** Utility method for calculating & synchronizing transmitted timestamp deltas */
-  public long markDeltaTimestampTx() {
-    long currentTimestamp = System.nanoTime() / 1000000;
-    long diffTimestamp = currentTimestamp - realLastTimestamp;
-    realLastTimestamp = currentTimestamp;
-    return diffTimestamp;
-  }
-
-  /** @return <code>true</code> if all packet data has been stored, or <code>false</code> if not */
-  public boolean storePacketChunk(InputStream in, int chunkSize) throws IOException {
-    final int remainingBytes = prevHeaderRx.getPacketLength() - baos.size();
-    byte[] chunk = new byte[Math.min(remainingBytes, chunkSize)];
-    Util.readBytesUntilFull(in, chunk);
-    baos.write(chunk);
-    return (baos.size() == prevHeaderRx.getPacketLength());
-  }
-
-  public ByteArrayInputStream getStoredPacketInputStream() {
-    ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray());
-    baos.reset();
-    return bis;
-  }
-
-  /** Clears all currently-stored packet chunks (used when an ABORT packet is received) */
-  public void clearStoredChunks() {
-    baos.reset();
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpConnection.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpConnection.java
deleted file mode 100644
index 7125b26..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpConnection.java
+++ /dev/null
@@ -1,695 +0,0 @@
-package com.github.faucamp.simplertmp.io;
-
-import android.util.Log;
-
-import com.github.faucamp.simplertmp.RtmpPublisher;
-import com.github.faucamp.simplertmp.Util;
-import com.github.faucamp.simplertmp.amf.AmfMap;
-import com.github.faucamp.simplertmp.amf.AmfNull;
-import com.github.faucamp.simplertmp.amf.AmfNumber;
-import com.github.faucamp.simplertmp.amf.AmfObject;
-import com.github.faucamp.simplertmp.amf.AmfString;
-import com.github.faucamp.simplertmp.packets.Abort;
-import com.github.faucamp.simplertmp.packets.Audio;
-import com.github.faucamp.simplertmp.packets.Command;
-import com.github.faucamp.simplertmp.packets.Data;
-import com.github.faucamp.simplertmp.packets.Handshake;
-import com.github.faucamp.simplertmp.packets.RtmpPacket;
-import com.github.faucamp.simplertmp.packets.SetPeerBandwidth;
-import com.github.faucamp.simplertmp.packets.UserControl;
-import com.github.faucamp.simplertmp.packets.Video;
-import com.github.faucamp.simplertmp.packets.WindowAckSize;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.util.Random;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import net.ossrs.rtmp.BitrateManager;
-import net.ossrs.rtmp.ConnectCheckerRtmp;
-import net.ossrs.rtmp.CreateSSLSocket;
-
-/**
- * Main RTMP connection implementation class
- *
- * @author francois, leoma, pedro
- */
-public class RtmpConnection implements RtmpPublisher {
-
-  private static final String TAG = "RtmpConnection";
-  private static final Pattern rtmpUrlPattern =
-      Pattern.compile("^rtmps?://([^/:]+)(?::(\\d+))*/([^/]+)/?([^*]*)$");
-
-  private int port;
-  private String host;
-  private String appName;
-  private String streamName;
-  private String publishType;
-  private String swfUrl;
-  private String tcUrl;
-  private String pageUrl;
-  private Socket socket;
-  private RtmpSessionInfo rtmpSessionInfo;
-  private RtmpDecoder rtmpDecoder;
-  private BufferedInputStream inputStream;
-  private BufferedOutputStream outputStream;
-  private Thread rxPacketHandler;
-  private volatile boolean connected = false;
-  private volatile boolean publishPermitted = false;
-  private final Object connectingLock = new Object();
-  private final Object publishLock = new Object();
-  private int currentStreamId = 0;
-  private int transactionIdCounter = 0;
-  private int videoWidth;
-  private int videoHeight;
-  private ConnectCheckerRtmp connectCheckerRtmp;
-  //for secure transport
-  private boolean tlsEnabled;
-  //for auth
-  private String user = null;
-  private String password = null;
-  private String salt = null;
-  private String challenge = null;
-  private String opaque = null;
-  private boolean onAuth = false;
-  private String netConnectionDescription;
-  private BitrateManager bitrateManager;
-
-  public RtmpConnection(ConnectCheckerRtmp connectCheckerRtmp) {
-    this.connectCheckerRtmp = connectCheckerRtmp;
-    bitrateManager = new BitrateManager(connectCheckerRtmp);
-  }
-
-  private void handshake(InputStream in, OutputStream out) throws IOException {
-    Handshake handshake = new Handshake();
-    handshake.writeC0(out);
-    handshake.writeC1(out); // Write C1 without waiting for S0
-    out.flush();
-    handshake.readS0(in);
-    handshake.readS1(in);
-    handshake.writeC2(out);
-    out.flush();
-    handshake.readS2(in);
-  }
-
-  @Override
-  public boolean connect(String url) {
-    Matcher rtmpMatcher = rtmpUrlPattern.matcher(url);
-    if (rtmpMatcher.matches()) {
-      tlsEnabled = rtmpMatcher.group(0).startsWith("rtmps");
-    } else {
-      connectCheckerRtmp.onConnectionFailedRtmp(
-          "Endpoint malformed, should be: rtmp://ip:port/appname/streamname");
-      return false;
-    }
-
-    swfUrl = "";
-    pageUrl = "";
-    host = rtmpMatcher.group(1);
-    String portStr = rtmpMatcher.group(2);
-    port = portStr != null ? Integer.parseInt(portStr) : 1935;
-    appName = rtmpMatcher.group(3);
-    streamName = rtmpMatcher.group(4);
-    tcUrl = rtmpMatcher.group(0).substring(0, rtmpMatcher.group(0).length() - streamName.length());
-
-    // socket connection
-    Log.d(TAG, "connect() called. Host: "
-        + host
-        + ", port: "
-        + port
-        + ", appName: "
-        + appName
-        + ", publishPath: "
-        + streamName);
-    rtmpSessionInfo = new RtmpSessionInfo();
-    rtmpDecoder = new RtmpDecoder(rtmpSessionInfo);
-    try {
-      if (!tlsEnabled) {
-        socket = new Socket();
-        SocketAddress socketAddress = new InetSocketAddress(host, port);
-        socket.connect(socketAddress, 5000);
-      } else {
-        socket = CreateSSLSocket.createSSlSocket(host, port);
-        if (socket == null) throw new IOException("Socket creation failed");
-      }
-      inputStream = new BufferedInputStream(socket.getInputStream());
-      outputStream = new BufferedOutputStream(socket.getOutputStream());
-      Log.d(TAG, "connect(): socket connection established, doing handhake...");
-      handshake(inputStream, outputStream);
-      Log.d(TAG, "connect(): handshake done");
-    } catch (IOException e) {
-      Log.e(TAG, "Error", e);
-      connectCheckerRtmp.onConnectionFailedRtmp("Connect error, " + e.getMessage());
-      return false;
-    }
-
-    // Start the "main" handling thread
-    rxPacketHandler = new Thread(new Runnable() {
-
-      @Override
-      public void run() {
-        Log.d(TAG, "starting main rx handler loop");
-        handleRxPacketLoop();
-      }
-    });
-    rxPacketHandler.start();
-    return rtmpConnect();
-  }
-
-  private boolean rtmpConnect() {
-    if (connected) {
-      connectCheckerRtmp.onConnectionFailedRtmp("Already connected");
-      return false;
-    }
-
-    if (user != null && password != null) {
-      sendConnect("?authmod=adobe&user=" + user);
-    } else {
-      sendConnect("");
-    }
-    synchronized (connectingLock) {
-      try {
-        connectingLock.wait(5000);
-      } catch (InterruptedException ex) {
-        // do nothing
-      }
-    }
-    if (!connected) {
-      shutdown(true);
-      connectCheckerRtmp.onConnectionFailedRtmp("Fail to connect, time out");
-    }
-    return connected;
-  }
-
-  private void sendConnect(String user) {
-    ChunkStreamInfo.markSessionTimestampTx();
-    Log.d(TAG, "rtmpConnect(): Building 'connect' invoke packet");
-    ChunkStreamInfo chunkStreamInfo =
-        rtmpSessionInfo.getChunkStreamInfo(ChunkStreamInfo.RTMP_CID_OVER_STREAM);
-    Command invoke = new Command("connect", ++transactionIdCounter, chunkStreamInfo);
-    invoke.getHeader().setMessageStreamId(0);
-    AmfObject args = new AmfObject();
-    args.setProperty("app", appName + user);
-    args.setProperty("flashVer", "FMLE/3.0 (compatible; Lavf57.56.101)");
-    args.setProperty("swfUrl", swfUrl);
-    args.setProperty("tcUrl", tcUrl + user);
-    args.setProperty("fpad", false);
-    args.setProperty("capabilities", 239);
-    args.setProperty("audioCodecs", 3191);
-    args.setProperty("videoCodecs", 252);
-    args.setProperty("videoFunction", 1);
-    args.setProperty("pageUrl", pageUrl);
-    args.setProperty("objectEncoding", 0);
-    invoke.addData(args);
-    sendRtmpPacket(invoke);
-  }
-
-  private String getAuthUserResult(String user, String password, String salt,
-      String challenge, String opaque) {
-    String challenge2 = String.format("%08x", new Random().nextInt());
-    String response = Util.stringToMD5BASE64(user + salt + password);
-    if (!opaque.isEmpty()) {
-      response += opaque;
-    } else if (!challenge.isEmpty()) {
-      response += challenge;
-    }
-    response = Util.stringToMD5BASE64(response + challenge2);
-    String result =
-        "?authmod=adobe&user=" + user + "&challenge=" + challenge2 + "&response=" + response;
-    if (!opaque.isEmpty()) {
-      result += "&opaque=" + opaque;
-    }
-    return result;
-  }
-
-  @Override
-  public boolean publish(String type) {
-    if (type == null) {
-      connectCheckerRtmp.onConnectionFailedRtmp("Null publish type");
-      return false;
-    }
-    publishType = type;
-    return createStream();
-  }
-
-  private boolean createStream() {
-    if (!connected || currentStreamId != 0) {
-      connectCheckerRtmp.onConnectionFailedRtmp(
-          "Create stream failed, connected= " + connected + ", StreamId= " + currentStreamId);
-      return false;
-    }
-    netConnectionDescription = null;
-
-    Log.d(TAG, "createStream(): Sending releaseStream command...");
-    // transactionId == 2
-    Command releaseStream = new Command("releaseStream", ++transactionIdCounter);
-    releaseStream.getHeader().setChunkStreamId(ChunkStreamInfo.RTMP_CID_OVER_STREAM);
-    releaseStream.addData(new AmfNull());  // command object: null for "createStream"
-    releaseStream.addData(streamName);  // command object: null for "releaseStream"
-    sendRtmpPacket(releaseStream);
-
-    Log.d(TAG, "createStream(): Sending FCPublish command...");
-    // transactionId == 3
-    Command FCPublish = new Command("FCPublish", ++transactionIdCounter);
-    FCPublish.getHeader().setChunkStreamId(ChunkStreamInfo.RTMP_CID_OVER_STREAM);
-    FCPublish.addData(new AmfNull());  // command object: null for "FCPublish"
-    FCPublish.addData(streamName);
-    sendRtmpPacket(FCPublish);
-
-    Log.d(TAG, "createStream(): Sending createStream command...");
-    ChunkStreamInfo chunkStreamInfo =
-        rtmpSessionInfo.getChunkStreamInfo(ChunkStreamInfo.RTMP_CID_OVER_CONNECTION);
-    // transactionId == 4
-    Command createStream = new Command("createStream", ++transactionIdCounter, chunkStreamInfo);
-    createStream.addData(new AmfNull());  // command object: null for "createStream"
-    sendRtmpPacket(createStream);
-
-    // Waiting for "NetStream.Publish.Start" response.
-    synchronized (publishLock) {
-      try {
-        publishLock.wait(5000);
-      } catch (InterruptedException ex) {
-        // do nothing
-      }
-    }
-    if (!publishPermitted) {
-      shutdown(true);
-      if (netConnectionDescription != null && !netConnectionDescription.isEmpty()) {
-        connectCheckerRtmp.onConnectionFailedRtmp(netConnectionDescription);
-      } else {
-        connectCheckerRtmp.onConnectionFailedRtmp(
-            "Error configure stream, publish permitted failed");
-      }
-    }
-    return publishPermitted;
-  }
-
-  private void fmlePublish() {
-    if (!connected || currentStreamId == 0) {
-      Log.e(TAG, "fmlePublish failed");
-      return;
-    }
-
-    Log.d(TAG, "fmlePublish(): Sending publish command...");
-    Command publish = new Command("publish", 0);
-    publish.getHeader().setChunkStreamId(ChunkStreamInfo.RTMP_CID_OVER_STREAM);
-    publish.getHeader().setMessageStreamId(currentStreamId);
-    publish.addData(new AmfNull());  // command object: null for "publish"
-    publish.addData(streamName);
-    publish.addData(publishType);
-    sendRtmpPacket(publish);
-  }
-
-  private void onMetaData() {
-    if (!connected || currentStreamId == 0) {
-      Log.e(TAG, "onMetaData failed");
-      return;
-    }
-
-    Log.d(TAG, "onMetaData(): Sending empty onMetaData...");
-    Data metadata = new Data("@setDataFrame");
-    metadata.getHeader().setMessageStreamId(currentStreamId);
-    metadata.addData("onMetaData");
-    AmfMap ecmaArray = new AmfMap();
-    ecmaArray.setProperty("duration", 0);
-    ecmaArray.setProperty("width", videoWidth);
-    ecmaArray.setProperty("height", videoHeight);
-    ecmaArray.setProperty("videocodecid", 7);
-    ecmaArray.setProperty("framerate", 30);
-    ecmaArray.setProperty("videodatarate", 0);
-    // @see FLV video_file_format_spec_v10_1.pdf
-    // According to E.4.2.1 AUDIODATA
-    // "If the SoundFormat indicates AAC, the SoundType should be 1 (stereo) and the SoundRate should be 3 (44 kHz).
-    // However, this does not mean that AAC audio in FLV is always stereo, 44 kHz data. Instead, the Flash Player ignores
-    // these values and extracts the channel and sample rate data is encoded in the AAC bit stream."
-    ecmaArray.setProperty("audiocodecid", 10);
-    ecmaArray.setProperty("audiosamplerate", 44100);
-    ecmaArray.setProperty("audiosamplesize", 16);
-    ecmaArray.setProperty("audiodatarate", 0);
-    ecmaArray.setProperty("stereo", true);
-    ecmaArray.setProperty("filesize", 0);
-    metadata.addData(ecmaArray);
-    sendRtmpPacket(metadata);
-  }
-
-  @Override
-  public void close() {
-    if (socket != null) {
-      closeStream();
-    }
-    shutdown(true);
-  }
-
-  private void closeStream() {
-    if (!connected || currentStreamId == 0 || !publishPermitted) {
-      Log.e(TAG, "closeStream failed");
-      return;
-    }
-    Log.d(TAG, "closeStream(): setting current stream ID to 0");
-    Command closeStream = new Command("closeStream", 0);
-    closeStream.getHeader().setChunkStreamId(ChunkStreamInfo.RTMP_CID_OVER_STREAM);
-    closeStream.getHeader().setMessageStreamId(currentStreamId);
-    closeStream.addData(new AmfNull());
-    sendRtmpPacket(closeStream);
-  }
-
-  private synchronized void shutdown(boolean r) {
-    if (socket != null) {
-      try {
-        // It will raise EOFException in handleRxPacketThread
-        socket.shutdownInput();
-        // It will raise SocketException in sendRtmpPacket
-        socket.shutdownOutput();
-      } catch (IOException | UnsupportedOperationException e) {
-        Log.e(TAG, "Shutdown socket", e);
-      }
-
-      // shutdown rxPacketHandler
-      if (rxPacketHandler != null) {
-        rxPacketHandler.interrupt();
-        try {
-          rxPacketHandler.join(100);
-        } catch (InterruptedException ie) {
-          rxPacketHandler.interrupt();
-        }
-        rxPacketHandler = null;
-      }
-
-      // shutdown socket as well as its input and output stream
-      try {
-        socket.close();
-        Log.d(TAG, "socket closed");
-      } catch (IOException ex) {
-        Log.e(TAG, "shutdown(): failed to close socket", ex);
-      }
-    }
-
-    if (r) {
-      reset();
-    }
-  }
-
-  private void reset() {
-    connected = false;
-    publishPermitted = false;
-    netConnectionDescription = null;
-    tcUrl = null;
-    swfUrl = null;
-    pageUrl = null;
-    appName = null;
-    streamName = null;
-    publishType = null;
-    currentStreamId = 0;
-    transactionIdCounter = 0;
-    socket = null;
-    rtmpSessionInfo = null;
-    user = null;
-    password = null;
-    salt = null;
-    challenge = null;
-    opaque = null;
-  }
-
-  @Override
-  public void publishAudioData(byte[] data, int size, int dts) {
-    if (data == null
-        || data.length == 0
-        || dts < 0
-        || !connected
-        || currentStreamId == 0
-        || !publishPermitted) {
-      return;
-    }
-    Audio audio = new Audio();
-    audio.setData(data, size);
-    audio.getHeader().setAbsoluteTimestamp(dts);
-    audio.getHeader().setMessageStreamId(currentStreamId);
-    sendRtmpPacket(audio);
-    //bytes to bits
-    bitrateManager.calculateBitrate(size * 8);
-  }
-
-  @Override
-  public void publishVideoData(byte[] data, int size, int dts) {
-    if (data == null
-        || data.length == 0
-        || dts < 0
-        || !connected
-        || currentStreamId == 0
-        || !publishPermitted) {
-      return;
-    }
-    Video video = new Video();
-    video.setData(data, size);
-    video.getHeader().setAbsoluteTimestamp(dts);
-    video.getHeader().setMessageStreamId(currentStreamId);
-    sendRtmpPacket(video);
-    //bytes to bits
-    bitrateManager.calculateBitrate(size * 8);
-  }
-
-  private void sendRtmpPacket(RtmpPacket rtmpPacket) {
-    try {
-      ChunkStreamInfo chunkStreamInfo =
-          rtmpSessionInfo.getChunkStreamInfo(rtmpPacket.getHeader().getChunkStreamId());
-      chunkStreamInfo.setPrevHeaderTx(rtmpPacket.getHeader());
-      if (!(rtmpPacket instanceof Video || rtmpPacket instanceof Audio)) {
-        rtmpPacket.getHeader()
-            .setAbsoluteTimestamp((int) chunkStreamInfo.markAbsoluteTimestampTx());
-      }
-      rtmpPacket.writeTo(outputStream, rtmpSessionInfo.getTxChunkSize(), chunkStreamInfo);
-      Log.d(TAG,
-          "wrote packet: " + rtmpPacket + ", size: " + rtmpPacket.getHeader().getPacketLength());
-      if (rtmpPacket instanceof Command) {
-        rtmpSessionInfo.addInvokedCommand(((Command) rtmpPacket).getTransactionId(),
-            ((Command) rtmpPacket).getCommandName());
-      }
-      outputStream.flush();
-    } catch (SocketException ignored) {
-    } catch (IOException ioe) {
-      connectCheckerRtmp.onConnectionFailedRtmp("Error send packet: " + ioe.getMessage());
-      Log.e(TAG, "Caught IOException during write loop, shutting down: " + ioe.getMessage());
-      Thread.currentThread().interrupt();
-    }
-  }
-
-  private void handleRxPacketLoop() {
-    // Handle all queued received RTMP packets
-    while (!Thread.interrupted()) {
-      try {
-        // It will be blocked when no data in input stream buffer
-        RtmpPacket rtmpPacket = rtmpDecoder.readPacket(inputStream);
-        if (rtmpPacket != null) {
-          //Log.d(TAG, "handleRxPacketLoop(): RTMP rx packet message type: " + rtmpPacket.getHeader().getMessageType());
-          switch (rtmpPacket.getHeader().getMessageType()) {
-            case ABORT:
-              rtmpSessionInfo.getChunkStreamInfo(((Abort) rtmpPacket).getChunkStreamId())
-                  .clearStoredChunks();
-              break;
-            case USER_CONTROL_MESSAGE:
-              UserControl user = (UserControl) rtmpPacket;
-              switch (user.getType()) {
-                case STREAM_BEGIN:
-                  break;
-                case PING_REQUEST:
-                  ChunkStreamInfo channelInfo =
-                      rtmpSessionInfo.getChunkStreamInfo(ChunkStreamInfo.RTMP_CID_PROTOCOL_CONTROL);
-                  Log.d(TAG, "handleRxPacketLoop(): Sending PONG reply..");
-                  UserControl pong = new UserControl(user, channelInfo);
-                  sendRtmpPacket(pong);
-                  break;
-                case STREAM_EOF:
-                  Log.i(TAG, "handleRxPacketLoop(): Stream EOF reached, closing RTMP writer...");
-                  break;
-                default:
-                  // Ignore...
-                  break;
-              }
-              break;
-            case WINDOW_ACKNOWLEDGEMENT_SIZE:
-              WindowAckSize windowAckSize = (WindowAckSize) rtmpPacket;
-              int size = windowAckSize.getAcknowledgementWindowSize();
-              Log.d(TAG, "handleRxPacketLoop(): Setting acknowledgement window size: " + size);
-              rtmpSessionInfo.setAcknowledgmentWindowSize(size);
-              break;
-            case SET_PEER_BANDWIDTH:
-              rtmpSessionInfo.setAcknowledgmentWindowSize(socket.getSendBufferSize());
-              int acknowledgementWindowsize = rtmpSessionInfo.getAcknowledgementWindowSize();
-              ChunkStreamInfo chunkStreamInfo =
-                  rtmpSessionInfo.getChunkStreamInfo(ChunkStreamInfo.RTMP_CID_PROTOCOL_CONTROL);
-              Log.d(TAG, "handleRxPacketLoop(): Send acknowledgement window size: "
-                  + acknowledgementWindowsize);
-              sendRtmpPacket(new WindowAckSize(acknowledgementWindowsize, chunkStreamInfo));
-              // Set socket option. This line could produce bps calculation problems.
-              socket.setSendBufferSize(acknowledgementWindowsize);
-              break;
-            case COMMAND_AMF0:
-              handleRxInvoke((Command) rtmpPacket);
-              break;
-            default:
-              Log.w(TAG, "handleRxPacketLoop(): Not handling unimplemented/unknown packet of type: "
-                  + rtmpPacket.getHeader().getMessageType());
-              break;
-          }
-        }
-      } catch (EOFException eof) {
-        Thread.currentThread().interrupt();
-      } catch (IOException e) {
-        connectCheckerRtmp.onConnectionFailedRtmp("Error reading packet: " + e.getMessage());
-        Log.e(TAG, "Caught SocketException while reading/decoding packet, shutting down: "
-            + e.getMessage());
-        Thread.currentThread().interrupt();
-      }
-    }
-  }
-
-  private void handleRxInvoke(Command invoke) {
-    String commandName = invoke.getCommandName();
-    switch (commandName) {
-      case "_error":
-        try {
-          String description = ((AmfString) ((AmfObject) invoke.getData().get(1)).getProperty(
-              "description")).getValue();
-          Log.i(TAG, description);
-          if (description.contains("reason=authfailed")) {
-            connectCheckerRtmp.onAuthErrorRtmp();
-            connected = false;
-            synchronized (connectingLock) {
-              connectingLock.notifyAll();
-            }
-          } else if (user != null
-              && password != null
-              && description.contains("challenge=")
-              && description.contains("salt=")) {
-            onAuth = true;
-            try {
-              shutdown(false);
-            } catch (Exception e) {
-              e.printStackTrace();
-            }
-            rtmpSessionInfo = new RtmpSessionInfo();
-            rtmpDecoder = new RtmpDecoder(rtmpSessionInfo);
-            if (!tlsEnabled) {
-              socket = new Socket(host, port);
-            } else {
-              socket = CreateSSLSocket.createSSlSocket(host, port);
-              if (socket == null) throw new IOException("Socket creation failed");
-            }
-            inputStream = new BufferedInputStream(socket.getInputStream());
-            outputStream = new BufferedOutputStream(socket.getOutputStream());
-            Log.d(TAG, "connect(): socket connection established, doing handshake...");
-            salt = Util.getSalt(description);
-            challenge = Util.getChallenge(description);
-            opaque = Util.getOpaque(description);
-            handshake(inputStream, outputStream);
-            rxPacketHandler = new Thread(new Runnable() {
-              @Override
-              public void run() {
-                handleRxPacketLoop();
-              }
-            });
-            rxPacketHandler.start();
-            sendConnect(getAuthUserResult(user, password, salt, challenge, opaque));
-          } else if (description.contains("code=403") && user == null || password == null) {
-            connectCheckerRtmp.onAuthErrorRtmp();
-            connected = false;
-            synchronized (connectingLock) {
-              connectingLock.notifyAll();
-            }
-          } else {
-            connectCheckerRtmp.onConnectionFailedRtmp(description);
-            connected = false;
-            synchronized (connectingLock) {
-              connectingLock.notifyAll();
-            }
-          }
-        } catch (Exception e) {
-          connectCheckerRtmp.onConnectionFailedRtmp(e.getMessage());
-          connected = false;
-          synchronized (connectingLock) {
-            connectingLock.notifyAll();
-          }
-        }
-        break;
-      case "_result":
-        // This is the result of one of the methods invoked by us
-        String method = rtmpSessionInfo.takeInvokedCommand(invoke.getTransactionId());
-
-        Log.i(TAG, "handleRxInvoke: Got result for invoked method: " + method);
-        if ("connect".equals(method)) {
-          if (onAuth) {
-            connectCheckerRtmp.onAuthSuccessRtmp();
-            onAuth = false;
-          }
-          // Capture server ip/pid/id information if any
-          // We can now send createStream commands
-          connected = true;
-          synchronized (connectingLock) {
-            connectingLock.notifyAll();
-          }
-        } else if ("createStream".contains(method)) {
-          // Get stream id
-          currentStreamId = (int) ((AmfNumber) invoke.getData().get(1)).getValue();
-          Log.d(TAG, "handleRxInvoke(): Stream ID to publish: " + currentStreamId);
-          if (streamName != null && publishType != null) {
-            fmlePublish();
-          }
-        } else if ("releaseStream".contains(method)) {
-          Log.d(TAG, "handleRxInvoke(): 'releaseStream'");
-        } else if ("FCPublish".contains(method)) {
-          Log.d(TAG, "handleRxInvoke(): 'FCPublish'");
-        } else {
-          Log.w(TAG, "handleRxInvoke(): '_result' message received for unknown method: " + method);
-        }
-        break;
-      case "onBWDone":
-        Log.d(TAG, "handleRxInvoke(): 'onBWDone'");
-        break;
-      case "onFCPublish":
-        Log.d(TAG, "handleRxInvoke(): 'onFCPublish'");
-        break;
-      case "onStatus":
-        String code =
-            ((AmfString) ((AmfObject) invoke.getData().get(1)).getProperty("code")).getValue();
-        Log.d(TAG, "handleRxInvoke(): onStatus " + code);
-        if (code.equals("NetStream.Publish.Start")) {
-          onMetaData();
-          // We can now publish AV data
-          publishPermitted = true;
-          synchronized (publishLock) {
-            publishLock.notifyAll();
-          }
-        } else if (code.equals("NetConnection.Connect.Rejected")) {
-          netConnectionDescription = ((AmfString) ((AmfObject) invoke.getData().get(1)).getProperty(
-              "description")).getValue();
-          publishPermitted = false;
-          synchronized (publishLock) {
-            publishLock.notifyAll();
-          }
-        }
-        break;
-      default:
-        Log.e(TAG, "handleRxInvoke(): Unknown/unhandled server invoke: " + invoke);
-        break;
-    }
-  }
-
-  @Override
-  public void setVideoResolution(int width, int height) {
-    videoWidth = width;
-    videoHeight = height;
-  }
-
-  @Override
-  public void setAuthorization(String user, String password) {
-    this.user = user;
-    this.password = password;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpDecoder.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpDecoder.java
deleted file mode 100644
index fd82cf6..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpDecoder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.github.faucamp.simplertmp.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import android.util.Log;
-
-import com.github.faucamp.simplertmp.packets.Abort;
-import com.github.faucamp.simplertmp.packets.Audio;
-import com.github.faucamp.simplertmp.packets.Command;
-import com.github.faucamp.simplertmp.packets.Data;
-import com.github.faucamp.simplertmp.packets.RtmpHeader;
-import com.github.faucamp.simplertmp.packets.RtmpPacket;
-import com.github.faucamp.simplertmp.packets.SetChunkSize;
-import com.github.faucamp.simplertmp.packets.SetPeerBandwidth;
-import com.github.faucamp.simplertmp.packets.UserControl;
-import com.github.faucamp.simplertmp.packets.Video;
-import com.github.faucamp.simplertmp.packets.WindowAckSize;
-import com.github.faucamp.simplertmp.packets.Acknowledgement;
-
-/**
- * @author francois
- */
-public class RtmpDecoder {
-
-  private static final String TAG = "RtmpDecoder";
-
-  private RtmpSessionInfo rtmpSessionInfo;
-
-  public RtmpDecoder(RtmpSessionInfo rtmpSessionInfo) {
-    this.rtmpSessionInfo = rtmpSessionInfo;
-  }
-
-  public RtmpPacket readPacket(InputStream in) throws IOException {
-
-    RtmpHeader header = RtmpHeader.readHeader(in, rtmpSessionInfo);
-    // Log.d(TAG, "readPacket(): header.messageType: " + header.getMessageType());
-
-    ChunkStreamInfo chunkStreamInfo = rtmpSessionInfo.getChunkStreamInfo(header.getChunkStreamId());
-    chunkStreamInfo.setPrevHeaderRx(header);
-
-    if (header.getPacketLength() > rtmpSessionInfo.getRxChunkSize()) {
-      // If the packet consists of more than one chunk,
-      // store the chunks in the chunk stream until everything is read
-      if (!chunkStreamInfo.storePacketChunk(in, rtmpSessionInfo.getRxChunkSize())) {
-        // return null because of incomplete packet
-        return null;
-      } else {
-        // stored chunks complete packet, get the input stream of the chunk stream
-        in = chunkStreamInfo.getStoredPacketInputStream();
-      }
-    }
-
-    RtmpPacket rtmpPacket;
-    switch (header.getMessageType()) {
-      case SET_CHUNK_SIZE:
-        SetChunkSize setChunkSize = new SetChunkSize(header);
-        setChunkSize.readBody(in);
-        Log.d(TAG, "readPacket(): Setting chunk size to: " + setChunkSize.getChunkSize());
-        rtmpSessionInfo.setRxChunkSize(setChunkSize.getChunkSize());
-        return null;
-      case ABORT:
-        rtmpPacket = new Abort(header);
-        break;
-      case USER_CONTROL_MESSAGE:
-        rtmpPacket = new UserControl(header);
-        break;
-      case WINDOW_ACKNOWLEDGEMENT_SIZE:
-        rtmpPacket = new WindowAckSize(header);
-        break;
-      case SET_PEER_BANDWIDTH:
-        rtmpPacket = new SetPeerBandwidth(header);
-        break;
-      case AUDIO:
-        rtmpPacket = new Audio(header);
-        break;
-      case VIDEO:
-        rtmpPacket = new Video(header);
-        break;
-      case COMMAND_AMF0:
-        rtmpPacket = new Command(header);
-        break;
-      case DATA_AMF0:
-        rtmpPacket = new Data(header);
-        break;
-      case ACKNOWLEDGEMENT:
-        rtmpPacket = new Acknowledgement(header);
-        break;
-      default:
-        throw new IOException(
-            "No packet body implementation for message type: " + header.getMessageType());
-    }
-    rtmpPacket.readBody(in);
-    return rtmpPacket;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpSessionInfo.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpSessionInfo.java
deleted file mode 100644
index aa32cc7..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/io/RtmpSessionInfo.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.github.faucamp.simplertmp.io;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.github.faucamp.simplertmp.packets.RtmpPacket;
-
-/**
- * @author francois
- */
-public class RtmpSessionInfo {
-
-  /** The (total) number of bytes read for this window (resets to 0 if the agreed-upon RTMP window acknowledgement size is reached) */
-  private int windowBytesRead;
-  /** The window acknowledgement size for this RTMP session, in bytes; default to max to avoid unnecessary "Acknowledgment" messages from being sent */
-  private int acknowledgementWindowSize = Integer.MAX_VALUE;
-  /** Used internally to store the total number of bytes read (used when sending Acknowledgement messages) */
-  private int totalBytesRead = 0;
-
-  /** Default chunk size is 128 bytes */
-  private int rxChunkSize = 128;
-  private int txChunkSize = 128;
-  private Map<Integer, ChunkStreamInfo> chunkChannels = new HashMap<>();
-  private Map<Integer, String> invokedMethods = new ConcurrentHashMap<>();
-
-  public ChunkStreamInfo getChunkStreamInfo(int chunkStreamId) {
-    ChunkStreamInfo chunkStreamInfo = chunkChannels.get(chunkStreamId);
-    if (chunkStreamInfo == null) {
-      chunkStreamInfo = new ChunkStreamInfo();
-      chunkChannels.put(chunkStreamId, chunkStreamInfo);
-    }
-    return chunkStreamInfo;
-  }
-
-  public String takeInvokedCommand(int transactionId) {
-    return invokedMethods.remove(transactionId);
-  }
-
-  public String addInvokedCommand(int transactionId, String commandName) {
-    return invokedMethods.put(transactionId, commandName);
-  }
-
-  public int getRxChunkSize() {
-    return rxChunkSize;
-  }
-
-  public void setRxChunkSize(int chunkSize) {
-    this.rxChunkSize = chunkSize;
-  }
-
-  public int getTxChunkSize() {
-    return txChunkSize;
-  }
-
-  public void setTxChunkSize(int chunkSize) {
-    this.txChunkSize = chunkSize;
-  }
-
-  public int getAcknowledgementWindowSize() {
-    return acknowledgementWindowSize;
-  }
-
-  public void setAcknowledgmentWindowSize(int acknowledgementWindowSize) {
-    this.acknowledgementWindowSize = acknowledgementWindowSize;
-  }
-
-  /**
-   * Add the specified amount of bytes to the total number of bytes read for this RTMP window;
-   *
-   * @param numBytes the number of bytes to add
-   * @return <code>true</code> if an "acknowledgement" packet should be sent, <code>false</code> otherwise
-   */
-  public final void addToWindowBytesRead(final int numBytes, final RtmpPacket packet)
-      throws WindowAckRequired {
-    windowBytesRead += numBytes;
-    totalBytesRead += numBytes;
-    if (windowBytesRead >= acknowledgementWindowSize) {
-      windowBytesRead -= acknowledgementWindowSize;
-      throw new WindowAckRequired(totalBytesRead, packet);
-    }
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/io/WindowAckRequired.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/io/WindowAckRequired.java
deleted file mode 100644
index 4431f36..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/io/WindowAckRequired.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.github.faucamp.simplertmp.io;
-
-import com.github.faucamp.simplertmp.packets.RtmpPacket;
-
-/**
- * Thrown by RTMP read thread when an Acknowledgement packet needs to be sent
- * to acknowledge the RTMP window size. It contains the RTMP packet that was
- * read when this event occurred (if any).
- *
- * @author francois
- */
-public class WindowAckRequired extends Exception {
-
-  private RtmpPacket rtmpPacket;
-  private int bytesRead;
-
-  /**
-   * Used when the window acknowledgement size was reached, whilst fully reading
-   * an RTMP packet or not. If a packet is present, it should still be handled as if it was returned
-   * by the RTMP decoder.
-   *
-   * @param bytesReadThusFar The (total) number of bytes received so far
-   * @param rtmpPacket The packet that was read (and thus should be handled), can be <code>null</code>
-   */
-  public WindowAckRequired(int bytesReadThusFar, RtmpPacket rtmpPacket) {
-    this.rtmpPacket = rtmpPacket;
-    this.bytesRead = bytesReadThusFar;
-  }
-
-  /**
-   * @return The RTMP packet that should be handled, or <code>null</code> if no full packet is available
-   */
-  public RtmpPacket getRtmpPacket() {
-    return rtmpPacket;
-  }
-
-  public int getBytesRead() {
-    return bytesRead;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Abort.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Abort.java
deleted file mode 100644
index 520f184..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Abort.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import com.github.faucamp.simplertmp.Util;
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-
-/**
- * A "Abort" RTMP control message, received on chunk stream ID 2 (control channel)
- *
- * @author francois
- */
-public class Abort extends RtmpPacket {
-
-  private int chunkStreamId;
-
-  public Abort(RtmpHeader header) {
-    super(header);
-  }
-
-  public Abort(int chunkStreamId) {
-    super(new RtmpHeader(RtmpHeader.ChunkType.TYPE_1_RELATIVE_LARGE,
-        ChunkStreamInfo.RTMP_CID_PROTOCOL_CONTROL, RtmpHeader.MessageType.SET_CHUNK_SIZE));
-    this.chunkStreamId = chunkStreamId;
-  }
-
-  /** @return the ID of the chunk stream to be aborted */
-  public int getChunkStreamId() {
-    return chunkStreamId;
-  }
-
-  /** Sets the ID of the chunk stream to be aborted */
-  public void setChunkStreamId(int chunkStreamId) {
-    this.chunkStreamId = chunkStreamId;
-  }
-
-  @Override
-  public void readBody(InputStream in) throws IOException {
-    // Value is received in the 4 bytes of the body
-    chunkStreamId = Util.readUnsignedInt32(in);
-  }
-
-  @Override
-  protected byte[] array() {
-    return null;
-  }
-
-  @Override
-  protected int size() {
-    return 0;
-  }
-
-  @Override
-  protected void writeBody(OutputStream out) throws IOException {
-    Util.writeUnsignedInt32(out, chunkStreamId);
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Acknowledgement.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Acknowledgement.java
deleted file mode 100644
index 9f13b53..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Acknowledgement.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import com.github.faucamp.simplertmp.Util;
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-
-/**
- * (Window) Acknowledgement
- *
- * The client or the server sends the acknowledgment to the peer after
- * receiving bytes equal to the window size. The window size is the
- * maximum number of bytes that the sender sends without receiving
- * acknowledgment from the receiver. The server sends the window size to
- * the client after application connects. This message specifies the
- * sequence number, which is the number of the bytes received so far.
- *
- * @author francois
- */
-public class Acknowledgement extends RtmpPacket {
-
-  private int sequenceNumber;
-
-  public Acknowledgement(RtmpHeader header) {
-    super(header);
-  }
-
-  public Acknowledgement(int numBytesReadThusFar) {
-    super(
-        new RtmpHeader(RtmpHeader.ChunkType.TYPE_0_FULL, ChunkStreamInfo.RTMP_CID_PROTOCOL_CONTROL,
-            RtmpHeader.MessageType.ACKNOWLEDGEMENT));
-    this.sequenceNumber = numBytesReadThusFar;
-  }
-
-  public int getAcknowledgementWindowSize() {
-    return sequenceNumber;
-  }
-
-  /** @return the sequence number, which is the number of the bytes received so far */
-  public int getSequenceNumber() {
-    return sequenceNumber;
-  }
-
-  /** Sets the sequence number, which is the number of the bytes received so far */
-  public void setSequenceNumber(int numBytesRead) {
-    this.sequenceNumber = numBytesRead;
-  }
-
-  @Override
-  public void readBody(InputStream in) throws IOException {
-    sequenceNumber = Util.readUnsignedInt32(in);
-  }
-
-  @Override
-  protected void writeBody(OutputStream out) throws IOException {
-    Util.writeUnsignedInt32(out, sequenceNumber);
-  }
-
-  @Override
-  protected byte[] array() {
-    return null;
-  }
-
-  @Override
-  protected int size() {
-    return 0;
-  }
-
-  @Override
-  public String toString() {
-    return "RTMP Acknowledgment (sequence number: " + sequenceNumber + ")";
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Audio.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Audio.java
deleted file mode 100644
index b436a7e..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Audio.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-
-/**
- * Audio data packet
- *
- * @author francois
- */
-public class Audio extends ContentData {
-
-  public Audio(RtmpHeader header) {
-    super(header);
-  }
-
-  public Audio() {
-    super(new RtmpHeader(RtmpHeader.ChunkType.TYPE_0_FULL, ChunkStreamInfo.RTMP_CID_AUDIO,
-        RtmpHeader.MessageType.AUDIO));
-  }
-
-  @Override
-  public String toString() {
-    return "RTMP Audio";
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Command.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Command.java
deleted file mode 100644
index 90122e0..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Command.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import com.github.faucamp.simplertmp.amf.AmfNumber;
-import com.github.faucamp.simplertmp.amf.AmfString;
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-
-/**
- * Encapsulates an command/"invoke" RTMP packet
- *
- * Invoke/command packet structure (AMF encoded):
- * (String) <commmand name>
- * (Number) <Transaction ID>
- * (Mixed) <Argument> ex. Null, String, Object: {key1:value1, key2:value2 ... }
- *
- * @author francois
- */
-public class Command extends VariableBodyRtmpPacket {
-
-  private static final String TAG = "Command";
-
-  private String commandName;
-  private int transactionId;
-
-  public Command(RtmpHeader header) {
-    super(header);
-  }
-
-  public Command(String commandName, int transactionId, ChunkStreamInfo channelInfo) {
-    super(new RtmpHeader((channelInfo.canReusePrevHeaderTx(RtmpHeader.MessageType.COMMAND_AMF0)
-        ? RtmpHeader.ChunkType.TYPE_1_RELATIVE_LARGE : RtmpHeader.ChunkType.TYPE_0_FULL),
-        ChunkStreamInfo.RTMP_CID_OVER_CONNECTION, RtmpHeader.MessageType.COMMAND_AMF0));
-    this.commandName = commandName;
-    this.transactionId = transactionId;
-  }
-
-  public Command(String commandName, int transactionId) {
-    super(new RtmpHeader(RtmpHeader.ChunkType.TYPE_0_FULL, ChunkStreamInfo.RTMP_CID_OVER_CONNECTION,
-        RtmpHeader.MessageType.COMMAND_AMF0));
-    this.commandName = commandName;
-    this.transactionId = transactionId;
-  }
-
-  public String getCommandName() {
-    return commandName;
-  }
-
-  public void setCommandName(String commandName) {
-    this.commandName = commandName;
-  }
-
-  public int getTransactionId() {
-    return transactionId;
-  }
-
-  public void setTransactionId(int transactionId) {
-    this.transactionId = transactionId;
-  }
-
-  @Override
-  public void readBody(InputStream in) throws IOException {
-    // The command name and transaction ID are always present (AMF string followed by number)
-    commandName = AmfString.readStringFrom(in, false);
-    transactionId = (int) AmfNumber.readNumberFrom(in);
-    int bytesRead = AmfString.sizeOf(commandName, false) + AmfNumber.SIZE;
-    readVariableData(in, bytesRead);
-  }
-
-  @Override
-  protected void writeBody(OutputStream out) throws IOException {
-    AmfString.writeStringTo(out, commandName, false);
-    AmfNumber.writeNumberTo(out, transactionId);
-    // Write body data
-    writeVariableData(out);
-  }
-
-  @Override
-  protected byte[] array() {
-    return null;
-  }
-
-  @Override
-  protected int size() {
-    return 0;
-  }
-
-  @Override
-  public String toString() {
-    return "RTMP Command (command: " + commandName + ", transaction ID: " + transactionId + ")";
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/ContentData.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/ContentData.java
deleted file mode 100644
index 45a3754..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/ContentData.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import com.github.faucamp.simplertmp.Util;
-
-/**
- * Content (audio/video) data packet base
- *
- * @author francois
- */
-public abstract class ContentData extends RtmpPacket {
-
-  protected byte[] data;
-  protected int size;
-
-  public ContentData(RtmpHeader header) {
-    super(header);
-  }
-
-  public byte[] getData() {
-    return data;
-  }
-
-  public void setData(byte[] data, int size) {
-    this.data = data;
-    this.size = size;
-  }
-
-  @Override
-  public void readBody(InputStream in) throws IOException {
-    data = new byte[this.header.getPacketLength()];
-    Util.readBytesUntilFull(in, data);
-  }
-
-  /**
-   * Method is public for content (audio/video)
-   * Write this packet body without chunking;
-   * useful for dumping audio/video streams
-   */
-  @Override
-  public void writeBody(OutputStream out) {
-  }
-
-  @Override
-  public byte[] array() {
-    return data;
-  }
-
-  @Override
-  public int size() {
-    return size;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Data.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Data.java
deleted file mode 100644
index 3fed7f8..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Data.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import com.github.faucamp.simplertmp.amf.AmfString;
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-
-/**
- * AMF Data packet
- *
- * Also known as NOTIFY in some RTMP implementations.
- *
- * The client or the server sends this message to send Metadata or any user data
- * to the peer. Metadata includes details about the data (audio, video etc.)
- * like creation time, duration, theme and so on.
- *
- * @author francois
- */
-public class Data extends VariableBodyRtmpPacket {
-
-  private String type;
-
-  public Data(RtmpHeader header) {
-    super(header);
-  }
-
-  public Data(String type) {
-    super(new RtmpHeader(RtmpHeader.ChunkType.TYPE_0_FULL, ChunkStreamInfo.RTMP_CID_OVER_CONNECTION,
-        RtmpHeader.MessageType.DATA_AMF0));
-    this.type = type;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  @Override
-  public void readBody(InputStream in) throws IOException {
-    // Read notification type
-    type = AmfString.readStringFrom(in, false);
-    int bytesRead = AmfString.sizeOf(type, false);
-    // Read data body
-    readVariableData(in, bytesRead);
-  }
-
-  /**
-   * This method is public for Data to make it easy to dump its contents to
-   * another output stream
-   */
-  @Override
-  protected void writeBody(OutputStream out) throws IOException {
-    AmfString.writeStringTo(out, type, false);
-    writeVariableData(out);
-  }
-
-  @Override
-  protected byte[] array() {
-    return null;
-  }
-
-  @Override
-  protected int size() {
-    return 0;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Handshake.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Handshake.java
deleted file mode 100644
index 497fc2b..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Handshake.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Random;
-
-import android.util.Log;
-
-import com.github.faucamp.simplertmp.Crypto;
-import com.github.faucamp.simplertmp.Util;
-
-/**
- * Handles the RTMP handshake song 'n dance
- *
- * Thanks to http://thompsonng.blogspot.com/2010/11/rtmp-part-10-handshake.html for some very useful information on
- * the the hidden "features" of the RTMP handshake
- *
- * @author francois
- */
-public final class Handshake {
-  private static final String TAG = "Handshake";
-  /** S1 as sent by the server */
-  private byte[] s1;
-  private static final int PROTOCOL_VERSION = 0x03;
-  private static final int HANDSHAKE_SIZE = 1536;
-  private static final int SHA256_DIGEST_SIZE = 32;
-
-  private static final int DIGEST_OFFSET_INDICATOR_POS = 772; // should either be byte 772 or byte 8
-
-  private static final byte[] GENUINE_FP_KEY = {
-      (byte) 0x47, (byte) 0x65, (byte) 0x6E, (byte) 0x75, (byte) 0x69, (byte) 0x6E, (byte) 0x65,
-      (byte) 0x20, (byte) 0x41, (byte) 0x64, (byte) 0x6F, (byte) 0x62, (byte) 0x65, (byte) 0x20,
-      (byte) 0x46, (byte) 0x6C, (byte) 0x61, (byte) 0x73, (byte) 0x68, (byte) 0x20, (byte) 0x50,
-      (byte) 0x6C, (byte) 0x61, (byte) 0x79, (byte) 0x65, (byte) 0x72, (byte) 0x20, (byte) 0x30,
-      (byte) 0x30, (byte) 0x31, // Genuine Adobe Flash Player 001
-      (byte) 0xF0, (byte) 0xEE, (byte) 0xC2, (byte) 0x4A, (byte) 0x80, (byte) 0x68, (byte) 0xBE,
-      (byte) 0xE8, (byte) 0x2E, (byte) 0x00, (byte) 0xD0, (byte) 0xD1, (byte) 0x02, (byte) 0x9E,
-      (byte) 0x7E, (byte) 0x57, (byte) 0x6E, (byte) 0xEC, (byte) 0x5D, (byte) 0x2D, (byte) 0x29,
-      (byte) 0x80, (byte) 0x6F, (byte) 0xAB, (byte) 0x93, (byte) 0xB8, (byte) 0xE6, (byte) 0x36,
-      (byte) 0xCF, (byte) 0xEB, (byte) 0x31, (byte) 0xAE
-  };
-
-  /** Generates and writes the first handshake packet (C0) */
-  public final void writeC0(OutputStream out) throws IOException {
-    Log.d(TAG, "writeC0");
-    out.write(PROTOCOL_VERSION);
-  }
-
-  public final void readS0(InputStream in) throws IOException {
-    Log.d(TAG, "readS0");
-    byte s0 = (byte) in.read();
-    if (s0 != PROTOCOL_VERSION && s0 != 72) { //check 72 to fix Ant Media Server
-      if (s0 == -1) {
-        throw new IOException("InputStream closed");
-      } else {
-        throw new IOException(
-            "Invalid RTMP protocol version; expected " + PROTOCOL_VERSION + ", got " + s0);
-      }
-    }
-  }
-
-  /** Generates and writes the second handshake packet (C1) */
-  public final void writeC1(OutputStream out) throws IOException {
-    Log.d(TAG, "writeC1");
-    Log.d(TAG, "writeC1(): Calculating digest offset");
-    Random random = new Random();
-    // Since we are faking a real Flash Player handshake, include a digest in C1
-    // Choose digest offset point (scheme 1; that is, offset is indicated by bytes 772 - 775 (4 bytes) )
-    final int digestOffset = random.nextInt(HANDSHAKE_SIZE
-        - DIGEST_OFFSET_INDICATOR_POS
-        - 4
-        - 8
-        - SHA256_DIGEST_SIZE); //random.nextInt(DIGEST_OFFSET_INDICATOR_POS - SHA256_DIGEST_SIZE);
-
-    final int absoluteDigestOffset = ((digestOffset % 728) + DIGEST_OFFSET_INDICATOR_POS + 4);
-    Log.d(TAG, "writeC1(): (real value of) digestOffset: " + digestOffset);
-
-    Log.d(TAG, "writeC1(): recalculated digestOffset: " + absoluteDigestOffset);
-
-    int remaining = digestOffset;
-    final byte[] digestOffsetBytes = new byte[4];
-    for (int i = 3; i >= 0; i--) {
-      if (remaining > 255) {
-        digestOffsetBytes[i] = (byte) 255;
-        remaining -= 255;
-      } else {
-        digestOffsetBytes[i] = (byte) remaining;
-        remaining -= remaining;
-      }
-    }
-
-    // Calculate the offset value that will be written
-    //inal byte[] digestOffsetBytes = Util.unsignedInt32ToByteArray(digestOffset);// //((digestOffset - DIGEST_OFFSET_INDICATOR_POS) % 728)); // Thanks to librtmp for the mod 728
-    Log.d(TAG, "writeC1(): digestOffsetBytes: " + Util.toHexString(
-        digestOffsetBytes));  //Util.unsignedInt32ToByteArray((digestOffset % 728))));
-
-    // Create random bytes up to the digest offset point
-    byte[] partBeforeDigest = new byte[absoluteDigestOffset];
-    Log.d(TAG, "partBeforeDigest(): size: " + partBeforeDigest.length);
-    random.nextBytes(partBeforeDigest);
-
-    Log.d(TAG, "writeC1(): Writing timestamp and Flash Player version");
-    byte[] timeStamp = Util.unsignedInt32ToByteArray((int) (System.currentTimeMillis() / 1000));
-    System.arraycopy(timeStamp, 0, partBeforeDigest, 0,
-        4); // Bytes 0 - 3 bytes: current epoch timestamp
-    System.arraycopy(new byte[] { (byte) 0x80, 0x00, 0x07, 0x02 }, 0, partBeforeDigest, 4,
-        4); // Bytes 4 - 7: Flash player version: 11.2.202.233
-
-    // Create random bytes for the part after the digest
-    byte[] partAfterDigest = new byte[HANDSHAKE_SIZE
-        - absoluteDigestOffset
-        - SHA256_DIGEST_SIZE]; // subtract 8 because of initial 8 bytes already written
-    Log.d(TAG, "partAfterDigest(): size: " + partAfterDigest.length);
-    random.nextBytes(partAfterDigest);
-
-    // Set the offset byte
-    Log.d(TAG, "copying digest offset bytes in partBeforeDigest");
-    System.arraycopy(digestOffsetBytes, 0, partBeforeDigest, 772, 4);
-    Log.d(TAG, "writeC1(): Calculating digest");
-    byte[] tempBuffer = new byte[HANDSHAKE_SIZE - SHA256_DIGEST_SIZE];
-    System.arraycopy(partBeforeDigest, 0, tempBuffer, 0, partBeforeDigest.length);
-    System.arraycopy(partAfterDigest, 0, tempBuffer, partBeforeDigest.length,
-        partAfterDigest.length);
-
-    Crypto crypto = new Crypto();
-    byte[] digest = crypto.calculateHmacSHA256(tempBuffer, GENUINE_FP_KEY, 30);
-
-    // Now write the packet
-    Log.d(TAG, "writeC1(): writing C1 packet");
-    out.write(partBeforeDigest);
-    out.write(digest);
-    out.write(partAfterDigest);
-  }
-
-  public final void readS1(InputStream in) throws IOException {
-    // S1 == 1536 bytes. We do not bother with checking the content of it
-    Log.d(TAG, "readS1");
-    s1 = new byte[HANDSHAKE_SIZE];
-
-    // Read server time (4 bytes)
-    int totalBytesRead = 0;
-    int read;
-    do {
-      read = in.read(s1, totalBytesRead, (HANDSHAKE_SIZE - totalBytesRead));
-      if (read != -1) {
-        totalBytesRead += read;
-      }
-    } while (totalBytesRead < HANDSHAKE_SIZE);
-
-    if (totalBytesRead != HANDSHAKE_SIZE) {
-      throw new IOException("Unexpected EOF while reading S1, expected "
-          + HANDSHAKE_SIZE
-          + " bytes, but only read "
-          + totalBytesRead
-          + " bytes");
-    } else {
-      Log.d(TAG, "readS1(): S1 total bytes read OK");
-    }
-  }
-
-  /** Generates and writes the third handshake packet (C2) */
-  public final void writeC2(OutputStream out) throws IOException {
-    Log.d(TAG, "writeC2");
-    // C2 is an echo of S1
-    if (s1 == null) {
-      throw new IllegalStateException("C2 cannot be written without S1 being read first");
-    }
-    out.write(s1);
-  }
-
-  public final void readS2(InputStream in) throws IOException {
-    // S2 should be an echo of C1, but we are not too strict
-    Log.d(TAG, "readS2");
-    byte[] sr_serverTime = new byte[4];
-    byte[] s2_serverVersion = new byte[4];
-    byte[] s2_rest = new byte[HANDSHAKE_SIZE - 8]; // subtract 4+4 bytes for time and version
-
-    // Read server time (4 bytes)
-    int totalBytesRead = 0;
-    int read;
-    do {
-      read = in.read(sr_serverTime, totalBytesRead, (4 - totalBytesRead));
-      if (read == -1) {
-        // End of stream reached - should not have happened at this point
-        throw new IOException("Unexpected EOF while reading S2 bytes 0-3");
-      } else {
-        totalBytesRead += read;
-      }
-    } while (totalBytesRead < 4);
-
-    // Read server version (4 bytes)
-    totalBytesRead = 0;
-    do {
-      read = in.read(s2_serverVersion, totalBytesRead, (4 - totalBytesRead));
-      if (read == -1) {
-        // End of stream reached - should not have happened at this point
-        throw new IOException("Unexpected EOF while reading S2 bytes 4-7");
-      } else {
-        totalBytesRead += read;
-      }
-    } while (totalBytesRead < 4);
-
-    // Read 1528 bytes (to make up S1 total size of 1536 bytes)
-    final int remainingBytes = HANDSHAKE_SIZE - 8;
-    totalBytesRead = 0;
-    do {
-      read = in.read(s2_rest, totalBytesRead, (remainingBytes - totalBytesRead));
-      if (read != -1) {
-        totalBytesRead += read;
-      }
-    } while (totalBytesRead < remainingBytes && read != -1);
-
-    if (totalBytesRead != remainingBytes) {
-      throw new IOException("Unexpected EOF while reading remainder of S2, expected "
-          + remainingBytes
-          + " bytes, but only read "
-          + totalBytesRead
-          + " bytes");
-    } else {
-      Log.d(TAG, "readS2(): S2 total bytes read OK");
-    }
-    // Technically we should check that S2 == C1, but for now this is ignored
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/RtmpHeader.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/RtmpHeader.java
deleted file mode 100644
index 8edea2a..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/RtmpHeader.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.github.faucamp.simplertmp.Util;
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-import com.github.faucamp.simplertmp.io.RtmpSessionInfo;
-
-/**
- * @author francois, leoma
- */
-public class RtmpHeader {
-
-  private static final String TAG = "RtmpHeader";
-
-  /**
-   * RTMP packet/message type definitions.
-   * Note: docstrings are adapted from the official Adobe RTMP spec:
-   * http://www.adobe.com/devnet/rtmp/
-   */
-  public enum MessageType {
-
-    /**
-     * Protocol control message 1
-     * Set Chunk Size, is used to notify the peer a new maximum chunk size to use.
-     */
-    SET_CHUNK_SIZE(0x01), /**
-     * Protocol control message 2
-     * Abort Message, is used to notify the peer if it is waiting for chunks
-     * to complete a message, then to discard the partially received message
-     * over a chunk stream and abort processing of that message.
-     */
-    ABORT(0x02), /**
-     * Protocol control message 3
-     * The client or the server sends the acknowledgment to the peer after
-     * receiving bytes equal to the window size. The window size is the
-     * maximum number of bytes that the sender sends without receiving
-     * acknowledgment from the receiver.
-     */
-    ACKNOWLEDGEMENT(0x03), /**
-     * Protocol control message 4
-     * The client or the server sends this message to notify the peer about
-     * the user control events. This message carries Event type and Event
-     * data.
-     * Also known as a PING message in some RTMP implementations.
-     */
-    USER_CONTROL_MESSAGE(0x04), /**
-     * Protocol control message 5
-     * The client or the server sends this message to inform the peer which
-     * window size to use when sending acknowledgment.
-     * Also known as ServerBW ("server bandwidth") in some RTMP implementations.
-     */
-    WINDOW_ACKNOWLEDGEMENT_SIZE(0x05), /**
-     * Protocol control message 6
-     * The client or the server sends this message to update the output
-     * bandwidth of the peer. The output bandwidth value is the same as the
-     * window size for the peer.
-     * Also known as ClientBW ("client bandwidth") in some RTMP implementations.
-     */
-    SET_PEER_BANDWIDTH(0x06), /**
-     * RTMP audio packet (0x08)
-     * The client or the server sends this message to send audio data to the peer.
-     */
-    AUDIO(0x08), /**
-     * RTMP video packet (0x09)
-     * The client or the server sends this message to send video data to the peer.
-     */
-    VIDEO(0x09), /**
-     * RTMP message type 0x0F
-     * The client or the server sends this message to send Metadata or any
-     * user data to the peer. Metadata includes details about the data (audio, video etc.)
-     * like creation time, duration, theme and so on.
-     * This is the AMF3-encoded version.
-     */
-    DATA_AMF3(0x0F), /**
-     * RTMP message type 0x10
-     * A shared object is a Flash object (a collection of name value pairs)
-     * that are in synchronization across multiple clients, instances, and
-     * so on.
-     * This is the AMF3 version: kMsgContainerEx=16 for AMF3.
-     */
-    SHARED_OBJECT_AMF3(0x10), /**
-     * RTMP message type 0x11
-     * Command messages carry the AMF-encoded commands between the client
-     * and the server.
-     * A command message consists of command name, transaction ID, and command object that
-     * contains related parameters.
-     * This is the AMF3-encoded version.
-     */
-    COMMAND_AMF3(0x11), /**
-     * RTMP message type 0x12
-     * The client or the server sends this message to send Metadata or any
-     * user data to the peer. Metadata includes details about the data (audio, video etc.)
-     * like creation time, duration, theme and so on.
-     * This is the AMF0-encoded version.
-     */
-    DATA_AMF0(0x12), /**
-     * RTMP message type 0x14
-     * Command messages carry the AMF-encoded commands between the client
-     * and the server.
-     * A command message consists of command name, transaction ID, and command object that
-     * contains related parameters.
-     * This is the common AMF0 version, also known as INVOKE in some RTMP implementations.
-     */
-    COMMAND_AMF0(0x14), /**
-     * RTMP message type 0x13
-     * A shared object is a Flash object (a collection of name value pairs)
-     * that are in synchronization across multiple clients, instances, and
-     * so on.
-     * This is the AMF0 version: kMsgContainer=19 for AMF0.
-     */
-    SHARED_OBJECT_AMF0(0x13), /**
-     * RTMP message type 0x16
-     * An aggregate message is a single message that contains a list of sub-messages.
-     */
-    AGGREGATE_MESSAGE(0x16);
-    private byte value;
-    private static final Map<Byte, MessageType> quickLookupMap = new HashMap<>();
-
-    static {
-      for (MessageType messageTypId : MessageType.values()) {
-        quickLookupMap.put(messageTypId.getValue(), messageTypId);
-      }
-    }
-
-    MessageType(int value) {
-      this.value = (byte) value;
-    }
-
-    /** Returns the value of this chunk type */
-    public byte getValue() {
-      return value;
-    }
-
-    public static MessageType valueOf(byte messageTypeId) {
-      if (quickLookupMap.containsKey(messageTypeId)) {
-        return quickLookupMap.get(messageTypeId);
-      } else {
-        throw new IllegalArgumentException(
-            "Unknown message type byte: " + Util.toHexString(messageTypeId));
-      }
-    }
-  }
-
-  public enum ChunkType {
-
-    /** Full 12-byte RTMP chunk header */
-    TYPE_0_FULL(0x00), /** Relative 8-byte RTMP chunk header (message stream ID is not included) */
-    TYPE_1_RELATIVE_LARGE(0x01), /** Relative 4-byte RTMP chunk header (only timestamp delta) */
-    TYPE_2_RELATIVE_TIMESTAMP_ONLY(0x02),
-    /** Relative 1-byte RTMP chunk header (no "real" header, just the 1-byte indicating chunk header type & chunk stream ID) */
-    TYPE_3_RELATIVE_SINGLE_BYTE(0x03);
-    /** The byte value of this chunk header type */
-    private byte value;
-    /** The full size (in bytes) of this RTMP header (including the basic header byte) */
-    private static final Map<Byte, ChunkType> quickLookupMap = new HashMap<>();
-
-    static {
-      for (ChunkType messageTypId : ChunkType.values()) {
-        quickLookupMap.put(messageTypId.getValue(), messageTypId);
-      }
-    }
-
-    ChunkType(int byteValue) {
-      this.value = (byte) byteValue;
-    }
-
-    /** Returns the byte value of this chunk header type */
-    public byte getValue() {
-      return value;
-    }
-
-    public static ChunkType valueOf(byte chunkHeaderType) {
-      if (quickLookupMap.containsKey(chunkHeaderType)) {
-        return quickLookupMap.get(chunkHeaderType);
-      } else {
-        throw new IllegalArgumentException(
-            "Unknown chunk header type byte: " + Util.toHexString(chunkHeaderType));
-      }
-    }
-  }
-
-  private ChunkType chunkType;
-  private int chunkStreamId;
-  private int absoluteTimestamp;
-  private int timestampDelta = -1;
-  private int packetLength;
-  private MessageType messageType;
-  private int messageStreamId;
-  private int extendedTimestamp;
-
-  public RtmpHeader() {
-  }
-
-  public RtmpHeader(ChunkType chunkType, int chunkStreamId, MessageType messageType) {
-    this.chunkType = chunkType;
-    this.chunkStreamId = chunkStreamId;
-    this.messageType = messageType;
-  }
-
-  public static RtmpHeader readHeader(InputStream in, RtmpSessionInfo rtmpSessionInfo)
-      throws IOException {
-    RtmpHeader rtmpHeader = new RtmpHeader();
-    rtmpHeader.readHeaderImpl(in, rtmpSessionInfo);
-    return rtmpHeader;
-  }
-
-  private void readHeaderImpl(InputStream in, RtmpSessionInfo rtmpSessionInfo) throws IOException {
-
-    int basicHeaderByte = in.read();
-    if (basicHeaderByte == -1) {
-      throw new EOFException("Unexpected EOF while reading RTMP packet basic header");
-    }
-    // Read byte 0: chunk type and chunk stream ID
-    parseBasicHeader((byte) basicHeaderByte);
-
-    switch (chunkType) {
-      case TYPE_0_FULL: { //  b00 = 12 byte header (full header)
-        // Read bytes 1-3: Absolute timestamp
-        absoluteTimestamp = Util.readUnsignedInt24(in);
-        timestampDelta = 0;
-        // Read bytes 4-6: Packet length
-        packetLength = Util.readUnsignedInt24(in);
-        // Read byte 7: Message type ID
-        messageType = MessageType.valueOf((byte) in.read());
-        // Read bytes 8-11: Message stream ID (apparently little-endian order)
-        byte[] messageStreamIdBytes = new byte[4];
-        Util.readBytesUntilFull(in, messageStreamIdBytes);
-        messageStreamId = Util.toUnsignedInt32LittleEndian(messageStreamIdBytes);
-        // Read bytes 1-4: Extended timestamp
-        extendedTimestamp = absoluteTimestamp >= 0xffffff ? Util.readUnsignedInt32(in) : 0;
-        if (extendedTimestamp != 0) {
-          absoluteTimestamp = extendedTimestamp;
-        }
-        break;
-      }
-      case TYPE_1_RELATIVE_LARGE: { // b01 = 8 bytes - like type 0. not including message stream ID (4 last bytes)
-        // Read bytes 1-3: Timestamp delta
-        timestampDelta = Util.readUnsignedInt24(in);
-        // Read bytes 4-6: Packet length
-        packetLength = Util.readUnsignedInt24(in);
-        // Read byte 7: Message type ID
-        messageType = MessageType.valueOf((byte) in.read());
-        // Read bytes 1-4: Extended timestamp delta
-        extendedTimestamp = timestampDelta >= 0xffffff ? Util.readUnsignedInt32(in) : 0;
-        RtmpHeader prevHeader = rtmpSessionInfo.getChunkStreamInfo(chunkStreamId).prevHeaderRx();
-        if (prevHeader != null) {
-          messageStreamId = prevHeader.messageStreamId;
-          absoluteTimestamp = extendedTimestamp != 0 ? extendedTimestamp
-              : prevHeader.absoluteTimestamp + timestampDelta;
-        } else {
-          messageStreamId = 0;
-          absoluteTimestamp = extendedTimestamp != 0 ? extendedTimestamp : timestampDelta;
-        }
-        break;
-      }
-      case TYPE_2_RELATIVE_TIMESTAMP_ONLY: { // b10 = 4 bytes - Basic Header and timestamp (3 bytes) are included
-        // Read bytes 1-3: Timestamp delta
-        timestampDelta = Util.readUnsignedInt24(in);
-        // Read bytes 1-4: Extended timestamp delta
-        extendedTimestamp = timestampDelta >= 0xffffff ? Util.readUnsignedInt32(in) : 0;
-        RtmpHeader prevHeader = rtmpSessionInfo.getChunkStreamInfo(chunkStreamId).prevHeaderRx();
-        packetLength = prevHeader.packetLength;
-        messageType = prevHeader.messageType;
-        messageStreamId = prevHeader.messageStreamId;
-        absoluteTimestamp = extendedTimestamp != 0 ? extendedTimestamp
-            : prevHeader.absoluteTimestamp + timestampDelta;
-        break;
-      }
-      case TYPE_3_RELATIVE_SINGLE_BYTE: { // b11 = 1 byte: basic header only
-        RtmpHeader prevHeader = rtmpSessionInfo.getChunkStreamInfo(chunkStreamId).prevHeaderRx();
-        // Read bytes 1-4: Extended timestamp
-        extendedTimestamp = prevHeader.timestampDelta >= 0xffffff ? Util.readUnsignedInt32(in) : 0;
-        timestampDelta = extendedTimestamp != 0 ? 0xffffff : prevHeader.timestampDelta;
-        packetLength = prevHeader.packetLength;
-        messageType = prevHeader.messageType;
-        messageStreamId = prevHeader.messageStreamId;
-        absoluteTimestamp = extendedTimestamp != 0 ? extendedTimestamp
-            : prevHeader.absoluteTimestamp + timestampDelta;
-        break;
-      }
-      default:
-        throw new IOException("Invalid chunk type; basic header byte was: " + Util.toHexString(
-            (byte) basicHeaderByte));
-    }
-  }
-
-  public void writeTo(OutputStream out, ChunkType chunkType, final ChunkStreamInfo chunkStreamInfo)
-      throws IOException {
-    // Write basic header byte
-    out.write(((byte) (chunkType.getValue() << 6) | chunkStreamId));
-    switch (chunkType) {
-      case TYPE_0_FULL: { //  b00 = 12 byte header (full header)
-        chunkStreamInfo.markDeltaTimestampTx();
-        Util.writeUnsignedInt24(out,
-            (absoluteTimestamp >= 0xffffff) ? 0xffffff : absoluteTimestamp);
-        Util.writeUnsignedInt24(out, packetLength);
-        out.write(messageType.getValue());
-        Util.writeUnsignedInt32LittleEndian(out, messageStreamId);
-        if (absoluteTimestamp >= 0xffffff) {
-          extendedTimestamp = absoluteTimestamp;
-          Util.writeUnsignedInt32(out, extendedTimestamp);
-        }
-        break;
-      }
-      case TYPE_1_RELATIVE_LARGE: { // b01 = 8 bytes - like type 0. not including message ID (4 last bytes)
-        timestampDelta = (int) chunkStreamInfo.markDeltaTimestampTx();
-        absoluteTimestamp =
-            chunkStreamInfo.getPrevHeaderTx().getAbsoluteTimestamp() + timestampDelta;
-        Util.writeUnsignedInt24(out, (absoluteTimestamp >= 0xffffff) ? 0xffffff : timestampDelta);
-        Util.writeUnsignedInt24(out, packetLength);
-        out.write(messageType.getValue());
-        if (absoluteTimestamp >= 0xffffff) {
-          extendedTimestamp = absoluteTimestamp;
-          Util.writeUnsignedInt32(out, absoluteTimestamp);
-        }
-        break;
-      }
-      case TYPE_2_RELATIVE_TIMESTAMP_ONLY: { // b10 = 4 bytes - Basic Header and timestamp (3 bytes) are included
-        timestampDelta = (int) chunkStreamInfo.markDeltaTimestampTx();
-        absoluteTimestamp =
-            chunkStreamInfo.getPrevHeaderTx().getAbsoluteTimestamp() + timestampDelta;
-        Util.writeUnsignedInt24(out, (absoluteTimestamp >= 0xffffff) ? 0xffffff : timestampDelta);
-        if (absoluteTimestamp >= 0xffffff) {
-          extendedTimestamp = absoluteTimestamp;
-          Util.writeUnsignedInt32(out, extendedTimestamp);
-        }
-        break;
-      }
-      case TYPE_3_RELATIVE_SINGLE_BYTE: { // b11 = 1 byte: basic header only
-        if (extendedTimestamp > 0) {
-          Util.writeUnsignedInt32(out, extendedTimestamp);
-        }
-        break;
-      }
-      default:
-        throw new IOException("Invalid chunk type: " + chunkType);
-    }
-  }
-
-  private void parseBasicHeader(byte basicHeaderByte) {
-    chunkType = ChunkType.valueOf(
-        (byte) ((0xff & basicHeaderByte) >>> 6)); // 2 most significant bits define the chunk type
-    chunkStreamId = basicHeaderByte & 0x3F; // 6 least significant bits define chunk stream ID
-  }
-
-  /** @return the RTMP chunk stream ID (channel ID) for this chunk */
-  public int getChunkStreamId() {
-    return chunkStreamId;
-  }
-
-  public ChunkType getChunkType() {
-    return chunkType;
-  }
-
-  public int getPacketLength() {
-    return packetLength;
-  }
-
-  public int getMessageStreamId() {
-    return messageStreamId;
-  }
-
-  public MessageType getMessageType() {
-    return messageType;
-  }
-
-  public int getAbsoluteTimestamp() {
-    return absoluteTimestamp;
-  }
-
-  public void setAbsoluteTimestamp(int absoluteTimestamp) {
-    this.absoluteTimestamp = absoluteTimestamp;
-  }
-
-  public int getTimestampDelta() {
-    return timestampDelta;
-  }
-
-  public void setTimestampDelta(int timestampDelta) {
-    this.timestampDelta = timestampDelta;
-  }
-
-  /** Sets the RTMP chunk stream ID (channel ID) for this chunk */
-  public void setChunkStreamId(int channelId) {
-    this.chunkStreamId = channelId;
-  }
-
-  public void setChunkType(ChunkType chunkType) {
-    this.chunkType = chunkType;
-  }
-
-  public void setMessageStreamId(int messageStreamId) {
-    this.messageStreamId = messageStreamId;
-  }
-
-  public void setMessageType(MessageType messageType) {
-    this.messageType = messageType;
-  }
-
-  public void setPacketLength(int packetLength) {
-    this.packetLength = packetLength;
-  }
-}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/RtmpPacket.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/RtmpPacket.java
deleted file mode 100644
index c52d7ee..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/RtmpPacket.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-
-/**
- * @author francois, leo
- */
-public abstract class RtmpPacket {
-
-  protected RtmpHeader header;
-
-  public RtmpPacket(RtmpHeader header) {
-    this.header = header;
-  }
-
-  public RtmpHeader getHeader() {
-    return header;
-  }
-
-  public abstract void readBody(InputStream in) throws IOException;
-
-  protected abstract void writeBody(OutputStream out) throws IOException;
-
-  protected abstract byte[] array();
-
-  protected abstract int size();
-
-  public void writeTo(OutputStream out, final int chunkSize, final ChunkStreamInfo chunkStreamInfo)
-      throws IOException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    writeBody(baos);
-    byte[] body = this instanceof ContentData ? array() : baos.toByteArray();
-    int length = this instanceof ContentData ? size() : body.length;
-    header.setPacketLength(length);
-    // Write header for first chunk
-    header.writeTo(out, RtmpHeader.ChunkType.TYPE_0_FULL, chunkStreamInfo);
-    int pos = 0;
-    while (length > chunkSize) {
-      // Write packet for chunk
-      out.write(body, pos, chunkSize);
-      length -= chunkSize;
-      pos += chunkSize;
-      // Write header for remain chunk
-      header.writeTo(out, RtmpHeader.ChunkType.TYPE_3_RELATIVE_SINGLE_BYTE, chunkStreamInfo);
-    }
-    out.write(body, pos, length);
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/SetChunkSize.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/SetChunkSize.java
deleted file mode 100644
index 2554f4e..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/SetChunkSize.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import com.github.faucamp.simplertmp.Util;
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-
-/**
- * A "Set chunk size" RTMP message, received on chunk stream ID 2 (control channel)
- *
- * @author francois
- */
-public class SetChunkSize extends RtmpPacket {
-
-  private int chunkSize;
-
-  public SetChunkSize(RtmpHeader header) {
-    super(header);
-  }
-
-  public SetChunkSize(int chunkSize) {
-    super(new RtmpHeader(RtmpHeader.ChunkType.TYPE_1_RELATIVE_LARGE,
-        ChunkStreamInfo.RTMP_CID_PROTOCOL_CONTROL, RtmpHeader.MessageType.SET_CHUNK_SIZE));
-    this.chunkSize = chunkSize;
-  }
-
-  public int getChunkSize() {
-    return chunkSize;
-  }
-
-  public void setChunkSize(int chunkSize) {
-    this.chunkSize = chunkSize;
-  }
-
-  @Override
-  public void readBody(InputStream in) throws IOException {
-    // Value is received in the 4 bytes of the body
-    chunkSize = Util.readUnsignedInt32(in);
-  }
-
-  @Override
-  protected void writeBody(OutputStream out) throws IOException {
-    Util.writeUnsignedInt32(out, chunkSize);
-  }
-
-  @Override
-  protected byte[] array() {
-    return null;
-  }
-
-  @Override
-  protected int size() {
-    return 0;
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/SetPeerBandwidth.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/SetPeerBandwidth.java
deleted file mode 100644
index c4d940f..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/SetPeerBandwidth.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.github.faucamp.simplertmp.Util;
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-
-/**
- * Set Peer Bandwidth
- *
- * Also known as ClientrBW ("client bandwidth") in some RTMP implementations.
- *
- * @author francois
- */
-public class SetPeerBandwidth extends RtmpPacket {
-
-  /**
-   * Bandwidth limiting type
-   */
-  public static enum LimitType {
-
-    /**
-     * In a hard (0) request, the peer must send the data in the provided bandwidth.
-     */
-    HARD(0), /**
-     * In a soft (1) request, the bandwidth is at the discretion of the peer
-     * and the sender can limit the bandwidth.
-     */
-    SOFT(1), /**
-     * In a dynamic (2) request, the bandwidth can be hard or soft.
-     */
-    DYNAMIC(2);
-    private int intValue;
-    private static final Map<Integer, LimitType> quickLookupMap = new HashMap<>();
-
-    static {
-      for (LimitType type : LimitType.values()) {
-        quickLookupMap.put(type.getIntValue(), type);
-      }
-    }
-
-    private LimitType(int intValue) {
-      this.intValue = intValue;
-    }
-
-    public int getIntValue() {
-      return intValue;
-    }
-
-    public static LimitType valueOf(int intValue) {
-      return quickLookupMap.get(intValue);
-    }
-  }
-
-  private int acknowledgementWindowSize;
-  private LimitType limitType;
-
-  public SetPeerBandwidth(RtmpHeader header) {
-    super(header);
-  }
-
-  public SetPeerBandwidth(int acknowledgementWindowSize, LimitType limitType,
-      ChunkStreamInfo channelInfo) {
-    super(new RtmpHeader(channelInfo.canReusePrevHeaderTx(RtmpHeader.MessageType.SET_PEER_BANDWIDTH)
-        ? RtmpHeader.ChunkType.TYPE_2_RELATIVE_TIMESTAMP_ONLY : RtmpHeader.ChunkType.TYPE_0_FULL,
-        ChunkStreamInfo.RTMP_CID_PROTOCOL_CONTROL,
-        RtmpHeader.MessageType.WINDOW_ACKNOWLEDGEMENT_SIZE));
-    this.acknowledgementWindowSize = acknowledgementWindowSize;
-    this.limitType = limitType;
-  }
-
-  public int getAcknowledgementWindowSize() {
-    return acknowledgementWindowSize;
-  }
-
-  public void setAcknowledgementWindowSize(int acknowledgementWindowSize) {
-    this.acknowledgementWindowSize = acknowledgementWindowSize;
-  }
-
-  public LimitType getLimitType() {
-    return limitType;
-  }
-
-  public void setLimitType(LimitType limitType) {
-    this.limitType = limitType;
-  }
-
-  @Override
-  public void readBody(InputStream in) throws IOException {
-    acknowledgementWindowSize = Util.readUnsignedInt32(in);
-    limitType = LimitType.valueOf(in.read());
-  }
-
-  @Override
-  protected void writeBody(OutputStream out) throws IOException {
-    Util.writeUnsignedInt32(out, acknowledgementWindowSize);
-    out.write(limitType.getIntValue());
-  }
-
-  @Override
-  protected byte[] array() {
-    return null;
-  }
-
-  @Override
-  protected int size() {
-    return 0;
-  }
-
-  @Override
-  public String toString() {
-    return "RTMP Set Peer Bandwidth";
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/UserControl.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/UserControl.java
deleted file mode 100644
index ed7a1b9..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/UserControl.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.github.faucamp.simplertmp.Util;
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-
-/**
- * User Control message, such as ping
- *
- * @author francois
- */
-public class UserControl extends RtmpPacket {
-
-  /**
-   * Control message type
-   * Docstring adapted from the official Adobe RTMP spec, section 3.7
-   */
-  public static enum Type {
-
-    /**
-     * Type: 0
-     * The server sends this event to notify the client that a stream has become
-     * functional and can be used for communication. By default, this event
-     * is sent on ID 0 after the application connect command is successfully
-     * received from the client.
-     *
-     * Event Data:
-     * eventData[0] (int) the stream ID of the stream that became functional
-     */
-    STREAM_BEGIN(0), /**
-     * Type: 1
-     * The server sends this event to notify the client that the playback of
-     * data is over as requested on this stream. No more data is sent without
-     * issuing additional commands. The client discards the messages received
-     * for the stream.
-     *
-     * Event Data:
-     * eventData[0]: the ID of thestream on which playback has ended.
-     */
-    STREAM_EOF(1), /**
-     * Type: 2
-     * The server sends this event to notify the client that there is no
-     * more data on the stream. If the server does not detect any message for
-     * a time period, it can notify the subscribed clients that the stream is
-     * dry.
-     *
-     * Event Data:
-     * eventData[0]: the stream ID of the dry stream.
-     */
-    STREAM_DRY(2), /**
-     * Type: 3
-     * The client sends this event to inform the server of the buffer size
-     * (in milliseconds) that is used to buffer any data coming over a stream.
-     * This event is sent before the server starts  processing the stream.
-     *
-     * Event Data:
-     * eventData[0]: the stream ID and
-     * eventData[1]: the buffer length, in milliseconds.
-     */
-    SET_BUFFER_LENGTH(3), /**
-     * Type: 4
-     * The server sends this event to notify the client that the stream is a
-     * recorded stream.
-     *
-     * Event Data:
-     * eventData[0]: the stream ID of the recorded stream.
-     */
-    STREAM_IS_RECORDED(4), /**
-     * Type: 6
-     * The server sends this event to test whether the client is reachable.
-     *
-     * Event Data:
-     * eventData[0]: a timestamp representing the local server time when the server dispatched the command.
-     *
-     * The client responds with PING_RESPONSE on receiving PING_REQUEST.
-     */
-    PING_REQUEST(6), /**
-     * Type: 7
-     * The client sends this event to the server in response to the ping request.
-     *
-     * Event Data:
-     * eventData[0]: the 4-byte timestamp which was received with the PING_REQUEST.
-     */
-    PONG_REPLY(7), /**
-     * Type: 31 (0x1F)
-     *
-     * This user control type is not specified in any official documentation, but
-     * is sent by Flash Media Server 3.5. Thanks to the rtmpdump devs for their
-     * explanation:
-     *
-     * Buffer Empty (unofficial name): After the server has sent a complete buffer, and
-     * sends this Buffer Empty message, it will wait until the play
-     * duration of that buffer has passed before sending a new buffer.
-     * The Buffer Ready message will be sent when the new buffer starts.
-     *
-     * (see also: http://repo.or.cz/w/rtmpdump.git/blob/8880d1456b282ee79979adbe7b6a6eb8ad371081:/librtmp/rtmp.c#l2787)
-     */
-    BUFFER_EMPTY(31), /**
-     * Type: 32 (0x20)
-     *
-     * This user control type is not specified in any official documentation, but
-     * is sent by Flash Media Server 3.5. Thanks to the rtmpdump devs for their
-     * explanation:
-     *
-     * Buffer Ready (unofficial name): After the server has sent a complete buffer, and
-     * sends a Buffer Empty message, it will wait until the play
-     * duration of that buffer has passed before sending a new buffer.
-     * The Buffer Ready message will be sent when the new buffer starts.
-     * (There is no BufferReady message for the very first buffer;
-     * presumably the Stream Begin message is sufficient for that
-     * purpose.)
-     *
-     * (see also: http://repo.or.cz/w/rtmpdump.git/blob/8880d1456b282ee79979adbe7b6a6eb8ad371081:/librtmp/rtmp.c#l2787)
-     */
-    BUFFER_READY(32);
-
-    private int intValue;
-    private static final Map<Integer, Type> quickLookupMap = new HashMap<Integer, Type>();
-
-    static {
-      for (Type type : Type.values()) {
-        quickLookupMap.put(type.getIntValue(), type);
-      }
-    }
-
-    private Type(int intValue) {
-      this.intValue = intValue;
-    }
-
-    public int getIntValue() {
-      return intValue;
-    }
-
-    public static Type valueOf(int intValue) {
-      return quickLookupMap.get(intValue);
-    }
-  }
-
-  private Type type;
-  private int[] eventData;
-
-  public UserControl(RtmpHeader header) {
-    super(header);
-  }
-
-  public UserControl(ChunkStreamInfo channelInfo) {
-    super(new RtmpHeader(
-        channelInfo.canReusePrevHeaderTx(RtmpHeader.MessageType.USER_CONTROL_MESSAGE)
-            ? RtmpHeader.ChunkType.TYPE_2_RELATIVE_TIMESTAMP_ONLY
-            : RtmpHeader.ChunkType.TYPE_0_FULL, ChunkStreamInfo.RTMP_CID_PROTOCOL_CONTROL,
-        RtmpHeader.MessageType.USER_CONTROL_MESSAGE));
-  }
-
-  /** Convenience construtor that creates a "pong" message for the specified ping */
-  public UserControl(UserControl replyToPing, ChunkStreamInfo channelInfo) {
-    this(Type.PONG_REPLY, channelInfo);
-    this.eventData = replyToPing.eventData;
-  }
-
-  public UserControl(Type type, ChunkStreamInfo channelInfo) {
-    this(channelInfo);
-    this.type = type;
-  }
-
-  public Type getType() {
-    return type;
-  }
-
-  public void setType(Type type) {
-    this.type = type;
-  }
-
-  /**
-   * Convenience method for getting the first event data item, as most user control
-   * message types only have one event data item anyway
-   * This is equivalent to calling <code>getEventData()[0]</code>
-   */
-  public int getFirstEventData() {
-    return eventData[0];
-  }
-
-  public int[] getEventData() {
-    return eventData;
-  }
-
-  /** Used to set (a single) event data for most user control message types */
-  public void setEventData(int eventData) {
-    if (type == Type.SET_BUFFER_LENGTH) {
-      throw new IllegalStateException(
-          "SET_BUFFER_LENGTH requires two event data values; use setEventData(int, int) instead");
-    }
-    this.eventData = new int[] { eventData };
-  }
-
-  /** Used to set event data for the SET_BUFFER_LENGTH user control message types */
-  public void setEventData(int streamId, int bufferLength) {
-    if (type != Type.SET_BUFFER_LENGTH) {
-      throw new IllegalStateException("User control type "
-          + type
-          + " requires only one event data value; use setEventData(int) instead");
-    }
-    this.eventData = new int[] { streamId, bufferLength };
-  }
-
-  @Override
-  public void readBody(InputStream in) throws IOException {
-    // Bytes 0-1: first parameter: ping type (mandatory)
-    type = Type.valueOf(Util.readUnsignedInt16(in));
-    int bytesRead = 2;
-    // Event data (1 for most types, 2 for SET_BUFFER_LENGTH)
-    if (type == Type.SET_BUFFER_LENGTH) {
-      setEventData(Util.readUnsignedInt32(in), Util.readUnsignedInt32(in));
-      bytesRead += 8;
-    } else {
-      setEventData(Util.readUnsignedInt32(in));
-      bytesRead += 4;
-    }
-    // To ensure some strange non-specified UserControl/ping message does not slip through
-    assert header.getPacketLength() == bytesRead;
-  }
-
-  @Override
-  protected void writeBody(OutputStream out) throws IOException {
-    // Write the user control message type
-    Util.writeUnsignedInt16(out, type.getIntValue());
-    // Now write the event data
-    Util.writeUnsignedInt32(out, eventData[0]);
-    if (type == Type.SET_BUFFER_LENGTH) {
-      Util.writeUnsignedInt32(out, eventData[1]);
-    }
-  }
-
-  @Override
-  protected byte[] array() {
-    return null;
-  }
-
-  @Override
-  protected int size() {
-    return 0;
-  }
-
-  @Override
-  public String toString() {
-    return "RTMP User Control (type: " + type + ", event data: " + eventData + ")";
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/VariableBodyRtmpPacket.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/VariableBodyRtmpPacket.java
deleted file mode 100644
index d4126fa..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/VariableBodyRtmpPacket.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.github.faucamp.simplertmp.amf.AmfBoolean;
-import com.github.faucamp.simplertmp.amf.AmfData;
-import com.github.faucamp.simplertmp.amf.AmfDecoder;
-import com.github.faucamp.simplertmp.amf.AmfNull;
-import com.github.faucamp.simplertmp.amf.AmfNumber;
-import com.github.faucamp.simplertmp.amf.AmfString;
-
-/**
- * RTMP packet with a "variable" body structure (i.e. the structure of the
- * body depends on some other state/parameter in the packet.
- *
- * Examples of this type of packet are Command and Data; this abstract class
- * exists mostly for code re-use.
- *
- * @author francois
- */
-public abstract class VariableBodyRtmpPacket extends RtmpPacket {
-
-  protected List<AmfData> data;
-
-  public VariableBodyRtmpPacket(RtmpHeader header) {
-    super(header);
-  }
-
-  public List<AmfData> getData() {
-    return data;
-  }
-
-  public void addData(String string) {
-    addData(new AmfString(string));
-  }
-
-  public void addData(double number) {
-    addData(new AmfNumber(number));
-  }
-
-  public void addData(boolean bool) {
-    addData(new AmfBoolean(bool));
-  }
-
-  public void addData(AmfData dataItem) {
-    if (data == null) {
-      data = new ArrayList<>();
-    }
-    if (dataItem == null) {
-      dataItem = new AmfNull();
-    }
-    data.add(dataItem);
-  }
-
-  protected void readVariableData(final InputStream in, int bytesAlreadyRead) throws IOException {
-    // ...now read in arguments (if any)
-    do {
-      AmfData dataItem = AmfDecoder.readFrom(in);
-      addData(dataItem);
-      bytesAlreadyRead += dataItem.getSize();
-    } while (bytesAlreadyRead < header.getPacketLength());
-  }
-
-  protected void writeVariableData(final OutputStream out) throws IOException {
-    if (data != null) {
-      for (AmfData dataItem : data) {
-        dataItem.writeTo(out);
-      }
-    } else {
-      // Write a null
-      AmfNull.writeNullTo(out);
-    }
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Video.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Video.java
deleted file mode 100644
index 1441d66..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/Video.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-
-/**
- * Video data packet
- *
- * @author francois
- */
-public class Video extends ContentData {
-
-  public Video(RtmpHeader header) {
-    super(header);
-  }
-
-  public Video() {
-    super(new RtmpHeader(RtmpHeader.ChunkType.TYPE_0_FULL, ChunkStreamInfo.RTMP_CID_VIDEO,
-        RtmpHeader.MessageType.VIDEO));
-  }
-
-  @Override
-  public String toString() {
-    return "RTMP Video";
-  }
-}
diff --git a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/WindowAckSize.java b/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/WindowAckSize.java
deleted file mode 100644
index 6194686..0000000
--- a/rtmp/src/main/java/com/github/faucamp/simplertmp/packets/WindowAckSize.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.github.faucamp.simplertmp.packets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import com.github.faucamp.simplertmp.Util;
-import com.github.faucamp.simplertmp.io.ChunkStreamInfo;
-
-/**
- * Window Acknowledgement Size
- *
- * Also known as ServerBW ("Server bandwidth") in some RTMP implementations.
- *
- * @author francois
- */
-public class WindowAckSize extends RtmpPacket {
-
-  private int acknowledgementWindowSize;
-
-  public WindowAckSize(RtmpHeader header) {
-    super(header);
-  }
-
-  public WindowAckSize(int acknowledgementWindowSize, ChunkStreamInfo channelInfo) {
-    super(new RtmpHeader(
-        channelInfo.canReusePrevHeaderTx(RtmpHeader.MessageType.WINDOW_ACKNOWLEDGEMENT_SIZE)
-            ? RtmpHeader.ChunkType.TYPE_2_RELATIVE_TIMESTAMP_ONLY
-            : RtmpHeader.ChunkType.TYPE_0_FULL, ChunkStreamInfo.RTMP_CID_PROTOCOL_CONTROL,
-        RtmpHeader.MessageType.WINDOW_ACKNOWLEDGEMENT_SIZE));
-    this.acknowledgementWindowSize = acknowledgementWindowSize;
-  }
-
-  public int getAcknowledgementWindowSize() {
-    return acknowledgementWindowSize;
-  }
-
-  public void setAcknowledgementWindowSize(int acknowledgementWindowSize) {
-    this.acknowledgementWindowSize = acknowledgementWindowSize;
-  }
-
-  @Override
-  public void readBody(InputStream in) throws IOException {
-    acknowledgementWindowSize = Util.readUnsignedInt32(in);
-  }
-
-  @Override
-  protected void writeBody(OutputStream out) throws IOException {
-    Util.writeUnsignedInt32(out, acknowledgementWindowSize);
-  }
-
-  @Override
-  protected byte[] array() {
-    return null;
-  }
-
-  @Override
-  protected int size() {
-    return 0;
-  }
-
-  @Override
-  public String toString() {
-    return "RTMP Window Acknowledgment Size";
-  }
-}
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/AmfVersion.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/AmfVersion.kt
new file mode 100644
index 0000000..3711430
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/AmfVersion.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf
+
+/**
+ * Created by pedro on 8/04/21.
+ */
+enum class AmfVersion {
+  VERSION_0, VERSION_3
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfBoolean.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfBoolean.kt
new file mode 100644
index 0000000..d0dccd5
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfBoolean.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v0
+
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import kotlin.jvm.Throws
+
+/**
+ * Created by pedro on 20/04/21.
+ *
+ * Only 1 byte of size where 0 is false and another value is true
+ */
+class AmfBoolean(private var value: Boolean = false): AmfData() {
+
+  @Throws(IOException::class)
+  override fun readBody(input: InputStream) {
+    val b = input.read()
+    this.value = b != 0
+  }
+
+  @Throws(IOException::class)
+  override fun writeBody(output: OutputStream) {
+    output.write(if (value) 1 else 0)
+  }
+
+  override fun getType(): AmfType = AmfType.BOOLEAN
+
+  override fun getSize(): Int = 1
+
+  override fun toString(): String {
+    return "AmfBoolean value: $value"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfData.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfData.kt
new file mode 100644
index 0000000..37469bc
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfData.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v0
+
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import kotlin.jvm.Throws
+
+/**
+ * Created by pedro on 20/04/21.
+ */
+abstract class AmfData {
+
+  companion object {
+
+    /**
+     * Read unknown AmfData and convert it to specific class
+     */
+    @Throws(IOException::class)
+    fun getAmfData(input: InputStream): AmfData {
+      val amfData = when (val type = getMarkType(input.read())) {
+        AmfType.NUMBER -> AmfNumber()
+        AmfType.BOOLEAN -> AmfBoolean()
+        AmfType.STRING -> AmfString()
+        AmfType.OBJECT -> AmfObject()
+        AmfType.NULL -> AmfNull()
+        AmfType.UNDEFINED -> AmfUndefined()
+        AmfType.ECMA_ARRAY -> AmfEcmaArray()
+        AmfType.STRICT_ARRAY -> AmfStrictArray()
+        else -> throw IOException("Unimplemented AMF data type: ${type.name}")
+      }
+      amfData.readBody(input)
+      return amfData
+    }
+
+    fun getMarkType(type: Int): AmfType {
+      return AmfType.values().find { it.mark.toInt() == type } ?: AmfType.STRING
+    }
+  }
+
+  @Throws(IOException::class)
+  fun readHeader(input: InputStream): AmfType {
+    return getMarkType(input.read())
+  }
+
+  @Throws(IOException::class)
+  fun writeHeader(output: OutputStream) {
+    output.write(getType().mark.toInt())
+  }
+
+  @Throws(IOException::class)
+  abstract fun readBody(input: InputStream)
+
+  @Throws(IOException::class)
+  abstract fun writeBody(output: OutputStream)
+
+  abstract fun getType(): AmfType
+
+  //Body size without header type
+  abstract fun getSize(): Int
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfEcmaArray.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfEcmaArray.kt
new file mode 100644
index 0000000..f0ca51b
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfEcmaArray.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v0
+
+import com.pedro.rtmp.utils.readUInt32
+import com.pedro.rtmp.utils.writeUInt32
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.util.LinkedHashMap
+import kotlin.jvm.Throws
+
+/**
+ * Created by pedro on 20/04/21.
+ *
+ * Exactly the same that AmfObject but start with an UInt32 that indicate the number of lines in Map
+ */
+class AmfEcmaArray(private val properties: HashMap<AmfString, AmfData> = LinkedHashMap()): AmfObject(properties) {
+
+  var length = 0
+
+  init {
+    // add length size to body
+    bodySize += 4
+  }
+
+  override fun setProperty(name: String, data: String) {
+    super.setProperty(name, data)
+    length = properties.size
+  }
+
+  override fun setProperty(name: String, data: Boolean) {
+    super.setProperty(name, data)
+    length = properties.size
+  }
+
+  override fun setProperty(name: String) {
+    super.setProperty(name)
+    length = properties.size
+  }
+
+  override fun setProperty(name: String, data: Double) {
+    super.setProperty(name, data)
+    length = properties.size
+  }
+
+  @Throws(IOException::class)
+  override fun readBody(input: InputStream) {
+    //get number of items as UInt32
+    length = input.readUInt32()
+    //read items
+    super.readBody(input)
+    bodySize += 4 //add length size to body
+  }
+
+  @Throws(IOException::class)
+  override fun writeBody(output: OutputStream) {
+    //write number of items in the list as UInt32
+    output.writeUInt32(length)
+    //write items
+    super.writeBody(output)
+  }
+
+  override fun getType(): AmfType = AmfType.ECMA_ARRAY
+
+  override fun toString(): String {
+    return "AmfEcmaArray length: $length, properties: $properties"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfNull.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfNull.kt
new file mode 100644
index 0000000..93843ce
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfNull.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v0
+
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import kotlin.jvm.Throws
+
+/**
+ * Created by pedro on 20/04/21.
+ *
+ * Contain an empty body
+ */
+class AmfNull: AmfData() {
+
+  @Throws(IOException::class)
+  override fun readBody(input: InputStream) {
+    //no body to read
+  }
+
+  @Throws(IOException::class)
+  override fun writeBody(output: OutputStream) {
+    //no body to write
+  }
+
+  override fun getType(): AmfType = AmfType.NULL
+
+  override fun getSize(): Int = 0
+
+  override fun toString(): String {
+    return "AmfNull"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfNumber.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfNumber.kt
new file mode 100644
index 0000000..b185b39
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfNumber.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v0
+
+import com.pedro.rtmp.utils.readUntil
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.nio.ByteBuffer
+import kotlin.jvm.Throws
+
+/**
+ * Created by pedro on 20/04/21.
+ *
+ * A number in 8 bytes IEEE-754 double precision floating point value
+ */
+class AmfNumber(var value: Double = 0.0): AmfData() {
+
+  @Throws(IOException::class)
+  override fun readBody(input: InputStream) {
+    val bytes = ByteArray(getSize())
+    input.readUntil(bytes)
+    val value = ByteBuffer.wrap(bytes).long
+    this.value = Double.Companion.fromBits(value)
+  }
+
+  @Throws(IOException::class)
+  override fun writeBody(output: OutputStream) {
+    val byteBuffer = ByteBuffer.allocate(getSize()).putLong(value.toRawBits())
+    output.write(byteBuffer.array())
+  }
+
+  override fun getType(): AmfType = AmfType.NUMBER
+
+  override fun getSize(): Int = 8
+
+  override fun toString(): String {
+    return "AmfNumber value: $value"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfObject.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfObject.kt
new file mode 100644
index 0000000..a747bd3
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfObject.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v0
+
+import java.io.BufferedInputStream
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.util.LinkedHashMap
+
+/**
+ * Created by pedro on 20/04/21.
+ *
+ * A Map of others amf packets where key is an AmfString and value could be any amf packet
+ */
+open class AmfObject(private val properties: HashMap<AmfString, AmfData> = LinkedHashMap()): AmfData() {
+
+  protected var bodySize = 0
+
+  init {
+    properties.forEach {
+      //Get size of all elements and include in size value. + 1 because include header size
+      bodySize += it.key.getSize()
+      bodySize += it.value.getSize() + 1
+    }
+    val objectEnd = AmfObjectEnd()
+    bodySize += objectEnd.getSize()
+  }
+
+  fun getProperty(name: String): AmfData? {
+    properties.forEach {
+      if (it.key.value == name) {
+        return it.value
+      }
+    }
+    return null
+  }
+
+  open fun setProperty(name: String, data: String) {
+    val key = AmfString(name)
+    val value = AmfString(data)
+    properties[key] = value
+    bodySize += key.getSize()
+    bodySize += value.getSize() + 1
+  }
+
+  open fun setProperty(name: String, data: Boolean) {
+    val key = AmfString(name)
+    val value = AmfBoolean(data)
+    properties[key] = value
+    bodySize += key.getSize()
+    bodySize += value.getSize() + 1
+  }
+
+  open fun setProperty(name: String) {
+    val key = AmfString(name)
+    val value = AmfNull()
+    properties[key] = value
+    bodySize += key.getSize()
+    bodySize += value.getSize() + 1
+  }
+
+  open fun setProperty(name: String, data: Double) {
+    val key = AmfString(name)
+    val value = AmfNumber(data)
+    properties[key] = value
+    bodySize += key.getSize()
+    bodySize += value.getSize() + 1
+  }
+
+  @Throws(IOException::class)
+  override fun readBody(input: InputStream) {
+    properties.clear()
+    bodySize = 0
+    val objectEnd = AmfObjectEnd()
+    val markInputStream: InputStream = if (input.markSupported()) input else BufferedInputStream(input)
+    while (!objectEnd.found) {
+      markInputStream.mark(objectEnd.getSize())
+      objectEnd.readBody(input)
+      if (objectEnd.found) {
+        bodySize += objectEnd.getSize()
+      } else {
+        markInputStream.reset()
+
+        val key = AmfString()
+        key.readBody(input)
+        bodySize += key.getSize()
+
+        val value = getAmfData(input)
+        bodySize += value.getSize() + 1
+
+        properties[key] = value
+      }
+    }
+  }
+
+  @Throws(IOException::class)
+  override fun writeBody(output: OutputStream) {
+    properties.forEach {
+      it.key.writeBody(output)
+
+      it.value.writeHeader(output)
+      it.value.writeBody(output)
+    }
+    val objectEnd = AmfObjectEnd()
+    objectEnd.writeBody(output)
+  }
+
+  override fun getType(): AmfType = AmfType.OBJECT
+
+  override fun getSize(): Int = bodySize
+
+  override fun toString(): String {
+    return "AmfObject properties: $properties"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfObjectEnd.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfObjectEnd.kt
new file mode 100644
index 0000000..1c92258
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfObjectEnd.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v0
+
+import com.pedro.rtmp.utils.readUntil
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import kotlin.jvm.Throws
+
+/**
+ * Created by pedro on 20/04/21.
+ *
+ * Packet used to indicate end of AmfObject and AmfEcmaArray.
+ * This is a final sequence of 3 bytes.
+ */
+class AmfObjectEnd(var found: Boolean = false): AmfData() {
+
+  private val endSequence = byteArrayOf(0x00, 0x00, getType().mark)
+
+  @Throws(IOException::class)
+  override fun readBody(input: InputStream) {
+    val bytes = ByteArray(getSize())
+    input.readUntil(bytes)
+    found = bytes contentEquals endSequence
+  }
+
+  @Throws(IOException::class)
+  override fun writeBody(output: OutputStream) {
+    output.write(endSequence)
+  }
+
+  override fun getType(): AmfType = AmfType.OBJECT_END
+
+  override fun getSize(): Int = endSequence.size
+
+  override fun toString(): String {
+    return "AmfObjectEnd"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfStrictArray.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfStrictArray.kt
new file mode 100644
index 0000000..a516414
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfStrictArray.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v0
+
+import com.pedro.rtmp.utils.readUInt32
+import com.pedro.rtmp.utils.writeUInt32
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import kotlin.jvm.Throws
+
+/**
+ * Created by pedro on 20/04/21.
+ *
+ * A list of any amf packets that start with an UInt32 to indicate number of items
+ */
+class AmfStrictArray(val items: MutableList<AmfData> = mutableListOf()): AmfData() {
+
+  private var bodySize = 0
+
+  init {
+    bodySize += 4
+    items.forEach {
+      bodySize += it.getSize() + 1
+    }
+  }
+
+  @Throws(IOException::class)
+  override fun readBody(input: InputStream) {
+    items.clear()
+    bodySize = 0
+    //get number of items as UInt32
+    val length = input.readUInt32()
+    bodySize += 4
+    //read items
+    for (i in 0 until length) {
+      val amfData = getAmfData(input)
+      bodySize += amfData.getSize() + 1
+      items.add(amfData)
+    }
+  }
+
+  @Throws(IOException::class)
+  override fun writeBody(output: OutputStream) {
+    //write number of items in the list as UInt32
+    output.writeUInt32(items.size)
+    //write items
+    items.forEach {
+      it.writeHeader(output)
+      it.writeBody(output)
+    }
+  }
+
+  override fun getType(): AmfType = AmfType.STRICT_ARRAY
+
+  override fun getSize(): Int = bodySize
+
+  override fun toString(): String {
+    return "AmfStrictArray items: ${items.toTypedArray().contentToString()}"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfString.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfString.kt
new file mode 100644
index 0000000..74474c5
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfString.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v0
+
+import com.pedro.rtmp.utils.readUInt16
+import com.pedro.rtmp.utils.readUntil
+import com.pedro.rtmp.utils.writeUInt16
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import kotlin.jvm.Throws
+
+/**
+ * Created by pedro on 8/04/21.
+ *
+ * A string encoded in ASCII where 2 first bytes indicate string size
+ */
+class AmfString(var value: String = ""): AmfData() {
+
+  private var bodySize: Int = value.toByteArray(Charsets.US_ASCII).size + 2
+
+  @Throws(IOException::class)
+  override fun readBody(input: InputStream) {
+    //read value size as UInt16
+    bodySize = input.readUInt16()
+    //read value in ASCII
+    val bytes = ByteArray(bodySize)
+    bodySize += 2
+    input.readUntil(bytes)
+    value = String(bytes, Charsets.US_ASCII)
+  }
+
+  @Throws(IOException::class)
+  override fun writeBody(output: OutputStream) {
+    val bytes = value.toByteArray(Charsets.US_ASCII)
+    //write value size as UInt16. Value size not included
+    output.writeUInt16(bodySize - 2)
+    //write value bytes in ASCII
+    output.write(bytes)
+  }
+
+  override fun getType(): AmfType = AmfType.STRING
+
+  override fun getSize(): Int = bodySize
+
+  override fun toString(): String {
+    return "AmfString value: $value"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfType.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfType.kt
new file mode 100644
index 0000000..fa427dd
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfType.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v0
+
+/**
+ * Created by pedro on 20/04/21.
+ */
+enum class AmfType(val mark: Byte) {
+  NUMBER(0x00), BOOLEAN(0x01), STRING(0x02), OBJECT(0x03),
+  NULL(0x05), UNDEFINED(0x06), ECMA_ARRAY(0x08), STRICT_ARRAY(0x0A),
+
+  /**
+   * Not used in RTMP
+   */
+  REFERENCE(0x07), DATE(0x0B), LONG_STRING(0x0C), OBJECT_END(0x09),
+  UNSUPPORTED(0x0D), XML_DOCUMENT(0x0F), TYPED_OBJECT(0x10),
+
+  /**
+   * reserved, not supported
+   */
+  MOVIE_CLIP(0x04), RECORD_SET(0x0E),
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfUndefined.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfUndefined.kt
new file mode 100644
index 0000000..7091b97
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfUndefined.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v0
+
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import kotlin.jvm.Throws
+
+/**
+ * Created by pedro on 20/04/21.
+ *
+ * Contain an empty body
+ */
+class AmfUndefined: AmfData() {
+
+  @Throws(IOException::class)
+  override fun readBody(input: InputStream) {
+    //no body to read
+  }
+
+  @Throws(IOException::class)
+  override fun writeBody(output: OutputStream) {
+    //no body to write
+  }
+
+  override fun getType(): AmfType = AmfType.UNDEFINED
+
+  override fun getSize(): Int = 0
+
+  override fun toString(): String {
+    return "AmfUndefined"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Array.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Array.kt
new file mode 100644
index 0000000..5c908ac
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Array.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+class Amf3Array: Amf3Data() {
+
+  override fun readBody(input: InputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun writeBody(output: OutputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun getType(): Amf3Type = Amf3Type.ARRAY
+
+  override fun getSize(): Int {
+    TODO("Not yet implemented")
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Data.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Data.kt
new file mode 100644
index 0000000..6af612a
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Data.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import kotlin.jvm.Throws
+
+/**
+ * Created by pedro on 20/04/21.
+ */
+abstract class Amf3Data {
+
+  companion object {
+
+    /**
+     * Read unknown AmfData and convert it to specific class
+     */
+    @Throws(IOException::class)
+    fun getAmf3Data(input: InputStream): Amf3Data {
+      val amf3Data = when (val type = getMark3Type(input.read())) {
+        Amf3Type.DOUBLE -> Amf3Double()
+        Amf3Type.INTEGER -> Amf3Integer()
+        Amf3Type.STRING -> Amf3String()
+        Amf3Type.OBJECT -> Amf3Object()
+        Amf3Type.NULL -> Amf3Null()
+        Amf3Type.UNDEFINED -> Amf3Undefined()
+        Amf3Type.ARRAY -> Amf3Array()
+        Amf3Type.DICTIONARY -> Amf3Dictionary()
+        Amf3Type.TRUE -> Amf3True()
+        Amf3Type.FALSE -> Amf3False()
+        else -> throw IOException("Unimplemented AMF3 data type: ${type.name}")
+      }
+      amf3Data.readBody(input)
+      return amf3Data
+    }
+
+    fun getMark3Type(type: Int): Amf3Type {
+      return Amf3Type.values().find { it.mark.toInt() == type } ?: Amf3Type.STRING
+    }
+  }
+
+  @Throws(IOException::class)
+  fun readHeader(input: InputStream): Amf3Type {
+    return getMark3Type(input.read())
+  }
+
+  @Throws(IOException::class)
+  fun writeHeader(output: OutputStream) {
+    output.write(getType().mark.toInt())
+  }
+
+  @Throws(IOException::class)
+  abstract fun readBody(input: InputStream)
+
+  @Throws(IOException::class)
+  abstract fun writeBody(output: OutputStream)
+
+  abstract fun getType(): Amf3Type
+
+  //Body size without header type
+  abstract fun getSize(): Int
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Dictionary.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Dictionary.kt
new file mode 100644
index 0000000..37a1bed
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Dictionary.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+class Amf3Dictionary: Amf3Data() {
+
+  override fun readBody(input: InputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun writeBody(output: OutputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun getType(): Amf3Type = Amf3Type.DICTIONARY
+
+  override fun getSize(): Int {
+    TODO("Not yet implemented")
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Double.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Double.kt
new file mode 100644
index 0000000..9095cd7
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Double.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+import com.pedro.rtmp.utils.readUntil
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.nio.ByteBuffer
+import kotlin.jvm.Throws
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+class Amf3Double(var value: Double = 0.0): Amf3Data() {
+
+  @Throws(IOException::class)
+  override fun readBody(input: InputStream) {
+    val bytes = ByteArray(getSize())
+    input.readUntil(bytes)
+    val value = ByteBuffer.wrap(bytes).long
+    this.value = Double.Companion.fromBits(value)
+  }
+
+  @Throws(IOException::class)
+  override fun writeBody(output: OutputStream) {
+    val byteBuffer = ByteBuffer.allocate(getSize()).putLong(value.toRawBits())
+    output.write(byteBuffer.array())
+  }
+
+  override fun getType(): Amf3Type = Amf3Type.DOUBLE
+
+  override fun getSize(): Int = 8
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3False.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3False.kt
new file mode 100644
index 0000000..2df8b26
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3False.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+class Amf3False: Amf3Data() {
+
+  override fun readBody(input: InputStream) {
+    //no body to read
+  }
+
+  override fun writeBody(output: OutputStream) {
+    //no body to write
+  }
+
+  override fun getType(): Amf3Type = Amf3Type.FALSE
+
+  override fun getSize(): Int = 0
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Integer.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Integer.kt
new file mode 100644
index 0000000..5635837
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Integer.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+class Amf3Integer: Amf3Data() {
+
+  override fun readBody(input: InputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun writeBody(output: OutputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun getType(): Amf3Type = Amf3Type.INTEGER
+
+  override fun getSize(): Int {
+    TODO("Not yet implemented")
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Null.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Null.kt
new file mode 100644
index 0000000..87189d3
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Null.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+class Amf3Null: Amf3Data() {
+
+  override fun readBody(input: InputStream) {
+    //no body to read
+  }
+
+  override fun writeBody(output: OutputStream) {
+    //no body to write
+  }
+
+  override fun getType(): Amf3Type = Amf3Type.NULL
+
+  override fun getSize(): Int = 0
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Object.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Object.kt
new file mode 100644
index 0000000..4847d5e
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Object.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+class Amf3Object: Amf3Data() {
+
+  override fun readBody(input: InputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun writeBody(output: OutputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun getType(): Amf3Type = Amf3Type.OBJECT
+
+  override fun getSize(): Int {
+    TODO("Not yet implemented")
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3String.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3String.kt
new file mode 100644
index 0000000..2c8739d
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3String.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 8/04/21.
+ */
+class Amf3String: Amf3Data() {
+
+  override fun readBody(input: InputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun writeBody(output: OutputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun getType(): Amf3Type = Amf3Type.STRING
+
+  override fun getSize(): Int {
+    TODO("Not yet implemented")
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3True.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3True.kt
new file mode 100644
index 0000000..e2e65c5
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3True.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+class Amf3True: Amf3Data() {
+
+  override fun readBody(input: InputStream) {
+    //no body to read
+  }
+
+  override fun writeBody(output: OutputStream) {
+    //no body to write
+  }
+
+  override fun getType(): Amf3Type = Amf3Type.TRUE
+
+  override fun getSize(): Int = 0
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Type.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Type.kt
new file mode 100644
index 0000000..b89507f
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Type.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+enum class Amf3Type(val mark: Byte) {
+  UNDEFINED(0x00), NULL(0x01), TRUE(0x02), FALSE(0x03), INTEGER(0x04), 
+  DOUBLE(0x05), STRING(0x06), XML_DOC(0x07), DATE(0x08), ARRAY(0x09), 
+  OBJECT(0x0A), XML(0x0B), BYTE_ARRAY(0x0C), VECTOR_INT(0x0D), VECTOR_UINT(0x0E), 
+  VECTOR_DOUBLE(0x0F), VECTOR_OBJECT(0x10), DICTIONARY(0x11)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Undefined.kt b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Undefined.kt
new file mode 100644
index 0000000..c6b8112
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Undefined.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.amf.v3
+
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+class Amf3Undefined: Amf3Data() {
+
+  override fun readBody(input: InputStream) {
+    //no body to read
+  }
+
+  override fun writeBody(output: OutputStream) {
+    //no body to write
+  }
+
+  override fun getType(): Amf3Type = Amf3Type.UNDEFINED
+
+  override fun getSize(): Int = 0
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/FlvPacket.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/FlvPacket.kt
new file mode 100644
index 0000000..6a9366b
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/FlvPacket.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv
+
+/**
+ * Created by pedro on 8/04/21.
+ */
+data class FlvPacket(val buffer: ByteArray = byteArrayOf(), var timeStamp: Long = 0,
+                     val length: Int = 0, val type: FlvType = FlvType.AUDIO)
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/FlvType.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/FlvType.kt
new file mode 100644
index 0000000..685ce36
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/FlvType.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+enum class FlvType {
+  AUDIO, VIDEO
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AacPacket.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AacPacket.kt
new file mode 100644
index 0000000..7190d40
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AacPacket.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.audio
+
+import android.media.MediaCodec
+import com.pedro.rtmp.flv.FlvPacket
+import com.pedro.rtmp.flv.FlvType
+import java.nio.ByteBuffer
+import kotlin.experimental.or
+
+/**
+ * Created by pedro on 8/04/21.
+ */
+class AacPacket(private val audioPacketCallback: AudioPacketCallback) {
+
+  private val header = ByteArray(2)
+  //first time we need send audio config
+  private var configSend = false
+
+  private var sampleRate = 44100
+  private var isStereo = true
+  //In microphone we are using always 16bits pcm encoding. Change me if needed
+  private var audioSize = AudioSize.SND_16_BIT
+  //In encoder we are using always AAC LC. Change me if needed
+  private val objectType = AudioObjectType.AAC_LC
+
+  enum class Type(val mark: Byte) {
+    SEQUENCE(0x00), RAW(0x01)
+  }
+
+  fun sendAudioInfo(sampleRate: Int, isStereo: Boolean, audioSize: AudioSize = AudioSize.SND_16_BIT) {
+    this.sampleRate = sampleRate
+    this.isStereo = isStereo
+    this.audioSize = audioSize
+  }
+
+  fun createFlvAudioPacket(byteBuffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    //header is 2 bytes length
+    //4 bits sound format, 2 bits sound rate, 1 bit sound size, 1 bit sound type
+    //8 bits sound data (always 10 because we aer using aac)
+    header[0] = if (isStereo) AudioSoundType.STEREO.value else AudioSoundType.MONO.value
+    header[0] = header[0] or (audioSize.value shl 1).toByte()
+    val soundRate = when (sampleRate) {
+      44100 -> AudioSoundRate.SR_44_1K
+      22050 -> AudioSoundRate.SR_22K
+      11025 -> AudioSoundRate.SR_11K
+      5500 -> AudioSoundRate.SR_5_5K
+      else -> AudioSoundRate.SR_44_1K
+    }
+    header[0] = header[0] or (soundRate.value shl 2).toByte()
+    header[0] = header[0] or (AudioFormat.AAC.value shl 4).toByte()
+    val buffer: ByteArray
+    if (!configSend) {
+      val config = AudioSpecificConfig(objectType.value, sampleRate, if (isStereo) 2 else 1)
+      buffer = ByteArray(config.size + header.size)
+      header[1] = Type.SEQUENCE.mark
+      config.write(buffer, header.size)
+      configSend = true
+    } else {
+      header[1] = Type.RAW.mark
+      buffer = ByteArray(info.size - info.offset + header.size)
+
+      byteBuffer.get(buffer, header.size, info.size - info.offset)
+    }
+    System.arraycopy(header, 0, buffer, 0, header.size)
+    val ts = info.presentationTimeUs / 1000
+    audioPacketCallback.onAudioFrameCreated(FlvPacket(buffer, ts, buffer.size, FlvType.AUDIO))
+  }
+
+  fun reset() {
+    configSend = false
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioFormat.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioFormat.kt
new file mode 100644
index 0000000..ed84302
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioFormat.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.audio
+
+/**
+ * Created by pedro on 29/04/21.
+ * list of audio codec supported by FLV
+ */
+enum class AudioFormat(val value: Int) {
+  PCM(0), ADPCM(1), MP3(2), PCM_LE(3), NELLYMOSER_16K(4),
+  NELLYMOSER_8K(5), NELLYMOSER(6), G711_A(7), G711_MU(8), RESERVED(9),
+  AAC(10), SPEEX(11), MP3_8K(14), DEVICE_SPECIFIC(15)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioObjectType.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioObjectType.kt
new file mode 100644
index 0000000..ecbc3c6
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioObjectType.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.audio
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+enum class AudioObjectType(val value: Int) {
+  UNKNOWN(0), AAC_MAIN(1), AAC_LC(2), AAC_SSR(3), AAC_LTP(4),
+  AAC_SBR(5), AAC_SCALABLE(6), TWINQ_VQ(7), CELP(8), HXVC(9)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioPacketCallback.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioPacketCallback.kt
new file mode 100644
index 0000000..ad70138
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioPacketCallback.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.audio
+
+import com.pedro.rtmp.flv.FlvPacket
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+interface AudioPacketCallback {
+  fun onAudioFrameCreated(flvPacket: FlvPacket)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSize.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSize.kt
new file mode 100644
index 0000000..6b7bc4f
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSize.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.audio
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+enum class AudioSize(val value: Int) {
+  SND_8_BIT(0), SND_16_BIT(1)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSoundRate.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSoundRate.kt
new file mode 100644
index 0000000..cb280ef
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSoundRate.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.audio
+
+/**
+ * Created by pedro on 29/04/21.
+ * sample rates supported
+ */
+enum class AudioSoundRate(val value: Int) {
+  SR_5_5K(0), SR_11K(1), SR_22K(2), SR_44_1K(3)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSoundType.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSoundType.kt
new file mode 100644
index 0000000..126c930
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSoundType.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.audio
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+enum class AudioSoundType(val value: Byte) {
+  MONO(0x00), STEREO(0x01)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSpecificConfig.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSpecificConfig.kt
new file mode 100644
index 0000000..838deb7
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/audio/AudioSpecificConfig.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.audio
+
+/**
+ * Created by pedro on 29/04/21.
+ *
+ * ISO 14496-3
+ */
+class AudioSpecificConfig(private val type: Int, private val sampleRate: Int, private val channels: Int) {
+
+  /** supported sampleRates.  */
+  private val AUDIO_SAMPLING_RATES = intArrayOf(
+      96000,  // 0
+      88200,  // 1
+      64000,  // 2
+      48000,  // 3
+      44100,  // 4
+      32000,  // 5
+      24000,  // 6
+      22050,  // 7
+      16000,  // 8
+      12000,  // 9
+      11025,  // 10
+      8000,  // 11
+      7350,  // 12
+  )
+
+  val size = 9
+
+  fun write(buffer: ByteArray, offset: Int) {
+    writeConfig(buffer, offset)
+    writeAdts(buffer, offset + 2)
+  }
+
+  private fun writeConfig(buffer: ByteArray, offset: Int) {
+    val frequency = getFrequency()
+    buffer[offset] = ((type shl 3) or (frequency shr 1)).toByte()
+    buffer[offset + 1] = (frequency shl 7 and 0x80).plus(channels shl 3 and 0x78).toByte()
+  }
+
+  private fun writeAdts(buffer: ByteArray, offset: Int) {
+    val frequency = getFrequency()
+    buffer[offset] = 0xFF.toByte()
+    buffer[offset + 1] = 0xF9.toByte()
+    buffer[offset + 2] = (((type - 1) shl 6) or (frequency shl 2) or (channels shr 2)).toByte()
+    buffer[offset + 3] = (((channels and 3) shl 6) or (buffer.size shr 11)).toByte()
+    buffer[offset + 4] = ((buffer.size and 0x7FF) shr 3).toByte()
+    buffer[offset + 5] = (((buffer.size and 7) shl 5).toByte()).plus(0x1F).toByte()
+    buffer[offset + 6] = 0xFC.toByte()
+  }
+
+  private fun getFrequency(): Int {
+    var frequency = AUDIO_SAMPLING_RATES.indexOf(sampleRate)
+    //sane check, if samplerate not found using default 44100
+    if (frequency == -1) frequency = 4
+    return frequency
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/video/H264Packet.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/video/H264Packet.kt
new file mode 100644
index 0000000..9bb87ef
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/video/H264Packet.kt
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.video
+
+import android.media.MediaCodec
+import android.util.Log
+import com.pedro.rtmp.flv.FlvPacket
+import com.pedro.rtmp.flv.FlvType
+import java.nio.ByteBuffer
+import kotlin.experimental.and
+
+/**
+ * Created by pedro on 8/04/21.
+ *
+ * ISO 14496-15
+ */
+class H264Packet(private val videoPacketCallback: VideoPacketCallback) {
+
+  private val TAG = "H264Packet"
+
+  private val header = ByteArray(5)
+  private val naluSize = 4
+  //first time we need send video config
+  private var configSend = false
+
+  private var sps: ByteArray? = null
+  private var pps: ByteArray? = null
+  var profileIop = ProfileIop.BASELINE
+
+  enum class Type(val value: Byte) {
+    SEQUENCE(0x00), NALU(0x01), EO_SEQ(0x02)
+  }
+
+  fun sendVideoInfo(sps: ByteBuffer, pps: ByteBuffer) {
+    val mSps = removeHeader(sps)
+    val mPps = removeHeader(pps)
+
+    val spsBytes = ByteArray(mSps.remaining())
+    val ppsBytes = ByteArray(mPps.remaining())
+    mSps.get(spsBytes, 0, spsBytes.size)
+    mPps.get(ppsBytes, 0, ppsBytes.size)
+
+    this.sps = spsBytes
+    this.pps = ppsBytes
+  }
+
+  fun createFlvVideoPacket(byteBuffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    byteBuffer.rewind()
+    val ts = info.presentationTimeUs / 1000
+    //header is 5 bytes length:
+    //4 bits FrameType, 4 bits CodecID
+    //1 byte AVCPacketType
+    //3 bytes CompositionTime, the cts.
+    val cts = 0
+    header[2] = (cts shr 16).toByte()
+    header[3] = (cts shr 8).toByte()
+    header[4] = cts.toByte()
+
+    var buffer: ByteArray
+    if (!configSend) {
+      header[0] = ((VideoDataType.KEYFRAME.value shl 4) or VideoFormat.AVC.value).toByte()
+      header[1] = Type.SEQUENCE.value
+
+      val sps = this.sps
+      val pps = this.pps
+      if (sps != null && pps != null) {
+        val config = VideoSpecificConfig(sps, pps, profileIop)
+        buffer = ByteArray(config.size + header.size)
+        config.write(buffer, header.size)
+      } else {
+        Log.e(TAG, "waiting for a valid sps and pps")
+        return
+      }
+
+      System.arraycopy(header, 0, buffer, 0, header.size)
+      videoPacketCallback.onVideoFrameCreated(FlvPacket(buffer, ts, buffer.size, FlvType.VIDEO))
+      configSend = true
+    }
+    if (configSend){
+      val headerSize = getHeaderSize(byteBuffer)
+      if (headerSize == 0) return //invalid buffer or waiting for sps/pps
+      byteBuffer.rewind()
+      val validBuffer = removeHeader(byteBuffer, headerSize)
+      val size = validBuffer.remaining()
+      buffer = ByteArray(header.size + size + naluSize)
+
+      val type: Int = (validBuffer.get(0) and 0x1F).toInt()
+      var nalType = VideoDataType.INTER_FRAME.value
+      if (type == VideoNalType.IDR.value || info.flags == MediaCodec.BUFFER_FLAG_KEY_FRAME) {
+        nalType = VideoDataType.KEYFRAME.value
+      } else if (type == VideoNalType.SPS.value || type == VideoNalType.PPS.value) {
+        // we don't need send it because we already do it in video config
+        return
+      }
+      header[0] = ((nalType shl 4) or VideoFormat.AVC.value).toByte()
+      header[1] = Type.NALU.value
+      writeNaluSize(buffer, header.size, size)
+      validBuffer.get(buffer, header.size + naluSize, size)
+
+      System.arraycopy(header, 0, buffer, 0, header.size)
+      videoPacketCallback.onVideoFrameCreated(FlvPacket(buffer, ts, buffer.size, FlvType.VIDEO))
+    }
+  }
+
+  //naluSize = UInt32
+  private fun writeNaluSize(buffer: ByteArray, offset: Int, size: Int) {
+    buffer[offset] = (size ushr 24).toByte()
+    buffer[offset + 1] = (size ushr 16).toByte()
+    buffer[offset + 2] = (size ushr 8).toByte()
+    buffer[offset + 3] = size.toByte()
+  }
+
+  private fun removeHeader(byteBuffer: ByteBuffer, size: Int = -1): ByteBuffer {
+    val position = if (size == -1) getStartCodeSize(byteBuffer) else size
+    byteBuffer.position(position)
+    return byteBuffer.slice()
+  }
+
+  private fun getHeaderSize(byteBuffer: ByteBuffer): Int {
+    if (byteBuffer.remaining() < 4) return 0
+
+    val sps = this.sps
+    val pps = this.pps
+    if (sps != null && pps != null) {
+      val startCodeSize = getStartCodeSize(byteBuffer)
+      if (startCodeSize == 0) return 0
+      val startCode = ByteArray(startCodeSize) { 0x00 }
+      startCode[startCodeSize - 1] = 0x01
+      val avcHeader = startCode.plus(sps).plus(startCode).plus(pps).plus(startCode)
+      if (byteBuffer.remaining() < avcHeader.size) return startCodeSize
+
+      val possibleAvcHeader = ByteArray(avcHeader.size)
+      byteBuffer.get(possibleAvcHeader, 0, possibleAvcHeader.size)
+      return if (avcHeader.contentEquals(possibleAvcHeader)) {
+        avcHeader.size
+      } else {
+        startCodeSize
+      }
+    }
+    return 0
+  }
+
+  private fun getStartCodeSize(byteBuffer: ByteBuffer): Int {
+    var startCodeSize = 0
+    if (byteBuffer.get(0).toInt() == 0x00 && byteBuffer.get(1).toInt() == 0x00
+      && byteBuffer.get(2).toInt() == 0x00 && byteBuffer.get(3).toInt() == 0x01) {
+      //match 00 00 00 01
+      startCodeSize = 4
+    } else if (byteBuffer.get(0).toInt() == 0x00 && byteBuffer.get(1).toInt() == 0x00
+      && byteBuffer.get(2).toInt() == 0x01) {
+      //match 00 00 01
+      startCodeSize = 3
+    }
+    return startCodeSize
+  }
+
+  fun reset(resetInfo: Boolean = true) {
+    if (resetInfo) {
+      sps = null
+      pps = null
+    }
+    configSend = false
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/video/ProfileIop.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/video/ProfileIop.kt
new file mode 100644
index 0000000..1ad88fe
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/video/ProfileIop.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.video
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+enum class ProfileIop(val value: Byte) {
+  BASELINE(0x00), CONSTRAINED(0x0C)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoDataType.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoDataType.kt
new file mode 100644
index 0000000..bea763a
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoDataType.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.video
+
+/**
+ * Created by pedro on 1/05/21.
+ */
+enum class VideoDataType(val value: Int) {
+  KEYFRAME(1), INTER_FRAME(2)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoFormat.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoFormat.kt
new file mode 100644
index 0000000..66c6290
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoFormat.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.video
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+enum class VideoFormat(val value: Int) {
+  SORENSON_H263(2), SCREEN_1(3), VP6(4), VP6_ALPHA(5),
+  SCREEN_2(6), AVC(7), UNKNOWN(255)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoNalType.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoNalType.kt
new file mode 100644
index 0000000..59d5e43
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoNalType.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.video
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+enum class VideoNalType(val value: Int) {
+  UNSPEC(0), SLICE(1), DPA(2), DPB(3), DPC(4), IDR(5), SEI(6),
+  SPS(7), PPS(8), AUD(9), EO_SEQ(10), EO_STREAM(11), FILL(12)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoPacketCallback.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoPacketCallback.kt
new file mode 100644
index 0000000..16e96c5
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoPacketCallback.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.video
+
+import com.pedro.rtmp.flv.FlvPacket
+
+/**
+ * Created by pedro on 29/04/21.
+ */
+interface VideoPacketCallback {
+  fun onVideoFrameCreated(flvPacket: FlvPacket)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoSpecificConfig.kt b/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoSpecificConfig.kt
new file mode 100644
index 0000000..0159a59
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/flv/video/VideoSpecificConfig.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.flv.video
+
+import java.nio.ByteBuffer
+
+/**
+ * Created by pedro on 29/04/21.
+ *
+ * 5 bytes sps/pps header:
+ * 1 byte configurationVersion (always 1), 1 byte AVCProfileIndication, 1 byte profile_compatibility,
+ * 1 byte AVCLevelIndication, 1 byte lengthSizeMinusOneWithReserved (always 0xff)
+ * 3 bytes size of sps:
+ * 1 byte numOfSequenceParameterSetsWithReserved (always 0xe1), 2 bytes sequenceParameterSetLength(2B) (sps size)
+ * N bytes of sps.
+ * sequenceParameterSetNALUnit (sps data)
+ * 3 bytes size of pps:
+ * 1 byte numOfPictureParameterSets (always 1), 2 bytes pictureParameterSetLength (pps size)
+ * N bytes of pps:
+ * pictureParameterSetNALUnit (pps data)
+ */
+class VideoSpecificConfig(private val sps: ByteArray, private val pps: ByteArray, private val profileIop: ProfileIop) {
+
+  var size = calculateSize(sps, pps)
+
+  fun write(buffer: ByteArray, offset: Int) {
+    val data = ByteBuffer.wrap(buffer, offset, size)
+    //5 bytes sps/pps header
+    data.put(0x01)
+    val profileIdc = sps[1]
+    data.put(profileIdc)
+    data.put(profileIop.value)
+    val levelIdc = sps[3]
+    data.put(levelIdc)
+    data.put(0xff.toByte())
+    //3 bytes size of sps
+    data.put(0xe1.toByte())
+    data.putShort(sps.size.toShort())
+    //N bytes of sps
+    data.put(sps)
+    //3 bytes size of pps
+    data.put(0x01)
+    data.putShort(pps.size.toShort())
+    //N bytes of pps
+    data.put(pps)
+  }
+
+  private fun calculateSize(sps: ByteArray, pps: ByteArray): Int {
+    return 5 + 3 + sps.size + 3 + pps.size
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManager.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManager.kt
new file mode 100644
index 0000000..1787861
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManager.kt
@@ -0,0 +1,313 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp
+
+import android.util.Log
+import com.pedro.rtmp.amf.v0.*
+import com.pedro.rtmp.flv.FlvPacket
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.rtmp.message.*
+import com.pedro.rtmp.rtmp.message.command.CommandAmf0
+import com.pedro.rtmp.rtmp.message.control.Event
+import com.pedro.rtmp.rtmp.message.control.Type
+import com.pedro.rtmp.rtmp.message.control.UserControl
+import com.pedro.rtmp.rtmp.message.data.DataAmf0
+import com.pedro.rtmp.utils.CommandSessionHistory
+import com.pedro.rtmp.utils.RtmpConfig
+import com.pedro.rtmp.utils.socket.RtmpSocket
+import java.io.*
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class CommandsManager {
+
+  private val TAG = "CommandsManager"
+
+  val sessionHistory = CommandSessionHistory()
+  var timestamp = 0
+  private var commandId = 0
+  var streamId = 0
+  var host = ""
+  var port = 1935
+  var appName = ""
+  var streamName = ""
+  var tcUrl = ""
+  var user: String? = null
+  var password: String? = null
+  var onAuth = false
+  var akamaiTs = false
+  var startTs = 0L
+  var readChunkSize = RtmpConfig.DEFAULT_CHUNK_SIZE
+  var audioDisabled = false
+  var videoDisabled = false
+
+  private var width = 640
+  private var height = 480
+  private var fps = 30
+  private var sampleRate = 44100
+  private var isStereo = true
+  //Avoid write a packet in middle of other.
+  private val writeSync = Any()
+
+  fun setVideoResolution(width: Int, height: Int) {
+    this.width = width
+    this.height = height
+  }
+
+  fun setFps(fps: Int) {
+    this.fps = fps
+  }
+
+  fun setAudioInfo(sampleRate: Int, isStereo: Boolean) {
+    this.sampleRate = sampleRate
+    this.isStereo = isStereo
+  }
+
+  fun setAuth(user: String?, password: String?) {
+    this.user = user
+    this.password = password
+  }
+
+  private fun getCurrentTimestamp(): Int {
+    return (System.currentTimeMillis() / 1000 - timestamp).toInt()
+  }
+
+  @Throws(IOException::class)
+  fun sendChunkSize(socket: RtmpSocket) {
+    synchronized(writeSync) {
+      val output = socket.getOutStream()
+      if (RtmpConfig.writeChunkSize != RtmpConfig.DEFAULT_CHUNK_SIZE) {
+        val chunkSize = SetChunkSize(RtmpConfig.writeChunkSize)
+        chunkSize.header.timeStamp = getCurrentTimestamp()
+        chunkSize.header.messageStreamId = streamId
+        chunkSize.writeHeader(output)
+        chunkSize.writeBody(output)
+        socket.flush()
+        Log.i(TAG, "send $chunkSize")
+      } else {
+        Log.i(TAG, "using default write chunk size ${RtmpConfig.DEFAULT_CHUNK_SIZE}")
+      }
+    }
+  }
+
+  @Throws(IOException::class)
+  fun sendConnect(auth: String, socket: RtmpSocket) {
+    synchronized(writeSync) {
+      val output = socket.getOutStream()
+      val connect = CommandAmf0("connect", ++commandId, getCurrentTimestamp(), streamId,
+        BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_CONNECTION.mark))
+      val connectInfo = AmfObject()
+      connectInfo.setProperty("app", appName + auth)
+      connectInfo.setProperty("flashVer", "FMLE/3.0 (compatible; Lavf57.56.101)")
+      connectInfo.setProperty("swfUrl", "")
+      connectInfo.setProperty("tcUrl", tcUrl + auth)
+      connectInfo.setProperty("fpad", false)
+      connectInfo.setProperty("capabilities", 239.0)
+      if (!audioDisabled) {
+        connectInfo.setProperty("audioCodecs", 3191.0)
+      }
+      if (!videoDisabled) {
+        connectInfo.setProperty("videoCodecs", 252.0)
+        connectInfo.setProperty("videoFunction", 1.0)
+      }
+      connectInfo.setProperty("pageUrl", "")
+      connectInfo.setProperty("objectEncoding", 0.0)
+      connect.addData(connectInfo)
+
+      connect.writeHeader(output)
+      connect.writeBody(output)
+      socket.flush()
+      sessionHistory.setPacket(commandId, "connect")
+      Log.i(TAG, "send $connect")
+    }
+  }
+
+  @Throws(IOException::class)
+  fun createStream(socket: RtmpSocket) {
+    synchronized(writeSync) {
+      val output = socket.getOutStream()
+      val releaseStream = CommandAmf0("releaseStream", ++commandId, getCurrentTimestamp(), streamId,
+        BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_STREAM.mark))
+      releaseStream.addData(AmfNull())
+      releaseStream.addData(AmfString(streamName))
+
+      releaseStream.writeHeader(output)
+      releaseStream.writeBody(output)
+      sessionHistory.setPacket(commandId, "releaseStream")
+      Log.i(TAG, "send $releaseStream")
+
+      val fcPublish = CommandAmf0("FCPublish", ++commandId, getCurrentTimestamp(), streamId,
+        BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_STREAM.mark))
+      fcPublish.addData(AmfNull())
+      fcPublish.addData(AmfString(streamName))
+
+      fcPublish.writeHeader(output)
+      fcPublish.writeBody(output)
+      sessionHistory.setPacket(commandId, "FCPublish")
+      Log.i(TAG, "send $fcPublish")
+
+      val createStream = CommandAmf0("createStream", ++commandId, getCurrentTimestamp(), streamId,
+        BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_CONNECTION.mark))
+      createStream.addData(AmfNull())
+
+      createStream.writeHeader(output)
+      createStream.writeBody(output)
+      socket.flush()
+      sessionHistory.setPacket(commandId, "createStream")
+      Log.i(TAG, "send $createStream")
+    }
+  }
+
+  @Throws(IOException::class)
+  fun readMessageResponse(socket: RtmpSocket): RtmpMessage {
+    val input = socket.getInputStream()
+    val message = RtmpMessage.getRtmpMessage(input, readChunkSize, sessionHistory)
+    sessionHistory.setReadHeader(message.header)
+    Log.i(TAG, "read $message")
+    return message
+  }
+
+  @Throws(IOException::class)
+  fun sendMetadata(socket: RtmpSocket) {
+    synchronized(writeSync) {
+      val output = socket.getOutStream()
+      val name = "@setDataFrame"
+      val metadata = DataAmf0(name, getCurrentTimestamp(), streamId)
+      metadata.addData(AmfString("onMetaData"))
+      val amfEcmaArray = AmfEcmaArray()
+      amfEcmaArray.setProperty("duration", 0.0)
+      if (!videoDisabled) {
+        amfEcmaArray.setProperty("width", width.toDouble())
+        amfEcmaArray.setProperty("height", height.toDouble())
+        amfEcmaArray.setProperty("videocodecid", 7.0)
+        amfEcmaArray.setProperty("framerate", fps.toDouble())
+        amfEcmaArray.setProperty("videodatarate", 0.0)
+      }
+      if (!audioDisabled) {
+        amfEcmaArray.setProperty("audiocodecid", 10.0)
+        amfEcmaArray.setProperty("audiosamplerate", sampleRate.toDouble())
+        amfEcmaArray.setProperty("audiosamplesize", 16.0)
+        amfEcmaArray.setProperty("audiodatarate", 0.0)
+      }
+      amfEcmaArray.setProperty("stereo", isStereo)
+      amfEcmaArray.setProperty("filesize", 0.0)
+      metadata.addData(amfEcmaArray)
+
+      metadata.writeHeader(output)
+      metadata.writeBody(output)
+      socket.flush()
+      Log.i(TAG, "send $metadata")
+    }
+  }
+
+  @Throws(IOException::class)
+  fun sendPublish(socket: RtmpSocket) {
+    synchronized(writeSync) {
+      val output = socket.getOutStream()
+      val name = "publish"
+      val publish = CommandAmf0(name, ++commandId, getCurrentTimestamp(), streamId,
+        BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_STREAM.mark))
+      publish.addData(AmfNull())
+      publish.addData(AmfString(streamName))
+      publish.addData(AmfString("live"))
+
+      publish.writeHeader(output)
+      publish.writeBody(output)
+      socket.flush()
+      sessionHistory.setPacket(commandId, name)
+      Log.i(TAG, "send $publish")
+    }
+  }
+
+  @Throws(IOException::class)
+  fun sendWindowAcknowledgementSize(socket: RtmpSocket) {
+    synchronized(writeSync) {
+      val output = socket.getOutStream()
+      val windowAcknowledgementSize = WindowAcknowledgementSize(RtmpConfig.acknowledgementWindowSize, getCurrentTimestamp())
+      windowAcknowledgementSize.writeHeader(output)
+      windowAcknowledgementSize.writeBody(output)
+      socket.flush()
+    }
+  }
+
+  fun sendPong(event: Event, socket: RtmpSocket) {
+    synchronized(writeSync) {
+      val output = socket.getOutStream()
+      val pong = UserControl(Type.PONG_REPLY, event)
+      pong.writeHeader(output)
+      pong.writeBody(output)
+      socket.flush()
+      Log.i(TAG, "send pong")
+    }
+  }
+
+  @Throws(IOException::class)
+  fun sendClose(socket: RtmpSocket) {
+    synchronized(writeSync) {
+      val output = socket.getOutStream()
+      val name = "closeStream"
+      val closeStream = CommandAmf0(name, ++commandId, getCurrentTimestamp(), streamId, BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_STREAM.mark))
+      closeStream.addData(AmfNull())
+
+      closeStream.writeHeader(output)
+      closeStream.writeBody(output)
+      socket.flush()
+      sessionHistory.setPacket(commandId, name)
+      Log.i(TAG, "send $closeStream")
+    }
+  }
+
+  @Throws(IOException::class)
+  fun sendVideoPacket(flvPacket: FlvPacket, socket: RtmpSocket): Int {
+    synchronized(writeSync) {
+      val output = socket.getOutStream()
+      if (akamaiTs) {
+        flvPacket.timeStamp = ((System.nanoTime() / 1000 - startTs) / 1000)
+      }
+      val video = Video(flvPacket, streamId)
+      video.writeHeader(output)
+      video.writeBody(output)
+      socket.flush()
+      return video.header.getPacketLength() //get packet size with header included to calculate bps
+    }
+  }
+
+  @Throws(IOException::class)
+  fun sendAudioPacket(flvPacket: FlvPacket, socket: RtmpSocket): Int {
+    synchronized(writeSync) {
+      val output = socket.getOutStream()
+      if (akamaiTs) {
+        flvPacket.timeStamp = ((System.nanoTime() / 1000 - startTs) / 1000)
+      }
+      val audio = Audio(flvPacket, streamId)
+      audio.writeHeader(output)
+      audio.writeBody(output)
+      socket.flush()
+      return audio.header.getPacketLength() //get packet size with header included to calculate bps
+    }
+  }
+
+  fun reset() {
+    startTs = 0
+    timestamp = 0
+    streamId = 0
+    commandId = 0
+    sessionHistory.reset()
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/Handshake.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/Handshake.kt
new file mode 100644
index 0000000..856a739
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/Handshake.kt
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp
+
+import android.util.Log
+import com.pedro.rtmp.utils.readUntil
+import com.pedro.rtmp.utils.socket.RtmpSocket
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import kotlin.random.Random
+
+/**
+ * Created by pedro on 8/04/21.
+ *
+ * The C0 and S0 packets are a single octet
+ *
+ * The version defined by this
+ * specification is 3. Values 0-2 are deprecated values used by
+ * earlier proprietary products; 4-31 are reserved for future
+ * implementations; and 32-255 are not allowed
+ * 0 1 2 3 4 5 6 7
+ * +-+-+-+-+-+-+-+-+
+ * | version |
+ * +-+-+-+-+-+-+-+-+
+ *
+ * The C1 and S1 packets are 1536 octets long
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | time (4 bytes) | local generated timestamp
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | zero (4 bytes) |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | random bytes |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | random bytes |
+ * | (cont) |
+ * | .... |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ * The C2 and S2 packets are 1536 octets long, and nearly an echo of S1 and C1 (respectively).
+ *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | time (4 bytes) | s1 timestamp for c2 or c1 for s2. In this case s1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | time2 (4 bytes) | timestamp of previous packet (s1 or c1). In this case c1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | random echo | random data field sent by the peer in s1 for c2 or s2 for c1.
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | random echo | random data field sent by the peer in s1 for c2 or s2 for c1.
+ * | (cont) |
+ * | .... |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+class Handshake {
+
+  private val TAG = "Handshake"
+
+  private val protocolVersion = 0x03
+  private val handshakeSize = 1536
+  private var timestampC1 = 0
+
+  @Throws(IOException::class)
+  fun sendHandshake(socket: RtmpSocket): Boolean {
+    var output = socket.getOutStream()
+    writeC0(output)
+    val c1 = writeC1(output)
+    socket.flush()
+    var input = socket.getInputStream()
+    readS0(input)
+    val s1 = readS1(input)
+    output = socket.getOutStream()
+    writeC2(output, s1)
+    socket.flush()
+    input = socket.getInputStream()
+    readS2(input, c1)
+    return true
+  }
+
+  @Throws(IOException::class)
+  private fun writeC0(output: OutputStream) {
+    Log.i(TAG, "writing C0")
+    output.write(protocolVersion)
+    Log.i(TAG, "C0 write successful")
+  }
+
+  @Throws(IOException::class)
+  private fun writeC1(output: OutputStream): ByteArray {
+    Log.i(TAG, "writing C1")
+    val c1 = ByteArray(handshakeSize)
+
+    timestampC1 = (System.currentTimeMillis() / 1000).toInt()
+    Log.i(TAG, "writing time $timestampC1 to c1")
+    val timestampData = ByteArray(4)
+    timestampData[0] = (timestampC1 ushr 24).toByte()
+    timestampData[1] = (timestampC1 ushr 16).toByte()
+    timestampData[2] = (timestampC1 ushr 8).toByte()
+    timestampData[3] = timestampC1.toByte()
+    System.arraycopy(timestampData, 0, c1, 0, timestampData.size)
+
+    Log.i(TAG, "writing zero to c1")
+    val zeroData = byteArrayOf(0x00, 0x00, 0x00, 0x00)
+    System.arraycopy(zeroData, 0, c1, timestampData.size, zeroData.size)
+
+    Log.i(TAG, "writing random to c1")
+    val random = Random.Default
+    val randomData = ByteArray(handshakeSize - 8)
+    for (i in randomData.indices step 1) { //step UInt8 size
+      //random with UInt8 max value
+      val uInt8 = random.nextInt().toByte()
+      randomData[i] = uInt8
+    }
+    System.arraycopy(randomData, 0, c1, 8, randomData.size)
+    output.write(c1)
+    Log.i(TAG, "C1 write successful")
+    return c1
+  }
+
+  @Throws(IOException::class)
+  private fun writeC2(output: OutputStream, s1: ByteArray) {
+    Log.i(TAG, "writing C2")
+    output.write(s1)
+    Log.i(TAG, "C2 write successful")
+  }
+
+  @Throws(IOException::class)
+  private fun readS0(input: InputStream): ByteArray {
+    Log.i(TAG, "reading S0")
+    val response = input.read()
+    if (response == protocolVersion || response == 72) {
+      Log.i(TAG, "read S0 successful")
+      return byteArrayOf(response.toByte())
+    } else {
+      throw IOException("$TAG error, unexpected $response S0 received")
+    }
+  }
+
+  @Throws(IOException::class)
+  private fun readS1(input: InputStream): ByteArray {
+    Log.i(TAG, "reading S1")
+    val s1 = ByteArray(handshakeSize)
+    input.readUntil(s1)
+    Log.i(TAG, "read S1 successful")
+    return s1
+  }
+
+  @Throws(IOException::class)
+  private fun readS2(input: InputStream, c1: ByteArray): ByteArray {
+    Log.i(TAG, "reading S2")
+    val s2 = ByteArray(handshakeSize)
+    input.readUntil(s2)
+    //S2 should be equals to C1 but we can skip this
+    if (!s2.contentEquals(c1)) {
+      Log.e(TAG, "S2 content is different that C1")
+    }
+    Log.i(TAG, "read S2 successful")
+    return s2
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt
new file mode 100644
index 0000000..b45de32
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt
@@ -0,0 +1,529 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp
+
+import android.media.MediaCodec
+import android.util.Log
+import com.pedro.rtmp.amf.v0.AmfNumber
+import com.pedro.rtmp.amf.v0.AmfObject
+import com.pedro.rtmp.amf.v0.AmfString
+import com.pedro.rtmp.flv.video.ProfileIop
+import com.pedro.rtmp.rtmp.message.*
+import com.pedro.rtmp.rtmp.message.command.Command
+import com.pedro.rtmp.rtmp.message.control.Type
+import com.pedro.rtmp.rtmp.message.control.UserControl
+import com.pedro.rtmp.utils.AuthUtil
+import com.pedro.rtmp.utils.ConnectCheckerRtmp
+import com.pedro.rtmp.utils.RtmpConfig
+import com.pedro.rtmp.utils.socket.RtmpSocket
+import com.pedro.rtmp.utils.socket.TcpSocket
+import com.pedro.rtmp.utils.socket.TcpTunneledSocket
+import java.io.*
+import java.net.*
+import java.nio.ByteBuffer
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledExecutorService
+import java.util.concurrent.TimeUnit
+import java.util.regex.Pattern
+
+/**
+ * Created by pedro on 8/04/21.
+ */
+class RtmpClient(private val connectCheckerRtmp: ConnectCheckerRtmp) {
+
+  private val TAG = "RtmpClient"
+  private val rtmpUrlPattern = Pattern.compile("^rtmpt?s?://([^/:]+)(?::(\\d+))*/([^/]+)/?([^*]*)$")
+
+  private var socket: RtmpSocket? = null
+  private var thread: ExecutorService? = null
+  private val commandsManager = CommandsManager()
+  private val rtmpSender = RtmpSender(connectCheckerRtmp, commandsManager)
+
+  @Volatile
+  var isStreaming = false
+    private set
+
+  private var url: String? = null
+  private var tlsEnabled = false
+  private var tunneled = false
+
+  private var doingRetry = false
+  private var numRetry = 0
+  private var reTries = 0
+  private var handler: ScheduledExecutorService? = null
+  private var runnable: Runnable? = null
+  private var checkServerAlive = false
+  private var publishPermitted = false
+
+  val droppedAudioFrames: Long
+    get() = rtmpSender.droppedAudioFrames
+  val droppedVideoFrames: Long
+    get() = rtmpSender.droppedVideoFrames
+
+  val cacheSize: Int
+    get() = rtmpSender.getCacheSize()
+  val sentAudioFrames: Long
+    get() = rtmpSender.getSentAudioFrames()
+  val sentVideoFrames: Long
+    get() = rtmpSender.getSentVideoFrames()
+
+  /**
+   * Check periodically if server is alive using Echo protocol.
+   */
+  fun setCheckServerAlive(enabled: Boolean) {
+    checkServerAlive = enabled
+  }
+
+  /**
+   * Must be called before connect
+   */
+  fun setOnlyAudio(onlyAudio: Boolean) {
+    commandsManager.audioDisabled = false
+    commandsManager.videoDisabled = onlyAudio
+  }
+
+  /**
+   * Must be called before connect
+   */
+  fun setOnlyVideo(onlyVideo: Boolean) {
+    commandsManager.videoDisabled = false
+    commandsManager.audioDisabled = onlyVideo
+  }
+
+  fun forceAkamaiTs(enabled: Boolean) {
+    commandsManager.akamaiTs = enabled
+  }
+
+  fun setWriteChunkSize(chunkSize: Int) {
+    RtmpConfig.writeChunkSize = chunkSize
+  }
+
+  fun setAuthorization(user: String?, password: String?) {
+    commandsManager.setAuth(user, password)
+  }
+
+  fun setReTries(reTries: Int) {
+    numRetry = reTries
+    this.reTries = reTries
+  }
+
+  fun shouldRetry(reason: String): Boolean {
+    val validReason = doingRetry && !reason.contains("Endpoint malformed")
+    return validReason && reTries > 0
+  }
+
+  fun setAudioInfo(sampleRate: Int, isStereo: Boolean) {
+    commandsManager.setAudioInfo(sampleRate, isStereo)
+    rtmpSender.setAudioInfo(sampleRate, isStereo)
+  }
+
+  fun setVideoInfo(sps: ByteBuffer, pps: ByteBuffer, vps: ByteBuffer?) {
+    Log.i(TAG, "send sps and pps")
+    rtmpSender.setVideoInfo(sps, pps, vps)
+  }
+
+  fun setProfileIop(profileIop: ProfileIop) {
+    rtmpSender.setProfileIop(profileIop)
+  }
+
+  fun setVideoResolution(width: Int, height: Int) {
+    commandsManager.setVideoResolution(width, height)
+  }
+
+  fun setFps(fps: Int) {
+    commandsManager.setFps(fps)
+  }
+
+  @JvmOverloads
+  fun connect(url: String?, isRetry: Boolean = false) {
+    if (!isRetry) doingRetry = true
+    if (url == null) {
+      isStreaming = false
+      connectCheckerRtmp.onConnectionFailedRtmp(
+          "Endpoint malformed, should be: rtmp://ip:port/appname/streamname")
+      return
+    }
+    if (!isStreaming || isRetry) {
+      this.url = url
+      connectCheckerRtmp.onConnectionStartedRtmp(url)
+      val rtmpMatcher = rtmpUrlPattern.matcher(url)
+      if (rtmpMatcher.matches()) {
+        val schema = rtmpMatcher.group(0) ?: ""
+        tunneled = schema.startsWith("rtmpt")
+        tlsEnabled = schema.startsWith("rtmps") || schema.startsWith("rtmpts")
+      } else {
+        connectCheckerRtmp.onConnectionFailedRtmp(
+            "Endpoint malformed, should be: rtmp://ip:port/appname/streamname")
+        return
+      }
+
+      commandsManager.host = rtmpMatcher.group(1) ?: ""
+      val portStr = rtmpMatcher.group(2)
+      val defaultPort = if (tlsEnabled) 443 else if (tunneled) 80 else 1935
+      commandsManager.port = portStr?.toInt() ?: defaultPort
+      commandsManager.appName = getAppName(rtmpMatcher.group(3) ?: "", rtmpMatcher.group(4) ?: "")
+      commandsManager.streamName = getStreamName(rtmpMatcher.group(4) ?: "")
+      commandsManager.tcUrl = getTcUrl((rtmpMatcher.group(0)
+          ?: "").substring(0, (rtmpMatcher.group(0)
+          ?: "").length - commandsManager.streamName.length))
+
+      isStreaming = true
+      thread = Executors.newSingleThreadExecutor()
+      thread?.execute post@{
+        try {
+          if (!establishConnection()) {
+            connectCheckerRtmp.onConnectionFailedRtmp("Handshake failed")
+            return@post
+          }
+          val socket = this.socket ?: throw IOException("Invalid socket, Connection failed")
+          commandsManager.sendChunkSize(socket)
+          commandsManager.sendConnect("", socket)
+          //read packets until you did success connection to server and you are ready to send packets
+          while (!Thread.interrupted() && !publishPermitted) {
+            //Handle all command received and send response for it.
+            handleMessages()
+          }
+          //read packet because maybe server want send you something while streaming
+          handleServerPackets()
+        } catch (e: Exception) {
+          Log.e(TAG, "connection error", e)
+          connectCheckerRtmp.onConnectionFailedRtmp("Error configure stream, ${e.message}")
+          return@post
+        }
+      }
+    }
+  }
+
+  private fun handleServerPackets() {
+    while (!Thread.interrupted() && isStreaming) {
+      try {
+        if (isAlive()) {
+          //ignore packet after connect if tunneled to avoid spam idle
+          if (!tunneled) handleMessages()
+        } else {
+          Thread.currentThread().interrupt()
+          connectCheckerRtmp.onConnectionFailedRtmp("No response from server")
+        }
+      } catch (ignored: SocketTimeoutException) {
+        //new packet not found
+      } catch (e: Exception) {
+        Thread.currentThread().interrupt()
+      }
+    }
+  }
+
+  /*
+    Send a heartbeat to know if server is alive using Echo Protocol.
+    Your firewall could block it.
+   */
+  private fun isAlive(): Boolean {
+    val connected = socket?.isConnected() ?: false
+    if (!checkServerAlive) return connected
+    val reachable = socket?.isReachable() ?: false
+    return if (connected && !reachable) false else connected
+  }
+
+  private fun getAppName(app: String, name: String): String {
+    return if (!name.contains("/")) {
+      app
+    } else {
+      app + "/" + name.substring(0, name.indexOf("/"))
+    }
+  }
+
+  private fun getStreamName(name: String): String {
+    return if (!name.contains("/")) {
+      name
+    } else {
+      name.substring(name.indexOf("/") + 1)
+    }
+  }
+
+  private fun getTcUrl(url: String): String {
+    return if (url.endsWith("/")) {
+      url.substring(0, url.length - 1)
+    } else {
+      url
+    }
+  }
+
+  @Throws(IOException::class)
+  private fun establishConnection(): Boolean {
+    val socket = if (tunneled) {
+      TcpTunneledSocket(commandsManager.host, commandsManager.port, tlsEnabled)
+    } else {
+      TcpSocket(commandsManager.host, commandsManager.port, tlsEnabled)
+    }
+    this.socket = socket
+    socket.connect()
+    if (!socket.isConnected()) return false
+    val timestamp = System.currentTimeMillis() / 1000
+    val handshake = Handshake()
+    if (!handshake.sendHandshake(socket)) return false
+    commandsManager.timestamp = timestamp.toInt()
+    commandsManager.startTs = System.nanoTime() / 1000
+    return true
+  }
+
+  /**
+   * Read all messages from server and response to it
+   */
+  @Throws(IOException::class)
+  private fun handleMessages() {
+    var socket = this.socket ?: throw IOException("Invalid socket, Connection failed")
+
+    val message = commandsManager.readMessageResponse(socket)
+    when (message.getType()) {
+      MessageType.SET_CHUNK_SIZE -> {
+        val setChunkSize = message as SetChunkSize
+        commandsManager.readChunkSize = setChunkSize.chunkSize
+        Log.i(TAG, "chunk size configured to ${setChunkSize.chunkSize}")
+      }
+      MessageType.ACKNOWLEDGEMENT -> {
+        val acknowledgement = message as Acknowledgement
+      }
+      MessageType.WINDOW_ACKNOWLEDGEMENT_SIZE -> {
+        val windowAcknowledgementSize = message as WindowAcknowledgementSize
+        RtmpConfig.acknowledgementWindowSize = windowAcknowledgementSize.acknowledgementWindowSize
+      }
+      MessageType.SET_PEER_BANDWIDTH -> {
+        val setPeerBandwidth = message as SetPeerBandwidth
+        commandsManager.sendWindowAcknowledgementSize(socket)
+      }
+      MessageType.ABORT -> {
+        val abort = message as Abort
+      }
+      MessageType.AGGREGATE -> {
+        val aggregate = message as Aggregate
+      }
+      MessageType.USER_CONTROL -> {
+        val userControl = message as UserControl
+        when (val type = userControl.type) {
+          Type.PING_REQUEST -> {
+            commandsManager.sendPong(userControl.event, socket)
+          }
+          else -> {
+            Log.i(TAG, "user control command $type ignored")
+          }
+        }
+      }
+      MessageType.COMMAND_AMF0, MessageType.COMMAND_AMF3 -> {
+        val command = message as Command
+        val commandName = commandsManager.sessionHistory.getName(command.commandId)
+        when (command.name) {
+          "_result" -> {
+            when (commandName) {
+              "connect" -> {
+                if (commandsManager.onAuth) {
+                  connectCheckerRtmp.onAuthSuccessRtmp()
+                  commandsManager.onAuth = false
+                }
+                commandsManager.createStream(socket)
+              }
+              "createStream" -> {
+                try {
+                  commandsManager.streamId = (command.data[3] as AmfNumber).value.toInt()
+                  commandsManager.sendPublish(socket)
+                } catch (e: ClassCastException) {
+                  Log.e(TAG, "error parsing _result createStream", e)
+                }
+              }
+            }
+            Log.i(TAG, "success response received from ${commandName ?: "unknown command"}")
+          }
+          "_error" -> {
+            try {
+              val description = ((command.data[3] as AmfObject).getProperty("description") as AmfString).value
+              when (commandName) {
+                "connect" -> {
+                  if (description.contains("reason=authfail") || description.contains("reason=nosuchuser")) {
+                    connectCheckerRtmp.onAuthErrorRtmp()
+                  } else if (commandsManager.user != null && commandsManager.password != null &&
+                      description.contains("challenge=") && description.contains("salt=") //adobe response
+                      || description.contains("nonce=")) { //llnw response
+                    closeConnection()
+                    establishConnection()
+                    socket = this.socket ?: throw IOException("Invalid socket, Connection failed")
+                    commandsManager.onAuth = true
+                    if (description.contains("challenge=") && description.contains("salt=")) { //create adobe auth
+                      val salt = AuthUtil.getSalt(description)
+                      val challenge = AuthUtil.getChallenge(description)
+                      val opaque = AuthUtil.getOpaque(description)
+                      commandsManager.sendConnect(AuthUtil.getAdobeAuthUserResult(commandsManager.user
+                          ?: "", commandsManager.password ?: "",
+                          salt, challenge, opaque), socket)
+                    } else if (description.contains("nonce=")) { //create llnw auth
+                      val nonce = AuthUtil.getNonce(description)
+                      commandsManager.sendConnect(AuthUtil.getLlnwAuthUserResult(commandsManager.user
+                          ?: "", commandsManager.password ?: "",
+                          nonce, commandsManager.appName), socket)
+                    }
+                  } else if (description.contains("code=403")) {
+                    if (description.contains("authmod=adobe")) {
+                      closeConnection()
+                      establishConnection()
+                      socket = this.socket ?: throw IOException("Invalid socket, Connection failed")
+                      Log.i(TAG, "sending auth mode adobe")
+                      commandsManager.sendConnect("?authmod=adobe&user=${commandsManager.user}", socket)
+                    } else if (description.contains("authmod=llnw")) {
+                      Log.i(TAG, "sending auth mode llnw")
+                      commandsManager.sendConnect("?authmod=llnw&user=${commandsManager.user}", socket)
+                    }
+                  } else {
+                    connectCheckerRtmp.onAuthErrorRtmp()
+                  }
+                }
+                else -> {
+                  connectCheckerRtmp.onConnectionFailedRtmp(description)
+                }
+              }
+            } catch (e: ClassCastException) {
+              Log.e(TAG, "error parsing _error command", e)
+            }
+          }
+          "onStatus" -> {
+            try {
+              when (val code = ((command.data[3] as AmfObject).getProperty("code") as AmfString).value) {
+                "NetStream.Publish.Start" -> {
+                  commandsManager.sendMetadata(socket)
+                  connectCheckerRtmp.onConnectionSuccessRtmp()
+
+                  rtmpSender.socket = socket
+                  rtmpSender.start()
+                  publishPermitted = true
+                }
+                "NetConnection.Connect.Rejected", "NetStream.Publish.BadName" -> {
+                  connectCheckerRtmp.onConnectionFailedRtmp("onStatus: $code")
+                }
+                else -> {
+                  Log.i(TAG, "onStatus $code response received from ${commandName ?: "unknown command"}")
+                }
+              }
+            } catch (e: ClassCastException) {
+              Log.e(TAG, "error parsing onStatus command", e)
+            }
+          }
+          else -> {
+            Log.i(TAG, "unknown ${command.name} response received from ${commandName ?: "unknown command"}")
+          }
+        }
+      }
+      MessageType.VIDEO, MessageType.AUDIO, MessageType.DATA_AMF0, MessageType.DATA_AMF3,
+      MessageType.SHARED_OBJECT_AMF0, MessageType.SHARED_OBJECT_AMF3 -> {
+        Log.e(TAG, "unimplemented response for ${message.getType()}. Ignored")
+      }
+    }
+  }
+
+  private fun closeConnection() {
+    socket?.close()
+    commandsManager.reset()
+  }
+
+  @JvmOverloads
+  fun reConnect(delay: Long, backupUrl: String? = null) {
+    reTries--
+    disconnect(false)
+    runnable = Runnable {
+      val reconnectUrl = backupUrl ?: url
+      connect(reconnectUrl, true)
+    }
+    runnable?.let {
+      handler = Executors.newSingleThreadScheduledExecutor()
+      handler?.schedule(it, delay, TimeUnit.MILLISECONDS)
+    }
+  }
+
+  fun disconnect() {
+    runnable?.let { handler?.shutdownNow() }
+    disconnect(true)
+  }
+
+  private fun disconnect(clear: Boolean) {
+    if (isStreaming) rtmpSender.stop(clear)
+    thread?.shutdownNow()
+    val executor = Executors.newSingleThreadExecutor()
+    executor.execute post@{
+      try {
+        socket?.let { socket ->
+          commandsManager.sendClose(socket)
+        }
+      } catch (e: IOException) {
+        Log.e(TAG, "disconnect error", e)
+      }
+    }
+    try {
+      executor.shutdownNow()
+      executor.awaitTermination(200, TimeUnit.MILLISECONDS)
+      thread?.awaitTermination(100, TimeUnit.MILLISECONDS)
+      thread = null
+    } catch (e: Exception) {
+    } finally {
+      closeConnection()
+    }
+    if (clear) {
+      reTries = numRetry
+      doingRetry = false
+      isStreaming = false
+      connectCheckerRtmp.onDisconnectRtmp()
+    }
+    publishPermitted = false
+    commandsManager.reset()
+  }
+
+  fun sendVideo(h264Buffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    if (!commandsManager.videoDisabled) {
+      rtmpSender.sendVideoFrame(h264Buffer, info)
+    }
+  }
+
+  fun sendAudio(aacBuffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    if (!commandsManager.audioDisabled) {
+      rtmpSender.sendAudioFrame(aacBuffer, info)
+    }
+  }
+
+  fun hasCongestion(): Boolean {
+    return rtmpSender.hasCongestion()
+  }
+
+  fun resetSentAudioFrames() {
+    rtmpSender.resetSentAudioFrames()
+  }
+
+  fun resetSentVideoFrames() {
+    rtmpSender.resetSentVideoFrames()
+  }
+
+  fun resetDroppedAudioFrames() {
+    rtmpSender.resetDroppedAudioFrames()
+  }
+
+  fun resetDroppedVideoFrames() {
+    rtmpSender.resetDroppedVideoFrames()
+  }
+
+  @Throws(RuntimeException::class)
+  fun resizeCache(newSize: Int) {
+    rtmpSender.resizeCache(newSize)
+  }
+
+  fun setLogs(enable: Boolean) {
+    rtmpSender.setLogs(enable)
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpSender.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpSender.kt
new file mode 100644
index 0000000..a761023
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpSender.kt
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp
+
+import android.media.MediaCodec
+import android.util.Log
+import com.pedro.rtmp.flv.FlvPacket
+import com.pedro.rtmp.flv.FlvType
+import com.pedro.rtmp.flv.audio.AacPacket
+import com.pedro.rtmp.flv.audio.AudioPacketCallback
+import com.pedro.rtmp.flv.video.H264Packet
+import com.pedro.rtmp.flv.video.ProfileIop
+import com.pedro.rtmp.flv.video.VideoPacketCallback
+import com.pedro.rtmp.utils.BitrateManager
+import com.pedro.rtmp.utils.ConnectCheckerRtmp
+import com.pedro.rtmp.utils.socket.RtmpSocket
+import java.nio.ByteBuffer
+import java.util.concurrent.*
+
+/**
+ * Created by pedro on 8/04/21.
+ */
+class RtmpSender(private val connectCheckerRtmp: ConnectCheckerRtmp,
+  private val commandsManager: CommandsManager) : AudioPacketCallback, VideoPacketCallback {
+
+  private var aacPacket = AacPacket(this)
+  private var h264Packet = H264Packet(this)
+  private var running = false
+
+  @Volatile
+  private var flvPacketBlockingQueue: BlockingQueue<FlvPacket> = LinkedBlockingQueue(60)
+  private var thread: ExecutorService? = null
+  private var audioFramesSent: Long = 0
+  private var videoFramesSent: Long = 0
+  var socket: RtmpSocket? = null
+  var droppedAudioFrames: Long = 0
+    private set
+  var droppedVideoFrames: Long = 0
+    private set
+  private val bitrateManager: BitrateManager = BitrateManager(connectCheckerRtmp)
+  private var isEnableLogs = true
+
+  companion object {
+    private const val TAG = "RtmpSender"
+  }
+
+  fun setVideoInfo(sps: ByteBuffer, pps: ByteBuffer, vps: ByteBuffer?) {
+    h264Packet.sendVideoInfo(sps, pps)
+  }
+
+  fun setProfileIop(profileIop: ProfileIop) {
+    h264Packet.profileIop = profileIop
+  }
+
+  fun setAudioInfo(sampleRate: Int, isStereo: Boolean) {
+    aacPacket.sendAudioInfo(sampleRate, isStereo)
+  }
+
+  fun sendVideoFrame(h264Buffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    if (running) h264Packet.createFlvVideoPacket(h264Buffer, info)
+  }
+
+  fun sendAudioFrame(aacBuffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    if (running) aacPacket.createFlvAudioPacket(aacBuffer, info)
+  }
+
+  override fun onVideoFrameCreated(flvPacket: FlvPacket) {
+    try {
+      flvPacketBlockingQueue.add(flvPacket)
+    } catch (e: IllegalStateException) {
+      Log.i(TAG, "Video frame discarded")
+      droppedVideoFrames++
+    }
+  }
+
+  override fun onAudioFrameCreated(flvPacket: FlvPacket) {
+    try {
+      flvPacketBlockingQueue.add(flvPacket)
+    } catch (e: IllegalStateException) {
+      Log.i(TAG, "Audio frame discarded")
+      droppedAudioFrames++
+    }
+  }
+
+  fun start() {
+    thread = Executors.newSingleThreadExecutor()
+    running = true
+    thread?.execute post@{
+      while (!Thread.interrupted() && running) {
+        try {
+          val flvPacket = flvPacketBlockingQueue.poll(1, TimeUnit.SECONDS)
+          if (flvPacket == null) {
+            Log.i(TAG, "Skipping iteration, frame null")
+            continue
+          }
+          var size = 0
+          if (flvPacket.type == FlvType.VIDEO) {
+            videoFramesSent++
+            socket?.let { socket ->
+              size = commandsManager.sendVideoPacket(flvPacket, socket)
+              if (isEnableLogs) {
+                Log.i(TAG, "wrote Video packet, size $size")
+              }
+            }
+          } else {
+            audioFramesSent++
+            socket?.let { socket ->
+              size = commandsManager.sendAudioPacket(flvPacket, socket)
+              if (isEnableLogs) {
+                Log.i(TAG, "wrote Audio packet, size $size")
+              }
+            }
+          }
+          //bytes to bits
+          bitrateManager.calculateBitrate(size * 8L)
+        } catch (e: Exception) {
+          //InterruptedException is only when you disconnect manually, you don't need report it.
+          if (e !is InterruptedException) {
+            connectCheckerRtmp.onConnectionFailedRtmp("Error send packet, " + e.message)
+            Log.e(TAG, "send error: ", e)
+          }
+          return@post
+        }
+      }
+    }
+  }
+
+  fun stop(clear: Boolean = true) {
+    running = false
+    thread?.shutdownNow()
+    try {
+      thread?.awaitTermination(100, TimeUnit.MILLISECONDS)
+    } catch (e: InterruptedException) { }
+    thread = null
+    flvPacketBlockingQueue.clear()
+    aacPacket.reset()
+    h264Packet.reset(clear)
+    resetSentAudioFrames()
+    resetSentVideoFrames()
+    resetDroppedAudioFrames()
+    resetDroppedVideoFrames()
+  }
+
+  fun hasCongestion(): Boolean {
+    val size = flvPacketBlockingQueue.size.toFloat()
+    val remaining = flvPacketBlockingQueue.remainingCapacity().toFloat()
+    val capacity = size + remaining
+    return size >= capacity * 0.2f //more than 20% queue used. You could have congestion
+  }
+
+  fun resizeCache(newSize: Int) {
+    if (newSize < flvPacketBlockingQueue.size - flvPacketBlockingQueue.remainingCapacity()) {
+      throw RuntimeException("Can't fit current cache inside new cache size")
+    }
+    val tempQueue: BlockingQueue<FlvPacket> = LinkedBlockingQueue(newSize)
+    flvPacketBlockingQueue.drainTo(tempQueue)
+    flvPacketBlockingQueue = tempQueue
+  }
+
+  fun getCacheSize(): Int {
+    return flvPacketBlockingQueue.size
+  }
+
+  fun getSentAudioFrames(): Long {
+    return audioFramesSent
+  }
+
+  fun getSentVideoFrames(): Long {
+    return videoFramesSent
+  }
+
+  fun resetSentAudioFrames() {
+    audioFramesSent = 0
+  }
+
+  fun resetSentVideoFrames() {
+    videoFramesSent = 0
+  }
+
+  fun resetDroppedAudioFrames() {
+    droppedAudioFrames = 0
+  }
+
+  fun resetDroppedVideoFrames() {
+    droppedVideoFrames = 0
+  }
+
+  fun setLogs(enable: Boolean) {
+    isEnableLogs = enable
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/chunk/ChunkStreamId.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/chunk/ChunkStreamId.kt
new file mode 100644
index 0000000..56e7ec3
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/chunk/ChunkStreamId.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.chunk
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+enum class ChunkStreamId(val mark: Int) {
+  PROTOCOL_CONTROL(0x02),
+  OVER_CONNECTION(0x03),
+  OVER_CONNECTION2(0x04),
+  OVER_STREAM(0x05),
+  VIDEO(0x06),
+  AUDIO(0x07)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/chunk/ChunkType.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/chunk/ChunkType.kt
new file mode 100644
index 0000000..9f83553
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/chunk/ChunkType.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.chunk
+
+/**
+ * Created by pedro on 21/04/21.
+ *
+ * timestamp = 3 bytes (timestamp of packet. If is greater than or
+ * equal to 16777215 (hexadecimal 0xFFFFFF), this field MUST be 16777215)
+ *
+ * message length = 3 bytes (packet size)
+ *
+ * message type id = 1 byte (represented by MessageType class)
+ *
+ * message stream id = 4 bytes (transactionId as little endian format)
+ */
+enum class ChunkType(val mark: Byte) {
+
+  /**
+   * 11 bytes long.
+   * This type MUST be used at the start of a chunk stream, and whenever the stream timestamp goes
+   * backward (e.g., because of a backward seek).
+   *
+   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   * | timestamp |message length |
+   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   * | message length (cont) |message type id| msg stream id |
+   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   * | message stream id (cont) |
+   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   */
+  TYPE_0(0x00),
+
+  /**
+   * 7 bytes long.
+   * The message stream ID is not included; this chunk takes the same stream ID as the preceding chunk.
+   * Streams with variable-sized messages (for example, many video formats)
+   * SHOULD use this format for the first chunk of each new message after the first
+   *
+   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   * | timestamp delta |message length |
+   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   * | message length (cont) |message type id|
+   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   */
+  TYPE_1(0x01),
+
+  /**
+   * 3 bytes long.
+   * Neither the stream ID nor the
+   * message length is included; this chunk has the same stream ID and
+   * message length as the preceding chunk. Streams with constant-sized
+   * messages (for example, some audio and data formats) SHOULD use this
+   * format for the first chunk of each message after the first.
+   *
+   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   * | timestamp delta |
+   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   */
+  TYPE_2(0x02),
+
+  /**
+   * Have no message header
+   * When a single message is split into chunks, all chunks of a message except
+   * the first one SHOULD use this type
+   */
+  TYPE_3(0x03)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Abort.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Abort.kt
new file mode 100644
index 0000000..91761a3
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Abort.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.utils.readUInt32
+import com.pedro.rtmp.utils.writeUInt32
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class Abort(private var chunkStreamId: Int = 0):
+    RtmpMessage(BasicHeader(ChunkType.TYPE_0, ChunkStreamId.PROTOCOL_CONTROL.mark)) {
+
+  override fun readBody(input: InputStream) {
+    chunkStreamId = input.readUInt32()
+  }
+
+  override fun storeBody(): ByteArray {
+    val byteArrayOutputStream = ByteArrayOutputStream()
+    byteArrayOutputStream.writeUInt32(chunkStreamId)
+    return byteArrayOutputStream.toByteArray()
+  }
+
+  override fun getType(): MessageType = MessageType.ABORT
+
+  override fun getSize(): Int = 4
+
+  override fun toString(): String {
+    return "Abort(chunkStreamId=$chunkStreamId)"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Acknowledgement.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Acknowledgement.kt
new file mode 100644
index 0000000..c2278ea
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Acknowledgement.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.utils.readUInt32
+import com.pedro.rtmp.utils.writeUInt32
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class Acknowledgement(private var sequenceNumber: Int = 0):
+    RtmpMessage(BasicHeader(ChunkType.TYPE_0, ChunkStreamId.PROTOCOL_CONTROL.mark)) {
+
+  override fun readBody(input: InputStream) {
+    sequenceNumber = input.readUInt32()
+  }
+
+  override fun storeBody(): ByteArray {
+    val byteArrayOutputStream = ByteArrayOutputStream()
+    byteArrayOutputStream.writeUInt32(sequenceNumber)
+    return byteArrayOutputStream.toByteArray()
+  }
+
+  override fun getType(): MessageType = MessageType.ACKNOWLEDGEMENT
+
+  override fun getSize(): Int = 4
+
+  override fun toString(): String {
+    return "Acknowledgement(sequenceNumber=$sequenceNumber)"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Aggregate.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Aggregate.kt
new file mode 100644
index 0000000..a8ceaef
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Aggregate.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import java.io.InputStream
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class Aggregate: RtmpMessage(BasicHeader(ChunkType.TYPE_0, ChunkStreamId.PROTOCOL_CONTROL.mark)) {
+
+  override fun readBody(input: InputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun storeBody(): ByteArray {
+    TODO("Not yet implemented")
+  }
+
+  override fun getType(): MessageType = MessageType.AGGREGATE
+
+  override fun getSize(): Int {
+    TODO("Not yet implemented")
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Audio.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Audio.kt
new file mode 100644
index 0000000..4ba565c
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Audio.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+import com.pedro.rtmp.flv.FlvPacket
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import java.io.InputStream
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class Audio(private val flvPacket: FlvPacket = FlvPacket(), streamId: Int = 0): RtmpMessage(BasicHeader(ChunkType.TYPE_0, ChunkStreamId.AUDIO.mark)) {
+
+  init {
+    header.messageStreamId = streamId
+    header.timeStamp = flvPacket.timeStamp.toInt()
+    header.messageLength = flvPacket.length
+  }
+
+  override fun readBody(input: InputStream) {
+  }
+
+  override fun storeBody(): ByteArray = flvPacket.buffer
+
+  override fun getType(): MessageType = MessageType.AUDIO
+
+  override fun getSize(): Int = flvPacket.length
+
+  override fun toString(): String {
+    return "Audio, size: ${getSize()}"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/BasicHeader.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/BasicHeader.kt
new file mode 100644
index 0000000..f858f59
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/BasicHeader.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import java.io.IOException
+import java.io.InputStream
+import kotlin.experimental.and
+
+/**
+ * Created by pedro on 21/04/21.
+ *
+ * cs id (6 bits)
+ * fmt (2 bits)
+ * cs id - 64 (8 or 16 bits)
+ *
+ * 0 1 2 3 4 5 6 7
+ * +-+-+-+-+-+-+-+-+
+ * |fmt| cs id |
+ * +-+-+-+-+-+-+-+-+
+ * Chunk basic header 1
+ *
+ *
+ * Chunk stream IDs 64-319 can be encoded in the 2-byte form of the
+ * header. ID is computed as (the second byte + 64).
+ *
+ * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |fmt| 0 | cs id - 64 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * Chunk basic header 2
+ *
+ *
+ * Chunk stream IDs 64-65599 can be encoded in the 3-byte version of
+ * this field. ID is computed as ((the third byte)*256 + (the second
+ * byte) + 64).
+ *
+ * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |fmt| 1 | cs id - 64 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ * Chunk basic header 3
+ */
+class BasicHeader(val chunkType: ChunkType, val chunkStreamId: Int) {
+
+  companion object {
+    fun parseBasicHeader(input: InputStream): BasicHeader {
+      val byte = input.read().toByte()
+      val chunkTypeValue = 0xff and byte.toInt() ushr 6
+      val chunkType = ChunkType.values().find { it.mark.toInt() == chunkTypeValue } ?: throw IOException("Unknown chunk type value: $chunkTypeValue")
+      var chunkStreamIdValue = (byte and 0x3F).toInt()
+      if (chunkStreamIdValue > 63) throw IOException("Unknown chunk stream id value: $chunkStreamIdValue")
+      if (chunkStreamIdValue == 0) { //Basic header 2 bytes
+        chunkStreamIdValue = input.read() - 64
+      } else if (chunkStreamIdValue == 1) { //Basic header 3 bytes
+        val a = input.read()
+        val b = input.read()
+        val value = b and 0xff shl 8 and a
+        chunkStreamIdValue = value - 64
+      }
+      return BasicHeader(chunkType, chunkStreamIdValue)
+    }
+  }
+
+  fun getHeaderSize(timestamp: Int): Int {
+    var size = when (chunkType) {
+      ChunkType.TYPE_0 -> 12
+      ChunkType.TYPE_1 -> 8
+      ChunkType.TYPE_2 -> 4
+      ChunkType.TYPE_3 -> 0
+    }
+    if (timestamp >= 0xffffff) {
+      size += 4
+    }
+    return size
+  }
+
+  override fun toString(): String {
+    return "BasicHeader chunkType: $chunkType, chunkStreamId: $chunkStreamId"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/MessageType.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/MessageType.kt
new file mode 100644
index 0000000..9be04fc
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/MessageType.kt
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+enum class MessageType(val mark: Byte) {
+
+  /**
+   * Set Chunk Size, is used to notify the peer a new maximum chunk size to use.
+   */
+  SET_CHUNK_SIZE(0x01),
+
+  /**
+   * Abort Message, is used to notify the peer if it is waiting for chunks
+   * to complete a message, then to discard the partially received message
+   * over a chunk stream and abort processing of that message.
+   */
+  ABORT(0x02),
+
+  /**
+   * The client or the server sends the acknowledgment to the peer after
+   * receiving bytes equal to the window size. The window size is the
+   * maximum number of bytes that the sender sends without receiving
+   * acknowledgment from the receiver.
+   */
+  ACKNOWLEDGEMENT(0x03),
+
+  /**
+   * The client or the server sends this message to notify the peer about
+   * the user control events. This message carries Event type and Event
+   * data.
+   * Also known as a PING message in some RTMP implementations.
+   */
+  USER_CONTROL(0x04),
+
+  /**
+   * The client or the server sends this message to inform the peer which
+   * window size to use when sending acknowledgment.
+   * Also known as ServerBW ("server bandwidth") in some RTMP implementations.
+   */
+  WINDOW_ACKNOWLEDGEMENT_SIZE(0x05),
+
+  /**
+   * The client or the server sends this message to update the output
+   * bandwidth of the peer. The output bandwidth value is the same as the
+   * window size for the peer.
+   * Also known as ClientBW ("client bandwidth") in some RTMP implementations.
+   */
+  SET_PEER_BANDWIDTH(0x06),
+
+  /**
+   * RTMP audio packet (0x08)
+   * The client or the server sends this message to send audio data to the peer.
+   */
+  AUDIO(0x08),
+
+  /**
+   * RTMP video packet (0x09)
+   * The client or the server sends this message to send video data to the peer.
+   */
+  VIDEO(0x09),
+
+  /**
+   * The client or the server sends this message to send Metadata or any
+   * user data to the peer. Metadata includes details about the data (audio, video etc.)
+   * like creation time, duration, theme and so on.
+   * This is the AMF3-encoded version.
+   */
+  DATA_AMF3(0x0F),
+
+  /**
+   * A shared object is a Flash object (a collection of name value pairs)
+   * that are in synchronization across multiple clients, instances, and
+   * so on.
+   * This is the AMF3 version: kMsgContainerEx=16 for AMF3.
+   */
+  SHARED_OBJECT_AMF3(0x10),
+
+  /**
+   * Command messages carry the AMF-encoded commands between the client
+   * and the server.
+   * A command message consists of command name, transaction ID, and command object that
+   * contains related parameters.
+   * This is the AMF3-encoded version.
+   */
+  COMMAND_AMF3(0x11),
+
+  /**
+   * The client or the server sends this message to send Metadata or any
+   * user data to the peer. Metadata includes details about the data (audio, video etc.)
+   * like creation time, duration, theme and so on.
+   * This is the AMF0-encoded version.
+   */
+  DATA_AMF0(0x012),
+
+  /**
+   * A shared object is a Flash object (a collection of name value pairs)
+   * that are in synchronization across multiple clients, instances, and
+   * so on.
+   * This is the AMF0 version: kMsgContainer=19 for AMF0.
+   */
+  SHARED_OBJECT_AMF0(0x13),
+
+  /**
+   * Command messages carry the AMF-encoded commands between the client
+   * and the server.
+   * A command message consists of command name, transaction ID, and command object that
+   * contains related parameters.
+   * This is the common AMF0 version, also known as INVOKE in some RTMP implementations.
+   */
+  COMMAND_AMF0(0x14),
+
+  /**
+   * An aggregate message is a single message that contains a list of sub-messages.
+   */
+  AGGREGATE(0x16)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/RtmpHeader.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/RtmpHeader.kt
new file mode 100644
index 0000000..552dfa0
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/RtmpHeader.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.utils.*
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import kotlin.math.min
+
+/**
+ * Created by pedro on 20/04/21.
+ */
+class RtmpHeader(var basicHeader: BasicHeader) {
+
+  var timeStamp: Int = 0
+  var messageLength: Int = 0
+  var messageType: MessageType? = null
+  var messageStreamId: Int = 0
+
+  companion object {
+
+    private const val TAG = "RtmpHeader"
+
+    /**
+     * Check ChunkType class to know header structure
+     */
+    @Throws(IOException::class)
+    fun readHeader(input: InputStream, commandSessionHistory: CommandSessionHistory,
+      timestamp: Int = 0): RtmpHeader {
+      val basicHeader = BasicHeader.parseBasicHeader(input)
+      var timeStamp = timestamp
+      var messageLength = 0
+      var messageType: MessageType? = null
+      var messageStreamId = 0
+      val lastHeader = commandSessionHistory.getLastReadHeader(basicHeader.chunkStreamId)
+      when (basicHeader.chunkType) {
+        ChunkType.TYPE_0 -> {
+          timeStamp = input.readUInt24()
+          messageLength = input.readUInt24()
+          messageType = RtmpMessage.getMarkType(input.read())
+          messageStreamId = input.readUInt32LittleEndian()
+          //extended timestamp
+          if (timeStamp >= 0xffffff) {
+            timeStamp = input.readUInt32()
+          }
+        }
+        ChunkType.TYPE_1 -> {
+          if (lastHeader != null) {
+            messageStreamId = lastHeader.messageStreamId
+          }
+          timeStamp = input.readUInt24()
+          messageLength = input.readUInt24()
+          messageType = RtmpMessage.getMarkType(input.read())
+          //extended timestamp
+          if (timeStamp >= 0xffffff) {
+            timeStamp = input.readUInt32()
+          }
+        }
+        ChunkType.TYPE_2 -> {
+          if (lastHeader != null) {
+            messageLength = lastHeader.messageLength
+            messageType = lastHeader.messageType
+            messageStreamId = lastHeader.messageStreamId
+          }
+          timeStamp = input.readUInt24()
+          //extended timestamp
+          if (timeStamp >= 0xffffff) {
+            timeStamp = input.readUInt32()
+          }
+        }
+        ChunkType.TYPE_3 -> {
+          if (lastHeader != null) {
+            timeStamp = lastHeader.timeStamp
+            messageLength = lastHeader.messageLength
+            messageType = lastHeader.messageType
+            messageStreamId = lastHeader.messageStreamId
+          }
+          //extended timestamp
+          if (timeStamp >= 0xffffff) {
+            timeStamp = input.readUInt32()
+          }
+          //No header to read
+        }
+      }
+      val rtmpHeader = RtmpHeader(basicHeader)
+      rtmpHeader.timeStamp = timeStamp
+      rtmpHeader.messageLength = messageLength
+      rtmpHeader.messageType = messageType
+      rtmpHeader.messageStreamId = messageStreamId
+      return rtmpHeader
+    }
+  }
+
+  @Throws(IOException::class)
+  fun writeHeader(output: OutputStream) {
+    writeHeader(basicHeader, output)
+  }
+
+  /**
+   * Check ChunkType class to know header structure
+   */
+  @Throws(IOException::class)
+  fun writeHeader(basicHeader: BasicHeader, output: OutputStream) {
+    // Write basic header byte
+    output.write((basicHeader.chunkType.mark.toInt() shl 6) or basicHeader.chunkStreamId)
+    when (basicHeader.chunkType) {
+      ChunkType.TYPE_0 -> {
+        output.writeUInt24(min(timeStamp, 0xffffff))
+        output.writeUInt24(messageLength)
+        messageType?.let { messageType ->
+          output.write(messageType.mark.toInt())
+        }
+        output.writeUInt32LittleEndian(messageStreamId)
+        //extended timestamp
+        if (timeStamp > 0xffffff) {
+          output.writeUInt32(timeStamp)
+        }
+      }
+      ChunkType.TYPE_1 -> {
+        output.writeUInt24(min(timeStamp, 0xffffff))
+        output.writeUInt24(messageLength)
+        messageType?.let { messageType ->
+          output.write(messageType.mark.toInt())
+        }
+        //extended timestamp
+        if (timeStamp > 0xffffff) {
+          output.writeUInt32(timeStamp)
+        }
+      }
+      ChunkType.TYPE_2 -> {
+        output.writeUInt24(min(timeStamp, 0xffffff))
+        //extended timestamp
+        if (timeStamp > 0xffffff) {
+          output.writeUInt32(timeStamp)
+        }
+      }
+      ChunkType.TYPE_3 -> {
+        //extended timestamp
+        if (timeStamp > 0xffffff) {
+          output.writeUInt32(timeStamp)
+        }
+      }
+    }
+  }
+
+  fun getPacketLength(): Int = messageLength + basicHeader.getHeaderSize(timeStamp)
+
+  override fun toString(): String {
+    return "RtmpHeader(timeStamp=$timeStamp, messageLength=$messageLength, messageType=$messageType, messageStreamId=$messageStreamId, basicHeader=$basicHeader)"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/RtmpMessage.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/RtmpMessage.kt
new file mode 100644
index 0000000..f9bbfae
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/RtmpMessage.kt
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.rtmp.message.command.CommandAmf0
+import com.pedro.rtmp.rtmp.message.command.CommandAmf3
+import com.pedro.rtmp.rtmp.message.control.UserControl
+import com.pedro.rtmp.rtmp.message.data.DataAmf0
+import com.pedro.rtmp.rtmp.message.data.DataAmf3
+import com.pedro.rtmp.rtmp.message.shared.SharedObjectAmf0
+import com.pedro.rtmp.rtmp.message.shared.SharedObjectAmf3
+import com.pedro.rtmp.utils.CommandSessionHistory
+import com.pedro.rtmp.utils.RtmpConfig
+import com.pedro.rtmp.utils.readUntil
+import java.io.*
+
+/**
+ * Created by pedro on 20/04/21.
+ */
+abstract class RtmpMessage(basicHeader: BasicHeader) {
+
+  val header by lazy {
+    RtmpHeader(basicHeader).apply {
+      messageType = getType()
+      messageLength = getSize()
+    }
+  }
+
+  companion object {
+
+    private const val TAG = "RtmpMessage"
+
+    @Throws(IOException::class)
+    fun getRtmpMessage(input: InputStream, chunkSize: Int,
+      commandSessionHistory: CommandSessionHistory): RtmpMessage {
+      val header = RtmpHeader.readHeader(input, commandSessionHistory)
+      val rtmpMessage = when (header.messageType) {
+        MessageType.SET_CHUNK_SIZE -> SetChunkSize()
+        MessageType.ABORT -> Abort()
+        MessageType.ACKNOWLEDGEMENT -> Acknowledgement()
+        MessageType.USER_CONTROL -> UserControl()
+        MessageType.WINDOW_ACKNOWLEDGEMENT_SIZE -> WindowAcknowledgementSize()
+        MessageType.SET_PEER_BANDWIDTH -> SetPeerBandwidth()
+        MessageType.AUDIO -> Audio()
+        MessageType.VIDEO -> Video()
+        MessageType.DATA_AMF3 -> DataAmf3()
+        MessageType.SHARED_OBJECT_AMF3 -> SharedObjectAmf3()
+        MessageType.COMMAND_AMF3 -> CommandAmf3()
+        MessageType.DATA_AMF0 -> DataAmf0()
+        MessageType.SHARED_OBJECT_AMF0 -> SharedObjectAmf0()
+        MessageType.COMMAND_AMF0 -> CommandAmf0()
+        MessageType.AGGREGATE -> Aggregate()
+        else -> throw IOException("Unimplemented message type: ${header.messageType}")
+      }
+      rtmpMessage.updateHeader(header)
+      //we have multiple chunk wait until we have full body on stream and discard chunk header
+      val bodyInput = if (header.messageLength > chunkSize) {
+        getInputWithoutChunks(input, header, chunkSize, commandSessionHistory)
+      } else {
+        input
+      }
+      rtmpMessage.readBody(bodyInput)
+      return rtmpMessage
+    }
+
+    fun getMarkType(type: Int): MessageType {
+      return MessageType.values().find { it.mark.toInt() == type } ?: throw IOException("Unknown rtmp message type: $type")
+    }
+
+    private fun getInputWithoutChunks(input: InputStream, header: RtmpHeader, chunkSize: Int,
+      commandSessionHistory: CommandSessionHistory): InputStream {
+      val packetStore = ByteArrayOutputStream()
+      var bytesRead = 0
+      while (bytesRead < header.messageLength) {
+        var chunk: ByteArray
+        if (header.messageLength - bytesRead < chunkSize) {
+          //last chunk
+          chunk = ByteArray(header.messageLength - bytesRead)
+          input.readUntil(chunk)
+        } else {
+          chunk = ByteArray(chunkSize)
+          input.readUntil(chunk)
+          //skip chunk header to discard it, set packet ts to indicate if you need read extended ts
+          RtmpHeader.readHeader(input, commandSessionHistory, header.timeStamp)
+        }
+        bytesRead += chunk.size
+        packetStore.write(chunk)
+      }
+      return ByteArrayInputStream(packetStore.toByteArray())
+    }
+  }
+
+  fun updateHeader(rtmpHeader: RtmpHeader) {
+    header.basicHeader = rtmpHeader.basicHeader
+    header.messageType = rtmpHeader.messageType
+    header.messageLength = rtmpHeader.messageLength
+    header.messageStreamId = rtmpHeader.messageStreamId
+    header.timeStamp = rtmpHeader.timeStamp
+  }
+
+  @Throws(IOException::class)
+  fun writeHeader(output: OutputStream) {
+    header.writeHeader(output)
+  }
+
+  @Throws(IOException::class)
+  fun writeBody(output: OutputStream) {
+    val chunkSize = RtmpConfig.writeChunkSize
+    val bytes = storeBody()
+    var pos = 0
+    var length = getSize()
+
+    while (length > chunkSize) {
+      // Write packet for chunk
+      output.write(bytes, pos, chunkSize)
+      length -= chunkSize
+      pos += chunkSize
+      // Write header for remain chunk
+      header.writeHeader(BasicHeader(ChunkType.TYPE_3, header.basicHeader.chunkStreamId), output)
+    }
+    output.write(bytes, pos, length)
+  }
+
+  abstract fun readBody(input: InputStream)
+
+  abstract fun storeBody(): ByteArray
+
+  abstract fun getType(): MessageType
+
+  abstract fun getSize(): Int
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/SetChunkSize.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/SetChunkSize.kt
new file mode 100644
index 0000000..fdb1fd2
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/SetChunkSize.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.utils.readUInt32
+import com.pedro.rtmp.utils.writeUInt32
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class SetChunkSize(var chunkSize: Int = 128):
+    RtmpMessage(BasicHeader(ChunkType.TYPE_0, ChunkStreamId.PROTOCOL_CONTROL.mark)) {
+
+  override fun readBody(input: InputStream) {
+    chunkSize = input.readUInt32()
+  }
+
+  override fun storeBody(): ByteArray {
+    val byteArrayOutputStream = ByteArrayOutputStream()
+    byteArrayOutputStream.writeUInt32(chunkSize)
+    return byteArrayOutputStream.toByteArray()
+  }
+
+  override fun getType(): MessageType = MessageType.SET_CHUNK_SIZE
+
+  override fun getSize(): Int = 4
+
+  override fun toString(): String {
+    return "SetChunkSize(chunkSize=$chunkSize)"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/SetPeerBandwidth.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/SetPeerBandwidth.kt
new file mode 100644
index 0000000..65f7637
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/SetPeerBandwidth.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.utils.readUInt32
+import com.pedro.rtmp.utils.writeUInt32
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.io.InputStream
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class SetPeerBandwidth(private var acknowledgementWindowSize: Int = 0, private var type: Type = Type.DYNAMIC):
+    RtmpMessage(BasicHeader(ChunkType.TYPE_0, ChunkStreamId.PROTOCOL_CONTROL.mark)) {
+
+  enum class Type(val mark: Byte) {
+    HARD(0x00), SOFT(0x01), DYNAMIC(0x02)
+  }
+
+  override fun readBody(input: InputStream) {
+    acknowledgementWindowSize = input.readUInt32()
+    val t = input.read().toByte()
+    type = Type.values().find { it.mark == t } ?: throw IOException("Unknown bandwidth type: $t")
+  }
+
+  override fun storeBody(): ByteArray {
+    val byteArrayOutputStream = ByteArrayOutputStream()
+    byteArrayOutputStream.writeUInt32(acknowledgementWindowSize)
+    byteArrayOutputStream.write(type.mark.toInt())
+    return byteArrayOutputStream.toByteArray()
+  }
+
+  override fun getType(): MessageType = MessageType.SET_PEER_BANDWIDTH
+
+  override fun getSize(): Int = 9
+
+  override fun toString(): String {
+    return "SetPeerBandwidth(acknowledgementWindowSize=$acknowledgementWindowSize, type=$type)"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Video.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Video.kt
new file mode 100644
index 0000000..ee4897a
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/Video.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+import com.pedro.rtmp.flv.FlvPacket
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import java.io.InputStream
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class Video(private val flvPacket: FlvPacket = FlvPacket(), streamId: Int = 0): RtmpMessage(BasicHeader(ChunkType.TYPE_0, ChunkStreamId.VIDEO.mark)) {
+
+  init {
+    header.messageStreamId = streamId
+    header.timeStamp = flvPacket.timeStamp.toInt()
+    header.messageLength = flvPacket.length
+  }
+
+  override fun readBody(input: InputStream) {
+  }
+
+  override fun storeBody(): ByteArray = flvPacket.buffer
+
+  override fun getType(): MessageType = MessageType.VIDEO
+
+  override fun getSize(): Int = flvPacket.length
+
+  override fun toString(): String {
+    return "Video, size: ${getSize()}"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/WindowAcknowledgementSize.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/WindowAcknowledgementSize.kt
new file mode 100644
index 0000000..a52151a
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/WindowAcknowledgementSize.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.utils.readUInt32
+import com.pedro.rtmp.utils.writeUInt32
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class WindowAcknowledgementSize(var acknowledgementWindowSize: Int = 0, timeStamp: Int = 0):
+    RtmpMessage(BasicHeader(ChunkType.TYPE_0, ChunkStreamId.PROTOCOL_CONTROL.mark)) {
+
+  init {
+    header.timeStamp = timeStamp
+  }
+
+  override fun readBody(input: InputStream) {
+    acknowledgementWindowSize = input.readUInt32()
+  }
+
+  override fun storeBody(): ByteArray {
+    val byteArrayOutputStream = ByteArrayOutputStream()
+    byteArrayOutputStream.writeUInt32(acknowledgementWindowSize)
+    return byteArrayOutputStream.toByteArray()
+  }
+
+  override fun getType(): MessageType = MessageType.WINDOW_ACKNOWLEDGEMENT_SIZE
+
+  override fun getSize(): Int = 4
+
+  override fun toString(): String {
+    return "WindowAcknowledgementSize(acknowledgementWindowSize=$acknowledgementWindowSize)"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/Command.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/Command.kt
new file mode 100644
index 0000000..c6f7d8e
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/Command.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.command
+
+import com.pedro.rtmp.amf.v0.AmfData
+import com.pedro.rtmp.amf.v0.AmfNumber
+import com.pedro.rtmp.amf.v0.AmfString
+import com.pedro.rtmp.rtmp.message.BasicHeader
+import com.pedro.rtmp.rtmp.message.RtmpMessage
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+
+/**
+ * Created by pedro on 8/04/21.
+ *
+ * Represent packets like connect, createStream, play, pause...
+ * Can be encoded using AMF0 or AMF3
+ *
+ * TODO use amf3 or amf0 depend of getType method
+ */
+abstract class Command(var name: String = "", var commandId: Int, private val timeStamp: Int, private val streamId: Int = 0, basicHeader: BasicHeader): RtmpMessage(basicHeader) {
+
+  val data: MutableList<AmfData> = mutableListOf()
+  private var bodySize = 0
+
+  init {
+    val amfString = AmfString(name)
+    data.add(amfString)
+    bodySize += amfString.getSize() + 1
+    val amfNumber = AmfNumber(commandId.toDouble())
+    bodySize += amfNumber.getSize() + 1
+    data.add(amfNumber)
+    header.messageLength = bodySize
+    header.timeStamp = timeStamp
+    header.messageStreamId = streamId
+  }
+
+  fun addData(amfData: AmfData) {
+    data.add(amfData)
+    bodySize += amfData.getSize() + 1
+    header.messageLength = bodySize
+  }
+
+  override fun readBody(input: InputStream) {
+    data.clear()
+    var bytesRead = 0
+    while (bytesRead < header.messageLength) {
+      val amfData = AmfData.getAmfData(input)
+      bytesRead += amfData.getSize() + 1
+      data.add(amfData)
+    }
+    if (data.isNotEmpty()) {
+      if (data[0] is AmfString) {
+        name = (data[0] as AmfString).value
+      }
+      if (data.size >= 2 && data[1] is AmfNumber) {
+        commandId = (data[1] as AmfNumber).value.toInt()
+      }
+    }
+    bodySize = bytesRead
+    header.messageLength = bodySize
+  }
+
+  override fun storeBody(): ByteArray {
+    val byteArrayOutputStream = ByteArrayOutputStream()
+    data.forEach {
+      it.writeHeader(byteArrayOutputStream)
+      it.writeBody(byteArrayOutputStream)
+    }
+    return byteArrayOutputStream.toByteArray()
+  }
+
+  override fun getSize(): Int = bodySize
+
+  override fun toString(): String {
+    return "Command(name='$name', transactionId=$commandId, timeStamp=$timeStamp, streamId=$streamId, data=$data, bodySize=$bodySize)"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/CommandAmf0.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/CommandAmf0.kt
new file mode 100644
index 0000000..00a376f
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/CommandAmf0.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.command
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.rtmp.message.BasicHeader
+import com.pedro.rtmp.rtmp.message.MessageType
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class CommandAmf0(name: String = "", commandId: Int = 0, timestamp: Int = 0, streamId: Int = 0, basicHeader: BasicHeader =
+    BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_CONNECTION.mark)): Command(name, commandId, timestamp, streamId, basicHeader = basicHeader) {
+  override fun getType(): MessageType = MessageType.COMMAND_AMF0
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/CommandAmf3.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/CommandAmf3.kt
new file mode 100644
index 0000000..3f283ab
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/command/CommandAmf3.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.command
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.rtmp.message.BasicHeader
+import com.pedro.rtmp.rtmp.message.MessageType
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class CommandAmf3(name: String = "", commandId: Int = 0, timestamp: Int = 0, streamId: Int = 0, basicHeader: BasicHeader =
+    BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_CONNECTION.mark)): Command(name, commandId, timestamp, streamId, basicHeader = basicHeader) {
+  override fun getType(): MessageType = MessageType.COMMAND_AMF3
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/Event.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/Event.kt
new file mode 100644
index 0000000..3257356
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/Event.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.control
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+data class Event(val data: Int, val bufferLength: Int = -1)
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/Type.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/Type.kt
new file mode 100644
index 0000000..ec3efe7
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/Type.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.control
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+enum class Type(val mark: Byte) {
+  /**
+   * Type: 0
+   * The server sends this event to notify the client that a stream has become
+   * functional and can be used for communication. By default, this event
+   * is sent on ID 0 after the application connect command is successfully
+   * received from the client.
+   *
+   * Event Data:
+   * eventData[0] (int) the stream ID of the stream that became functional
+   */
+  STREAM_BEGIN(0x00),
+
+  /**
+   * Type: 1
+   * The server sends this event to notify the client that the playback of
+   * data is over as requested on this stream. No more data is sent without
+   * issuing additional commands. The client discards the messages received
+   * for the stream.
+   *
+   * Event Data:
+   * eventData[0]: the ID of thestream on which playback has ended.
+   */
+  STREAM_EOF(0x01),
+
+  /**
+   * Type: 2
+   * The server sends this event to notify the client that there is no
+   * more data on the stream. If the server does not detect any message for
+   * a time period, it can notify the subscribed clients that the stream is
+   * dry.
+   *
+   * Event Data:
+   * eventData[0]: the stream ID of the dry stream.
+   */
+  STREAM_DRY(0x02),
+
+  /**
+   * Type: 3
+   * The client sends this event to inform the server of the buffer size
+   * (in milliseconds) that is used to buffer any data coming over a stream.
+   * This event is sent before the server starts  processing the stream.
+   *
+   * Event Data:
+   * eventData[0]: the stream ID and
+   * eventData[1]: the buffer length, in milliseconds.
+   */
+  SET_BUFFER_LENGTH(0x03),
+
+  /**
+   * Type: 4
+   * The server sends this event to notify the client that the stream is a
+   * recorded stream.
+   *
+   * Event Data:
+   * eventData[0]: the stream ID of the recorded stream.
+   */
+  STREAM_IS_RECORDED(0x04),
+
+  /**
+   * Type: 6
+   * The server sends this event to test whether the client is reachable.
+   *
+   * Event Data:
+   * eventData[0]: a timestamp representing the local server time when the server dispatched the command.
+   *
+   * The client responds with PING_RESPONSE on receiving PING_REQUEST.
+   */
+  PING_REQUEST(0x06),
+
+  /**
+   * Type: 7
+   * The client sends this event to the server in response to the ping request.
+   *
+   * Event Data:
+   * eventData[0]: the 4-byte timestamp which was received with the PING_REQUEST.
+   */
+  PONG_REPLY(0x07),
+
+  /**
+   * Type: 31 (0x1F)
+   *
+   * This user control type is not specified in any official documentation, but
+   * is sent by Flash Media Server 3.5. Thanks to the rtmpdump devs for their
+   * explanation:
+   *
+   * Buffer Empty (unofficial name): After the server has sent a complete buffer, and
+   * sends this Buffer Empty message, it will wait until the play
+   * duration of that buffer has passed before sending a new buffer.
+   * The Buffer Ready message will be sent when the new buffer starts.
+   *
+   * (see also: http://repo.or.cz/w/rtmpdump.git/blob/8880d1456b282ee79979adbe7b6a6eb8ad371081:/librtmp/rtmp.c#l2787)
+   */
+  BUFFER_EMPTY(0x1F),
+
+  /**
+   * Type: 32 (0x20)
+   *
+   * This user control type is not specified in any official documentation, but
+   * is sent by Flash Media Server 3.5. Thanks to the rtmpdump devs for their
+   * explanation:
+   *
+   * Buffer Ready (unofficial name): After the server has sent a complete buffer, and
+   * sends a Buffer Empty message, it will wait until the play
+   * duration of that buffer has passed before sending a new buffer.
+   * The Buffer Ready message will be sent when the new buffer starts.
+   * (There is no BufferReady message for the very first buffer;
+   * presumably the Stream Begin message is sufficient for that
+   * purpose.)
+   *
+   * (see also: http://repo.or.cz/w/rtmpdump.git/blob/8880d1456b282ee79979adbe7b6a6eb8ad371081:/librtmp/rtmp.c#l2787)
+   */
+  BUFFER_READY(0x20)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/UserControl.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/UserControl.kt
new file mode 100644
index 0000000..acc6ba2
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/control/UserControl.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.control
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.rtmp.message.BasicHeader
+import com.pedro.rtmp.rtmp.message.MessageType
+import com.pedro.rtmp.rtmp.message.RtmpMessage
+import com.pedro.rtmp.utils.readUInt16
+import com.pedro.rtmp.utils.readUInt32
+import com.pedro.rtmp.utils.writeUInt16
+import com.pedro.rtmp.utils.writeUInt32
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.io.InputStream
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class UserControl(var type: Type = Type.PING_REQUEST, var event: Event = Event(-1, -1)): RtmpMessage(BasicHeader(ChunkType.TYPE_0, ChunkStreamId.PROTOCOL_CONTROL.mark)) {
+
+  private val TAG = "UserControl"
+  private var bodySize = 6
+
+  override fun readBody(input: InputStream) {
+    bodySize = 0
+    val t = input.readUInt16()
+    type = Type.values().find { it.mark.toInt() == t } ?: throw IOException("unknown user control type: $t")
+    bodySize += 2
+    val data = input.readUInt32()
+    bodySize += 4
+    event = if (type == Type.SET_BUFFER_LENGTH) {
+      val bufferLength = input.readUInt32()
+      Event(data, bufferLength)
+    } else {
+      Event(data)
+    }
+  }
+
+  override fun storeBody(): ByteArray {
+    val byteArrayOutputStream = ByteArrayOutputStream()
+    byteArrayOutputStream.writeUInt16(type.mark.toInt())
+    byteArrayOutputStream.writeUInt32(event.data)
+    if (event.bufferLength != -1) {
+      byteArrayOutputStream.writeUInt32(event.bufferLength)
+    }
+    return byteArrayOutputStream.toByteArray()
+  }
+
+  override fun getType(): MessageType = MessageType.USER_CONTROL
+
+  override fun getSize(): Int = bodySize
+
+  override fun toString(): String {
+    return "UserControl(type=$type, event=$event, bodySize=$bodySize)"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/Data.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/Data.kt
new file mode 100644
index 0000000..d42eb1b
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/Data.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.data
+
+import com.pedro.rtmp.amf.v0.AmfData
+import com.pedro.rtmp.amf.v0.AmfString
+import com.pedro.rtmp.rtmp.message.BasicHeader
+import com.pedro.rtmp.rtmp.message.RtmpMessage
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+abstract class Data(private val name: String, timeStamp: Int, streamId: Int, basicHeader: BasicHeader): RtmpMessage(basicHeader) {
+
+  private val data: MutableList<AmfData> = mutableListOf()
+  private var bodySize = 0
+
+  init {
+    val amfString = AmfString(name)
+    bodySize += amfString.getSize() + 1
+    data.forEach {
+      bodySize += it.getSize() + 1
+    }
+    header.messageLength = bodySize
+    header.timeStamp = timeStamp
+    header.messageStreamId = streamId
+  }
+
+  fun addData(amfData: AmfData) {
+    data.add(amfData)
+    bodySize += amfData.getSize() + 1
+    header.messageLength = bodySize
+  }
+
+  override fun readBody(input: InputStream) {
+    bodySize = 0
+    val amfString = AmfString()
+    amfString.readHeader(input)
+    amfString.readBody(input)
+    bodySize += amfString.getSize() + 1
+    while (bodySize < header.messageLength) {
+      val amfData = AmfData.getAmfData(input)
+      data.add(amfData)
+      bodySize += amfData.getSize() + 1
+    }
+  }
+
+  override fun storeBody(): ByteArray {
+    val byteArrayOutputStream = ByteArrayOutputStream()
+    val amfString = AmfString(name)
+    amfString.writeHeader(byteArrayOutputStream)
+    amfString.writeBody(byteArrayOutputStream)
+    data.forEach {
+      it.writeHeader(byteArrayOutputStream)
+      it.writeBody(byteArrayOutputStream)
+    }
+    return byteArrayOutputStream.toByteArray()
+  }
+
+  override fun getSize(): Int = bodySize
+
+  override fun toString(): String {
+    return "Data(name='$name', data=$data, bodySize=$bodySize)"
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/DataAmf0.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/DataAmf0.kt
new file mode 100644
index 0000000..d5cd2d9
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/DataAmf0.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.data
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.rtmp.message.BasicHeader
+import com.pedro.rtmp.rtmp.message.MessageType
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class DataAmf0(name: String = "", timeStamp: Int = 0, streamId: Int = 0, basicHeader: BasicHeader = BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_CONNECTION.mark)):
+    Data(name, timeStamp, streamId, basicHeader) {
+  override fun getType(): MessageType = MessageType.DATA_AMF0
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/DataAmf3.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/DataAmf3.kt
new file mode 100644
index 0000000..48137ba
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/data/DataAmf3.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.data
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.rtmp.message.BasicHeader
+import com.pedro.rtmp.rtmp.message.MessageType
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class DataAmf3(name: String = "", timeStamp: Int = 0, streamId: Int = 0, basicHeader: BasicHeader = BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_CONNECTION.mark)):
+    Data(name, timeStamp, streamId, basicHeader) {
+  override fun getType(): MessageType = MessageType.DATA_AMF3
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObject.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObject.kt
new file mode 100644
index 0000000..f438350
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObject.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.shared
+
+import com.pedro.rtmp.rtmp.chunk.ChunkStreamId
+import com.pedro.rtmp.rtmp.chunk.ChunkType
+import com.pedro.rtmp.rtmp.message.BasicHeader
+import com.pedro.rtmp.rtmp.message.RtmpMessage
+import java.io.InputStream
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+abstract class SharedObject: RtmpMessage(BasicHeader(ChunkType.TYPE_0, ChunkStreamId.PROTOCOL_CONTROL.mark)) {
+  override fun readBody(input: InputStream) {
+    TODO("Not yet implemented")
+  }
+
+  override fun storeBody(): ByteArray {
+    TODO("Not yet implemented")
+  }
+
+  override fun getSize(): Int {
+    TODO("Not yet implemented")
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObjectAmf0.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObjectAmf0.kt
new file mode 100644
index 0000000..eb7f2aa
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObjectAmf0.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.shared
+
+import com.pedro.rtmp.rtmp.message.MessageType
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class SharedObjectAmf0: SharedObject() {
+  override fun getType(): MessageType = MessageType.SHARED_OBJECT_AMF0
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObjectAmf3.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObjectAmf3.kt
new file mode 100644
index 0000000..c7399f5
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/message/shared/SharedObjectAmf3.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.rtmp.message.shared
+
+import com.pedro.rtmp.rtmp.message.MessageType
+
+/**
+ * Created by pedro on 21/04/21.
+ */
+class SharedObjectAmf3: SharedObject() {
+  override fun getType(): MessageType = MessageType.SHARED_OBJECT_AMF3
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/utils/AuthUtil.kt b/rtmp/src/main/java/com/pedro/rtmp/utils/AuthUtil.kt
new file mode 100644
index 0000000..bf1d507
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/utils/AuthUtil.kt
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.utils
+
+import android.util.Base64
+import java.io.UnsupportedEncodingException
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+import java.util.*
+
+/**
+ * Created by pedro on 27/04/21.
+ */
+object AuthUtil {
+
+  fun getAdobeAuthUserResult(user: String, password: String, salt: String, challenge: String, opaque: String): String {
+    val challenge2 = String.format("%08x", Random().nextInt())
+    var response = stringToMd5Base64(user + salt + password)
+    if (opaque.isNotEmpty()) {
+      response += opaque
+    } else if (challenge.isNotEmpty()) {
+      response += challenge
+    }
+    response = stringToMd5Base64(response + challenge2)
+    var result = "?authmod=adobe&user=$user&challenge=$challenge2&response=$response"
+    if (opaque.isNotEmpty()) {
+      result += "&opaque=$opaque"
+    }
+    return result
+  }
+
+  /**
+   * Limelight auth. This auth is closely to Digest auth
+   * http://tools.ietf.org/html/rfc2617
+   * http://en.wikipedia.org/wiki/Digest_access_authentication
+   *
+   * https://github.com/ossrs/librtmp/blob/feature/srs/librtmp/rtmp.c
+   */
+  fun getLlnwAuthUserResult(user: String, password: String, nonce: String, app: String): String {
+    val authMod = "llnw"
+    val realm = "live"
+    val method = "publish"
+    val qop = "auth"
+    val ncHex = String.format("%08x", 1)
+    val cNonce = String.format("%08x", Random().nextInt())
+    var path = app
+    //extract query parameters
+    val queryPos = path.indexOf("?")
+    if (queryPos >= 0) path = path.substring(0, queryPos)
+    if (!path.contains("/")) path += "/_definst_"
+    val hash1 = getMd5Hash("$user:$realm:$password")
+    val hash2 = getMd5Hash("$method:/$path")
+    val hash3 = getMd5Hash("$hash1:$nonce:$ncHex:$cNonce:$qop:$hash2")
+    return "?authmod=$authMod&user=$user&nonce=$nonce&cnonce=$cNonce&nc=$ncHex&response=$hash3"
+  }
+
+  fun getSalt(description: String): String {
+    var salt = ""
+    val data = description.split("&").toTypedArray()
+    for (s in data) {
+      if (s.contains("salt=")) {
+        salt = s.substring(5)
+        break
+      }
+    }
+    return salt
+  }
+
+  fun getChallenge(description: String): String {
+    var challenge = ""
+    val data = description.split("&").toTypedArray()
+    for (s in data) {
+      if (s.contains("challenge=")) {
+        challenge = s.substring(10)
+        break
+      }
+    }
+    return challenge
+  }
+
+  fun getOpaque(description: String): String {
+    var opaque = ""
+    val data = description.split("&").toTypedArray()
+    for (s in data) {
+      if (s.contains("opaque=")) {
+        opaque = s.substring(7)
+        break
+      }
+    }
+    return opaque
+  }
+
+  fun stringToMd5Base64(s: String): String {
+    try {
+      val md = MessageDigest.getInstance("MD5")
+      md.update(s.toByteArray())
+      val md5hash = md.digest()
+      return Base64.encodeToString(md5hash, Base64.NO_WRAP)
+    } catch (ignore: Exception) { }
+    return ""
+  }
+
+  /**
+   * Limelight auth utils
+   */
+  fun getNonce(description: String): String {
+    var nonce = ""
+    val data = description.split("&").toTypedArray()
+    for (s in data) {
+      if (s.contains("nonce=")) {
+        nonce = s.substring(6)
+        break
+      }
+    }
+    return nonce
+  }
+
+  fun getMd5Hash(buffer: String): String {
+    val md: MessageDigest
+    try {
+      md = MessageDigest.getInstance("MD5")
+      return bytesToHex(md.digest(buffer.toByteArray()))
+    } catch (ignore: NoSuchAlgorithmException) {
+    } catch (ignore: UnsupportedEncodingException) {
+    }
+    return ""
+  }
+
+  fun bytesToHex(bytes: ByteArray): String {
+    return bytes.joinToString("") { "%02x".format(it) }
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/utils/BitrateManager.kt b/rtmp/src/main/java/com/pedro/rtmp/utils/BitrateManager.kt
new file mode 100644
index 0000000..655170f
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/utils/BitrateManager.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.utils
+
+/**
+ * Created by pedro on 8/04/21.
+ *
+ * Calculate video and audio bitrate per second
+ */
+open class BitrateManager(private val connectCheckerRtmp: ConnectCheckerRtmp) {
+
+  private var bitrate: Long = 0
+  private var timeStamp = System.currentTimeMillis()
+
+  @Synchronized
+  fun calculateBitrate(size: Long) {
+    bitrate += size
+    val timeDiff = System.currentTimeMillis() - timeStamp
+    if (timeDiff >= 1000) {
+      connectCheckerRtmp.onNewBitrateRtmp((bitrate / (timeDiff / 1000f)).toLong())
+      timeStamp = System.currentTimeMillis()
+      bitrate = 0
+    }
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/utils/CommandSessionHistory.kt b/rtmp/src/main/java/com/pedro/rtmp/utils/CommandSessionHistory.kt
new file mode 100644
index 0000000..83186f9
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/utils/CommandSessionHistory.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.utils
+
+import com.pedro.rtmp.rtmp.message.RtmpHeader
+import kotlin.collections.ArrayList
+import kotlin.collections.HashMap
+
+/**
+ * Created by pedro on 22/04/21.
+ */
+class CommandSessionHistory(private val commandHistory: HashMap<Int, String> = HashMap(),
+    private val headerHistory: MutableList<RtmpHeader> = ArrayList()) {
+
+  fun setReadHeader(header: RtmpHeader) {
+    headerHistory.add(header)
+  }
+
+  fun getLastReadHeader(chunkStreamId: Int): RtmpHeader? {
+    val reverseList = headerHistory
+    reverseList.reversed().forEach {
+      if (it.basicHeader.chunkStreamId == chunkStreamId) {
+        return it
+      }
+    }
+    return null
+  }
+
+  fun getName(id: Int): String? {
+    return commandHistory[id]
+  }
+
+  fun setPacket(id: Int, name: String) {
+    commandHistory[id] = name
+  }
+
+  fun reset() {
+    commandHistory.clear()
+    headerHistory.clear()
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/utils/ConnectCheckerRtmp.kt b/rtmp/src/main/java/com/pedro/rtmp/utils/ConnectCheckerRtmp.kt
new file mode 100644
index 0000000..96e3f61
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/utils/ConnectCheckerRtmp.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.utils
+
+/**
+ * Created by pedro on 8/04/21.
+ */
+interface ConnectCheckerRtmp {
+  fun onConnectionStartedRtmp(rtmpUrl: String)
+  fun onConnectionSuccessRtmp()
+  fun onConnectionFailedRtmp(reason: String)
+  fun onNewBitrateRtmp(bitrate: Long)
+  fun onDisconnectRtmp()
+  fun onAuthErrorRtmp()
+  fun onAuthSuccessRtmp()
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/utils/RtmpConfig.kt b/rtmp/src/main/java/com/pedro/rtmp/utils/RtmpConfig.kt
new file mode 100644
index 0000000..db54744
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/utils/RtmpConfig.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.utils
+
+/**
+ * Created by pedro on 26/04/21.
+ */
+object RtmpConfig {
+  const val DEFAULT_CHUNK_SIZE = 128
+  var writeChunkSize = DEFAULT_CHUNK_SIZE
+  var acknowledgementWindowSize = 0
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/utils/TLSSocketFactory.kt b/rtmp/src/main/java/com/pedro/rtmp/utils/TLSSocketFactory.kt
new file mode 100644
index 0000000..9490571
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/utils/TLSSocketFactory.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.utils
+
+import java.io.IOException
+import java.net.InetAddress
+import java.net.Socket
+import java.net.UnknownHostException
+import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
+
+/**
+ * @author fkrauthan
+ */
+open class TLSSocketFactory : SSLSocketFactory() {
+
+  private val internalSSLSocketFactory: SSLSocketFactory
+
+  init {
+    val context = SSLContext.getInstance("TLS")
+    context.init(null, null, null)
+    internalSSLSocketFactory = context.socketFactory
+  }
+
+  override fun getDefaultCipherSuites(): Array<String> {
+    return internalSSLSocketFactory.defaultCipherSuites
+  }
+
+  override fun getSupportedCipherSuites(): Array<String> {
+    return internalSSLSocketFactory.supportedCipherSuites
+  }
+
+  @Throws(IOException::class)
+  override fun createSocket(): Socket {
+    return enableTLSOnSocket(internalSSLSocketFactory.createSocket())
+  }
+
+  @Throws(IOException::class)
+  override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket {
+    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(s, host, port, autoClose))
+  }
+
+  @Throws(IOException::class, UnknownHostException::class)
+  override fun createSocket(host: String, port: Int): Socket {
+    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port))
+  }
+
+  @Throws(IOException::class, UnknownHostException::class)
+  override fun createSocket(host: String, port: Int, localHost: InetAddress, localPort: Int): Socket {
+    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port, localHost, localPort))
+  }
+
+  @Throws(IOException::class)
+  override fun createSocket(host: InetAddress, port: Int): Socket {
+    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port))
+  }
+
+  @Throws(IOException::class)
+  override fun createSocket(address: InetAddress, port: Int, localAddress: InetAddress, localPort: Int): Socket {
+    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(address, port, localAddress, localPort))
+  }
+
+  private fun enableTLSOnSocket(socket: Socket): Socket {
+    if (socket is SSLSocket) {
+      socket.enabledProtocols = arrayOf("TLSv1.1", "TLSv1.2")
+    }
+    return socket
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/utils/Utils.kt b/rtmp/src/main/java/com/pedro/rtmp/utils/Utils.kt
new file mode 100644
index 0000000..8329b60
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/utils/Utils.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.utils
+
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 20/04/21.
+ */
+
+fun InputStream.readUntil(byteArray: ByteArray) {
+  var bytesRead = 0
+  while (bytesRead < byteArray.size) {
+    val result = read(byteArray, bytesRead, byteArray.size - bytesRead)
+    if (result != -1) bytesRead += result
+  }
+}
+
+fun InputStream.readUInt32(): Int {
+  return read() and 0xff shl 24 or (read() and 0xff shl 16) or (read() and 0xff shl 8) or (read() and 0xff)
+}
+
+fun InputStream.readUInt24(): Int {
+  return read() and 0xff shl 16 or (read() and 0xff shl 8) or (read() and 0xff)
+}
+
+fun InputStream.readUInt16(): Int {
+  return read() and 0xff shl 8 or (read() and 0xff)
+}
+
+fun InputStream.readUInt32LittleEndian(): Int {
+  return toLittleEndian(readUInt32())
+}
+
+fun InputStream.readUInt24LittleEndian(): Int {
+  return toLittleEndian(readUInt24())
+}
+
+fun InputStream.readUInt16LittleEndian(): Int {
+  return toLittleEndian(readUInt16())
+}
+
+fun OutputStream.writeUInt32(value: Int) {
+  write(value ushr 24)
+  write(value ushr 16)
+  write(value ushr 8)
+  write(value)
+}
+
+fun OutputStream.writeUInt24(value: Int) {
+  write(value ushr 16)
+  write(value ushr 8)
+  write(value)
+}
+
+fun OutputStream.writeUInt16(value: Int) {
+  write(value ushr 8)
+  write(value)
+}
+
+fun OutputStream.writeUInt32LittleEndian(value: Int) {
+  write(value)
+  write(value ushr 8)
+  write(value ushr 16)
+  write(value ushr 24)
+}
+
+fun OutputStream.writeUInt24LittleEndian(value: Int) {
+  write(value)
+  write(value ushr 8)
+  write(value ushr 16)
+}
+
+fun OutputStream.writeUInt16LittleEndian(value: Int) {
+  write(value)
+  write(value ushr 8)
+}
+
+private fun toLittleEndian(value: Int): Int {
+  return Integer.reverseBytes(value)
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/utils/socket/RtmpSocket.kt b/rtmp/src/main/java/com/pedro/rtmp/utils/socket/RtmpSocket.kt
new file mode 100644
index 0000000..4022749
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/utils/socket/RtmpSocket.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2022 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.utils.socket
+
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 5/4/22.
+ * Socket implementation that accept:
+ * - TCP
+ * - TCP SSL/TLS
+ * - UDP
+ * - Tunneled HTTP
+ * - Tunneled HTTPS
+ */
+abstract class RtmpSocket {
+
+  protected val timeout = 5000
+
+  abstract fun getOutStream(): OutputStream
+  abstract fun getInputStream(): InputStream
+  abstract fun flush()
+  abstract fun connect()
+  abstract fun close()
+  abstract fun isConnected(): Boolean
+  abstract fun isReachable(): Boolean
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/utils/socket/TcpSocket.kt b/rtmp/src/main/java/com/pedro/rtmp/utils/socket/TcpSocket.kt
new file mode 100644
index 0000000..a85f75b
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/utils/socket/TcpSocket.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2022 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.utils.socket
+
+import com.pedro.rtmp.utils.TLSSocketFactory
+import java.io.*
+import java.net.InetSocketAddress
+import java.net.Socket
+import java.net.SocketAddress
+import java.security.GeneralSecurityException
+
+/**
+ * Created by pedro on 5/4/22.
+ */
+class TcpSocket(private val host: String, private val port: Int, private val secured: Boolean): RtmpSocket() {
+
+  private var socket: Socket = Socket()
+  private var input: BufferedInputStream = BufferedInputStream(ByteArrayInputStream(byteArrayOf()))
+  private var output: OutputStream = ByteArrayOutputStream()
+
+  override fun getOutStream(): OutputStream = output
+
+  override fun getInputStream(): InputStream = input
+
+  override fun flush() {
+    getOutStream().flush()
+  }
+
+  override fun connect() {
+    if (secured) {
+      try {
+        val socketFactory = TLSSocketFactory()
+        socket = socketFactory.createSocket(host, port)
+      } catch (e: GeneralSecurityException) {
+        throw IOException("Create SSL socket failed: ${e.message}")
+      }
+    } else {
+      socket = Socket()
+      val socketAddress: SocketAddress = InetSocketAddress(host, port)
+      socket.connect(socketAddress, timeout)
+    }
+    output = socket.getOutputStream()
+    input = BufferedInputStream(socket.getInputStream())
+    socket.soTimeout = timeout
+  }
+
+  override fun close() {
+    if (socket.isConnected) {
+      socket.getInputStream().close()
+      input.close()
+      output.close()
+      socket.close()
+    }
+  }
+
+  override fun isConnected(): Boolean = socket.isConnected
+
+  override fun isReachable(): Boolean = socket.inetAddress?.isReachable(5000) ?: false
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/com/pedro/rtmp/utils/socket/TcpTunneledSocket.kt b/rtmp/src/main/java/com/pedro/rtmp/utils/socket/TcpTunneledSocket.kt
new file mode 100644
index 0000000..ae7c9b4
--- /dev/null
+++ b/rtmp/src/main/java/com/pedro/rtmp/utils/socket/TcpTunneledSocket.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2022 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.utils.socket
+
+import android.util.Log
+import java.io.*
+import java.net.HttpURLConnection
+import java.net.SocketTimeoutException
+import java.net.URL
+import java.util.concurrent.atomic.AtomicLong
+import javax.net.ssl.HttpsURLConnection
+
+/**
+ * Created by pedro on 5/4/22.
+ */
+class TcpTunneledSocket(private val host: String, private val port: Int, private val secured: Boolean): RtmpSocket() {
+
+  private val TAG = "TcpTunneledSocket"
+
+  private val headers = mapOf(
+    "Content-Type" to "application/x-fcs",
+    "User-Agent" to "Shockwave Flash"
+  )
+  private var connectionId: String = ""
+  private var connected = false
+  private var index = AtomicLong(0)
+  private var output = ByteArrayOutputStream()
+  private var input = ByteArrayInputStream(byteArrayOf())
+  private val sync = Any()
+
+  override fun getOutStream(): OutputStream = output
+
+  override fun getInputStream(): InputStream {
+    synchronized(sync) {
+      val start = System.currentTimeMillis()
+      while (input.available() <= 1 && connected) {
+        val i = index.addAndGet(1)
+        val bytes = requestRead("idle/$connectionId/$i", secured)
+        input = ByteArrayInputStream(bytes, 1, bytes.size)
+        if (System.currentTimeMillis() - start >= timeout) {
+          throw SocketTimeoutException("couldn't receive a valid packet")
+        }
+      }
+    }
+    return input
+  }
+
+  override fun flush() {
+    synchronized(sync) {
+      if (!connected) return
+      val i = index.addAndGet(1)
+      val bytes = output.toByteArray()
+      output.reset()
+      requestWrite("send/$connectionId/$i", secured, bytes)
+    }
+  }
+
+  override fun connect() {
+    synchronized(sync) {
+      try {
+        //optional in few servers
+        requestWrite("fcs/ident2", secured, byteArrayOf(0x00))
+      } catch (ignored: IOException) { }
+      try {
+        val openResult = requestRead("open/1", secured)
+        connectionId = String(openResult).trimIndent()
+        requestWrite("idle/$connectionId/${index.get()}", secured, byteArrayOf(0x00))
+        connected = true
+        Log.i(TAG, "Connection success")
+      } catch (e: IOException) {
+        Log.e(TAG, "Connection failed: ${e.message}")
+        connected = false
+      }
+    }
+  }
+
+  override fun close() {
+    Log.i(TAG, "closing tunneled socket...")
+    connected = false
+    synchronized(sync) {
+      Thread {
+        try {
+          requestWrite("close/$connectionId", secured, byteArrayOf(0x00))
+          Log.i(TAG, "Close success")
+        } catch (e: IOException) {
+          Log.e(TAG, "Close request failed: ${e.message}")
+        } finally {
+          index.set(0)
+          connectionId = ""
+        }
+      }.start()
+    }
+  }
+
+  override fun isConnected(): Boolean = connected
+
+  override fun isReachable(): Boolean = connected
+
+  @Throws(IOException::class)
+  private fun requestWrite(path: String, secured: Boolean, data: ByteArray) {
+    val socket = configureSocket(path, secured)
+    try {
+      socket.connect()
+      socket.outputStream.write(data)
+      val bytes = socket.inputStream.readBytes()
+      if (bytes.size > 1) input = ByteArrayInputStream(bytes, 1, bytes.size)
+      val success = socket.responseCode == HttpURLConnection.HTTP_OK
+      if (!success) throw IOException("send packet failed: ${socket.responseMessage}")
+    } finally {
+      socket.disconnect()
+    }
+  }
+
+  @Throws(IOException::class)
+  private fun requestRead(path: String, secured: Boolean): ByteArray {
+    val socket = configureSocket(path, secured)
+    try {
+      socket.connect()
+      val data = socket.inputStream.readBytes()
+      val success = socket.responseCode == HttpURLConnection.HTTP_OK
+      if (!success) throw IOException("receive packet failed: ${socket.responseMessage}")
+      return data
+    } finally {
+      socket.disconnect()
+    }
+  }
+
+  private fun configureSocket(path: String, secured: Boolean): HttpURLConnection {
+    val schema = if (secured) "https" else "http"
+    val url = URL("$schema://$host:$port/$path")
+    val socket = if (secured) {
+      url.openConnection() as HttpsURLConnection
+    } else {
+      url.openConnection() as HttpURLConnection
+    }
+    Log.i(TAG, "open: $url")
+    socket.requestMethod = "POST"
+    headers.forEach { (key, value) ->
+      socket.addRequestProperty(key, value)
+    }
+    socket.doOutput = true
+    socket.connectTimeout = timeout
+    socket.readTimeout = timeout
+    return socket
+  }
+}
\ No newline at end of file
diff --git a/rtmp/src/main/java/net/ossrs/rtmp/BitrateManager.java b/rtmp/src/main/java/net/ossrs/rtmp/BitrateManager.java
deleted file mode 100644
index db38ce8..0000000
--- a/rtmp/src/main/java/net/ossrs/rtmp/BitrateManager.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package net.ossrs.rtmp;
-
-/**
- * Created by pedro on 10/07/19.
- *
- * Calculate video and audio bitrate per second
- */
-public class BitrateManager {
-
-  private long bitrate;
-  private long timeStamp = System.currentTimeMillis();
-  private ConnectCheckerRtmp connectCheckerRtmp;
-
-  public BitrateManager(ConnectCheckerRtmp connectCheckerRtsp) {
-    this.connectCheckerRtmp = connectCheckerRtsp;
-  }
-
-  public synchronized void calculateBitrate(long size) {
-    bitrate += size;
-    long timeDiff = System.currentTimeMillis() - timeStamp;
-    if (timeDiff >= 1000) {
-      connectCheckerRtmp.onNewBitrateRtmp((int) (bitrate / (timeDiff / 1000f)));
-      timeStamp = System.currentTimeMillis();
-      bitrate = 0;
-    }
-  }
-}
diff --git a/rtmp/src/main/java/net/ossrs/rtmp/ConnectCheckerRtmp.java b/rtmp/src/main/java/net/ossrs/rtmp/ConnectCheckerRtmp.java
deleted file mode 100644
index 6e60cf0..0000000
--- a/rtmp/src/main/java/net/ossrs/rtmp/ConnectCheckerRtmp.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package net.ossrs.rtmp;
-
-import androidx.annotation.NonNull;
-
-/**
- * Created by pedro on 25/01/17.
- */
-
-public interface ConnectCheckerRtmp {
-
-  void onConnectionSuccessRtmp();
-
-  void onConnectionFailedRtmp(@NonNull String reason);
-
-  void onNewBitrateRtmp(long bitrate);
-
-  void onDisconnectRtmp();
-
-  void onAuthErrorRtmp();
-
-  void onAuthSuccessRtmp();
-}
diff --git a/rtmp/src/main/java/net/ossrs/rtmp/CreateSSLSocket.java b/rtmp/src/main/java/net/ossrs/rtmp/CreateSSLSocket.java
deleted file mode 100644
index 6c238ad..0000000
--- a/rtmp/src/main/java/net/ossrs/rtmp/CreateSSLSocket.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package net.ossrs.rtmp;
-
-import android.util.Log;
-import java.io.IOException;
-import java.net.Socket;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * Created by pedro on 25/02/17.
- *
- * this class is used for secure transport, to use replace socket on RtmpConnection with this and
- * you will have a secure stream under ssl/tls.
- */
-
-public class CreateSSLSocket {
-
-  /**
-   * @param host variable from RtmpConnection
-   * @param port variable from RtmpConnection
-   */
-  public static Socket createSSlSocket(String host, int port) {
-    try {
-      TLSSocketFactory socketFactory = new TLSSocketFactory();
-      return socketFactory.createSocket(host, port);
-    } catch (NoSuchAlgorithmException | KeyManagementException | IOException e) {
-      Log.e("CreateSSLSocket", "Error", e);
-      return null;
-    }
-  }
-}
diff --git a/rtmp/src/main/java/net/ossrs/rtmp/ProfileIop.java b/rtmp/src/main/java/net/ossrs/rtmp/ProfileIop.java
deleted file mode 100644
index 87d3c8f..0000000
--- a/rtmp/src/main/java/net/ossrs/rtmp/ProfileIop.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.ossrs.rtmp;
-
-/**
- * Created by pedro on 18/12/17.
- */
-
-public class ProfileIop {
-
-  public static final byte BASELINE = 0x00;
-  public static final byte CONSTRAINED = (byte) 0xC0;
-}
diff --git a/rtmp/src/main/java/net/ossrs/rtmp/SrsAllocator.java b/rtmp/src/main/java/net/ossrs/rtmp/SrsAllocator.java
deleted file mode 100644
index b625f94..0000000
--- a/rtmp/src/main/java/net/ossrs/rtmp/SrsAllocator.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package net.ossrs.rtmp;
-
-import java.util.Arrays;
-
-public final class SrsAllocator {
-
-  public class Allocation {
-
-    private byte[] data;
-    private int size;
-
-    public Allocation(int size) {
-      this.data = new byte[size];
-      this.size = 0;
-    }
-
-    public byte[] array() {
-      return data;
-    }
-
-    public int size() {
-      return size;
-    }
-
-    public void appendOffset(int offset) {
-      size += offset;
-    }
-
-    public void clear() {
-      size = 0;
-    }
-
-    public void put(byte b) {
-      data[size++] = b;
-    }
-
-    public void put(byte b, int pos) {
-      data[pos++] = b;
-      size = pos > size ? pos : size;
-    }
-
-    public void put(short s) {
-      put((byte) s);
-      put((byte) (s >>> 8));
-    }
-
-    public void put(int i) {
-      put((byte) i);
-      put((byte) (i >>> 8));
-      put((byte) (i >>> 16));
-      put((byte) (i >>> 24));
-    }
-
-    public void put(byte[] bs) {
-      System.arraycopy(bs, 0, data, size, bs.length);
-      size += bs.length;
-    }
-  }
-
-  private final int individualAllocationSize;
-  private volatile int availableSentinel;
-  private Allocation[] availableAllocations;
-
-  /**
-   * Constructs an instance without creating any {@link Allocation}s up front.
-   *
-   * @param individualAllocationSize The length of each individual {@link Allocation}.
-   */
-  public SrsAllocator(int individualAllocationSize) {
-    this(individualAllocationSize, 0);
-  }
-
-  /**
-   * Constructs an instance with some {@link Allocation}s created up front.
-   * <p>
-   *
-   * @param individualAllocationSize The length of each individual {@link Allocation}.
-   * @param initialAllocationCount The number of allocations to create up front.
-   */
-  public SrsAllocator(int individualAllocationSize, int initialAllocationCount) {
-    this.individualAllocationSize = individualAllocationSize;
-    this.availableSentinel = initialAllocationCount + 10;
-    this.availableAllocations = new Allocation[availableSentinel];
-    for (int i = 0; i < availableSentinel; i++) {
-      availableAllocations[i] = new Allocation(individualAllocationSize);
-    }
-  }
-
-  public synchronized Allocation allocate(int size) {
-    for (int i = 0; i < availableSentinel; i++) {
-      if (availableAllocations[i].size() >= size) {
-        Allocation ret = availableAllocations[i];
-        availableAllocations[i] = null;
-        return ret;
-      }
-    }
-
-    return new Allocation(size > individualAllocationSize ? size : individualAllocationSize);
-  }
-
-  public synchronized void release(Allocation allocation) {
-    allocation.clear();
-
-    for (int i = 0; i < availableSentinel; i++) {
-      if (availableAllocations[i].size() == 0) {
-        availableAllocations[i] = allocation;
-        return;
-      }
-    }
-
-    if (availableSentinel + 1 > availableAllocations.length) {
-      availableAllocations = Arrays.copyOf(availableAllocations, availableAllocations.length * 2);
-    }
-    availableAllocations[availableSentinel++] = allocation;
-  }
-}
\ No newline at end of file
diff --git a/rtmp/src/main/java/net/ossrs/rtmp/SrsFlvMuxer.java b/rtmp/src/main/java/net/ossrs/rtmp/SrsFlvMuxer.java
deleted file mode 100644
index e0d7cf6..0000000
--- a/rtmp/src/main/java/net/ossrs/rtmp/SrsFlvMuxer.java
+++ /dev/null
@@ -1,1048 +0,0 @@
-package net.ossrs.rtmp;
-
-import android.media.MediaCodec;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Process;
-import android.util.Log;
-import com.github.faucamp.simplertmp.DefaultRtmpPublisher;
-import com.github.faucamp.simplertmp.RtmpPublisher;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Created by winlin on 5/2/15.
- * Updated by leoma on 4/1/16.
- * modified by pedro
- * to POST the h.264/avc annexb frame over RTMP.
- * modified by Troy
- * to accept any RtmpPublisher implementation.
- *
- * Usage:
- * muxer = new SrsRtmp("rtmp://ossrs.net/live/yasea");
- * muxer.start();
- *
- * MediaFormat aformat = MediaFormat.createAudioFormat(MediaFormat.MIMETYPE_AUDIO_AAC, sampleRate,
- * achannel);
- * // setup the aformat for audio.
- * atrack = muxer.addTrack(aformat);
- *
- * MediaFormat vformat = MediaFormat.createVideoFormat(MediaFormat.MIMETYPE_VIDEO_AVC, vsize.width,
- * vsize.height);
- * // setup the vformat for video.
- * vtrack = muxer.addTrack(vformat);
- *
- * // encode the video frame from camera by h.264 codec to es and bi,
- * // where es is the h.264 ES(element stream).
- * ByteBuffer es, MediaCodec.BufferInfo bi;
- * muxer.writeSampleData(vtrack, es, bi);
- *
- * // encode the audio frame from microphone by aac codec to es and bi,
- * // where es is the aac ES(element stream).
- * ByteBuffer es, MediaCodec.BufferInfo bi;
- * muxer.writeSampleData(atrack, es, bi);
- *
- * muxer.stop();
- * muxer.release();
- */
-
-public class SrsFlvMuxer {
-
-  private static final String TAG = "SrsFlvMuxer";
-
-  private static final int VIDEO_ALLOC_SIZE = 128 * 1024;
-  private static final int AUDIO_ALLOC_SIZE = 4 * 1024;
-  private volatile boolean connected = false;
-  private RtmpPublisher publisher;
-  private Thread worker;
-  private SrsFlv flv = new SrsFlv();
-  private boolean needToFindKeyFrame = true;
-  private SrsFlvFrame mVideoSequenceHeader;
-  private SrsFlvFrame mAudioSequenceHeader;
-  private SrsAllocator mVideoAllocator = new SrsAllocator(VIDEO_ALLOC_SIZE);
-  private SrsAllocator mAudioAllocator = new SrsAllocator(AUDIO_ALLOC_SIZE);
-  private volatile BlockingQueue<SrsFlvFrame> mFlvVideoTagCache = new LinkedBlockingQueue<>(30);
-  private volatile BlockingQueue<SrsFlvFrame> mFlvAudioTagCache = new LinkedBlockingQueue<>(30);
-  private ConnectCheckerRtmp connectCheckerRtmp;
-  private int sampleRate = 0;
-  private boolean isPpsSpsSend = false;
-  private byte profileIop = ProfileIop.BASELINE;
-  private String url;
-  //re connection
-  private int numRetry;
-  private int reTries;
-  private Handler handler;
-  private Runnable runnable;
-
-  private long mAudioFramesSent = 0;
-  private long mVideoFramesSent = 0;
-  private long mDroppedAudioFrames = 0;
-  private long mDroppedVideoFrames = 0;
-
-  /**
-   * constructor.
-   */
-  public SrsFlvMuxer(ConnectCheckerRtmp connectCheckerRtmp, RtmpPublisher publisher) {
-    this.connectCheckerRtmp = connectCheckerRtmp;
-    this.publisher = publisher;
-    handler = new Handler(Looper.getMainLooper());
-  }
-
-  public SrsFlvMuxer(ConnectCheckerRtmp connectCheckerRtmp) {
-    this(connectCheckerRtmp, new DefaultRtmpPublisher(connectCheckerRtmp));
-  }
-
-  public void setProfileIop(byte profileIop) {
-    this.profileIop = profileIop;
-  }
-
-  public void setSpsPPs(ByteBuffer sps, ByteBuffer pps) {
-    flv.setSpsPPs(sps, pps);
-  }
-
-  public void setSampleRate(int sampleRate) {
-    this.sampleRate = sampleRate;
-  }
-
-  public void setIsStereo(boolean isStereo) {
-    int channel = (isStereo) ? 2 : 1;
-    flv.setAchannel(channel);
-  }
-
-  public void setAuthorization(String user, String password) {
-    publisher.setAuthorization(user, password);
-  }
-
-  public boolean isConnected() {
-    return connected;
-  }
-
-  public void resizeFlvTagCache(int newSize) {
-    synchronized (mFlvAudioTagCache) {
-      mFlvAudioTagCache = resizeFlvTagCacheInternal(mFlvAudioTagCache, newSize);
-    }
-    synchronized (mFlvVideoTagCache) {
-      mFlvVideoTagCache = resizeFlvTagCacheInternal(mFlvVideoTagCache, newSize);
-    }
-  }
-
-  private BlockingQueue<SrsFlvFrame> resizeFlvTagCacheInternal(BlockingQueue<SrsFlvFrame> cache, int newSize) {
-    if(newSize < cache.size() - cache.remainingCapacity()) {
-      throw new RuntimeException("Can't fit current cache inside new cache size");
-    }
-
-    BlockingQueue<SrsFlvFrame> newQueue = new LinkedBlockingQueue<>(newSize);
-    cache.drainTo(newQueue);
-    return newQueue;
-  }
-
-  public int getFlvTagCacheSize() {
-    return mFlvVideoTagCache.size() + mFlvAudioTagCache.size();
-  }
-
-  public long getSentAudioFrames() {
-    return mAudioFramesSent;
-  }
-
-  public long getSentVideoFrames() {
-    return mVideoFramesSent;
-  }
-
-  public long getDroppedAudioFrames() {
-    return mDroppedAudioFrames;
-  }
-
-  public long getDroppedVideoFrames() {
-    return mDroppedVideoFrames;
-  }
-
-  public void resetSentAudioFrames() {
-    mAudioFramesSent = 0;
-  }
-
-  public void resetSentVideoFrames() {
-    mVideoFramesSent = 0;
-  }
-
-  public void resetDroppedAudioFrames() {
-    mDroppedAudioFrames = 0;
-  }
-
-  public void resetDroppedVideoFrames() {
-    mDroppedVideoFrames = 0;
-  }
-
-  /**
-   * set video resolution for publisher
-   *
-   * @param width width
-   * @param height height
-   */
-  public void setVideoResolution(int width, int height) {
-    publisher.setVideoResolution(width, height);
-  }
-
-  private void disconnect(ConnectCheckerRtmp connectChecker) {
-    try {
-      publisher.close();
-    } catch (IllegalStateException e) {
-      // Ignore illegal state.
-    }
-    connected = false;
-    mVideoSequenceHeader = null;
-    mAudioSequenceHeader = null;
-
-    resetSentAudioFrames();
-    resetSentVideoFrames();
-    resetDroppedAudioFrames();
-    resetDroppedVideoFrames();
-
-    if (connectChecker != null) {
-      reTries = 0;
-      connectChecker.onDisconnectRtmp();
-    }
-    Log.i(TAG, "worker: disconnect ok.");
-  }
-
-  public void setReTries(int reTries) {
-    numRetry = reTries;
-    this.reTries = reTries;
-  }
-
-  public boolean shouldRetry(String reason) {
-    boolean validReason = !reason.contains("Endpoint malformed");
-    return validReason && reTries > 0;
-  }
-
-  public void reConnect(final long delay) {
-    reTries--;
-    stop(null);
-    runnable = new Runnable() {
-      @Override
-      public void run() {
-        start(url);
-      }
-    };
-    handler.postDelayed(runnable, delay);
-  }
-
-  private boolean connect(String url) {
-    this.url = url;
-    if (!connected) {
-      Log.i(TAG, String.format("worker: connecting to RTMP server by url=%s\n", url));
-      if (publisher.connect(url)) {
-        connected = publisher.publish("live");
-      }
-      mVideoSequenceHeader = null;
-      mAudioSequenceHeader = null;
-    }
-    return connected;
-  }
-
-  private void sendFlvTag(SrsFlvFrame frame) {
-    if (!connected || frame == null) {
-      return;
-    }
-
-    if (frame.is_video()) {
-      if (frame.is_keyframe()) {
-        Log.i(TAG,
-            String.format("worker: send frame type=%d, dts=%d, size=%dB", frame.type, frame.dts,
-                frame.flvTag.array().length));
-      }
-      publisher.publishVideoData(frame.flvTag.array(), frame.flvTag.size(), frame.dts);
-      mVideoAllocator.release(frame.flvTag);
-      mVideoFramesSent++;
-    } else if (frame.is_audio()) {
-      publisher.publishAudioData(frame.flvTag.array(), frame.flvTag.size(), frame.dts);
-      mAudioAllocator.release(frame.flvTag);
-      mAudioFramesSent++;
-    }
-  }
-
-  /**
-   * start to the remote SRS for remux.
-   */
-  public void start(final String rtmpUrl) {
-    worker = new Thread(new Runnable() {
-      @Override
-      public void run() {
-        android.os.Process.setThreadPriority(Process.THREAD_PRIORITY_MORE_FAVORABLE);
-        if (!connect(rtmpUrl)) {
-          return;
-        }
-        reTries = numRetry;
-        connectCheckerRtmp.onConnectionSuccessRtmp();
-        while (!Thread.interrupted()) {
-          try {
-            SrsFlvFrame frame = mFlvAudioTagCache.poll(1, TimeUnit.MILLISECONDS);
-            if (frame != null) {
-              if (frame.is_sequenceHeader()) {
-                mAudioSequenceHeader = frame;
-              }
-              sendFlvTag(frame);
-            }
-
-            frame = mFlvVideoTagCache.poll(1, TimeUnit.MILLISECONDS);
-            if (frame != null) {
-              // video
-              if (frame.is_sequenceHeader()) {
-                mVideoSequenceHeader = frame;
-              }
-              sendFlvTag(frame);
-            }
-          } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-          }
-        }
-      }
-    });
-    worker.start();
-  }
-
-  public void stop() {
-    stop(connectCheckerRtmp);
-  }
-
-  /**
-   * stop the muxer, disconnect RTMP connection.
-   */
-  private void stop(final ConnectCheckerRtmp connectCheckerRtmp) {
-    handler.removeCallbacks(runnable);
-    if (worker != null) {
-      worker.interrupt();
-      try {
-        worker.join(100);
-      } catch (InterruptedException e) {
-        worker.interrupt();
-      }
-      worker = null;
-    }
-    mFlvAudioTagCache.clear();
-    mFlvVideoTagCache.clear();
-    flv.reset();
-    needToFindKeyFrame = true;
-    Log.i(TAG, "SrsFlvMuxer closed");
-
-    new Thread(new Runnable() {
-      @Override
-      public void run() {
-        disconnect(connectCheckerRtmp);
-      }
-    }).start();
-  }
-
-  public void sendVideo(ByteBuffer byteBuffer, MediaCodec.BufferInfo bufferInfo) {
-    flv.writeVideoSample(byteBuffer, bufferInfo);
-  }
-
-  public void sendAudio(ByteBuffer byteBuffer, MediaCodec.BufferInfo bufferInfo) {
-    flv.writeAudioSample(byteBuffer, bufferInfo);
-  }
-
-  // E.4.3.1 VIDEODATA
-  // Frame Type UB [4]
-  // Type of video frame. The following values are defined:
-  //     1 = key frame (for AVC, a seekable frame)
-  //     2 = inter frame (for AVC, a non-seekable frame)
-  //     3 = disposable inter frame (H.263 only)
-  //     4 = generated key frame (reserved for server use only)
-  //     5 = video info/command frame
-  private class SrsCodecVideoAVCFrame {
-    public final static int KeyFrame = 1;
-    public final static int InterFrame = 2;
-  }
-
-  // AVCPacketType IF CodecID == 7 UI8
-  // The following values are defined:
-  //     0 = AVC sequence header
-  //     1 = AVC NALU
-  //     2 = AVC end of sequence (lower level NALU sequence ender is
-  //         not required or supported)
-  private class SrsCodecVideoAVCType {
-    public final static int SequenceHeader = 0;
-    public final static int NALU = 1;
-  }
-
-  /**
-   * E.4.1 FLV Tag, page 75
-   */
-  private class SrsCodecFlvTag {
-    // 8 = audio
-    public final static int Audio = 8;
-    // 9 = video
-    public final static int Video = 9;
-  }
-
-  private class AudioSampleRate {
-    public final static int R11025 = 11025;
-    public final static int R12000 = 12000;
-    public final static int R16000 = 16000;
-    public final static int R22050 = 22050;
-    public final static int R24000 = 24000;
-    public final static int R32000 = 32000;
-    public final static int R44100 = 44100;
-    public final static int R48000 = 48000;
-    public final static int R64000 = 64000;
-    public final static int R88200 = 88200;
-    public final static int R96000 = 96000;
-  }
-
-  // E.4.3.1 VIDEODATA
-  // CodecID UB [4]
-  // Codec Identifier. The following values are defined:
-  //     2 = Sorenson H.263
-  //     3 = Screen video
-  //     4 = On2 VP6
-  //     5 = On2 VP6 with alpha channel
-  //     6 = Screen video version 2
-  //     7 = AVC
-  private class SrsCodecVideo {
-    public final static int AVC = 7;
-  }
-
-  /**
-   * the aac object type, for RTMP sequence header
-   * for AudioSpecificConfig, @see aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 33
-   * for audioObjectType, @see aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 23
-   */
-  private class SrsAacObjectType {
-    public final static int AacLC = 2;
-  }
-
-  /**
-   * Table 7-1 – NAL unit type codes, syntax element categories, and NAL unit type classes
-   * H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 83.
-   */
-  private class SrsAvcNaluType {
-    // Unspecified
-    public final static int Reserved = 0;
-
-    // Coded slice of a non-IDR picture slice_layer_without_partitioning_rbsp( )
-    public final static int NonIDR = 1;
-    // Coded slice data partition A slice_data_partition_a_layer_rbsp( )
-    public final static int DataPartitionA = 2;
-    // Coded slice data partition B slice_data_partition_b_layer_rbsp( )
-    public final static int DataPartitionB = 3;
-    // Coded slice data partition C slice_data_partition_c_layer_rbsp( )
-    public final static int DataPartitionC = 4;
-    // Coded slice of an IDR picture slice_layer_without_partitioning_rbsp( )
-    public final static int IDR = 5;
-    // Supplemental enhancement information (SEI) sei_rbsp( )
-    public final static int SEI = 6;
-    // Sequence parameter set seq_parameter_set_rbsp( )
-    public final static int SPS = 7;
-    // Picture parameter set pic_parameter_set_rbsp( )
-    public final static int PPS = 8;
-    // Access unit delimiter access_unit_delimiter_rbsp( )
-    public final static int AccessUnitDelimiter = 9;
-    // End of sequence end_of_seq_rbsp( )
-    public final static int EOSequence = 10;
-    // End of stream end_of_stream_rbsp( )
-    public final static int EOStream = 11;
-    // Filler data filler_data_rbsp( )
-    public final static int FilterData = 12;
-    // Sequence parameter set extension seq_parameter_set_extension_rbsp( )
-    public final static int SPSExt = 13;
-    // Prefix NAL unit prefix_nal_unit_rbsp( )
-    public final static int PrefixNALU = 14;
-    // Subset sequence parameter set subset_seq_parameter_set_rbsp( )
-    public final static int SubsetSPS = 15;
-    // Coded slice of an auxiliary coded picture without partitioning slice_layer_without_partitioning_rbsp( )
-    public final static int LayerWithoutPartition = 19;
-    // Coded slice extension slice_layer_extension_rbsp( )
-    public final static int CodedSliceExt = 20;
-  }
-
-  /**
-   * the search result for annexb.
-   */
-  private class SrsAnnexbSearch {
-    public int nb_start_code = 0;
-    public boolean match = false;
-  }
-
-  /**
-   * the demuxed tag frame.
-   */
-  private class SrsFlvFrameBytes {
-    public ByteBuffer data;
-    public int size;
-  }
-
-  /**
-   * the muxed flv frame.
-   */
-  private class SrsFlvFrame {
-    // the tag bytes.
-    public SrsAllocator.Allocation flvTag;
-    // the codec type for audio/aac and video/avc for instance.
-    public int avc_aac_type;
-    // the frame type, keyframe or not.
-    public int frame_type;
-    // the tag type, audio, video or data.
-    public int type;
-    // the dts in ms, tbn is 1000.
-    public int dts;
-
-    public boolean is_keyframe() {
-      return is_video() && frame_type == SrsCodecVideoAVCFrame.KeyFrame;
-    }
-
-    public boolean is_sequenceHeader() {
-      return avc_aac_type == 0;
-    }
-
-    public boolean is_video() {
-      return type == SrsCodecFlvTag.Video;
-    }
-
-    public boolean is_audio() {
-      return type == SrsCodecFlvTag.Audio;
-    }
-  }
-
-  /**
-   * the raw h.264 stream, in annexb.
-   */
-  private class SrsRawH264Stream {
-    private final static String TAG = "SrsFlvMuxer";
-
-    private SrsAnnexbSearch annexb = new SrsAnnexbSearch();
-    private SrsFlvFrameBytes nalu_header = new SrsFlvFrameBytes();
-    private SrsFlvFrameBytes seq_hdr = new SrsFlvFrameBytes();
-    private SrsFlvFrameBytes sps_hdr = new SrsFlvFrameBytes();
-    private SrsFlvFrameBytes sps_bb = new SrsFlvFrameBytes();
-    private SrsFlvFrameBytes pps_hdr = new SrsFlvFrameBytes();
-    private SrsFlvFrameBytes pps_bb = new SrsFlvFrameBytes();
-
-    public boolean isSps(SrsFlvFrameBytes frame) {
-      return frame.size >= 1 && (frame.data.get(0) & 0x1f) == SrsAvcNaluType.SPS;
-    }
-
-    public boolean isPps(SrsFlvFrameBytes frame) {
-      return frame.size >= 1 && (frame.data.get(0) & 0x1f) == SrsAvcNaluType.PPS;
-    }
-
-    public SrsFlvFrameBytes muxNaluHeader(SrsFlvFrameBytes frame) {
-      if (nalu_header.data == null) {
-        nalu_header.data = ByteBuffer.allocate(4);
-        nalu_header.size = 4;
-      }
-      nalu_header.data.rewind();
-
-      // 5.3.4.2.1 Syntax, H.264-AVC-ISO_IEC_14496-15.pdf, page 16
-      // lengthSizeMinusOne, or NAL_unit_length, always use 4bytes size
-      int NAL_unit_length = frame.size;
-
-      // mux the avc NALU in "ISO Base Media File Format"
-      // from H.264-AVC-ISO_IEC_14496-15.pdf, page 20
-      // NALUnitLength
-      nalu_header.data.putInt(NAL_unit_length);
-
-      // reset the buffer.
-      nalu_header.data.rewind();
-      return nalu_header;
-    }
-
-    public void muxSequenceHeader(ByteBuffer sps, ByteBuffer pps,
-        ArrayList<SrsFlvFrameBytes> frames) {
-      // 5bytes sps/pps header:
-      //      configurationVersion, AVCProfileIndication, profile_compatibility,
-      //      AVCLevelIndication, lengthSizeMinusOne
-      // 3bytes size of sps:
-      //      numOfSequenceParameterSets, sequenceParameterSetLength(2B)
-      // Nbytes of sps.
-      //      sequenceParameterSetNALUnit
-      // 3bytes size of pps:
-      //      numOfPictureParameterSets, pictureParameterSetLength
-      // Nbytes of pps:
-      //      pictureParameterSetNALUnit
-
-      // decode the SPS:
-      // @see: 7.3.2.1.1, H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 62
-      if (seq_hdr.data == null) {
-        seq_hdr.data = ByteBuffer.allocate(5);
-        seq_hdr.size = 5;
-      }
-      seq_hdr.data.rewind();
-      // @see: Annex A Profiles and levels, H.264-AVC-ISO_IEC_14496-10.pdf, page 205
-      //      Baseline profile profile_idc is 66(0x42).
-      //      Main profile profile_idc is 77(0x4d).
-      //      Extended profile profile_idc is 88(0x58).
-      byte profile_idc = sps.get(1);
-      //u_int8_t constraint_set = frame[2];
-      byte level_idc = sps.get(3);
-
-      // generate the sps/pps header
-      // 5.3.4.2.1 Syntax, H.264-AVC-ISO_IEC_14496-15.pdf, page 16
-      // configurationVersion
-      seq_hdr.data.put((byte) 0x01);
-      // AVCProfileIndication
-      seq_hdr.data.put(profile_idc);
-      // profile_compatibility
-      seq_hdr.data.put(profileIop);
-      // AVCLevelIndication
-      seq_hdr.data.put(level_idc);
-      // lengthSizeMinusOne, or NAL_unit_length, always use 4bytes size,
-      // so we always set it to 0x03.
-      seq_hdr.data.put((byte) 0x03);
-
-      // reset the buffer.
-      seq_hdr.data.rewind();
-      frames.add(seq_hdr);
-
-      // sps
-      if (sps_hdr.data == null) {
-        sps_hdr.data = ByteBuffer.allocate(3);
-        sps_hdr.size = 3;
-      }
-      sps_hdr.data.rewind();
-      // 5.3.4.2.1 Syntax, H.264-AVC-ISO_IEC_14496-15.pdf, page 16
-      // numOfSequenceParameterSets, always 1
-      sps_hdr.data.put((byte) 0x01);
-      // sequenceParameterSetLength
-      sps_hdr.data.putShort((short) sps.array().length);
-
-      sps_hdr.data.rewind();
-      frames.add(sps_hdr);
-
-      // sequenceParameterSetNALUnit
-      sps_bb.size = sps.array().length;
-      sps_bb.data = sps.duplicate();
-      frames.add(sps_bb);
-
-      // pps
-      if (pps_hdr.data == null) {
-        pps_hdr.data = ByteBuffer.allocate(3);
-        pps_hdr.size = 3;
-      }
-      pps_hdr.data.rewind();
-      // 5.3.4.2.1 Syntax, H.264-AVC-ISO_IEC_14496-15.pdf, page 16
-      // numOfPictureParameterSets, always 1
-      pps_hdr.data.put((byte) 0x01);
-      // pictureParameterSetLength
-      pps_hdr.data.putShort((short) pps.array().length);
-
-      pps_hdr.data.rewind();
-      frames.add(pps_hdr);
-
-      // pictureParameterSetNALUnit
-      pps_bb.size = pps.array().length;
-      pps_bb.data = pps.duplicate();
-      frames.add(pps_bb);
-    }
-
-    public SrsAllocator.Allocation muxFlvTag(ArrayList<SrsFlvFrameBytes> frames, int frame_type,
-        int avc_packet_type) {
-      // for h264 in RTMP video payload, there is 5bytes header:
-      //      1bytes, FrameType | CodecID
-      //      1bytes, AVCPacketType
-      //      3bytes, CompositionTime, the cts.
-      // @see: E.4.3 Video Tags, video_file_format_spec_v10_1.pdf, page 78
-      int size = 5;
-      for (int i = 0; i < frames.size(); i++) {
-        size += frames.get(i).size;
-      }
-      SrsAllocator.Allocation allocation = mVideoAllocator.allocate(size);
-
-      // @see: E.4.3 Video Tags, video_file_format_spec_v10_1.pdf, page 78
-      // Frame Type, Type of video frame.
-      // CodecID, Codec Identifier.
-      // set the rtmp header
-      allocation.put((byte) ((frame_type << 4) | SrsCodecVideo.AVC));
-
-      // AVCPacketType
-      allocation.put((byte) avc_packet_type);
-
-      // CompositionTime
-      // pts = dts + cts, or
-      // cts = pts - dts.
-      // where cts is the header in rtmp video packet payload header.
-      int cts = 0;
-      allocation.put((byte) (cts >> 16));
-      allocation.put((byte) (cts >> 8));
-      allocation.put((byte) cts);
-
-      // h.264 raw data.
-      for (int i = 0; i < frames.size(); i++) {
-        SrsFlvFrameBytes frame = frames.get(i);
-        frame.data.rewind();
-        frame.data.get(allocation.array(), allocation.size(), frame.size);
-        allocation.appendOffset(frame.size);
-      }
-
-      return allocation;
-    }
-
-    private SrsAnnexbSearch searchStartcode(ByteBuffer bb, int size) {
-      annexb.match = false;
-      annexb.nb_start_code = 0;
-      if (size - 4 > 0) {
-        if (bb.get(0) == 0x00 && bb.get(1) == 0x00 && bb.get(2) == 0x00 && bb.get(3) == 0x01) {
-          // match N[00] 00 00 00 01, where N>=0
-          annexb.match = true;
-          annexb.nb_start_code = 4;
-        } else if (bb.get(0) == 0x00 && bb.get(1) == 0x00 && bb.get(2) == 0x01) {
-          // match N[00] 00 00 01, where N>=0
-          annexb.match = true;
-          annexb.nb_start_code = 3;
-        }
-      }
-      return annexb;
-    }
-
-    private SrsAnnexbSearch searchAnnexb(ByteBuffer bb, int size) {
-      annexb.match = false;
-      annexb.nb_start_code = 0;
-      for (int i = bb.position(); i < size - 4; i++) {
-        // not match.
-        if (bb.get(i) != 0x00 || bb.get(i + 1) != 0x00) {
-          continue;
-        }
-        // match N[00] 00 00 01, where N>=0
-        if (bb.get(i + 2) == 0x01) {
-          annexb.match = true;
-          annexb.nb_start_code = i + 3 - bb.position();
-          break;
-        }
-        // match N[00] 00 00 00 01, where N>=0
-        if (bb.get(i + 2) == 0x00 && bb.get(i + 3) == 0x01) {
-          annexb.match = true;
-          annexb.nb_start_code = i + 4 - bb.position();
-          break;
-        }
-      }
-      return annexb;
-    }
-
-    public SrsFlvFrameBytes demuxAnnexb(ByteBuffer bb, int size, boolean isOnlyChkHeader) {
-      SrsFlvFrameBytes tbb = new SrsFlvFrameBytes();
-      if (bb.position() < size - 4) {
-        // each frame must prefixed by annexb format.
-        // about annexb, @see H.264-AVC-ISO_IEC_14496-10.pdf, page 211.
-        SrsAnnexbSearch tbbsc =
-            isOnlyChkHeader ? searchStartcode(bb, size) : searchAnnexb(bb, size);
-        // tbbsc.nb_start_code always 4 , after 00 00 00 01
-        if (!tbbsc.match || tbbsc.nb_start_code < 3) {
-          Log.e(TAG, "annexb not match.");
-        } else {
-          // the start codes.
-          for (int i = 0; i < tbbsc.nb_start_code; i++) {
-            bb.get();
-          }
-
-          // find out the frame size.
-          tbb.data = bb.slice();
-          tbb.size = size - bb.position();
-        }
-      }
-      return tbb;
-    }
-  }
-
-  /**
-   * remux the annexb to flv tags.
-   */
-  private class SrsFlv {
-    private SrsRawH264Stream avc = new SrsRawH264Stream();
-    private ArrayList<SrsFlvFrameBytes> ipbs = new ArrayList<>();
-    private SrsAllocator.Allocation audio_tag;
-    private SrsAllocator.Allocation video_tag;
-    private ByteBuffer Sps;
-    private ByteBuffer Pps;
-    private boolean aac_specific_config_got;
-    private int achannel;
-
-    public SrsFlv() {
-      reset();
-    }
-
-    public void setAchannel(int achannel) {
-      this.achannel = achannel;
-    }
-
-    public void reset() {
-      Sps = null;
-      Pps = null;
-      isPpsSpsSend = false;
-      aac_specific_config_got = false;
-    }
-
-    public void writeAudioSample(final ByteBuffer bb, MediaCodec.BufferInfo bi) {
-      int dts = (int) (bi.presentationTimeUs / 1000);
-
-      audio_tag = mAudioAllocator.allocate(bi.size + 2);
-      byte aac_packet_type = 1; // 1 = AAC raw
-      if (!aac_specific_config_got) {
-        // @see aac-mp4a-format-ISO_IEC_14496-3+2001.pdf
-        // AudioSpecificConfig (), page 33
-        // 1.6.2.1 AudioSpecificConfig
-        // audioObjectType; 5 bslbf
-        byte ch = (byte) (bi.flags == MediaCodec.BUFFER_FLAG_CODEC_CONFIG ? bb.get(0) & 0xf8
-            : (bb.get(0) & 0xf8) / 2);
-        // 3bits left.
-
-        // samplingFrequencyIndex; 4 bslbf
-        // For the values refer to https://wiki.multimedia.cx/index.php/MPEG-4_Audio#Sampling_Frequencies
-        byte samplingFrequencyIndex;
-        switch (sampleRate) {
-          case AudioSampleRate.R96000:
-            samplingFrequencyIndex = 0x00;
-            break;
-          case AudioSampleRate.R88200:
-            samplingFrequencyIndex = 0x01;
-            break;
-          case AudioSampleRate.R64000:
-            samplingFrequencyIndex = 0x02;
-            break;
-          case AudioSampleRate.R48000:
-            samplingFrequencyIndex = 0x03;
-            break;
-          case AudioSampleRate.R44100:
-            samplingFrequencyIndex = 0x04;
-            break;
-          case AudioSampleRate.R32000:
-            samplingFrequencyIndex = 0x05;
-            break;
-          case AudioSampleRate.R24000:
-            samplingFrequencyIndex = 0x06;
-            break;
-          case AudioSampleRate.R22050:
-            samplingFrequencyIndex = 0x07;
-            break;
-          case AudioSampleRate.R16000:
-            samplingFrequencyIndex = 0x08;
-            break;
-          case AudioSampleRate.R12000:
-            samplingFrequencyIndex = 0x09;
-            break;
-          case AudioSampleRate.R11025:
-            samplingFrequencyIndex = 0x0a;
-            break;
-          default:
-            // 44100 Hz shall be the fallback value when sampleRate is irregular.
-            // not implemented: other sample rates might be possible with samplingFrequencyIndex = 0x0f.
-            samplingFrequencyIndex = 0x04; // 4: 44100 Hz
-        }
-        ch |= (samplingFrequencyIndex >> 1) & 0x07;
-        audio_tag.put(ch, 2);
-
-        ch = (byte) ((samplingFrequencyIndex << 7) & 0x80);
-        // 7bits left.
-
-        // channelConfiguration; 4 bslbf
-        byte channelConfiguration = 1;
-        if (achannel == 2) {
-          channelConfiguration = 2;
-        }
-        ch |= (channelConfiguration << 3) & 0x78;
-        // 3bits left.
-
-        // GASpecificConfig(), page 451
-        // 4.4.1 Decoder configuration (GASpecificConfig)
-        // frameLengthFlag; 1 bslbf
-        // dependsOnCoreCoder; 1 bslbf
-        // extensionFlag; 1 bslbf
-        audio_tag.put(ch, 3);
-
-        aac_specific_config_got = true;
-        aac_packet_type = 0; // 0 = AAC sequence header
-
-        writeAdtsHeader(audio_tag.array(), 4);
-        audio_tag.appendOffset(7);
-      } else {
-        bb.get(audio_tag.array(), 2, bi.size);
-        audio_tag.appendOffset(bi.size + 2);
-      }
-
-      byte sound_format = 10; // AAC
-      byte sound_type = 0; // 0 = Mono sound
-      if (achannel == 2) {
-        sound_type = 1; // 1 = Stereo sound
-      }
-      byte sound_size = 1; // 1 = 16-bit samples
-      byte sound_rate = 3; // 44100, 22050, 11025
-      if (sampleRate == 22050) {
-        sound_rate = 2;
-      } else if (sampleRate == 11025) {
-        sound_rate = 1;
-      }
-
-      // for audio frame, there is 1 or 2 bytes header:
-      //      1bytes, SoundFormat|SoundRate|SoundSize|SoundType
-      //      1bytes, AACPacketType for SoundFormat == 10, 0 is sequence header.
-      byte audio_header = (byte) (sound_type & 0x01);
-      audio_header |= (sound_size << 1) & 0x02;
-      audio_header |= (sound_rate << 2) & 0x0c;
-      audio_header |= (sound_format << 4) & 0xf0;
-
-      audio_tag.put(audio_header, 0);
-      audio_tag.put(aac_packet_type, 1);
-      writeRtmpPacket(SrsCodecFlvTag.Audio, dts, 0, aac_packet_type, audio_tag);
-    }
-
-    private void writeAdtsHeader(byte[] frame, int offset) {
-      // adts sync word 0xfff (12-bit)
-      frame[offset] = (byte) 0xff;
-      frame[offset + 1] = (byte) 0xf0;
-      // version 0 for MPEG-4, 1 for MPEG-2 (1-bit)
-      frame[offset + 1] |= 0 << 3;
-      // layer 0 (2-bit)
-      frame[offset + 1] |= 0 << 1;
-      // protection absent: 1 (1-bit)
-      frame[offset + 1] |= 1;
-      // profile: audio_object_type - 1 (2-bit)
-      frame[offset + 2] = (SrsAacObjectType.AacLC - 1) << 6;
-      // sampling frequency index: 4 (4-bit)
-      frame[offset + 2] |= (4 & 0xf) << 2;
-      // channel configuration (3-bit)
-      frame[offset + 2] |= (2 & (byte) 0x4) >> 2;
-      frame[offset + 3] = (byte) ((2 & (byte) 0x03) << 6);
-      // original: 0 (1-bit)
-      frame[offset + 3] |= 0 << 5;
-      // home: 0 (1-bit)
-      frame[offset + 3] |= 0 << 4;
-      // copyright id bit: 0 (1-bit)
-      frame[offset + 3] |= 0 << 3;
-      // copyright id start: 0 (1-bit)
-      frame[offset + 3] |= 0 << 2;
-      // frame size (13-bit)
-      frame[offset + 3] |= ((frame.length - 2) & 0x1800) >> 11;
-      frame[offset + 4] = (byte) (((frame.length - 2) & 0x7f8) >> 3);
-      frame[offset + 5] = (byte) (((frame.length - 2) & 0x7) << 5);
-      // buffer fullness (0x7ff for variable bitrate)
-      frame[offset + 5] |= (byte) 0x1f;
-      frame[offset + 6] = (byte) 0xfc;
-      // number of data block (nb - 1)
-      frame[offset + 6] |= 0x0;
-    }
-
-    public void writeVideoSample(final ByteBuffer bb, MediaCodec.BufferInfo bi) {
-      if (bi.size < 4) return;
-
-      bb.rewind();  //Sometimes the position is not 0.
-      int pts = (int) (bi.presentationTimeUs / 1000);
-      int type = SrsCodecVideoAVCFrame.InterFrame;
-      SrsFlvFrameBytes frame = avc.demuxAnnexb(bb, bi.size, true);
-      int nal_unit_type = frame.data.get(0) & 0x1f;
-      if (nal_unit_type == SrsAvcNaluType.IDR || bi.flags == MediaCodec.BUFFER_FLAG_KEY_FRAME) {
-        type = SrsCodecVideoAVCFrame.KeyFrame;
-      } else if (nal_unit_type == SrsAvcNaluType.SPS || nal_unit_type == SrsAvcNaluType.PPS) {
-        SrsFlvFrameBytes frame_pps = avc.demuxAnnexb(bb, bi.size, false);
-        frame.size = frame.size - frame_pps.size - 4;  // 4 ---> 00 00 00 01 pps
-        if (!frame.data.equals(Sps)) {
-          byte[] sps = new byte[frame.size];
-          frame.data.get(sps);
-          isPpsSpsSend = false;
-          Sps = ByteBuffer.wrap(sps);
-        }
-
-        SrsFlvFrameBytes frame_sei = avc.demuxAnnexb(bb, bi.size, false);
-        if (frame_sei.size > 0) {
-          if (SrsAvcNaluType.SEI == (frame_sei.data.get(0) & 0x1f)) {
-            frame_pps.size = frame_pps.size - frame_sei.size - 3;// 3 ---> 00 00 01 SEI
-          }
-        }
-
-        if (frame_pps.size > 0 && !frame_pps.data.equals(Pps)) {
-          byte[] pps = new byte[frame_pps.size];
-          frame_pps.data.get(pps);
-          isPpsSpsSend = false;
-          Pps = ByteBuffer.wrap(pps);
-          writeH264SpsPps(pts);
-        }
-        return;
-      } else if (nal_unit_type != SrsAvcNaluType.NonIDR) {
-        return;
-      }
-
-      ipbs.add(avc.muxNaluHeader(frame));
-      ipbs.add(frame);
-
-      writeH264IpbFrame(ipbs, type, pts);
-      ipbs.clear();
-    }
-
-    public void setSpsPPs(ByteBuffer sps, ByteBuffer pps) {
-      Sps = sps;
-      Pps = pps;
-    }
-
-    private void writeH264SpsPps(int pts) {
-      // when not got sps/pps, wait.
-      if (Pps == null || Sps == null || isPpsSpsSend) {
-        return;
-      }
-
-      // h264 raw to h264 packet.
-      ArrayList<SrsFlvFrameBytes> frames = new ArrayList<>();
-      avc.muxSequenceHeader(Sps, Pps, frames);
-
-      // h264 packet to flv packet.
-      int frame_type = SrsCodecVideoAVCFrame.KeyFrame;
-      int avc_packet_type = SrsCodecVideoAVCType.SequenceHeader;
-      video_tag = avc.muxFlvTag(frames, frame_type, avc_packet_type);
-
-      isPpsSpsSend = true;
-      // the timestamp in rtmp message header is dts.
-      writeRtmpPacket(SrsCodecFlvTag.Video, pts, frame_type, avc_packet_type, video_tag);
-      Log.i(TAG, String.format("flv: h264 sps/pps sent, sps=%dB, pps=%dB", Sps.array().length,
-          Pps.array().length));
-    }
-
-    private void writeH264IpbFrame(ArrayList<SrsFlvFrameBytes> frames, int frame_type, int dts) {
-      // when sps or pps not sent, ignore the packet.
-      // @see https://github.com/simple-rtmp-server/srs/issues/203
-      if (Pps == null || Sps == null) {
-        return;
-      }
-      video_tag = avc.muxFlvTag(frames, frame_type, SrsCodecVideoAVCType.NALU);
-      // the timestamp in rtmp message header is dts.
-      writeRtmpPacket(SrsCodecFlvTag.Video, dts, frame_type, SrsCodecVideoAVCType.NALU, video_tag);
-    }
-
-    private void writeRtmpPacket(int type, int dts, int frame_type, int avc_aac_type,
-        SrsAllocator.Allocation tag) {
-      SrsFlvFrame frame = new SrsFlvFrame();
-      frame.flvTag = tag;
-      frame.type = type;
-      frame.dts = dts;
-      frame.frame_type = frame_type;
-      frame.avc_aac_type = avc_aac_type;
-      if (frame.is_video()) {
-        if (needToFindKeyFrame) {
-          if (frame.is_keyframe()) {
-            needToFindKeyFrame = false;
-            flvFrameCacheAdd(frame);
-          }
-        } else {
-          flvFrameCacheAdd(frame);
-        }
-      } else if (frame.is_audio()) {
-        flvFrameCacheAdd(frame);
-      }
-    }
-
-    private void flvFrameCacheAdd(SrsFlvFrame frame) {
-      try {
-        if(frame.is_video()) {
-          mFlvVideoTagCache.add(frame);
-        } else {
-          mFlvAudioTagCache.add(frame);
-        }
-      } catch (IllegalStateException e) {
-        Log.i(TAG, "frame discarded");
-        if (frame.is_video()) {
-          mDroppedVideoFrames++;
-        } else {
-          mDroppedAudioFrames++;
-        }
-      }
-    }
-  }
-}
diff --git a/rtmp/src/main/java/net/ossrs/rtmp/TLSSocketFactory.java b/rtmp/src/main/java/net/ossrs/rtmp/TLSSocketFactory.java
deleted file mode 100644
index 5ba5ba1..0000000
--- a/rtmp/src/main/java/net/ossrs/rtmp/TLSSocketFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package net.ossrs.rtmp;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-/**
- * @author fkrauthan
- */
-public class TLSSocketFactory extends SSLSocketFactory {
-
-  private SSLSocketFactory internalSSLSocketFactory;
-
-  public TLSSocketFactory() throws KeyManagementException, NoSuchAlgorithmException {
-    SSLContext context = SSLContext.getInstance("TLS");
-    context.init(null, null, null);
-    internalSSLSocketFactory = context.getSocketFactory();
-  }
-
-  @Override
-  public String[] getDefaultCipherSuites() {
-    return internalSSLSocketFactory.getDefaultCipherSuites();
-  }
-
-  @Override
-  public String[] getSupportedCipherSuites() {
-    return internalSSLSocketFactory.getSupportedCipherSuites();
-  }
-
-  @Override
-  public Socket createSocket() throws IOException {
-    return enableTLSOnSocket(internalSSLSocketFactory.createSocket());
-  }
-
-  @Override
-  public Socket createSocket(Socket s, String host, int port, boolean autoClose)
-      throws IOException {
-    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(s, host, port, autoClose));
-  }
-
-  @Override
-  public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
-  }
-
-  @Override
-  public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
-      throws IOException, UnknownHostException {
-    return enableTLSOnSocket(
-        internalSSLSocketFactory.createSocket(host, port, localHost, localPort));
-  }
-
-  @Override
-  public Socket createSocket(InetAddress host, int port) throws IOException {
-    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
-  }
-
-  @Override
-  public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
-      throws IOException {
-    return enableTLSOnSocket(
-        internalSSLSocketFactory.createSocket(address, port, localAddress, localPort));
-  }
-
-  private Socket enableTLSOnSocket(Socket socket) {
-    if (socket != null && (socket instanceof SSLSocket)) {
-      ((SSLSocket) socket).setEnabledProtocols(new String[] { "TLSv1.1", "TLSv1.2" });
-    }
-    return socket;
-  }
-}
diff --git a/rtmp/src/test/java/android/media/MediaCodec.java b/rtmp/src/test/java/android/media/MediaCodec.java
new file mode 100644
index 0000000..faab3fe
--- /dev/null
+++ b/rtmp/src/test/java/android/media/MediaCodec.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 android.media;
+
+/**
+ * Created by pedro on 16/6/21.
+ *
+ * Replace MediaCodec.BufferInfo class of Android for testing purpose
+ */
+public class MediaCodec {
+  public final static class BufferInfo {
+
+    public void set(int newOffset, int newSize, long newTimeUs, int newFlags) {
+      offset = newOffset;
+      size = newSize;
+      presentationTimeUs = newTimeUs;
+      flags = newFlags;
+    }
+
+    public int offset;
+    public int size;
+    public long presentationTimeUs;
+    public int flags;
+  }
+}
diff --git a/rtmp/src/test/java/android/util/Base64.java b/rtmp/src/test/java/android/util/Base64.java
new file mode 100644
index 0000000..d5fc913
--- /dev/null
+++ b/rtmp/src/test/java/android/util/Base64.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 android.util;
+
+/**
+ * Created by pedro on 16/6/21.
+ *
+ * Replace Base64 class of Android for testing purpose
+ */
+public class Base64 {
+  public static String encodeToString(byte[] input, int flags) {
+    return java.util.Base64.getEncoder().encodeToString(input);
+  }
+}
diff --git a/rtmp/src/test/java/android/util/Log.java b/rtmp/src/test/java/android/util/Log.java
new file mode 100644
index 0000000..51f84d9
--- /dev/null
+++ b/rtmp/src/test/java/android/util/Log.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 android.util;
+
+/**
+ * Created by pedro on 16/6/21.
+ *
+ * Replace Log class of Android for testing purpose
+ */
+public class Log {
+
+  public static int i(String tag, String message, Throwable throwable) {
+    return println(tag, message, throwable);
+  }
+
+  public static int i(String tag, String message) {
+    return println(tag, message, null);
+  }
+
+  public static int e(String tag, String message, Throwable throwable) {
+    return printlnError(tag, message, throwable);
+  }
+
+  public static int e(String tag, String message) {
+    return printlnError(tag, message, null);
+  }
+
+  private static int println(String tag, String message, Throwable throwable) {
+    System.out.println("" + tag + ": " + message);
+    if (throwable != null) throwable.printStackTrace();
+    return 0;
+  }
+
+  private static int printlnError(String tag, String message, Throwable throwable) {
+    System.err.println("" + tag + ": " + message);
+    if (throwable != null) throwable.printStackTrace();
+    return 0;
+  }
+}
diff --git a/rtmp/src/test/java/com/pedro/rtmp/utils/AuthUtilTest.kt b/rtmp/src/test/java/com/pedro/rtmp/utils/AuthUtilTest.kt
new file mode 100644
index 0000000..b039e53
--- /dev/null
+++ b/rtmp/src/test/java/com/pedro/rtmp/utils/AuthUtilTest.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtmp.utils
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class AuthUtilTest {
+
+    @Test
+    fun `when list of numbers converted to hex, then correct concatenated hex returned`() {
+        val numbersToHex = mapOf(
+            255 to "ff", 128 to "80", 8 to "08", 1 to "01", 0 to "00", -255 to "01", -1 to "ff"
+        )
+        val testBytes = numbersToHex.keys.map { it.toByte()}.toByteArray()
+        val expectedHex = numbersToHex.values.reduce { acc, s -> acc + s }
+        assertEquals(expectedHex, AuthUtil.bytesToHex(testBytes))
+    }
+
+    @Test
+    fun `convert string to MD5 and that MD5 to base64 string`() {
+        assertEquals("XrY7u+Ae7tCTyyK7j1rNww==", AuthUtil.stringToMd5Base64("hello world"))
+    }
+}
\ No newline at end of file
diff --git a/rtmp/src/test/java/com/pedro/rtmp/utils/SocketTest.kt b/rtmp/src/test/java/com/pedro/rtmp/utils/SocketTest.kt
new file mode 100644
index 0000000..602171c
--- /dev/null
+++ b/rtmp/src/test/java/com/pedro/rtmp/utils/SocketTest.kt
@@ -0,0 +1,15 @@
+package com.pedro.rtmp.utils
+
+import com.pedro.rtmp.utils.socket.TcpSocket
+import org.junit.Test
+
+class SocketTest {
+
+    @Test
+    fun `check tcp socket error with socket not connected`() {
+        val socket = TcpSocket("127.0.0.1", 1935, false)
+        socket.getOutStream().write(0)
+        socket.getInputStream()
+        socket.close()
+    }
+}
\ No newline at end of file
diff --git a/rtplibrary/build.gradle b/rtplibrary/build.gradle
index 5a36bda..fc05c97 100644
--- a/rtplibrary/build.gradle
+++ b/rtplibrary/build.gradle
@@ -1,11 +1,13 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 32
 
   defaultConfig {
     minSdkVersion 16
-    targetSdkVersion 30
+    targetSdkVersion 32
   }
   buildTypes {
     release {
@@ -13,10 +15,13 @@ android {
       consumerProguardFiles 'proguard-rules.pro'
     }
   }
+  namespace 'com.pedro.rtplibrary'
+
 }
 
 dependencies {
   api project(':encoder')
   api project(':rtmp')
   api project(':rtsp')
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
diff --git a/rtplibrary/src/main/AndroidManifest.xml b/rtplibrary/src/main/AndroidManifest.xml
index 2a5f25e..cc947c5 100644
--- a/rtplibrary/src/main/AndroidManifest.xml
+++ b/rtplibrary/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.pedro.rtplibrary" />
+<manifest />
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
index 18dbdcf..f59e7fc 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
@@ -1,14 +1,36 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.base;
 
 import android.content.Context;
+import android.graphics.Point;
 import android.hardware.Camera;
 import android.media.MediaCodec;
 import android.media.MediaFormat;
+import android.media.MediaRecorder;
 import android.os.Build;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.TextureView;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import com.pedro.encoder.Frame;
 import com.pedro.encoder.audio.AudioEncoder;
@@ -16,7 +38,10 @@ import com.pedro.encoder.audio.GetAacData;
 import com.pedro.encoder.input.audio.CustomAudioEffect;
 import com.pedro.encoder.input.audio.GetMicrophoneData;
 import com.pedro.encoder.input.audio.MicrophoneManager;
+import com.pedro.encoder.input.audio.MicrophoneManagerManual;
+import com.pedro.encoder.input.audio.MicrophoneMode;
 import com.pedro.encoder.input.video.Camera1ApiManager;
+import com.pedro.encoder.input.video.CameraCallbacks;
 import com.pedro.encoder.input.video.CameraHelper;
 import com.pedro.encoder.input.video.CameraOpenException;
 import com.pedro.encoder.input.video.GetCameraData;
@@ -24,12 +49,15 @@ import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.encoder.video.FormatVideoEncoder;
 import com.pedro.encoder.video.GetVideoData;
 import com.pedro.encoder.video.VideoEncoder;
+import com.pedro.rtplibrary.base.recording.BaseRecordController;
+import com.pedro.rtplibrary.base.recording.RecordController;
+import com.pedro.rtplibrary.util.AndroidMuxerRecordController;
 import com.pedro.rtplibrary.util.FpsListener;
-import com.pedro.rtplibrary.util.RecordController;
 import com.pedro.rtplibrary.view.GlInterface;
 import com.pedro.rtplibrary.view.LightOpenGlView;
 import com.pedro.rtplibrary.view.OffScreenGlThread;
 import com.pedro.rtplibrary.view.OpenGlView;
+import java.io.FileDescriptor;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.List;
@@ -52,18 +80,18 @@ public abstract class Camera1Base
 
   private static final String TAG = "Camera1Base";
 
-  private Context context;
-  private Camera1ApiManager cameraManager;
+  private final Context context;
+  private final Camera1ApiManager cameraManager;
   protected VideoEncoder videoEncoder;
   private MicrophoneManager microphoneManager;
   private AudioEncoder audioEncoder;
   private GlInterface glInterface;
   private boolean streaming = false;
-  private boolean videoEnabled = true;
+  protected boolean audioInitialized = false;
   private boolean onPreview = false;
-  private RecordController recordController;
+  protected BaseRecordController recordController;
   private int previewWidth, previewHeight;
-  private FpsListener fpsListener = new FpsListener();
+  private final FpsListener fpsListener = new FpsListener();
 
   public Camera1Base(SurfaceView surfaceView) {
     context = surfaceView.getContext();
@@ -106,9 +134,40 @@ public abstract class Camera1Base
 
   private void init() {
     videoEncoder = new VideoEncoder(this);
-    microphoneManager = new MicrophoneManager(this);
-    audioEncoder = new AudioEncoder(this);
-    recordController = new RecordController();
+    setMicrophoneMode(MicrophoneMode.ASYNC);
+    recordController = new AndroidMuxerRecordController();
+  }
+
+  /**
+   * Must be called before prepareAudio.
+   *
+   * @param microphoneMode mode to work accord to audioEncoder. By default ASYNC:
+   * SYNC using same thread. This mode could solve choppy audio or audio frame discarded.
+   * ASYNC using other thread.
+   */
+  public void setMicrophoneMode(MicrophoneMode microphoneMode) {
+    switch (microphoneMode) {
+      case SYNC:
+        microphoneManager = new MicrophoneManagerManual();
+        audioEncoder = new AudioEncoder(this);
+        audioEncoder.setGetFrame(((MicrophoneManagerManual) microphoneManager).getGetFrame());
+        audioEncoder.setTsModeBuffer(false);
+        break;
+      case ASYNC:
+        microphoneManager = new MicrophoneManager(this);
+        audioEncoder = new AudioEncoder(this);
+        audioEncoder.setTsModeBuffer(false);
+        break;
+      case BUFFER:
+        microphoneManager = new MicrophoneManager(this);
+        audioEncoder = new AudioEncoder(this);
+        audioEncoder.setTsModeBuffer(true);
+        break;
+    }
+  }
+
+  public void setCameraCallbacks(CameraCallbacks callbacks) {
+    cameraManager.setCameraCallbacks(callbacks);
   }
 
   /**
@@ -126,28 +185,45 @@ public abstract class Camera1Base
   }
 
   /**
-   * Experimental
+   * @return true if success, false if fail (not supported or called before start camera)
    */
-  public void enableFaceDetection(Camera1ApiManager.FaceDetectorCallback faceDetectorCallback) {
-    cameraManager.enableFaceDetection(faceDetectorCallback);
+  public boolean enableFaceDetection(Camera1ApiManager.FaceDetectorCallback faceDetectorCallback) {
+    return cameraManager.enableFaceDetection(faceDetectorCallback);
   }
 
-  /**
-   * Experimental
-   */
   public void disableFaceDetection() {
     cameraManager.disableFaceDetection();
   }
 
-  /**
-   * Experimental
-   */
   public boolean isFaceDetectionEnabled() {
     return cameraManager.isFaceDetectionEnabled();
   }
 
+  /**
+   * @return true if success, false if fail (not supported or called before start camera)
+   */
+  public boolean enableVideoStabilization() {
+    return cameraManager.enableVideoStabilization();
+  }
+
+  public void disableVideoStabilization() {
+    cameraManager.disableVideoStabilization();
+  }
+
+  public boolean isVideoStabilizationEnabled() {
+    return cameraManager.isVideoStabilizationEnabled();
+  }
+
+  /**
+   * Use getCameraFacing instead
+   */
+  @Deprecated
   public boolean isFrontCamera() {
-    return cameraManager.isFrontCamera();
+    return cameraManager.getCameraFacing() == CameraHelper.Facing.FRONT;
+  }
+
+  public CameraHelper.Facing getCameraFacing() {
+    return cameraManager.getCameraFacing();
   }
 
   public void enableLantern() throws Exception {
@@ -162,6 +238,18 @@ public abstract class Camera1Base
     return cameraManager.isLanternEnabled();
   }
 
+  public void enableAutoFocus() {
+    cameraManager.enableAutoFocus();
+  }
+
+  public void disableAutoFocus() {
+    cameraManager.disableAutoFocus();
+  }
+
+  public boolean isAutoFocusEnabled() {
+    return cameraManager.isAutoFocusEnabled();
+  }
+
   /**
    * Basic auth developed to work with Wowza. No tested with other server
    *
@@ -178,39 +266,40 @@ public abstract class Camera1Base
    * @param height resolution in px.
    * @param fps frames per second of the stream.
    * @param bitrate H264 in bps.
-   * @param hardwareRotation true if you want rotate using encoder, false if you want rotate with
-   * software if you are using a SurfaceView or TextureView or with OpenGl if you are using
-   * OpenGlView.
    * @param rotation could be 90, 180, 270 or 0. You should use CameraHelper.getCameraOrientation
    * with SurfaceView or TextureView and 0 with OpenGlView or LightOpenGlView. NOTE: Rotation with
    * encoder is silence ignored in some devices.
    * @return true if success, false if you get a error (Normally because the encoder selected
    * doesn't support any configuration seated or your device hasn't a H264 encoder).
    */
-  public boolean prepareVideo(int width, int height, int fps, int bitrate, boolean hardwareRotation,
-      int iFrameInterval, int rotation, int avcProfile, int avcProfileLevel) {
-    if (onPreview && width != previewWidth || height != previewHeight) {
+  public boolean prepareVideo(int width, int height, int fps, int bitrate, int iFrameInterval,
+      int rotation, int avcProfile, int avcProfileLevel) {
+    if (onPreview && width != previewWidth || height != previewHeight
+        || fps != videoEncoder.getFps() || rotation != videoEncoder.getRotation()) {
       stopPreview();
       onPreview = true;
     }
     FormatVideoEncoder formatVideoEncoder =
         glInterface == null ? FormatVideoEncoder.YUV420Dynamical : FormatVideoEncoder.SURFACE;
-    return videoEncoder.prepareVideoEncoder(width, height, fps, bitrate, rotation, hardwareRotation,
-        iFrameInterval, formatVideoEncoder, avcProfile, avcProfileLevel);
+    return videoEncoder.prepareVideoEncoder(width, height, fps, bitrate, rotation, iFrameInterval,
+        formatVideoEncoder, avcProfile, avcProfileLevel);
   }
 
   /**
    * backward compatibility reason
    */
-  public boolean prepareVideo(int width, int height, int fps, int bitrate, boolean hardwareRotation,
-                              int iFrameInterval, int rotation) {
-    return prepareVideo(width, height, fps, bitrate, hardwareRotation, iFrameInterval, rotation,
-        -1, -1);
+  public boolean prepareVideo(int width, int height, int fps, int bitrate, int iFrameInterval,
+      int rotation) {
+    return prepareVideo(width, height, fps, bitrate, iFrameInterval, rotation, -1, -1);
   }
 
-  public boolean prepareVideo(int width, int height, int fps, int bitrate, boolean hardwareRotation,
-      int rotation) {
-    return prepareVideo(width, height, fps, bitrate, hardwareRotation, 2, rotation);
+  public boolean prepareVideo(int width, int height, int fps, int bitrate, int rotation) {
+    return prepareVideo(width, height, fps, bitrate, 2, rotation);
+  }
+
+  public boolean prepareVideo(int width, int height, int bitrate) {
+    int rotation = CameraHelper.getCameraOrientation(context);
+    return prepareVideo(width, height, 30, bitrate, 2, rotation);
   }
 
   protected abstract void prepareAudioRtp(boolean isStereo, int sampleRate);
@@ -227,12 +316,25 @@ public abstract class Camera1Base
    * @return true if success, false if you get a error (Normally because the encoder selected
    * doesn't support any configuration seated or your device hasn't a AAC encoder).
    */
+  public boolean prepareAudio(int audioSource, int bitrate, int sampleRate, boolean isStereo, boolean echoCanceler,
+      boolean noiseSuppressor) {
+     if (!microphoneManager.createMicrophone(audioSource, sampleRate, isStereo, echoCanceler, noiseSuppressor)) {
+       return false;
+     }
+    prepareAudioRtp(isStereo, sampleRate);
+    audioInitialized = audioEncoder.prepareAudioEncoder(bitrate, sampleRate, isStereo,
+        microphoneManager.getMaxInputSize());
+    return audioInitialized;
+  }
+
   public boolean prepareAudio(int bitrate, int sampleRate, boolean isStereo, boolean echoCanceler,
       boolean noiseSuppressor) {
-    microphoneManager.createMicrophone(sampleRate, isStereo, echoCanceler, noiseSuppressor);
-    prepareAudioRtp(isStereo, sampleRate);
-    return audioEncoder.prepareAudioEncoder(bitrate, sampleRate, isStereo,
-        microphoneManager.getMaxInputSize());
+    return prepareAudio(MediaRecorder.AudioSource.DEFAULT, bitrate, sampleRate, isStereo, echoCanceler,
+        noiseSuppressor);
+  }
+
+  public boolean prepareAudio(int bitrate, int sampleRate, boolean isStereo) {
+    return prepareAudio(bitrate, sampleRate, isStereo, false, false);
   }
 
   /**
@@ -244,7 +346,7 @@ public abstract class Camera1Base
    */
   public boolean prepareVideo() {
     int rotation = CameraHelper.getCameraOrientation(context);
-    return prepareVideo(640, 480, 30, 1200 * 1024, false, rotation);
+    return prepareVideo(640, 480, 30, 1200 * 1024, rotation);
   }
 
   /**
@@ -267,27 +369,49 @@ public abstract class Camera1Base
   }
 
   /**
-   * Start record a MP4 video. Need be called while stream.
+   * Starts recording an MP4 video. Needs to be called while streaming.
    *
-   * @param path where file will be saved.
-   * @throws IOException If you init it before start stream.
+   * @param path Where file will be saved.
+   * @throws IOException If initialized before a stream.
    */
   @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
-  public void startRecord(final String path, RecordController.Listener listener)
+  public void startRecord(@NonNull final String path, @Nullable RecordController.Listener listener)
       throws IOException {
     recordController.startRecord(path, listener);
     if (!streaming) {
       startEncoders();
     } else if (videoEncoder.isRunning()) {
-      resetVideoEncoder();
+      requestKeyFrame();
     }
   }
 
   @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
-  public void startRecord(final String path) throws IOException {
+  public void startRecord(@NonNull final String path) throws IOException {
     startRecord(path, null);
   }
 
+  /**
+   * Starts recording an MP4 video. Needs to be called while streaming.
+   *
+   * @param fd Where the file will be saved.
+   * @throws IOException If initialized before a stream.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  public void startRecord(@NonNull final FileDescriptor fd,
+      @Nullable RecordController.Listener listener) throws IOException {
+    recordController.startRecord(fd, listener);
+    if (!streaming) {
+      startEncoders();
+    } else if (videoEncoder.isRunning()) {
+      requestKeyFrame();
+    }
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  public void startRecord(@NonNull final FileDescriptor fd) throws IOException {
+    startRecord(fd, null);
+  }
+
   /**
    * Stop record MP4 video started with @startRecord. If you don't call it file will be unreadable.
    */
@@ -321,17 +445,13 @@ public abstract class Camera1Base
   private void replaceGlInterface(GlInterface glInterface) {
     if (this.glInterface != null && Build.VERSION.SDK_INT >= 18) {
       if (isStreaming() || isRecording() || isOnPreview()) {
+        Point size = this.glInterface.getEncoderSize();
         cameraManager.stop();
         this.glInterface.removeMediaCodecSurface();
         this.glInterface.stop();
         this.glInterface = glInterface;
         this.glInterface.init();
-        boolean isPortrait = CameraHelper.isPortrait(context);
-        if (isPortrait) {
-          this.glInterface.setEncoderSize(videoEncoder.getHeight(), videoEncoder.getWidth());
-        } else {
-          this.glInterface.setEncoderSize(videoEncoder.getWidth(), videoEncoder.getHeight());
-        }
+        this.glInterface.setEncoderSize(size.x, size.y);
         this.glInterface.setRotation(0);
         this.glInterface.start();
         if (isStreaming() || isRecording()) {
@@ -343,6 +463,7 @@ public abstract class Camera1Base
             videoEncoder.getFps());
       } else {
         this.glInterface = glInterface;
+        this.glInterface.init();
       }
     }
   }
@@ -357,43 +478,108 @@ public abstract class Camera1Base
    * @param rotation camera rotation (0, 90, 180, 270). Recommended: {@link
    * com.pedro.encoder.input.video.CameraHelper#getCameraOrientation(Context)}
    */
-  public void startPreview(CameraHelper.Facing cameraFacing, int width, int height, int rotation) {
+  public void startPreview(CameraHelper.Facing cameraFacing, int width, int height, int fps, int rotation) {
     if (!isStreaming() && !onPreview && !(glInterface instanceof OffScreenGlThread)) {
       previewWidth = width;
       previewHeight = height;
+      videoEncoder.setFps(fps);
+      videoEncoder.setRotation(rotation);
       if (glInterface != null && Build.VERSION.SDK_INT >= 18) {
-        boolean isPortrait = CameraHelper.isPortrait(context);
-        if (isPortrait) {
+        if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
           glInterface.setEncoderSize(height, width);
         } else {
           glInterface.setEncoderSize(width, height);
         }
         glInterface.setRotation(0);
+        glInterface.setFps(fps);
         glInterface.start();
         cameraManager.setSurfaceTexture(glInterface.getSurfaceTexture());
       }
       cameraManager.setRotation(rotation);
       cameraManager.start(cameraFacing, width, height, videoEncoder.getFps());
       onPreview = true;
+    } else if (!isStreaming() && !onPreview && glInterface instanceof OffScreenGlThread) {
+      // if you are using background mode startPreview only work to indicate
+      // that you want start with front or back camera
+      cameraManager.setCameraFacing(cameraFacing);
     } else {
       Log.e(TAG, "Streaming or preview started, ignored");
     }
   }
 
+  /**
+   * Start camera preview. Ignored, if stream or preview is started.
+   *
+   * @param cameraId camera id.
+   * {@link com.pedro.encoder.input.video.CameraHelper.Facing#FRONT}
+   * @param width of preview in px.
+   * @param height of preview in px.
+   * @param rotation camera rotation (0, 90, 180, 270). Recommended: {@link
+   * com.pedro.encoder.input.video.CameraHelper#getCameraOrientation(Context)}
+   */
+  public void startPreview(int cameraId, int width, int height, int fps, int rotation) {
+    if (!isStreaming() && !onPreview && !(glInterface instanceof OffScreenGlThread)) {
+      previewWidth = width;
+      previewHeight = height;
+      videoEncoder.setFps(fps);
+      videoEncoder.setRotation(rotation);
+      if (glInterface != null && Build.VERSION.SDK_INT >= 18) {
+        if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
+          glInterface.setEncoderSize(height, width);
+        } else {
+          glInterface.setEncoderSize(width, height);
+        }
+        glInterface.setRotation(0);
+        glInterface.setFps(fps);
+        glInterface.start();
+        cameraManager.setSurfaceTexture(glInterface.getSurfaceTexture());
+      }
+      cameraManager.setRotation(rotation);
+      cameraManager.start(cameraId, width, height, videoEncoder.getFps());
+      onPreview = true;
+    } else if (!isStreaming() && !onPreview && glInterface instanceof OffScreenGlThread) {
+      // if you are using background mode startPreview only work to indicate
+      // that you want start with front or back camera
+      cameraManager.setCameraSelect(cameraId);
+    } else {
+      Log.e(TAG, "Streaming or preview started, ignored");
+    }
+  }
+
+  public void startPreview(CameraHelper.Facing cameraFacing, int width, int height, int rotation) {
+    startPreview(cameraFacing, width, height, videoEncoder.getFps(), rotation);
+  }
+
+  public void startPreview(int cameraFacing, int width, int height, int rotation) {
+    startPreview(cameraFacing, width, height, videoEncoder.getFps(), rotation);
+  }
+
   public void startPreview(CameraHelper.Facing cameraFacing, int width, int height) {
     startPreview(cameraFacing, width, height, CameraHelper.getCameraOrientation(context));
   }
 
+  public void startPreview(int cameraFacing, int width, int height) {
+    startPreview(cameraFacing, width, height, CameraHelper.getCameraOrientation(context));
+  }
+
+  public void startPreview(CameraHelper.Facing cameraFacing, int rotation) {
+    startPreview(cameraFacing, videoEncoder.getWidth(), videoEncoder.getHeight(), rotation);
+  }
+
   public void startPreview(CameraHelper.Facing cameraFacing) {
-    startPreview(cameraFacing, 640, 480);
+    startPreview(cameraFacing, videoEncoder.getWidth(), videoEncoder.getHeight());
+  }
+
+  public void startPreview(int cameraFacing) {
+    startPreview(cameraFacing, videoEncoder.getWidth(), videoEncoder.getHeight());
   }
 
   public void startPreview(int width, int height) {
-    startPreview(CameraHelper.Facing.BACK, width, height);
+    startPreview(getCameraFacing(), width, height);
   }
 
   public void startPreview() {
-    startPreview(CameraHelper.Facing.BACK);
+    startPreview(getCameraFacing());
   }
 
   /**
@@ -436,6 +622,55 @@ public abstract class Camera1Base
     cameraManager.setZoom(event);
   }
 
+  /**
+   * Set zoomIn or zoomOut to camera.
+   * Use this method if you use a zoom slider.
+   *
+   * @param level Expected to be >= 1 and <= max zoom level
+   * @see Camera2Base#getZoom()
+   */
+  public void setZoom(int level) {
+    cameraManager.setZoom(level);
+  }
+
+  /**
+   * Return current zoom level
+   *
+   * @return current zoom level
+   */
+  public float getZoom() {
+    return cameraManager.getZoom();
+  }
+
+  /**
+   * Return max zoom level
+   *
+   * @return max zoom level range
+   */
+  public int getMaxZoom() {
+    return cameraManager.getMaxZoom();
+  }
+
+  /**
+   * Return min zoom level
+   *
+   * @return min zoom level range
+   */
+  public int getMinZoom() {
+    return cameraManager.getMinZoom();
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void startStreamAndRecord(String url, String path, RecordController.Listener listener) throws IOException {
+    startStream(url);
+    recordController.startRecord(path, listener);
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void startStreamAndRecord(String url, String path) throws IOException {
+    startStreamAndRecord(url, path, null);
+  }
+
   protected abstract void startStreamRtp(String url);
 
   /**
@@ -453,7 +688,7 @@ public abstract class Camera1Base
     if (!recordController.isRunning()) {
       startEncoders();
     } else {
-      resetVideoEncoder();
+      requestKeyFrame();
     }
     startStreamRtp(url);
     onPreview = true;
@@ -461,9 +696,9 @@ public abstract class Camera1Base
 
   private void startEncoders() {
     videoEncoder.start();
-    audioEncoder.start();
+    if (audioInitialized) audioEncoder.start();
     prepareGlView();
-    microphoneManager.start();
+    if (audioInitialized) microphoneManager.start();
     cameraManager.setRotation(videoEncoder.getRotation());
     if (!cameraManager.isRunning() && videoEncoder.getWidth() != previewWidth
         || videoEncoder.getHeight() != previewHeight) {
@@ -472,22 +707,24 @@ public abstract class Camera1Base
     onPreview = true;
   }
 
-  private void resetVideoEncoder() {
-    if (glInterface != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      glInterface.removeMediaCodecSurface();
-    }
-    videoEncoder.reset();
-    if (glInterface != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      glInterface.addMediaCodecSurface(videoEncoder.getInputSurface());
+  public void requestKeyFrame() {
+    if (videoEncoder.isRunning()) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+        videoEncoder.requestKeyframe();
+      } else {
+        if (glInterface != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+          glInterface.removeMediaCodecSurface();
+        }
+        videoEncoder.reset();
+        if (glInterface != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+          glInterface.addMediaCodecSurface(videoEncoder.getInputSurface());
+        }
+      }
     }
   }
 
   private void prepareGlView() {
     if (glInterface != null && Build.VERSION.SDK_INT >= 18) {
-      if (glInterface instanceof OffScreenGlThread) {
-        glInterface = new OffScreenGlThread(context);
-        glInterface.init();
-      }
       glInterface.setFps(videoEncoder.getFps());
       if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
         glInterface.setEncoderSize(videoEncoder.getHeight(), videoEncoder.getWidth());
@@ -517,48 +754,48 @@ public abstract class Camera1Base
       stopStreamRtp();
     }
     if (!recordController.isRecording()) {
-      microphoneManager.stop();
+      if (audioInitialized) microphoneManager.stop();
       if (glInterface != null && Build.VERSION.SDK_INT >= 18) {
         glInterface.removeMediaCodecSurface();
         if (glInterface instanceof OffScreenGlThread) {
           glInterface.stop();
           cameraManager.stop();
+          onPreview = false;
         }
       }
       videoEncoder.stop();
-      audioEncoder.stop();
+      if (audioInitialized) audioEncoder.stop();
       recordController.resetFormats();
     }
   }
 
-  public boolean reTry(long delay, String reason) {
+  /**
+   * Retries to connect with the given delay. You can pass an optional backupUrl
+   * if you'd like to connect to your backup server instead of the original one.
+   * Given backupUrl replaces the original one.
+   */
+  public boolean reTry(long delay, String reason, @Nullable String backupUrl) {
     boolean result = shouldRetry(reason);
     if (result) {
-      reTry(delay);
+      requestKeyFrame();
+      reConnect(delay, backupUrl);
     }
     return result;
   }
 
-  /**
-   * Replace with reTry(long delay, String reason);
-   */
-  @Deprecated
-  public void reTry(long delay) {
-    resetVideoEncoder();
-    reConnect(delay);
+  public boolean reTry(long delay, String reason) {
+    return reTry(delay, reason, null);
   }
 
-  /**
-   * Replace with reTry(long delay, String reason);
-   */
-  @Deprecated
-  public abstract boolean shouldRetry(String reason);
+  protected abstract boolean shouldRetry(String reason);
 
   public abstract void setReTries(int reTries);
 
-  protected abstract void reConnect(long delay);
+  protected abstract void reConnect(long delay, @Nullable String backupUrl);
 
   //cache control
+  public abstract boolean hasCongestion();
+
   public abstract void resizeCache(int newSize) throws RuntimeException;
 
   public abstract int getCacheSize();
@@ -597,6 +834,10 @@ public abstract class Camera1Base
     return cameraManager.getPreviewSizeFront();
   }
 
+  public List<int[]> getSupportedFps() {
+    return cameraManager.getSupportedFps();
+  }
+
   /**
    * Mute microphone, can be called before, while and after stream.
    */
@@ -620,15 +861,6 @@ public abstract class Camera1Base
     return microphoneManager.isMuted();
   }
 
-  /**
-   * Get video camera state
-   *
-   * @return true if disabled, false if enabled
-   */
-  public boolean isVideoEnabled() {
-    return videoEnabled;
-  }
-
   public int getBitrate() {
     return videoEncoder.getBitRate();
   }
@@ -646,16 +878,46 @@ public abstract class Camera1Base
   }
 
   /**
-   * Switch camera used. Can be called on preview or while stream, ignored with preview off.
+   * Switch camera used. Can be called anytime
    *
    * @throws CameraOpenException If the other camera doesn't support same resolution.
    */
   public void switchCamera() throws CameraOpenException {
-    if (isStreaming() || onPreview) {
+    if (isStreaming() || isRecording() || onPreview) {
       cameraManager.switchCamera();
+    } else {
+      cameraManager.setCameraFacing(getCameraFacing() ==  CameraHelper.Facing.FRONT ? CameraHelper.Facing.BACK : CameraHelper.Facing.FRONT);
     }
   }
 
+  public void switchCamera(int cameraId) throws CameraOpenException {
+    if (isStreaming() || onPreview) {
+      cameraManager.switchCamera(cameraId);
+    } else {
+      cameraManager.setCameraSelect(cameraId);
+    }
+  }
+
+  public void setExposure(int value) {
+    cameraManager.setExposure(value);
+  }
+
+  public int getExposure() {
+    return cameraManager.getExposure();
+  }
+
+  public int getMaxExposure() {
+    return cameraManager.getMaxExposure();
+  }
+
+  public int getMinExposure() {
+    return cameraManager.getMinExposure();
+  }
+
+  public void tapToFocus(View view, MotionEvent event) {
+    cameraManager.tapToFocus(view, event);
+  }
+
   public GlInterface getGlInterface() {
     if (glInterface != null) {
       return glInterface;
@@ -735,14 +997,9 @@ public abstract class Camera1Base
 
   protected abstract void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps);
 
-  @Override
-  public void onSpsPps(ByteBuffer sps, ByteBuffer pps) {
-    if (streaming) onSpsPpsVpsRtp(sps, pps, null);
-  }
-
   @Override
   public void onSpsPpsVps(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    if (streaming) onSpsPpsVpsRtp(sps, pps, vps);
+    onSpsPpsVpsRtp(sps.duplicate(), pps.duplicate(), vps != null ? vps.duplicate() : null);
   }
 
   protected abstract void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info);
@@ -768,11 +1025,19 @@ public abstract class Camera1Base
 
   @Override
   public void onVideoFormat(MediaFormat mediaFormat) {
-    recordController.setVideoFormat(mediaFormat);
+    recordController.setVideoFormat(mediaFormat, !audioInitialized);
   }
 
   @Override
   public void onAudioFormat(MediaFormat mediaFormat) {
     recordController.setAudioFormat(mediaFormat);
   }
+
+  public void setRecordController(BaseRecordController recordController) {
+    if (!isRecording()) this.recordController = recordController;
+  }
+
+  public abstract void setLogs(boolean enable);
+
+  public abstract void setCheckServerAlive(boolean enable);
 }
\ No newline at end of file
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
index 75b80b3..e100706 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
@@ -1,15 +1,38 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.base;
 
 import android.content.Context;
+import android.graphics.Point;
 import android.hardware.camera2.CameraCharacteristics;
 import android.media.MediaCodec;
 import android.media.MediaFormat;
+import android.media.MediaRecorder;
 import android.os.Build;
+import android.util.Log;
+import android.util.Range;
 import android.util.Size;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.SurfaceView;
 import android.view.TextureView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import com.pedro.encoder.Frame;
 import com.pedro.encoder.audio.AudioEncoder;
@@ -17,19 +40,26 @@ import com.pedro.encoder.audio.GetAacData;
 import com.pedro.encoder.input.audio.CustomAudioEffect;
 import com.pedro.encoder.input.audio.GetMicrophoneData;
 import com.pedro.encoder.input.audio.MicrophoneManager;
+import com.pedro.encoder.input.audio.MicrophoneManagerManual;
+import com.pedro.encoder.input.audio.MicrophoneMode;
 import com.pedro.encoder.input.video.Camera2ApiManager;
+import com.pedro.encoder.input.video.CameraCallbacks;
 import com.pedro.encoder.input.video.CameraHelper;
 import com.pedro.encoder.input.video.CameraOpenException;
 import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.encoder.video.FormatVideoEncoder;
 import com.pedro.encoder.video.GetVideoData;
 import com.pedro.encoder.video.VideoEncoder;
+import com.pedro.rtplibrary.base.recording.BaseRecordController;
+import com.pedro.rtplibrary.base.recording.RecordController;
+import com.pedro.rtplibrary.util.AndroidMuxerRecordController;
 import com.pedro.rtplibrary.util.FpsListener;
-import com.pedro.rtplibrary.util.RecordController;
 import com.pedro.rtplibrary.view.GlInterface;
 import com.pedro.rtplibrary.view.LightOpenGlView;
 import com.pedro.rtplibrary.view.OffScreenGlThread;
 import com.pedro.rtplibrary.view.OpenGlView;
+
+import java.io.FileDescriptor;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -48,7 +78,9 @@ import java.util.List;
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrophoneData {
 
-  protected Context context;
+  private static final String TAG = "Camera2Base";
+
+  private final Context context;
   private Camera2ApiManager cameraManager;
   protected VideoEncoder videoEncoder;
   private MicrophoneManager microphoneManager;
@@ -57,19 +89,31 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
   private SurfaceView surfaceView;
   private TextureView textureView;
   private GlInterface glInterface;
-  private boolean videoEnabled = false;
+  protected boolean audioInitialized = false;
   private boolean onPreview = false;
   private boolean isBackground = false;
-  private RecordController recordController;
+  protected BaseRecordController recordController;
   private int previewWidth, previewHeight;
-  private FpsListener fpsListener = new FpsListener();
+  private final FpsListener fpsListener = new FpsListener();
 
+  /**
+   * @deprecated This view produce rotations problems and could be unsupported in future versions.
+   * Use {@link Camera2Base#Camera2Base(OpenGlView)} or {@link Camera2Base#Camera2Base(LightOpenGlView)}
+   * instead.
+   */
+  @Deprecated
   public Camera2Base(SurfaceView surfaceView) {
     this.surfaceView = surfaceView;
     this.context = surfaceView.getContext();
     init(context);
   }
 
+  /**
+   * @deprecated This view produce rotations problems and could be unsupported in future versions.
+   * Use {@link Camera2Base#Camera2Base(OpenGlView)} or {@link Camera2Base#Camera2Base(LightOpenGlView)}
+   * instead.
+   */
+  @Deprecated
   public Camera2Base(TextureView textureView) {
     this.textureView = textureView;
     this.context = textureView.getContext();
@@ -103,9 +147,40 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
   private void init(Context context) {
     cameraManager = new Camera2ApiManager(context);
     videoEncoder = new VideoEncoder(this);
-    microphoneManager = new MicrophoneManager(this);
-    audioEncoder = new AudioEncoder(this);
-    recordController = new RecordController();
+    setMicrophoneMode(MicrophoneMode.ASYNC);
+    recordController = new AndroidMuxerRecordController();
+  }
+
+  /**
+   * Must be called before prepareAudio.
+   *
+   * @param microphoneMode mode to work accord to audioEncoder. By default ASYNC:
+   * SYNC using same thread. This mode could solve choppy audio or AudioEncoder frame discarded.
+   * ASYNC using other thread.
+   */
+  public void setMicrophoneMode(MicrophoneMode microphoneMode) {
+    switch (microphoneMode) {
+      case SYNC:
+        microphoneManager = new MicrophoneManagerManual();
+        audioEncoder = new AudioEncoder(this);
+        audioEncoder.setGetFrame(((MicrophoneManagerManual) microphoneManager).getGetFrame());
+        audioEncoder.setTsModeBuffer(false);
+        break;
+      case ASYNC:
+        microphoneManager = new MicrophoneManager(this);
+        audioEncoder = new AudioEncoder(this);
+        audioEncoder.setTsModeBuffer(false);
+        break;
+      case BUFFER:
+        microphoneManager = new MicrophoneManager(this);
+        audioEncoder = new AudioEncoder(this);
+        audioEncoder.setTsModeBuffer(true);
+        break;
+    }
+  }
+
+  public void setCameraCallbacks(CameraCallbacks callbacks) {
+    cameraManager.setCameraCallbacks(callbacks);
   }
 
   /**
@@ -123,28 +198,64 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
   }
 
   /**
-   * Experimental
+   * @return true if success, false if fail (not supported or called before start camera)
    */
-  public void enableFaceDetection(Camera2ApiManager.FaceDetectorCallback faceDetectorCallback) {
-    cameraManager.enableFaceDetection(faceDetectorCallback);
+  public boolean enableFaceDetection(Camera2ApiManager.FaceDetectorCallback faceDetectorCallback) {
+    return cameraManager.enableFaceDetection(faceDetectorCallback);
   }
 
-  /**
-   * Experimental
-   */
   public void disableFaceDetection() {
     cameraManager.disableFaceDetection();
   }
 
-  /**
-   * Experimental
-   */
   public boolean isFaceDetectionEnabled() {
     return cameraManager.isFaceDetectionEnabled();
   }
 
+  /**
+   * Enable EIS video stabilization
+   * Warning: Turning both OIS and EIS modes on may produce undesirable interaction, so it is recommended not to enable both at the same time.
+   * @return true if success, false if fail (not supported or called before start camera)
+   */
+  public boolean enableVideoStabilization() {
+    return cameraManager.enableVideoStabilization();
+  }
+
+  public void disableVideoStabilization() {
+    cameraManager.disableVideoStabilization();
+  }
+
+  public boolean isVideoStabilizationEnabled() {
+    return cameraManager.isVideoStabilizationEnabled();
+  }
+
+  /**
+   * Enable OIS video stabilization
+   * Warning: Turning both OIS and EIS modes on may produce undesirable interaction, so it is recommended not to enable both at the same time.
+   * @return true if success, false if fail (not supported or called before start camera)
+   */
+  public boolean enableOpticalVideoStabilization() {
+    return cameraManager.enableOpticalVideoStabilization();
+  }
+
+  public void disableOpticalVideoStabilization() {
+    cameraManager.disableOpticalVideoStabilization();
+  }
+
+  public boolean isOpticalVideoStabilizationEnabled() {
+    return cameraManager.isOpticalStabilizationEnabled();
+  }
+
+  /**
+   * Use getCameraFacing instead
+   */
+  @Deprecated
   public boolean isFrontCamera() {
-    return cameraManager.isFrontCamera();
+    return cameraManager.getCameraFacing() == CameraHelper.Facing.FRONT;
+  }
+
+  public CameraHelper.Facing getCameraFacing() {
+    return cameraManager.getCameraFacing();
   }
 
   public void enableLantern() throws Exception {
@@ -163,6 +274,22 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
     return cameraManager.isLanternSupported();
   }
 
+  public void enableAutoFocus() {
+    cameraManager.enableAutoFocus();
+  }
+
+  public void disableAutoFocus() {
+    cameraManager.disableAutoFocus();
+  }
+
+  public boolean isAutoFocusEnabled() {
+    return cameraManager.isAutoFocusEnabled();
+  }
+
+  public void setFocusDistance(float distance) {
+    cameraManager.setFocusDistance(distance);
+  }
+
   /**
    * Basic auth developed to work with Wowza. No tested with other server
    *
@@ -178,39 +305,40 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
    * @param height resolution in px.
    * @param fps frames per second of the stream.
    * @param bitrate H264 in bps.
-   * @param hardwareRotation true if you want rotate using encoder, false if you with OpenGl if you
-   * are using OpenGlView.
    * @param rotation could be 90, 180, 270 or 0 (Normally 0 if you are streaming in landscape or 90
    * if you are streaming in Portrait). This only affect to stream result. NOTE: Rotation with
    * encoder is silence ignored in some devices.
    * @return true if success, false if you get a error (Normally because the encoder selected
    * doesn't support any configuration seated or your device hasn't a H264 encoder).
    */
-  public boolean prepareVideo(int width, int height, int fps, int bitrate, boolean hardwareRotation,
-      int iFrameInterval, int rotation, int avcProfile, int avcProfileLevel) {
-    if (onPreview && !(glInterface != null && width == previewWidth && height == previewHeight)) {
+  public boolean prepareVideo(int width, int height, int fps, int bitrate, int iFrameInterval,
+      int rotation, int avcProfile, int avcProfileLevel) {
+    if (onPreview && glInterface != null && (width != previewWidth || height != previewHeight
+        || fps != videoEncoder.getFps() || rotation != videoEncoder.getRotation())) {
       stopPreview();
       onPreview = true;
     }
-    boolean result =
-        videoEncoder.prepareVideoEncoder(width, height, fps, bitrate, rotation, hardwareRotation,
-            iFrameInterval, FormatVideoEncoder.SURFACE, avcProfile, avcProfileLevel);
+    boolean result = videoEncoder.prepareVideoEncoder(width, height, fps, bitrate, rotation,
+        iFrameInterval, FormatVideoEncoder.SURFACE, avcProfile, avcProfileLevel);
     prepareCameraManager();
     return result;
   }
 
-  public boolean prepareVideo(int width, int height, int fps, int bitrate, boolean hardwareRotation,
-      int iFrameInterval, int rotation) {
-    return prepareVideo(width, height, fps, bitrate, hardwareRotation, iFrameInterval, rotation, -1,
-        -1);
+  public boolean prepareVideo(int width, int height, int fps, int bitrate, int iFrameInterval,
+      int rotation) {
+    return prepareVideo(width, height, fps, bitrate, iFrameInterval, rotation, -1, -1);
   }
 
   /**
    * backward compatibility reason
    */
-  public boolean prepareVideo(int width, int height, int fps, int bitrate, boolean hardwareRotation,
-      int rotation) {
-    return prepareVideo(width, height, fps, bitrate, hardwareRotation, 2, rotation);
+  public boolean prepareVideo(int width, int height, int fps, int bitrate, int rotation) {
+    return prepareVideo(width, height, fps, bitrate, 2, rotation);
+  }
+
+  public boolean prepareVideo(int width, int height, int bitrate) {
+    int rotation = CameraHelper.getCameraOrientation(context);
+    return prepareVideo(width, height, 30, bitrate, 2, rotation);
   }
 
   protected abstract void prepareAudioRtp(boolean isStereo, int sampleRate);
@@ -227,12 +355,25 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
    * @return true if success, false if you get a error (Normally because the encoder selected
    * doesn't support any configuration seated or your device hasn't a AAC encoder).
    */
+  public boolean prepareAudio(int audioSource, int bitrate, int sampleRate, boolean isStereo, boolean echoCanceler,
+      boolean noiseSuppressor) {
+    if (!microphoneManager.createMicrophone(audioSource, sampleRate, isStereo, echoCanceler, noiseSuppressor)) {
+      return false;
+    }
+    prepareAudioRtp(isStereo, sampleRate);
+    audioInitialized = audioEncoder.prepareAudioEncoder(bitrate, sampleRate, isStereo,
+        microphoneManager.getMaxInputSize());
+    return audioInitialized;
+  }
+
   public boolean prepareAudio(int bitrate, int sampleRate, boolean isStereo, boolean echoCanceler,
       boolean noiseSuppressor) {
-    microphoneManager.createMicrophone(sampleRate, isStereo, echoCanceler, noiseSuppressor);
-    prepareAudioRtp(isStereo, sampleRate);
-    return audioEncoder.prepareAudioEncoder(bitrate, sampleRate, isStereo,
-        microphoneManager.getMaxInputSize());
+    return prepareAudio(MediaRecorder.AudioSource.DEFAULT, bitrate, sampleRate, isStereo, echoCanceler,
+        noiseSuppressor);
+  }
+
+  public boolean prepareAudio(int bitrate, int sampleRate, boolean isStereo) {
+    return prepareAudio(bitrate, sampleRate, isStereo, false, false);
   }
 
   /**
@@ -243,9 +384,8 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
    * doesn't support any configuration seated or your device hasn't a H264 encoder).
    */
   public boolean prepareVideo() {
-    boolean isHardwareRotation = glInterface == null;
     int rotation = CameraHelper.getCameraOrientation(context);
-    return prepareVideo(640, 480, 30, 1200 * 1024, isHardwareRotation, rotation);
+    return prepareVideo(640, 480, 30, 1200 * 1024, rotation);
   }
 
   /**
@@ -268,24 +408,47 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
   }
 
   /**
-   * Start record a MP4 video. Need be called while stream.
+   * Starts recording an MP4 video. Needs to be called while streaming.
    *
-   * @param path where file will be saved.
-   * @throws IOException If you init it before start stream.
+   * @param path Where file will be saved.
+   * @throws IOException If initialized before a stream.
    */
-  public void startRecord(String path, RecordController.Listener listener) throws IOException {
+  public void startRecord(@NonNull String path, @Nullable RecordController.Listener listener)
+      throws IOException {
     recordController.startRecord(path, listener);
     if (!streaming) {
       startEncoders();
     } else if (videoEncoder.isRunning()) {
-      resetVideoEncoder();
+      requestKeyFrame();
     }
   }
 
-  public void startRecord(final String path) throws IOException {
+  public void startRecord(@NonNull final String path) throws IOException {
     startRecord(path, null);
   }
 
+  /**
+   * Starts recording an MP4 video. Needs to be called while streaming.
+   *
+   * @param fd Where the file will be saved.
+   * @throws IOException If initialized before a stream.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  public void startRecord(@NonNull final FileDescriptor fd,
+      @Nullable RecordController.Listener listener) throws IOException {
+    recordController.startRecord(fd, listener);
+    if (!streaming) {
+      startEncoders();
+    } else if (videoEncoder.isRunning()) {
+      requestKeyFrame();
+    }
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  public void startRecord(@NonNull final FileDescriptor fd) throws IOException {
+    startRecord(fd, null);
+  }
+
   /**
    * Stop record MP4 video started with @startRecord. If you don't call it file will be unreadable.
    */
@@ -316,25 +479,20 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
   private void replaceGlInterface(GlInterface glInterface) {
     if (this.glInterface != null && Build.VERSION.SDK_INT >= 18) {
       if (isStreaming() || isRecording() || isOnPreview()) {
+        Point size = this.glInterface.getEncoderSize();
         cameraManager.closeCamera();
         this.glInterface.removeMediaCodecSurface();
         this.glInterface.stop();
         this.glInterface = glInterface;
         this.glInterface.init();
-        boolean isPortrait = CameraHelper.isPortrait(context);
-        if (isPortrait) {
-          this.glInterface.setEncoderSize(videoEncoder.getHeight(), videoEncoder.getWidth());
-        } else {
-          this.glInterface.setEncoderSize(videoEncoder.getWidth(), videoEncoder.getHeight());
-        }
-        this.glInterface.setRotation(
-            videoEncoder.getRotation() == 0 ? 270 : videoEncoder.getRotation() - 90);
+        this.glInterface.setEncoderSize(size.x, size.y);
+        this.glInterface.setRotation(videoEncoder.getRotation() == 0 ? 270 : videoEncoder.getRotation() - 90);
         this.glInterface.start();
         if (isStreaming() || isRecording()) {
           this.glInterface.addMediaCodecSurface(videoEncoder.getInputSurface());
         }
         cameraManager.prepareCamera(this.glInterface.getSurfaceTexture(), videoEncoder.getWidth(),
-            videoEncoder.getHeight());
+            videoEncoder.getHeight(), videoEncoder.getFps());
         cameraManager.openLastCamera();
       } else {
         this.glInterface = glInterface;
@@ -351,45 +509,85 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
    * @param rotation camera rotation (0, 90, 180, 270). Recommended: {@link
    * com.pedro.encoder.input.video.CameraHelper#getCameraOrientation(Context)}
    */
+  public void startPreview(CameraHelper.Facing cameraFacing, int width, int height, int fps, int rotation) {
+    startPreview(cameraManager.getCameraIdForFacing(cameraFacing), width, height, fps, rotation);
+  }
+
   public void startPreview(CameraHelper.Facing cameraFacing, int width, int height, int rotation) {
+    startPreview(cameraFacing, width, height, videoEncoder.getFps(), rotation);
+  }
+
+  public void startPreview(String cameraId, int width, int height, int rotation) {
+    startPreview(cameraId, width, height, videoEncoder.getFps(), rotation);
+  }
+
+  public void startPreview(String cameraId, int width, int height, int fps, int rotation) {
     if (!isStreaming() && !onPreview && !isBackground) {
       previewWidth = width;
       previewHeight = height;
+      videoEncoder.setFps(fps);
+      videoEncoder.setRotation(rotation);
       if (surfaceView != null) {
-        cameraManager.prepareCamera(surfaceView.getHolder().getSurface());
+        cameraManager.prepareCamera(surfaceView.getHolder().getSurface(), videoEncoder.getFps());
       } else if (textureView != null) {
-        cameraManager.prepareCamera(new Surface(textureView.getSurfaceTexture()));
+        cameraManager.prepareCamera(new Surface(textureView.getSurfaceTexture()),
+            videoEncoder.getFps());
       } else if (glInterface != null) {
-        boolean isPortrait = CameraHelper.isPortrait(context);
-        if (isPortrait) {
+        if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
           glInterface.setEncoderSize(height, width);
         } else {
           glInterface.setEncoderSize(width, height);
         }
         glInterface.setRotation(rotation == 0 ? 270 : rotation - 90);
+        glInterface.setFps(videoEncoder.getFps());
         glInterface.start();
-        cameraManager.prepareCamera(glInterface.getSurfaceTexture(), width, height);
+        cameraManager.prepareCamera(glInterface.getSurfaceTexture(), width, height,
+            videoEncoder.getFps());
       }
-      cameraManager.openCameraFacing(cameraFacing);
+      cameraManager.openCameraId(cameraId);
       onPreview = true;
+    } else if (!isStreaming() && !onPreview && isBackground) {
+      // if you are using background mode startPreview only work to indicate
+      // that you want start with front or back camera
+      cameraManager.setCameraId(cameraId);
+    } else {
+      Log.e(TAG, "Streaming or preview started, ignored");
     }
   }
 
   public void startPreview(CameraHelper.Facing cameraFacing, int width, int height) {
-    startPreview(cameraFacing, width, height, CameraHelper.getCameraOrientation(context));
+    startPreview(cameraManager.getCameraIdForFacing(cameraFacing),
+            width, height, CameraHelper.getCameraOrientation(context));
+  }
+
+  public void startPreview(String cameraId, int width, int height) {
+    startPreview(cameraId, width, height, CameraHelper.getCameraOrientation(context));
+  }
+
+  public void startPreview(String cameraId, int rotation) {
+    startPreview(cameraId, videoEncoder.getWidth(), videoEncoder.getHeight(), rotation);
   }
 
   public void startPreview(CameraHelper.Facing cameraFacing, int rotation) {
-    startPreview(cameraFacing, videoEncoder.getWidth(), videoEncoder.getHeight(), rotation);
+    startPreview(cameraManager.getCameraIdForFacing(cameraFacing),
+            videoEncoder.getWidth(), videoEncoder.getHeight(), rotation);
+  }
+
+  public void startPreview(String cameraId) {
+    startPreview(cameraId, videoEncoder.getWidth(), videoEncoder.getHeight());
   }
 
   public void startPreview(CameraHelper.Facing cameraFacing) {
-    startPreview(cameraFacing, videoEncoder.getWidth(), videoEncoder.getHeight(),
-        CameraHelper.getCameraOrientation(context));
+    startPreview(cameraManager.getCameraIdForFacing(cameraFacing),
+            videoEncoder.getWidth(), videoEncoder.getHeight());
+  }
+
+  public void startPreview(int width, int height) {
+    startPreview(getCameraFacing(), width, height);
   }
 
   public void startPreview() {
-    startPreview(CameraHelper.Facing.BACK);
+    startPreview(getCameraFacing());
   }
 
   /**
@@ -406,9 +604,20 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
       onPreview = false;
       previewWidth = 0;
       previewHeight = 0;
+    } else {
+      Log.e(TAG, "Streaming or preview stopped, ignored");
     }
   }
 
+  public void startStreamAndRecord(String url, String path, RecordController.Listener listener) throws IOException {
+    startStream(url);
+    recordController.startRecord(path, listener);
+  }
+
+  public void startStreamAndRecord(String url, String path) throws IOException {
+    startStreamAndRecord(url, path, null);
+  }
+
   protected abstract void startStreamRtp(String url);
 
   /**
@@ -426,7 +635,7 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
     if (!recordController.isRunning()) {
       startEncoders();
     } else {
-      resetVideoEncoder();
+      requestKeyFrame();
     }
     startStreamRtp(url);
     onPreview = true;
@@ -434,40 +643,24 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
 
   private void startEncoders() {
     videoEncoder.start();
-    audioEncoder.start();
+    if (audioInitialized) audioEncoder.start();
     prepareGlView();
-    microphoneManager.start();
+    if (audioInitialized) microphoneManager.start();
     if (glInterface == null && !cameraManager.isRunning() && videoEncoder.getWidth() != previewWidth
         || videoEncoder.getHeight() != previewHeight) {
-      if (onPreview) {
-        cameraManager.openLastCamera();
-      } else {
-        cameraManager.openCameraBack();
-      }
+      cameraManager.openLastCamera();
     }
     onPreview = true;
   }
 
-  private void resetVideoEncoder() {
-    if (glInterface != null) {
-      glInterface.removeMediaCodecSurface();
-    }
-    videoEncoder.reset();
-    if (glInterface != null) {
-      glInterface.addMediaCodecSurface(videoEncoder.getInputSurface());
-    } else {
-      cameraManager.closeCamera();
-      cameraManager.prepareCamera(videoEncoder.getInputSurface());
-      cameraManager.openLastCamera();
+  public void requestKeyFrame() {
+    if (videoEncoder.isRunning()) {
+      videoEncoder.requestKeyframe();
     }
   }
 
   private void prepareGlView() {
-    if (glInterface != null && videoEnabled) {
-      if (glInterface instanceof OffScreenGlThread) {
-        glInterface = new OffScreenGlThread(context);
-        glInterface.init();
-      }
+    if (glInterface != null) {
       glInterface.setFps(videoEncoder.getFps());
       if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
         glInterface.setEncoderSize(videoEncoder.getHeight(), videoEncoder.getWidth());
@@ -484,7 +677,7 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
         glInterface.addMediaCodecSurface(videoEncoder.getInputSurface());
       }
       cameraManager.prepareCamera(glInterface.getSurfaceTexture(), videoEncoder.getWidth(),
-          videoEncoder.getHeight());
+          videoEncoder.getHeight(), videoEncoder.getFps());
     }
   }
 
@@ -500,7 +693,7 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
     }
     if (!recordController.isRecording()) {
       onPreview = !isBackground;
-      microphoneManager.stop();
+      if (audioInitialized) microphoneManager.stop();
       if (glInterface != null) {
         glInterface.removeMediaCodecSurface();
         if (glInterface instanceof OffScreenGlThread) {
@@ -510,44 +703,44 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
       } else {
         if (isBackground) {
           cameraManager.closeCamera();
+          onPreview = false;
         } else {
           cameraManager.stopRepeatingEncoder();
         }
       }
       videoEncoder.stop();
-      audioEncoder.stop();
+      if (audioInitialized) audioEncoder.stop();
       recordController.resetFormats();
     }
   }
 
-  public boolean reTry(long delay, String reason) {
+  /**
+   * Retries to connect with the given delay. You can pass an optional backupUrl
+   * if you'd like to connect to your backup server instead of the original one.
+   * Given backupUrl replaces the original one.
+   */
+  public boolean reTry(long delay, String reason, @Nullable String backupUrl) {
     boolean result = shouldRetry(reason);
     if (result) {
-      reTry(delay);
+      requestKeyFrame();
+      reConnect(delay, backupUrl);
     }
     return result;
   }
 
-  /**
-   * Replace with reTry(long delay, String reason);
-   */
-  @Deprecated
-  public void reTry(long delay) {
-    resetVideoEncoder();
-    reConnect(delay);
+  public boolean reTry(long delay, String reason) {
+    return reTry(delay, reason, null);
   }
 
-  /**
-   * Replace with reTry(long delay, String reason);
-   */
-  @Deprecated
-  public abstract boolean shouldRetry(String reason);
+  protected abstract boolean shouldRetry(String reason);
 
   public abstract void setReTries(int reTries);
 
-  protected abstract void reConnect(long delay);
+  protected abstract void reConnect(long delay, @Nullable String backupUrl);
 
   //cache control
+  public abstract boolean hasCongestion();
+
   public abstract void resizeCache(int newSize) throws RuntimeException;
 
   public abstract int getCacheSize();
@@ -586,6 +779,14 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
     return Arrays.asList(cameraManager.getCameraResolutionsFront());
   }
 
+  public List<Range<Integer>> getSupportedFps() {
+    return cameraManager.getSupportedFps(null, CameraHelper.Facing.BACK);
+  }
+
+  public List<Range<Integer>> getSupportedFps(Size size, CameraHelper.Facing facing) {
+    return cameraManager.getSupportedFps(size, facing);
+  }
+
   /**
    * Get supported properties of the camera
    *
@@ -619,21 +820,12 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
   }
 
   /**
-   * Get video camera state
+   * Return zoom level range
    *
-   * @return true if disabled, false if enabled
+   * @return zoom level range
    */
-  public boolean isVideoEnabled() {
-    return videoEnabled;
-  }
-
-  /**
-   * Return max zoom level
-   *
-   * @return max zoom level
-   */
-  public float getMaxZoom() {
-    return cameraManager.getMaxZoom();
+  public Range<Float> getZoomRange() {
+    return cameraManager.getZoomRange();
   }
 
   /**
@@ -650,7 +842,7 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
    * Use this method if you use a zoom slider.
    *
    * @param level Expected to be >= 1 and <= max zoom level
-   * @see Camera2Base#getMaxZoom()
+   * @see Camera2Base#getZoom()
    */
   public void setZoom(float level) {
     cameraManager.setZoom(level);
@@ -665,6 +857,22 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
     cameraManager.setZoom(event);
   }
 
+  /**
+   * @Experimental
+   * @return optical zoom values available
+   */
+  public float[] getOpticalZooms() {
+    return cameraManager.getOpticalZooms();
+  }
+
+  /**
+   * @Experimental
+   * @param level value provided by getOpticalZooms method
+   */
+  public void setOpticalZoom(float level) {
+    cameraManager.setOpticalZoom(level);
+  }
+
   public int getBitrate() {
     return videoEncoder.getBitRate();
   }
@@ -682,16 +890,58 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
   }
 
   /**
-   * Switch camera used. Can be called on preview or while stream, ignored with preview off.
+   * @return IDs of cameras available that can be used on startPreview of switchCamera. null If no cameras available
+   */
+  public String[] getCamerasAvailable() {
+    return cameraManager.getCamerasAvailable();
+  }
+  /**
+   * Switch camera used. Can be called anytime
    *
    * @throws CameraOpenException If the other camera doesn't support same resolution.
    */
   public void switchCamera() throws CameraOpenException {
-    if (isStreaming() || onPreview) {
+    if (isStreaming() || isRecording() || onPreview) {
       cameraManager.switchCamera();
+    } else {
+      cameraManager.setCameraFacing(getCameraFacing() == CameraHelper.Facing.FRONT ? CameraHelper.Facing.BACK : CameraHelper.Facing.FRONT);
     }
   }
 
+  /**
+   * Choose a specific camera to use. Can be called anytime.
+   *
+   * @param cameraId Identifier of the camera to use.
+   * @throws CameraOpenException
+   */
+  public void switchCamera(String cameraId) throws CameraOpenException {
+    if (isStreaming() || onPreview) {
+      cameraManager.reOpenCamera(cameraId);
+    } else {
+      cameraManager.setCameraId(cameraId);
+    }
+  }
+
+  public void setExposure(int value) {
+    cameraManager.setExposure(value);
+  }
+
+  public int getExposure() {
+    return cameraManager.getExposure();
+  }
+
+  public int getMaxExposure() {
+    return cameraManager.getMaxExposure();
+  }
+
+  public int getMinExposure() {
+    return cameraManager.getMinExposure();
+  }
+
+  public void tapToFocus(MotionEvent event) {
+    cameraManager.tapToFocus(event);
+  }
+
   public GlInterface getGlInterface() {
     if (glInterface != null) {
       return glInterface;
@@ -702,14 +952,15 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
 
   private void prepareCameraManager() {
     if (textureView != null) {
-      cameraManager.prepareCamera(textureView, videoEncoder.getInputSurface());
+      cameraManager.prepareCamera(textureView, videoEncoder.getInputSurface(),
+          videoEncoder.getFps());
     } else if (surfaceView != null) {
-      cameraManager.prepareCamera(surfaceView, videoEncoder.getInputSurface());
+      cameraManager.prepareCamera(surfaceView, videoEncoder.getInputSurface(),
+          videoEncoder.getFps());
     } else if (glInterface != null) {
     } else {
-      cameraManager.prepareCamera(videoEncoder.getInputSurface());
+      cameraManager.prepareCamera(videoEncoder.getInputSurface(), videoEncoder.getFps());
     }
-    videoEnabled = true;
   }
 
   /**
@@ -780,14 +1031,9 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
 
   protected abstract void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps);
 
-  @Override
-  public void onSpsPps(ByteBuffer sps, ByteBuffer pps) {
-    if (streaming) onSpsPpsVpsRtp(sps, pps, null);
-  }
-
   @Override
   public void onSpsPpsVps(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    if (streaming) onSpsPpsVpsRtp(sps, pps, vps);
+    onSpsPpsVpsRtp(sps.duplicate(), pps.duplicate(), vps != null ? vps.duplicate() : null);
   }
 
   protected abstract void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info);
@@ -806,11 +1052,19 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
 
   @Override
   public void onVideoFormat(MediaFormat mediaFormat) {
-    recordController.setVideoFormat(mediaFormat);
+    recordController.setVideoFormat(mediaFormat, !audioInitialized);
   }
 
   @Override
   public void onAudioFormat(MediaFormat mediaFormat) {
     recordController.setAudioFormat(mediaFormat);
   }
+
+  public void setRecordController(BaseRecordController recordController) {
+    if (!isRecording()) this.recordController = recordController;
+  }
+
+  public abstract void setLogs(boolean enable);
+
+  public abstract void setCheckServerAlive(boolean enable);
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/DisplayBase.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/DisplayBase.java
index 4d2a721..b988a60 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/DisplayBase.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/DisplayBase.java
@@ -1,17 +1,36 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.base;
 
 import android.content.Context;
 import android.content.Intent;
-import android.hardware.display.VirtualDisplay;
 import android.media.AudioAttributes;
 import android.media.AudioPlaybackCaptureConfiguration;
 import android.media.MediaCodec;
 import android.media.MediaFormat;
+import android.media.MediaRecorder;
 import android.media.projection.MediaProjection;
 import android.media.projection.MediaProjectionManager;
 import android.os.Build;
 import android.view.Surface;
 import android.view.SurfaceView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import com.pedro.encoder.Frame;
 import com.pedro.encoder.audio.AudioEncoder;
@@ -19,14 +38,20 @@ import com.pedro.encoder.audio.GetAacData;
 import com.pedro.encoder.input.audio.CustomAudioEffect;
 import com.pedro.encoder.input.audio.GetMicrophoneData;
 import com.pedro.encoder.input.audio.MicrophoneManager;
+import com.pedro.encoder.input.audio.MicrophoneManagerManual;
+import com.pedro.encoder.input.audio.MicrophoneMode;
 import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.encoder.video.FormatVideoEncoder;
 import com.pedro.encoder.video.GetVideoData;
 import com.pedro.encoder.video.VideoEncoder;
+import com.pedro.rtplibrary.base.recording.BaseRecordController;
+import com.pedro.rtplibrary.base.recording.RecordController;
 import com.pedro.rtplibrary.util.FpsListener;
-import com.pedro.rtplibrary.util.RecordController;
+import com.pedro.rtplibrary.util.AndroidMuxerRecordController;
 import com.pedro.rtplibrary.view.GlInterface;
 import com.pedro.rtplibrary.view.OffScreenGlThread;
+
+import java.io.FileDescriptor;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
@@ -45,24 +70,21 @@ import static android.content.Context.MEDIA_PROJECTION_SERVICE;
 public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrophoneData {
 
   private OffScreenGlThread glInterface;
-  protected Context context;
   private MediaProjection mediaProjection;
-  private MediaProjectionManager mediaProjectionManager;
+  private final MediaProjectionManager mediaProjectionManager;
   protected VideoEncoder videoEncoder;
   private MicrophoneManager microphoneManager;
   private AudioEncoder audioEncoder;
   private boolean streaming = false;
   protected SurfaceView surfaceView;
-  private boolean videoEnabled = true;
   private int dpi = 320;
-  private VirtualDisplay virtualDisplay;
   private int resultCode = -1;
   private Intent data;
-  private RecordController recordController;
-  private FpsListener fpsListener = new FpsListener();
+  protected BaseRecordController recordController;
+  private final FpsListener fpsListener = new FpsListener();
+  private boolean audioInitialized = false;
 
   public DisplayBase(Context context, boolean useOpengl) {
-    this.context = context;
     if (useOpengl) {
       glInterface = new OffScreenGlThread(context);
       glInterface.init();
@@ -71,9 +93,31 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
         ((MediaProjectionManager) context.getSystemService(MEDIA_PROJECTION_SERVICE));
     this.surfaceView = null;
     videoEncoder = new VideoEncoder(this);
-    microphoneManager = new MicrophoneManager(this);
     audioEncoder = new AudioEncoder(this);
-    recordController = new RecordController();
+    //Necessary use same thread to read input buffer and encode it with internal audio or audio is choppy.
+    setMicrophoneMode(MicrophoneMode.SYNC);
+    recordController = new AndroidMuxerRecordController();
+  }
+
+  /**
+   * Must be called before prepareAudio.
+   *
+   * @param microphoneMode mode to work accord to audioEncoder. By default SYNC:
+   * SYNC using same thread. This mode could solve choppy audio or audio frame discarded.
+   * ASYNC using other thread.
+   */
+  public void setMicrophoneMode(MicrophoneMode microphoneMode) {
+    switch (microphoneMode) {
+      case SYNC:
+        microphoneManager = new MicrophoneManagerManual();
+        audioEncoder = new AudioEncoder(this);
+        audioEncoder.setGetFrame(((MicrophoneManagerManual) microphoneManager).getGetFrame());
+        break;
+      case ASYNC:
+        microphoneManager = new MicrophoneManager(this);
+        audioEncoder = new AudioEncoder(this);
+        break;
+    }
   }
 
   /**
@@ -114,15 +158,17 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
    * doesn't support any configuration seated or your device hasn't a H264 encoder).
    */
   public boolean prepareVideo(int width, int height, int fps, int bitrate, int rotation, int dpi,
-                              int avcProfile, int avcProfileLevel, int iFrameInterval) {
+      int avcProfile, int avcProfileLevel, int iFrameInterval) {
     this.dpi = dpi;
     boolean result =
-            videoEncoder.prepareVideoEncoder(width, height, fps, bitrate, rotation, true, iFrameInterval,
-                    FormatVideoEncoder.SURFACE, avcProfile, avcProfileLevel);
+        videoEncoder.prepareVideoEncoder(width, height, fps, bitrate, rotation, iFrameInterval,
+            FormatVideoEncoder.SURFACE, avcProfile, avcProfileLevel);
     if (glInterface != null) {
-      glInterface = new OffScreenGlThread(context);
-      glInterface.init();
-      glInterface.setEncoderSize(videoEncoder.getWidth(), videoEncoder.getHeight());
+      if (rotation == 90 || rotation == 270) {
+        glInterface.setEncoderSize(videoEncoder.getHeight(), videoEncoder.getWidth());
+      } else {
+        glInterface.setEncoderSize(videoEncoder.getWidth(), videoEncoder.getHeight());
+      }
     }
     return result;
   }
@@ -131,6 +177,10 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
     return prepareVideo(width, height, fps, bitrate, rotation, dpi, -1, -1, 2);
   }
 
+  public boolean prepareVideo(int width, int height, int bitrate) {
+    return prepareVideo(width, height, 30, bitrate, 0, 320);
+  }
+
   protected abstract void prepareAudioRtp(boolean isStereo, int sampleRate);
 
   /**
@@ -145,12 +195,25 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
    * @return true if success, false if you get a error (Normally because the encoder selected
    * doesn't support any configuration seated or your device hasn't a AAC encoder).
    */
+  public boolean prepareAudio(int audioSource, int bitrate, int sampleRate, boolean isStereo, boolean echoCanceler,
+      boolean noiseSuppressor) {
+    if (!microphoneManager.createMicrophone(audioSource, sampleRate, isStereo, echoCanceler, noiseSuppressor)) {
+      return false;
+    }
+    prepareAudioRtp(isStereo, sampleRate);
+    audioInitialized = audioEncoder.prepareAudioEncoder(bitrate, sampleRate, isStereo,
+        microphoneManager.getMaxInputSize());
+    return audioInitialized;
+  }
+
   public boolean prepareAudio(int bitrate, int sampleRate, boolean isStereo, boolean echoCanceler,
       boolean noiseSuppressor) {
-    microphoneManager.createMicrophone(sampleRate, isStereo, echoCanceler, noiseSuppressor);
-    prepareAudioRtp(isStereo, sampleRate);
-    return audioEncoder.prepareAudioEncoder(bitrate, sampleRate, isStereo,
-        microphoneManager.getMaxInputSize());
+    return prepareAudio(MediaRecorder.AudioSource.DEFAULT, bitrate, sampleRate, isStereo, echoCanceler,
+        noiseSuppressor);
+  }
+
+  public boolean prepareAudio(int bitrate, int sampleRate, boolean isStereo) {
+    return prepareAudio(bitrate, sampleRate, isStereo, false, false);
   }
 
   /**
@@ -163,21 +226,31 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
    * @see AudioPlaybackCaptureConfiguration.Builder#Builder(MediaProjection)
    */
   @RequiresApi(api = Build.VERSION_CODES.Q)
-  public boolean prepareInternalAudio(int bitrate, int sampleRate, boolean isStereo) {
+  public boolean prepareInternalAudio(int bitrate, int sampleRate, boolean isStereo,
+      boolean echoCanceler, boolean noiseSuppressor) {
     if (mediaProjection == null) {
       mediaProjection = mediaProjectionManager.getMediaProjection(resultCode, data);
     }
 
-    AudioPlaybackCaptureConfiguration config = new AudioPlaybackCaptureConfiguration
-            .Builder(mediaProjection)
-            .addMatchingUsage(AudioAttributes.USAGE_MEDIA)
+    AudioPlaybackCaptureConfiguration config =
+        new AudioPlaybackCaptureConfiguration.Builder(mediaProjection).addMatchingUsage(
+            AudioAttributes.USAGE_MEDIA)
             .addMatchingUsage(AudioAttributes.USAGE_GAME)
             .addMatchingUsage(AudioAttributes.USAGE_UNKNOWN)
             .build();
-    microphoneManager.createInternalMicrophone(config, sampleRate, isStereo);
+    if (!microphoneManager.createInternalMicrophone(config, sampleRate, isStereo, echoCanceler,
+        noiseSuppressor)) {
+      return false;
+    }
     prepareAudioRtp(isStereo, sampleRate);
-    return audioEncoder.prepareAudioEncoder(bitrate, sampleRate, isStereo,
-            microphoneManager.getMaxInputSize());
+    audioInitialized = audioEncoder.prepareAudioEncoder(bitrate, sampleRate, isStereo,
+        microphoneManager.getMaxInputSize());
+    return audioInitialized;
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.Q)
+  public boolean prepareInternalAudio(int bitrate, int sampleRate, boolean isStereo) {
+    return prepareInternalAudio(bitrate, sampleRate, isStereo, false, false);
   }
 
   /**
@@ -204,6 +277,11 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
     return prepareAudio(64 * 1024, 32000, true, false, false);
   }
 
+  @RequiresApi(api = Build.VERSION_CODES.Q)
+  public boolean prepareInternalAudio() {
+    return prepareInternalAudio(64 * 1024, 32000, true);
+  }
+
   /**
    * @param forceVideo force type codec used. FIRST_COMPATIBLE_FOUND, SOFTWARE, HARDWARE
    * @param forceAudio force type codec used. FIRST_COMPATIBLE_FOUND, SOFTWARE, HARDWARE
@@ -214,24 +292,47 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
   }
 
   /**
-   * Start record a MP4 video. Need be called while stream.
+   * Starts recording an MP4 video. Needs to be called while streaming.
    *
-   * @param path where file will be saved.
-   * @throws IOException If you init it before start stream.
+   * @param path Where file will be saved.
+   * @throws IOException If initialized before a stream.
    */
-  public void startRecord(String path, RecordController.Listener listener) throws IOException {
+  public void startRecord(@NonNull String path, @Nullable RecordController.Listener listener)
+      throws IOException {
     recordController.startRecord(path, listener);
     if (!streaming) {
       startEncoders(resultCode, data);
     } else if (videoEncoder.isRunning()) {
-      resetVideoEncoder();
+      requestKeyFrame();
     }
   }
 
-  public void startRecord(final String path) throws IOException {
+  public void startRecord(@NonNull final String path) throws IOException {
     startRecord(path, null);
   }
 
+  /**
+   * Starts recording an MP4 video. Needs to be called while streaming.
+   *
+   * @param fd Where the file will be saved.
+   * @throws IOException If initialized before a stream.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  public void startRecord(@NonNull final FileDescriptor fd,
+      @Nullable RecordController.Listener listener) throws IOException {
+    recordController.startRecord(fd, listener);
+    if (!streaming) {
+      startEncoders(resultCode, data);
+    } else if (videoEncoder.isRunning()) {
+      requestKeyFrame();
+    }
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  public void startRecord(@NonNull final FileDescriptor fd) throws IOException {
+    startRecord(fd, null);
+  }
+
   /**
    * Stop record MP4 video started with @startRecord. If you don't call it file will be unreadable.
    */
@@ -272,7 +373,7 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
     if (!recordController.isRunning()) {
       startEncoders(resultCode, data);
     } else {
-      resetVideoEncoder();
+      requestKeyFrame();
     }
     startStreamRtp(url);
   }
@@ -282,7 +383,7 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
       throw new RuntimeException("You need send intent data before startRecord or startStream");
     }
     videoEncoder.start();
-    audioEncoder.start();
+    if (audioInitialized) audioEncoder.start();
     if (glInterface != null) {
       glInterface.setFps(videoEncoder.getFps());
       glInterface.start();
@@ -293,22 +394,21 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
     if (mediaProjection == null) {
       mediaProjection = mediaProjectionManager.getMediaProjection(resultCode, data);
     }
-    virtualDisplay = mediaProjection.createVirtualDisplay("Stream Display", videoEncoder.getWidth(),
-        videoEncoder.getHeight(), dpi, 0, surface, null, null);
-    microphoneManager.start();
+    if (glInterface != null && videoEncoder.getRotation() == 90
+        || videoEncoder.getRotation() == 270) {
+      mediaProjection.createVirtualDisplay("Stream Display", videoEncoder.getHeight(),
+              videoEncoder.getWidth(), dpi, 0, surface, null, null);
+    } else {
+      mediaProjection.createVirtualDisplay("Stream Display", videoEncoder.getWidth(),
+              videoEncoder.getHeight(), dpi, 0, surface, null, null);
+    }
+    if (audioInitialized) microphoneManager.start();
   }
 
-  private void resetVideoEncoder() {
-    virtualDisplay.setSurface(null);
-    if (glInterface != null) {
-      glInterface.removeMediaCodecSurface();
+  public void requestKeyFrame() {
+    if (videoEncoder.isRunning()) {
+      videoEncoder.requestKeyframe();
     }
-    videoEncoder.reset();
-    if (glInterface != null) {
-      glInterface.addMediaCodecSurface(videoEncoder.getInputSurface());
-    }
-    virtualDisplay.setSurface(
-        glInterface != null ? glInterface.getSurface() : videoEncoder.getInputSurface());
   }
 
   protected abstract void stopStreamRtp();
@@ -322,7 +422,7 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
       stopStreamRtp();
     }
     if (!recordController.isRecording()) {
-      microphoneManager.stop();
+      if (audioInitialized) microphoneManager.stop();
       if (mediaProjection != null) {
         mediaProjection.stop();
       }
@@ -337,34 +437,33 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
     }
   }
 
-  public boolean reTry(long delay, String reason) {
+  /**
+   * Retries to connect with the given delay. You can pass an optional backupUrl
+   * if you'd like to connect to your backup server instead of the original one.
+   * Given backupUrl replaces the original one.
+   */
+  public boolean reTry(long delay, String reason, @Nullable String backupUrl) {
     boolean result = shouldRetry(reason);
     if (result) {
-      reTry(delay);
+      requestKeyFrame();
+      reConnect(delay, backupUrl);
     }
     return result;
   }
 
-  /**
-   * Replace with reTry(long delay, String reason);
-   */
-  @Deprecated
-  public void reTry(long delay) {
-    resetVideoEncoder();
-    reConnect(delay);
+  public boolean reTry(long delay, String reason) {
+    return reTry(delay, reason, null);
   }
 
-  /**
-   * Replace with reTry(long delay, String reason);
-   */
-  @Deprecated
-  public abstract boolean shouldRetry(String reason);
+  protected abstract boolean shouldRetry(String reason);
 
   public abstract void setReTries(int reTries);
 
-  protected abstract void reConnect(long delay);
+  protected abstract void reConnect(long delay, @Nullable String backupUrl);
 
   //cache control
+  public abstract boolean hasCongestion();
+
   public abstract void resizeCache(int newSize) throws RuntimeException;
 
   public abstract int getCacheSize();
@@ -416,15 +515,6 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
     return microphoneManager.isMuted();
   }
 
-  /**
-   * Get video camera state
-   *
-   * @return true if disabled, false if enabled
-   */
-  public boolean isVideoEnabled() {
-    return videoEnabled;
-  }
-
   public int getBitrate() {
     return videoEncoder.getBitRate();
   }
@@ -500,14 +590,9 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
 
   protected abstract void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps);
 
-  @Override
-  public void onSpsPps(ByteBuffer sps, ByteBuffer pps) {
-    if (streaming) onSpsPpsVpsRtp(sps, pps, null);
-  }
-
   @Override
   public void onSpsPpsVps(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    if (streaming) onSpsPpsVpsRtp(sps, pps, vps);
+    onSpsPpsVpsRtp(sps.duplicate(), pps.duplicate(), vps != null ? vps.duplicate() : null);
   }
 
   protected abstract void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info);
@@ -526,12 +611,20 @@ public abstract class DisplayBase implements GetAacData, GetVideoData, GetMicrop
 
   @Override
   public void onVideoFormat(MediaFormat mediaFormat) {
-    recordController.setVideoFormat(mediaFormat);
+    recordController.setVideoFormat(mediaFormat, !audioInitialized);
   }
 
   @Override
   public void onAudioFormat(MediaFormat mediaFormat) {
     recordController.setAudioFormat(mediaFormat);
   }
+
+  public void setRecordController(BaseRecordController recordController) {
+    if (!isRecording()) this.recordController = recordController;
+  }
+
+  public abstract void setLogs(boolean enable);
+
+  public abstract void setCheckServerAlive(boolean enable);
 }
 
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/FromFileBase.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/FromFileBase.java
index 204c699..3ab8b8a 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/FromFileBase.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/FromFileBase.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.base;
 
 import android.content.Context;
@@ -8,6 +24,9 @@ import android.media.MediaCodec;
 import android.media.MediaFormat;
 import android.os.Build;
 import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import com.pedro.encoder.Frame;
 import com.pedro.encoder.audio.AudioEncoder;
@@ -22,12 +41,16 @@ import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.encoder.video.FormatVideoEncoder;
 import com.pedro.encoder.video.GetVideoData;
 import com.pedro.encoder.video.VideoEncoder;
+import com.pedro.rtplibrary.base.recording.BaseRecordController;
+import com.pedro.rtplibrary.base.recording.RecordController;
 import com.pedro.rtplibrary.util.FpsListener;
-import com.pedro.rtplibrary.util.RecordController;
+import com.pedro.rtplibrary.util.AndroidMuxerRecordController;
 import com.pedro.rtplibrary.view.GlInterface;
 import com.pedro.rtplibrary.view.LightOpenGlView;
 import com.pedro.rtplibrary.view.OffScreenGlThread;
 import com.pedro.rtplibrary.view.OpenGlView;
+
+import java.io.FileDescriptor;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
@@ -46,15 +69,13 @@ public abstract class FromFileBase
     implements GetVideoData, GetAacData, GetMicrophoneData, LoopFileInterface {
 
   private static final String TAG = "FromFileBase";
-  private Context context;
 
   protected VideoEncoder videoEncoder;
   private AudioEncoder audioEncoder;
   private GlInterface glInterface;
   private boolean streaming = false;
-  private boolean videoEnabled = true;
-  private RecordController recordController;
-  private FpsListener fpsListener = new FpsListener();
+  protected BaseRecordController recordController;
+  private final FpsListener fpsListener = new FpsListener();
 
   private VideoDecoder videoDecoder;
   private AudioDecoder audioDecoder;
@@ -63,6 +84,8 @@ public abstract class FromFileBase
   private AudioDecoderInterface audioDecoderInterface;
 
   private String videoPath, audioPath;
+  protected boolean videoEnabled = false;
+  private boolean audioEnabled = false;
   private final Object sync = new Object();
   private AudioTrack audioTrackPlayer;
 
@@ -76,7 +99,6 @@ public abstract class FromFileBase
    */
   public FromFileBase(Context context, VideoDecoderInterface videoDecoderInterface,
       AudioDecoderInterface audioDecoderInterface) {
-    this.context = context;
     glInterface = new OffScreenGlThread(context);
     glInterface.init();
     init(videoDecoderInterface, audioDecoderInterface);
@@ -84,7 +106,6 @@ public abstract class FromFileBase
 
   public FromFileBase(OpenGlView openGlView, VideoDecoderInterface videoDecoderInterface,
       AudioDecoderInterface audioDecoderInterface) {
-    context = openGlView.getContext();
     glInterface = openGlView;
     glInterface.init();
     init(videoDecoderInterface, audioDecoderInterface);
@@ -92,7 +113,6 @@ public abstract class FromFileBase
 
   public FromFileBase(LightOpenGlView lightOpenGlView, VideoDecoderInterface videoDecoderInterface,
       AudioDecoderInterface audioDecoderInterface) {
-    context = lightOpenGlView.getContext();
     glInterface = lightOpenGlView;
     glInterface.init();
     init(videoDecoderInterface, audioDecoderInterface);
@@ -104,7 +124,9 @@ public abstract class FromFileBase
     this.audioDecoderInterface = audioDecoderInterface;
     videoEncoder = new VideoEncoder(this);
     audioEncoder = new AudioEncoder(this);
-    recordController = new RecordController();
+    videoDecoder = new VideoDecoder(videoDecoderInterface, this);
+    audioDecoder = new AudioDecoder(this, audioDecoderInterface, this);
+    recordController = new AndroidMuxerRecordController();
   }
 
   /**
@@ -132,12 +154,14 @@ public abstract class FromFileBase
   public boolean prepareVideo(String filePath, int bitRate, int rotation, int avcProfile,
       int avcProfileLevel) throws IOException {
     videoPath = filePath;
-    videoDecoder = new VideoDecoder(videoDecoderInterface, this);
     if (!videoDecoder.initExtractor(filePath)) return false;
-    boolean hardwareRotation = glInterface == null;
-    return videoEncoder.prepareVideoEncoder(videoDecoder.getWidth(), videoDecoder.getHeight(), 30,
-        bitRate, rotation, hardwareRotation, 2, FormatVideoEncoder.SURFACE, avcProfile,
-        avcProfileLevel);
+    boolean result =
+        videoEncoder.prepareVideoEncoder(videoDecoder.getWidth(), videoDecoder.getHeight(), 30,
+            bitRate, rotation, 2, FormatVideoEncoder.SURFACE, avcProfile, avcProfileLevel);
+    if (!result) return false;
+    result = videoDecoder.prepareVideo(videoEncoder.getInputSurface());
+    videoEnabled = result;
+    return result;
   }
 
   public boolean prepareVideo(String filePath, int bitRate, int rotation) throws IOException {
@@ -157,13 +181,25 @@ public abstract class FromFileBase
    */
   public boolean prepareAudio(String filePath, int bitRate) throws IOException {
     audioPath = filePath;
-    audioDecoder = new AudioDecoder(this, audioDecoderInterface, this);
     if (!audioDecoder.initExtractor(filePath)) return false;
-    boolean result = audioEncoder.prepareAudioEncoder(bitRate, audioDecoder.getSampleRate(),
-        audioDecoder.isStereo(), 0);
-    prepareAudioRtp(audioDecoder.isStereo(), audioDecoder.getSampleRate());
     audioDecoder.prepareAudio();
-    if (glInterface != null && !(glInterface instanceof OffScreenGlThread)) {
+    boolean result = audioEncoder.prepareAudioEncoder(bitRate, audioDecoder.getSampleRate(),
+        audioDecoder.isStereo(), audioDecoder.getOutsize());
+    prepareAudioRtp(audioDecoder.isStereo(), audioDecoder.getSampleRate());
+    audioEnabled = result;
+    return result;
+  }
+
+  public boolean isAudioDeviceEnabled() {
+    return audioTrackPlayer != null
+        && audioTrackPlayer.getPlayState() == AudioTrack.PLAYSTATE_PLAYING;
+  }
+
+  public void playAudioDevice() {
+    if (audioEnabled) {
+      if (isAudioDeviceEnabled()) {
+        audioTrackPlayer.stop();
+      }
       int channel =
           audioDecoder.isStereo() ? AudioFormat.CHANNEL_OUT_STEREO : AudioFormat.CHANNEL_OUT_MONO;
       int buffSize = AudioTrack.getMinBufferSize(audioDecoder.getSampleRate(), channel,
@@ -171,8 +207,15 @@ public abstract class FromFileBase
       audioTrackPlayer =
           new AudioTrack(AudioManager.STREAM_MUSIC, audioDecoder.getSampleRate(), channel,
               AudioFormat.ENCODING_PCM_16BIT, buffSize, AudioTrack.MODE_STREAM);
+      audioTrackPlayer.play();
+    }
+  }
+
+  public void stopAudioDevice() {
+    if (audioEnabled && isAudioDeviceEnabled()) {
+      audioTrackPlayer.stop();
+      audioTrackPlayer = null;
     }
-    return result;
   }
 
   public boolean prepareAudio(String filePath) throws IOException {
@@ -185,29 +228,50 @@ public abstract class FromFileBase
    * @param forceVideo force type codec used. FIRST_COMPATIBLE_FOUND, SOFTWARE, HARDWARE
    */
   public void setForce(CodecUtil.Force forceVideo, CodecUtil.Force forceAudio) {
-    videoEncoder.setForce(forceVideo);
-    audioEncoder.setForce(forceAudio);
+    if (videoEnabled) videoEncoder.setForce(forceVideo);
+    if (audioEnabled) audioEncoder.setForce(forceAudio);
   }
 
   /**
-   * Start record a MP4 video. Need be called while stream.
+   * Starts recording an MP4 video. Needs to be called while streaming.
    *
-   * @param path where file will be saved.
-   * @throws IOException If you init it before start stream.
+   * @param path Where file will be saved.
+   * @throws IOException If initialized before a stream.
    */
-  public void startRecord(String path, RecordController.Listener listener) throws IOException {
+  public void startRecord(@NonNull String path, @Nullable RecordController.Listener listener) throws IOException {
     recordController.startRecord(path, listener);
     if (!streaming) {
       startEncoders();
     } else if (videoEncoder.isRunning()) {
-      resetVideoEncoder();
+      requestKeyFrame();
     }
   }
 
-  public void startRecord(final String path) throws IOException {
+  public void startRecord(@NonNull final String path) throws IOException {
     startRecord(path, null);
   }
 
+  /**
+   * Starts recording an MP4 video. Needs to be called while streaming.
+   *
+   * @param fd Where the file will be saved.
+   * @throws IOException If initialized before a stream.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  public void startRecord(@NonNull final FileDescriptor fd, @Nullable RecordController.Listener listener) throws IOException {
+    recordController.startRecord(fd, listener);
+    if (!streaming) {
+      startEncoders();
+    } else if (videoEncoder.isRunning()) {
+      requestKeyFrame();
+    }
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  public void startRecord(@NonNull final FileDescriptor fd) throws IOException{
+    startRecord(fd, null);
+  }
+
   /**
    * Stop record MP4 video started with @startRecord. If you don't call it file will be unreadable.
    */
@@ -234,26 +298,75 @@ public abstract class FromFileBase
     if (!recordController.isRunning()) {
       startEncoders();
     } else {
-      resetVideoEncoder();
+      if (videoEnabled) requestKeyFrame();
     }
     startStreamRtp(url);
   }
 
   private void startEncoders() {
-    videoEncoder.start();
+    if (videoEnabled) videoEncoder.start();
     if (audioTrackPlayer != null) audioTrackPlayer.play();
-    audioEncoder.start();
-    prepareGlView();
-    videoDecoder.start();
-    audioDecoder.start();
+    if (audioEnabled) audioEncoder.start();
+    if (videoEnabled) prepareGlView();
+    if (videoEnabled) videoDecoder.start();
+    if (audioEnabled) audioDecoder.start();
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void replaceView(Context context) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      replaceGlInterface(new OffScreenGlThread(context));
+    }
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void replaceView(OpenGlView openGlView) {
+    replaceGlInterface(openGlView);
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void replaceView(LightOpenGlView lightOpenGlView) {
+    replaceGlInterface(lightOpenGlView);
+  }
+
+  /**
+   * Replace glInterface used on fly. Ignored if you use SurfaceView or TextureView
+   */
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  private void replaceGlInterface(GlInterface glInterface) {
+    if (this.glInterface != null && Build.VERSION.SDK_INT >= 18 && videoEnabled) {
+      if (isStreaming() || isRecording()) {
+        try {
+          this.glInterface.removeMediaCodecSurface();
+          this.glInterface.stop();
+          this.glInterface = glInterface;
+          this.glInterface.init();
+          prepareGlView();
+          if (Build.VERSION.SDK_INT >= 23) {
+            videoDecoder.changeOutputSurface(this.glInterface.getSurface());
+          } else {
+            double time = videoDecoder.getTime();
+            videoDecoder.stop();
+            videoDecoder = new VideoDecoder(videoDecoderInterface, this);
+            if (!videoDecoder.initExtractor(videoPath)) {
+              throw new IOException("fail to reset video file");
+            }
+            videoDecoder.prepareVideo(this.glInterface.getSurface());
+            videoDecoder.start();
+            videoDecoder.moveTo(time);
+          }
+        } catch (IOException e) {
+          Log.e(TAG, "Error", e);
+        }
+      } else {
+        this.glInterface = glInterface;
+        this.glInterface.init();
+      }
+    }
   }
 
   private void prepareGlView() {
     if (glInterface != null) {
-      if (glInterface instanceof OffScreenGlThread) {
-        glInterface = new OffScreenGlThread(context);
-        glInterface.init();
-      }
       glInterface.setFps(videoEncoder.getFps());
       if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
         glInterface.setEncoderSize(videoEncoder.getHeight(), videoEncoder.getWidth());
@@ -263,65 +376,59 @@ public abstract class FromFileBase
       glInterface.setRotation(0);
       glInterface.start();
       if (videoEncoder.getInputSurface() != null) {
+        videoDecoder.changeOutputSurface(this.glInterface.getSurface());
         glInterface.addMediaCodecSurface(videoEncoder.getInputSurface());
       }
-      videoDecoder.prepareVideo(glInterface.getSurface());
-    } else {
-      videoDecoder.prepareVideo(videoEncoder.getInputSurface());
     }
   }
 
-  private void resetVideoEncoder() {
-    try {
-      if (glInterface != null) {
-        glInterface.removeMediaCodecSurface();
-        glInterface.stop();
+  public void requestKeyFrame() {
+    if (videoEncoder.isRunning()) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+        videoEncoder.requestKeyframe();
+      } else {
+        if (glInterface != null) {
+          glInterface.removeMediaCodecSurface();
+        }
+        videoEncoder.reset();
+        if (glInterface != null) {
+          glInterface.addMediaCodecSurface(videoEncoder.getInputSurface());
+        } else {
+          videoDecoder.reset(videoEncoder.getInputSurface());
+        }
       }
-      double time = videoDecoder.getTime();
-      videoDecoder.stop();
-      videoDecoder = new VideoDecoder(videoDecoderInterface, this);
-      if (!videoDecoder.initExtractor(videoPath)) {
-        throw new IOException("fail to reset video file");
-      }
-      videoEncoder.reset();
-      prepareGlView();
-      videoDecoder.start();
-      videoDecoder.moveTo(time);
-    } catch (IOException e) {
-      Log.e(TAG, "Error", e);
     }
   }
 
   protected abstract void stopStreamRtp();
 
-  public boolean reTry(long delay, String reason) {
+  /**
+   * Retries to connect with the given delay. You can pass an optional backupUrl
+   * if you'd like to connect to your backup server instead of the original one.
+   * Given backupUrl replaces the original one.
+   */
+  public boolean reTry(long delay, String reason, @Nullable String backupUrl) {
     boolean result = shouldRetry(reason);
     if (result) {
-      reTry(delay);
+      requestKeyFrame();
+      reConnect(delay, backupUrl);
     }
     return result;
   }
 
-  /**
-   * Replace with reTry(long delay, String reason);
-   */
-  @Deprecated
-  public void reTry(long delay) {
-    resetVideoEncoder();
-    reConnect(delay);
+  public boolean reTry(long delay, String reason) {
+    return reTry(delay, reason, null);
   }
 
-  /**
-   * Replace with reTry(long delay, String reason);
-   */
-  @Deprecated
-  public abstract boolean shouldRetry(String reason);
+  protected abstract boolean shouldRetry(String reason);
 
   public abstract void setReTries(int reTries);
 
-  protected abstract void reConnect(long delay);
+  protected abstract void reConnect(long delay, @Nullable String backupUrl);
 
   //cache control
+  public abstract boolean hasCongestion();
+
   public abstract void resizeCache(int newSize) throws RuntimeException;
 
   public abstract int getCacheSize();
@@ -355,16 +462,17 @@ public abstract class FromFileBase
         glInterface.removeMediaCodecSurface();
         glInterface.stop();
       }
-      if (videoDecoder != null) videoDecoder.stop();
-      if (audioDecoder != null) audioDecoder.stop();
-      if (audioTrackPlayer != null
-          && audioTrackPlayer.getPlayState() == AudioTrack.PLAYSTATE_PLAYING) {
+      if (videoEnabled) videoDecoder.stop();
+      if (audioEnabled) audioDecoder.stop();
+      if (audioEnabled && isAudioDeviceEnabled()) {
         audioTrackPlayer.stop();
       }
       audioTrackPlayer = null;
-      videoEncoder.stop();
-      audioEncoder.stop();
+      if (videoEnabled) videoEncoder.stop();
+      if (audioEnabled) audioEncoder.stop();
       recordController.resetFormats();
+      videoEnabled = false;
+      audioEnabled = false;
     }
   }
 
@@ -375,12 +483,12 @@ public abstract class FromFileBase
    * @param loopMode true in loop, false stop stream when video finish.
    */
   public void setLoopMode(boolean loopMode) {
-    videoDecoder.setLoopMode(loopMode);
-    audioDecoder.setLoopMode(loopMode);
+    if (videoEnabled) videoDecoder.setLoopMode(loopMode);
+    if (audioEnabled) audioDecoder.setLoopMode(loopMode);
   }
 
   public void reSyncFile() {
-    if (isStreaming()) audioDecoder.moveTo(videoDecoder.getTime());
+    if (isStreaming() && videoEnabled && audioEnabled) audioDecoder.moveTo(videoDecoder.getTime());
   }
 
   public GlInterface getGlInterface() {
@@ -407,24 +515,14 @@ public abstract class FromFileBase
     return videoEncoder.getHeight();
   }
 
-  /**
-   * Get video camera state
-   *
-   * @return true if disabled, false if enabled
-   */
-  public boolean isVideoEnabled() {
-    return videoEnabled;
-  }
-
   /**
    * Set video bitrate of H264 in bits per second while stream.
    *
    * @param bitrate H264 in bits per second.
    */
+  @RequiresApi(api = Build.VERSION_CODES.KITKAT)
   public void setVideoBitrateOnFly(int bitrate) {
-    if (Build.VERSION.SDK_INT >= 19) {
-      videoEncoder.setVideoBitrateOnFly(bitrate);
-    }
+    videoEncoder.setVideoBitrateOnFly(bitrate);
   }
 
   /**
@@ -478,7 +576,7 @@ public abstract class FromFileBase
    * @return return time in seconds. 0 if no streaming
    */
   public double getAudioTime() {
-    return videoDecoder.getTime();
+    return audioDecoder.getTime();
   }
 
   /**
@@ -501,8 +599,8 @@ public abstract class FromFileBase
    * @param time second to move.
    */
   public void moveTo(double time) {
-    videoDecoder.moveTo(time);
-    audioDecoder.moveTo(time);
+    if (videoEnabled) videoDecoder.moveTo(time);
+    if (audioEnabled) audioDecoder.moveTo(time);
   }
 
   @Override
@@ -514,21 +612,29 @@ public abstract class FromFileBase
             glInterface.removeMediaCodecSurface();
             glInterface.stop();
           }
-          videoDecoder.stop();
-          videoDecoder = new VideoDecoder(videoDecoderInterface, this);
-          if (!videoDecoder.initExtractor(videoPath)) {
-            throw new IOException("fail to reset video file");
+          if (videoEnabled) {
+            videoDecoder.stop();
+            boolean loopMode = videoDecoder.isLoopMode();
+            videoDecoder = new VideoDecoder(videoDecoderInterface, this);
+            videoDecoder.setLoopMode(loopMode);
+            if (!videoDecoder.initExtractor(videoPath)) {
+              throw new IOException("fail to reset video file");
+            }
+            prepareGlView();
+            videoDecoder.start();
           }
-          prepareGlView();
-          videoDecoder.start();
         } else {
-          audioDecoder.stop();
-          audioDecoder = new AudioDecoder(this, audioDecoderInterface, this);
-          if (!audioDecoder.initExtractor(audioPath)) {
-            throw new IOException("fail to reset audio file");
+          if (audioEnabled) {
+            audioDecoder.stop();
+            boolean loopMode = audioDecoder.isLoopMode();
+            audioDecoder = new AudioDecoder(this, audioDecoderInterface, this);
+            audioDecoder.setLoopMode(loopMode);
+            if (!audioDecoder.initExtractor(audioPath)) {
+              throw new IOException("fail to reset audio file");
+            }
+            audioDecoder.prepareAudio();
+            audioDecoder.start();
           }
-          audioDecoder.prepareAudio();
-          audioDecoder.start();
         }
       } catch (IOException e) {
         Log.e(TAG, "Error", e);
@@ -543,14 +649,9 @@ public abstract class FromFileBase
 
   protected abstract void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps);
 
-  @Override
-  public void onSpsPps(ByteBuffer sps, ByteBuffer pps) {
-    if (streaming) onSpsPpsVpsRtp(sps, pps, null);
-  }
-
   @Override
   public void onSpsPpsVps(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    if (streaming) onSpsPpsVpsRtp(sps, pps, vps);
+    onSpsPpsVpsRtp(sps.duplicate(), pps.duplicate(), vps != null ? vps.duplicate() : null);
   }
 
   protected abstract void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info);
@@ -564,7 +665,7 @@ public abstract class FromFileBase
 
   @Override
   public void onVideoFormat(MediaFormat mediaFormat) {
-    recordController.setVideoFormat(mediaFormat);
+    recordController.setVideoFormat(mediaFormat, !audioEnabled);
   }
 
   protected abstract void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info);
@@ -577,7 +678,7 @@ public abstract class FromFileBase
 
   @Override
   public void onAudioFormat(MediaFormat mediaFormat) {
-    recordController.setAudioFormat(mediaFormat);
+    recordController.setAudioFormat(mediaFormat, !videoEnabled);
   }
 
   @Override
@@ -587,4 +688,12 @@ public abstract class FromFileBase
     }
     audioEncoder.inputPCMData(frame);
   }
+
+  public void setRecordController(BaseRecordController recordController) {
+    if (!isRecording()) this.recordController = recordController;
+  }
+
+  public abstract void setLogs(boolean enable);
+
+  public abstract void setCheckServerAlive(boolean enable);
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/OnlyAudioBase.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/OnlyAudioBase.java
index 86f6741..d69e3ac 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/OnlyAudioBase.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/OnlyAudioBase.java
@@ -1,13 +1,43 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.base;
 
 import android.media.MediaCodec;
 import android.media.MediaFormat;
+import android.media.MediaRecorder;
+import android.os.Build;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import com.pedro.encoder.Frame;
 import com.pedro.encoder.audio.AudioEncoder;
 import com.pedro.encoder.audio.GetAacData;
 import com.pedro.encoder.input.audio.CustomAudioEffect;
 import com.pedro.encoder.input.audio.GetMicrophoneData;
 import com.pedro.encoder.input.audio.MicrophoneManager;
+import com.pedro.encoder.input.audio.MicrophoneManagerManual;
+import com.pedro.encoder.input.audio.MicrophoneMode;
+import com.pedro.rtplibrary.base.recording.BaseRecordController;
+import com.pedro.rtplibrary.base.recording.RecordController;
+import com.pedro.rtplibrary.util.AndroidMuxerRecordController;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 
 /**
@@ -17,13 +47,42 @@ import java.nio.ByteBuffer;
  */
 public abstract class OnlyAudioBase implements GetAacData, GetMicrophoneData {
 
+  protected BaseRecordController recordController;
   private MicrophoneManager microphoneManager;
   private AudioEncoder audioEncoder;
   private boolean streaming = false;
 
   public OnlyAudioBase() {
-    microphoneManager = new MicrophoneManager(this);
-    audioEncoder = new AudioEncoder(this);
+    setMicrophoneMode(MicrophoneMode.ASYNC);
+    recordController = new AndroidMuxerRecordController();
+  }
+
+  /**
+   * Must be called before prepareAudio.
+   *
+   * @param microphoneMode mode to work accord to audioEncoder. By default ASYNC:
+   * SYNC using same thread. This mode could solve choppy audio or audio frame discarded.
+   * ASYNC using other thread.
+   */
+  public void setMicrophoneMode(MicrophoneMode microphoneMode) {
+    switch (microphoneMode) {
+      case SYNC:
+        microphoneManager = new MicrophoneManagerManual();
+        audioEncoder = new AudioEncoder(this);
+        audioEncoder.setGetFrame(((MicrophoneManagerManual) microphoneManager).getGetFrame());
+        audioEncoder.setTsModeBuffer(false);
+        break;
+      case ASYNC:
+        microphoneManager = new MicrophoneManager(this);
+        audioEncoder = new AudioEncoder(this);
+        audioEncoder.setTsModeBuffer(false);
+        break;
+      case BUFFER:
+        microphoneManager = new MicrophoneManager(this);
+        audioEncoder = new AudioEncoder(this);
+        audioEncoder.setTsModeBuffer(true);
+        break;
+    }
   }
 
   /**
@@ -55,14 +114,26 @@ public abstract class OnlyAudioBase implements GetAacData, GetMicrophoneData {
    * @return true if success, false if you get a error (Normally because the encoder selected
    * doesn't support any configuration seated or your device hasn't a AAC encoder).
    */
-  public boolean prepareAudio(int bitrate, int sampleRate, boolean isStereo, boolean echoCanceler,
+  public boolean prepareAudio(int audioSource, int bitrate, int sampleRate, boolean isStereo, boolean echoCanceler,
       boolean noiseSuppressor) {
-    microphoneManager.createMicrophone(sampleRate, isStereo, echoCanceler, noiseSuppressor);
+    if (!microphoneManager.createMicrophone(audioSource, sampleRate, isStereo, echoCanceler, noiseSuppressor)) {
+      return false;
+    }
     prepareAudioRtp(isStereo, sampleRate);
     return audioEncoder.prepareAudioEncoder(bitrate, sampleRate, isStereo,
         microphoneManager.getMaxInputSize());
   }
 
+  public boolean prepareAudio(int bitrate, int sampleRate, boolean isStereo, boolean echoCanceler,
+      boolean noiseSuppressor) {
+    return prepareAudio(MediaRecorder.AudioSource.DEFAULT, bitrate, sampleRate, isStereo, echoCanceler,
+        noiseSuppressor);
+  }
+
+  public boolean prepareAudio(int bitrate, int sampleRate, boolean isStereo) {
+    return prepareAudio(bitrate, sampleRate, isStereo, false, false);
+  }
+
   /**
    * Same to call:
    * prepareAudio(64 * 1024, 32000, true, false, false);
@@ -74,6 +145,54 @@ public abstract class OnlyAudioBase implements GetAacData, GetMicrophoneData {
     return prepareAudio(64 * 1024, 32000, true, false, false);
   }
 
+  /**
+   * Starts recording an MP4 video. Needs to be called while streaming.
+   *
+   * @param path Where file will be saved.
+   * @throws IOException If initialized before a stream.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void startRecord(String path, RecordController.Listener listener) throws IOException {
+    recordController.startRecord(path, listener);
+    if (!streaming) {
+      startEncoders();
+    }
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void startRecord(final String path) throws IOException {
+    startRecord(path, null);
+  }
+
+  /**
+   * Starts recording an MP4 video. Needs to be called while streaming.
+   *
+   * @param fd Where the file will be saved.
+   * @throws IOException If initialized before a stream.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  public void startRecord(@NonNull final FileDescriptor fd,
+      @Nullable RecordController.Listener listener) throws IOException {
+    recordController.startRecord(fd, listener);
+    if (!streaming) {
+      startEncoders();
+    }
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  public void startRecord(@NonNull final FileDescriptor fd) throws IOException {
+    startRecord(fd, null);
+  }
+
+  /**
+   * Stop record MP4 video started with @startRecord. If you don't call it file will be unreadable.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void stopRecord() {
+    recordController.stopRecord();
+    if (!streaming) stopStream();
+  }
+
   protected abstract void startStreamRtp(String url);
 
   /**
@@ -89,40 +208,79 @@ public abstract class OnlyAudioBase implements GetAacData, GetMicrophoneData {
    */
   public void startStream(String url) {
     streaming = true;
+    if (!recordController.isRunning()) {
+      startEncoders();
+    }
+    startStreamRtp(url);
+  }
+
+  /**
+   * Stop stream started with @startStream.
+   */
+  public void stopStream() {
+    streaming = false;
+    stopStreamRtp();
+    if (!recordController.isRecording()) {
+      microphoneManager.stop();
+      audioEncoder.stop();
+      recordController.resetFormats();
+    }
+  }
+
+  private void startEncoders() {
     audioEncoder.start();
     microphoneManager.start();
-    startStreamRtp(url);
   }
 
   protected abstract void stopStreamRtp();
 
-  public boolean reTry(long delay, String reason) {
+  /**
+   * Get record state.
+   *
+   * @return true if recording, false if not recoding.
+   */
+  public boolean isRecording() {
+    return recordController.isRunning();
+  }
+
+  public void pauseRecord() {
+    recordController.pauseRecord();
+  }
+
+  public void resumeRecord() {
+    recordController.resumeRecord();
+  }
+
+  public RecordController.Status getRecordStatus() {
+    return recordController.getStatus();
+  }
+
+  /**
+   * Retries to connect with the given delay. You can pass an optional backupUrl
+   * if you'd like to connect to your backup server instead of the original one.
+   * Given backupUrl replaces the original one.
+   */
+  public boolean reTry(long delay, String reason, @Nullable String backupUrl) {
     boolean result = shouldRetry(reason);
     if (result) {
-      reTry(delay);
+      reConnect(delay, backupUrl);
     }
     return result;
   }
 
-  /**
-   * Replace with reTry(long delay, String reason);
-   */
-  @Deprecated
-  public void reTry(long delay) {
-    reConnect(delay);
+  public boolean reTry(long delay, String reason) {
+    return reTry(delay, reason, null);
   }
 
-  /**
-   * Replace with reTry(long delay, String reason);
-   */
-  @Deprecated
-  public abstract boolean shouldRetry(String reason);
+  protected abstract boolean shouldRetry(String reason);
 
   public abstract void setReTries(int reTries);
 
-  protected abstract void reConnect(long delay);
+  protected abstract void reConnect(long delay, @Nullable String backupUrl);
 
   //cache control
+  public abstract boolean hasCongestion();
+
   public abstract void resizeCache(int newSize) throws RuntimeException;
 
   public abstract int getCacheSize();
@@ -143,16 +301,6 @@ public abstract class OnlyAudioBase implements GetAacData, GetMicrophoneData {
 
   public abstract void resetDroppedVideoFrames();
 
-  /**
-   * Stop stream started with @startStream.
-   */
-  public void stopStream() {
-    streaming = false;
-    stopStreamRtp();
-    microphoneManager.stop();
-    audioEncoder.stop();
-  }
-
   /**
    * Mute microphone, can be called before, while and after stream.
    */
@@ -189,7 +337,10 @@ public abstract class OnlyAudioBase implements GetAacData, GetMicrophoneData {
 
   @Override
   public void getAacData(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
-    getAacDataRtp(aacBuffer, info);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      recordController.recordAudio(aacBuffer, info);
+    }
+    if (streaming) getAacDataRtp(aacBuffer, info);
   }
 
   @Override
@@ -199,6 +350,14 @@ public abstract class OnlyAudioBase implements GetAacData, GetMicrophoneData {
 
   @Override
   public void onAudioFormat(MediaFormat mediaFormat) {
-    //ignored because record is not implemented
+    recordController.setAudioFormat(mediaFormat, true);
   }
+
+  public void setRecordController(BaseRecordController recordController) {
+    if (!isRecording()) this.recordController = recordController;
+  }
+
+  public abstract void setLogs(boolean enable);
+
+  public abstract void setCheckServerAlive(boolean enable);
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/StreamBase.kt b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/StreamBase.kt
new file mode 100644
index 0000000..0441309
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/StreamBase.kt
@@ -0,0 +1,529 @@
+package com.pedro.rtplibrary.base
+
+import android.content.Context
+import android.graphics.SurfaceTexture
+import android.media.MediaCodec
+import android.media.MediaFormat
+import android.media.projection.MediaProjection
+import android.os.Build
+import android.util.Range
+import android.util.Size
+import android.view.MotionEvent
+import android.view.Surface
+import android.view.SurfaceView
+import android.view.TextureView
+import androidx.annotation.RequiresApi
+import com.pedro.encoder.Frame
+import com.pedro.encoder.audio.AudioEncoder
+import com.pedro.encoder.audio.GetAacData
+import com.pedro.encoder.input.audio.GetMicrophoneData
+import com.pedro.encoder.input.video.CameraHelper
+import com.pedro.encoder.video.FormatVideoEncoder
+import com.pedro.encoder.video.GetVideoData
+import com.pedro.encoder.video.VideoEncoder
+import com.pedro.rtplibrary.base.recording.BaseRecordController
+import com.pedro.rtplibrary.base.recording.RecordController
+import com.pedro.rtplibrary.util.AndroidMuxerRecordController
+import com.pedro.rtplibrary.util.sources.AudioManager
+import com.pedro.rtplibrary.util.sources.VideoManager
+import com.pedro.rtplibrary.view.GlStreamInterface
+import java.nio.ByteBuffer
+
+/**
+ * Created by pedro on 21/2/22.
+ *
+ * Allow:
+ * - video source camera1, camera2 or screen.
+ * - audio source microphone or internal.
+ * - Rotation on realtime.
+ */
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+abstract class StreamBase(context: Context, videoSource: VideoManager.Source,
+  audioSource: AudioManager.Source): GetVideoData, GetAacData, GetMicrophoneData {
+
+  //video and audio encoders
+  private val videoEncoder by lazy { VideoEncoder(this) }
+  private val audioEncoder by lazy { AudioEncoder(this) }
+  //video render
+  private val glInterface = GlStreamInterface(context)
+  //video and audio sources
+  private val videoManager = VideoManager(context, videoSource)
+  private val audioManager by lazy { AudioManager(this, audioSource) }
+  //video/audio record
+  private var recordController: BaseRecordController = AndroidMuxerRecordController()
+  var isStreaming = false
+    private set
+  var isOnPreview = false
+    private set
+  val isRecording: Boolean
+    get() = recordController.isRunning
+
+  init {
+    glInterface.init()
+  }
+
+  /**
+   * Necessary only one time before start preview, stream or record.
+   * If you want change values stop preview, stream and record is necessary.
+   *
+   * @return True if success, False if failed
+   */
+  @JvmOverloads
+  fun prepareVideo(width: Int, height: Int, bitrate: Int, fps: Int = 30, iFrameInterval: Int = 2,
+    avcProfile: Int = -1, avcProfileLevel: Int = -1): Boolean {
+    val videoResult = videoManager.createVideoManager(width, height, fps)
+    if (videoResult) {
+      glInterface.setEncoderSize(width, height)
+      return videoEncoder.prepareVideoEncoder(width, height, fps, bitrate, 0,
+        iFrameInterval, FormatVideoEncoder.SURFACE, avcProfile, avcProfileLevel)
+    }
+    return videoResult
+  }
+
+  /**
+   * Necessary only one time before start stream or record.
+   * If you want change values stop stream and record is necessary.
+   *
+   * @return True if success, False if failed
+   */
+  @JvmOverloads
+  fun prepareAudio(sampleRate: Int, isStereo: Boolean, bitrate: Int, echoCanceler: Boolean = false,
+    noiseSuppressor: Boolean = false): Boolean {
+    val audioResult = audioManager.createAudioManager(sampleRate, isStereo, echoCanceler, noiseSuppressor)
+    if (audioResult) {
+      return audioEncoder.prepareAudioEncoder(bitrate, sampleRate, isStereo, audioManager.getMaxInputSize())
+    }
+    return audioResult
+  }
+
+  /**
+   * Start stream.
+   *
+   * Must be called after prepareVideo and prepareAudio
+   */
+  fun startStream(endPoint: String) {
+    isStreaming = true
+    rtpStartStream(endPoint)
+    if (!isRecording) startSources()
+    else videoEncoder.requestKeyframe()
+  }
+
+  /**
+   * Stop stream.
+   *
+   * @return True if encoders prepared successfully with previous parameters. False other way
+   * If return is false you will need call prepareVideo and prepareAudio manually again before startStream or StartRecord
+   *
+   * Must be called after prepareVideo and prepareAudio.
+   */
+  fun stopStream(): Boolean {
+    isStreaming = false
+    rtpStopStream()
+    if (!isRecording) {
+      stopSources()
+      return prepareEncoders()
+    }
+    return true
+  }
+
+  /**
+   * Start record.
+   *
+   * Must be called after prepareVideo and prepareAudio.
+   */
+  fun startRecord(path: String, listener: RecordController.Listener) {
+    recordController.startRecord(path, listener)
+    if (!isStreaming) startSources()
+    else videoEncoder.requestKeyframe()
+  }
+
+  /**
+   * @return True if encoders prepared successfully with previous parameters. False other way
+   * If return is false you will need call prepareVideo and prepareAudio manually again before startStream or StartRecord
+   *
+   * Must be called after prepareVideo and prepareAudio.
+   */
+  fun stopRecord(): Boolean {
+    recordController.stopRecord()
+    if (!isStreaming) {
+      stopSources()
+      return prepareEncoders()
+    }
+    return true
+  }
+
+  /**
+   * Start preview in the selected TextureView.
+   * Must be called after prepareVideo.
+   */
+  fun startPreview(textureView: TextureView) {
+    startPreview(Surface(textureView.surfaceTexture), textureView.width, textureView.height)
+  }
+
+  /**
+   * Start preview in the selected SurfaceView.
+   * Must be called after prepareVideo.
+   */
+  fun startPreview(surfaceView: SurfaceView) {
+    startPreview(surfaceView.holder.surface, surfaceView.width, surfaceView.height)
+  }
+
+  /**
+   * Start preview in the selected SurfaceTexture.
+   * Must be called after prepareVideo.
+   */
+  fun startPreview(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
+    startPreview(Surface(surfaceTexture), width, height)
+  }
+
+  /**
+   * Start preview in the selected Surface.
+   * Must be called after prepareVideo.
+   */
+  fun startPreview(surface: Surface, width: Int, height: Int) {
+    if (!surface.isValid) throw IllegalArgumentException("Make sure the Surface is valid")
+    isOnPreview = true
+    if (!glInterface.running) glInterface.start()
+    if (!videoManager.isRunning()) {
+      videoManager.start(glInterface.getSurfaceTexture())
+    }
+    glInterface.attachPreview(surface)
+    glInterface.setPreviewResolution(width, height)
+  }
+
+  /**
+   * Stop preview.
+   * Must be called after prepareVideo.
+   */
+  fun stopPreview() {
+    isOnPreview = false
+    if (!isStreaming && !isRecording) videoManager.stop()
+    glInterface.deAttachPreview()
+    if (!isStreaming && !isRecording) glInterface.stop()
+  }
+
+  /**
+   * Change video source to Camera1 or Camera2.
+   * Must be called after prepareVideo.
+   */
+  fun changeVideoSourceCamera(source: VideoManager.Source) {
+    glInterface.setForceRender(false)
+    videoManager.changeSourceCamera(source)
+  }
+
+  /**
+   * Change video source to Screen.
+   * Must be called after prepareVideo.
+   */
+  fun changeVideoSourceScreen(mediaProjection: MediaProjection) {
+    glInterface.setForceRender(true)
+    videoManager.changeSourceScreen(mediaProjection)
+  }
+
+  /**
+   * Disable video stopping process video frames from video source.
+   * You can return to camera/screen video using changeVideoSourceCamera/changeVideoSourceScreen
+   *
+   * @NOTE:
+   * This isn't recommended because it isn't supported in all servers/players.
+   * Use BlackFilterRender to send only black images is recommended.
+   */
+  fun changeVideoSourceDisabled() {
+    glInterface.setForceRender(false)
+    videoManager.changeVideoSourceDisabled()
+  }
+
+  /**
+   * Change audio source to Microphone.
+   * Must be called after prepareAudio.
+   */
+  fun changeAudioSourceMicrophone() {
+    audioManager.changeSourceMicrophone()
+  }
+
+  /**
+   * Change audio source to Internal.
+   * Must be called after prepareAudio.
+   */
+  @RequiresApi(Build.VERSION_CODES.Q)
+  fun changeAudioSourceInternal(mediaProjection: MediaProjection) {
+    audioManager.changeSourceInternal(mediaProjection)
+  }
+
+  /**
+   * Disable audio stopping process audio frames from audio source.
+   * You can return to microphone/internal audio using changeAudioSourceMicrophone/changeAudioSourceInternal
+   *
+   * @NOTE:
+   * This isn't recommended because it isn't supported in all servers/players.
+   * Use mute and unMute to send empty audio is recommended
+   */
+  fun changeAudioSourceDisabled() {
+    audioManager.changeAudioSourceDisabled()
+  }
+
+  /**
+   * Mute microphone or internal audio.
+   * Must be called after prepareAudio.
+   */
+  fun mute() {
+    audioManager.mute()
+  }
+
+  /**
+   * Mute microphone or internal audio.
+   * Must be called after prepareAudio.
+   */
+  fun unMute() {
+    audioManager.unMute()
+  }
+
+  /**
+   * Check if microphone or internal audio is muted.
+   * Must be called after prepareAudio.
+   */
+  fun isMuted(): Boolean = audioManager.isMuted()
+
+  /**
+   * Switch between front or back camera if using Camera1 or Camera2.
+   * Must be called after prepareVideo.
+   */
+  fun switchCamera() {
+    videoManager.switchCamera()
+  }
+
+  /**
+   * get if using front or back camera with Camera1 or Camera2.
+   * Must be called after prepareVideo.
+   */
+  fun getCameraFacing(): CameraHelper.Facing = videoManager.getCameraFacing()
+
+  /**
+   * Get camera resolutions.
+   *
+   * @param source select camera source (Camera1 or Camera2) of the required resolutions.
+   * @param facing indicate if resolutions provide from front camera or back camera.
+   */
+  fun getCameraResolutions(source: VideoManager.Source, facing: CameraHelper.Facing): List<Size> {
+    return videoManager.getCameraResolutions(source, facing)
+  }
+
+  /**
+   * Set exposure to Camera1 or Camera2. Ignored with other video source.
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will be ignored.
+   */
+  fun setExposure(level: Int) {
+    videoManager.setExposure(level)
+  }
+
+  /**
+   * @return exposure of Camera1 or Camera2. 0 with other video source.
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will return 0.
+   */
+  fun getExposure(): Int = videoManager.getExposure()
+
+  /**
+   * Enable lantern using Camera1 or Camera2. Ignored with other video source.
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will be ignored.
+   */
+  fun enableLantern() {
+    videoManager.enableLantern()
+  }
+
+  /**
+   * Disable lantern using Camera1 or Camera2. Ignored with other video source.
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will be ignored.
+   */
+  fun disableLantern() {
+    videoManager.disableLantern()
+  }
+
+  /**
+   * @return lantern state using Camera1 or Camera2. False with other video source.
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will return false.
+   */
+  fun isLanternEnabled(): Boolean = videoManager.isLanternEnabled()
+
+  /**
+   * Enable auto focus using Camera1 or Camera2. Ignored with other video source.
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will be ignored.
+   */
+  fun enableAutoFocus() {
+    videoManager.enableAutoFocus()
+  }
+
+  /**
+   * Disable auto focus using Camera1 or Camera2. Ignored with other video source.
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will be ignored.
+   */
+  fun disableAutoFocus() {
+    videoManager.disableAutoFocus()
+  }
+
+  /**
+   * @return auto focus state using Camera1 or Camera2. False with other video source.
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will return false.
+   */
+  fun isAutoFocusEnabled(): Boolean = videoManager.isAutoFocusEnabled()
+
+  /**
+   * Set zoom to Camera1 or Camera2. Ignored with other video source.
+   * This method is used with onTouch event to implement zoom with gestures.
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will be ignored.
+   */
+  fun setZoom(event: MotionEvent) {
+    videoManager.setZoom(event)
+  }
+
+  /**
+   * Set zoom to Camera1 or Camera2. Ignored with other video source.
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will be ignored.
+   */
+  fun setZoom(level: Float) {
+    videoManager.setZoom(level)
+  }
+
+  /**
+   * @return zoom range (min and max) using Camera1 or Camera2. Range(0f, 0f) with other video source
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will return Range(0f, 0f).
+   */
+  fun getZoomRange(): Range<Float> = videoManager.getZoomRange()
+
+  /**
+   * @return current zoom using Camera1 or Camera2. 0f with other video source.
+   *
+   * Must be called with isOnPreview, isStreaming or isRecording true or will return 0f.
+   */
+  fun getZoom(): Float = videoManager.getZoom()
+
+  /**
+   * Change stream orientation depend of activity orientation.
+   * This method affect ro preview and stream.
+   * Must be called after prepareVideo.
+   */
+  fun setOrientation(orientation: Int) {
+    glInterface.setCameraOrientation(orientation)
+  }
+
+  /**
+   * Retries to connect with the given delay. You can pass an optional backupUrl
+   * if you'd like to connect to your backup server instead of the original one.
+   * Given backupUrl replaces the original one.
+   */
+  @JvmOverloads
+  fun reTry(delay: Long, reason: String, backupUrl: String? = null): Boolean {
+    val result = shouldRetry(reason)
+    if (result) {
+      videoEncoder.requestKeyframe()
+      reConnect(delay, backupUrl)
+    }
+    return result
+  }
+
+  /**
+   * Get glInterface used to render video.
+   * This is useful to send filters to stream.
+   * Must be called after prepareVideo.
+   */
+  fun getGlInterface(): GlStreamInterface = glInterface
+
+  fun setRecordController(recordController: BaseRecordController) {
+    if (!isRecording) this.recordController = recordController
+  }
+
+  protected fun setVideoMime(videoMime: String) {
+    recordController.setVideoMime(videoMime)
+    videoEncoder.type = videoMime
+  }
+
+  protected fun getVideoResolution() = Size(videoEncoder.width, videoEncoder.height)
+
+  protected fun getVideoFps() = videoEncoder.fps
+
+  private fun startSources() {
+    if (!glInterface.running) glInterface.start()
+    if (!videoManager.isRunning()) {
+      videoManager.start(glInterface.getSurfaceTexture())
+    }
+    audioManager.start()
+    videoEncoder.start()
+    audioEncoder.start()
+    glInterface.addMediaCodecSurface(videoEncoder.inputSurface)
+  }
+
+  private fun stopSources() {
+    if (!isOnPreview) videoManager.stop()
+    audioManager.stop()
+    videoEncoder.stop()
+    audioEncoder.stop()
+    glInterface.removeMediaCodecSurface()
+    if (!isOnPreview) glInterface.stop()
+    if (!isRecording) recordController.resetFormats()
+  }
+
+  private fun prepareEncoders(): Boolean {
+    return videoEncoder.prepareVideoEncoder() && audioEncoder.prepareAudioEncoder()
+  }
+
+  override fun inputPCMData(frame: Frame) {
+    audioEncoder.inputPCMData(frame)
+  }
+
+  override fun onVideoFormat(mediaFormat: MediaFormat) {
+    recordController.setVideoFormat(mediaFormat)
+  }
+
+  override fun onAudioFormat(mediaFormat: MediaFormat) {
+    recordController.setAudioFormat(mediaFormat)
+  }
+
+  override fun onSpsPpsVps(sps: ByteBuffer, pps: ByteBuffer, vps: ByteBuffer?) {
+    onSpsPpsVpsRtp(sps.duplicate(), pps.duplicate(), vps?.duplicate())
+  }
+
+  override fun getVideoData(h264Buffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    getH264DataRtp(h264Buffer, info)
+    recordController.recordVideo(h264Buffer, info)
+  }
+
+  override fun getAacData(aacBuffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    getAacDataRtp(aacBuffer, info)
+    recordController.recordAudio(aacBuffer, info)
+  }
+
+  protected abstract fun audioInfo(sampleRate: Int, isStereo: Boolean)
+  protected abstract fun rtpStartStream(endPoint: String)
+  protected abstract fun rtpStopStream()
+  protected abstract fun setAuthorization(user: String?, password: String?)
+  protected abstract fun onSpsPpsVpsRtp(sps: ByteBuffer, pps: ByteBuffer, vps: ByteBuffer?)
+  protected abstract fun getH264DataRtp(h264Buffer: ByteBuffer, info: MediaCodec.BufferInfo)
+  protected abstract fun getAacDataRtp(aacBuffer: ByteBuffer, info: MediaCodec.BufferInfo)
+  protected abstract fun shouldRetry(reason: String): Boolean
+  protected abstract fun reConnect(delay: Long, backupUrl: String?)
+  abstract fun setReTries(reTries: Int)
+  abstract fun hasCongestion(): Boolean
+  abstract fun setLogs(enabled: Boolean)
+  abstract fun setCheckServerAlive(enabled: Boolean)
+  @Throws(RuntimeException::class)
+  abstract fun resizeCache(newSize: Int)
+  abstract fun getCacheSize(): Int
+  abstract fun getSentAudioFrames(): Long
+  abstract fun getSentVideoFrames(): Long
+  abstract fun getDroppedAudioFrames(): Long
+  abstract fun getDroppedVideoFrames(): Long
+  abstract fun resetSentAudioFrames()
+  abstract fun resetSentVideoFrames()
+  abstract fun resetDroppedAudioFrames()
+  abstract fun resetDroppedVideoFrames()
+}
\ No newline at end of file
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/recording/BaseRecordController.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/recording/BaseRecordController.java
new file mode 100644
index 0000000..e4125c5
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/recording/BaseRecordController.java
@@ -0,0 +1,87 @@
+package com.pedro.rtplibrary.base.recording;
+
+import android.media.MediaCodec;
+import android.media.MediaFormat;
+
+import com.pedro.encoder.utils.CodecUtil;
+import com.pedro.rtsp.utils.RtpConstants;
+
+import java.nio.ByteBuffer;
+
+public abstract class BaseRecordController implements RecordController {
+
+    protected Status status = Status.STOPPED;
+    protected String videoMime = CodecUtil.H264_MIME;
+    protected long pauseMoment = 0;
+    protected long pauseTime = 0;
+    protected Listener listener;
+    protected int videoTrack = -1;
+    protected int audioTrack = -1;
+    protected final MediaCodec.BufferInfo videoInfo = new MediaCodec.BufferInfo();
+    protected final MediaCodec.BufferInfo audioInfo = new MediaCodec.BufferInfo();
+    protected boolean isOnlyAudio = false;
+    protected boolean isOnlyVideo = false;
+
+    public void setVideoMime(String videoMime) {
+        this.videoMime = videoMime;
+    }
+
+    public boolean isRunning() {
+        return status == Status.STARTED
+                || status == Status.RECORDING
+                || status == Status.RESUMED
+                || status == Status.PAUSED;
+    }
+
+    public boolean isRecording() {
+        return status == Status.RECORDING;
+    }
+
+    public Status getStatus() {
+        return status;
+    }
+
+    public void pauseRecord() {
+        if (status == Status.RECORDING) {
+            pauseMoment = System.nanoTime() / 1000;
+            status = Status.PAUSED;
+            if (listener != null) listener.onStatusChange(status);
+        }
+    }
+
+    public void resumeRecord() {
+        if (status == Status.PAUSED) {
+            pauseTime += System.nanoTime() / 1000 - pauseMoment;
+            status = Status.RESUMED;
+            if (listener != null) listener.onStatusChange(status);
+        }
+    }
+
+    protected boolean isKeyFrame(ByteBuffer videoBuffer) {
+        byte[] header = new byte[5];
+        videoBuffer.duplicate().get(header, 0, header.length);
+        if (videoMime.equals(CodecUtil.H264_MIME) && (header[4] & 0x1F) == RtpConstants.IDR) {  //h264
+            return true;
+        } else { //h265
+            return videoMime.equals(CodecUtil.H265_MIME)
+                    && ((header[4] >> 1) & 0x3f) == RtpConstants.IDR_W_DLP
+                    || ((header[4] >> 1) & 0x3f) == RtpConstants.IDR_N_LP;
+        }
+    }
+
+    //We can't reuse info because could produce stream issues
+    protected void updateFormat(MediaCodec.BufferInfo newInfo, MediaCodec.BufferInfo oldInfo) {
+        newInfo.flags = oldInfo.flags;
+        newInfo.offset = oldInfo.offset;
+        newInfo.size = oldInfo.size;
+        newInfo.presentationTimeUs = oldInfo.presentationTimeUs - pauseTime;
+    }
+
+    public void setVideoFormat(MediaFormat videoFormat) {
+        setVideoFormat(videoFormat, false);
+    }
+
+    public void setAudioFormat(MediaFormat audioFormat) {
+        setAudioFormat(audioFormat, false);
+    }
+}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/recording/RecordController.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/recording/RecordController.java
new file mode 100644
index 0000000..3bf80d6
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/recording/RecordController.java
@@ -0,0 +1,33 @@
+package com.pedro.rtplibrary.base.recording;
+
+import android.media.MediaCodec;
+import android.media.MediaFormat;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.pedro.rtplibrary.base.recording.BaseRecordController;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+public interface RecordController {
+
+    void startRecord(@NonNull String path, @Nullable Listener listener) throws IOException;
+    void startRecord(@NonNull FileDescriptor fd, @Nullable Listener listener) throws IOException;
+    void stopRecord();
+    void recordVideo(ByteBuffer videoBuffer, MediaCodec.BufferInfo videoInfo);
+    void recordAudio(ByteBuffer audioBuffer, MediaCodec.BufferInfo audioInfo);
+    void setVideoFormat(MediaFormat videoFormat, boolean isOnlyVideo);
+    void setAudioFormat(MediaFormat audioFormat, boolean isOnlyVideo);
+    void resetFormats();
+
+    interface Listener {
+        void onStatusChange(Status status);
+    }
+
+    enum Status {
+        STARTED, STOPPED, RECORDING, PAUSED, RESUMED
+    }
+}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpCamera1.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpCamera1.java
new file mode 100644
index 0000000..016248b
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpCamera1.java
@@ -0,0 +1,496 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.multiple;
+
+import android.content.Context;
+import android.media.MediaCodec;
+import android.os.Build;
+import android.view.SurfaceView;
+import android.view.TextureView;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import com.pedro.rtmp.flv.video.ProfileIop;
+import com.pedro.rtmp.rtmp.RtmpClient;
+import com.pedro.rtmp.utils.ConnectCheckerRtmp;
+import com.pedro.rtplibrary.base.Camera1Base;
+import com.pedro.rtplibrary.view.LightOpenGlView;
+import com.pedro.rtplibrary.view.OpenGlView;
+import com.pedro.rtsp.rtsp.RtspClient;
+import com.pedro.rtsp.utils.ConnectCheckerRtsp;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Created by pedro on 21/5/21.
+ *
+ * Experiment class.
+ *
+ * Support multiple streams in rtmp and rtsp at same time.
+ * You must set the same number of ConnectChecker that you want use.
+ *
+ * For example. 2 RTMP and 1 RTSP:
+ * stream1, stream2, stream3 (stream1 and stream2 are ConnectCheckerRtmp. stream3 is ConnectCheckerRtsp)
+ *
+ * MultiRtpCamera1 multiRtpCamera1 = new MultiRtpCamera1(surfaceView, new ConnectCheckerRtmp[]{ stream1, stream2 },
+ * new ConnectCheckerRtsp[]{ stream3 });
+ *
+ * You can set an empty array or null if you don't want use a protocol
+ * new MultiRtpCamera1(surfaceView, new ConnectCheckerRtmp[]{ stream1, stream2 },
+ *  null); //RTSP protocol is not used
+ *
+ * In order to use start, stop and other calls you must send type of stream and index to execute it.
+ * Example (using previous example interfaces):
+ *
+ * multiRtpCamera1.startStream(RtpType.RTMP, 1, myendpoint); //stream2 is started
+ * multiRtpCamera1.stopStream(RtpType.RTSP, 0); //stream3 is stopped
+ * multiRtpCamera1.retry(RtpType.RTMP, 0, delay, reason, backupUrl) //retry stream1
+ *
+ * NOTE:
+ * If you call this methods nothing is executed:
+ *
+ * multiRtpCamera1.startStream(endpoint);
+ * multiRtpCamera1.stopStream();
+ * multiRtpCamera1.retry(delay, reason, backUpUrl);
+ *
+ * The rest of methods without RtpType and index means that you will execute that command in all streams.
+ * Read class code if you need info about any method.
+ */
+public class MultiRtpCamera1 extends Camera1Base {
+
+  private final RtmpClient[] rtmpClients;
+  private final RtspClient[] rtspClients;
+
+  public MultiRtpCamera1(SurfaceView surfaceView, ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super(surfaceView);
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+    }
+  }
+
+  public MultiRtpCamera1(TextureView textureView, ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super(textureView);
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+    }
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public MultiRtpCamera1(OpenGlView openGlView, ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super(openGlView);
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+    }
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public MultiRtpCamera1(LightOpenGlView lightOpenGlView, ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super(lightOpenGlView);
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+    }
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public MultiRtpCamera1(Context context, ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super(context);
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+    }
+  }
+
+  public boolean isStreaming(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].isStreaming();
+    } else {
+      return rtspClients[index].isStreaming();
+    }
+  }
+
+  /**
+   * H264 profile.
+   *
+   * @param profileIop Could be ProfileIop.BASELINE or ProfileIop.CONSTRAINED
+   */
+  public void setProfileIop(ProfileIop profileIop, int index) {
+    rtmpClients[index].setProfileIop(profileIop);
+  }
+
+  public void resizeCache(RtpType rtpType, int index, int newSize) {
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].resizeCache(newSize);
+    } else {
+      rtspClients[index].resizeCache(newSize);
+    }
+  }
+
+  @Override
+  public void resizeCache(int newSize) throws RuntimeException {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resizeCache(newSize);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resizeCache(newSize);
+    }
+  }
+
+  public int getCacheSize(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].getCacheSize();
+    } else {
+      return rtspClients[index].getCacheSize();
+    }
+  }
+
+  @Override
+  public int getCacheSize() {
+    return 0;
+  }
+
+  @Override
+  public long getSentAudioFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getSentAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getSentAudioFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getSentVideoFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getSentVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getSentVideoFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getDroppedAudioFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getDroppedAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getDroppedAudioFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getDroppedVideoFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getDroppedVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getDroppedVideoFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public void resetSentAudioFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetSentAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetSentAudioFrames();
+    }
+  }
+
+  @Override
+  public void resetSentVideoFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetSentVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetSentVideoFrames();
+    }
+  }
+
+  @Override
+  public void resetDroppedAudioFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetDroppedAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetDroppedAudioFrames();
+    }
+  }
+
+  @Override
+  public void resetDroppedVideoFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetDroppedVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetDroppedVideoFrames();
+    }
+  }
+
+  public void setAuthorization(RtpType rtpType, int index, String user, String password) {
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].setAuthorization(user, password);
+    } else {
+      rtspClients[index].setAuthorization(user, password);
+    }
+  }
+
+  @Override
+  public void setAuthorization(String user, String password) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setAuthorization(user, password);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setAuthorization(user, password);
+    }
+  }
+
+  /**
+   * Some Livestream hosts use Akamai auth that requires RTMP packets to be sent with increasing
+   * timestamp order regardless of packet type.
+   * Necessary with Servers like Dacast.
+   * More info here:
+   * https://learn.akamai.com/en-us/webhelp/media-services-live/media-services-live-encoder-compatibility-testing-and-qualification-guide-v4.0/GUID-F941C88B-9128-4BF4-A81B-C2E5CFD35BBF.html
+   */
+  public void forceAkamaiTs(boolean enabled) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.forceAkamaiTs(enabled);
+    }
+  }
+
+  @Override
+  protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setAudioInfo(sampleRate, isStereo);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setAudioInfo(sampleRate, isStereo);
+    }
+  }
+
+  public void startStream(RtpType rtpType, int index, String url) {
+    boolean shouldStarEncoder = true;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      if (rtmpClient.isStreaming()) {
+        shouldStarEncoder = false;
+        break;
+      }
+    }
+    if (shouldStarEncoder) {
+      for (RtspClient rtspClient : rtspClients) {
+        if (rtspClient.isStreaming()) {
+          shouldStarEncoder = false;
+          break;
+        }
+      }
+    }
+    if (shouldStarEncoder) super.startStream("");
+    if (rtpType == RtpType.RTMP) {
+      if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
+        rtmpClients[index].setVideoResolution(videoEncoder.getHeight(), videoEncoder.getWidth());
+      } else {
+        rtmpClients[index].setVideoResolution(videoEncoder.getWidth(), videoEncoder.getHeight());
+      }
+      rtmpClients[index].setFps(videoEncoder.getFps());
+      rtmpClients[index].connect(url);
+    } else {
+      rtspClients[index].connect(url);
+    }
+  }
+
+  @Override
+  protected void startStreamRtp(String url) {
+  }
+
+  public void stopStream(RtpType rtpType, int index) {
+    boolean shouldStopEncoder = true;
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].disconnect();
+    } else {
+      rtspClients[index].disconnect();
+    }
+    for (RtmpClient rtmpClient: rtmpClients) {
+      if (rtmpClient.isStreaming()) {
+        shouldStopEncoder = false;
+        break;
+      }
+    }
+    if (shouldStopEncoder) {
+      for (RtspClient rtspClient : rtspClients) {
+        if (rtspClient.isStreaming()) {
+          shouldStopEncoder = false;
+          break;
+        }
+      }
+    }
+    if (shouldStopEncoder) super.stopStream();
+  }
+
+  @Override
+  protected void stopStreamRtp() {
+  }
+
+  @Override
+  public void setReTries(int reTries) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setReTries(reTries);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setReTries(reTries);
+    }
+  }
+
+  public boolean reTry(RtpType rtpType, int index, long delay, String reason, @Nullable String backupUrl) {
+    boolean result;
+    if (rtpType == RtpType.RTMP) {
+      result = rtmpClients[index].shouldRetry(reason);
+      if (result) {
+        requestKeyFrame();
+        rtmpClients[index].reConnect(delay, backupUrl);
+      }
+    } else {
+      result = rtspClients[index].shouldRetry(reason);
+      if (result) {
+        requestKeyFrame();
+        rtmpClients[index].reConnect(delay, backupUrl);
+      }
+    }
+    return result;
+  }
+
+  @Override
+  protected boolean shouldRetry(String reason) {
+    return false;
+  }
+
+  @Override
+  protected void reConnect(long delay, @Nullable String backupUrl) {
+
+  }
+
+  public boolean hasCongestion(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].hasCongestion();
+    } else {
+      return rtspClients[index].hasCongestion();
+    }
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return false;
+  }
+
+  @Override
+  protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.sendAudio(aacBuffer.duplicate(), info);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.sendAudio(aacBuffer.duplicate(), info);
+    }
+  }
+
+  @Override
+  protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setVideoInfo(sps.duplicate(), pps.duplicate(), vps != null ? vps.duplicate() : null);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setVideoInfo(sps.duplicate(), pps.duplicate(), vps != null ? vps.duplicate() : null);
+    }
+  }
+
+  @Override
+  protected void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.sendVideo(h264Buffer.duplicate(), info);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.sendVideo(h264Buffer.duplicate(), info);
+    }
+  }
+
+  @Override
+  public void setLogs(boolean enable) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setLogs(enable);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setLogs(enable);
+    }
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setCheckServerAlive(enable);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setCheckServerAlive(enable);
+    }
+  }
+}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpCamera2.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpCamera2.java
new file mode 100644
index 0000000..eed491e
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpCamera2.java
@@ -0,0 +1,496 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.multiple;
+
+import android.content.Context;
+import android.media.MediaCodec;
+import android.os.Build;
+import android.view.SurfaceView;
+import android.view.TextureView;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import com.pedro.rtmp.flv.video.ProfileIop;
+import com.pedro.rtmp.rtmp.RtmpClient;
+import com.pedro.rtmp.utils.ConnectCheckerRtmp;
+import com.pedro.rtplibrary.base.Camera2Base;
+import com.pedro.rtplibrary.view.LightOpenGlView;
+import com.pedro.rtplibrary.view.OpenGlView;
+import com.pedro.rtsp.rtsp.RtspClient;
+import com.pedro.rtsp.utils.ConnectCheckerRtsp;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Created by pedro on 21/5/21.
+ *
+ * Experiment class.
+ *
+ * Support multiple streams in rtmp and rtsp at same time.
+ * You must set the same number of ConnectChecker that you want use.
+ *
+ * For example. 2 RTMP and 1 RTSP:
+ * stream1, stream2, stream3 (stream1 and stream2 are ConnectCheckerRtmp. stream3 is ConnectCheckerRtsp)
+ *
+ * MultiRtpCamera2 multiRtpCamera2 = new MultiRtpCamera2(surfaceView, new ConnectCheckerRtmp[]{ stream1, stream2 },
+ * new ConnectCheckerRtsp[]{ stream3 });
+ *
+ * You can set an empty array or null if you don't want use a protocol
+ * new MultiRtpCamera2(surfaceView, new ConnectCheckerRtmp[]{ stream1, stream2 },
+ *  null); //RTSP protocol is not used
+ *
+ * In order to use start, stop and other calls you must send type of stream and index to execute it.
+ * Example (using previous example interfaces):
+ *
+ * multiRtpCamera2.startStream(RtpType.RTMP, 1, myendpoint); //stream2 is started
+ * multiRtpCamera2.stopStream(RtpType.RTSP, 0); //stream3 is stopped
+ * multiRtpCamera2.retry(RtpType.RTMP, 0, delay, reason, backupUrl) //retry stream1
+ *
+ * NOTE:
+ * If you call this methods nothing is executed:
+ *
+ * multiRtpCamera2.startStream(endpoint);
+ * multiRtpCamera2.stopStream();
+ * multiRtpCamera2.retry(delay, reason, backUpUrl);
+ *
+ * The rest of methods without RtpType and index means that you will execute that command in all streams.
+ * Read class code if you need info about any method.
+ */
+@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+public class MultiRtpCamera2 extends Camera2Base {
+
+  private final RtmpClient[] rtmpClients;
+  private final RtspClient[] rtspClients;
+
+  @Deprecated
+  public MultiRtpCamera2(SurfaceView surfaceView, ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super(surfaceView);
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+    }
+  }
+
+  @Deprecated
+  public MultiRtpCamera2(TextureView textureView, ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super(textureView);
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+    }
+  }
+
+  public MultiRtpCamera2(OpenGlView openGlView, ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super(openGlView);
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+    }
+  }
+
+  public MultiRtpCamera2(LightOpenGlView lightOpenGlView, ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super(lightOpenGlView);
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+    }
+  }
+
+  public MultiRtpCamera2(Context context, boolean useOpengl, ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super(context, useOpengl);
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+    }
+  }
+
+  public boolean isStreaming(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].isStreaming();
+    } else {
+      return rtspClients[index].isStreaming();
+    }
+  }
+
+  /**
+   * H264 profile.
+   *
+   * @param profileIop Could be ProfileIop.BASELINE or ProfileIop.CONSTRAINED
+   */
+  public void setProfileIop(ProfileIop profileIop, int index) {
+    rtmpClients[index].setProfileIop(profileIop);
+  }
+
+  public void resizeCache(RtpType rtpType, int index, int newSize) {
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].resizeCache(newSize);
+    } else {
+      rtspClients[index].resizeCache(newSize);
+    }
+  }
+
+  @Override
+  public void resizeCache(int newSize) throws RuntimeException {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resizeCache(newSize);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resizeCache(newSize);
+    }
+  }
+
+  public int getCacheSize(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].getCacheSize();
+    } else {
+      return rtspClients[index].getCacheSize();
+    }
+  }
+
+  @Override
+  public int getCacheSize() {
+    return 0;
+  }
+
+  @Override
+  public long getSentAudioFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getSentAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getSentAudioFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getSentVideoFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getSentVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getSentVideoFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getDroppedAudioFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getDroppedAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getDroppedAudioFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getDroppedVideoFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getDroppedVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getDroppedVideoFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public void resetSentAudioFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetSentAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetSentAudioFrames();
+    }
+  }
+
+  @Override
+  public void resetSentVideoFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetSentVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetSentVideoFrames();
+    }
+  }
+
+  @Override
+  public void resetDroppedAudioFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetDroppedAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetDroppedAudioFrames();
+    }
+  }
+
+  @Override
+  public void resetDroppedVideoFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetDroppedVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetDroppedVideoFrames();
+    }
+  }
+
+  public void setAuthorization(RtpType rtpType, int index, String user, String password) {
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].setAuthorization(user, password);
+    } else {
+      rtspClients[index].setAuthorization(user, password);
+    }
+  }
+
+  @Override
+  public void setAuthorization(String user, String password) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setAuthorization(user, password);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setAuthorization(user, password);
+    }
+  }
+
+  /**
+   * Some Livestream hosts use Akamai auth that requires RTMP packets to be sent with increasing
+   * timestamp order regardless of packet type.
+   * Necessary with Servers like Dacast.
+   * More info here:
+   * https://learn.akamai.com/en-us/webhelp/media-services-live/media-services-live-encoder-compatibility-testing-and-qualification-guide-v4.0/GUID-F941C88B-9128-4BF4-A81B-C2E5CFD35BBF.html
+   */
+  public void forceAkamaiTs(boolean enabled) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.forceAkamaiTs(enabled);
+    }
+  }
+
+  @Override
+  protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setAudioInfo(sampleRate, isStereo);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setAudioInfo(sampleRate, isStereo);
+    }
+  }
+
+  public void startStream(RtpType rtpType, int index, String url) {
+    boolean shouldStarEncoder = true;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      if (rtmpClient.isStreaming()) {
+        shouldStarEncoder = false;
+        break;
+      }
+    }
+    if (shouldStarEncoder) {
+      for (RtspClient rtspClient : rtspClients) {
+        if (rtspClient.isStreaming()) {
+          shouldStarEncoder = false;
+          break;
+        }
+      }
+    }
+    if (shouldStarEncoder) super.startStream("");
+    if (rtpType == RtpType.RTMP) {
+      if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
+        rtmpClients[index].setVideoResolution(videoEncoder.getHeight(), videoEncoder.getWidth());
+      } else {
+        rtmpClients[index].setVideoResolution(videoEncoder.getWidth(), videoEncoder.getHeight());
+      }
+      rtmpClients[index].setFps(videoEncoder.getFps());
+      rtmpClients[index].connect(url);
+    } else {
+      rtspClients[index].connect(url);
+    }
+  }
+
+  @Override
+  protected void startStreamRtp(String url) {
+  }
+
+  public void stopStream(RtpType rtpType, int index) {
+    boolean shouldStopEncoder = true;
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].disconnect();
+    } else {
+      rtspClients[index].disconnect();
+    }
+    for (RtmpClient rtmpClient: rtmpClients) {
+      if (rtmpClient.isStreaming()) {
+        shouldStopEncoder = false;
+        break;
+      }
+    }
+    if (shouldStopEncoder) {
+      for (RtspClient rtspClient : rtspClients) {
+        if (rtspClient.isStreaming()) {
+          shouldStopEncoder = false;
+          break;
+        }
+      }
+    }
+    if (shouldStopEncoder) super.stopStream();
+  }
+
+  @Override
+  protected void stopStreamRtp() {
+  }
+
+  @Override
+  public void setReTries(int reTries) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setReTries(reTries);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setReTries(reTries);
+    }
+  }
+
+  public boolean reTry(RtpType rtpType, int index, long delay, String reason, @Nullable String backupUrl) {
+    boolean result;
+    if (rtpType == RtpType.RTMP) {
+      result = rtmpClients[index].shouldRetry(reason);
+      if (result) {
+        requestKeyFrame();
+        rtmpClients[index].reConnect(delay, backupUrl);
+      }
+    } else {
+      result = rtspClients[index].shouldRetry(reason);
+      if (result) {
+        requestKeyFrame();
+        rtmpClients[index].reConnect(delay, backupUrl);
+      }
+    }
+    return result;
+  }
+
+  @Override
+  protected boolean shouldRetry(String reason) {
+    return false;
+  }
+
+  @Override
+  protected void reConnect(long delay, @Nullable String backupUrl) {
+
+  }
+
+  public boolean hasCongestion(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].hasCongestion();
+    } else {
+      return rtspClients[index].hasCongestion();
+    }
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return false;
+  }
+
+  @Override
+  protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.sendAudio(aacBuffer.duplicate(), info);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.sendAudio(aacBuffer.duplicate(), info);
+    }
+  }
+
+  @Override
+  protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setVideoInfo(sps.duplicate(), pps.duplicate(), vps != null ? vps.duplicate() : null);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setVideoInfo(sps.duplicate(), pps.duplicate(), vps != null ? vps.duplicate() : null);
+    }
+  }
+
+  @Override
+  protected void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.sendVideo(h264Buffer.duplicate(), info);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.sendVideo(h264Buffer.duplicate(), info);
+    }
+  }
+
+  @Override
+  public void setLogs(boolean enable) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setLogs(enable);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setLogs(enable);
+    }
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setCheckServerAlive(enable);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setCheckServerAlive(enable);
+    }
+  }
+}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpDisplay.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpDisplay.java
new file mode 100644
index 0000000..f754606
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpDisplay.java
@@ -0,0 +1,425 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.multiple;
+
+import android.content.Context;
+import android.media.MediaCodec;
+import android.os.Build;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import com.pedro.rtmp.flv.video.ProfileIop;
+import com.pedro.rtmp.rtmp.RtmpClient;
+import com.pedro.rtmp.utils.ConnectCheckerRtmp;
+import com.pedro.rtplibrary.base.DisplayBase;
+import com.pedro.rtsp.rtsp.RtspClient;
+import com.pedro.rtsp.utils.ConnectCheckerRtsp;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Created by pedro, HirogaKatageri on 2021-05-24.
+ *
+ * Experimental Class.
+ *
+ * It supports multiple streams of rtmp and rtsp at same time.
+ * You must set the same number of ConnectChecker that you want use.
+ *
+ * For example. 2 RTMP and 1 RTSP:
+ * stream1, stream2, stream3 (stream1 and stream2 are ConnectCheckerRtmp. stream3 is ConnectCheckerRtsp)
+ *
+ * MultiRtpDisplay multiRtpDisplay = new MultiRtpDisplay(context, true, new ConnectCheckerRtmp[]{ stream1, stream2 },
+ * new ConnectCheckerRtsp[]{ stream3 });
+ *
+ * You can set an empty array or null if you don't want to use a specific protocol.
+ * new MultiRtpDisplay(context, true, new ConnectCheckerRtmp[]{ stream1, stream2 },
+ * null); // RTSP protocol is not used
+ *
+ * In order to use start, stop and other calls you must send type of stream and index to execute it.
+ * Example (using previous example interfaces):
+ *
+ * multiRtpDisplay.startStream(RtpType.RTMP, 1, url); //stream2 is started
+ * multiRtpDisplay.stopStream(RtpType.RTSP, 0); //stream3 is stopped
+ * multiRtpDisplay.retry(RtpType.RTMP, 0, delay, reason, backupUrl) //retry stream1
+ *
+ * NOTE:
+ * If you call these methods nothing is executed:
+ *
+ * multiRtpDisplay.startStream(endpoint);
+ * multiRtpDisplay.stopStream();
+ * multiRtpDisplay.retry(delay, reason, backUpUrl);
+ *
+ * The rest of methods without RtpType and index means that you will execute that command in all streams.
+ * Read class code if you need info about any method.
+ */
+@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+public class MultiRtpDisplay extends DisplayBase {
+
+  private final RtmpClient[] rtmpClients;
+  private final RtspClient[] rtspClients;
+
+  public MultiRtpDisplay(Context context, boolean useOpenGL, ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super(context, useOpenGL);
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+    }
+  }
+
+  public boolean isStreaming(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].isStreaming();
+    } else {
+      return rtspClients[index].isStreaming();
+    }
+  }
+
+  /**
+   * H264 profile.
+   *
+   * @param profileIop Could be ProfileIop.BASELINE or ProfileIop.CONSTRAINED
+   */
+  public void setProfileIop(ProfileIop profileIop, int index) {
+    rtmpClients[index].setProfileIop(profileIop);
+  }
+
+  /**
+   * Some Livestream hosts use Akamai auth that requires RTMP packets to be sent with increasing
+   * timestamp order regardless of packet type.
+   * Necessary with Servers like Dacast.
+   * More info here:
+   * https://learn.akamai.com/en-us/webhelp/media-services-live/media-services-live-encoder-compatibility-testing-and-qualification-guide-v4.0/GUID-F941C88B-9128-4BF4-A81B-C2E5CFD35BBF.html
+   */
+  public void forceAkamaiTs(boolean enabled) {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.forceAkamaiTs(enabled);
+    }
+  }
+
+  public void setAuthorization(RtpType rtpType, int index, String user, String password) {
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].setAuthorization(user, password);
+    } else {
+      rtspClients[index].setAuthorization(user, password);
+    }
+  }
+
+  @Override
+  public void setAuthorization(String user, String password) {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.setAuthorization(user, password);
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      rtspClient.setAuthorization(user, password);
+    }
+  }
+
+  @Override
+  protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.setAudioInfo(sampleRate, isStereo);
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      rtspClient.setAudioInfo(sampleRate, isStereo);
+    }
+  }
+
+  public void startStream(RtpType rtpType, int index, String url) {
+    boolean shouldStarEncoder = true;
+    for (RtmpClient rtmpClient : rtmpClients) {
+      if (rtmpClient.isStreaming()) {
+        shouldStarEncoder = false;
+        break;
+      }
+    }
+    if (shouldStarEncoder) {
+      for (RtspClient rtspClient : rtspClients) {
+        if (rtspClient.isStreaming()) {
+          shouldStarEncoder = false;
+          break;
+        }
+      }
+    }
+    if (shouldStarEncoder) super.startStream("");
+    if (rtpType == RtpType.RTMP) {
+      if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
+        rtmpClients[index].setVideoResolution(videoEncoder.getHeight(), videoEncoder.getWidth());
+      } else {
+        rtmpClients[index].setVideoResolution(videoEncoder.getWidth(), videoEncoder.getHeight());
+      }
+      rtmpClients[index].setFps(videoEncoder.getFps());
+      rtmpClients[index].connect(url);
+    } else {
+      rtspClients[index].connect(url);
+    }
+  }
+
+  public void stopStream(RtpType rtpType, int index) {
+    boolean shouldStopEncoder = true;
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].disconnect();
+    } else {
+      rtspClients[index].disconnect();
+    }
+    for (RtmpClient rtmpClient : rtmpClients) {
+      if (rtmpClient.isStreaming()) {
+        shouldStopEncoder = false;
+        break;
+      }
+    }
+    if (shouldStopEncoder) {
+      for (RtspClient rtspClient : rtspClients) {
+        if (rtspClient.isStreaming()) {
+          shouldStopEncoder = false;
+          break;
+        }
+      }
+    }
+    if (shouldStopEncoder) super.stopStream();
+  }
+
+  @Override
+  protected void startStreamRtp(String url) {
+  }
+
+  @Override
+  protected void stopStreamRtp() {
+  }
+
+  public boolean reTry(RtpType rtpType, int index, long delay, String reason, @Nullable String backupUrl) {
+    boolean result;
+    if (rtpType == RtpType.RTMP) {
+      result = rtmpClients[index].shouldRetry(reason);
+      if (result) {
+        requestKeyFrame();
+        rtmpClients[index].reConnect(delay, backupUrl);
+      }
+    } else {
+      result = rtspClients[index].shouldRetry(reason);
+      if (result) {
+        requestKeyFrame();
+        rtmpClients[index].reConnect(delay, backupUrl);
+      }
+    }
+    return result;
+  }
+
+  @Override
+  protected boolean shouldRetry(String reason) {
+    return false;
+  }
+
+  @Override
+  public void setReTries(int reTries) {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.setReTries(reTries);
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      rtspClient.setReTries(reTries);
+    }
+  }
+
+  @Override
+  protected void reConnect(long delay, @Nullable String backupUrl) {
+
+  }
+
+  public boolean hasCongestion(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].hasCongestion();
+    } else {
+      return rtspClients[index].hasCongestion();
+    }
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return false;
+  }
+
+  public void resizeCache(RtpType rtpType, int index, int newSize) {
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].resizeCache(newSize);
+    } else {
+      rtspClients[index].resizeCache(newSize);
+    }
+  }
+
+  @Override
+  public void resizeCache(int newSize) throws RuntimeException {
+
+  }
+
+  public int getCacheSize(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].getCacheSize();
+    } else {
+      return rtspClients[index].getCacheSize();
+    }
+  }
+
+  @Override
+  public int getCacheSize() {
+    return 0;
+  }
+
+  @Override
+  public long getSentAudioFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient : rtmpClients) {
+      number += rtmpClient.getSentAudioFrames();
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      number += rtspClient.getSentAudioFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getSentVideoFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient : rtmpClients) {
+      number += rtmpClient.getSentVideoFrames();
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      number += rtspClient.getSentVideoFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getDroppedAudioFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient : rtmpClients) {
+      number += rtmpClient.getDroppedAudioFrames();
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      number += rtspClient.getDroppedAudioFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getDroppedVideoFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient : rtmpClients) {
+      number += rtmpClient.getDroppedVideoFrames();
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      number += rtspClient.getDroppedVideoFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public void resetSentAudioFrames() {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.resetSentAudioFrames();
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      rtspClient.resetSentAudioFrames();
+    }
+  }
+
+  @Override
+  public void resetSentVideoFrames() {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.resetSentVideoFrames();
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      rtspClient.resetSentVideoFrames();
+    }
+  }
+
+  @Override
+  public void resetDroppedAudioFrames() {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.resetDroppedAudioFrames();
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      rtspClient.resetDroppedAudioFrames();
+    }
+  }
+
+  @Override
+  public void resetDroppedVideoFrames() {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.resetDroppedVideoFrames();
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      rtspClient.resetDroppedVideoFrames();
+    }
+  }
+
+  @Override
+  protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.sendAudio(aacBuffer.duplicate(), info);
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      rtspClient.sendAudio(aacBuffer.duplicate(), info);
+    }
+  }
+
+  @Override
+  protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.setVideoInfo(sps.duplicate(), pps.duplicate(), vps != null ? vps.duplicate() : null);
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      rtspClient.setVideoInfo(sps.duplicate(), pps.duplicate(), vps != null ? vps.duplicate() : null);
+    }
+  }
+
+  @Override
+  protected void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.sendVideo(h264Buffer.duplicate(), info);
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      rtspClient.sendVideo(h264Buffer.duplicate(), info);
+    }
+  }
+
+  @Override
+  public void setLogs(boolean enable) {
+    for (RtmpClient rtmpClient : rtmpClients) {
+      rtmpClient.setLogs(enable);
+    }
+    for (RtspClient rtspClient : rtspClients) {
+      rtspClient.setLogs(enable);
+    }
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setCheckServerAlive(enable);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setCheckServerAlive(enable);
+    }
+  }
+}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpOnlyAudio.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpOnlyAudio.java
new file mode 100644
index 0000000..5d0e047
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/MultiRtpOnlyAudio.java
@@ -0,0 +1,398 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.multiple;
+
+import android.media.MediaCodec;
+
+import androidx.annotation.Nullable;
+
+import com.pedro.rtmp.flv.video.ProfileIop;
+import com.pedro.rtmp.rtmp.RtmpClient;
+import com.pedro.rtmp.utils.ConnectCheckerRtmp;
+import com.pedro.rtplibrary.base.OnlyAudioBase;
+import com.pedro.rtsp.rtsp.RtspClient;
+import com.pedro.rtsp.utils.ConnectCheckerRtsp;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Created by pedro on 30/5/21.
+ *
+ * Support multiple streams in rtmp and rtsp at same time.
+ * You must set the same number of ConnectChecker that you want use.
+ *
+ * For example. 2 RTMP and 1 RTSP:
+ * stream1, stream2, stream3 (stream1 and stream2 are ConnectCheckerRtmp. stream3 is ConnectCheckerRtsp)
+ *
+ * MultiRtpOnlyAudio multiRtpOnlyAudio = new MultiRtpOnlyAudio(new ConnectCheckerRtmp[]{ stream1, stream2 },
+ * new ConnectCheckerRtsp[]{ stream3 });
+ *
+ * You can set an empty array or null if you don't want use a protocol
+ * new MultiRtpOnlyAudio(new ConnectCheckerRtmp[]{ stream1, stream2 },
+ *  null); //RTSP protocol is not used
+ *
+ * In order to use start, stop and other calls you must send type of stream and index to execute it.
+ * Example (using previous example interfaces):
+ *
+ * multiRtpOnlyAudio.startStream(RtpType.RTMP, 1, myendpoint); //stream2 is started
+ * multiRtpOnlyAudio.stopStream(RtpType.RTSP, 0); //stream3 is stopped
+ * multiRtpOnlyAudio.retry(RtpType.RTMP, 0, delay, reason, backupUrl) //retry stream1
+ *
+ * NOTE:
+ * If you call this methods nothing is executed:
+ *
+ * multiRtpOnlyAudio.startStream(endpoint);
+ * multiRtpOnlyAudio.stopStream();
+ * multiRtpOnlyAudio.retry(delay, reason, backUpUrl);
+ *
+ * The rest of methods without RtpType and index means that you will execute that command in all streams.
+ * Read class code if you need info about any method.
+ */
+public class MultiRtpOnlyAudio extends OnlyAudioBase {
+
+  private final RtmpClient[] rtmpClients;
+  private final RtspClient[] rtspClients;
+
+  public MultiRtpOnlyAudio(ConnectCheckerRtmp[] connectCheckerRtmpList,
+      ConnectCheckerRtsp[] connectCheckerRtspList) {
+    super();
+    int rtmpSize = connectCheckerRtmpList != null ? connectCheckerRtmpList.length : 0;
+    rtmpClients = new RtmpClient[rtmpSize];
+    for (int i = 0; i < rtmpClients.length; i++) {
+      rtmpClients[i] = new RtmpClient(connectCheckerRtmpList[i]);
+      rtmpClients[i].setOnlyAudio(true);
+    }
+    int rtspSize = connectCheckerRtspList != null ? connectCheckerRtspList.length : 0;
+    rtspClients = new RtspClient[rtspSize];
+    for (int i = 0; i < rtspClients.length; i++) {
+      rtspClients[i] = new RtspClient(connectCheckerRtspList[i]);
+      rtspClients[i].setOnlyAudio(true);
+    }
+  }
+
+  public boolean isStreaming(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].isStreaming();
+    } else {
+      return rtspClients[index].isStreaming();
+    }
+  }
+
+  /**
+   * H264 profile.
+   *
+   * @param profileIop Could be ProfileIop.BASELINE or ProfileIop.CONSTRAINED
+   */
+  public void setProfileIop(ProfileIop profileIop, int index) {
+    rtmpClients[index].setProfileIop(profileIop);
+  }
+
+  public void resizeCache(RtpType rtpType, int index, int newSize) {
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].resizeCache(newSize);
+    } else {
+      rtspClients[index].resizeCache(newSize);
+    }
+  }
+
+  @Override
+  public void resizeCache(int newSize) throws RuntimeException {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resizeCache(newSize);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resizeCache(newSize);
+    }
+  }
+
+  public int getCacheSize(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].getCacheSize();
+    } else {
+      return rtspClients[index].getCacheSize();
+    }
+  }
+
+  @Override
+  public int getCacheSize() {
+    return 0;
+  }
+
+  @Override
+  public long getSentAudioFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getSentAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getSentAudioFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getSentVideoFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getSentVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getSentVideoFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getDroppedAudioFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getDroppedAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getDroppedAudioFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public long getDroppedVideoFrames() {
+    long number = 0;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      number += rtmpClient.getDroppedVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      number += rtspClient.getDroppedVideoFrames();
+    }
+    return number;
+  }
+
+  @Override
+  public void resetSentAudioFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetSentAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetSentAudioFrames();
+    }
+  }
+
+  @Override
+  public void resetSentVideoFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetSentVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetSentVideoFrames();
+    }
+  }
+
+  @Override
+  public void resetDroppedAudioFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetDroppedAudioFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetDroppedAudioFrames();
+    }
+  }
+
+  @Override
+  public void resetDroppedVideoFrames() {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.resetDroppedVideoFrames();
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.resetDroppedVideoFrames();
+    }
+  }
+
+  public void setAuthorization(RtpType rtpType, int index, String user, String password) {
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].setAuthorization(user, password);
+    } else {
+      rtspClients[index].setAuthorization(user, password);
+    }
+  }
+
+  @Override
+  public void setAuthorization(String user, String password) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setAuthorization(user, password);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setAuthorization(user, password);
+    }
+  }
+
+  /**
+   * Some Livestream hosts use Akamai auth that requires RTMP packets to be sent with increasing
+   * timestamp order regardless of packet type.
+   * Necessary with Servers like Dacast.
+   * More info here:
+   * https://learn.akamai.com/en-us/webhelp/media-services-live/media-services-live-encoder-compatibility-testing-and-qualification-guide-v4.0/GUID-F941C88B-9128-4BF4-A81B-C2E5CFD35BBF.html
+   */
+  public void forceAkamaiTs(boolean enabled) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.forceAkamaiTs(enabled);
+    }
+  }
+
+  @Override
+  protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setAudioInfo(sampleRate, isStereo);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setAudioInfo(sampleRate, isStereo);
+    }
+  }
+
+  public void startStream(RtpType rtpType, int index, String url) {
+    boolean shouldStarEncoder = true;
+    for (RtmpClient rtmpClient: rtmpClients) {
+      if (rtmpClient.isStreaming()) {
+        shouldStarEncoder = false;
+        break;
+      }
+    }
+    if (shouldStarEncoder) {
+      for (RtspClient rtspClient : rtspClients) {
+        if (rtspClient.isStreaming()) {
+          shouldStarEncoder = false;
+          break;
+        }
+      }
+    }
+    if (shouldStarEncoder) super.startStream("");
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].connect(url);
+    } else {
+      rtspClients[index].connect(url);
+    }
+  }
+
+  @Override
+  protected void startStreamRtp(String url) {
+  }
+
+  public void stopStream(RtpType rtpType, int index) {
+    boolean shouldStopEncoder = true;
+    if (rtpType == RtpType.RTMP) {
+      rtmpClients[index].disconnect();
+    } else {
+      rtspClients[index].disconnect();
+    }
+    for (RtmpClient rtmpClient: rtmpClients) {
+      if (rtmpClient.isStreaming()) {
+        shouldStopEncoder = false;
+        break;
+      }
+    }
+    if (shouldStopEncoder) {
+      for (RtspClient rtspClient : rtspClients) {
+        if (rtspClient.isStreaming()) {
+          shouldStopEncoder = false;
+          break;
+        }
+      }
+    }
+    if (shouldStopEncoder) super.stopStream();
+  }
+
+  @Override
+  protected void stopStreamRtp() {
+  }
+
+  @Override
+  public void setReTries(int reTries) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setReTries(reTries);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setReTries(reTries);
+    }
+  }
+
+  public boolean reTry(RtpType rtpType, int index, long delay, String reason, @Nullable String backupUrl) {
+    boolean result;
+    if (rtpType == RtpType.RTMP) {
+      result = rtmpClients[index].shouldRetry(reason);
+      if (result) {
+        rtmpClients[index].reConnect(delay, backupUrl);
+      }
+    } else {
+      result = rtspClients[index].shouldRetry(reason);
+      if (result) {
+        rtmpClients[index].reConnect(delay, backupUrl);
+      }
+    }
+    return result;
+  }
+
+  @Override
+  protected boolean shouldRetry(String reason) {
+    return false;
+  }
+
+  @Override
+  protected void reConnect(long delay, @Nullable String backupUrl) {
+
+  }
+
+  public boolean hasCongestion(RtpType rtpType, int index) {
+    if (rtpType == RtpType.RTMP) {
+      return rtmpClients[index].hasCongestion();
+    } else {
+      return rtspClients[index].hasCongestion();
+    }
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return false;
+  }
+
+  @Override
+  protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.sendAudio(aacBuffer.duplicate(), info);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.sendAudio(aacBuffer.duplicate(), info);
+    }
+  }
+
+  @Override
+  public void setLogs(boolean enable) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setLogs(enable);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setLogs(enable);
+    }
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    for (RtmpClient rtmpClient: rtmpClients) {
+      rtmpClient.setCheckServerAlive(enable);
+    }
+    for (RtspClient rtspClient: rtspClients) {
+      rtspClient.setCheckServerAlive(enable);
+    }
+  }
+}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/RtpType.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/RtpType.java
new file mode 100644
index 0000000..49c7cf6
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/multiple/RtpType.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.multiple;
+
+/**
+ * Created by pedro on 21/5/21.
+ */
+public enum RtpType {
+  RTMP, RTSP
+}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/network/AdapterBitrateParser.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/network/AdapterBitrateParser.java
index 3cc829d..09f706a 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/network/AdapterBitrateParser.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/network/AdapterBitrateParser.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.network;
 
 @Deprecated
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpCamera1.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpCamera1.java
index 9bde06a..3d9e30b 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpCamera1.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpCamera1.java
@@ -1,17 +1,37 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.rtmp;
 
 import android.content.Context;
 import android.media.MediaCodec;
 import android.os.Build;
+
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import android.view.SurfaceView;
 import android.view.TextureView;
+
+import com.pedro.rtmp.flv.video.ProfileIop;
+import com.pedro.rtmp.rtmp.RtmpClient;
+import com.pedro.rtmp.utils.ConnectCheckerRtmp;
 import com.pedro.rtplibrary.base.Camera1Base;
 import com.pedro.rtplibrary.view.LightOpenGlView;
 import com.pedro.rtplibrary.view.OpenGlView;
 import java.nio.ByteBuffer;
-import net.ossrs.rtmp.ConnectCheckerRtmp;
-import net.ossrs.rtmp.SrsFlvMuxer;
 
 /**
  * More documentation see:
@@ -22,34 +42,34 @@ import net.ossrs.rtmp.SrsFlvMuxer;
 
 public class RtmpCamera1 extends Camera1Base {
 
-  private SrsFlvMuxer srsFlvMuxer;
+  private final RtmpClient rtmpClient;
 
   public RtmpCamera1(SurfaceView surfaceView, ConnectCheckerRtmp connectChecker) {
     super(surfaceView);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   public RtmpCamera1(TextureView textureView, ConnectCheckerRtmp connectChecker) {
     super(textureView);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
   public RtmpCamera1(OpenGlView openGlView, ConnectCheckerRtmp connectChecker) {
     super(openGlView);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
   public RtmpCamera1(LightOpenGlView lightOpenGlView, ConnectCheckerRtmp connectChecker) {
     super(lightOpenGlView);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
   public RtmpCamera1(Context context, ConnectCheckerRtmp connectChecker) {
     super(context);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   /**
@@ -57,113 +77,156 @@ public class RtmpCamera1 extends Camera1Base {
    *
    * @param profileIop Could be ProfileIop.BASELINE or ProfileIop.CONSTRAINED
    */
-  public void setProfileIop(byte profileIop) {
-    srsFlvMuxer.setProfileIop(profileIop);
+  public void setProfileIop(ProfileIop profileIop) {
+    rtmpClient.setProfileIop(profileIop);
   }
 
   @Override
   public void resizeCache(int newSize) throws RuntimeException {
-    srsFlvMuxer.resizeFlvTagCache(newSize);
+    rtmpClient.resizeCache(newSize);
   }
 
   @Override
   public int getCacheSize() {
-    return srsFlvMuxer.getFlvTagCacheSize();
+    return rtmpClient.getCacheSize();
   }
 
   @Override
   public long getSentAudioFrames() {
-    return srsFlvMuxer.getSentAudioFrames();
+    return rtmpClient.getSentAudioFrames();
   }
 
   @Override
   public long getSentVideoFrames() {
-    return srsFlvMuxer.getSentVideoFrames();
+    return rtmpClient.getSentVideoFrames();
   }
 
   @Override
   public long getDroppedAudioFrames() {
-    return srsFlvMuxer.getDroppedAudioFrames();
+    return rtmpClient.getDroppedAudioFrames();
   }
 
   @Override
   public long getDroppedVideoFrames() {
-    return srsFlvMuxer.getDroppedVideoFrames();
+    return rtmpClient.getDroppedVideoFrames();
   }
 
   @Override
   public void resetSentAudioFrames() {
-    srsFlvMuxer.resetSentAudioFrames();
+    rtmpClient.resetSentAudioFrames();
   }
 
   @Override
   public void resetSentVideoFrames() {
-    srsFlvMuxer.resetSentVideoFrames();
+    rtmpClient.resetSentVideoFrames();
   }
 
   @Override
   public void resetDroppedAudioFrames() {
-    srsFlvMuxer.resetDroppedAudioFrames();
+    rtmpClient.resetDroppedAudioFrames();
   }
 
   @Override
   public void resetDroppedVideoFrames() {
-    srsFlvMuxer.resetDroppedVideoFrames();
+    rtmpClient.resetDroppedVideoFrames();
   }
 
   @Override
   public void setAuthorization(String user, String password) {
-    srsFlvMuxer.setAuthorization(user, password);
+    rtmpClient.setAuthorization(user, password);
+  }
+
+  /**
+   * Some Livestream hosts use Akamai auth that requires RTMP packets to be sent with increasing
+   * timestamp order regardless of packet type.
+   * Necessary with Servers like Dacast.
+   * More info here:
+   * https://learn.akamai.com/en-us/webhelp/media-services-live/media-services-live-encoder-compatibility-testing-and-qualification-guide-v4.0/GUID-F941C88B-9128-4BF4-A81B-C2E5CFD35BBF.html
+   */
+  public void forceAkamaiTs(boolean enabled) {
+    rtmpClient.forceAkamaiTs(enabled);
+  }
+
+  /**
+   * Must be called before start stream.
+   *
+   * Default value 128
+   * Range value: 1 to 16777215.
+   *
+   * The most common values example: 128, 4096, 65535
+   *
+   * @param chunkSize packet's chunk size send to server
+   */
+  public void setWriteChunkSize(int chunkSize) {
+    if (!isStreaming()) {
+      rtmpClient.setWriteChunkSize(chunkSize);
+    }
   }
 
   @Override
   protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
-    srsFlvMuxer.setIsStereo(isStereo);
-    srsFlvMuxer.setSampleRate(sampleRate);
+    rtmpClient.setAudioInfo(sampleRate, isStereo);
   }
 
   @Override
   protected void startStreamRtp(String url) {
     if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
-      srsFlvMuxer.setVideoResolution(videoEncoder.getHeight(), videoEncoder.getWidth());
+      rtmpClient.setVideoResolution(videoEncoder.getHeight(), videoEncoder.getWidth());
     } else {
-      srsFlvMuxer.setVideoResolution(videoEncoder.getWidth(), videoEncoder.getHeight());
+      rtmpClient.setVideoResolution(videoEncoder.getWidth(), videoEncoder.getHeight());
     }
-    srsFlvMuxer.start(url);
+    rtmpClient.setFps(videoEncoder.getFps());
+    rtmpClient.setOnlyVideo(!audioInitialized);
+    rtmpClient.connect(url);
   }
 
   @Override
   protected void stopStreamRtp() {
-    srsFlvMuxer.stop();
+    rtmpClient.disconnect();
   }
 
   @Override
   public void setReTries(int reTries) {
-    srsFlvMuxer.setReTries(reTries);
+    rtmpClient.setReTries(reTries);
   }
 
   @Override
-  public boolean shouldRetry(String reason) {
-    return srsFlvMuxer.shouldRetry(reason);
+  protected boolean shouldRetry(String reason) {
+    return rtmpClient.shouldRetry(reason);
   }
 
   @Override
-  public void reConnect(long delay) {
-    srsFlvMuxer.reConnect(delay);
+  public void reConnect(long delay, @Nullable String backupUrl) {
+    rtmpClient.reConnect(delay, backupUrl);
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return rtmpClient.hasCongestion();
   }
 
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
-    srsFlvMuxer.sendAudio(aacBuffer, info);
+    rtmpClient.sendAudio(aacBuffer, info);
   }
 
   @Override
   protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    srsFlvMuxer.setSpsPPs(sps, pps);
+    rtmpClient.setVideoInfo(sps, pps, vps);
   }
 
   @Override
   protected void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
-    srsFlvMuxer.sendVideo(h264Buffer, info);
+    rtmpClient.sendVideo(h264Buffer, info);
+  }
+
+  @Override
+  public void setLogs(boolean enable) {
+    rtmpClient.setLogs(enable);
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    rtmpClient.setCheckServerAlive(enable);
   }
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpCamera2.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpCamera2.java
index 6418fbe..1b36604 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpCamera2.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpCamera2.java
@@ -1,18 +1,37 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.rtmp;
 
 import android.content.Context;
 import android.media.MediaCodec;
 import android.os.Build;
+
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import android.view.SurfaceView;
 import android.view.TextureView;
 
+import com.pedro.rtmp.flv.video.ProfileIop;
+import com.pedro.rtmp.rtmp.RtmpClient;
+import com.pedro.rtmp.utils.ConnectCheckerRtmp;
 import com.pedro.rtplibrary.base.Camera2Base;
 
 import com.pedro.rtplibrary.view.LightOpenGlView;
 import com.pedro.rtplibrary.view.OpenGlView;
-import net.ossrs.rtmp.ConnectCheckerRtmp;
-import net.ossrs.rtmp.SrsFlvMuxer;
 
 import java.nio.ByteBuffer;
 
@@ -25,31 +44,43 @@ import java.nio.ByteBuffer;
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 public class RtmpCamera2 extends Camera2Base {
 
-  private SrsFlvMuxer srsFlvMuxer;
+  private final RtmpClient rtmpClient;
 
+  /**
+   * @deprecated This view produce rotations problems and could be unsupported in future versions.
+   * Use {@link Camera2Base#Camera2Base(OpenGlView)} or {@link Camera2Base#Camera2Base(LightOpenGlView)}
+   * instead.
+   */
+  @Deprecated
   public RtmpCamera2(SurfaceView surfaceView, ConnectCheckerRtmp connectChecker) {
     super(surfaceView);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
+  /**
+   * @deprecated This view produce rotations problems and could be unsupported in future versions.
+   * Use {@link Camera2Base#Camera2Base(OpenGlView)} or {@link Camera2Base#Camera2Base(LightOpenGlView)}
+   * instead.
+   */
+  @Deprecated
   public RtmpCamera2(TextureView textureView, ConnectCheckerRtmp connectChecker) {
     super(textureView);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   public RtmpCamera2(OpenGlView openGlView, ConnectCheckerRtmp connectChecker) {
     super(openGlView);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   public RtmpCamera2(LightOpenGlView lightOpenGlView, ConnectCheckerRtmp connectChecker) {
     super(lightOpenGlView);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   public RtmpCamera2(Context context, boolean useOpengl, ConnectCheckerRtmp connectChecker) {
     super(context, useOpengl);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   /**
@@ -57,114 +88,157 @@ public class RtmpCamera2 extends Camera2Base {
    *
    * @param profileIop Could be ProfileIop.BASELINE or ProfileIop.CONSTRAINED
    */
-  public void setProfileIop(byte profileIop) {
-    srsFlvMuxer.setProfileIop(profileIop);
+  public void setProfileIop(ProfileIop profileIop) {
+    rtmpClient.setProfileIop(profileIop);
   }
 
   @Override
   public void resizeCache(int newSize) throws RuntimeException {
-    srsFlvMuxer.resizeFlvTagCache(newSize);
+    rtmpClient.resizeCache(newSize);
   }
 
   @Override
   public int getCacheSize() {
-    return srsFlvMuxer.getFlvTagCacheSize();
+    return rtmpClient.getCacheSize();
   }
 
   @Override
   public long getSentAudioFrames() {
-    return srsFlvMuxer.getSentAudioFrames();
+    return rtmpClient.getSentAudioFrames();
   }
 
   @Override
   public long getSentVideoFrames() {
-    return srsFlvMuxer.getSentVideoFrames();
+    return rtmpClient.getSentVideoFrames();
   }
 
   @Override
   public long getDroppedAudioFrames() {
-    return srsFlvMuxer.getDroppedAudioFrames();
+    return rtmpClient.getDroppedAudioFrames();
   }
 
   @Override
   public long getDroppedVideoFrames() {
-    return srsFlvMuxer.getDroppedVideoFrames();
+    return rtmpClient.getDroppedVideoFrames();
   }
 
   @Override
   public void resetSentAudioFrames() {
-    srsFlvMuxer.resetSentAudioFrames();
+    rtmpClient.resetSentAudioFrames();
   }
 
   @Override
   public void resetSentVideoFrames() {
-    srsFlvMuxer.resetSentVideoFrames();
+    rtmpClient.resetSentVideoFrames();
   }
 
   @Override
   public void resetDroppedAudioFrames() {
-    srsFlvMuxer.resetDroppedAudioFrames();
+    rtmpClient.resetDroppedAudioFrames();
   }
 
   @Override
   public void resetDroppedVideoFrames() {
-    srsFlvMuxer.resetDroppedVideoFrames();
+    rtmpClient.resetDroppedVideoFrames();
   }
 
   @Override
   public void setAuthorization(String user, String password) {
-    srsFlvMuxer.setAuthorization(user, password);
+    rtmpClient.setAuthorization(user, password);
+  }
+
+  /**
+   * Some Livestream hosts use Akamai auth that requires RTMP packets to be sent with increasing
+   * timestamp order regardless of packet type.
+   * Necessary with Servers like Dacast.
+   * More info here:
+   * https://learn.akamai.com/en-us/webhelp/media-services-live/media-services-live-encoder-compatibility-testing-and-qualification-guide-v4.0/GUID-F941C88B-9128-4BF4-A81B-C2E5CFD35BBF.html
+   */
+  public void forceAkamaiTs(boolean enabled) {
+    rtmpClient.forceAkamaiTs(enabled);
+  }
+
+  /**
+   * Must be called before start stream.
+   *
+   * Default value 128
+   * Range value: 1 to 16777215.
+   *
+   * The most common values example: 128, 4096, 65535
+   *
+   * @param chunkSize packet's chunk size send to server
+   */
+  public void setWriteChunkSize(int chunkSize) {
+    if (!isStreaming()) {
+      rtmpClient.setWriteChunkSize(chunkSize);
+    }
   }
 
   @Override
   protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
-    srsFlvMuxer.setIsStereo(isStereo);
-    srsFlvMuxer.setSampleRate(sampleRate);
+    rtmpClient.setAudioInfo(sampleRate, isStereo);
   }
 
   @Override
   protected void startStreamRtp(String url) {
     if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
-      srsFlvMuxer.setVideoResolution(videoEncoder.getHeight(), videoEncoder.getWidth());
+      rtmpClient.setVideoResolution(videoEncoder.getHeight(), videoEncoder.getWidth());
     } else {
-      srsFlvMuxer.setVideoResolution(videoEncoder.getWidth(), videoEncoder.getHeight());
+      rtmpClient.setVideoResolution(videoEncoder.getWidth(), videoEncoder.getHeight());
     }
-    srsFlvMuxer.start(url);
+    rtmpClient.setFps(videoEncoder.getFps());
+    rtmpClient.setOnlyVideo(!audioInitialized);
+    rtmpClient.connect(url);
   }
 
   @Override
   protected void stopStreamRtp() {
-    srsFlvMuxer.stop();
+    rtmpClient.disconnect();
   }
 
   @Override
   public void setReTries(int reTries) {
-    srsFlvMuxer.setReTries(reTries);
+    rtmpClient.setReTries(reTries);
   }
 
   @Override
-  public boolean shouldRetry(String reason) {
-    return srsFlvMuxer.shouldRetry(reason);
+  protected boolean shouldRetry(String reason) {
+    return rtmpClient.shouldRetry(reason);
   }
 
   @Override
-  public void reConnect(long delay) {
-    srsFlvMuxer.reConnect(delay);
+  public void reConnect(long delay, @Nullable String backupUrl) {
+    rtmpClient.reConnect(delay, backupUrl);
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return rtmpClient.hasCongestion();
   }
 
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
-    srsFlvMuxer.sendAudio(aacBuffer, info);
+    rtmpClient.sendAudio(aacBuffer, info);
   }
 
   @Override
   protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    srsFlvMuxer.setSpsPPs(sps, pps);
+    rtmpClient.setVideoInfo(sps, pps, vps);
   }
 
   @Override
   protected void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
-    srsFlvMuxer.sendVideo(h264Buffer, info);
+    rtmpClient.sendVideo(h264Buffer, info);
+  }
+
+  @Override
+  public void setLogs(boolean enable) {
+    rtmpClient.setLogs(enable);
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    rtmpClient.setCheckServerAlive(enable);
   }
 }
 
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpDisplay.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpDisplay.java
index cae00ad..5767a6d 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpDisplay.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpDisplay.java
@@ -1,15 +1,33 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.rtmp;
 
 import android.content.Context;
 import android.media.MediaCodec;
 import android.os.Build;
+
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
+import com.pedro.rtmp.flv.video.ProfileIop;
+import com.pedro.rtmp.rtmp.RtmpClient;
+import com.pedro.rtmp.utils.ConnectCheckerRtmp;
 import com.pedro.rtplibrary.base.DisplayBase;
 
-import net.ossrs.rtmp.ConnectCheckerRtmp;
-import net.ossrs.rtmp.SrsFlvMuxer;
-
 import java.nio.ByteBuffer;
 
 /**
@@ -21,11 +39,11 @@ import java.nio.ByteBuffer;
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 public class RtmpDisplay extends DisplayBase {
 
-  private SrsFlvMuxer srsFlvMuxer;
+  private final RtmpClient rtmpClient;
 
   public RtmpDisplay(Context context, boolean useOpengl, ConnectCheckerRtmp connectChecker) {
     super(context, useOpengl);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   /**
@@ -33,113 +51,155 @@ public class RtmpDisplay extends DisplayBase {
    *
    * @param profileIop Could be ProfileIop.BASELINE or ProfileIop.CONSTRAINED
    */
-  public void setProfileIop(byte profileIop) {
-    srsFlvMuxer.setProfileIop(profileIop);
+  public void setProfileIop(ProfileIop profileIop) {
+    rtmpClient.setProfileIop(profileIop);
   }
 
   @Override
   public void resizeCache(int newSize) throws RuntimeException {
-    srsFlvMuxer.resizeFlvTagCache(newSize);
+    rtmpClient.resizeCache(newSize);
   }
 
   @Override
   public int getCacheSize() {
-    return srsFlvMuxer.getFlvTagCacheSize();
+    return rtmpClient.getCacheSize();
   }
 
   @Override
   public long getSentAudioFrames() {
-    return srsFlvMuxer.getSentAudioFrames();
+    return rtmpClient.getSentAudioFrames();
   }
 
   @Override
   public long getSentVideoFrames() {
-    return srsFlvMuxer.getSentVideoFrames();
+    return rtmpClient.getSentVideoFrames();
   }
 
   @Override
   public long getDroppedAudioFrames() {
-    return srsFlvMuxer.getDroppedAudioFrames();
+    return rtmpClient.getDroppedAudioFrames();
   }
 
   @Override
   public long getDroppedVideoFrames() {
-    return srsFlvMuxer.getDroppedVideoFrames();
+    return rtmpClient.getDroppedVideoFrames();
   }
 
   @Override
   public void resetSentAudioFrames() {
-    srsFlvMuxer.resetSentAudioFrames();
+    rtmpClient.resetSentAudioFrames();
   }
 
   @Override
   public void resetSentVideoFrames() {
-    srsFlvMuxer.resetSentVideoFrames();
+    rtmpClient.resetSentVideoFrames();
   }
 
   @Override
   public void resetDroppedAudioFrames() {
-    srsFlvMuxer.resetDroppedAudioFrames();
+    rtmpClient.resetDroppedAudioFrames();
   }
 
   @Override
   public void resetDroppedVideoFrames() {
-    srsFlvMuxer.resetDroppedVideoFrames();
+    rtmpClient.resetDroppedVideoFrames();
   }
 
   @Override
   public void setAuthorization(String user, String password) {
-    srsFlvMuxer.setAuthorization(user, password);
+    rtmpClient.setAuthorization(user, password);
+  }
+
+  /**
+   * Some Livestream hosts use Akamai auth that requires RTMP packets to be sent with increasing
+   * timestamp order regardless of packet type.
+   * Necessary with Servers like Dacast.
+   * More info here:
+   * https://learn.akamai.com/en-us/webhelp/media-services-live/media-services-live-encoder-compatibility-testing-and-qualification-guide-v4.0/GUID-F941C88B-9128-4BF4-A81B-C2E5CFD35BBF.html
+   */
+  public void forceAkamaiTs(boolean enabled) {
+    rtmpClient.forceAkamaiTs(enabled);
+  }
+
+  /**
+   * Must be called before start stream.
+   *
+   * Default value 128
+   * Range value: 1 to 16777215.
+   *
+   * The most common values example: 128, 4096, 65535
+   *
+   * @param chunkSize packet's chunk size send to server
+   */
+  public void setWriteChunkSize(int chunkSize) {
+    if (!isStreaming()) {
+      rtmpClient.setWriteChunkSize(chunkSize);
+    }
   }
 
   @Override
   protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
-    srsFlvMuxer.setIsStereo(isStereo);
-    srsFlvMuxer.setSampleRate(sampleRate);
+    rtmpClient.setAudioInfo(sampleRate, isStereo);
   }
 
   @Override
   protected void startStreamRtp(String url) {
     if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
-      srsFlvMuxer.setVideoResolution(videoEncoder.getHeight(), videoEncoder.getWidth());
+      rtmpClient.setVideoResolution(videoEncoder.getHeight(), videoEncoder.getWidth());
     } else {
-      srsFlvMuxer.setVideoResolution(videoEncoder.getWidth(), videoEncoder.getHeight());
+      rtmpClient.setVideoResolution(videoEncoder.getWidth(), videoEncoder.getHeight());
     }
-    srsFlvMuxer.start(url);
+    rtmpClient.setFps(videoEncoder.getFps());
+    rtmpClient.connect(url);
   }
 
   @Override
   protected void stopStreamRtp() {
-    srsFlvMuxer.stop();
+    rtmpClient.disconnect();
   }
 
   @Override
   public void setReTries(int reTries) {
-    srsFlvMuxer.setReTries(reTries);
+    rtmpClient.setReTries(reTries);
   }
 
   @Override
-  public boolean shouldRetry(String reason) {
-    return srsFlvMuxer.shouldRetry(reason);
+  protected boolean shouldRetry(String reason) {
+    return rtmpClient.shouldRetry(reason);
   }
 
   @Override
-  public void reConnect(long delay) {
-    srsFlvMuxer.reConnect(delay);
+  public void reConnect(long delay, @Nullable String backupUrl) {
+    rtmpClient.reConnect(delay, backupUrl);
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return rtmpClient.hasCongestion();
   }
 
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
-    srsFlvMuxer.sendAudio(aacBuffer, info);
+    rtmpClient.sendAudio(aacBuffer, info);
   }
 
   @Override
   protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    srsFlvMuxer.setSpsPPs(sps, pps);
+    rtmpClient.setVideoInfo(sps, pps, vps);
   }
 
   @Override
   protected void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
-    srsFlvMuxer.sendVideo(h264Buffer, info);
+    rtmpClient.sendVideo(h264Buffer, info);
+  }
+
+  @Override
+  public void setLogs(boolean enable) {
+    rtmpClient.setLogs(enable);
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    rtmpClient.setCheckServerAlive(enable);
   }
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpFromFile.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpFromFile.java
index 8ca85c5..41edc1f 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpFromFile.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpFromFile.java
@@ -1,18 +1,37 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.rtmp;
 
 import android.content.Context;
 import android.media.MediaCodec;
 import android.os.Build;
+
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
 import com.pedro.encoder.input.decoder.AudioDecoderInterface;
 import com.pedro.encoder.input.decoder.VideoDecoderInterface;
+import com.pedro.rtmp.flv.video.ProfileIop;
+import com.pedro.rtmp.rtmp.RtmpClient;
+import com.pedro.rtmp.utils.ConnectCheckerRtmp;
 import com.pedro.rtplibrary.base.FromFileBase;
 
 import com.pedro.rtplibrary.view.LightOpenGlView;
 import com.pedro.rtplibrary.view.OpenGlView;
-import net.ossrs.rtmp.ConnectCheckerRtmp;
-import net.ossrs.rtmp.SrsFlvMuxer;
 
 import java.nio.ByteBuffer;
 
@@ -25,30 +44,30 @@ import java.nio.ByteBuffer;
 @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
 public class RtmpFromFile extends FromFileBase {
 
-  private SrsFlvMuxer srsFlvMuxer;
+  private final RtmpClient rtmpClient;
 
   public RtmpFromFile(ConnectCheckerRtmp connectChecker,
       VideoDecoderInterface videoDecoderInterface, AudioDecoderInterface audioDecoderInterface) {
     super(videoDecoderInterface, audioDecoderInterface);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   public RtmpFromFile(Context context, ConnectCheckerRtmp connectChecker,
       VideoDecoderInterface videoDecoderInterface, AudioDecoderInterface audioDecoderInterface) {
     super(context, videoDecoderInterface, audioDecoderInterface);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   public RtmpFromFile(OpenGlView openGlView, ConnectCheckerRtmp connectChecker,
       VideoDecoderInterface videoDecoderInterface, AudioDecoderInterface audioDecoderInterface) {
     super(openGlView, videoDecoderInterface, audioDecoderInterface);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   public RtmpFromFile(LightOpenGlView lightOpenGlView, ConnectCheckerRtmp connectChecker,
       VideoDecoderInterface videoDecoderInterface, AudioDecoderInterface audioDecoderInterface) {
     super(lightOpenGlView, videoDecoderInterface, audioDecoderInterface);
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
   }
 
   /**
@@ -56,113 +75,155 @@ public class RtmpFromFile extends FromFileBase {
    *
    * @param profileIop Could be ProfileIop.BASELINE or ProfileIop.CONSTRAINED
    */
-  public void setProfileIop(byte profileIop) {
-    srsFlvMuxer.setProfileIop(profileIop);
+  public void setProfileIop(ProfileIop profileIop) {
+    rtmpClient.setProfileIop(profileIop);
   }
 
   @Override
   public void resizeCache(int newSize) throws RuntimeException {
-    srsFlvMuxer.resizeFlvTagCache(newSize);
+    rtmpClient.resizeCache(newSize);
   }
 
   @Override
   public int getCacheSize() {
-    return srsFlvMuxer.getFlvTagCacheSize();
+    return rtmpClient.getCacheSize();
   }
 
   @Override
   public long getSentAudioFrames() {
-    return srsFlvMuxer.getSentAudioFrames();
+    return rtmpClient.getSentAudioFrames();
   }
 
   @Override
   public long getSentVideoFrames() {
-    return srsFlvMuxer.getSentVideoFrames();
+    return rtmpClient.getSentVideoFrames();
   }
 
   @Override
   public long getDroppedAudioFrames() {
-    return srsFlvMuxer.getDroppedAudioFrames();
+    return rtmpClient.getDroppedAudioFrames();
   }
 
   @Override
   public long getDroppedVideoFrames() {
-    return srsFlvMuxer.getDroppedVideoFrames();
+    return rtmpClient.getDroppedVideoFrames();
   }
 
   @Override
   public void resetSentAudioFrames() {
-    srsFlvMuxer.resetSentAudioFrames();
+    rtmpClient.resetSentAudioFrames();
   }
 
   @Override
   public void resetSentVideoFrames() {
-    srsFlvMuxer.resetSentVideoFrames();
+    rtmpClient.resetSentVideoFrames();
   }
 
   @Override
   public void resetDroppedAudioFrames() {
-    srsFlvMuxer.resetDroppedAudioFrames();
+    rtmpClient.resetDroppedAudioFrames();
   }
 
   @Override
   public void resetDroppedVideoFrames() {
-    srsFlvMuxer.resetDroppedVideoFrames();
+    rtmpClient.resetDroppedVideoFrames();
   }
 
   @Override
   public void setAuthorization(String user, String password) {
-    srsFlvMuxer.setAuthorization(user, password);
+    rtmpClient.setAuthorization(user, password);
+  }
+
+  /**
+   * Some Livestream hosts use Akamai auth that requires RTMP packets to be sent with increasing
+   * timestamp order regardless of packet type.
+   * Necessary with Servers like Dacast.
+   * More info here:
+   * https://learn.akamai.com/en-us/webhelp/media-services-live/media-services-live-encoder-compatibility-testing-and-qualification-guide-v4.0/GUID-F941C88B-9128-4BF4-A81B-C2E5CFD35BBF.html
+   */
+  public void forceAkamaiTs(boolean enabled) {
+    rtmpClient.forceAkamaiTs(enabled);
+  }
+
+  /**
+   * Must be called before start stream.
+   *
+   * Default value 128
+   * Range value: 1 to 16777215.
+   *
+   * The most common values example: 128, 4096, 65535
+   *
+   * @param chunkSize packet's chunk size send to server
+   */
+  public void setWriteChunkSize(int chunkSize) {
+    if (!isStreaming()) {
+      rtmpClient.setWriteChunkSize(chunkSize);
+    }
   }
 
   @Override
   protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
-    srsFlvMuxer.setIsStereo(isStereo);
-    srsFlvMuxer.setSampleRate(sampleRate);
+    rtmpClient.setAudioInfo(sampleRate, isStereo);
   }
 
   @Override
   protected void startStreamRtp(String url) {
     if (videoEncoder.getRotation() == 90 || videoEncoder.getRotation() == 270) {
-      srsFlvMuxer.setVideoResolution(videoEncoder.getHeight(), videoEncoder.getWidth());
+      rtmpClient.setVideoResolution(videoEncoder.getHeight(), videoEncoder.getWidth());
     } else {
-      srsFlvMuxer.setVideoResolution(videoEncoder.getWidth(), videoEncoder.getHeight());
+      rtmpClient.setVideoResolution(videoEncoder.getWidth(), videoEncoder.getHeight());
     }
-    srsFlvMuxer.start(url);
+    rtmpClient.setFps(videoEncoder.getFps());
+    rtmpClient.connect(url);
   }
 
   @Override
   protected void stopStreamRtp() {
-    srsFlvMuxer.stop();
+    rtmpClient.disconnect();
   }
 
   @Override
   public void setReTries(int reTries) {
-    srsFlvMuxer.setReTries(reTries);
+    rtmpClient.setReTries(reTries);
   }
 
   @Override
-  public boolean shouldRetry(String reason) {
-    return srsFlvMuxer.shouldRetry(reason);
+  protected boolean shouldRetry(String reason) {
+    return rtmpClient.shouldRetry(reason);
   }
 
   @Override
-  public void reConnect(long delay) {
-    srsFlvMuxer.reConnect(delay);
+  public void reConnect(long delay, @Nullable String backupUrl) {
+    rtmpClient.reConnect(delay, backupUrl);
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return rtmpClient.hasCongestion();
   }
 
   @Override
   protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    srsFlvMuxer.setSpsPPs(sps, pps);
+    rtmpClient.setVideoInfo(sps, pps, vps);
   }
 
   @Override
   protected void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
-    srsFlvMuxer.sendVideo(h264Buffer, info);
+    rtmpClient.sendVideo(h264Buffer, info);
   }
 
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
-    srsFlvMuxer.sendAudio(aacBuffer, info);
+    rtmpClient.sendAudio(aacBuffer, info);
+  }
+
+  @Override
+  public void setLogs(boolean enable) {
+    rtmpClient.setLogs(enable);
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    rtmpClient.setCheckServerAlive(enable);
   }
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpOnlyAudio.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpOnlyAudio.java
index 2c6e9bd..cf96f09 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpOnlyAudio.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpOnlyAudio.java
@@ -1,10 +1,29 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.rtmp;
 
 import android.media.MediaCodec;
+
+import androidx.annotation.Nullable;
+
+import com.pedro.rtmp.rtmp.RtmpClient;
+import com.pedro.rtmp.utils.ConnectCheckerRtmp;
 import com.pedro.rtplibrary.base.OnlyAudioBase;
 import java.nio.ByteBuffer;
-import net.ossrs.rtmp.ConnectCheckerRtmp;
-import net.ossrs.rtmp.SrsFlvMuxer;
 
 /**
  * More documentation see:
@@ -14,101 +33,143 @@ import net.ossrs.rtmp.SrsFlvMuxer;
  */
 public class RtmpOnlyAudio extends OnlyAudioBase {
 
-  private SrsFlvMuxer srsFlvMuxer;
+  private final RtmpClient rtmpClient;
 
   public RtmpOnlyAudio(ConnectCheckerRtmp connectChecker) {
     super();
-    srsFlvMuxer = new SrsFlvMuxer(connectChecker);
+    rtmpClient = new RtmpClient(connectChecker);
+    rtmpClient.setOnlyAudio(true);
   }
 
   @Override
   public void resizeCache(int newSize) throws RuntimeException {
-    srsFlvMuxer.resizeFlvTagCache(newSize);
+    rtmpClient.resizeCache(newSize);
   }
 
   @Override
   public int getCacheSize() {
-    return srsFlvMuxer.getFlvTagCacheSize();
+    return rtmpClient.getCacheSize();
   }
 
   @Override
   public long getSentAudioFrames() {
-    return srsFlvMuxer.getSentAudioFrames();
+    return rtmpClient.getSentAudioFrames();
   }
 
   @Override
   public long getSentVideoFrames() {
-    return srsFlvMuxer.getSentVideoFrames();
+    return rtmpClient.getSentVideoFrames();
   }
 
   @Override
   public long getDroppedAudioFrames() {
-    return srsFlvMuxer.getDroppedAudioFrames();
+    return rtmpClient.getDroppedAudioFrames();
   }
 
   @Override
   public long getDroppedVideoFrames() {
-    return srsFlvMuxer.getDroppedVideoFrames();
+    return rtmpClient.getDroppedVideoFrames();
   }
 
   @Override
   public void resetSentAudioFrames() {
-    srsFlvMuxer.resetSentAudioFrames();
+    rtmpClient.resetSentAudioFrames();
   }
 
   @Override
   public void resetSentVideoFrames() {
-    srsFlvMuxer.resetSentVideoFrames();
+    rtmpClient.resetSentVideoFrames();
   }
 
   @Override
   public void resetDroppedAudioFrames() {
-    srsFlvMuxer.resetDroppedAudioFrames();
+    rtmpClient.resetDroppedAudioFrames();
   }
 
   @Override
   public void resetDroppedVideoFrames() {
-    srsFlvMuxer.resetDroppedVideoFrames();
+    rtmpClient.resetDroppedVideoFrames();
   }
 
   @Override
   public void setAuthorization(String user, String password) {
-    srsFlvMuxer.setAuthorization(user, password);
+    rtmpClient.setAuthorization(user, password);
+  }
+
+  /**
+   * Some Livestream hosts use Akamai auth that requires RTMP packets to be sent with increasing
+   * timestamp order regardless of packet type.
+   * Necessary with Servers like Dacast.
+   * More info here:
+   * https://learn.akamai.com/en-us/webhelp/media-services-live/media-services-live-encoder-compatibility-testing-and-qualification-guide-v4.0/GUID-F941C88B-9128-4BF4-A81B-C2E5CFD35BBF.html
+   */
+  public void forceAkamaiTs(boolean enabled) {
+    rtmpClient.forceAkamaiTs(enabled);
+  }
+
+  /**
+   * Must be called before start stream.
+   *
+   * Default value 128
+   * Range value: 1 to 16777215.
+   *
+   * The most common values example: 128, 4096, 65535
+   *
+   * @param chunkSize packet's chunk size send to server
+   */
+  public void setWriteChunkSize(int chunkSize) {
+    if (!isStreaming()) {
+      rtmpClient.setWriteChunkSize(chunkSize);
+    }
   }
 
   @Override
   protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
-    srsFlvMuxer.setIsStereo(isStereo);
-    srsFlvMuxer.setSampleRate(sampleRate);
+    rtmpClient.setAudioInfo(sampleRate, isStereo);
   }
 
   @Override
   protected void startStreamRtp(String url) {
-    srsFlvMuxer.start(url);
+    rtmpClient.connect(url);
   }
 
   @Override
   protected void stopStreamRtp() {
-    srsFlvMuxer.stop();
+    rtmpClient.disconnect();
   }
 
   @Override
   public void setReTries(int reTries) {
-    srsFlvMuxer.setReTries(reTries);
+    rtmpClient.setReTries(reTries);
   }
 
   @Override
-  public boolean shouldRetry(String reason) {
-    return srsFlvMuxer.shouldRetry(reason);
+  protected boolean shouldRetry(String reason) {
+    return rtmpClient.shouldRetry(reason);
   }
 
   @Override
-  public void reConnect(long delay) {
-    srsFlvMuxer.reConnect(delay);
+  public void reConnect(long delay, @Nullable String backupUrl) {
+    rtmpClient.reConnect(delay, backupUrl);
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return rtmpClient.hasCongestion();
   }
 
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
-    srsFlvMuxer.sendAudio(aacBuffer, info);
+    rtmpClient.sendAudio(aacBuffer, info);
+  }
+
+  @Override
+  public void setLogs(boolean enable) {
+    rtmpClient.setLogs(enable);
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    rtmpClient.setCheckServerAlive(enable);
   }
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpStream.kt b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpStream.kt
new file mode 100644
index 0000000..1bb40da
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtmp/RtmpStream.kt
@@ -0,0 +1,147 @@
+package com.pedro.rtplibrary.rtmp
+
+import android.content.Context
+import android.media.MediaCodec
+import android.os.Build
+import androidx.annotation.RequiresApi
+import com.pedro.rtmp.flv.video.ProfileIop
+import com.pedro.rtmp.rtmp.RtmpClient
+import com.pedro.rtmp.utils.ConnectCheckerRtmp
+import com.pedro.rtplibrary.base.StreamBase
+import com.pedro.rtplibrary.util.sources.AudioManager
+import com.pedro.rtplibrary.util.sources.VideoManager
+import java.nio.ByteBuffer
+
+/**
+ * Created by pedro on 14/3/22.
+ *
+ * If you use VideoManager.Source.SCREEN/AudioManager.Source.INTERNAL. Call
+ * changeVideoSourceScreen/changeAudioSourceInternal is necessary to start it.
+ */
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+class RtmpStream(context: Context, connectCheckerRtmp: ConnectCheckerRtmp, videoSource: VideoManager.Source,
+  audioSource: AudioManager.Source): StreamBase(context, videoSource, audioSource) {
+
+  constructor(context: Context, connectCheckerRtmp: ConnectCheckerRtmp):
+      this(context, connectCheckerRtmp, VideoManager.Source.CAMERA2, AudioManager.Source.MICROPHONE)
+
+  private val rtmpClient = RtmpClient(connectCheckerRtmp)
+
+  /**
+   * H264 profile.
+   *
+   * @param profileIop Could be ProfileIop.BASELINE or ProfileIop.CONSTRAINED
+   */
+  fun setProfileIop(profileIop: ProfileIop?) {
+    rtmpClient.setProfileIop(profileIop!!)
+  }
+
+  /**
+   * Some Livestream hosts use Akamai auth that requires RTMP packets to be sent with increasing
+   * timestamp order regardless of packet type.
+   * Necessary with Servers like Dacast.
+   * More info here:
+   * https://learn.akamai.com/en-us/webhelp/media-services-live/media-services-live-encoder-compatibility-testing-and-qualification-guide-v4.0/GUID-F941C88B-9128-4BF4-A81B-C2E5CFD35BBF.html
+   */
+  fun forceAkamaiTs(enabled: Boolean) {
+    rtmpClient.forceAkamaiTs(enabled)
+  }
+
+  /**
+   * Must be called before start stream.
+   *
+   * Default value 128
+   * Range value: 1 to 16777215.
+   *
+   * The most common values example: 128, 4096, 65535
+   *
+   * @param chunkSize packet's chunk size send to server
+   */
+  fun setWriteChunkSize(chunkSize: Int) {
+    if (!isStreaming) {
+      rtmpClient.setWriteChunkSize(chunkSize)
+    }
+  }
+
+  override fun audioInfo(sampleRate: Int, isStereo: Boolean) {
+    rtmpClient.setAudioInfo(sampleRate, isStereo)
+  }
+
+  override fun rtpStartStream(endPoint: String) {
+    val resolution = super.getVideoResolution()
+    rtmpClient.setVideoResolution(resolution.width, resolution.height)
+    rtmpClient.setFps(super.getVideoFps())
+    rtmpClient.connect(endPoint)
+  }
+
+  override fun rtpStopStream() {
+    rtmpClient.disconnect()
+  }
+
+  override fun setAuthorization(user: String?, password: String?) {
+    rtmpClient.setAuthorization(user, password)
+  }
+
+  override fun onSpsPpsVpsRtp(sps: ByteBuffer, pps: ByteBuffer, vps: ByteBuffer?) {
+    rtmpClient.setVideoInfo(sps, pps, vps)
+  }
+
+  override fun getH264DataRtp(h264Buffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    rtmpClient.sendVideo(h264Buffer, info)
+  }
+
+  override fun getAacDataRtp(aacBuffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    rtmpClient.sendAudio(aacBuffer, info)
+  }
+
+  override fun setReTries(reTries: Int) {
+    rtmpClient.setReTries(reTries)
+  }
+
+  override fun shouldRetry(reason: String): Boolean = rtmpClient.shouldRetry(reason)
+
+  override fun reConnect(delay: Long, backupUrl: String?) {
+    rtmpClient.reConnect(delay, backupUrl)
+  }
+
+  override fun hasCongestion(): Boolean = rtmpClient.hasCongestion()
+
+  override fun setLogs(enabled: Boolean) {
+    rtmpClient.setLogs(enabled)
+  }
+
+  override fun setCheckServerAlive(enabled: Boolean) {
+    rtmpClient.setCheckServerAlive(enabled)
+  }
+
+  override fun resizeCache(newSize: Int) {
+    rtmpClient.resizeCache(newSize)
+  }
+
+  override fun getCacheSize(): Int = rtmpClient.cacheSize
+
+  override fun getSentAudioFrames(): Long = rtmpClient.sentAudioFrames
+
+  override fun getSentVideoFrames(): Long = rtmpClient.sentVideoFrames
+
+  override fun getDroppedAudioFrames(): Long = rtmpClient.droppedAudioFrames
+
+  override fun getDroppedVideoFrames(): Long = rtmpClient.droppedVideoFrames
+
+  override fun resetSentAudioFrames() {
+    rtmpClient.resetSentAudioFrames()
+  }
+
+  override fun resetSentVideoFrames() {
+    rtmpClient.resetSentVideoFrames()
+  }
+
+  override fun resetDroppedAudioFrames() {
+    rtmpClient.resetDroppedAudioFrames()
+  }
+
+  override fun resetDroppedVideoFrames() {
+    rtmpClient.resetDroppedVideoFrames()
+  }
+}
\ No newline at end of file
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspCamera1.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspCamera1.java
index 70a9b20..51af4ba 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspCamera1.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspCamera1.java
@@ -1,8 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.rtsp;
 
 import android.content.Context;
 import android.media.MediaCodec;
 import android.os.Build;
+
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import android.view.SurfaceView;
 import android.view.TextureView;
@@ -25,7 +43,7 @@ import java.nio.ByteBuffer;
 
 public class RtspCamera1 extends Camera1Base {
 
-  private RtspClient rtspClient;
+  private final RtspClient rtspClient;
 
   public RtspCamera1(SurfaceView surfaceView, ConnectCheckerRtsp connectCheckerRtsp) {
     super(surfaceView);
@@ -115,6 +133,8 @@ public class RtspCamera1 extends Camera1Base {
   }
 
   public void setVideoCodec(VideoCodec videoCodec) {
+    recordController.setVideoMime(
+        videoCodec == VideoCodec.H265 ? CodecUtil.H265_MIME : CodecUtil.H264_MIME);
     videoEncoder.setType(videoCodec == VideoCodec.H265 ? CodecUtil.H265_MIME : CodecUtil.H264_MIME);
   }
 
@@ -125,13 +145,13 @@ public class RtspCamera1 extends Camera1Base {
 
   @Override
   protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
-    rtspClient.setIsStereo(isStereo);
-    rtspClient.setSampleRate(sampleRate);
+    rtspClient.setAudioInfo(sampleRate, isStereo);
   }
 
   @Override
   protected void startStreamRtp(String url) {
-    rtspClient.setUrl(url);
+    rtspClient.setOnlyVideo(!audioInitialized);
+    rtspClient.connect(url);
   }
 
   @Override
@@ -145,13 +165,18 @@ public class RtspCamera1 extends Camera1Base {
   }
 
   @Override
-  public boolean shouldRetry(String reason) {
+  protected boolean shouldRetry(String reason) {
     return rtspClient.shouldRetry(reason);
   }
 
   @Override
-  public void reConnect(long delay) {
-    rtspClient.reConnect(delay);
+  public void reConnect(long delay, @Nullable String backupUrl) {
+    rtspClient.reConnect(delay, backupUrl);
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return rtspClient.hasCongestion();
   }
 
   @Override
@@ -161,15 +186,21 @@ public class RtspCamera1 extends Camera1Base {
 
   @Override
   protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    ByteBuffer newSps = sps.duplicate();
-    ByteBuffer newPps = pps.duplicate();
-    ByteBuffer newVps = vps != null ? vps.duplicate() : null;
-    rtspClient.setSPSandPPS(newSps, newPps, newVps);
-    rtspClient.connect();
+    rtspClient.setVideoInfo(sps, pps, vps);
   }
 
   @Override
   protected void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
     rtspClient.sendVideo(h264Buffer, info);
   }
+
+  @Override
+  public void setLogs(boolean enable) {
+    rtspClient.setLogs(enable);
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    rtspClient.setCheckServerAlive(enable);
+  }
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspCamera2.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspCamera2.java
index 981aa19..d4ff74c 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspCamera2.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspCamera2.java
@@ -1,8 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.rtsp;
 
 import android.content.Context;
 import android.media.MediaCodec;
 import android.os.Build;
+
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import android.view.SurfaceView;
 import android.view.TextureView;
@@ -27,13 +45,25 @@ import java.nio.ByteBuffer;
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 public class RtspCamera2 extends Camera2Base {
 
-  private RtspClient rtspClient;
+  private final RtspClient rtspClient;
 
+  /**
+   * @deprecated This view produce rotations problems and could be unsupported in future versions.
+   * Use {@link Camera2Base#Camera2Base(OpenGlView)} or {@link Camera2Base#Camera2Base(LightOpenGlView)}
+   * instead.
+   */
+  @Deprecated
   public RtspCamera2(SurfaceView surfaceView, ConnectCheckerRtsp connectCheckerRtsp) {
     super(surfaceView);
     rtspClient = new RtspClient(connectCheckerRtsp);
   }
 
+  /**
+   * @deprecated This view produce rotations problems and could be unsupported in future versions.
+   * Use {@link Camera2Base#Camera2Base(OpenGlView)} or {@link Camera2Base#Camera2Base(LightOpenGlView)}
+   * instead.
+   */
+  @Deprecated
   public RtspCamera2(TextureView textureView, ConnectCheckerRtsp connectCheckerRtsp) {
     super(textureView);
     rtspClient = new RtspClient(connectCheckerRtsp);
@@ -114,6 +144,8 @@ public class RtspCamera2 extends Camera2Base {
   }
 
   public void setVideoCodec(VideoCodec videoCodec) {
+    recordController.setVideoMime(
+        videoCodec == VideoCodec.H265 ? CodecUtil.H265_MIME : CodecUtil.H264_MIME);
     videoEncoder.setType(videoCodec == VideoCodec.H265 ? CodecUtil.H265_MIME : CodecUtil.H264_MIME);
   }
 
@@ -124,13 +156,13 @@ public class RtspCamera2 extends Camera2Base {
 
   @Override
   protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
-    rtspClient.setIsStereo(isStereo);
-    rtspClient.setSampleRate(sampleRate);
+    rtspClient.setAudioInfo(sampleRate, isStereo);
   }
 
   @Override
   protected void startStreamRtp(String url) {
-    rtspClient.setUrl(url);
+    rtspClient.setOnlyVideo(!audioInitialized);
+    rtspClient.connect(url);
   }
 
   @Override
@@ -144,13 +176,18 @@ public class RtspCamera2 extends Camera2Base {
   }
 
   @Override
-  public boolean shouldRetry(String reason) {
+  protected boolean shouldRetry(String reason) {
     return rtspClient.shouldRetry(reason);
   }
 
   @Override
-  public void reConnect(long delay) {
-    rtspClient.reConnect(delay);
+  public void reConnect(long delay, @Nullable String backupUrl) {
+    rtspClient.reConnect(delay, backupUrl);
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return rtspClient.hasCongestion();
   }
 
   @Override
@@ -160,16 +197,22 @@ public class RtspCamera2 extends Camera2Base {
 
   @Override
   protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    ByteBuffer newSps = sps.duplicate();
-    ByteBuffer newPps = pps.duplicate();
-    ByteBuffer newVps = vps != null ? vps.duplicate() : null;
-    rtspClient.setSPSandPPS(newSps, newPps, newVps);
-    rtspClient.connect();
+    rtspClient.setVideoInfo(sps, pps, vps);
   }
 
   @Override
   protected void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
     rtspClient.sendVideo(h264Buffer, info);
   }
+
+  @Override
+  public void setLogs(boolean enable) {
+    rtspClient.setLogs(enable);
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    rtspClient.setCheckServerAlive(enable);
+  }
 }
 
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspDisplay.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspDisplay.java
index 0221170..ef4923c 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspDisplay.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspDisplay.java
@@ -1,8 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.rtsp;
 
 import android.content.Context;
 import android.media.MediaCodec;
 import android.os.Build;
+
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.rtplibrary.base.DisplayBase;
@@ -21,7 +39,7 @@ import java.nio.ByteBuffer;
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 public class RtspDisplay extends DisplayBase {
 
-  private RtspClient rtspClient;
+  private final RtspClient rtspClient;
 
   public RtspDisplay(Context context, boolean useOpengl, ConnectCheckerRtsp connectCheckerRtsp) {
     super(context, useOpengl);
@@ -88,6 +106,8 @@ public class RtspDisplay extends DisplayBase {
   }
 
   public void setVideoCodec(VideoCodec videoCodec) {
+    recordController.setVideoMime(
+        videoCodec == VideoCodec.H265 ? CodecUtil.H265_MIME : CodecUtil.H264_MIME);
     videoEncoder.setType(videoCodec == VideoCodec.H265 ? CodecUtil.H265_MIME : CodecUtil.H264_MIME);
   }
 
@@ -98,13 +118,12 @@ public class RtspDisplay extends DisplayBase {
 
   @Override
   protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
-    rtspClient.setIsStereo(isStereo);
-    rtspClient.setSampleRate(sampleRate);
+    rtspClient.setAudioInfo(sampleRate, isStereo);
   }
 
   @Override
   protected void startStreamRtp(String url) {
-    rtspClient.setUrl(url);
+    rtspClient.connect(url);
   }
 
   @Override
@@ -118,13 +137,18 @@ public class RtspDisplay extends DisplayBase {
   }
 
   @Override
-  public boolean shouldRetry(String reason) {
+  protected boolean shouldRetry(String reason) {
     return rtspClient.shouldRetry(reason);
   }
 
   @Override
-  public void reConnect(long delay) {
-    rtspClient.reConnect(delay);
+  public void reConnect(long delay, @Nullable String backupUrl) {
+    rtspClient.reConnect(delay, backupUrl);
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return rtspClient.hasCongestion();
   }
 
   @Override
@@ -134,15 +158,21 @@ public class RtspDisplay extends DisplayBase {
 
   @Override
   protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    ByteBuffer newSps = sps.duplicate();
-    ByteBuffer newPps = pps.duplicate();
-    ByteBuffer newVps = vps != null ? vps.duplicate() : null;
-    rtspClient.setSPSandPPS(newSps, newPps, newVps);
-    rtspClient.connect();
+    rtspClient.setVideoInfo(sps, pps, vps);
   }
 
   @Override
   protected void getH264DataRtp(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
     rtspClient.sendVideo(h264Buffer, info);
   }
+
+  @Override
+  public void setLogs(boolean enable) {
+    rtspClient.setLogs(enable);
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    rtspClient.setCheckServerAlive(enable);
+  }
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspFromFile.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspFromFile.java
index d3f975e..ec6eba4 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspFromFile.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspFromFile.java
@@ -1,8 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.rtsp;
 
 import android.content.Context;
 import android.media.MediaCodec;
 import android.os.Build;
+
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import com.pedro.encoder.input.decoder.AudioDecoderInterface;
 import com.pedro.encoder.input.decoder.VideoDecoderInterface;
@@ -25,7 +43,7 @@ import java.nio.ByteBuffer;
 @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
 public class RtspFromFile extends FromFileBase {
 
-  private RtspClient rtspClient;
+  private final RtspClient rtspClient;
 
   public RtspFromFile(ConnectCheckerRtsp connectCheckerRtsp,
       VideoDecoderInterface videoDecoderInterface, AudioDecoderInterface audioDecoderInterface) {
@@ -111,6 +129,8 @@ public class RtspFromFile extends FromFileBase {
   }
 
   public void setVideoCodec(VideoCodec videoCodec) {
+    recordController.setVideoMime(
+        videoCodec == VideoCodec.H265 ? CodecUtil.H265_MIME : CodecUtil.H264_MIME);
     videoEncoder.setType(videoCodec == VideoCodec.H265 ? CodecUtil.H265_MIME : CodecUtil.H264_MIME);
   }
 
@@ -121,13 +141,13 @@ public class RtspFromFile extends FromFileBase {
 
   @Override
   protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
-    rtspClient.setIsStereo(isStereo);
-    rtspClient.setSampleRate(sampleRate);
+    rtspClient.setAudioInfo(sampleRate, isStereo);
   }
 
   @Override
   protected void startStreamRtp(String url) {
-    rtspClient.setUrl(url);
+    rtspClient.setOnlyAudio(!videoEnabled);
+    rtspClient.connect(url);
   }
 
   @Override
@@ -141,22 +161,23 @@ public class RtspFromFile extends FromFileBase {
   }
 
   @Override
-  public boolean shouldRetry(String reason) {
+  protected boolean shouldRetry(String reason) {
     return rtspClient.shouldRetry(reason);
   }
 
   @Override
-  public void reConnect(long delay) {
-    rtspClient.reConnect(delay);
+  public void reConnect(long delay, @Nullable String backupUrl) {
+    rtspClient.reConnect(delay, backupUrl);
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return rtspClient.hasCongestion();
   }
 
   @Override
   protected void onSpsPpsVpsRtp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    ByteBuffer newSps = sps.duplicate();
-    ByteBuffer newPps = pps.duplicate();
-    ByteBuffer newVps = vps != null ? vps.duplicate() : null;
-    rtspClient.setSPSandPPS(newSps, newPps, newVps);
-    rtspClient.connect();
+    rtspClient.setVideoInfo(sps, pps, vps);
   }
 
   @Override
@@ -168,5 +189,15 @@ public class RtspFromFile extends FromFileBase {
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     rtspClient.sendAudio(aacBuffer, info);
   }
+
+  @Override
+  public void setLogs(boolean enable) {
+    rtspClient.setLogs(enable);
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    rtspClient.setCheckServerAlive(enable);
+  }
 }
 
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspOnlyAudio.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspOnlyAudio.java
index 528d801..155d340 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspOnlyAudio.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspOnlyAudio.java
@@ -1,6 +1,25 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.rtsp;
 
 import android.media.MediaCodec;
+
+import androidx.annotation.Nullable;
+
 import com.pedro.rtplibrary.base.OnlyAudioBase;
 import com.pedro.rtsp.rtsp.Protocol;
 import com.pedro.rtsp.rtsp.RtspClient;
@@ -15,7 +34,7 @@ import java.nio.ByteBuffer;
  */
 public class RtspOnlyAudio extends OnlyAudioBase {
 
-  private RtspClient rtspClient;
+  private final RtspClient rtspClient;
 
   public RtspOnlyAudio(ConnectCheckerRtsp connectCheckerRtsp) {
     super();
@@ -89,14 +108,12 @@ public class RtspOnlyAudio extends OnlyAudioBase {
 
   @Override
   protected void prepareAudioRtp(boolean isStereo, int sampleRate) {
-    rtspClient.setIsStereo(isStereo);
-    rtspClient.setSampleRate(sampleRate);
+    rtspClient.setAudioInfo(sampleRate, isStereo);
   }
 
   @Override
   protected void startStreamRtp(String url) {
-    rtspClient.setUrl(url);
-    rtspClient.connect();
+    rtspClient.connect(url);
   }
 
   @Override
@@ -110,17 +127,32 @@ public class RtspOnlyAudio extends OnlyAudioBase {
   }
 
   @Override
-  public boolean shouldRetry(String reason) {
+  protected boolean shouldRetry(String reason) {
     return rtspClient.shouldRetry(reason);
   }
 
   @Override
-  public void reConnect(long delay) {
-    rtspClient.reConnect(delay);
+  public void reConnect(long delay, @Nullable String backupUrl) {
+    rtspClient.reConnect(delay, backupUrl);
+  }
+
+  @Override
+  public boolean hasCongestion() {
+    return rtspClient.hasCongestion();
   }
 
   @Override
   protected void getAacDataRtp(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
     rtspClient.sendAudio(aacBuffer, info);
   }
+
+  @Override
+  public void setLogs(boolean enable) {
+    rtspClient.setLogs(enable);
+  }
+
+  @Override
+  public void setCheckServerAlive(boolean enable) {
+    rtspClient.setCheckServerAlive(enable);
+  }
 }
\ No newline at end of file
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspStream.kt b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspStream.kt
new file mode 100644
index 0000000..d2e4156
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/rtsp/RtspStream.kt
@@ -0,0 +1,124 @@
+package com.pedro.rtplibrary.rtsp
+
+import android.content.Context
+import android.media.MediaCodec
+import android.os.Build
+import androidx.annotation.RequiresApi
+import com.pedro.encoder.utils.CodecUtil
+import com.pedro.rtplibrary.base.StreamBase
+import com.pedro.rtplibrary.util.sources.AudioManager
+import com.pedro.rtplibrary.util.sources.VideoManager
+import com.pedro.rtsp.rtsp.Protocol
+import com.pedro.rtsp.rtsp.RtspClient
+import com.pedro.rtsp.rtsp.VideoCodec
+import com.pedro.rtsp.utils.ConnectCheckerRtsp
+import java.nio.ByteBuffer
+
+/**
+ * Created by pedro on 14/3/22.
+ *
+ * If you use VideoManager.Source.SCREEN/AudioManager.Source.INTERNAL. Call
+ * changeVideoSourceScreen/changeAudioSourceInternal is necessary to start it.
+ */
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+class RtspStream(context: Context, connectCheckerRtsp: ConnectCheckerRtsp, videoSource: VideoManager.Source,
+  audioSource: AudioManager.Source): StreamBase(context, videoSource, audioSource) {
+
+  constructor(context: Context, connectCheckerRtsp: ConnectCheckerRtsp):
+      this(context, connectCheckerRtsp, VideoManager.Source.CAMERA2, AudioManager.Source.MICROPHONE)
+
+  private val rtspClient = RtspClient(connectCheckerRtsp)
+
+  /**
+   * Internet protocol used.
+   *
+   * @param protocol Could be Protocol.TCP or Protocol.UDP.
+   */
+  fun setProtocol(protocol: Protocol?) {
+    rtspClient.setProtocol(protocol!!)
+  }
+
+  fun setVideoCodec(videoCodec: VideoCodec) {
+    val mime = if (videoCodec === VideoCodec.H265) CodecUtil.H265_MIME else CodecUtil.H264_MIME
+    super.setVideoMime(mime)
+  }
+
+  override fun audioInfo(sampleRate: Int, isStereo: Boolean) {
+    rtspClient.setAudioInfo(sampleRate, isStereo)
+  }
+
+  override fun rtpStartStream(endPoint: String) {
+    rtspClient.connect(endPoint)
+  }
+
+  override fun rtpStopStream() {
+    rtspClient.disconnect()
+  }
+
+  override fun setAuthorization(user: String?, password: String?) {
+    rtspClient.setAuthorization(user, password)
+  }
+
+  override fun onSpsPpsVpsRtp(sps: ByteBuffer, pps: ByteBuffer, vps: ByteBuffer?) {
+    rtspClient.setVideoInfo(sps, pps, vps)
+  }
+
+  override fun getH264DataRtp(h264Buffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    rtspClient.sendVideo(h264Buffer, info)
+  }
+
+  override fun getAacDataRtp(aacBuffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    rtspClient.sendAudio(aacBuffer, info)
+  }
+
+  override fun setReTries(reTries: Int) {
+    rtspClient.setReTries(reTries)
+  }
+
+  override fun shouldRetry(reason: String): Boolean = rtspClient.shouldRetry(reason)
+
+  override fun reConnect(delay: Long, backupUrl: String?) {
+    rtspClient.reConnect(delay, backupUrl)
+  }
+
+  override fun hasCongestion(): Boolean = rtspClient.hasCongestion()
+
+  override fun setLogs(enabled: Boolean) {
+    rtspClient.setLogs(enabled)
+  }
+
+  override fun setCheckServerAlive(enabled: Boolean) {
+    rtspClient.setCheckServerAlive(enabled)
+  }
+
+  override fun resizeCache(newSize: Int) {
+    rtspClient.resizeCache(newSize)
+  }
+
+  override fun getCacheSize(): Int = rtspClient.cacheSize
+
+  override fun getSentAudioFrames(): Long = rtspClient.sentAudioFrames
+
+  override fun getSentVideoFrames(): Long = rtspClient.sentVideoFrames
+
+  override fun getDroppedAudioFrames(): Long = rtspClient.droppedAudioFrames
+
+  override fun getDroppedVideoFrames(): Long = rtspClient.droppedVideoFrames
+
+  override fun resetSentAudioFrames() {
+    rtspClient.resetSentAudioFrames()
+  }
+
+  override fun resetSentVideoFrames() {
+    rtspClient.resetSentVideoFrames()
+  }
+
+  override fun resetDroppedAudioFrames() {
+    rtspClient.resetDroppedAudioFrames()
+  }
+
+  override fun resetDroppedVideoFrames() {
+    rtspClient.resetDroppedVideoFrames()
+  }
+}
\ No newline at end of file
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/AndroidMuxerRecordController.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/AndroidMuxerRecordController.java
new file mode 100644
index 0000000..78d3726
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/AndroidMuxerRecordController.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.util;
+
+import android.media.MediaCodec;
+import android.media.MediaFormat;
+import android.media.MediaMuxer;
+import android.os.Build;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+
+import com.pedro.rtplibrary.base.recording.BaseRecordController;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+/**
+ * Created by pedro on 08/03/19.
+ *
+ * Class to control video recording with MediaMuxer.
+ */
+public class AndroidMuxerRecordController extends BaseRecordController {
+
+  private static final String TAG = "AndroidRecordController";
+  private MediaMuxer mediaMuxer;
+  private MediaFormat videoFormat, audioFormat;
+
+  @Override
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void startRecord(@NonNull String path, @Nullable Listener listener) throws IOException {
+    mediaMuxer = new MediaMuxer(path, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+    this.listener = listener;
+    status = Status.STARTED;
+    if (listener != null) listener.onStatusChange(status);
+    if (isOnlyAudio && audioFormat != null) init();
+  }
+
+  @Override
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  public void startRecord(@NonNull FileDescriptor fd, @Nullable Listener listener) throws IOException {
+    mediaMuxer = new MediaMuxer(fd, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+    this.listener = listener;
+    status = Status.STARTED;
+    if(listener != null) listener.onStatusChange(status);
+    if(isOnlyAudio && audioFormat != null) init();
+  }
+
+  @Override
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void stopRecord() {
+    videoTrack = -1;
+    audioTrack = -1;
+    status = Status.STOPPED;
+    if (mediaMuxer != null) {
+      try {
+        mediaMuxer.stop();
+        mediaMuxer.release();
+      } catch (Exception ignored) {
+      }
+    }
+    mediaMuxer = null;
+    pauseMoment = 0;
+    pauseTime = 0;
+    if (listener != null) listener.onStatusChange(status);
+  }
+
+  @Override
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void recordVideo(ByteBuffer videoBuffer, MediaCodec.BufferInfo videoInfo) {
+    if (status == Status.STARTED && videoFormat != null && (audioFormat != null || isOnlyVideo)) {
+      if (videoInfo.flags == MediaCodec.BUFFER_FLAG_KEY_FRAME || isKeyFrame(videoBuffer)) {
+        videoTrack = mediaMuxer.addTrack(videoFormat);
+        init();
+      }
+    } else if (status == Status.RESUMED && (videoInfo.flags == MediaCodec.BUFFER_FLAG_KEY_FRAME
+            || isKeyFrame(videoBuffer))) {
+      status = Status.RECORDING;
+      if (listener != null) listener.onStatusChange(status);
+    }
+    if (status == Status.RECORDING) {
+      updateFormat(this.videoInfo, videoInfo);
+      write(videoTrack, videoBuffer, this.videoInfo);
+    }
+  }
+
+  @Override
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  public void recordAudio(ByteBuffer audioBuffer, MediaCodec.BufferInfo audioInfo) {
+    if (status == Status.RECORDING) {
+      updateFormat(this.audioInfo, audioInfo);
+      write(audioTrack, audioBuffer, this.audioInfo);
+    }
+  }
+
+  @Override
+  public void setVideoFormat(MediaFormat videoFormat, boolean isOnlyVideo) {
+    this.videoFormat = videoFormat;
+    this.isOnlyVideo = isOnlyVideo;
+  }
+
+  @Override
+  public void setAudioFormat(MediaFormat audioFormat, boolean isOnlyAudio) {
+    this.audioFormat = audioFormat;
+    this.isOnlyAudio = isOnlyAudio;
+    if (isOnlyAudio && status == Status.STARTED
+            && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      init();
+    }
+  }
+
+  @Override
+  public void resetFormats() {
+    videoFormat = null;
+    audioFormat = null;
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  private void init() {
+    if (!isOnlyVideo) audioTrack = mediaMuxer.addTrack(audioFormat);
+    mediaMuxer.start();
+    status = Status.RECORDING;
+    if (listener != null) listener.onStatusChange(status);
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+  private void write(int track, ByteBuffer byteBuffer, MediaCodec.BufferInfo info) {
+    try {
+      mediaMuxer.writeSampleData(track, byteBuffer, info);
+    } catch (IllegalStateException | IllegalArgumentException e) {
+      Log.i(TAG, "Write error", e);
+    }
+  }
+}
\ No newline at end of file
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/BitrateAdapter.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/BitrateAdapter.java
index 023ff6c..5b5d56f 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/BitrateAdapter.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/BitrateAdapter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.util;
 
 /**
@@ -14,6 +30,8 @@ public class BitrateAdapter {
   private int averageBitrate;
   private int cont;
   private Listener listener;
+  private float decreaseRange = 0.8f; //20%
+  private float increaseRange = 1.2f; //20%
 
   public BitrateAdapter(Listener listener) {
     this.listener = listener;
@@ -38,13 +56,40 @@ public class BitrateAdapter {
     }
   }
 
+  /**
+   * Adapt bitrate on fly based on queue state.
+   */
+  public void adaptBitrate(long actualBitrate, boolean hasCongestion) {
+    averageBitrate += actualBitrate;
+    averageBitrate /= 2;
+    cont++;
+    if (cont >= 5) {
+      if (listener != null && maxBitrate != 0) {
+        listener.onBitrateAdapted(getBitrateAdapted(averageBitrate, hasCongestion));
+        reset();
+      }
+    }
+  }
+
   private int getBitrateAdapted(int bitrate) {
     if (bitrate >= maxBitrate) { //You have high speed and max bitrate. Keep max speed
       oldBitrate = maxBitrate;
     } else if (bitrate <= oldBitrate * 0.9f) { //You have low speed and bitrate too high. Reduce bitrate by 10%.
-      oldBitrate = (int) (bitrate * 0.9);
+      oldBitrate = (int) (bitrate * decreaseRange);
     } else { //You have high speed and bitrate too low. Increase bitrate by 10%.
-      oldBitrate = (int) (bitrate * 1.1);
+      oldBitrate = (int) (bitrate * increaseRange);
+      if (oldBitrate > maxBitrate) oldBitrate = maxBitrate;
+    }
+    return oldBitrate;
+  }
+
+  private int getBitrateAdapted(int bitrate, boolean hasCongestion) {
+    if (bitrate >= maxBitrate) { //You have high speed and max bitrate. Keep max speed
+      oldBitrate = maxBitrate;
+    } else if (hasCongestion) { //You have low speed and bitrate too high. Reduce bitrate by 10%.
+      oldBitrate = (int) (bitrate * decreaseRange);
+    } else { //You have high speed and bitrate too low. Increase bitrate by 10%.
+      oldBitrate = (int) (bitrate * increaseRange);
       if (oldBitrate > maxBitrate) oldBitrate = maxBitrate;
     }
     return oldBitrate;
@@ -54,4 +99,34 @@ public class BitrateAdapter {
     averageBitrate = 0;
     cont = 0;
   }
+
+  public float getDecreaseRange() {
+    return decreaseRange;
+  }
+
+  /**
+   * @param decreaseRange in percent. How many bitrate will be reduced based on oldBitrate.
+   * valid values:
+   * 0 to 100 not included
+   */
+  public void setDecreaseRange(float decreaseRange) {
+    if (decreaseRange > 0f && decreaseRange < 100f) {
+      this.decreaseRange = 1f - (decreaseRange / 100f);
+    }
+  }
+
+  public float getIncreaseRange() {
+    return increaseRange;
+  }
+
+  /**
+   * @param increaseRange in percent. How many bitrate will be increment based on oldBitrate.
+   * valid values:
+   * 0 to 100
+   */
+  public void setIncreaseRange(float increaseRange) {
+    if (increaseRange > 0f && increaseRange < 100f) {
+      this.increaseRange = 1f + (increaseRange / 100f);
+    }
+  }
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/Filter.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/Filter.java
new file mode 100644
index 0000000..f3c0448
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/Filter.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.util;
+
+import com.pedro.encoder.input.gl.FilterAction;
+import com.pedro.encoder.input.gl.render.filters.BaseFilterRender;
+
+/**
+ * Created by pedro on 30/07/18.
+ */
+
+public class Filter {
+
+  private FilterAction filterAction;
+  private int position;
+  private BaseFilterRender baseFilterRender;
+
+  public Filter(FilterAction filterAction, int position, BaseFilterRender baseFilterRender) {
+    this.filterAction = filterAction;
+    this.position = position;
+    this.baseFilterRender = baseFilterRender;
+  }
+
+  public FilterAction getFilterAction() {
+    return filterAction;
+  }
+
+  public void setFilterAction(FilterAction filterAction) {
+    this.filterAction = filterAction;
+  }
+
+  public int getPosition() {
+    return position;
+  }
+
+  public void setPosition(int position) {
+    this.position = position;
+  }
+
+  public BaseFilterRender getBaseFilterRender() {
+    return baseFilterRender;
+  }
+
+  public void setBaseFilterRender(BaseFilterRender baseFilterRender) {
+    this.baseFilterRender = baseFilterRender;
+  }
+}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/FpsListener.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/FpsListener.java
index 80948ff..083ce5e 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/FpsListener.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/FpsListener.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.util;
 
 /**
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/RecordController.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/RecordController.java
deleted file mode 100644
index d538274..0000000
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/RecordController.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.pedro.rtplibrary.util;
-
-import android.media.MediaCodec;
-import android.media.MediaFormat;
-import android.media.MediaMuxer;
-import android.os.Build;
-import androidx.annotation.RequiresApi;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * Created by pedro on 08/03/19.
- *
- * Class to control video recording with MediaMuxer.
- */
-public class RecordController {
-
-  private Status status = Status.STOPPED;
-  private MediaMuxer mediaMuxer;
-  private MediaFormat videoFormat, audioFormat;
-  private int videoTrack = -1;
-  private int audioTrack = -1;
-  private Listener listener;
-  //Pause/Resume
-  private long pauseMoment = 0;
-  private long pauseTime = 0;
-  private MediaCodec.BufferInfo videoInfo = new MediaCodec.BufferInfo();
-  private MediaCodec.BufferInfo audioInfo = new MediaCodec.BufferInfo();
-
-  public enum Status {
-    STARTED, STOPPED, RECORDING, PAUSED, RESUMED
-  }
-
-  public interface Listener {
-    void onStatusChange(Status status);
-  }
-
-  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
-  public void startRecord(String path, Listener listener) throws IOException {
-    mediaMuxer = new MediaMuxer(path, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
-    this.listener = listener;
-    status = Status.STARTED;
-    if (listener != null) listener.onStatusChange(status);
-  }
-
-  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
-  public void stopRecord() {
-    status = Status.STOPPED;
-    if (mediaMuxer != null) {
-      try {
-        mediaMuxer.stop();
-        mediaMuxer.release();
-      } catch (Exception ignored) {
-      }
-    }
-    mediaMuxer = null;
-    videoTrack = -1;
-    audioTrack = -1;
-    pauseMoment = 0;
-    pauseTime = 0;
-    if (listener != null) listener.onStatusChange(status);
-  }
-
-  public boolean isRunning() {
-    return status == Status.STARTED
-        || status == Status.RECORDING
-        || status == Status.RESUMED
-        || status == Status.PAUSED;
-  }
-
-  public boolean isRecording() {
-    return status == Status.RECORDING;
-  }
-
-  public Status getStatus() {
-    return status;
-  }
-
-  public void resetFormats() {
-    videoFormat = null;
-    audioFormat = null;
-  }
-
-  public void pauseRecord() {
-    if (status == Status.RECORDING) {
-      pauseMoment = System.nanoTime() / 1000;
-      status = Status.PAUSED;
-      if (listener != null) listener.onStatusChange(status);
-    }
-  }
-
-  public void resumeRecord() {
-    if (status == Status.PAUSED) {
-      pauseTime += System.nanoTime() / 1000 - pauseMoment;
-      status = Status.RESUMED;
-      if (listener != null) listener.onStatusChange(status);
-    }
-  }
-
-  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
-  public void recordVideo(ByteBuffer videoBuffer, MediaCodec.BufferInfo videoInfo) {
-    if (status == Status.STARTED
-        && videoInfo.flags == MediaCodec.BUFFER_FLAG_KEY_FRAME
-        && videoFormat != null
-        && audioFormat != null) {
-      videoTrack = mediaMuxer.addTrack(videoFormat);
-      audioTrack = mediaMuxer.addTrack(audioFormat);
-      mediaMuxer.start();
-      status = Status.RECORDING;
-      if (listener != null) listener.onStatusChange(status);
-    } else if (status == Status.RESUMED && videoInfo.flags == MediaCodec.BUFFER_FLAG_KEY_FRAME) {
-      status = Status.RECORDING;
-      if (listener != null) listener.onStatusChange(status);
-    }
-    if (status == Status.RECORDING) {
-      updateFormat(this.videoInfo, videoInfo);
-      mediaMuxer.writeSampleData(videoTrack, videoBuffer, this.videoInfo);
-    }
-  }
-
-  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
-  public void recordAudio(ByteBuffer audioBuffer, MediaCodec.BufferInfo audioInfo) {
-    if (status == Status.RECORDING) {
-      updateFormat(this.audioInfo, audioInfo);
-      mediaMuxer.writeSampleData(audioTrack, audioBuffer, this.audioInfo);
-    }
-  }
-
-  public void setVideoFormat(MediaFormat videoFormat) {
-    this.videoFormat = videoFormat;
-  }
-
-  public void setAudioFormat(MediaFormat audioFormat) {
-    this.audioFormat = audioFormat;
-  }
-
-  //We can't reuse info because could produce stream issues
-  private void updateFormat(MediaCodec.BufferInfo newInfo, MediaCodec.BufferInfo oldInfo) {
-    newInfo.flags = oldInfo.flags;
-    newInfo.offset = oldInfo.offset;
-    newInfo.size = oldInfo.size;
-    newInfo.presentationTimeUs = oldInfo.presentationTimeUs - pauseTime;
-  }
-}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/SensorRotationManager.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/SensorRotationManager.java
index 3346e05..31ecc8b 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/SensorRotationManager.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/SensorRotationManager.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.util;
 
 import android.content.Context;
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/AudioManager.kt b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/AudioManager.kt
new file mode 100644
index 0000000..eab5cb1
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/AudioManager.kt
@@ -0,0 +1,139 @@
+package com.pedro.rtplibrary.util.sources
+
+import android.media.AudioAttributes
+import android.media.AudioPlaybackCaptureConfiguration
+import android.media.projection.MediaProjection
+import android.os.Build
+import androidx.annotation.RequiresApi
+import com.pedro.encoder.input.audio.GetMicrophoneData
+import com.pedro.encoder.input.audio.MicrophoneManager
+
+/**
+ * Created by pedro on 29/3/22.
+ */
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+class AudioManager(getMicrophoneData: GetMicrophoneData, private var source: Source) {
+
+  enum class Source {
+    MICROPHONE, DISABLED,
+    @RequiresApi(Build.VERSION_CODES.Q)
+    INTERNAL,
+  }
+
+  private val microphone = MicrophoneManager(getMicrophoneData)
+  private val noSource = NoSource()
+  private var mediaProjection: MediaProjection? = null
+  private var sampleRate = 0
+  private var isStereo = true
+  private var echoCanceler = false
+  private var noiseSuppressor = false
+
+  fun createAudioManager(sampleRate: Int, isStereo: Boolean, echoCanceler: Boolean,
+    noiseSuppressor: Boolean): Boolean {
+    this.sampleRate = sampleRate
+    this.isStereo = isStereo
+    this.echoCanceler = echoCanceler
+    this.noiseSuppressor = noiseSuppressor
+    //create microphone to confirm valid parameters
+    return microphone.createMicrophone(sampleRate, isStereo, echoCanceler, noiseSuppressor)
+  }
+
+  fun start() {
+    if (!isRunning()) {
+      when (source) {
+        Source.MICROPHONE -> {
+          val result = microphone.createMicrophone(sampleRate, isStereo, echoCanceler, noiseSuppressor)
+          if (!result) {
+            throw IllegalArgumentException("Failed to create microphone audio source")
+          }
+          microphone.start()
+        }
+        Source.INTERNAL -> {
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            mediaProjection?.let {
+              val config = AudioPlaybackCaptureConfiguration.Builder(it)
+                .addMatchingUsage(AudioAttributes.USAGE_MEDIA)
+                .addMatchingUsage(AudioAttributes.USAGE_GAME)
+                .addMatchingUsage(AudioAttributes.USAGE_UNKNOWN).build()
+              val result = microphone.createInternalMicrophone(config, sampleRate, isStereo,
+                echoCanceler, noiseSuppressor)
+              if (!result) {
+                throw IllegalArgumentException("Failed to create internal audio source")
+              }
+            }
+          } else {
+            throw IllegalStateException("Using internal audio in a invalid Android version. Android 10+ is necessary")
+          }
+          microphone.start()
+        }
+        Source.DISABLED -> noSource.start()
+      }
+    }
+  }
+
+  fun stop() {
+    if (isRunning()) {
+      when (source) {
+        Source.MICROPHONE, Source.INTERNAL -> microphone.stop()
+        Source.DISABLED -> noSource.stop()
+      }
+    }
+  }
+
+  @RequiresApi(Build.VERSION_CODES.Q)
+  fun changeSourceInternal(mediaProjection: MediaProjection) {
+    if (this.source != Source.INTERNAL || this.mediaProjection == null) {
+      this.mediaProjection = mediaProjection
+      val wasRunning = isRunning()
+      stop()
+      this.source = Source.INTERNAL
+      if (wasRunning) start()
+    }
+  }
+
+  fun changeSourceMicrophone() {
+    if (this.source != Source.MICROPHONE) {
+      val wasRunning = isRunning()
+      stop()
+      this.source = Source.MICROPHONE
+      mediaProjection?.stop()
+      mediaProjection = null
+      if (wasRunning) start()
+    }
+  }
+
+  fun changeAudioSourceDisabled() {
+    if (this.source != Source.DISABLED) {
+      val wasRunning = isRunning()
+      stop()
+      this.source = Source.DISABLED
+      mediaProjection?.stop()
+      mediaProjection = null
+      if (wasRunning) start()
+    }
+  }
+
+  fun mute() {
+    if (source == Source.DISABLED) return
+    microphone.mute()
+  }
+
+  fun unMute() {
+    if (source == Source.DISABLED) return
+    microphone.unMute()
+  }
+
+  fun isMuted(): Boolean {
+    return if (source == Source.DISABLED) false
+    else microphone.isMuted
+  }
+
+  fun isRunning(): Boolean {
+    return when (source) {
+      Source.MICROPHONE, Source.INTERNAL -> microphone.isRunning
+      Source.DISABLED -> noSource.isRunning()
+    }
+  }
+
+  fun getMaxInputSize(): Int = microphone.maxInputSize
+}
\ No newline at end of file
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/NoSource.kt b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/NoSource.kt
new file mode 100644
index 0000000..7ff010e
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/NoSource.kt
@@ -0,0 +1,19 @@
+package com.pedro.rtplibrary.util.sources
+
+/**
+ * Created by pedro on 29/3/22.
+ */
+class NoSource {
+
+  private var running = false
+
+  fun start() {
+    running = true
+  }
+
+  fun stop() {
+    running = false
+  }
+
+  fun isRunning(): Boolean = running
+}
\ No newline at end of file
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/VideoManager.kt b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/VideoManager.kt
new file mode 100644
index 0000000..ace2669
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/util/sources/VideoManager.kt
@@ -0,0 +1,411 @@
+package com.pedro.rtplibrary.util.sources
+
+import android.content.Context
+import android.graphics.SurfaceTexture
+import android.hardware.Camera
+import android.hardware.camera2.CameraCharacteristics
+import android.hardware.display.DisplayManager
+import android.hardware.display.VirtualDisplay
+import android.media.projection.MediaProjection
+import android.os.Build
+import android.util.Range
+import android.util.Size
+import android.view.MotionEvent
+import android.view.Surface
+import androidx.annotation.RequiresApi
+import com.pedro.encoder.input.video.Camera1ApiManager
+import com.pedro.encoder.input.video.Camera2ApiManager
+import com.pedro.encoder.input.video.CameraHelper
+
+
+/**
+ * Created by pedro on 21/2/22.
+ * A class to use camera1 or camera2 with same methods totally transparent for user.
+ */
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+class VideoManager(private val context: Context, private var source: Source) {
+
+  enum class Source {
+    CAMERA1, CAMERA2, SCREEN, DISABLED
+  }
+
+  private var facing = CameraHelper.Facing.BACK
+  private val camera1 = Camera1ApiManager(null, context)
+  private val camera2 = Camera2ApiManager(context)
+  private var mediaProjection: MediaProjection? = null
+  private var virtualDisplay: VirtualDisplay? = null
+  private val noSource = NoSource()
+
+  private var surfaceTexture: SurfaceTexture? = null
+  private var width = 0
+  private var height = 0
+  private var fps = 0
+
+  fun createVideoManager(width: Int, height: Int, fps: Int): Boolean {
+    this.width = width
+    this.height = height
+    this.fps = fps
+    return checkResolutionSupported(width, height, source)
+  }
+
+  fun changeSourceCamera(source: Source) {
+    if (source == Source.SCREEN || source == Source.DISABLED) {
+      throw IllegalArgumentException("Invalid ${source.name}. Only ${Source.CAMERA1.name} or ${Source.CAMERA2.name} is accepted.")
+    }
+    if (this.source != source) {
+      if (!checkResolutionSupported(width, height, source)) {
+        throw IllegalArgumentException("Resolution ${width}x$height is not supported for ${source.name}.")
+      }
+      val wasRunning = isRunning()
+      stop()
+      this.source = source
+      mediaProjection?.stop()
+      mediaProjection = null
+      surfaceTexture?.let {
+        if (wasRunning) start(it)
+      }
+    }
+  }
+
+  fun changeSourceScreen(mediaProjection: MediaProjection) {
+    if (this.source != Source.SCREEN || this.mediaProjection == null) {
+      this.mediaProjection = mediaProjection
+      val wasRunning = isRunning()
+      stop()
+      this.source = Source.SCREEN
+      surfaceTexture?.let {
+        if (wasRunning) start(it)
+      }
+    }
+  }
+
+  fun changeVideoSourceDisabled() {
+    if (this.source != Source.DISABLED) {
+      val wasRunning = isRunning()
+      stop()
+      this.source = Source.DISABLED
+      mediaProjection?.stop()
+      mediaProjection = null
+      surfaceTexture?.let {
+        if (wasRunning) start(it)
+      }
+    }
+  }
+
+  fun start(surfaceTexture: SurfaceTexture) {
+    this.surfaceTexture = surfaceTexture
+    if (!isRunning()) {
+      when (source) {
+        Source.CAMERA1 -> {
+          surfaceTexture.setDefaultBufferSize(width, height)
+          camera1.setSurfaceTexture(surfaceTexture)
+          camera1.start(facing, width, height, fps)
+          camera1.setPreviewOrientation(90) // necessary to use the same orientation than camera2
+        }
+        Source.CAMERA2 -> {
+          surfaceTexture.setDefaultBufferSize(width, height)
+          camera2.prepareCamera(surfaceTexture, width, height, fps)
+          camera2.openCameraFacing(facing)
+        }
+        Source.SCREEN -> {
+          val dpi = context.resources.displayMetrics.densityDpi
+          var flags = DisplayManager.VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR
+          val VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT = 128
+          flags += VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT
+          //Adapt MediaProjection render to stream resolution
+          val shouldRotate = width > height
+          val displayWidth = if (shouldRotate) height else width
+          val displayHeight = if (shouldRotate) width else height
+          if (shouldRotate) {
+            surfaceTexture.setDefaultBufferSize(height, width)
+          }
+          virtualDisplay = mediaProjection?.createVirtualDisplay("VideoManagerScreen",
+            displayWidth, displayHeight, dpi, flags,
+            Surface(surfaceTexture), null, null)
+        }
+        Source.DISABLED -> noSource.start()
+      }
+    }
+  }
+
+  fun stop() {
+    if (isRunning()) {
+      when (source) {
+        Source.CAMERA1 -> {
+          camera1.stop()
+        }
+        Source.CAMERA2 -> {
+          camera2.closeCamera()
+        }
+        Source.SCREEN -> {
+          virtualDisplay?.release()
+          virtualDisplay = null
+        }
+        Source.DISABLED -> noSource.stop()
+      }
+    }
+  }
+
+  fun setExposure(level: Int) {
+    if (isRunning()) {
+      when (source) {
+        Source.CAMERA1 -> {
+          camera1.exposure = level
+        }
+        Source.CAMERA2 -> {
+          camera2.exposure = level
+        }
+        else -> {}
+      }
+    }
+  }
+
+  fun getExposure(): Int {
+    if (isRunning()) {
+      return when (source) {
+        Source.CAMERA1 -> {
+          camera1.exposure
+        }
+        Source.CAMERA2 -> {
+          camera2.exposure
+        }
+        else -> 0
+      }
+    }
+    return 0
+  }
+
+  fun enableLantern() {
+    if (isRunning()) {
+      when (source) {
+        Source.CAMERA1 -> {
+          camera1.enableLantern()
+        }
+        Source.CAMERA2 -> {
+          camera2.enableLantern()
+        }
+        else -> {}
+      }
+    }
+  }
+
+  fun disableLantern() {
+    if (isRunning()) {
+      when (source) {
+        Source.CAMERA1 -> {
+          camera1.disableLantern()
+        }
+        Source.CAMERA2 -> {
+          camera2.disableLantern()
+        }
+        else -> {}
+      }
+    }
+  }
+
+  fun isLanternEnabled(): Boolean {
+    if (isRunning()) {
+      return when (source) {
+        Source.CAMERA1 -> {
+          camera1.isLanternEnabled
+        }
+        Source.CAMERA2 -> {
+          camera2.isLanternEnabled
+        }
+        else -> false
+      }
+    }
+    return false
+  }
+
+  fun enableAutoFocus() {
+    if (isRunning()) {
+      when (source) {
+        Source.CAMERA1 -> {
+          camera1.enableAutoFocus()
+        }
+        Source.CAMERA2 -> {
+          camera2.enableAutoFocus()
+        }
+        else -> {}
+      }
+    }
+  }
+
+  fun disableAutoFocus() {
+    if (isRunning()) {
+      when (source) {
+        Source.CAMERA1 -> {
+          camera1.disableAutoFocus()
+        }
+        Source.CAMERA2 -> {
+          camera2.disableAutoFocus()
+        }
+        else -> {}
+      }
+    }
+  }
+
+  fun isAutoFocusEnabled(): Boolean {
+    if (isRunning()) {
+      return when (source) {
+        Source.CAMERA1 -> {
+          camera1.isAutoFocusEnabled
+        }
+        Source.CAMERA2 -> {
+          camera2.isAutoFocusEnabled
+        }
+        else -> false
+      }
+    }
+    return false
+  }
+
+  fun setZoom(event: MotionEvent) {
+    if (isRunning()) {
+      when (source) {
+        Source.CAMERA1 -> {
+          camera1.setZoom(event)
+        }
+        Source.CAMERA2 -> {
+          camera2.setZoom(event)
+        }
+        else -> {}
+      }
+    }
+  }
+
+  fun setZoom(level: Float) {
+    if (isRunning()) {
+      when (source) {
+        Source.CAMERA1 -> {
+          camera1.zoom = level.toInt()
+        }
+        Source.CAMERA2 -> {
+          camera2.zoom = level
+        }
+        else -> {}
+      }
+    }
+  }
+
+  fun getZoomRange(): Range<Float> {
+    if (isRunning()) {
+      return when (source) {
+        Source.CAMERA1 -> {
+          Range(camera1.minZoom.toFloat(), camera1.maxZoom.toFloat())
+        }
+        Source.CAMERA2 -> {
+          camera2.zoomRange
+        }
+        else -> Range(0f, 0f)
+      }
+    }
+    return Range(0f, 0f)
+  }
+
+  fun getZoom(): Float {
+    if (isRunning()) {
+      return when (source) {
+        Source.CAMERA1 -> {
+          camera1.zoom.toFloat()
+        }
+        Source.CAMERA2 -> {
+          camera2.zoom
+        }
+        else -> 0f
+      }
+    }
+    return 0f
+  }
+
+  fun switchCamera() {
+    if (source == Source.SCREEN || source == Source.DISABLED) return
+    facing = if (facing == CameraHelper.Facing.BACK) {
+      CameraHelper.Facing.FRONT
+    } else {
+      CameraHelper.Facing.BACK
+    }
+    if (isRunning()) {
+      stop()
+      surfaceTexture?.let {
+        start(it)
+      }
+    }
+  }
+
+  fun getCameraFacing(): CameraHelper.Facing = facing
+
+  fun isRunning(): Boolean {
+    return when (source) {
+      Source.CAMERA1 -> camera1.isRunning
+      Source.CAMERA2 -> camera2.isRunning
+      Source.SCREEN -> virtualDisplay != null
+      Source.DISABLED -> noSource.isRunning()
+    }
+  }
+
+  fun getCameraResolutions(source: Source, facing: CameraHelper.Facing): List<Size> {
+      return when (source) {
+        Source.CAMERA1 -> {
+          val resolutions = if (facing == CameraHelper.Facing.FRONT) {
+            camera1.previewSizeFront
+          } else {
+            camera1.previewSizeBack
+          }
+          mapCamera1Resolutions(resolutions)
+        }
+        Source.CAMERA2 -> {
+          val resolutions = if (facing == CameraHelper.Facing.FRONT) {
+            camera2.cameraResolutionsFront
+          } else {
+            camera2.cameraResolutionsBack
+          }
+          resolutions.toList()
+        }
+        else -> emptyList()
+      }
+  }
+
+  private fun checkResolutionSupported(width: Int, height: Int, source: Source): Boolean {
+    if (width % 2 != 0 || height % 2 != 0) {
+      throw IllegalArgumentException("width and height values must be divisible by 2")
+    }
+    when (source) {
+      Source.CAMERA1 -> {
+        val shouldRotate = width > height
+        val w = if (shouldRotate) height else width
+        val h = if (shouldRotate) width else height
+        val size = Size(w, h)
+        val resolutions = if (facing == CameraHelper.Facing.BACK) {
+          camera1.previewSizeBack
+        } else camera1.previewSizeFront
+        return mapCamera1Resolutions(resolutions).contains(size)
+      }
+      Source.CAMERA2 -> {
+        val size = Size(width, height)
+        val resolutions = if (facing == CameraHelper.Facing.BACK) {
+          camera2.cameraResolutionsBack
+        } else camera2.cameraResolutionsFront
+        return if (camera2.levelSupported == CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY) {
+          //this is a wrapper of camera1 api. Only listed resolutions are supported
+          resolutions.contains(size)
+        } else {
+          val widthList = resolutions.map { size.width }
+          val heightList = resolutions.map { size.height }
+          val maxWidth = widthList.maxOrNull() ?: 0
+          val maxHeight = heightList.maxOrNull() ?: 0
+          val minWidth = widthList.minOrNull() ?: 0
+          val minHeight = heightList.minOrNull() ?: 0
+          size.width in minWidth..maxWidth && size.height in minHeight..maxHeight
+        }
+      }
+      Source.SCREEN, Source.DISABLED -> {
+        return true
+      }
+    }
+  }
+
+  @Suppress("DEPRECATION")
+  private fun mapCamera1Resolutions(resolutions: List<Camera.Size>) = resolutions.map { Size(it.width, it.height) }
+}
\ No newline at end of file
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/AspectRatioMode.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/AspectRatioMode.java
new file mode 100644
index 0000000..5c74d45
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/AspectRatioMode.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.view;
+
+public enum AspectRatioMode {
+    Adjust(0),
+    Fill(1),
+    AdjustRotate(2),
+    FillRotate(3);
+
+    int id;
+
+    AspectRatioMode(int id) {
+        this.id = id;
+    }
+
+    static AspectRatioMode fromId(int id) {
+        for (AspectRatioMode mode : values()) {
+            if (mode.id == id) return mode;
+        }
+        throw new IllegalArgumentException();
+    }
+}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/Filter.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/Filter.java
deleted file mode 100644
index a215b55..0000000
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/Filter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.pedro.rtplibrary.view;
-
-import com.pedro.encoder.input.gl.render.filters.BaseFilterRender;
-
-/**
- * Created by pedro on 30/07/18.
- */
-
-public class Filter {
-
-  private int position;
-  private BaseFilterRender baseFilterRender;
-
-  public Filter() {
-  }
-
-  public Filter(int position, BaseFilterRender baseFilterRender) {
-    this.position = position;
-    this.baseFilterRender = baseFilterRender;
-  }
-
-  public int getPosition() {
-    return position;
-  }
-
-  public void setPosition(int position) {
-    this.position = position;
-  }
-
-  public BaseFilterRender getBaseFilterRender() {
-    return baseFilterRender;
-  }
-
-  public void setBaseFilterRender(BaseFilterRender baseFilterRender) {
-    this.baseFilterRender = baseFilterRender;
-  }
-}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java
index 4daa95b..bc5f72f 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java
@@ -1,5 +1,22 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.view;
 
+import android.graphics.Point;
 import android.graphics.SurfaceTexture;
 import android.view.Surface;
 import com.pedro.encoder.input.gl.render.filters.BaseFilterRender;
@@ -18,6 +35,7 @@ public interface GlInterface {
    */
   void setEncoderSize(int width, int height);
 
+  Point getEncoderSize();
   /**
    * Get SurfaceTexture generated by Opengl. This should be called after start render.
    * @return surface texture generated by Opengl.
@@ -50,17 +68,59 @@ public interface GlInterface {
   void takePhoto(TakePhotoCallback takePhotoCallback);
 
   /**
-   * Set a filter to stream.
-   * You can select any filter from {@link com.pedro.encoder.input.gl.render.filters} or create
-   * your own filter if you extends from {@link com.pedro.encoder.input.gl.render.filters.BaseFilterRender}
+   * Replaces the filter at the specified position with the specified filter.
+   * You can modify filter's parameters after set it to stream.
    *
-   * @param baseFilterRender filter to set. You can modify parameters to filter after set it to stream.
+   * @param filterPosition filter position
+   * @param baseFilterRender filter to set
    */
   void setFilter(int filterPosition, BaseFilterRender baseFilterRender);
 
   /**
-   * Set filter in position 0.
-   * @param baseFilterRender filter to set. You can modify parameters to filter after set it to stream.
+   * Appends the specified filter to the end.
+   * You can modify filter's parameters after set it to stream.
+   *
+   * @param baseFilterRender filter to add
+   */
+  void addFilter(BaseFilterRender baseFilterRender);
+
+  /**
+   * Inserts the specified filter at the specified position.
+   * You can modify filter's parameters after set it to stream.
+   *
+   * @param filterPosition filter position
+   * @param baseFilterRender filter to set
+   */
+  void addFilter(int filterPosition, BaseFilterRender baseFilterRender);
+
+  /**
+   * Remove all filters
+   */
+  void clearFilters();
+
+  /**
+   * Remove the filter at the specified position.
+   *
+   * @param filterPosition position of filter to remove
+   */
+  void removeFilter(int filterPosition);
+
+  /**
+   * Removes the first occurrence of the specified element from this list, if it is present.
+   *
+   * @param baseFilterRender filter to remove
+   */
+  void removeFilter(BaseFilterRender baseFilterRender);
+  /**
+   * @return number of filters
+   */
+  int filtersCount();
+
+  /**
+   * Replace the filter in position 0 or add the filter if list is empty.
+   * You can modify filter's parameters after set it to stream.
+   *
+   * @param baseFilterRender filter to set.
    */
   void setFilter(BaseFilterRender baseFilterRender);
   
@@ -78,6 +138,26 @@ public interface GlInterface {
    */
   void setStreamRotation(int rotation);
 
+  /**
+   * When true, flips only the stream horizontally
+   */
+  void setIsStreamHorizontalFlip(boolean flip);
+
+  /**
+   * When true, flips only the stream vertically
+   */
+  void setIsStreamVerticalFlip(boolean flip);
+
+  /**
+   * When true, flips only the preview horizontally
+   */
+  void setIsPreviewHorizontalFlip(boolean flip);
+
+  /**
+   * When true, flips only the preview vertically
+   */
+  void setIsPreviewVerticalFlip(boolean flip);
+
   /**
    * Get Anti alias is enabled.
    * @return true is enabled, false is disabled.
@@ -100,4 +180,21 @@ public interface GlInterface {
   void stop();
 
   void setFps(int fps);
+
+  /**
+   * This produce send black image all time.
+   * This affect to stream and record result.
+   */
+  void muteVideo();
+
+  void unMuteVideo();
+
+  boolean isVideoMuted();
+
+  /**
+   * @param force render last frame.
+   * This is useful with Display mode to continue producing video frames.
+   * Not recommendable in others modes.
+   */
+  void setForceRender(boolean force);
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlStreamInterface.kt b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlStreamInterface.kt
new file mode 100644
index 0000000..baaecd9
--- /dev/null
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlStreamInterface.kt
@@ -0,0 +1,244 @@
+package com.pedro.rtplibrary.view
+
+import android.content.Context
+import android.graphics.Point
+import android.graphics.SurfaceTexture
+import android.graphics.SurfaceTexture.OnFrameAvailableListener
+import android.os.Build
+import android.view.Surface
+import androidx.annotation.RequiresApi
+import com.pedro.encoder.input.gl.FilterAction
+import com.pedro.encoder.input.gl.SurfaceManager
+import com.pedro.encoder.input.gl.render.MainRender
+import com.pedro.encoder.input.gl.render.filters.BaseFilterRender
+import com.pedro.encoder.input.video.CameraHelper
+import com.pedro.encoder.input.video.FpsLimiter
+import com.pedro.rtplibrary.util.Filter
+import java.util.concurrent.BlockingQueue
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.Semaphore
+
+/**
+ * Created by pedro on 14/3/22.
+ */
+@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+class GlStreamInterface(private val context: Context) : Runnable, OnFrameAvailableListener {
+
+  private var thread: Thread? = null
+  private var frameAvailable = false
+  var running = false
+  private var initialized = false
+  private val surfaceManager = SurfaceManager()
+  private val surfaceManagerEncoder = SurfaceManager()
+  private val surfaceManagerPreview = SurfaceManager()
+  private var managerRender: MainRender? = null
+  private val semaphore = Semaphore(0)
+  private val sync = Object()
+  private var encoderWidth = 0
+  private var encoderHeight = 0
+  private var streamOrientation = 0
+  private var previewWidth = 0
+  private var previewHeight = 0
+  private var previewOrientation = 0
+  private var isPortrait = false
+  private val fpsLimiter = FpsLimiter()
+  private val filterQueue: BlockingQueue<Filter> = LinkedBlockingQueue()
+  private var forceRender = false
+
+  fun init() {
+    if (!initialized) managerRender = MainRender()
+    managerRender?.setCameraFlip(false, false)
+    initialized = true
+  }
+
+  fun setEncoderSize(width: Int, height: Int) {
+    encoderWidth = width
+    encoderHeight = height
+  }
+
+  fun getEncoderSize(): Point {
+    return Point(encoderWidth, encoderHeight)
+  }
+
+  fun setFps(fps: Int) {
+    fpsLimiter.setFPS(fps)
+  }
+
+  fun setForceRender(forceRender: Boolean) {
+    this.forceRender = forceRender
+  }
+
+  fun getSurfaceTexture(): SurfaceTexture {
+    return managerRender!!.getSurfaceTexture()
+  }
+
+  fun getSurface(): Surface {
+    return managerRender!!.getSurface()
+  }
+
+  fun addMediaCodecSurface(surface: Surface) {
+    synchronized(sync) {
+      if (surfaceManager.isReady) {
+        surfaceManagerEncoder.release()
+        surfaceManagerEncoder.eglSetup(surface, surfaceManager)
+      }
+    }
+  }
+
+  fun removeMediaCodecSurface() {
+    synchronized(sync) {
+      surfaceManagerEncoder.release()
+    }
+  }
+
+  fun start() {
+    synchronized(sync) {
+      thread = Thread(this)
+      running = true
+      thread?.start()
+      semaphore.acquireUninterruptibly()
+    }
+  }
+
+  fun stop() {
+    synchronized(sync) {
+      running = false
+      thread?.interrupt()
+      try {
+        thread?.join(100)
+      } catch (e: InterruptedException) {
+        thread?.interrupt()
+      }
+      thread = null
+      surfaceManagerEncoder.release()
+      surfaceManager.release()
+    }
+  }
+
+  override fun run() {
+    surfaceManager.release()
+    surfaceManager.eglSetup()
+    surfaceManager.makeCurrent()
+    managerRender?.initGl(context, encoderWidth, encoderHeight, encoderWidth, encoderHeight)
+    managerRender?.getSurfaceTexture()?.setOnFrameAvailableListener(this)
+    semaphore.release()
+    try {
+      while (running) {
+        if (frameAvailable || forceRender) {
+          frameAvailable = false
+          surfaceManager.makeCurrent()
+          managerRender?.updateFrame()
+          managerRender?.drawOffScreen()
+          managerRender?.drawScreen(encoderWidth, encoderHeight, false, 0, 0,
+              false, false)
+          surfaceManager.swapBuffer()
+
+          if (!filterQueue.isEmpty()) {
+            val filter = filterQueue.take()
+            managerRender?.setFilterAction(filter.filterAction, filter.position, filter.baseFilterRender)
+          }
+
+          synchronized(sync) {
+            val limitFps = fpsLimiter.limitFPS()
+            // render VideoEncoder (stream and record)
+            if (surfaceManagerEncoder.isReady && !limitFps) {
+              val w =  encoderWidth
+              val h =  encoderHeight
+              surfaceManagerEncoder.makeCurrent()
+              managerRender?.drawScreenEncoder(w, h, isPortrait, streamOrientation,
+                  false, false)
+              surfaceManagerEncoder.swapBuffer()
+            }
+            // render preview
+            if (surfaceManagerPreview.isReady && !limitFps) {
+              val w =  if (previewWidth == 0) encoderWidth else previewWidth
+              val h =  if (previewHeight == 0) encoderHeight else previewHeight
+              surfaceManagerPreview.makeCurrent()
+              managerRender?.drawScreenPreview(w, h, isPortrait, true, 0, previewOrientation,
+                 false, false)
+              surfaceManagerPreview.swapBuffer()
+            }
+          }
+        }
+      }
+    } catch (ignore: InterruptedException) {
+      Thread.currentThread().interrupt()
+    } finally {
+      managerRender?.release()
+      surfaceManagerEncoder.release()
+      surfaceManager.release()
+    }
+  }
+
+  override fun onFrameAvailable(surfaceTexture: SurfaceTexture?) {
+    synchronized(sync) {
+      frameAvailable = true
+      sync.notifyAll()
+    }
+  }
+
+  fun attachPreview(surface: Surface) {
+    synchronized(sync) {
+      if (surfaceManager.isReady) {
+        isPortrait = CameraHelper.isPortrait(context)
+        surfaceManagerPreview.release()
+        surfaceManagerPreview.eglSetup(surface, surfaceManager)
+      }
+    }
+  }
+
+  fun deAttachPreview() {
+    synchronized(sync) {
+      surfaceManagerPreview.release()
+    }
+  }
+
+  fun setStreamOrientation(orientation: Int) {
+    this.streamOrientation = orientation
+  }
+
+  fun setPreviewResolution(width: Int, height: Int) {
+    this.previewWidth = width
+    this.previewHeight = height
+  }
+
+  fun setPreviewOrientation(orientation: Int) {
+    this.previewOrientation = orientation
+  }
+
+  fun setCameraOrientation(orientation: Int) {
+    managerRender?.setCameraRotation(orientation)
+  }
+
+  fun setFilter(filterPosition: Int, baseFilterRender: BaseFilterRender?) {
+    filterQueue.add(Filter(FilterAction.SET_INDEX, filterPosition, baseFilterRender))
+  }
+
+  fun addFilter(baseFilterRender: BaseFilterRender?) {
+    filterQueue.add(Filter(FilterAction.ADD, 0, baseFilterRender))
+  }
+
+  fun addFilter(filterPosition: Int, baseFilterRender: BaseFilterRender?) {
+    filterQueue.add(Filter(FilterAction.ADD_INDEX, filterPosition, baseFilterRender))
+  }
+
+  fun clearFilters() {
+    filterQueue.add(Filter(FilterAction.CLEAR, 0, null))
+  }
+
+  fun removeFilter(filterPosition: Int) {
+    filterQueue.add(Filter(FilterAction.REMOVE_INDEX, filterPosition, null))
+  }
+
+  fun removeFilter(baseFilterRender: BaseFilterRender?) {
+    filterQueue.add(Filter(FilterAction.REMOVE, 0, baseFilterRender))
+  }
+
+  fun filtersCount(): Int {
+    return managerRender?.filtersCount() ?: 0
+  }
+
+  fun setFilter(baseFilterRender: BaseFilterRender?) {
+    filterQueue.add(Filter(FilterAction.SET, 0, baseFilterRender))
+  }
+}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java
index faf6154..aff68db 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java
@@ -1,15 +1,30 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.SurfaceTexture;
 import android.os.Build;
+import android.util.AttributeSet;
 import android.util.Log;
+import android.view.Surface;
 import android.view.SurfaceHolder;
 import androidx.annotation.RequiresApi;
-import android.util.AttributeSet;
-import android.view.Surface;
-import com.pedro.encoder.input.gl.SurfaceManager;
 import com.pedro.encoder.input.gl.render.SimpleCameraRender;
 import com.pedro.encoder.input.gl.render.filters.BaseFilterRender;
 import com.pedro.encoder.utils.gl.GlUtil;
@@ -26,7 +41,7 @@ public class LightOpenGlView extends OpenGlViewBase {
 
   private SimpleCameraRender simpleCameraRender = null;
   private boolean keepAspectRatio = false;
-  private int aspectRatioMode = 0;
+  private AspectRatioMode aspectRatioMode = AspectRatioMode.Adjust;
   private boolean isFlipHorizontal = false, isFlipVertical = false;
 
   public LightOpenGlView(Context context) {
@@ -38,7 +53,7 @@ public class LightOpenGlView extends OpenGlViewBase {
     TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.LightOpenGlView);
     try {
       keepAspectRatio = typedArray.getBoolean(R.styleable.LightOpenGlView_keepAspectRatio, false);
-      aspectRatioMode = typedArray.getInt(R.styleable.OpenGlView_aspectRatioMode, 0);
+      aspectRatioMode = AspectRatioMode.fromId(typedArray.getInt(R.styleable.OpenGlView_aspectRatioMode, 0));
       isFlipHorizontal = typedArray.getBoolean(R.styleable.LightOpenGlView_isFlipHorizontal, false);
       isFlipVertical = typedArray.getBoolean(R.styleable.LightOpenGlView_isFlipVertical, false);
     } finally {
@@ -57,6 +72,10 @@ public class LightOpenGlView extends OpenGlViewBase {
     return keepAspectRatio;
   }
 
+  public void setAspectRatioMode(AspectRatioMode aspectRatioMode) {
+    this.aspectRatioMode = aspectRatioMode;
+  }
+
   public void setKeepAspectRatio(boolean keepAspectRatio) {
     this.keepAspectRatio = keepAspectRatio;
   }
@@ -74,37 +93,47 @@ public class LightOpenGlView extends OpenGlViewBase {
 
   @Override
   public void run() {
-    releaseSurfaceManager();
-    surfaceManager = new SurfaceManager(getHolder().getSurface());
+    surfaceManager.release();
+    surfaceManager.eglSetup(getHolder().getSurface());
     surfaceManager.makeCurrent();
     simpleCameraRender.initGl(getContext(), encoderWidth, encoderHeight);
     simpleCameraRender.getSurfaceTexture().setOnFrameAvailableListener(this);
+    surfaceManagerPhoto.release();
+    surfaceManagerPhoto.eglSetup(encoderWidth, encoderHeight, surfaceManager);
     semaphore.release();
     while (running) {
-      if (frameAvailable) {
+      if (frameAvailable || forceRender) {
         frameAvailable = false;
         surfaceManager.makeCurrent();
         simpleCameraRender.updateFrame();
-        simpleCameraRender.drawFrame(previewWidth, previewHeight, keepAspectRatio, aspectRatioMode,
-            0, true);
+        simpleCameraRender.drawFrame(previewWidth, previewHeight, keepAspectRatio, aspectRatioMode.id,
+            0, isPreviewVerticalFlip, isPreviewHorizontalFlip);
         surfaceManager.swapBuffer();
-        if (takePhotoCallback != null) {
-          takePhotoCallback.onTakePhoto(
-              GlUtil.getBitmap(previewWidth, previewHeight, encoderWidth, encoderHeight));
-          takePhotoCallback = null;
-        }
+
         synchronized (sync) {
-          if (surfaceManagerEncoder != null && !fpsLimiter.limitFPS()) {
+          if (surfaceManagerEncoder.isReady() && !fpsLimiter.limitFPS()) {
+            int w = muteVideo ? 0 : encoderWidth;
+            int h = muteVideo ? 0 : encoderHeight;
             surfaceManagerEncoder.makeCurrent();
-            simpleCameraRender.drawFrame(encoderWidth, encoderHeight, false, aspectRatioMode,
-                streamRotation, false);
+            simpleCameraRender.drawFrame(w, h, false, aspectRatioMode.id,
+                streamRotation, isStreamVerticalFlip, isStreamHorizontalFlip);
             surfaceManagerEncoder.swapBuffer();
           }
+          if (takePhotoCallback != null && surfaceManagerPhoto.isReady()) {
+            surfaceManagerPhoto.makeCurrent();
+            simpleCameraRender.drawFrame(encoderWidth, encoderHeight, false, aspectRatioMode.id,
+                streamRotation, isStreamVerticalFlip, isStreamHorizontalFlip);
+            takePhotoCallback.onTakePhoto(GlUtil.getBitmap(encoderWidth, encoderHeight));
+            takePhotoCallback = null;
+            surfaceManagerPhoto.swapBuffer();
+          }
         }
       }
     }
     simpleCameraRender.release();
-    releaseSurfaceManager();
+    surfaceManagerPhoto.release();
+    surfaceManagerEncoder.release();
+    surfaceManager.release();
   }
 
   @Override
@@ -122,9 +151,39 @@ public class LightOpenGlView extends OpenGlViewBase {
 
   }
 
+  @Override
+  public void addFilter(BaseFilterRender baseFilterRender) {
+
+  }
+
+  @Override
+  public void addFilter(int filterPosition, BaseFilterRender baseFilterRender) {
+
+  }
+
+  @Override
+  public void clearFilters() {
+
+  }
+
+  @Override
+  public void removeFilter(int filterPosition) {
+
+  }
+
+  @Override
+  public void removeFilter(BaseFilterRender baseFilterRender) {
+
+  }
+
+  @Override
+  public int filtersCount() {
+    return 0;
+  }
+
   @Override
   public void setFilter(BaseFilterRender baseFilterRender) {
-    setFilter(0, baseFilterRender);
+    addFilter(baseFilterRender);
   }
 
   @Override
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java
index c307b4a..ff28391 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java
@@ -1,15 +1,36 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.view;
 
 import android.content.Context;
+import android.graphics.Point;
 import android.graphics.SurfaceTexture;
 import android.os.Build;
-import androidx.annotation.RequiresApi;
 import android.view.Surface;
+import androidx.annotation.RequiresApi;
+
+import com.pedro.encoder.input.gl.FilterAction;
 import com.pedro.encoder.input.gl.SurfaceManager;
 import com.pedro.encoder.input.gl.render.ManagerRender;
 import com.pedro.encoder.input.gl.render.filters.BaseFilterRender;
 import com.pedro.encoder.input.video.FpsLimiter;
 import com.pedro.encoder.utils.gl.GlUtil;
+import com.pedro.rtplibrary.util.Filter;
+
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Semaphore;
@@ -28,10 +49,11 @@ public class OffScreenGlThread
   private boolean running = true;
   private boolean initialized = false;
 
-  private SurfaceManager surfaceManager = null;
-  private SurfaceManager surfaceManagerEncoder = null;
+  private final SurfaceManager surfaceManagerPhoto = new SurfaceManager();
+  private final SurfaceManager surfaceManager = new SurfaceManager();
+  private final SurfaceManager surfaceManagerEncoder = new SurfaceManager();
 
-  private ManagerRender textureManager = null;
+  private ManagerRender managerRender = null;
 
   private final Semaphore semaphore = new Semaphore(0);
   private final BlockingQueue<Filter> filterQueue = new LinkedBlockingQueue<>();
@@ -39,11 +61,16 @@ public class OffScreenGlThread
   private int encoderWidth, encoderHeight;
   private boolean loadAA = false;
   private int streamRotation;
+  private boolean muteVideo = false;
+  protected boolean isPreviewHorizontalFlip = false;
+  protected boolean isPreviewVerticalFlip = false;
+  private boolean isStreamHorizontalFlip = false;
+  private boolean isStreamVerticalFlip = false;
 
   private boolean AAEnabled = false;
-  private FpsLimiter fpsLimiter = new FpsLimiter();
-  //used with camera
+  private final FpsLimiter fpsLimiter = new FpsLimiter();
   private TakePhotoCallback takePhotoCallback;
+  private boolean forceRender = false;
 
   public OffScreenGlThread(Context context) {
     this.context = context;
@@ -51,17 +78,42 @@ public class OffScreenGlThread
 
   @Override
   public void init() {
-    if (!initialized) textureManager = new ManagerRender();
-    textureManager.setCameraFlip(false, false);
+    if (!initialized) managerRender = new ManagerRender();
+    managerRender.setCameraFlip(false, false);
     initialized = true;
   }
 
+  @Override
+  public void setForceRender(boolean forceRender) {
+    this.forceRender = forceRender;
+  }
+
   @Override
   public void setEncoderSize(int width, int height) {
     this.encoderWidth = width;
     this.encoderHeight = height;
   }
 
+  @Override
+  public Point getEncoderSize() {
+    return new Point(encoderWidth, encoderHeight);
+  }
+
+  @Override
+  public void muteVideo() {
+    muteVideo = true;
+  }
+
+  @Override
+  public void unMuteVideo() {
+    muteVideo = false;
+  }
+
+  @Override
+  public boolean isVideoMuted() {
+    return muteVideo;
+  }
+
   @Override
   public void setFps(int fps) {
     fpsLimiter.setFPS(fps);
@@ -69,28 +121,32 @@ public class OffScreenGlThread
 
   @Override
   public SurfaceTexture getSurfaceTexture() {
-    return textureManager.getSurfaceTexture();
+    return managerRender.getSurfaceTexture();
   }
 
   @Override
   public Surface getSurface() {
-    return textureManager.getSurface();
+    return managerRender.getSurface();
   }
 
   @Override
   public void addMediaCodecSurface(Surface surface) {
     synchronized (sync) {
-      surfaceManagerEncoder = new SurfaceManager(surface, surfaceManager);
+      if (surfaceManager.isReady()) {
+        surfaceManagerPhoto.release();
+        surfaceManagerEncoder.release();
+        surfaceManagerEncoder.eglSetup(surface, surfaceManager);
+        surfaceManagerPhoto.eglSetup(encoderWidth, encoderHeight, surfaceManagerEncoder);
+      }
     }
   }
 
   @Override
   public void removeMediaCodecSurface() {
     synchronized (sync) {
-      if (surfaceManagerEncoder != null) {
-        surfaceManagerEncoder.release();
-        surfaceManagerEncoder = null;
-      }
+      surfaceManagerPhoto.release();
+      surfaceManagerEncoder.release();
+      surfaceManagerPhoto.eglSetup(encoderWidth, encoderHeight, surfaceManager);
     }
   }
 
@@ -101,12 +157,42 @@ public class OffScreenGlThread
 
   @Override
   public void setFilter(int filterPosition, BaseFilterRender baseFilterRender) {
-    filterQueue.add(new Filter(filterPosition, baseFilterRender));
+    filterQueue.add(new Filter(FilterAction.SET_INDEX, filterPosition, baseFilterRender));
+  }
+
+  @Override
+  public void addFilter(BaseFilterRender baseFilterRender) {
+    filterQueue.add(new Filter(FilterAction.ADD, 0, baseFilterRender));
+  }
+
+  @Override
+  public void addFilter(int filterPosition, BaseFilterRender baseFilterRender) {
+    filterQueue.add(new Filter(FilterAction.ADD_INDEX, filterPosition, baseFilterRender));
+  }
+
+  @Override
+  public void clearFilters() {
+    filterQueue.add(new Filter(FilterAction.CLEAR, 0, null));
+  }
+
+  @Override
+  public void removeFilter(int filterPosition) {
+    filterQueue.add(new Filter(FilterAction.REMOVE_INDEX, filterPosition, null));
+  }
+
+  @Override
+  public void removeFilter(BaseFilterRender baseFilterRender) {
+    filterQueue.add(new Filter(FilterAction.REMOVE, 0, baseFilterRender));
+  }
+
+  @Override
+  public int filtersCount() {
+    return managerRender.filtersCount();
   }
 
   @Override
   public void setFilter(BaseFilterRender baseFilterRender) {
-    setFilter(0, baseFilterRender);
+    filterQueue.add(new Filter(FilterAction.SET, 0, baseFilterRender));
   }
 
   @Override
@@ -117,7 +203,7 @@ public class OffScreenGlThread
 
   @Override
   public void setRotation(int rotation) {
-    textureManager.setCameraRotation(rotation);
+    managerRender.setCameraRotation(rotation);
   }
 
   @Override
@@ -125,9 +211,29 @@ public class OffScreenGlThread
     streamRotation = rotation;
   }
 
+  @Override
+  public void setIsStreamHorizontalFlip(boolean flip) {
+    isStreamHorizontalFlip = flip;
+  }
+
+  @Override
+  public void setIsStreamVerticalFlip(boolean flip) {
+    isStreamVerticalFlip = flip;
+  }
+
+  @Override
+  public void setIsPreviewHorizontalFlip(boolean flip) {
+    isPreviewHorizontalFlip = flip;
+  }
+
+  @Override
+  public void setIsPreviewVerticalFlip(boolean flip) {
+    isPreviewVerticalFlip = flip;
+  }
+
   @Override
   public boolean isAAEnabled() {
-    return textureManager != null && textureManager.isAAEnabled();
+    return managerRender != null && managerRender.isAAEnabled();
   }
 
   @Override
@@ -143,6 +249,7 @@ public class OffScreenGlThread
   @Override
   public void stop() {
     synchronized (sync) {
+      running = false;
       if (thread != null) {
         thread.interrupt();
         try {
@@ -152,62 +259,67 @@ public class OffScreenGlThread
         }
         thread = null;
       }
-      running = false;
-    }
-  }
-
-  private void releaseSurfaceManager() {
-    if (surfaceManager != null) {
+      surfaceManagerPhoto.release();
+      surfaceManagerEncoder.release();
       surfaceManager.release();
-      surfaceManager = null;
     }
   }
 
   @Override
   public void run() {
-    releaseSurfaceManager();
-    surfaceManager = new SurfaceManager();
+    surfaceManager.release();
+    surfaceManager.eglSetup();
     surfaceManager.makeCurrent();
-    textureManager.initGl(context, encoderWidth, encoderHeight, encoderWidth, encoderHeight);
-    textureManager.getSurfaceTexture().setOnFrameAvailableListener(this);
+    managerRender.initGl(context, encoderWidth, encoderHeight, encoderWidth, encoderHeight);
+    managerRender.getSurfaceTexture().setOnFrameAvailableListener(this);
+    surfaceManagerPhoto.release();
+    surfaceManagerPhoto.eglSetup(encoderWidth, encoderHeight, surfaceManager);
     semaphore.release();
     try {
       while (running) {
-        if (frameAvailable) {
+        if (frameAvailable || forceRender) {
           frameAvailable = false;
           surfaceManager.makeCurrent();
-          textureManager.updateFrame();
-          textureManager.drawOffScreen();
-          textureManager.drawScreen(encoderWidth, encoderHeight, false, 0, 0, true);
+          managerRender.updateFrame();
+          managerRender.drawOffScreen();
+          managerRender.drawScreen(encoderWidth, encoderHeight, false, 0, 0, isPreviewVerticalFlip, isPreviewHorizontalFlip);
           surfaceManager.swapBuffer();
 
-          synchronized (sync) {
-            if (surfaceManagerEncoder != null && !fpsLimiter.limitFPS()) {
-              surfaceManagerEncoder.makeCurrent();
-              textureManager.drawScreen(encoderWidth, encoderHeight, false, 0, streamRotation,
-                  false);
-              surfaceManagerEncoder.swapBuffer();
-            }
-            if (takePhotoCallback != null) {
-              takePhotoCallback.onTakePhoto(
-                  GlUtil.getBitmap(encoderWidth, encoderHeight, encoderWidth, encoderHeight));
-              takePhotoCallback = null;
-            }
-          }
           if (!filterQueue.isEmpty()) {
             Filter filter = filterQueue.take();
-            textureManager.setFilter(filter.getPosition(), filter.getBaseFilterRender());
+            managerRender.setFilterAction(filter.getFilterAction(), filter.getPosition(), filter.getBaseFilterRender());
           } else if (loadAA) {
-            textureManager.enableAA(AAEnabled);
+            managerRender.enableAA(AAEnabled);
             loadAA = false;
           }
+
+          synchronized (sync) {
+            if (surfaceManagerEncoder.isReady() && !fpsLimiter.limitFPS()) {
+              int w = muteVideo ? 0 : encoderWidth;
+              int h = muteVideo ? 0 : encoderHeight;
+              surfaceManagerEncoder.makeCurrent();
+              managerRender.drawScreen(w, h, false, 0,
+                  streamRotation, isStreamVerticalFlip, isStreamHorizontalFlip);
+              surfaceManagerEncoder.swapBuffer();
+            }
+            if (takePhotoCallback != null && surfaceManagerPhoto.isReady()) {
+              surfaceManagerPhoto.makeCurrent();
+              managerRender.drawScreen(encoderWidth, encoderHeight, false, 0,
+                  streamRotation, isStreamVerticalFlip, isStreamHorizontalFlip);
+              takePhotoCallback.onTakePhoto(GlUtil.getBitmap(encoderWidth, encoderHeight));
+              takePhotoCallback = null;
+              surfaceManagerPhoto.swapBuffer();
+            }
+          }
         }
       }
     } catch (InterruptedException ignore) {
       Thread.currentThread().interrupt();
     } finally {
-      textureManager.release();
-      releaseSurfaceManager();
+      managerRender.release();
+      surfaceManagerPhoto.release();
+      surfaceManagerEncoder.release();
+      surfaceManager.release();
     }
   }
 
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java
index a8740df..a7e3fe4 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.view;
 
 import android.content.Context;
@@ -9,11 +25,13 @@ import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import androidx.annotation.RequiresApi;
-import com.pedro.encoder.input.gl.SurfaceManager;
+
+import com.pedro.encoder.input.gl.FilterAction;
 import com.pedro.encoder.input.gl.render.ManagerRender;
 import com.pedro.encoder.input.gl.render.filters.BaseFilterRender;
 import com.pedro.encoder.utils.gl.GlUtil;
 import com.pedro.rtplibrary.R;
+import com.pedro.rtplibrary.util.Filter;
 
 /**
  * Created by pedro on 9/09/17.
@@ -27,7 +45,7 @@ public class OpenGlView extends OpenGlViewBase {
 
   private boolean AAEnabled = false;
   private boolean keepAspectRatio = false;
-  private int aspectRatioMode = 0;
+  private AspectRatioMode aspectRatioMode = AspectRatioMode.Adjust;
   private boolean isFlipHorizontal = false, isFlipVertical = false;
 
   public OpenGlView(Context context) {
@@ -39,9 +57,9 @@ public class OpenGlView extends OpenGlViewBase {
     TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.OpenGlView);
     try {
       keepAspectRatio = typedArray.getBoolean(R.styleable.OpenGlView_keepAspectRatio, false);
-      aspectRatioMode = typedArray.getInt(R.styleable.OpenGlView_aspectRatioMode, 0);
+      aspectRatioMode = AspectRatioMode.fromId(typedArray.getInt(R.styleable.OpenGlView_aspectRatioMode, 0));
       AAEnabled = typedArray.getBoolean(R.styleable.OpenGlView_AAEnabled, false);
-      ManagerRender.numFilters = typedArray.getInt(R.styleable.OpenGlView_numFilters, 1);
+      ManagerRender.numFilters = typedArray.getInt(R.styleable.OpenGlView_numFilters, 0);
       isFlipHorizontal = typedArray.getBoolean(R.styleable.OpenGlView_isFlipHorizontal, false);
       isFlipVertical = typedArray.getBoolean(R.styleable.OpenGlView_isFlipVertical, false);
     } finally {
@@ -68,12 +86,42 @@ public class OpenGlView extends OpenGlViewBase {
 
   @Override
   public void setFilter(int filterPosition, BaseFilterRender baseFilterRender) {
-    filterQueue.add(new Filter(filterPosition, baseFilterRender));
+    filterQueue.add(new Filter(FilterAction.SET_INDEX, filterPosition, baseFilterRender));
+  }
+
+  @Override
+  public void addFilter(BaseFilterRender baseFilterRender) {
+    filterQueue.add(new Filter(FilterAction.ADD, 0, baseFilterRender));
+  }
+
+  @Override
+  public void addFilter(int filterPosition, BaseFilterRender baseFilterRender) {
+    filterQueue.add(new Filter(FilterAction.ADD_INDEX, filterPosition, baseFilterRender));
+  }
+
+  @Override
+  public void clearFilters() {
+    filterQueue.add(new Filter(FilterAction.CLEAR, 0, null));
+  }
+
+  @Override
+  public void removeFilter(int filterPosition) {
+    filterQueue.add(new Filter(FilterAction.REMOVE_INDEX, filterPosition, null));
+  }
+
+  @Override
+  public void removeFilter(BaseFilterRender baseFilterRender) {
+    filterQueue.add(new Filter(FilterAction.REMOVE, 0, baseFilterRender));
+  }
+
+  @Override
+  public int filtersCount() {
+    return managerRender.filtersCount();
   }
 
   @Override
   public void setFilter(BaseFilterRender baseFilterRender) {
-    setFilter(0, baseFilterRender);
+    filterQueue.add(new Filter(FilterAction.SET, 0, baseFilterRender));
   }
 
   @Override
@@ -91,6 +139,10 @@ public class OpenGlView extends OpenGlViewBase {
     return keepAspectRatio;
   }
 
+  public void setAspectRatioMode(AspectRatioMode aspectRatioMode) {
+    this.aspectRatioMode = aspectRatioMode;
+  }
+
   public void setKeepAspectRatio(boolean keepAspectRatio) {
     this.keepAspectRatio = keepAspectRatio;
   }
@@ -114,49 +166,60 @@ public class OpenGlView extends OpenGlViewBase {
 
   @Override
   public void run() {
-    releaseSurfaceManager();
-    surfaceManager = new SurfaceManager(getHolder().getSurface());
+    surfaceManager.release();
+    surfaceManager.eglSetup(getHolder().getSurface());
     surfaceManager.makeCurrent();
     managerRender.initGl(getContext(), encoderWidth, encoderHeight, previewWidth, previewHeight);
     managerRender.getSurfaceTexture().setOnFrameAvailableListener(this);
+    surfaceManagerPhoto.release();
+    surfaceManagerPhoto.eglSetup(encoderWidth, encoderHeight, surfaceManager);
     semaphore.release();
     try {
       while (running) {
-        if (frameAvailable) {
+        if (frameAvailable || forceRender) {
           frameAvailable = false;
           surfaceManager.makeCurrent();
           managerRender.updateFrame();
           managerRender.drawOffScreen();
-          managerRender.drawScreen(previewWidth, previewHeight, keepAspectRatio, aspectRatioMode, 0,
-              true);
+          managerRender.drawScreen(previewWidth, previewHeight, keepAspectRatio, aspectRatioMode.id, 0,
+              isPreviewVerticalFlip, isPreviewHorizontalFlip);
           surfaceManager.swapBuffer();
-          if (takePhotoCallback != null) {
-            takePhotoCallback.onTakePhoto(
-                GlUtil.getBitmap(previewWidth, previewHeight, encoderWidth, encoderHeight));
-            takePhotoCallback = null;
-          }
-          synchronized (sync) {
-            if (surfaceManagerEncoder != null && !fpsLimiter.limitFPS()) {
-              surfaceManagerEncoder.makeCurrent();
-              managerRender.drawScreen(encoderWidth, encoderHeight, false, aspectRatioMode,
-                  streamRotation, false);
-              surfaceManagerEncoder.swapBuffer();
-            }
-          }
+
           if (!filterQueue.isEmpty()) {
             Filter filter = filterQueue.take();
-            managerRender.setFilter(filter.getPosition(), filter.getBaseFilterRender());
+            managerRender.setFilterAction(filter.getFilterAction(), filter.getPosition(), filter.getBaseFilterRender());
           } else if (loadAA) {
             managerRender.enableAA(AAEnabled);
             loadAA = false;
           }
+
+          synchronized (sync) {
+            if (surfaceManagerEncoder.isReady() && !fpsLimiter.limitFPS()) {
+              int w = muteVideo ? 0 : encoderWidth;
+              int h = muteVideo ? 0 : encoderHeight;
+              surfaceManagerEncoder.makeCurrent();
+              managerRender.drawScreen(w, h, false, aspectRatioMode.id,
+                  streamRotation, isStreamVerticalFlip, isStreamHorizontalFlip);
+              surfaceManagerEncoder.swapBuffer();
+            }
+            if (takePhotoCallback != null && surfaceManagerPhoto.isReady()) {
+              surfaceManagerPhoto.makeCurrent();
+              managerRender.drawScreen(encoderWidth, encoderHeight, false, aspectRatioMode.id,
+                  streamRotation, isStreamVerticalFlip, isStreamHorizontalFlip);
+              takePhotoCallback.onTakePhoto(GlUtil.getBitmap(encoderWidth, encoderHeight));
+              takePhotoCallback = null;
+              surfaceManagerPhoto.swapBuffer();
+            }
+          }
         }
       }
     } catch (InterruptedException ignore) {
       Thread.currentThread().interrupt();
     } finally {
       managerRender.release();
-      releaseSurfaceManager();
+      surfaceManagerPhoto.release();
+      surfaceManagerEncoder.release();
+      surfaceManager.release();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlViewBase.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlViewBase.java
index 7e5fce8..7ac43c1 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlViewBase.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlViewBase.java
@@ -1,6 +1,23 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.view;
 
 import android.content.Context;
+import android.graphics.Point;
 import android.graphics.SurfaceTexture;
 import android.os.Build;
 import androidx.annotation.RequiresApi;
@@ -11,6 +28,8 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import com.pedro.encoder.input.gl.SurfaceManager;
 import com.pedro.encoder.input.video.FpsLimiter;
+import com.pedro.rtplibrary.util.Filter;
+
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Semaphore;
@@ -31,10 +50,11 @@ public abstract class OpenGlViewBase extends SurfaceView
   protected boolean running = false;
   protected boolean initialized = false;
 
-  protected SurfaceManager surfaceManager = null;
-  protected SurfaceManager surfaceManagerEncoder = null;
+  protected final SurfaceManager surfaceManagerPhoto = new SurfaceManager();
+  protected final SurfaceManager surfaceManager = new SurfaceManager();
+  protected final SurfaceManager surfaceManagerEncoder = new SurfaceManager();
 
-  protected FpsLimiter fpsLimiter = new FpsLimiter();
+  protected final FpsLimiter fpsLimiter = new FpsLimiter();
   protected final Semaphore semaphore = new Semaphore(0);
   protected final BlockingQueue<Filter> filterQueue = new LinkedBlockingQueue<>();
   protected final Object sync = new Object();
@@ -42,6 +62,12 @@ public abstract class OpenGlViewBase extends SurfaceView
   protected int encoderWidth, encoderHeight;
   protected TakePhotoCallback takePhotoCallback;
   protected int streamRotation;
+  protected boolean muteVideo = false;
+  protected boolean isPreviewHorizontalFlip = false;
+  protected boolean isPreviewVerticalFlip = false;
+  protected boolean isStreamHorizontalFlip = false;
+  protected boolean isStreamVerticalFlip = false;
+  protected boolean forceRender = false;
 
   public OpenGlViewBase(Context context) {
     super(context);
@@ -53,11 +79,51 @@ public abstract class OpenGlViewBase extends SurfaceView
     getHolder().addCallback(this);
   }
 
+  @Override
+  public void setForceRender(boolean forceRender) {
+    this.forceRender = forceRender;
+  }
+
   @Override
   public void setStreamRotation(int streamRotation) {
     this.streamRotation = streamRotation;
   }
 
+  @Override
+  public void setIsStreamHorizontalFlip(boolean flip) {
+    isStreamHorizontalFlip = flip;
+  }
+
+  @Override
+  public void setIsStreamVerticalFlip(boolean flip) {
+    isStreamVerticalFlip = flip;
+  }
+
+  @Override
+  public void setIsPreviewHorizontalFlip(boolean flip) {
+    isPreviewHorizontalFlip = flip;
+  }
+
+  @Override
+  public void setIsPreviewVerticalFlip(boolean flip) {
+    isPreviewVerticalFlip = flip;
+  }
+
+  @Override
+  public void muteVideo() {
+    muteVideo = true;
+  }
+
+  @Override
+  public void unMuteVideo() {
+    muteVideo = false;
+  }
+
+  @Override
+  public boolean isVideoMuted() {
+    return muteVideo;
+  }
+
   @Override
   public abstract void init();
 
@@ -80,17 +146,21 @@ public abstract class OpenGlViewBase extends SurfaceView
   @Override
   public void addMediaCodecSurface(Surface surface) {
     synchronized (sync) {
-      surfaceManagerEncoder = new SurfaceManager(surface, surfaceManager);
+      if (surfaceManager.isReady()) {
+        surfaceManagerPhoto.release();
+        surfaceManagerEncoder.release();
+        surfaceManagerEncoder.eglSetup(surface, surfaceManager);
+        surfaceManagerPhoto.eglSetup(encoderWidth, encoderHeight, surfaceManagerEncoder);
+      }
     }
   }
 
   @Override
   public void removeMediaCodecSurface() {
     synchronized (sync) {
-      if (surfaceManagerEncoder != null) {
-        surfaceManagerEncoder.release();
-        surfaceManagerEncoder = null;
-      }
+      surfaceManagerPhoto.release();
+      surfaceManagerEncoder.release();
+      surfaceManagerPhoto.eglSetup(encoderWidth, encoderHeight, surfaceManager);
     }
   }
 
@@ -100,6 +170,11 @@ public abstract class OpenGlViewBase extends SurfaceView
     this.encoderHeight = height;
   }
 
+  @Override
+  public Point getEncoderSize() {
+    return new Point(encoderWidth, encoderHeight);
+  }
+
   @Override
   public void start() {
     synchronized (sync) {
@@ -114,6 +189,7 @@ public abstract class OpenGlViewBase extends SurfaceView
   @Override
   public void stop() {
     synchronized (sync) {
+      running = false;
       if (thread != null) {
         thread.interrupt();
         try {
@@ -123,14 +199,9 @@ public abstract class OpenGlViewBase extends SurfaceView
         }
         thread = null;
       }
-      running = false;
-    }
-  }
-
-  protected void releaseSurfaceManager() {
-    if (surfaceManager != null) {
+      surfaceManagerPhoto.release();
+      surfaceManagerEncoder.release();
       surfaceManager.release();
-      surfaceManager = null;
     }
   }
 
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/TakePhotoCallback.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/TakePhotoCallback.java
index 1fd93a4..c60b649 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/TakePhotoCallback.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/TakePhotoCallback.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtplibrary.view;
 
 import android.graphics.Bitmap;
diff --git a/rtplibrary/src/main/res/values/attrs.xml b/rtplibrary/src/main/res/values/attrs.xml
index d2c08ad..582cd82 100644
--- a/rtplibrary/src/main/res/values/attrs.xml
+++ b/rtplibrary/src/main/res/values/attrs.xml
@@ -10,8 +10,6 @@
   <attr name="aspectRatioMode" format="enum">
     <enum name="adjust" value="0"/>
     <enum name="fill" value="1"/>
-    <enum name="adjust_rotate" value="2"/>
-    <enum name="fill_rotate" value="3"/>
   </attr>
 
   <declare-styleable name="OpenGlView">
diff --git a/rtsp/build.gradle b/rtsp/build.gradle
index 7625382..679f937 100644
--- a/rtsp/build.gradle
+++ b/rtsp/build.gradle
@@ -1,11 +1,15 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 32
 
   defaultConfig {
     minSdkVersion 16
-    targetSdkVersion 30
+    targetSdkVersion 32
+    buildConfigField 'int', 'VERSION_CODE', "${rtsp_version_code}"
+    buildConfigField 'String', 'VERSION_NAME', "\"${rtsp_version_name}\""
   }
   buildTypes {
     release {
@@ -13,6 +17,13 @@ android {
       consumerProguardFiles 'proguard-rules.pro'
     }
   }
+  namespace 'com.pedro.rtsp'
+
 }
 
-dependencies {}
+
+dependencies {
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+  testImplementation 'junit:junit:4.13.2'
+  testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0"
+}
diff --git a/rtsp/src/main/AndroidManifest.xml b/rtsp/src/main/AndroidManifest.xml
index 7d16cbb..cc947c5 100644
--- a/rtsp/src/main/AndroidManifest.xml
+++ b/rtsp/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.pedro.rtsp" />
+<manifest />
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtcp/BaseSenderReport.java b/rtsp/src/main/java/com/pedro/rtsp/rtcp/BaseSenderReport.java
deleted file mode 100644
index 883a3be..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtcp/BaseSenderReport.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.pedro.rtsp.rtcp;
-
-import android.util.Log;
-import com.pedro.rtsp.rtsp.Protocol;
-import com.pedro.rtsp.rtsp.RtpFrame;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Random;
-
-/**
- * Created by pedro on 7/11/18.
- */
-
-public abstract class BaseSenderReport {
-
-  protected static final String TAG = "BaseSenderReport";
-  protected static final int PACKET_LENGTH = 28;
-  private static final int MTU = 1500;
-  private final long interval = 3000;
-
-  private final byte[] videoBuffer = new byte[MTU];
-  private final byte[] audioBuffer = new byte[MTU];
-
-  private long videoTime;
-  private long audioTime;
-  private int videoPacketCount;
-  private int videoOctetCount;
-  private int audioPacketCount;
-  private int audioOctetCount;
-
-  BaseSenderReport() {
-    /*							     Version(2)  Padding(0)					 					*/
-    /*									 ^		  ^			PT = 0	    						*/
-    /*									 |		  |				^								*/
-    /*									 | --------			 	|								*/
-    /*									 | |---------------------								*/
-    /*									 | ||													*/
-    /*									 | ||													*/
-    videoBuffer[0] = (byte) Integer.parseInt("10000000", 2);
-    audioBuffer[0] = (byte) Integer.parseInt("10000000", 2);
-
-    /* Packet Type PT */
-    videoBuffer[1] = (byte) 200;
-    audioBuffer[1] = (byte) 200;
-
-    /* Byte 2,3          ->  Length		                     */
-    setLong(videoBuffer, PACKET_LENGTH / 4 - 1, 2, 4);
-    setLong(audioBuffer, PACKET_LENGTH / 4 - 1, 2, 4);
-    /* Byte 4,5,6,7      ->  SSRC                            */
-    setLong(videoBuffer, new Random().nextInt(), 4, 8);
-    setLong(audioBuffer, new Random().nextInt(), 4, 8);
-    /* Byte 8,9,10,11    ->  NTP timestamp hb				 */
-    /* Byte 12,13,14,15  ->  NTP timestamp lb				 */
-    /* Byte 16,17,18,19  ->  RTP timestamp		             */
-    /* Byte 20,21,22,23  ->  packet count				 	 */
-    /* Byte 24,25,26,27  ->  octet count			         */
-  }
-
-  public static BaseSenderReport getInstance(Protocol protocol, int videoSourcePort,
-      int audioSourcePort) {
-    return protocol == Protocol.TCP ? new SenderReportTcp()
-        : new SenderReportUdp(videoSourcePort, audioSourcePort);
-  }
-
-  public abstract void setDataStream(OutputStream outputStream, String host);
-
-  public void update(RtpFrame rtpFrame) {
-    if (rtpFrame.getChannelIdentifier() == (byte) 2) {
-      updateVideo(rtpFrame);
-    } else {
-      updateAudio(rtpFrame);
-    }
-  }
-
-  public abstract void sendReport(byte[] buffer, RtpFrame rtpFrame, String type, int packetCount,
-      int octetCount) throws IOException;
-
-  private void updateVideo(RtpFrame rtpFrame) {
-    videoPacketCount++;
-    videoOctetCount += rtpFrame.getLength();
-    setLong(videoBuffer, videoPacketCount, 20, 24);
-    setLong(videoBuffer, videoOctetCount, 24, 28);
-    if (System.currentTimeMillis() - videoTime >= interval) {
-      videoTime = System.currentTimeMillis();
-      setData(videoBuffer, System.nanoTime(), rtpFrame.getTimeStamp());
-      try {
-        sendReport(videoBuffer, rtpFrame, "Video", videoPacketCount, videoOctetCount);
-      } catch (IOException e) {
-        Log.e(TAG, "Error", e);
-      }
-    }
-  }
-
-  private void updateAudio(RtpFrame rtpFrame) {
-    audioPacketCount++;
-    audioOctetCount += rtpFrame.getLength();
-    setLong(audioBuffer, audioPacketCount, 20, 24);
-    setLong(audioBuffer, audioOctetCount, 24, 28);
-    if (System.currentTimeMillis() - audioTime >= interval) {
-      audioTime = System.currentTimeMillis();
-      setData(audioBuffer, System.nanoTime(), rtpFrame.getTimeStamp());
-      try {
-        sendReport(audioBuffer, rtpFrame, "Audio", audioPacketCount, audioOctetCount);
-      } catch (IOException e) {
-        Log.e(TAG, "Error", e);
-      }
-    }
-  }
-
-  public void reset() {
-    videoPacketCount = videoOctetCount = 0;
-    audioPacketCount = audioOctetCount = 0;
-    videoTime = audioTime = 0;
-    setLong(videoBuffer, videoPacketCount, 20, 24);
-    setLong(videoBuffer, videoOctetCount, 24, 28);
-    setLong(audioBuffer, audioPacketCount, 20, 24);
-    setLong(audioBuffer, audioOctetCount, 24, 28);
-  }
-
-  public abstract void close();
-
-  private void setLong(byte[] buffer, long n, int begin, int end) {
-    for (end--; end >= begin; end--) {
-      buffer[end] = (byte) (n % 256);
-      n >>= 8;
-    }
-  }
-
-  private void setData(byte[] buffer, long ntpts, long rtpts) {
-    long hb = ntpts / 1000000000;
-    long lb = ((ntpts - hb * 1000000000) * 4294967296L) / 1000000000;
-    setLong(buffer, hb, 8, 12);
-    setLong(buffer, lb, 12, 16);
-    setLong(buffer, rtpts, 16, 20);
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtcp/BaseSenderReport.kt b/rtsp/src/main/java/com/pedro/rtsp/rtcp/BaseSenderReport.kt
new file mode 100644
index 0000000..0a9600e
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtcp/BaseSenderReport.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtcp
+
+import com.pedro.rtsp.rtsp.Protocol
+import com.pedro.rtsp.rtsp.RtpFrame
+import com.pedro.rtsp.utils.RtpConstants
+import com.pedro.rtsp.utils.setLong
+import java.io.IOException
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 7/11/18.
+ */
+abstract class BaseSenderReport internal constructor() {
+
+  private val interval: Long = 3000
+  private val videoBuffer = ByteArray(RtpConstants.MTU)
+  private val audioBuffer = ByteArray(RtpConstants.MTU)
+  private var videoTime: Long = 0
+  private var audioTime: Long = 0
+  private var videoPacketCount = 0L
+  private var videoOctetCount = 0L
+  private var audioPacketCount = 0L
+  private var audioOctetCount = 0L
+  val PACKET_LENGTH = 28
+  protected val TAG = "BaseSenderReport"
+
+  companion object {
+    @JvmStatic
+    fun getInstance(protocol: Protocol, videoSourcePort: Int, audioSourcePort: Int): BaseSenderReport {
+      return if (protocol === Protocol.TCP) {
+        SenderReportTcp()
+      } else {
+        SenderReportUdp(videoSourcePort, audioSourcePort)
+      }
+    }
+  }
+
+  init {
+    /*							     Version(2)  Padding(0)					 					*/
+    /*									 ^		  ^			PT = 0	    						*/
+    /*									 |		  |				^								*/
+    /*									 | --------			 	|								*/
+    /*									 | |---------------------								*/
+    /*									 | ||													*/
+    /*									 | ||													*/
+    videoBuffer[0] = 0x80.toByte()
+    audioBuffer[0] = 0x80.toByte()
+
+    /* Packet Type PT */
+    videoBuffer[1] = 200.toByte()
+    audioBuffer[1] = 200.toByte()
+
+    /* Byte 2,3          ->  Length		                     */
+    videoBuffer.setLong(PACKET_LENGTH / 4 - 1L, 2, 4)
+    audioBuffer.setLong(PACKET_LENGTH / 4 - 1L, 2, 4)
+    /* Byte 4,5,6,7      ->  SSRC                            */
+    /* Byte 8,9,10,11    ->  NTP timestamp hb				 */
+    /* Byte 12,13,14,15  ->  NTP timestamp lb				 */
+    /* Byte 16,17,18,19  ->  RTP timestamp		             */
+    /* Byte 20,21,22,23  ->  packet count				 	 */
+    /* Byte 24,25,26,27  ->  octet count			         */
+  }
+
+  fun setSSRC(ssrcVideo: Long, ssrcAudio: Long) {
+    videoBuffer.setLong(ssrcVideo, 4, 8)
+    audioBuffer.setLong(ssrcAudio, 4, 8)
+  }
+
+  @Throws(IOException::class)
+  abstract fun setDataStream(outputStream: OutputStream, host: String)
+
+  @Throws(IOException::class)
+  fun update(rtpFrame: RtpFrame, isEnableLogs: Boolean): Boolean {
+    return if (rtpFrame.channelIdentifier == RtpConstants.trackVideo) {
+      updateVideo(rtpFrame, isEnableLogs)
+    } else {
+      updateAudio(rtpFrame, isEnableLogs)
+    }
+  }
+
+  @Throws(IOException::class)
+  abstract fun sendReport(buffer: ByteArray, rtpFrame: RtpFrame, type: String, packetCount: Long, octetCount: Long, isEnableLogs: Boolean)
+
+  @Throws(IOException::class)
+  private fun updateVideo(rtpFrame: RtpFrame, isEnableLogs: Boolean): Boolean {
+    videoPacketCount++
+    videoOctetCount += rtpFrame.length
+    videoBuffer.setLong(videoPacketCount, 20, 24)
+    videoBuffer.setLong(videoOctetCount, 24, 28)
+    if (System.currentTimeMillis() - videoTime >= interval) {
+      videoTime = System.currentTimeMillis()
+      setData(videoBuffer, System.nanoTime(), rtpFrame.timeStamp)
+      sendReport(videoBuffer, rtpFrame, "Video", videoPacketCount, videoOctetCount, isEnableLogs)
+      return true
+    }
+    return false
+  }
+
+  @Throws(IOException::class)
+  private fun updateAudio(rtpFrame: RtpFrame, isEnableLogs: Boolean): Boolean {
+    audioPacketCount++
+    audioOctetCount += rtpFrame.length
+    audioBuffer.setLong(audioPacketCount, 20, 24)
+    audioBuffer.setLong(audioOctetCount, 24, 28)
+    if (System.currentTimeMillis() - audioTime >= interval) {
+      audioTime = System.currentTimeMillis()
+      setData(audioBuffer, System.nanoTime(), rtpFrame.timeStamp)
+      sendReport(audioBuffer, rtpFrame, "Audio", audioPacketCount, audioOctetCount, isEnableLogs)
+      return true
+    }
+    return false
+  }
+
+  fun reset() {
+    videoOctetCount = 0
+    videoPacketCount = videoOctetCount
+    audioOctetCount = 0
+    audioPacketCount = audioOctetCount
+    audioTime = 0
+    videoTime = audioTime
+    videoBuffer.setLong(videoPacketCount, 20, 24)
+    videoBuffer.setLong(videoOctetCount, 24, 28)
+    audioBuffer.setLong(audioPacketCount, 20, 24)
+    audioBuffer.setLong(audioOctetCount, 24, 28)
+  }
+
+  abstract fun close()
+
+  private fun setData(buffer: ByteArray, ntpts: Long, rtpts: Long) {
+    val hb = ntpts / 1000000000
+    val lb = (ntpts - hb * 1000000000) * 4294967296L / 1000000000
+    buffer.setLong(hb, 8, 12)
+    buffer.setLong(lb, 12, 16)
+    buffer.setLong(rtpts, 16, 20)
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportTcp.java b/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportTcp.java
deleted file mode 100644
index 036011b..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportTcp.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.pedro.rtsp.rtcp;
-
-import android.util.Log;
-import com.pedro.rtsp.rtsp.RtpFrame;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Created by pedro on 8/11/18.
- */
-
-public class SenderReportTcp extends BaseSenderReport {
-
-  private OutputStream outputStream;
-  private byte tcpHeader[];
-
-  public SenderReportTcp() {
-    super();
-    tcpHeader = new byte[] { '$', 0, 0, PACKET_LENGTH };
-  }
-
-  @Override
-  public void setDataStream(OutputStream outputStream, String host) {
-    this.outputStream = outputStream;
-  }
-
-  @Override
-  public void sendReport(byte[] buffer, RtpFrame rtpFrame, String type, int packetCount,
-      int octetCount) throws IOException {
-    sendReportTCP(buffer, rtpFrame.getChannelIdentifier(), type, packetCount, octetCount);
-  }
-
-  @Override
-  public void close() {
-
-  }
-
-  private void sendReportTCP(byte[] buffer, byte channelIdentifier, String type, int packet,
-      int octet) throws IOException {
-    synchronized (outputStream) {
-      tcpHeader[1] = (byte) (channelIdentifier + 1);
-      outputStream.write(tcpHeader);
-      outputStream.write(buffer, 0, PACKET_LENGTH);
-      outputStream.flush();
-      Log.i(TAG, "wrote report: " + type + ", packets: " + packet + ", octet: " + octet);
-    }
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportTcp.kt b/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportTcp.kt
new file mode 100644
index 0000000..f2fc9b9
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportTcp.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtcp
+
+import android.util.Log
+import com.pedro.rtsp.rtsp.RtpFrame
+import com.pedro.rtsp.utils.RtpConstants
+import java.io.IOException
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 8/11/18.
+ */
+open class SenderReportTcp : BaseSenderReport() {
+
+  private var outputStream: OutputStream? = null
+  private val tcpHeader: ByteArray = byteArrayOf('$'.code.toByte(), 0, 0, PACKET_LENGTH.toByte())
+
+  @Throws(IOException::class)
+  override fun setDataStream(outputStream: OutputStream, host: String) {
+    this.outputStream = outputStream
+  }
+
+  @Throws(IOException::class)
+  override fun sendReport(buffer: ByteArray, rtpFrame: RtpFrame, type: String, packetCount: Long, octetCount: Long, isEnableLogs: Boolean) {
+    sendReportTCP(buffer, rtpFrame.channelIdentifier, type, packetCount, octetCount, isEnableLogs)
+  }
+
+  override fun close() {}
+
+  @Throws(IOException::class)
+  private fun sendReportTCP(buffer: ByteArray, channelIdentifier: Int, type: String, packet: Long, octet: Long, isEnableLogs: Boolean) {
+    synchronized(RtpConstants.lock) {
+      tcpHeader[1] = (2 * channelIdentifier + 1).toByte()
+      outputStream?.write(tcpHeader)
+      outputStream?.write(buffer, 0, PACKET_LENGTH)
+      outputStream?.flush()
+      if (isEnableLogs) {
+        Log.i(TAG, "wrote report: $type, packets: $packet, octet: $octet")
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportUdp.java b/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportUdp.java
deleted file mode 100644
index 7a062d8..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportUdp.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.pedro.rtsp.rtcp;
-
-import android.util.Log;
-import com.pedro.rtsp.rtsp.RtpFrame;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.DatagramPacket;
-import java.net.InetAddress;
-import java.net.MulticastSocket;
-import java.net.UnknownHostException;
-
-/**
- * Created by pedro on 8/11/18.
- */
-
-public class SenderReportUdp extends BaseSenderReport {
-
-  private MulticastSocket multicastSocketVideo;
-  private MulticastSocket multicastSocketAudio;
-  private DatagramPacket datagramPacket = new DatagramPacket(new byte[] { 0 }, 1);
-
-  public SenderReportUdp(int videoSourcePort, int audioSourcePort) {
-    super();
-    try {
-      multicastSocketVideo = new MulticastSocket(videoSourcePort);
-      multicastSocketVideo.setTimeToLive(64);
-      multicastSocketAudio = new MulticastSocket(audioSourcePort);
-      multicastSocketAudio.setTimeToLive(64);
-    } catch (IOException e) {
-      Log.e(TAG, "Error", e);
-    }
-  }
-
-  @Override
-  public void setDataStream(OutputStream outputStream, String host) {
-    try {
-      datagramPacket.setAddress(InetAddress.getByName(host));
-    } catch (UnknownHostException e) {
-      Log.e(TAG, "Error", e);
-    }
-  }
-
-  @Override
-  public void sendReport(byte[] buffer, RtpFrame rtpFrame, String type, int packetCount,
-      int octetCount) throws IOException {
-    sendReportUDP(buffer, rtpFrame.getRtcpPort(), type, packetCount, octetCount);
-  }
-
-  @Override
-  public void close() {
-    multicastSocketVideo.close();
-    multicastSocketAudio.close();
-  }
-
-  private void sendReportUDP(byte[] buffer, int port, String type, int packet, int octet)
-      throws IOException {
-    datagramPacket.setData(buffer);
-    datagramPacket.setPort(port);
-    datagramPacket.setLength(PACKET_LENGTH);
-    if (type.equals("Video")) {
-      multicastSocketVideo.send(datagramPacket);
-    } else {
-      multicastSocketAudio.send(datagramPacket);
-    }
-    Log.i(TAG, "wrote report: " + type + ", port: " + port + ", packets: " + packet + ", octet: " + octet);
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportUdp.kt b/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportUdp.kt
new file mode 100644
index 0000000..1255949
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtcp/SenderReportUdp.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtcp
+
+import android.util.Log
+import com.pedro.rtsp.rtsp.RtpFrame
+import com.pedro.rtsp.utils.RtpConstants
+import java.io.IOException
+import java.io.OutputStream
+import java.net.DatagramPacket
+import java.net.InetAddress
+import java.net.MulticastSocket
+import java.net.UnknownHostException
+
+/**
+ * Created by pedro on 8/11/18.
+ */
+open class SenderReportUdp(videoSourcePort: Int, audioSourcePort: Int) : BaseSenderReport() {
+
+  private var multicastSocketVideo: MulticastSocket? = null
+  private var multicastSocketAudio: MulticastSocket? = null
+  private val datagramPacket = DatagramPacket(byteArrayOf(0), 1)
+
+  init {
+    multicastSocketVideo = MulticastSocket(videoSourcePort)
+    multicastSocketVideo?.timeToLive = 64
+    multicastSocketAudio = MulticastSocket(audioSourcePort)
+    multicastSocketAudio?.timeToLive = 64
+  }
+
+  @Throws(IOException::class)
+  override fun setDataStream(outputStream: OutputStream, host: String) {
+    datagramPacket.address = InetAddress.getByName(host)
+  }
+
+  @Throws(IOException::class)
+  override fun sendReport(buffer: ByteArray, rtpFrame: RtpFrame, type: String, packetCount: Long, octetCount: Long, isEnableLogs: Boolean) {
+    sendReportUDP(buffer, rtpFrame.rtcpPort, type, packetCount, octetCount, isEnableLogs)
+  }
+
+  override fun close() {
+    multicastSocketVideo?.close()
+    multicastSocketAudio?.close()
+  }
+
+  @Throws(IOException::class)
+  private fun sendReportUDP(buffer: ByteArray, port: Int, type: String, packet: Long, octet: Long, isEnableLogs: Boolean) {
+    synchronized(RtpConstants.lock) {
+      datagramPacket.data = buffer
+      datagramPacket.port = port
+      datagramPacket.length = PACKET_LENGTH
+      if (type == "Video") {
+        multicastSocketVideo?.send(datagramPacket)
+      } else {
+        multicastSocketAudio?.send(datagramPacket)
+      }
+      if (isEnableLogs) {
+        Log.i(TAG, "wrote report: $type, port: $port, packets: $packet, octet: $octet")
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AacPacket.java b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AacPacket.java
deleted file mode 100644
index 1bce52b..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AacPacket.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.pedro.rtsp.rtp.packets;
-
-import android.media.MediaCodec;
-import com.pedro.rtsp.rtsp.RtpFrame;
-import com.pedro.rtsp.utils.RtpConstants;
-import java.nio.ByteBuffer;
-
-/**
- * Created by pedro on 27/11/18.
- *
- * RFC 3640.
- */
-public class AacPacket extends BasePacket {
-
-  private AudioPacketCallback audioPacketCallback;
-
-  public AacPacket(int sampleRate, AudioPacketCallback audioPacketCallback) {
-    super(sampleRate);
-    this.audioPacketCallback = audioPacketCallback;
-    channelIdentifier = (byte) 0;
-  }
-
-  @Override
-  public void createAndSendPacket(ByteBuffer byteBuffer, MediaCodec.BufferInfo bufferInfo) {
-    int length = bufferInfo.size - byteBuffer.position();
-    if (length > 0) {
-      byte[] buffer = getBuffer(length + RtpConstants.RTP_HEADER_LENGTH + 4);
-
-      byteBuffer.get(buffer, RtpConstants.RTP_HEADER_LENGTH + 4, length);
-      long ts = bufferInfo.presentationTimeUs * 1000;
-      markPacket(buffer);
-      updateTimeStamp(buffer, ts);
-
-      // AU-headers-length field: contains the size in bits of a AU-header
-      // 13+3 = 16 bits -> 13bits for AU-size and 3bits for AU-Index / AU-Index-delta
-      // 13 bits will be enough because ADTS uses 13 bits for frame length
-      buffer[RtpConstants.RTP_HEADER_LENGTH] = (byte) 0;
-      buffer[RtpConstants.RTP_HEADER_LENGTH + 1] = (byte) 0x10;
-
-      // AU-size
-      buffer[RtpConstants.RTP_HEADER_LENGTH + 2] = (byte) (length >> 5);
-      buffer[RtpConstants.RTP_HEADER_LENGTH + 3] = (byte) (length << 3);
-
-      // AU-Index
-      buffer[RtpConstants.RTP_HEADER_LENGTH + 3] &= 0xF8;
-      buffer[RtpConstants.RTP_HEADER_LENGTH + 3] |= 0x00;
-
-      updateSeq(buffer);
-      RtpFrame rtpFrame =
-          new RtpFrame(buffer, ts, RtpConstants.RTP_HEADER_LENGTH + length + 4, rtpPort, rtcpPort,
-              channelIdentifier);
-      audioPacketCallback.onAudioFrameCreated(rtpFrame);
-    }
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AacPacket.kt b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AacPacket.kt
new file mode 100644
index 0000000..b71b5d7
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AacPacket.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp.packets
+
+import android.media.MediaCodec
+import com.pedro.rtsp.rtsp.RtpFrame
+import com.pedro.rtsp.utils.RtpConstants
+import java.nio.ByteBuffer
+import kotlin.experimental.and
+import kotlin.experimental.or
+
+/**
+ * Created by pedro on 27/11/18.
+ *
+ * RFC 3640.
+ */
+open class AacPacket(sampleRate: Int, private val audioPacketCallback: AudioPacketCallback) : BasePacket(sampleRate.toLong(),
+    RtpConstants.payloadType + RtpConstants.trackAudio) {
+
+  init {
+    channelIdentifier = RtpConstants.trackAudio
+  }
+
+  override fun createAndSendPacket(byteBuffer: ByteBuffer, bufferInfo: MediaCodec.BufferInfo) {
+    val length = bufferInfo.size - byteBuffer.position()
+    if (length > 0) {
+      val buffer = getBuffer(length + RtpConstants.RTP_HEADER_LENGTH + 4)
+      byteBuffer.get(buffer, RtpConstants.RTP_HEADER_LENGTH + 4, length)
+      val ts = bufferInfo.presentationTimeUs * 1000
+      markPacket(buffer)
+      val rtpTs = updateTimeStamp(buffer, ts)
+
+      // AU-headers-length field: contains the size in bits of a AU-header
+      // 13+3 = 16 bits -> 13bits for AU-size and 3bits for AU-Index / AU-Index-delta
+      // 13 bits will be enough because ADTS uses 13 bits for frame length
+      buffer[RtpConstants.RTP_HEADER_LENGTH] = 0.toByte()
+      buffer[RtpConstants.RTP_HEADER_LENGTH + 1] = 0x10.toByte()
+
+      // AU-size
+      buffer[RtpConstants.RTP_HEADER_LENGTH + 2] = (length shr 5).toByte()
+      buffer[RtpConstants.RTP_HEADER_LENGTH + 3] = (length shl 3).toByte()
+
+      // AU-Index
+      buffer[RtpConstants.RTP_HEADER_LENGTH + 3] = buffer[RtpConstants.RTP_HEADER_LENGTH + 3] and 0xF8.toByte()
+      buffer[RtpConstants.RTP_HEADER_LENGTH + 3] = buffer[RtpConstants.RTP_HEADER_LENGTH + 3] or 0x00
+      updateSeq(buffer)
+      val rtpFrame = RtpFrame(buffer, rtpTs, RtpConstants.RTP_HEADER_LENGTH + length + 4, rtpPort, rtcpPort, channelIdentifier)
+      audioPacketCallback.onAudioFrameCreated(rtpFrame)
+    }
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AudioPacketCallback.java b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AudioPacketCallback.java
deleted file mode 100644
index 956887b..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AudioPacketCallback.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.pedro.rtsp.rtp.packets;
-
-import com.pedro.rtsp.rtsp.RtpFrame;
-
-/**
- * Created by pedro on 7/11/18.
- */
-
-public interface AudioPacketCallback {
-  void onAudioFrameCreated(RtpFrame rtpFrame);
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AudioPacketCallback.kt b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AudioPacketCallback.kt
new file mode 100644
index 0000000..232e529
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/AudioPacketCallback.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp.packets
+
+import com.pedro.rtsp.rtsp.RtpFrame
+
+/**
+ * Created by pedro on 7/11/18.
+ */
+interface AudioPacketCallback {
+  fun onAudioFrameCreated(rtpFrame: RtpFrame)
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/BasePacket.java b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/BasePacket.java
deleted file mode 100644
index fe5ea3b..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/BasePacket.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.pedro.rtsp.rtp.packets;
-
-import android.media.MediaCodec;
-import com.pedro.rtsp.utils.RtpConstants;
-import java.nio.ByteBuffer;
-import java.util.Random;
-
-/**
- * Created by pedro on 27/11/18.
- */
-
-public abstract class BasePacket {
-
-  protected final static int maxPacketSize = RtpConstants.MTU - 28;
-  protected byte channelIdentifier;
-  protected int rtpPort;
-  protected int rtcpPort;
-  private final long clock;
-  private int seq = 0;
-  private int ssrc;
-
-  public BasePacket(long clock) {
-    this.clock = clock;
-    ssrc = new Random().nextInt();
-  }
-
-  public abstract void createAndSendPacket(ByteBuffer byteBuffer, MediaCodec.BufferInfo bufferInfo);
-
-  public void setPorts(int rtpPort, int rtcpPort) {
-    this.rtpPort = rtpPort;
-    this.rtcpPort = rtcpPort;
-  }
-
-  public void reset() {
-    seq = 0;
-    ssrc = new Random().nextInt();
-  }
-
-  protected byte[] getBuffer(int size) {
-    byte[] buffer = new byte[size];
-    buffer[0] = (byte) Integer.parseInt("10000000", 2);
-    buffer[1] = (byte) RtpConstants.payloadType;
-    setLongSSRC(buffer, ssrc);
-    requestBuffer(buffer);
-    return buffer;
-  }
-
-  protected void updateTimeStamp(byte[] buffer, long timestamp) {
-    long ts = timestamp * clock / 1000000000L;
-    setLong(buffer, ts, 4, 8);
-  }
-
-  protected void setLong(byte[] buffer, long n, int begin, int end) {
-    for (end--; end >= begin; end--) {
-      buffer[end] = (byte) (n % 256);
-      n >>= 8;
-    }
-  }
-
-  protected void updateSeq(byte[] buffer) {
-    setLong(buffer, ++seq, 2, 4);
-  }
-
-  protected void markPacket(byte[] buffer) {
-    buffer[1] |= 0x80;
-  }
-
-  private void setLongSSRC(byte[] buffer, int ssrc) {
-    setLong(buffer, ssrc, 8, 12);
-  }
-
-  private void requestBuffer(byte[] buffer) {
-    buffer[1] &= 0x7F;
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/BasePacket.kt b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/BasePacket.kt
new file mode 100644
index 0000000..d11ef7e
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/BasePacket.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp.packets
+
+import android.media.MediaCodec
+import com.pedro.rtsp.utils.RtpConstants
+import com.pedro.rtsp.utils.setLong
+import java.nio.ByteBuffer
+import kotlin.experimental.and
+import kotlin.experimental.or
+
+/**
+ * Created by pedro on 27/11/18.
+ */
+abstract class BasePacket(private val clock: Long, private val payloadType: Int) {
+
+  protected var channelIdentifier: Int = 0
+  protected var rtpPort = 0
+  protected var rtcpPort = 0
+  private var seq = 0L
+  private var ssrc = 0L
+  protected val maxPacketSize = RtpConstants.MTU - 28
+  protected val TAG = "BasePacket"
+
+  abstract fun createAndSendPacket(byteBuffer: ByteBuffer, bufferInfo: MediaCodec.BufferInfo)
+
+  fun setPorts(rtpPort: Int, rtcpPort: Int) {
+    this.rtpPort = rtpPort
+    this.rtcpPort = rtcpPort
+  }
+
+  open fun reset() {
+    seq = 0
+    ssrc = 0
+  }
+
+  fun setSSRC(ssrc: Long) {
+    this.ssrc = ssrc
+  }
+
+  protected fun getBuffer(size: Int): ByteArray {
+    val buffer = ByteArray(size)
+    buffer[0] = 0x80.toByte()
+    buffer[1] = payloadType.toByte()
+    setLongSSRC(buffer, ssrc)
+    requestBuffer(buffer)
+    return buffer
+  }
+
+  protected fun updateTimeStamp(buffer: ByteArray, timestamp: Long): Long {
+    val ts = timestamp * clock / 1000000000L
+    buffer.setLong(ts, 4, 8)
+    return ts
+  }
+
+  protected fun updateSeq(buffer: ByteArray) {
+    buffer.setLong(++seq, 2, 4)
+  }
+
+  protected fun markPacket(buffer: ByteArray) {
+    buffer[1] = buffer[1] or 0x80.toByte()
+  }
+
+  private fun setLongSSRC(buffer: ByteArray, ssrc: Long) {
+    buffer.setLong(ssrc, 8, 12)
+  }
+
+  private fun requestBuffer(buffer: ByteArray) {
+    buffer[1] = buffer[1] and 0x7F
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H264Packet.java b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H264Packet.java
deleted file mode 100644
index 91ee8af..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H264Packet.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.pedro.rtsp.rtp.packets;
-
-import android.media.MediaCodec;
-import com.pedro.rtsp.rtsp.RtpFrame;
-import com.pedro.rtsp.utils.RtpConstants;
-import java.nio.ByteBuffer;
-
-/**
- * Created by pedro on 27/11/18.
- *
- * RFC 3984
- */
-public class H264Packet extends BasePacket {
-
-  private byte[] header = new byte[5];
-  private byte[] stapA;
-  private VideoPacketCallback videoPacketCallback;
-  private boolean sendKeyFrame = false;
-
-  public H264Packet(byte[] sps, byte[] pps, VideoPacketCallback videoPacketCallback) {
-    super(RtpConstants.clockVideoFrequency);
-    this.videoPacketCallback = videoPacketCallback;
-    channelIdentifier = (byte) 2;
-    setSpsPps(sps, pps);
-  }
-
-  @Override
-  public void createAndSendPacket(ByteBuffer byteBuffer, MediaCodec.BufferInfo bufferInfo) {
-    // We read a NAL units from ByteBuffer and we send them
-    // NAL units are preceded with 0x00000001
-    byteBuffer.rewind();
-    byteBuffer.get(header, 0, 5);
-    long ts = bufferInfo.presentationTimeUs * 1000L;
-    int naluLength = bufferInfo.size - byteBuffer.position() + 1;
-    int type = header[4] & 0x1F;
-    if (type == RtpConstants.IDR || bufferInfo.flags == MediaCodec.BUFFER_FLAG_KEY_FRAME) {
-      byte[] buffer = getBuffer(stapA.length + RtpConstants.RTP_HEADER_LENGTH);
-      updateTimeStamp(buffer, ts);
-
-      markPacket(buffer); //mark end frame
-      System.arraycopy(stapA, 0, buffer, RtpConstants.RTP_HEADER_LENGTH, stapA.length);
-
-      updateSeq(buffer);
-      RtpFrame rtpFrame =
-          new RtpFrame(buffer, ts, stapA.length + RtpConstants.RTP_HEADER_LENGTH, rtpPort, rtcpPort,
-              channelIdentifier);
-      videoPacketCallback.onVideoFrameCreated(rtpFrame);
-      sendKeyFrame = true;
-    }
-    if (sendKeyFrame) {
-      // Small NAL unit => Single NAL unit
-      if (naluLength <= maxPacketSize - RtpConstants.RTP_HEADER_LENGTH - 2) {
-        int cont = naluLength - 1;
-        int length = cont < bufferInfo.size - byteBuffer.position() ? cont : bufferInfo.size - byteBuffer.position();
-        byte[] buffer = getBuffer(length + RtpConstants.RTP_HEADER_LENGTH + 1);
-
-        buffer[RtpConstants.RTP_HEADER_LENGTH] = header[4];
-        byteBuffer.get(buffer, RtpConstants.RTP_HEADER_LENGTH + 1, length);
-
-        updateTimeStamp(buffer, ts);
-        markPacket(buffer); //mark end frame
-
-        updateSeq(buffer);
-        RtpFrame rtpFrame =
-            new RtpFrame(buffer, ts, naluLength + RtpConstants.RTP_HEADER_LENGTH, rtpPort, rtcpPort,
-                channelIdentifier);
-        videoPacketCallback.onVideoFrameCreated(rtpFrame);
-      }
-      // Large NAL unit => Split nal unit
-      else {
-        // Set FU-A header
-        header[1] = (byte) (header[4] & 0x1F);  // FU header type
-        header[1] += 0x80; // set start bit to 1
-        // Set FU-A indicator
-        header[0] = (byte) ((header[4] & 0x60) & 0xFF); // FU indicator NRI
-        header[0] += 28;
-
-        int sum = 1;
-        while (sum < naluLength) {
-          int cont = naluLength - sum > maxPacketSize - RtpConstants.RTP_HEADER_LENGTH - 2 ?
-              maxPacketSize
-                  - RtpConstants.RTP_HEADER_LENGTH
-                  - 2 : naluLength - sum;
-          int length = cont < bufferInfo.size - byteBuffer.position() ? cont : bufferInfo.size - byteBuffer.position();
-          byte[] buffer = getBuffer(length + RtpConstants.RTP_HEADER_LENGTH + 2);
-
-          buffer[RtpConstants.RTP_HEADER_LENGTH] = header[0];
-          buffer[RtpConstants.RTP_HEADER_LENGTH + 1] = header[1];
-          updateTimeStamp(buffer, ts);
-          byteBuffer.get(buffer, RtpConstants.RTP_HEADER_LENGTH + 2, length);
-          sum += length;
-          // Last packet before next NAL
-          if (sum >= naluLength) {
-            // End bit on
-            buffer[RtpConstants.RTP_HEADER_LENGTH + 1] += 0x40;
-            markPacket(buffer); //mark end frame
-          }
-          updateSeq(buffer);
-          RtpFrame rtpFrame =
-              new RtpFrame(buffer, ts, length + RtpConstants.RTP_HEADER_LENGTH + 2, rtpPort,
-                  rtcpPort, channelIdentifier);
-          videoPacketCallback.onVideoFrameCreated(rtpFrame);
-          // Switch start bit
-          header[1] = (byte) (header[1] & 0x7F);
-        }
-      }
-    }
-  }
-
-  private void setSpsPps(byte[] sps, byte[] pps) {
-    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);
-  }
-
-  @Override
-  public void reset() {
-    super.reset();
-    sendKeyFrame = false;
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H264Packet.kt b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H264Packet.kt
new file mode 100644
index 0000000..94e7bf1
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H264Packet.kt
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp.packets
+
+import android.media.MediaCodec
+import android.util.Log
+import com.pedro.rtsp.rtsp.RtpFrame
+import com.pedro.rtsp.utils.RtpConstants
+import com.pedro.rtsp.utils.getVideoStartCodeSize
+import java.nio.ByteBuffer
+import kotlin.experimental.and
+
+/**
+ * Created by pedro on 27/11/18.
+ *
+ * RFC 3984
+ */
+open class H264Packet(sps: ByteArray, pps: ByteArray, private val videoPacketCallback: VideoPacketCallback) : BasePacket(RtpConstants.clockVideoFrequency,
+    RtpConstants.payloadType + RtpConstants.trackVideo) {
+
+  private var stapA: ByteArray? = null
+  private var sendKeyFrame = false
+  private var sps: ByteArray? = null
+  private var pps: ByteArray? = null
+
+  init {
+    channelIdentifier = RtpConstants.trackVideo
+    setSpsPps(sps, pps)
+  }
+
+  override fun createAndSendPacket(byteBuffer: ByteBuffer, bufferInfo: MediaCodec.BufferInfo) {
+    // We read a NAL units from ByteBuffer and we send them
+    // NAL units are preceded with 0x00000001
+    byteBuffer.rewind()
+    val header = ByteArray(getHeaderSize(byteBuffer) + 1)
+    if (header.size == 1) return //invalid buffer or waiting for sps/pps
+    byteBuffer.rewind()
+    byteBuffer.get(header, 0, header.size)
+    val ts = bufferInfo.presentationTimeUs * 1000L
+    val naluLength = bufferInfo.size - byteBuffer.position()
+    val type: Int = (header[header.size - 1] and 0x1F).toInt()
+    if (type == RtpConstants.IDR || bufferInfo.flags == MediaCodec.BUFFER_FLAG_KEY_FRAME) {
+      stapA?.let {
+        val buffer = getBuffer(it.size + RtpConstants.RTP_HEADER_LENGTH)
+        val rtpTs = updateTimeStamp(buffer, ts)
+        markPacket(buffer) //mark end frame
+        System.arraycopy(it, 0, buffer, RtpConstants.RTP_HEADER_LENGTH, it.size)
+        updateSeq(buffer)
+        val rtpFrame = RtpFrame(buffer, rtpTs, it.size + RtpConstants.RTP_HEADER_LENGTH, rtpPort, rtcpPort, channelIdentifier)
+        videoPacketCallback.onVideoFrameCreated(rtpFrame)
+        sendKeyFrame = true
+      } ?: run {
+        Log.i(TAG, "can't create key frame because setSpsPps was not called")
+      }
+    }
+    if (sendKeyFrame) {
+      // Small NAL unit => Single NAL unit
+      if (naluLength <= maxPacketSize - RtpConstants.RTP_HEADER_LENGTH - 1) {
+        val buffer = getBuffer(naluLength + RtpConstants.RTP_HEADER_LENGTH + 1)
+        buffer[RtpConstants.RTP_HEADER_LENGTH] = header[header.size - 1]
+        byteBuffer.get(buffer, RtpConstants.RTP_HEADER_LENGTH + 1, naluLength)
+        val rtpTs = updateTimeStamp(buffer, ts)
+        markPacket(buffer) //mark end frame
+        updateSeq(buffer)
+        val rtpFrame = RtpFrame(buffer, rtpTs, buffer.size, rtpPort, rtcpPort, channelIdentifier)
+        videoPacketCallback.onVideoFrameCreated(rtpFrame)
+      } else {
+        // Set FU-A header
+        header[1] = header[header.size - 1] and 0x1F // FU header type
+        header[1] = header[1].plus(0x80).toByte()  // set start bit to 1
+        // Set FU-A indicator
+        header[0] = header[header.size - 1] and 0x60 and 0xFF.toByte() // FU indicator NRI
+        header[0] = header[0].plus(28).toByte()
+        var sum = 0
+        while (sum < naluLength) {
+          val length = if (naluLength - sum > maxPacketSize - RtpConstants.RTP_HEADER_LENGTH - 2) {
+            maxPacketSize - RtpConstants.RTP_HEADER_LENGTH - 2
+          } else {
+            bufferInfo.size - byteBuffer.position()
+          }
+          val buffer = getBuffer(length + RtpConstants.RTP_HEADER_LENGTH + 2)
+          buffer[RtpConstants.RTP_HEADER_LENGTH] = header[0]
+          buffer[RtpConstants.RTP_HEADER_LENGTH + 1] = header[1]
+          val rtpTs = updateTimeStamp(buffer, ts)
+          byteBuffer.get(buffer, RtpConstants.RTP_HEADER_LENGTH + 2, length)
+          sum += length
+          // Last packet before next NAL
+          if (sum >= naluLength) {
+            // End bit on
+            buffer[RtpConstants.RTP_HEADER_LENGTH + 1] = buffer[RtpConstants.RTP_HEADER_LENGTH + 1].plus(0x40).toByte()
+            markPacket(buffer) //mark end frame
+          }
+          updateSeq(buffer)
+          val rtpFrame = RtpFrame(buffer, rtpTs, buffer.size, rtpPort, rtcpPort, channelIdentifier)
+          videoPacketCallback.onVideoFrameCreated(rtpFrame)
+          // Switch start bit
+          header[1] = header[1] and 0x7F
+        }
+      }
+    } else {
+      Log.i(TAG, "waiting for keyframe")
+    }
+  }
+
+  private fun setSpsPps(sps: ByteArray, pps: ByteArray) {
+    this.sps = sps
+    this.pps = pps
+    stapA = ByteArray(sps.size + pps.size + 5)
+    stapA?.let {
+      // STAP-A NAL header is 24
+      it[0] = 24
+
+      // Write NALU 1 size into the array (NALU 1 is the SPS).
+      it[1] = (sps.size shr 8).toByte()
+      it[2] = (sps.size and 0xFF).toByte()
+
+      // Write NALU 2 size into the array (NALU 2 is the PPS).
+      it[sps.size + 3] = (pps.size shr 8).toByte()
+      it[sps.size + 4] = (pps.size and 0xFF).toByte()
+
+      // Write NALU 1 into the array, then write NALU 2 into the array.
+      System.arraycopy(sps, 0, it, 3, sps.size)
+      System.arraycopy(pps, 0, it, 5 + sps.size, pps.size)
+    }
+  }
+
+  private fun getHeaderSize(byteBuffer: ByteBuffer): Int {
+    if (byteBuffer.remaining() < 4) return 0
+
+    val sps = this.sps
+    val pps = this.pps
+    if (sps != null && pps != null) {
+      val startCodeSize = byteBuffer.getVideoStartCodeSize()
+      if (startCodeSize == 0) return 0
+      val startCode = ByteArray(startCodeSize) { 0x00 }
+      startCode[startCodeSize - 1] = 0x01
+      val avcHeader = startCode.plus(sps).plus(startCode).plus(pps).plus(startCode)
+      if (byteBuffer.remaining() < avcHeader.size) return startCodeSize
+
+      val possibleAvcHeader = ByteArray(avcHeader.size)
+      byteBuffer.get(possibleAvcHeader, 0, possibleAvcHeader.size)
+      return if (avcHeader.contentEquals(possibleAvcHeader)) {
+        avcHeader.size
+      } else {
+        startCodeSize
+      }
+    }
+    return 0
+  }
+
+  override fun reset() {
+    super.reset()
+    sendKeyFrame = false
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H265Packet.java b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H265Packet.java
deleted file mode 100644
index afe4d25..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H265Packet.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.pedro.rtsp.rtp.packets;
-
-import android.media.MediaCodec;
-import com.pedro.rtsp.rtsp.RtpFrame;
-import com.pedro.rtsp.utils.RtpConstants;
-import java.nio.ByteBuffer;
-
-/**
- * Created by pedro on 28/11/18.
- *
- * RFC 7798.
- */
-public class H265Packet extends BasePacket {
-
-  private byte[] header = new byte[6];
-  private byte[] stapA;
-  private VideoPacketCallback videoPacketCallback;
-  private boolean sendKeyFrame = false;
-
-  public H265Packet(byte[] sps, byte[] pps, byte[] vps, VideoPacketCallback videoPacketCallback) {
-    super(RtpConstants.clockVideoFrequency);
-    this.videoPacketCallback = videoPacketCallback;
-    channelIdentifier = (byte) 2;
-    setSpsPpsVps(sps, pps, vps);
-  }
-
-  @Override
-  public void createAndSendPacket(ByteBuffer byteBuffer, MediaCodec.BufferInfo bufferInfo) {
-    // We read a NAL units from ByteBuffer and we send them
-    // NAL units are preceded with 0x00000001
-    byteBuffer.rewind();
-    byteBuffer.get(header, 0, 6);
-    long ts = bufferInfo.presentationTimeUs * 1000L;
-    int naluLength = bufferInfo.size - byteBuffer.position() + 1;
-    int type = (header[4] >> 1) & 0x3f;
-    if (type == RtpConstants.IDR_N_LP || type == RtpConstants.IDR_W_DLP
-        || bufferInfo.flags == MediaCodec.BUFFER_FLAG_KEY_FRAME) {
-      byte[] buffer = getBuffer(stapA.length + RtpConstants.RTP_HEADER_LENGTH);
-      updateTimeStamp(buffer, ts);
-
-      markPacket(buffer); //mark end frame
-      System.arraycopy(stapA, 0, buffer, RtpConstants.RTP_HEADER_LENGTH, stapA.length);
-
-      updateSeq(buffer);
-      RtpFrame rtpFrame =
-          new RtpFrame(buffer, ts, stapA.length + RtpConstants.RTP_HEADER_LENGTH, rtpPort, rtcpPort,
-              channelIdentifier);
-      videoPacketCallback.onVideoFrameCreated(rtpFrame);
-      sendKeyFrame = true;
-    }
-    if (sendKeyFrame) {
-      // Small NAL unit => Single NAL unit
-      if (naluLength <= maxPacketSize - RtpConstants.RTP_HEADER_LENGTH - 3) {
-        int cont = naluLength - 1;
-        int length = cont < bufferInfo.size - byteBuffer.position() ? cont : bufferInfo.size - byteBuffer.position();
-        byte[] buffer = getBuffer(length + RtpConstants.RTP_HEADER_LENGTH + 2);
-        //Set PayloadHdr (exact copy of nal unit header)
-        buffer[RtpConstants.RTP_HEADER_LENGTH] = header[4];
-        buffer[RtpConstants.RTP_HEADER_LENGTH + 1] = header[5];
-        byteBuffer.get(buffer, RtpConstants.RTP_HEADER_LENGTH + 2, length);
-
-        updateTimeStamp(buffer, ts);
-        markPacket(buffer); //mark end frame
-
-        updateSeq(buffer);
-        RtpFrame rtpFrame =
-            new RtpFrame(buffer, ts, naluLength + RtpConstants.RTP_HEADER_LENGTH, rtpPort, rtcpPort,
-                channelIdentifier);
-        videoPacketCallback.onVideoFrameCreated(rtpFrame);
-      }
-      // Large NAL unit => Split nal unit
-      else {
-        //Set PayloadHdr (16bit type=49)
-        header[0] = 49 << 1;
-        header[1] = 1;
-        // Set FU header
-        //   +---------------+
-        //   |0|1|2|3|4|5|6|7|
-        //   +-+-+-+-+-+-+-+-+
-        //   |S|E|  FuType   |
-        //   +---------------+
-        header[2] = (byte) type;  // FU header type
-        header[2] += 0x80; // Start bit
-
-        int sum = 1;
-        while (sum < naluLength) {
-          int cont = naluLength - sum > maxPacketSize - RtpConstants.RTP_HEADER_LENGTH - 3 ?
-              maxPacketSize
-                  - RtpConstants.RTP_HEADER_LENGTH
-                  - 3 : naluLength - sum;
-          int length = cont < bufferInfo.size - byteBuffer.position() ? cont : bufferInfo.size - byteBuffer.position();
-          byte[] buffer = getBuffer(length + RtpConstants.RTP_HEADER_LENGTH + 3);
-
-          buffer[RtpConstants.RTP_HEADER_LENGTH] = header[0];
-          buffer[RtpConstants.RTP_HEADER_LENGTH + 1] = header[1];
-          buffer[RtpConstants.RTP_HEADER_LENGTH + 2] = header[2];
-          updateTimeStamp(buffer, ts);
-          byteBuffer.get(buffer, RtpConstants.RTP_HEADER_LENGTH + 3, length);
-          sum += length;
-          // Last packet before next NAL
-          if (sum >= naluLength) {
-            // End bit on
-            buffer[RtpConstants.RTP_HEADER_LENGTH + 2] += 0x40;
-            markPacket(buffer); //mark end frame
-          }
-          updateSeq(buffer);
-          RtpFrame rtpFrame =
-              new RtpFrame(buffer, ts, length + RtpConstants.RTP_HEADER_LENGTH + 3, rtpPort,
-                  rtcpPort, channelIdentifier);
-          videoPacketCallback.onVideoFrameCreated(rtpFrame);
-          // Switch start bit
-          header[2] = (byte) (header[2] & 0x7F);
-        }
-      }
-    }
-  }
-
-  private void setSpsPpsVps(byte[] sps, byte[] pps, byte[] vps) {
-    stapA = new byte[sps.length + pps.length + 6];
-
-    stapA[0] = 48 << 1;
-    stapA[1] = 1;
-
-    // Write NALU 1 size into the array (NALU 1 is the SPS).
-    stapA[2] = (byte) (sps.length >> 8);
-    stapA[3] = (byte) (sps.length & 0xFF);
-
-    // Write NALU 2 size into the array (NALU 2 is the PPS).
-    stapA[sps.length + 4] = (byte) (pps.length >> 8);
-    stapA[sps.length + 5] = (byte) (pps.length & 0xFF);
-
-    // Write NALU 1 into the array, then write NALU 2 into the array.
-    System.arraycopy(sps, 0, stapA, 4, sps.length);
-    System.arraycopy(pps, 0, stapA, 6 + sps.length, pps.length);
-  }
-
-  @Override
-  public void reset() {
-    super.reset();
-    sendKeyFrame = false;
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H265Packet.kt b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H265Packet.kt
new file mode 100644
index 0000000..fb69f9f
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/H265Packet.kt
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp.packets
+
+import android.media.MediaCodec
+import android.util.Log
+import com.pedro.rtsp.rtsp.RtpFrame
+import com.pedro.rtsp.utils.RtpConstants
+import java.nio.ByteBuffer
+import kotlin.experimental.and
+
+/**
+ * Created by pedro on 28/11/18.
+ *
+ * RFC 7798.
+ */
+open class H265Packet(sps: ByteArray, pps: ByteArray, vps: ByteArray, private val videoPacketCallback: VideoPacketCallback) : BasePacket(RtpConstants.clockVideoFrequency,
+    RtpConstants.payloadType + RtpConstants.trackVideo) {
+
+  private val header = ByteArray(6)
+  private var stapA: ByteArray? = null
+  private var sendKeyFrame = false
+
+  init {
+    channelIdentifier = RtpConstants.trackVideo
+    setSpsPpsVps(sps, pps, vps)
+  }
+
+  override fun createAndSendPacket(byteBuffer: ByteBuffer, bufferInfo: MediaCodec.BufferInfo) {
+    // We read a NAL units from ByteBuffer and we send them
+    // NAL units are preceded with 0x00000001
+    byteBuffer.rewind()
+    byteBuffer.get(header, 0, 6)
+    val ts = bufferInfo.presentationTimeUs * 1000L
+    val naluLength = bufferInfo.size - byteBuffer.position()
+    val type: Int = header[4].toInt().shr(1 and 0x3f)
+    if (type == RtpConstants.IDR_N_LP || type == RtpConstants.IDR_W_DLP || bufferInfo.flags == MediaCodec.BUFFER_FLAG_KEY_FRAME) {
+      stapA?.let {
+        val buffer = getBuffer(it.size + RtpConstants.RTP_HEADER_LENGTH)
+        val rtpTs = updateTimeStamp(buffer, ts)
+        markPacket(buffer) //mark end frame
+        System.arraycopy(it, 0, buffer, RtpConstants.RTP_HEADER_LENGTH, it.size)
+        updateSeq(buffer)
+        val rtpFrame = RtpFrame(buffer, rtpTs, it.size + RtpConstants.RTP_HEADER_LENGTH, rtpPort, rtcpPort, channelIdentifier)
+        videoPacketCallback.onVideoFrameCreated(rtpFrame)
+        sendKeyFrame = true
+      } ?: run {
+        Log.i(TAG, "can't create key frame because setSpsPps was not called")
+      }
+    }
+    if (sendKeyFrame) {
+      // Small NAL unit => Single NAL unit
+      if (naluLength <= maxPacketSize - RtpConstants.RTP_HEADER_LENGTH - 2) {
+        val buffer = getBuffer(naluLength + RtpConstants.RTP_HEADER_LENGTH + 2)
+        //Set PayloadHdr (exact copy of nal unit header)
+        buffer[RtpConstants.RTP_HEADER_LENGTH] = header[4]
+        buffer[RtpConstants.RTP_HEADER_LENGTH + 1] = header[5]
+        byteBuffer.get(buffer, RtpConstants.RTP_HEADER_LENGTH + 2, naluLength)
+        val rtpTs = updateTimeStamp(buffer, ts)
+        markPacket(buffer) //mark end frame
+        updateSeq(buffer)
+        val rtpFrame = RtpFrame(buffer, rtpTs, buffer.size, rtpPort, rtcpPort, channelIdentifier)
+        videoPacketCallback.onVideoFrameCreated(rtpFrame)
+      } else {
+        //Set PayloadHdr (16bit type=49)
+        header[0] = (49 shl 1).toByte()
+        header[1] = 1
+        // Set FU header
+        //   +---------------+
+        //   |0|1|2|3|4|5|6|7|
+        //   +-+-+-+-+-+-+-+-+
+        //   |S|E|  FuType   |
+        //   +---------------+
+        header[2] = type.toByte() // FU header type
+        header[2] = header[2].plus(0x80).toByte() // Start bit
+        var sum = 0
+        while (sum < naluLength) {
+          val length = if (naluLength - sum > maxPacketSize - RtpConstants.RTP_HEADER_LENGTH - 3) {
+            maxPacketSize - RtpConstants.RTP_HEADER_LENGTH - 3
+          } else {
+            bufferInfo.size - byteBuffer.position()
+          }
+          val buffer = getBuffer(length + RtpConstants.RTP_HEADER_LENGTH + 3)
+          buffer[RtpConstants.RTP_HEADER_LENGTH] = header[0]
+          buffer[RtpConstants.RTP_HEADER_LENGTH + 1] = header[1]
+          buffer[RtpConstants.RTP_HEADER_LENGTH + 2] = header[2]
+          val rtpTs = updateTimeStamp(buffer, ts)
+          byteBuffer.get(buffer, RtpConstants.RTP_HEADER_LENGTH + 3, length)
+          sum += length
+          // Last packet before next NAL
+          if (sum >= naluLength) {
+            // End bit on
+            buffer[RtpConstants.RTP_HEADER_LENGTH + 2] = buffer[RtpConstants.RTP_HEADER_LENGTH + 2].plus(0x40).toByte()
+            markPacket(buffer) //mark end frame
+          }
+          updateSeq(buffer)
+          val rtpFrame = RtpFrame(buffer, rtpTs, buffer.size, rtpPort, rtcpPort, channelIdentifier)
+          videoPacketCallback.onVideoFrameCreated(rtpFrame)
+          // Switch start bit
+          header[2] = header[2] and 0x7F
+        }
+      }
+    }
+  }
+
+  private fun setSpsPpsVps(sps: ByteArray, pps: ByteArray, vps: ByteArray) {
+    stapA = ByteArray(sps.size + pps.size + 6)
+    stapA?.let {
+      it[0] = (48 shl 1).toByte()
+      it[1] = 1
+
+      // Write NALU 1 size into the array (NALU 1 is the SPS).
+      it[2] = (sps.size shr 8).toByte()
+      it[3] = (sps.size and 0xFF).toByte()
+
+      // Write NALU 2 size into the array (NALU 2 is the PPS).
+      it[sps.size + 4] = (pps.size shr 8).toByte()
+      it[sps.size + 5] = (pps.size and 0xFF).toByte()
+
+      // Write NALU 1 into the array, then write NALU 2 into the array.
+      System.arraycopy(sps, 0, it, 4, sps.size)
+      System.arraycopy(pps, 0, it, 6 + sps.size, pps.size)
+    }
+  }
+
+  override fun reset() {
+    super.reset()
+    sendKeyFrame = false
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/VideoPacketCallback.java b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/VideoPacketCallback.java
deleted file mode 100644
index 54abc89..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/VideoPacketCallback.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.pedro.rtsp.rtp.packets;
-
-import com.pedro.rtsp.rtsp.RtpFrame;
-
-/**
- * Created by pedro on 7/11/18.
- */
-
-public interface VideoPacketCallback {
-  void onVideoFrameCreated(RtpFrame rtpFrame);
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/VideoPacketCallback.kt b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/VideoPacketCallback.kt
new file mode 100644
index 0000000..24ccf3f
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtp/packets/VideoPacketCallback.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp.packets
+
+import com.pedro.rtsp.rtsp.RtpFrame
+
+/**
+ * Created by pedro on 7/11/18.
+ */
+interface VideoPacketCallback {
+  fun onVideoFrameCreated(rtpFrame: RtpFrame)
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/BaseRtpSocket.java b/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/BaseRtpSocket.java
deleted file mode 100644
index 5c6e8d7..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/BaseRtpSocket.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.pedro.rtsp.rtp.sockets;
-
-import com.pedro.rtsp.rtsp.Protocol;
-import com.pedro.rtsp.rtsp.RtpFrame;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Created by pedro on 7/11/18.
- */
-
-public abstract class BaseRtpSocket {
-
-  protected final static String TAG = "BaseRtpSocket";
-
-  public static BaseRtpSocket getInstance(Protocol protocol, int videoSourcePort,
-      int audioSourcePort) {
-    return protocol == Protocol.TCP ? new RtpSocketTcp()
-        : new RtpSocketUdp(videoSourcePort, audioSourcePort);
-  }
-
-  public abstract void setDataStream(OutputStream outputStream, String host);
-
-  public abstract void sendFrame(RtpFrame rtpFrame) throws IOException;
-
-  public abstract void close();
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/BaseRtpSocket.kt b/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/BaseRtpSocket.kt
new file mode 100644
index 0000000..f418827
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/BaseRtpSocket.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp.sockets
+
+import com.pedro.rtsp.rtsp.Protocol
+import com.pedro.rtsp.rtsp.RtpFrame
+import java.io.IOException
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 7/11/18.
+ */
+abstract class BaseRtpSocket {
+
+  protected val TAG = "BaseRtpSocket"
+
+  companion object {
+    @JvmStatic
+    fun getInstance(protocol: Protocol, videoSourcePort: Int, audioSourcePort: Int): BaseRtpSocket {
+      return if (protocol === Protocol.TCP) {
+        RtpSocketTcp()
+      } else {
+        RtpSocketUdp(videoSourcePort, audioSourcePort)
+      }
+    }
+  }
+
+  @Throws(IOException::class)
+  abstract fun setDataStream(outputStream: OutputStream, host: String)
+
+  @Throws(IOException::class)
+  abstract fun sendFrame(rtpFrame: RtpFrame, isEnableLogs: Boolean)
+
+  abstract fun close()
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketTcp.java b/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketTcp.java
deleted file mode 100644
index 183b908..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketTcp.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.pedro.rtsp.rtp.sockets;
-
-import android.util.Log;
-import com.pedro.rtsp.rtsp.RtpFrame;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Created by pedro on 7/11/18.
- */
-
-public class RtpSocketTcp extends BaseRtpSocket {
-
-  private OutputStream outputStream;
-  private byte tcpHeader[];
-
-  public RtpSocketTcp() {
-    tcpHeader = new byte[] { '$', 0, 0, 0 };
-  }
-
-  @Override
-  public void setDataStream(OutputStream outputStream, String host) {
-    this.outputStream = outputStream;
-  }
-
-  @Override
-  public void sendFrame(RtpFrame rtpFrame) throws IOException {
-    sendFrameTCP(rtpFrame);
-  }
-
-  @Override
-  public void close() {
-
-  }
-
-  private void sendFrameTCP(RtpFrame rtpFrame) throws IOException {
-    synchronized (outputStream) {
-      int len = rtpFrame.getLength();
-      tcpHeader[1] = rtpFrame.getChannelIdentifier();
-      tcpHeader[2] = (byte) (len >> 8);
-      tcpHeader[3] = (byte) (len & 0xFF);
-      outputStream.write(tcpHeader);
-      outputStream.write(rtpFrame.getBuffer(), 0, len);
-      outputStream.flush();
-      Log.i(TAG, "wrote packet: "
-          + (rtpFrame.getChannelIdentifier() == (byte) 2 ? "Video" : "Audio")
-          + ", size: "
-          + rtpFrame.getLength());
-    }
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketTcp.kt b/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketTcp.kt
new file mode 100644
index 0000000..cc7f3c8
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketTcp.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp.sockets
+
+import android.util.Log
+import com.pedro.rtsp.rtsp.RtpFrame
+import com.pedro.rtsp.utils.RtpConstants
+import java.io.IOException
+import java.io.OutputStream
+
+/**
+ * Created by pedro on 7/11/18.
+ */
+open class RtpSocketTcp : BaseRtpSocket() {
+
+  private var outputStream: OutputStream? = null
+  private val tcpHeader: ByteArray = byteArrayOf('$'.code.toByte(), 0, 0, 0)
+
+  @Throws(IOException::class)
+  override fun setDataStream(outputStream: OutputStream, host: String) {
+    this.outputStream = outputStream
+  }
+
+  @Throws(IOException::class)
+  override fun sendFrame(rtpFrame: RtpFrame, isEnableLogs: Boolean) {
+    sendFrameTCP(rtpFrame, isEnableLogs)
+  }
+
+  override fun close() {}
+
+  @Throws(IOException::class)
+  private fun sendFrameTCP(rtpFrame: RtpFrame, isEnableLogs: Boolean) {
+    synchronized(RtpConstants.lock) {
+      val len = rtpFrame.length
+      tcpHeader[1] = (2 * rtpFrame.channelIdentifier).toByte()
+      tcpHeader[2] = (len shr 8).toByte()
+      tcpHeader[3] = (len and 0xFF).toByte()
+      outputStream?.write(tcpHeader)
+      outputStream?.write(rtpFrame.buffer, 0, len)
+      outputStream?.flush()
+      if (isEnableLogs) {
+        Log.i(TAG, "wrote packet: ${(if (rtpFrame.isVideoFrame()) "Video" else "Audio")}, size: ${len + tcpHeader.size}")
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketUdp.java b/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketUdp.java
deleted file mode 100644
index d07f788..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketUdp.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.pedro.rtsp.rtp.sockets;
-
-import android.util.Log;
-import com.pedro.rtsp.rtsp.RtpFrame;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.DatagramPacket;
-import java.net.InetAddress;
-import java.net.MulticastSocket;
-import java.net.UnknownHostException;
-
-/**
- * Created by pedro on 7/11/18.
- */
-
-public class RtpSocketUdp extends BaseRtpSocket {
-
-  private MulticastSocket multicastSocketVideo;
-  private MulticastSocket multicastSocketAudio;
-  private DatagramPacket datagramPacket = new DatagramPacket(new byte[] { 0 }, 1);
-
-  public RtpSocketUdp(int videoSourcePort, int audioSourcePort) {
-    try {
-      multicastSocketVideo = new MulticastSocket(videoSourcePort);
-      multicastSocketVideo.setTimeToLive(64);
-      multicastSocketAudio = new MulticastSocket(audioSourcePort);
-      multicastSocketAudio.setTimeToLive(64);
-    } catch (IOException e) {
-      Log.e(TAG, "Error", e);
-    }
-  }
-
-  @Override
-  public void setDataStream(OutputStream outputStream, String host) {
-    try {
-      datagramPacket.setAddress(InetAddress.getByName(host));
-    } catch (UnknownHostException e) {
-      Log.e(TAG, "Error", e);
-    }
-  }
-
-  @Override
-  public void sendFrame(RtpFrame rtpFrame) throws IOException {
-    sendFrameUDP(rtpFrame);
-  }
-
-  @Override
-  public void close() {
-    multicastSocketVideo.close();
-    multicastSocketAudio.close();
-  }
-
-  private void sendFrameUDP(RtpFrame rtpFrame) throws IOException {
-    datagramPacket.setData(rtpFrame.getBuffer());
-    datagramPacket.setPort(rtpFrame.getRtpPort());
-    datagramPacket.setLength(rtpFrame.getLength());
-    if (rtpFrame.getChannelIdentifier() == (byte) 2) {
-      multicastSocketVideo.send(datagramPacket);
-    } else {
-      multicastSocketAudio.send(datagramPacket);
-    }
-    Log.i(TAG, "wrote packet: "
-        + (rtpFrame.getChannelIdentifier() == (byte) 2 ? "Video" : "Audio")
-        + ", size: "
-        + rtpFrame.getLength()
-        + ", port: "
-        + rtpFrame.getRtpPort());
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketUdp.kt b/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketUdp.kt
new file mode 100644
index 0000000..df88015
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtp/sockets/RtpSocketUdp.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp.sockets
+
+import android.util.Log
+import com.pedro.rtsp.rtsp.RtpFrame
+import com.pedro.rtsp.utils.RtpConstants
+import java.io.IOException
+import java.io.OutputStream
+import java.net.DatagramPacket
+import java.net.InetAddress
+import java.net.MulticastSocket
+import java.net.UnknownHostException
+
+/**
+ * Created by pedro on 7/11/18.
+ */
+open class RtpSocketUdp(videoSourcePort: Int, audioSourcePort: Int) : BaseRtpSocket() {
+
+  private var multicastSocketVideo: MulticastSocket? = null
+  private var multicastSocketAudio: MulticastSocket? = null
+  private val datagramPacket = DatagramPacket(byteArrayOf(0), 1)
+
+  init {
+    multicastSocketVideo = MulticastSocket(videoSourcePort)
+    multicastSocketVideo?.timeToLive = 64
+    multicastSocketAudio = MulticastSocket(audioSourcePort)
+    multicastSocketAudio?.timeToLive = 64
+  }
+
+  @Throws(IOException::class)
+  override fun setDataStream(outputStream: OutputStream, host: String) {
+    datagramPacket.address = InetAddress.getByName(host)
+  }
+
+  @Throws(IOException::class)
+  override fun sendFrame(rtpFrame: RtpFrame, isEnableLogs: Boolean) {
+    sendFrameUDP(rtpFrame, isEnableLogs)
+  }
+
+  override fun close() {
+    multicastSocketVideo?.close()
+    multicastSocketAudio?.close()
+  }
+
+  @Throws(IOException::class)
+  private fun sendFrameUDP(rtpFrame: RtpFrame, isEnableLogs: Boolean) {
+    synchronized(RtpConstants.lock) {
+      datagramPacket.data = rtpFrame.buffer
+      datagramPacket.port = rtpFrame.rtpPort
+      datagramPacket.length = rtpFrame.length
+      if (rtpFrame.isVideoFrame()) {
+        multicastSocketVideo?.send(datagramPacket)
+      } else {
+        multicastSocketAudio?.send(datagramPacket)
+      }
+      if (isEnableLogs) {
+        Log.i(TAG, "wrote packet: ${(if (rtpFrame.isVideoFrame()) "Video" else "Audio")}, size: ${rtpFrame.length}, port: ${rtpFrame.rtpPort}")
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/Body.java b/rtsp/src/main/java/com/pedro/rtsp/rtsp/Body.java
deleted file mode 100644
index 0e22f15..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtsp/Body.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.pedro.rtsp.rtsp;
-
-import com.pedro.rtsp.utils.RtpConstants;
-
-/**
- * Created by pedro on 21/02/17.
- */
-
-public class Body {
-
-  /** supported sampleRates. **/
-  private static final int[] AUDIO_SAMPLING_RATES = {
-      96000, // 0
-      88200, // 1
-      64000, // 2
-      48000, // 3
-      44100, // 4
-      32000, // 5
-      24000, // 6
-      22050, // 7
-      16000, // 8
-      12000, // 9
-      11025, // 10
-      8000,  // 11
-      7350,  // 12
-      -1,   // 13
-      -1,   // 14
-      -1,   // 15
-  };
-
-  public static String createAacBody(int trackAudio, int sampleRate, boolean isStereo) {
-    int sampleRateNum = -1;
-    for (int i = 0; i < AUDIO_SAMPLING_RATES.length; i++) {
-      if (AUDIO_SAMPLING_RATES[i] == sampleRate) {
-        sampleRateNum = i;
-        break;
-      }
-    }
-    int channel = (isStereo) ? 2 : 1;
-    int config = (2 & 0x1F) << 11 | (sampleRateNum & 0x0F) << 7 | (channel & 0x0F) << 3;
-    return "m=audio 0 RTP/AVP "
-        + RtpConstants.payloadType
-        + "\r\n"
-        + "a=rtpmap:"
-        + RtpConstants.payloadType
-        + " MPEG4-GENERIC/"
-        + sampleRate
-        + "/"
-        + channel
-        + "\r\n"
-        + "a=fmtp:"
-        + RtpConstants.payloadType
-        + " streamtype=5; profile-level-id=15; mode=AAC-hbr; config="
-        + Integer.toHexString(config)
-        + "; SizeLength=13; IndexLength=3; IndexDeltaLength=3;\r\n"
-        + "a=control:trackID="
-        + trackAudio
-        + "\r\n";
-  }
-
-  public static String createH264Body(int trackVideo, String sps, String pps) {
-    return "m=video 0 RTP/AVP "
-        + RtpConstants.payloadType
-        + "\r\n"
-        + "a=rtpmap:"
-        + RtpConstants.payloadType
-        + " H264/"
-        + RtpConstants.clockVideoFrequency
-        + "\r\n"
-        + "a=fmtp:"
-        + RtpConstants.payloadType
-        + " packetization-mode=1;sprop-parameter-sets="
-        + sps
-        + ","
-        + pps
-        + ";\r\n"
-        + "a=control:trackID="
-        + trackVideo
-        + "\r\n";
-  }
-
-  public static String createH265Body(int trackVideo, String sps, String pps, String vps) {
-    return "m=video 0 RTP/AVP "
-        + RtpConstants.payloadType
-        + "\r\n"
-        + "a=rtpmap:"
-        + RtpConstants.payloadType
-        + " H265/"
-        + RtpConstants.clockVideoFrequency
-        + "\r\n"
-        + "a=fmtp:"
-        + RtpConstants.payloadType
-        + " sprop-sps="
-        + sps
-        + "; sprop-pps="
-        + pps
-        + "; sprop-vps="
-        + vps
-        + ";\r\n"
-        + "a=control:trackID="
-        + trackVideo
-        + "\r\n";
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/CommandsManager.java b/rtsp/src/main/java/com/pedro/rtsp/rtsp/CommandsManager.java
deleted file mode 100644
index 7e4045e..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtsp/CommandsManager.java
+++ /dev/null
@@ -1,435 +0,0 @@
-package com.pedro.rtsp.rtsp;
-
-import android.util.Base64;
-import android.util.Log;
-import com.pedro.rtsp.utils.AuthUtil;
-import com.pedro.rtsp.utils.ConnectCheckerRtsp;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by pedro on 12/02/19.
- *
- * Class to create request to server and parse response from server.
- */
-
-public class CommandsManager {
-
-  private static final String TAG = "CommandsManager";
-  private static String authorization = null;
-  private String host;
-  private int port;
-  private String path;
-  private byte[] sps;
-  private byte[] pps;
-  private int cSeq = 0;
-  private String sessionId;
-  private long timeStamp;
-  private int sampleRate = 32000;
-  private boolean isStereo = true;
-  private int trackAudio = 0;
-  private int trackVideo = 1;
-  private Protocol protocol;
-  private boolean isOnlyAudio;
-
-  //For udp
-  private final int[] audioClientPorts = new int[] { 5000, 5001 };
-  private final int[] videoClientPorts = new int[] { 5002, 5003 };
-  private int[] audioServerPorts = new int[] { 5004, 5005 };
-  private int[] videoServerPorts = new int[] { 5006, 5007 };
-  private byte[] vps; //For H265
-  //For auth
-  private String user;
-  private String password;
-
-  public CommandsManager() {
-    protocol = Protocol.TCP;
-    long uptime = System.currentTimeMillis();
-    timeStamp = (uptime / 1000) << 32 & (((uptime - ((uptime / 1000) * 1000)) >> 32)
-        / 1000); // NTP timestamp
-  }
-
-  private byte[] getData(ByteBuffer byteBuffer) {
-    if (byteBuffer != null) {
-      byte[] bytes = new byte[byteBuffer.capacity() - 4];
-      byteBuffer.position(4);
-      byteBuffer.get(bytes, 0, bytes.length);
-      return bytes;
-    } else {
-      return null;
-    }
-  }
-
-  private String encodeToString(byte[] bytes) {
-    return Base64.encodeToString(bytes, 0, bytes.length, Base64.NO_WRAP);
-  }
-
-  public boolean isOnlyAudio() {
-    return isOnlyAudio;
-  }
-
-  public void setOnlyAudio(boolean onlyAudio) {
-    isOnlyAudio = onlyAudio;
-  }
-
-  public void setVideoInfo(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    this.sps = getData(sps);
-    this.pps = getData(pps);
-    this.vps = getData(vps);  //H264 has no vps so if not null assume H265
-  }
-
-  public void setSampleRate(int sampleRate) {
-    this.sampleRate = sampleRate;
-  }
-
-  public void setIsStereo(boolean isStereo) {
-    this.isStereo = isStereo;
-  }
-
-  public void setAuth(String user, String password) {
-    this.user = user;
-    this.password = password;
-  }
-
-  public void setUrl(String host, int port, String path) {
-    this.host = host;
-    this.port = port;
-    this.path = path;
-  }
-
-  public void setProtocol(Protocol protocol) {
-    this.protocol = protocol;
-  }
-
-  public String getHost() {
-    return host;
-  }
-
-  public int getPort() {
-    return port;
-  }
-
-  public String getPath() {
-    return path;
-  }
-
-  public byte[] getSps() {
-    return sps;
-  }
-
-  public byte[] getPps() {
-    return pps;
-  }
-
-  public int getSampleRate() {
-    return sampleRate;
-  }
-
-  public boolean isStereo() {
-    return isStereo;
-  }
-
-  public int getTrackAudio() {
-    return trackAudio;
-  }
-
-  public int getTrackVideo() {
-    return trackVideo;
-  }
-
-  public Protocol getProtocol() {
-    return protocol;
-  }
-
-  public int[] getAudioClientPorts() {
-    return audioClientPorts;
-  }
-
-  public int[] getVideoClientPorts() {
-    return videoClientPorts;
-  }
-
-  public byte[] getVps() {
-    return vps;
-  }
-
-  public String getUser() {
-    return user;
-  }
-
-  public String getPassword() {
-    return password;
-  }
-
-  public int[] getAudioServerPorts() {
-    return audioServerPorts;
-  }
-
-  public int[] getVideoServerPorts() {
-    return videoServerPorts;
-  }
-
-  public void clear() {
-    sps = null;
-    pps = null;
-    vps = null;
-    retryClear();
-  }
-
-  public void retryClear() {
-    cSeq = 0;
-    sessionId = null;
-  }
-
-  private String getSpsString() {
-    return encodeToString(sps);
-  }
-
-  private String getPpsString() {
-    return encodeToString(pps);
-  }
-
-  private String getVpsString() {
-    return encodeToString(vps);
-  }
-
-  private String addHeaders() {
-    return "CSeq: " + (++cSeq) + "\r\n" + (sessionId != null ? "Session: " + sessionId + "\r\n"
-        : "") + (authorization != null ? "Authorization: " + authorization + "\r\n" : "") + "\r\n";
-  }
-
-  private String createBody() {
-    String videoBody = "";
-    if (!isOnlyAudio) {
-      videoBody = vps == null ? Body.createH264Body(trackVideo, getSpsString(), getPpsString())
-          : Body.createH265Body(trackVideo, getSpsString(), getPpsString(), getVpsString());
-    }
-    return "v=0\r\n"
-        + "o=- "
-        + timeStamp
-        + " "
-        + timeStamp
-        + " IN IP4 "
-        + "127.0.0.1"
-        + "\r\n"
-        + "s=Unnamed\r\n"
-        + "i=N/A\r\n"
-        + "c=IN IP4 "
-        + host
-        + "\r\n"
-        + "t=0 0\r\n"
-        + "a=recvonly\r\n"
-        + videoBody
-        + Body.createAacBody(trackAudio, sampleRate, isStereo);
-  }
-
-  private String createAuth(String authResponse) {
-    Pattern authPattern =
-        Pattern.compile("realm=\"(.+)\",\\s+nonce=\"(\\w+)\"", Pattern.CASE_INSENSITIVE);
-    Matcher matcher = authPattern.matcher(authResponse);
-    //digest auth
-    if (matcher.find()) {
-      Log.i(TAG, "using digest auth");
-      String realm = matcher.group(1);
-      String nonce = matcher.group(2);
-      String hash1 = AuthUtil.getMd5Hash(user + ":" + realm + ":" + password);
-      String hash2 = AuthUtil.getMd5Hash("ANNOUNCE:rtsp://" + host + ":" + port + path);
-      String hash3 = AuthUtil.getMd5Hash(hash1 + ":" + nonce + ":" + hash2);
-      return "Digest username=\""
-          + user
-          + "\",realm=\""
-          + realm
-          + "\",nonce=\""
-          + nonce
-          + "\",uri=\"rtsp://"
-          + host
-          + ":"
-          + port
-          + path
-          + "\",response=\""
-          + hash3
-          + "\"";
-      //basic auth
-    } else {
-      Log.i(TAG, "using basic auth");
-      String data = user + ":" + password;
-      String base64Data = Base64.encodeToString(data.getBytes(), Base64.DEFAULT);
-      return "Basic " + base64Data;
-    }
-  }
-
-  //Commands
-
-  public String createOptions() {
-    String options = "OPTIONS rtsp://" + host + ":" + port + path + " RTSP/1.0\r\n" + addHeaders();
-    Log.i(TAG, options);
-    return options;
-  }
-
-  public String createSetup(int track) {
-    int[] udpPorts = track == trackVideo ? videoClientPorts : audioClientPorts;
-    String params =
-        (protocol == Protocol.UDP) ? ("UDP;unicast;client_port=" + udpPorts[0] + "-" + udpPorts[1] + ";mode=record")
-            : ("TCP;interleaved=" + 2 * track + "-" + (2 * track + 1) + ";mode=record");
-    String setup = "SETUP rtsp://"
-        + host
-        + ":"
-        + port
-        + path
-        + "/trackID="
-        + track
-        + " RTSP/1.0\r\n"
-        + "Transport: RTP/AVP/"
-        + params
-        + "\r\n"
-        + addHeaders();
-    Log.i(TAG, setup);
-    return setup;
-  }
-
-  public String createRecord() {
-    String record = "RECORD rtsp://"
-        + host
-        + ":"
-        + port
-        + path
-        + " RTSP/1.0\r\n"
-        + "Range: npt=0.000-\r\n"
-        + addHeaders();
-    Log.i(TAG, record);
-    return record;
-  }
-
-  public String createAnnounce() {
-    String body = createBody();
-    String announce = "ANNOUNCE rtsp://"
-        + host
-        + ":"
-        + port
-        + path
-        + " RTSP/1.0\r\n"
-        + "CSeq: "
-        + (++cSeq)
-        + "\r\n"
-        + "Content-Length: "
-        + body.length()
-        + "\r\n"
-        + (authorization == null ? "" : "Authorization: " + authorization  + "\r\n")
-        + "Content-Type: application/sdp\r\n\r\n"
-        + body;
-    Log.i(TAG, announce);
-    return announce;
-  }
-
-  public String createAnnounceWithAuth(String authResponse) {
-    authorization = createAuth(authResponse);
-    Log.i("Auth", authorization);
-    String body = createBody();
-    String announceAuth = "ANNOUNCE rtsp://"
-        + host
-        + ":"
-        + port
-        + path
-        + " RTSP/1.0\r\n"
-        + "CSeq: "
-        + (++cSeq)
-        + "\r\n"
-        + "Content-Length: "
-        + body.length()
-        + "\r\n"
-        + "Authorization: "
-        + authorization
-        + "\r\n"
-        + "Content-Type: application/sdp\r\n\r\n"
-        + body;
-    Log.i(TAG, announceAuth);
-    return announceAuth;
-  }
-
-  public String createTeardown() {
-    String teardown =
-        "TEARDOWN rtsp://" + host + ":" + port + path + " RTSP/1.0\r\n" + addHeaders();
-    Log.i(TAG, teardown);
-    return teardown;
-  }
-
-  //Unused commands
-
-  public static String createPause() {
-    return "";
-  }
-
-  public static String createPlay() {
-    return "";
-  }
-
-  public static String createGetParameter() {
-    return "";
-  }
-
-  public static String createSetParameter() {
-    return "";
-  }
-
-  public static String createRedirect() {
-    return "";
-  }
-
-  //Response parser
-
-  public String getResponse(BufferedReader reader, ConnectCheckerRtsp connectCheckerRtsp,
-      boolean isAudio, boolean checkStatus) {
-    try {
-      String response = "";
-      String line;
-
-      while ((line = reader.readLine()) != null) {
-        if (line.contains("Session")) {
-          Pattern rtspPattern = Pattern.compile("Session: (\\w+)");
-          Matcher matcher = rtspPattern.matcher(line);
-          if (matcher.find()) {
-            sessionId = matcher.group(1);
-          }
-          sessionId = line.split(";")[0].split(":")[1].trim();
-        }
-        if (line.contains("server_port")) {
-          Pattern rtspPattern = Pattern.compile("server_port=([0-9]+)-([0-9]+)");
-          Matcher matcher = rtspPattern.matcher(line);
-          if (matcher.find()) {
-            if (isAudio) {
-              audioServerPorts[0] = Integer.parseInt(matcher.group(1));
-              audioServerPorts[1] = Integer.parseInt(matcher.group(2));
-            } else {
-              videoServerPorts[0] = Integer.parseInt(matcher.group(1));
-              videoServerPorts[1] = Integer.parseInt(matcher.group(2));
-            }
-          }
-        }
-        response += line + "\n";
-        //end of response
-        if (line.length() < 3) break;
-      }
-      if (checkStatus && getResponseStatus(response) != 200) {
-        connectCheckerRtsp.onConnectionFailedRtsp("Error configure stream, " + response);
-      }
-      Log.i(TAG, response);
-      return response;
-    } catch (IOException e) {
-      Log.e(TAG, "read error", e);
-      return null;
-    }
-  }
-
-  public int getResponseStatus(String response) {
-    Matcher matcher =
-        Pattern.compile("RTSP/\\d.\\d (\\d+) (\\w+)", Pattern.CASE_INSENSITIVE).matcher(response);
-    if (matcher.find()) {
-      return Integer.parseInt(matcher.group(1));
-    } else {
-      return -1;
-    }
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/Protocol.java b/rtsp/src/main/java/com/pedro/rtsp/rtsp/Protocol.java
deleted file mode 100644
index c0d7c79..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtsp/Protocol.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.pedro.rtsp.rtsp;
-
-/**
- * Created by pedro on 24/02/17.
- */
-
-public enum Protocol {
-  UDP, TCP
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/Protocol.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/Protocol.kt
new file mode 100644
index 0000000..a2eeac1
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtsp/Protocol.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp
+
+/**
+ * Created by pedro on 24/02/17.
+ */
+enum class Protocol {
+  UDP, TCP
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtpFrame.java b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtpFrame.java
deleted file mode 100644
index 7d22c04..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtpFrame.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.pedro.rtsp.rtsp;
-
-/**
- * Created by pedro on 7/11/18.
- */
-
-public class RtpFrame {
-
-  private byte[] buffer;
-  private long timeStamp;
-  private int length;
-  private int rtpPort; //rtp udp
-  private int rtcpPort; //rtcp udp
-  private byte channelIdentifier; //rtcp tcp
-
-  public RtpFrame(byte[] buffer, long timeStamp, int length, int rtpPort, int rtcpPort,
-      byte channelIdentifier) {
-    this.buffer = buffer;
-    this.timeStamp = timeStamp;
-    this.length = length;
-    this.rtpPort = rtpPort;
-    this.rtcpPort = rtcpPort;
-    this.channelIdentifier = channelIdentifier;
-  }
-
-  public byte[] getBuffer() {
-    return buffer;
-  }
-
-  public void setBuffer(byte[] buffer) {
-    this.buffer = buffer;
-  }
-
-  public long getTimeStamp() {
-    return timeStamp;
-  }
-
-  public void setTimeStamp(long timeStamp) {
-    this.timeStamp = timeStamp;
-  }
-
-  public int getLength() {
-    return length;
-  }
-
-  public void setLength(int length) {
-    this.length = length;
-  }
-
-  public int getRtpPort() {
-    return rtpPort;
-  }
-
-  public void setRtpPort(int rtpPort) {
-    this.rtpPort = rtpPort;
-  }
-
-  public int getRtcpPort() {
-    return rtcpPort;
-  }
-
-  public void setRtcpPort(int rtcpPort) {
-    this.rtcpPort = rtcpPort;
-  }
-
-  public byte getChannelIdentifier() {
-    return channelIdentifier;
-  }
-
-  public void setChannelIdentifier(byte channelIdentifier) {
-    this.channelIdentifier = channelIdentifier;
-  }
-
-  public boolean isVideoFrame() {
-    return channelIdentifier == (byte) 2;
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtpFrame.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtpFrame.kt
new file mode 100644
index 0000000..5370baf
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtpFrame.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp
+
+import com.pedro.rtsp.utils.RtpConstants
+
+/**
+ * Created by pedro on 7/11/18.
+ */
+data class RtpFrame(val buffer: ByteArray, val timeStamp: Long, val length: Int,
+                    val rtpPort: Int, val rtcpPort: Int, val channelIdentifier: Int) {
+
+  fun isVideoFrame(): Boolean = channelIdentifier == RtpConstants.trackVideo
+
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (javaClass != other?.javaClass) return false
+
+    other as RtpFrame
+
+    if (!buffer.contentEquals(other.buffer)) return false
+    if (timeStamp != other.timeStamp) return false
+    if (length != other.length) return false
+    if (rtpPort != other.rtpPort) return false
+    if (rtcpPort != other.rtcpPort) return false
+    if (channelIdentifier != other.channelIdentifier) return false
+
+    return true
+  }
+
+  override fun hashCode(): Int {
+    var result = buffer.contentHashCode()
+    result = 31 * result + timeStamp.hashCode()
+    result = 31 * result + length
+    result = 31 * result + rtpPort
+    result = 31 * result + rtcpPort
+    result = 31 * result + channelIdentifier
+    return result
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.java b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.java
deleted file mode 100644
index 6ee4fdb..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package com.pedro.rtsp.rtsp;
-
-import android.media.MediaCodec;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-import com.pedro.rtsp.utils.ConnectCheckerRtsp;
-import com.pedro.rtsp.utils.CreateSSLSocket;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.nio.ByteBuffer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by pedro on 10/02/17.
- */
-
-public class RtspClient {
-
-  private final String TAG = "RtspClient";
-  private static final Pattern rtspUrlPattern =
-      Pattern.compile("^rtsps?://([^/:]+)(?::(\\d+))*/([^/]+)/?([^*]*)$");
-
-  private ConnectCheckerRtsp connectCheckerRtsp;
-  //sockets objects
-  private Socket connectionSocket;
-  private BufferedReader reader;
-  private BufferedWriter writer;
-  private Thread thread;
-  //for tcp
-  private OutputStream outputStream;
-  private volatile boolean streaming = false;
-  //for secure transport
-  private boolean tlsEnabled = false;
-  private RtspSender rtspSender;
-  private String url;
-  private CommandsManager commandsManager;
-  private int numRetry;
-  private int reTries;
-  private Handler handler;
-  private Runnable runnable;
-
-  public RtspClient(ConnectCheckerRtsp connectCheckerRtsp) {
-    this.connectCheckerRtsp = connectCheckerRtsp;
-    commandsManager = new CommandsManager();
-    rtspSender = new RtspSender(connectCheckerRtsp);
-    handler = new Handler(Looper.getMainLooper());
-  }
-
-  public void setOnlyAudio(boolean onlyAudio) {
-    commandsManager.setOnlyAudio(onlyAudio);
-  }
-
-  public void setProtocol(Protocol protocol) {
-    commandsManager.setProtocol(protocol);
-  }
-
-  public void setAuthorization(String user, String password) {
-    commandsManager.setAuth(user, password);
-  }
-
-  public void setReTries(int reTries) {
-    numRetry = reTries;
-    this.reTries = reTries;
-  }
-
-  public boolean shouldRetry(String reason) {
-    boolean validReason = !reason.contains("Endpoint malformed");
-    return validReason && reTries > 0;
-  }
-
-  public boolean isStreaming() {
-    return streaming;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public void setSampleRate(int sampleRate) {
-    commandsManager.setSampleRate(sampleRate);
-  }
-
-  public String getHost() {
-    return commandsManager.getHost();
-  }
-
-  public int getPort() {
-    return commandsManager.getPort();
-  }
-
-  public String getPath() {
-    return commandsManager.getPath();
-  }
-
-  public ConnectCheckerRtsp getConnectCheckerRtsp() {
-    return connectCheckerRtsp;
-  }
-
-  public void setSPSandPPS(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps) {
-    commandsManager.setVideoInfo(sps, pps, vps);
-  }
-
-  public void setIsStereo(boolean isStereo) {
-    commandsManager.setIsStereo(isStereo);
-  }
-
-  public void connect() {
-    if (!streaming) {
-      Matcher rtspMatcher = rtspUrlPattern.matcher(url);
-      if (rtspMatcher.matches()) {
-        tlsEnabled = rtspMatcher.group(0).startsWith("rtsps");
-      } else {
-        streaming = false;
-        connectCheckerRtsp.onConnectionFailedRtsp(
-            "Endpoint malformed, should be: rtsp://ip:port/appname/streamname");
-        return;
-      }
-      String host = rtspMatcher.group(1);
-      int port = Integer.parseInt((rtspMatcher.group(2) != null) ? rtspMatcher.group(2) : "554");
-      String path = "/" + rtspMatcher.group(3) + "/" + rtspMatcher.group(4);
-      commandsManager.setUrl(host, port, path);
-
-      rtspSender.setSocketsInfo(commandsManager.getProtocol(),
-          commandsManager.getVideoClientPorts(), commandsManager.getAudioClientPorts());
-      rtspSender.setAudioInfo(commandsManager.getSampleRate());
-      if (!commandsManager.isOnlyAudio()) {
-        rtspSender.setVideoInfo(commandsManager.getSps(), commandsManager.getPps(),
-            commandsManager.getVps());
-      }
-      thread = new Thread(new Runnable() {
-        @Override
-        public void run() {
-          try {
-            if (!tlsEnabled) {
-              connectionSocket = new Socket();
-              SocketAddress socketAddress =
-                  new InetSocketAddress(commandsManager.getHost(), commandsManager.getPort());
-              connectionSocket.connect(socketAddress, 5000);
-            } else {
-              connectionSocket = CreateSSLSocket.createSSlSocket(commandsManager.getHost(),
-                  commandsManager.getPort());
-              if (connectionSocket == null) throw new IOException("Socket creation failed");
-            }
-            connectionSocket.setSoTimeout(5000);
-            reader = new BufferedReader(new InputStreamReader(connectionSocket.getInputStream()));
-            outputStream = connectionSocket.getOutputStream();
-            writer = new BufferedWriter(new OutputStreamWriter(outputStream));
-            writer.write(commandsManager.createOptions());
-            writer.flush();
-            commandsManager.getResponse(reader, connectCheckerRtsp, false, false);
-            writer.write(commandsManager.createAnnounce());
-            writer.flush();
-            //check if you need credential for stream, if you need try connect with credential
-            String response = commandsManager.getResponse(reader, connectCheckerRtsp, false, false);
-            int status = commandsManager.getResponseStatus(response);
-            if (status == 403) {
-              connectCheckerRtsp.onConnectionFailedRtsp("Error configure stream, access denied");
-              Log.e(TAG, "Response 403, access denied");
-              return;
-            } else if (status == 401) {
-              if (commandsManager.getUser() == null || commandsManager.getPassword() == null) {
-                connectCheckerRtsp.onAuthErrorRtsp();
-                return;
-              } else {
-                writer.write(commandsManager.createAnnounceWithAuth(response));
-                writer.flush();
-                int statusAuth = commandsManager.getResponseStatus(
-                    commandsManager.getResponse(reader, connectCheckerRtsp, false, false));
-                if (statusAuth == 401) {
-                  connectCheckerRtsp.onAuthErrorRtsp();
-                  return;
-                } else if (statusAuth == 200) {
-                  connectCheckerRtsp.onAuthSuccessRtsp();
-                } else {
-                  connectCheckerRtsp.onConnectionFailedRtsp(
-                      "Error configure stream, announce with auth failed");
-                }
-              }
-            } else if (status != 200) {
-              connectCheckerRtsp.onConnectionFailedRtsp("Error configure stream, announce failed");
-            }
-            writer.write(commandsManager.createSetup(commandsManager.getTrackAudio()));
-            writer.flush();
-            commandsManager.getResponse(reader, connectCheckerRtsp, true, true);
-            if (!commandsManager.isOnlyAudio()) {
-              writer.write(commandsManager.createSetup(commandsManager.getTrackVideo()));
-              writer.flush();
-              commandsManager.getResponse(reader, connectCheckerRtsp, false, true);
-            }
-            writer.write(commandsManager.createRecord());
-            writer.flush();
-            commandsManager.getResponse(reader, connectCheckerRtsp, false, true);
-
-            rtspSender.setDataStream(outputStream, commandsManager.getHost());
-            int[] videoPorts = commandsManager.getVideoServerPorts();
-            int[] audioPorts = commandsManager.getAudioServerPorts();
-            if (!commandsManager.isOnlyAudio()) {
-              rtspSender.setVideoPorts(videoPorts[0], videoPorts[1]);
-            }
-            rtspSender.setAudioPorts(audioPorts[0], audioPorts[1]);
-            rtspSender.start();
-            streaming = true;
-            reTries = numRetry;
-            connectCheckerRtsp.onConnectionSuccessRtsp();
-          } catch (IOException | NullPointerException e) {
-            Log.e(TAG, "connection error", e);
-            connectCheckerRtsp.onConnectionFailedRtsp("Error configure stream, " + e.getMessage());
-            streaming = false;
-          }
-        }
-      });
-      thread.start();
-    }
-  }
-
-  public void disconnect() {
-    handler.removeCallbacks(runnable);
-    disconnect(true);
-  }
-
-  private void disconnect(final boolean clear) {
-    if (streaming) rtspSender.stop();
-    streaming = false;
-    thread = new Thread(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          if (writer != null) {
-            writer.write(commandsManager.createTeardown());
-            writer.flush();
-            if (clear) {
-              commandsManager.clear();
-            } else {
-              commandsManager.retryClear();
-            }
-          }
-          if (connectionSocket != null) connectionSocket.close();
-          writer = null;
-          connectionSocket = null;
-        } catch (IOException e) {
-          if (clear) {
-            commandsManager.clear();
-          } else {
-            commandsManager.retryClear();
-          }
-          Log.e(TAG, "disconnect error", e);
-        }
-      }
-    });
-    thread.start();
-    if (clear) {
-      reTries = 0;
-      connectCheckerRtsp.onDisconnectRtsp();
-    }
-  }
-
-  public void sendVideo(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
-    if (isStreaming() && !commandsManager.isOnlyAudio()) {
-      rtspSender.sendVideoFrame(h264Buffer, info);
-    }
-  }
-
-  public void sendAudio(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
-    if (isStreaming()) {
-      rtspSender.sendAudioFrame(aacBuffer, info);
-    }
-  }
-
-  public void reConnect(long delay) {
-    reTries--;
-    disconnect(false);
-    runnable = new Runnable() {
-      @Override
-      public void run() {
-        connect();
-      }
-    };
-    handler.postDelayed(runnable, delay);
-  }
-
-  public long getDroppedAudioFrames() {
-    return rtspSender.getDroppedAudioFrames();
-  }
-
-  public long getDroppedVideoFrames() {
-    return rtspSender.getDroppedVideoFrames();
-  }
-
-  public void resetSentAudioFrames() {
-    rtspSender.resetSentAudioFrames();
-  }
-
-  public void resetSentVideoFrames() {
-    rtspSender.resetSentVideoFrames();
-  }
-
-  public void resetDroppedAudioFrames() {
-    rtspSender.resetDroppedAudioFrames();
-  }
-
-  public void resetDroppedVideoFrames() {
-    rtspSender.resetDroppedVideoFrames();
-  }
-
-  public void resizeCache(int newSize) throws RuntimeException {
-    rtspSender.resizeCache(newSize);
-  }
-
-  public int getCacheSize() {
-    return rtspSender.getCacheSize();
-  }
-
-  public long getSentAudioFrames() {
-    return rtspSender.getSentAudioFrames();
-  }
-
-  public long getSentVideoFrames() {
-    return rtspSender.getSentVideoFrames();
-  }
-}
-
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.kt
new file mode 100644
index 0000000..aa93c45
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.kt
@@ -0,0 +1,433 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp
+
+import android.media.MediaCodec
+import android.util.Log
+import com.pedro.rtsp.rtsp.commands.CommandsManager
+import com.pedro.rtsp.rtsp.commands.Method
+import com.pedro.rtsp.utils.ConnectCheckerRtsp
+import com.pedro.rtsp.utils.CreateSSLSocket.createSSlSocket
+import com.pedro.rtsp.utils.RtpConstants
+import java.io.*
+import java.net.InetSocketAddress
+import java.net.Socket
+import java.net.SocketAddress
+import java.net.SocketTimeoutException
+import java.nio.ByteBuffer
+import java.util.concurrent.*
+import java.util.regex.Pattern
+
+/**
+ * Created by pedro on 10/02/17.
+ */
+open class RtspClient(private val connectCheckerRtsp: ConnectCheckerRtsp) {
+
+  private val TAG = "RtspClient"
+
+  //sockets objects
+  private var connectionSocket: Socket? = null
+  private var reader: BufferedReader? = null
+  private var writer: BufferedWriter? = null
+  private var thread: ExecutorService? = null
+  private val semaphore = Semaphore(0)
+
+  @Volatile
+  var isStreaming = false
+    private set
+
+  //for secure transport
+  private var tlsEnabled = false
+  private val rtspSender: RtspSender = RtspSender(connectCheckerRtsp)
+  private var url: String? = null
+  private val commandsManager: CommandsManager = CommandsManager()
+  private var doingRetry = false
+  private var numRetry = 0
+  private var reTries = 0
+  private var handler: ScheduledExecutorService? = null
+  private var runnable: Runnable? = null
+  private var checkServerAlive = false
+
+  val droppedAudioFrames: Long
+    get() = rtspSender.droppedAudioFrames
+  val droppedVideoFrames: Long
+    get() = rtspSender.droppedVideoFrames
+
+  val cacheSize: Int
+    get() = rtspSender.getCacheSize()
+  val sentAudioFrames: Long
+    get() = rtspSender.getSentAudioFrames()
+  val sentVideoFrames: Long
+    get() = rtspSender.getSentVideoFrames()
+
+  companion object {
+    private val rtspUrlPattern = Pattern.compile("^rtsps?://([^/:]+)(?::(\\d+))*/([^/]+)/?([^*]*)$")
+  }
+
+  /**
+   * Check periodically if server is alive using Echo protocol.
+   */
+  fun setCheckServerAlive(enabled: Boolean) {
+    checkServerAlive = enabled
+  }
+
+  /**
+   * Must be called before connect
+   */
+  fun setOnlyAudio(onlyAudio: Boolean) {
+    if (onlyAudio) {
+      RtpConstants.trackAudio = 0
+      RtpConstants.trackVideo = 1
+    } else {
+      RtpConstants.trackVideo = 0
+      RtpConstants.trackAudio = 1
+    }
+    commandsManager.audioDisabled = false
+    commandsManager.videoDisabled = onlyAudio
+  }
+
+  /**
+   * Must be called before connect
+   */
+  fun setOnlyVideo(onlyVideo: Boolean) {
+    RtpConstants.trackVideo = 0
+    RtpConstants.trackAudio = 1
+    commandsManager.videoDisabled = false
+    commandsManager.audioDisabled = onlyVideo
+  }
+
+  fun setProtocol(protocol: Protocol) {
+    commandsManager.protocol = protocol
+  }
+
+  fun setAuthorization(user: String?, password: String?) {
+    commandsManager.setAuth(user, password)
+  }
+
+  fun setReTries(reTries: Int) {
+    numRetry = reTries
+    this.reTries = reTries
+  }
+
+  fun shouldRetry(reason: String): Boolean {
+    val validReason = doingRetry && !reason.contains("Endpoint malformed")
+    return validReason && reTries > 0
+  }
+
+  fun setVideoInfo(sps: ByteBuffer, pps: ByteBuffer, vps: ByteBuffer?) {
+    Log.i(TAG, "send sps and pps")
+    commandsManager.setVideoInfo(sps, pps, vps)
+    semaphore.release()
+  }
+
+  fun setAudioInfo(sampleRate: Int, isStereo: Boolean) {
+    commandsManager.setAudioInfo(sampleRate, isStereo)
+  }
+
+  @JvmOverloads
+  fun connect(url: String?, isRetry: Boolean = false) {
+    if (!isRetry) doingRetry = true
+    if (url == null) {
+      isStreaming = false
+      connectCheckerRtsp.onConnectionFailedRtsp("Endpoint malformed, should be: rtsp://ip:port/appname/streamname")
+      return
+    }
+    if (!isStreaming || isRetry) {
+      this.url = url
+      connectCheckerRtsp.onConnectionStartedRtsp(url)
+      val rtspMatcher = rtspUrlPattern.matcher(url)
+      if (rtspMatcher.matches()) {
+        tlsEnabled = (rtspMatcher.group(0) ?: "").startsWith("rtsps")
+      } else {
+        isStreaming = false
+        connectCheckerRtsp.onConnectionFailedRtsp("Endpoint malformed, should be: rtsp://ip:port/appname/streamname")
+        return
+      }
+      val host = rtspMatcher.group(1) ?: ""
+      val port: Int = rtspMatcher.group(2)?.toInt() ?: if (tlsEnabled) 443 else 554
+      val streamName = if (rtspMatcher.group(4).isNullOrEmpty()) "" else "/" + rtspMatcher.group(4)
+      val path = "/" + rtspMatcher.group(3) + streamName
+
+      isStreaming = true
+      thread = Executors.newSingleThreadExecutor()
+      thread?.execute post@{
+        try {
+          commandsManager.setUrl(host, port, path)
+          rtspSender.setSocketsInfo(commandsManager.protocol,
+            commandsManager.videoClientPorts,
+            commandsManager.audioClientPorts)
+          if (!commandsManager.audioDisabled) {
+            rtspSender.setAudioInfo(commandsManager.sampleRate)
+          }
+          if (!commandsManager.videoDisabled) {
+            if (commandsManager.sps == null || commandsManager.pps == null) {
+              semaphore.drainPermits()
+              Log.i(TAG, "waiting for sps and pps")
+              semaphore.tryAcquire(5000, TimeUnit.MILLISECONDS)
+            }
+            if (commandsManager.sps == null || commandsManager.pps == null) {
+              connectCheckerRtsp.onConnectionFailedRtsp("sps or pps is null")
+              return@post
+            } else {
+              rtspSender.setVideoInfo(commandsManager.sps!!, commandsManager.pps!!, commandsManager.vps)
+            }
+          }
+          if (!tlsEnabled) {
+            connectionSocket = Socket()
+            val socketAddress: SocketAddress = InetSocketAddress(host, port)
+            connectionSocket?.connect(socketAddress, 5000)
+          } else {
+            connectionSocket = createSSlSocket(host, port)
+            if (connectionSocket == null) throw IOException("Socket creation failed")
+          }
+          connectionSocket?.soTimeout = 5000
+          val reader = BufferedReader(InputStreamReader(connectionSocket?.getInputStream()))
+          val outputStream = connectionSocket?.getOutputStream()
+          val writer = BufferedWriter(OutputStreamWriter(outputStream))
+          this.reader = reader
+          this.writer = writer
+          writer.write(commandsManager.createOptions())
+          writer.flush()
+          commandsManager.getResponse(reader, Method.OPTIONS)
+          writer.write(commandsManager.createAnnounce())
+          writer.flush()
+          //check if you need credential for stream, if you need try connect with credential
+          val announceResponse = commandsManager.getResponse(reader, Method.ANNOUNCE)
+          when (announceResponse.status) {
+            403 -> {
+              connectCheckerRtsp.onConnectionFailedRtsp("Error configure stream, access denied")
+              Log.e(TAG, "Response 403, access denied")
+              return@post
+            }
+            401 -> {
+              if (commandsManager.user == null || commandsManager.password == null) {
+                connectCheckerRtsp.onAuthErrorRtsp()
+                return@post
+              } else {
+                writer.write(commandsManager.createAnnounceWithAuth(announceResponse.text))
+                writer.flush()
+                when (commandsManager.getResponse(reader, Method.ANNOUNCE).status) {
+                  401 -> {
+                    connectCheckerRtsp.onAuthErrorRtsp()
+                    return@post
+                  }
+                  200 -> {
+                    connectCheckerRtsp.onAuthSuccessRtsp()
+                  }
+                  else -> {
+                    connectCheckerRtsp.onConnectionFailedRtsp("Error configure stream, announce with auth failed")
+                    return@post
+                  }
+                }
+              }
+            }
+            200 -> {
+              Log.i(TAG, "announce success")
+            }
+            else -> {
+              connectCheckerRtsp.onConnectionFailedRtsp("Error configure stream, announce failed")
+              return@post
+            }
+          }
+          if (!commandsManager.videoDisabled) {
+            writer.write(commandsManager.createSetup(RtpConstants.trackVideo))
+            writer.flush()
+            val setupVideoStatus = commandsManager.getResponse(reader, Method.SETUP).status
+            if (setupVideoStatus != 200) {
+              connectCheckerRtsp.onConnectionFailedRtsp("Error configure stream, setup video $setupVideoStatus")
+              return@post
+            }
+          }
+          if (!commandsManager.audioDisabled) {
+            writer.write(commandsManager.createSetup(RtpConstants.trackAudio))
+            writer.flush()
+            val setupAudioStatus = commandsManager.getResponse(reader, Method.SETUP).status
+            if (setupAudioStatus != 200) {
+              connectCheckerRtsp.onConnectionFailedRtsp("Error configure stream, setup audio $setupAudioStatus")
+              return@post
+            }
+          }
+          writer.write(commandsManager.createRecord())
+          writer.flush()
+          val recordStatus = commandsManager.getResponse(reader, Method.RECORD).status
+          if (recordStatus != 200) {
+            connectCheckerRtsp.onConnectionFailedRtsp("Error configure stream, record $recordStatus")
+            return@post
+          }
+          outputStream?.let { out ->
+            rtspSender.setDataStream(out, host)
+          }
+          val videoPorts = commandsManager.videoServerPorts
+          val audioPorts = commandsManager.audioServerPorts
+          if (!commandsManager.videoDisabled) {
+            rtspSender.setVideoPorts(videoPorts[0], videoPorts[1])
+          }
+          if (!commandsManager.audioDisabled) {
+            rtspSender.setAudioPorts(audioPorts[0], audioPorts[1])
+          }
+          rtspSender.start()
+          reTries = numRetry
+          connectCheckerRtsp.onConnectionSuccessRtsp()
+          handleServerCommands()
+        } catch (e: Exception) {
+          Log.e(TAG, "connection error", e)
+          connectCheckerRtsp.onConnectionFailedRtsp("Error configure stream, " + e.message)
+          return@post
+        }
+      }
+    }
+  }
+
+  private fun handleServerCommands() {
+    //Read and print server commands received each 2 seconds
+    while (!Thread.interrupted() && isStreaming) {
+      try {
+        if (isAlive()) {
+          Thread.sleep(2000)
+          reader?.let { r ->
+            if (r.ready()) {
+              val command = commandsManager.getResponse(r)
+              //Do something depend of command if required
+            }
+          }
+        } else {
+          Thread.currentThread().interrupt()
+          connectCheckerRtsp.onConnectionFailedRtsp("No response from server")
+        }
+      } catch (ignored: SocketTimeoutException) {
+        //new packet not found
+      } catch (e: Exception) {
+        Thread.currentThread().interrupt()
+      }
+    }
+  }
+
+  /*
+    Send a heartbeat to know if server is alive using Echo Protocol.
+    Your firewall could block it.
+   */
+  private fun isAlive(): Boolean {
+    val connected = connectionSocket?.isConnected ?: false
+    if (!checkServerAlive) return connected
+    val reachable = connectionSocket?.inetAddress?.isReachable(5000) ?: false
+    return if (connected && !reachable) false else connected
+  }
+
+  fun disconnect() {
+    runnable?.let { handler?.shutdownNow() }
+    disconnect(true)
+  }
+
+  private fun disconnect(clear: Boolean) {
+    if (isStreaming) rtspSender.stop()
+    thread?.shutdownNow()
+    val executor = Executors.newSingleThreadExecutor()
+    executor.execute post@{
+      try {
+        writer?.write(commandsManager.createTeardown())
+        writer?.flush()
+        if (clear) {
+          commandsManager.clear()
+        } else {
+          commandsManager.retryClear()
+        }
+        connectionSocket?.close()
+        reader?.close()
+        reader = null
+        writer?.close()
+        writer = null
+        connectionSocket = null
+        Log.i(TAG, "write teardown success")
+      } catch (e: IOException) {
+        if (clear) {
+          commandsManager.clear()
+        } else {
+          commandsManager.retryClear()
+        }
+        Log.e(TAG, "disconnect error", e)
+      }
+    }
+    try {
+      executor.shutdownNow()
+      executor.awaitTermination(200, TimeUnit.MILLISECONDS)
+      thread?.awaitTermination(100, TimeUnit.MILLISECONDS)
+      thread = null
+      semaphore.release()
+    } catch (e: Exception) { }
+    if (clear) {
+      reTries = numRetry
+      doingRetry = false
+      isStreaming = false
+      connectCheckerRtsp.onDisconnectRtsp()
+    }
+  }
+
+  fun sendVideo(h264Buffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    if (!commandsManager.videoDisabled) {
+      rtspSender.sendVideoFrame(h264Buffer, info)
+    }
+  }
+
+  fun sendAudio(aacBuffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    if (!commandsManager.audioDisabled) {
+      rtspSender.sendAudioFrame(aacBuffer, info)
+    }
+  }
+
+  fun hasCongestion(): Boolean {
+    return rtspSender.hasCongestion()
+  }
+
+  @JvmOverloads
+  fun reConnect(delay: Long, backupUrl: String? = null) {
+    reTries--
+    disconnect(false)
+    runnable = Runnable {
+      val reconnectUrl = backupUrl ?: url
+      connect(reconnectUrl, true)
+    }
+    runnable?.let {
+      handler = Executors.newSingleThreadScheduledExecutor()
+      handler?.schedule(it, delay, TimeUnit.MILLISECONDS)
+    }
+  }
+
+  fun resetSentAudioFrames() {
+    rtspSender.resetSentAudioFrames()
+  }
+
+  fun resetSentVideoFrames() {
+    rtspSender.resetSentVideoFrames()
+  }
+
+  fun resetDroppedAudioFrames() {
+    rtspSender.resetDroppedAudioFrames()
+  }
+
+  fun resetDroppedVideoFrames() {
+    rtspSender.resetDroppedVideoFrames()
+  }
+
+  @Throws(RuntimeException::class)
+  fun resizeCache(newSize: Int) {
+    rtspSender.resizeCache(newSize)
+  }
+
+  fun setLogs(enable: Boolean) {
+    rtspSender.setLogs(enable)
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspSender.java b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspSender.java
deleted file mode 100644
index 26487fc..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspSender.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.pedro.rtsp.rtsp;
-
-import android.media.MediaCodec;
-import android.util.Log;
-import com.pedro.rtsp.rtcp.BaseSenderReport;
-import com.pedro.rtsp.rtp.packets.AacPacket;
-import com.pedro.rtsp.rtp.packets.AudioPacketCallback;
-import com.pedro.rtsp.rtp.packets.BasePacket;
-import com.pedro.rtsp.rtp.packets.H264Packet;
-import com.pedro.rtsp.rtp.packets.H265Packet;
-import com.pedro.rtsp.rtp.packets.VideoPacketCallback;
-import com.pedro.rtsp.rtp.sockets.BaseRtpSocket;
-import com.pedro.rtsp.utils.BitrateManager;
-import com.pedro.rtsp.utils.ConnectCheckerRtsp;
-import com.pedro.rtsp.utils.RtpConstants;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Created by pedro on 7/11/18.
- */
-
-public class RtspSender implements VideoPacketCallback, AudioPacketCallback {
-
-  private final static String TAG = "RtspSender";
-  private BasePacket videoPacket;
-  private AacPacket aacPacket;
-  private BaseRtpSocket rtpSocket;
-  private BaseSenderReport baseSenderReport;
-  private volatile BlockingQueue<RtpFrame> rtpFrameBlockingQueue =
-      new LinkedBlockingQueue<>(getDefaultCacheSize());
-  private Thread thread;
-  private ConnectCheckerRtsp connectCheckerRtsp;
-  private long audioFramesSent = 0;
-  private long videoFramesSent = 0;
-  private long droppedAudioFrames = 0;
-  private long droppedVideoFrames = 0;
-  private BitrateManager bitrateManager;
-
-  public RtspSender(ConnectCheckerRtsp connectCheckerRtsp) {
-    this.connectCheckerRtsp = connectCheckerRtsp;
-    bitrateManager = new BitrateManager(connectCheckerRtsp);
-  }
-
-  public void setSocketsInfo(Protocol protocol, int[] videoSourcePorts, int[] audioSourcePorts) {
-    rtpSocket = BaseRtpSocket.getInstance(protocol, videoSourcePorts[0], audioSourcePorts[0]);
-    baseSenderReport =
-        BaseSenderReport.getInstance(protocol, videoSourcePorts[1], audioSourcePorts[1]);
-  }
-
-  public void setVideoInfo(byte[] sps, byte[] pps, byte[] vps) {
-    videoPacket =
-        vps == null ? new H264Packet(sps, pps, this) : new H265Packet(sps, pps, vps, this);
-  }
-
-  public void setAudioInfo(int sampleRate) {
-    aacPacket = new AacPacket(sampleRate, this);
-  }
-
-  /**
-   * @return number of packets
-   */
-  private int getDefaultCacheSize() {
-    return 10 * 1024 * 1024 / RtpConstants.MTU;
-  }
-
-  public void setDataStream(OutputStream outputStream, String host) {
-    rtpSocket.setDataStream(outputStream, host);
-    baseSenderReport.setDataStream(outputStream, host);
-  }
-
-  public void setVideoPorts(int rtpPort, int rtcpPort) {
-    videoPacket.setPorts(rtpPort, rtcpPort);
-  }
-
-  public void setAudioPorts(int rtpPort, int rtcpPort) {
-    aacPacket.setPorts(rtpPort, rtcpPort);
-  }
-
-  public void sendVideoFrame(ByteBuffer h264Buffer, MediaCodec.BufferInfo info) {
-    videoPacket.createAndSendPacket(h264Buffer, info);
-  }
-
-  public void sendAudioFrame(ByteBuffer aacBuffer, MediaCodec.BufferInfo info) {
-    aacPacket.createAndSendPacket(aacBuffer, info);
-  }
-
-  @Override
-  public void onVideoFrameCreated(RtpFrame rtpFrame) {
-    try {
-      rtpFrameBlockingQueue.add(rtpFrame);
-    } catch (IllegalStateException e) {
-      Log.i(TAG, "Video frame discarded");
-      droppedVideoFrames++;
-    }
-  }
-
-  @Override
-  public void onAudioFrameCreated(RtpFrame rtpFrame) {
-    try {
-      rtpFrameBlockingQueue.add(rtpFrame);
-    } catch (IllegalStateException e) {
-      Log.i(TAG, "Audio frame discarded");
-      droppedAudioFrames++;
-    }
-  }
-
-  public void start() {
-    thread = new Thread(new Runnable() {
-      @Override
-      public void run() {
-        while (!Thread.interrupted()) {
-          try {
-            RtpFrame rtpFrame = rtpFrameBlockingQueue.poll(1, TimeUnit.SECONDS);
-            if (rtpFrame == null) {
-              Log.i(TAG, "Skipping iteration, frame null");
-              continue;
-            }
-            rtpSocket.sendFrame(rtpFrame);
-            //bytes to bits
-            bitrateManager.calculateBitrate(rtpFrame.getLength() * 8);
-            if (rtpFrame.isVideoFrame()) {
-              videoFramesSent++;
-            } else {
-              audioFramesSent++;
-            }
-            baseSenderReport.update(rtpFrame);
-          } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-          } catch (IOException e) {
-            Thread.currentThread().interrupt();
-            Log.e(TAG, "send error: ", e);
-            connectCheckerRtsp.onConnectionFailedRtsp("Error send packet, " + e.getMessage());
-          }
-        }
-      }
-    });
-    thread.start();
-  }
-
-  public void stop() {
-    if (thread != null) {
-      thread.interrupt();
-      try {
-        thread.join(100);
-      } catch (InterruptedException e) {
-        thread.interrupt();
-      }
-      thread = null;
-    }
-    rtpFrameBlockingQueue.clear();
-    baseSenderReport.reset();
-    baseSenderReport.close();
-    rtpSocket.close();
-    aacPacket.reset();
-    if (videoPacket != null) videoPacket.reset();
-
-    resetSentAudioFrames();
-    resetSentVideoFrames();
-    resetDroppedAudioFrames();
-    resetDroppedVideoFrames();
-  }
-
-  public void resizeCache(int newSize) {
-    if (newSize < rtpFrameBlockingQueue.size() - rtpFrameBlockingQueue.remainingCapacity()) {
-      throw new RuntimeException("Can't fit current cache inside new cache size");
-    }
-
-    BlockingQueue<RtpFrame> tempQueue = new LinkedBlockingQueue<>(newSize);
-    rtpFrameBlockingQueue.drainTo(tempQueue);
-    rtpFrameBlockingQueue = tempQueue;
-  }
-
-  public int getCacheSize() {
-    return rtpFrameBlockingQueue.size();
-  }
-
-  public long getSentAudioFrames() {
-    return audioFramesSent;
-  }
-
-  public long getSentVideoFrames() {
-    return videoFramesSent;
-  }
-
-  public long getDroppedAudioFrames() {
-    return droppedAudioFrames;
-  }
-
-  public long getDroppedVideoFrames() {
-    return droppedVideoFrames;
-  }
-
-  public void resetSentAudioFrames() {
-    audioFramesSent = 0;
-  }
-
-  public void resetSentVideoFrames() {
-    videoFramesSent = 0;
-  }
-
-  public void resetDroppedAudioFrames() {
-    droppedAudioFrames = 0;
-  }
-
-  public void resetDroppedVideoFrames() {
-    droppedVideoFrames = 0;
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspSender.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspSender.kt
new file mode 100644
index 0000000..bece31b
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspSender.kt
@@ -0,0 +1,231 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp
+
+import android.media.MediaCodec
+import android.util.Log
+import com.pedro.rtsp.rtcp.BaseSenderReport
+import com.pedro.rtsp.rtp.packets.*
+import com.pedro.rtsp.rtp.sockets.BaseRtpSocket
+import com.pedro.rtsp.rtp.sockets.RtpSocketTcp
+import com.pedro.rtsp.utils.BitrateManager
+import com.pedro.rtsp.utils.ConnectCheckerRtsp
+import com.pedro.rtsp.utils.RtpConstants
+import java.io.IOException
+import java.io.OutputStream
+import java.nio.ByteBuffer
+import java.util.*
+import java.util.concurrent.*
+
+/**
+ * Created by pedro on 7/11/18.
+ */
+open class RtspSender(private val connectCheckerRtsp: ConnectCheckerRtsp) : VideoPacketCallback, AudioPacketCallback {
+
+  private var videoPacket: BasePacket? = null
+  private var aacPacket: AacPacket? = null
+  private var rtpSocket: BaseRtpSocket? = null
+  private var baseSenderReport: BaseSenderReport? = null
+  private var running = false
+
+  @Volatile
+  private var rtpFrameBlockingQueue: BlockingQueue<RtpFrame> = LinkedBlockingQueue(defaultCacheSize)
+  private var thread: ExecutorService? = null
+  private var audioFramesSent: Long = 0
+  private var videoFramesSent: Long = 0
+  var droppedAudioFrames: Long = 0
+    private set
+  var droppedVideoFrames: Long = 0
+    private set
+  private val bitrateManager: BitrateManager = BitrateManager(connectCheckerRtsp)
+  private var isEnableLogs = true
+
+  companion object {
+    private const val TAG = "RtspSender"
+  }
+
+  @Throws(IOException::class)
+  fun setSocketsInfo(protocol: Protocol, videoSourcePorts: IntArray, audioSourcePorts: IntArray) {
+    rtpSocket = BaseRtpSocket.getInstance(protocol, videoSourcePorts[0], audioSourcePorts[0])
+    baseSenderReport = BaseSenderReport.getInstance(protocol, videoSourcePorts[1], audioSourcePorts[1])
+  }
+
+  fun setVideoInfo(sps: ByteArray, pps: ByteArray, vps: ByteArray?) {
+    videoPacket = if (vps == null) H264Packet(sps, pps, this) else H265Packet(sps, pps, vps, this)
+  }
+
+  fun setAudioInfo(sampleRate: Int) {
+    aacPacket = AacPacket(sampleRate, this)
+  }
+
+  /**
+   * @return number of packets
+   */
+  private val defaultCacheSize: Int
+    get() = 10 * 1024 * 1024 / RtpConstants.MTU
+
+  @Throws(IOException::class)
+  fun setDataStream(outputStream: OutputStream, host: String) {
+    rtpSocket?.setDataStream(outputStream, host)
+    baseSenderReport?.setDataStream(outputStream, host)
+  }
+
+  fun setVideoPorts(rtpPort: Int, rtcpPort: Int) {
+    videoPacket?.setPorts(rtpPort, rtcpPort)
+  }
+
+  fun setAudioPorts(rtpPort: Int, rtcpPort: Int) {
+    aacPacket?.setPorts(rtpPort, rtcpPort)
+  }
+
+  fun sendVideoFrame(h264Buffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    if (running) videoPacket?.createAndSendPacket(h264Buffer, info)
+  }
+
+  fun sendAudioFrame(aacBuffer: ByteBuffer, info: MediaCodec.BufferInfo) {
+    if (running) aacPacket?.createAndSendPacket(aacBuffer, info)
+  }
+
+  override fun onVideoFrameCreated(rtpFrame: RtpFrame) {
+    try {
+      rtpFrameBlockingQueue.add(rtpFrame)
+    } catch (e: IllegalStateException) {
+      Log.i(TAG, "Video frame discarded")
+      droppedVideoFrames++
+    }
+  }
+
+  override fun onAudioFrameCreated(rtpFrame: RtpFrame) {
+    try {
+      rtpFrameBlockingQueue.add(rtpFrame)
+    } catch (e: IllegalStateException) {
+      Log.i(TAG, "Audio frame discarded")
+      droppedAudioFrames++
+    }
+  }
+
+  fun start() {
+    thread = Executors.newSingleThreadExecutor()
+    running = true
+    thread?.execute post@{
+      val ssrcVideo = Random().nextInt().toLong()
+      val ssrcAudio = Random().nextInt().toLong()
+      baseSenderReport?.setSSRC(ssrcVideo, ssrcAudio)
+      videoPacket?.setSSRC(ssrcVideo)
+      aacPacket?.setSSRC(ssrcAudio)
+      val isTcp = rtpSocket is RtpSocketTcp
+
+      while (!Thread.interrupted() && running) {
+        try {
+          val rtpFrame = rtpFrameBlockingQueue.poll(1, TimeUnit.SECONDS)
+          if (rtpFrame == null) {
+            Log.i(TAG, "Skipping iteration, frame null")
+            continue
+          }
+          rtpSocket?.sendFrame(rtpFrame, isEnableLogs)
+          //bytes to bits (4 is tcp header length)
+          val packetSize = if (isTcp) rtpFrame.length + 4 else rtpFrame.length
+          bitrateManager.calculateBitrate(packetSize * 8.toLong())
+          if (rtpFrame.isVideoFrame()) {
+            videoFramesSent++
+          } else {
+            audioFramesSent++
+          }
+          if (baseSenderReport?.update(rtpFrame, isEnableLogs) == true) {
+            //bytes to bits (4 is tcp header length)
+            val reportSize = if (isTcp) baseSenderReport?.PACKET_LENGTH ?: 0 + 4 else baseSenderReport?.PACKET_LENGTH ?: 0
+            bitrateManager.calculateBitrate(reportSize * 8.toLong())
+          }
+        } catch (e: Exception) {
+          //InterruptedException is only when you disconnect manually, you don't need report it.
+          if (e !is InterruptedException) {
+            connectCheckerRtsp.onConnectionFailedRtsp("Error send packet, " + e.message)
+            Log.e(TAG, "send error: ", e)
+          }
+          return@post
+        }
+      }
+    }
+  }
+
+  fun stop() {
+    running = false
+    thread?.shutdownNow()
+    try {
+      thread?.awaitTermination(100, TimeUnit.MILLISECONDS)
+    } catch (e: InterruptedException) { }
+    thread = null
+    rtpFrameBlockingQueue.clear()
+    baseSenderReport?.reset()
+    baseSenderReport?.close()
+    rtpSocket?.close()
+    aacPacket?.reset()
+    videoPacket?.reset()
+    resetSentAudioFrames()
+    resetSentVideoFrames()
+    resetDroppedAudioFrames()
+    resetDroppedVideoFrames()
+  }
+
+  fun hasCongestion(): Boolean {
+    val size = rtpFrameBlockingQueue.size.toFloat()
+    val remaining = rtpFrameBlockingQueue.remainingCapacity().toFloat()
+    val capacity = size + remaining
+    return size >= capacity * 0.2f //more than 20% queue used. You could have congestion
+  }
+
+  fun resizeCache(newSize: Int) {
+    if (newSize < rtpFrameBlockingQueue.size - rtpFrameBlockingQueue.remainingCapacity()) {
+      throw RuntimeException("Can't fit current cache inside new cache size")
+    }
+    val tempQueue: BlockingQueue<RtpFrame> = LinkedBlockingQueue(newSize)
+    rtpFrameBlockingQueue.drainTo(tempQueue)
+    rtpFrameBlockingQueue = tempQueue
+  }
+
+  fun getCacheSize(): Int {
+    return rtpFrameBlockingQueue.size
+  }
+
+  fun getSentAudioFrames(): Long {
+    return audioFramesSent
+  }
+
+  fun getSentVideoFrames(): Long {
+    return videoFramesSent
+  }
+
+  fun resetSentAudioFrames() {
+    audioFramesSent = 0
+  }
+
+  fun resetSentVideoFrames() {
+    videoFramesSent = 0
+  }
+
+  fun resetDroppedAudioFrames() {
+    droppedAudioFrames = 0
+  }
+
+  fun resetDroppedVideoFrames() {
+    droppedVideoFrames = 0
+  }
+
+  fun setLogs(enable: Boolean) {
+    isEnableLogs = enable
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/VideoCodec.java b/rtsp/src/main/java/com/pedro/rtsp/rtsp/VideoCodec.java
deleted file mode 100644
index 766eee5..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/rtsp/VideoCodec.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.pedro.rtsp.rtsp;
-
-/**
- * Created by pedro on 28/11/18.
- */
-
-public enum VideoCodec {
-  H264, H265
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/VideoCodec.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/VideoCodec.kt
new file mode 100644
index 0000000..e3f2a60
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtsp/VideoCodec.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp
+
+/**
+ * Created by pedro on 28/11/18.
+ */
+enum class VideoCodec {
+  H264, H265
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/Command.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/Command.kt
new file mode 100644
index 0000000..037995d
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/Command.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp.commands
+
+/**
+ * Created by pedro on 7/04/21.
+ */
+data class Command(val method: Method, val cSeq: Int, val status: Int, val text: String)
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/CommandParser.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/CommandParser.kt
new file mode 100644
index 0000000..91c4387
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/CommandParser.kt
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp.commands
+
+import android.util.Log
+import com.pedro.rtsp.rtsp.Protocol
+import java.util.regex.Pattern
+
+/**
+ * Created by pedro on 13/4/22.
+ */
+class CommandParser {
+
+  companion object {
+    private const val TAG = "CommandParser"
+  }
+
+  fun loadServerPorts(command: Command, protocol: Protocol, audioClientPorts: IntArray,
+    videoClientPorts: IntArray, audioServerPorts: IntArray, videoServerPorts: IntArray): Boolean {
+    var isAudio = true
+    if (command.method == Method.SETUP && protocol == Protocol.UDP) {
+      val clientPattern = Pattern.compile("client_port=([0-9]+)-([0-9]+)")
+      val clientMatcher = clientPattern.matcher(command.text)
+      if (clientMatcher.find()) {
+        val port = (clientMatcher.group(1) ?: "-1").toInt()
+        isAudio = port == audioClientPorts[0]
+      }
+
+      val rtspPattern = Pattern.compile("server_port=([0-9]+)-([0-9]+)")
+      val matcher = rtspPattern.matcher(command.text)
+      if (matcher.find()) {
+        if (isAudio) {
+          audioServerPorts[0] = matcher.group(1)?.toInt() ?: audioClientPorts[0]
+          audioServerPorts[1] = matcher.group(2)?.toInt() ?: audioClientPorts[1]
+        } else {
+          videoServerPorts[0] = matcher.group(1)?.toInt() ?: videoClientPorts[0]
+          videoServerPorts[1] = matcher.group(2)?.toInt() ?: videoClientPorts[1]
+        }
+        return true
+      }
+    }
+    return false
+  }
+
+  fun getSessionId(command: Command): String {
+    var sessionId = ""
+    val rtspPattern = Pattern.compile("Session:(\\s?[^;]+)")
+    val matcher = rtspPattern.matcher(command.text)
+    if (matcher.find()) {
+      sessionId = matcher.group(1) ?: ""
+      val temp = sessionId.split(";")[0]
+      sessionId = temp.trim()
+    }
+    return sessionId
+  }
+  /**
+   * Response received after send a command
+   */
+  fun parseResponse(method: Method, responseText: String): Command {
+    val status = getResponseStatus(responseText)
+    val cSeq = getCSeq(responseText)
+    return Command(method, cSeq, status, responseText)
+  }
+
+  /**
+   * Command send by pusher/player
+   */
+  fun parseCommand(commandText: String): Command {
+    val method = getMethod(commandText)
+    val cSeq = getCSeq(commandText)
+    return Command(method, cSeq, -1, commandText)
+  }
+
+  private fun getCSeq(request: String): Int {
+    val cSeqMatcher = Pattern.compile("CSeq\\s*:\\s*(\\d+)", Pattern.CASE_INSENSITIVE).matcher(request)
+    return if (cSeqMatcher.find()) {
+      cSeqMatcher.group(1)?.toInt() ?: -1
+    } else {
+      Log.e(TAG, "cSeq not found")
+      -1
+    }
+  }
+
+  private fun getMethod(response: String): Method {
+    val matcher = Pattern.compile("(\\w+) (\\S+) RTSP", Pattern.CASE_INSENSITIVE).matcher(response)
+    if (matcher.find()) {
+      val method = matcher.group(1)
+      return if (method != null) {
+        when (method.uppercase()) {
+          Method.OPTIONS.name -> Method.OPTIONS
+          Method.ANNOUNCE.name -> Method.ANNOUNCE
+          Method.RECORD.name -> Method.RECORD
+          Method.SETUP.name -> Method.SETUP
+          Method.DESCRIBE.name -> Method.DESCRIBE
+          Method.TEARDOWN.name -> Method.TEARDOWN
+          Method.PLAY.name -> Method.PLAY
+          Method.PAUSE.name -> Method.PAUSE
+          Method.SET_PARAMETERS.name -> Method.SET_PARAMETERS
+          Method.GET_PARAMETERS.name -> Method.GET_PARAMETERS
+          Method.REDIRECT.name -> Method.REDIRECT
+          else -> Method.UNKNOWN
+        }
+      } else  {
+        Method.UNKNOWN
+      }
+    } else {
+      return Method.UNKNOWN
+    }
+  }
+
+  private fun getResponseStatus(response: String): Int {
+    val matcher = Pattern.compile("RTSP/\\d.\\d (\\d+) (\\w+)", Pattern.CASE_INSENSITIVE).matcher(response)
+    return if (matcher.find()) {
+      (matcher.group(1) ?: "-1").toInt()
+    } else {
+      Log.e(TAG, "status code not found")
+      -1
+    }
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/CommandsManager.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/CommandsManager.kt
new file mode 100644
index 0000000..e5457f1
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/CommandsManager.kt
@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp.commands
+
+import android.util.Base64
+import android.util.Log
+import com.pedro.rtsp.BuildConfig
+import com.pedro.rtsp.rtsp.Protocol
+import com.pedro.rtsp.rtsp.commands.SdpBody.createAacBody
+import com.pedro.rtsp.rtsp.commands.SdpBody.createH264Body
+import com.pedro.rtsp.rtsp.commands.SdpBody.createH265Body
+import com.pedro.rtsp.utils.AuthUtil.getMd5Hash
+import com.pedro.rtsp.utils.RtpConstants
+import com.pedro.rtsp.utils.encodeToString
+import com.pedro.rtsp.utils.getData
+import java.io.BufferedReader
+import java.io.IOException
+import java.nio.ByteBuffer
+import java.util.regex.Pattern
+
+/**
+ * Created by pedro on 12/02/19.
+ *
+ * Class to create request to server and parse response from server.
+ */
+open class CommandsManager {
+
+  var host: String? = null
+    private set
+  var port = 0
+    private set
+  var path: String? = null
+    private set
+  var sps: ByteArray? = null
+    private set
+  var pps: ByteArray? = null
+    private set
+  private var cSeq = 0
+  private var sessionId: String? = null
+  private val timeStamp: Long
+  var sampleRate = 32000
+  var isStereo = true
+  var protocol: Protocol = Protocol.TCP
+  var videoDisabled = false
+  var audioDisabled = false
+  private val commandParser = CommandParser()
+
+  //For udp
+  val audioClientPorts = intArrayOf(5000, 5001)
+  val videoClientPorts = intArrayOf(5002, 5003)
+  val audioServerPorts = intArrayOf(5004, 5005)
+  val videoServerPorts = intArrayOf(5006, 5007)
+
+  //For H265
+  var vps: ByteArray? = null
+    private set
+
+  //For auth
+  var user: String? = null
+    private set
+  var password: String? = null
+    private set
+
+  companion object {
+    private const val TAG = "CommandsManager"
+    private var authorization: String? = null
+  }
+
+  init {
+    val uptime = System.currentTimeMillis()
+    timeStamp = uptime / 1000 shl 32 and ((uptime - uptime / 1000 * 1000 shr 32)
+        / 1000) // NTP timestamp
+  }
+
+  fun setVideoInfo(sps: ByteBuffer, pps: ByteBuffer, vps: ByteBuffer?) {
+    this.sps = sps.getData()
+    this.pps = pps.getData()
+    this.vps = vps?.getData() //H264 has no vps so if not null assume H265
+  }
+
+  fun setAudioInfo(sampleRate: Int, isStereo: Boolean) {
+    this.isStereo = isStereo
+    this.sampleRate = sampleRate
+  }
+
+  fun setAuth(user: String?, password: String?) {
+    this.user = user
+    this.password = password
+  }
+
+  fun setUrl(host: String?, port: Int, path: String?) {
+    this.host = host
+    this.port = port
+    this.path = path
+  }
+
+  fun clear() {
+    sps = null
+    pps = null
+    vps = null
+    retryClear()
+  }
+
+  fun retryClear() {
+    cSeq = 0
+    sessionId = null
+  }
+
+  private val spsString: String
+    get() = sps?.encodeToString() ?: ""
+  private val ppsString: String
+    get() = pps?.encodeToString() ?: ""
+  private val vpsString: String
+    get() = vps?.encodeToString() ?: ""
+
+  private fun addHeaders(): String {
+    return "CSeq: ${++cSeq}\r\n" +
+        "User-Agent: ${BuildConfig.LIBRARY_PACKAGE_NAME} ${BuildConfig.VERSION_NAME}\r\n" +
+        (if (sessionId == null) "" else "Session: $sessionId\r\n") +
+        (if (authorization == null) "" else "Authorization: $authorization\r\n")
+  }
+
+  private fun createBody(): String {
+    var videoBody = ""
+    if (!videoDisabled) {
+      videoBody = if (vps == null) {
+        createH264Body(RtpConstants.trackVideo, spsString, ppsString)
+      } else {
+        createH265Body(RtpConstants.trackVideo, spsString, ppsString, vpsString)
+      }
+    }
+    var audioBody = ""
+    if (!audioDisabled) {
+      audioBody = createAacBody(RtpConstants.trackAudio, sampleRate, isStereo)
+    }
+    return "v=0\r\n" +
+        "o=- $timeStamp $timeStamp IN IP4 127.0.0.1\r\n" +
+        "s=Unnamed\r\n" +
+        "i=N/A\r\n" +
+        "c=IN IP4 $host\r\n" +
+        "t=0 0\r\n" +
+        "a=recvonly\r\n" +
+        videoBody + audioBody
+  }
+
+  private fun createAuth(authResponse: String): String {
+    val authPattern = Pattern.compile("realm=\"(.+)\",\\s+nonce=\"(\\w+)\"", Pattern.CASE_INSENSITIVE)
+    val matcher = authPattern.matcher(authResponse)
+    //digest auth
+    return if (matcher.find()) {
+      Log.i(TAG, "using digest auth")
+      val realm = matcher.group(1)
+      val nonce = matcher.group(2)
+      val hash1 = getMd5Hash("$user:$realm:$password")
+      val hash2 = getMd5Hash("ANNOUNCE:rtsp://$host:$port$path")
+      val hash3 = getMd5Hash("$hash1:$nonce:$hash2")
+      "Digest username=\"$user\", realm=\"$realm\", nonce=\"$nonce\", uri=\"rtsp://$host:$port$path\", response=\"$hash3\""
+      //basic auth
+    } else {
+      Log.i(TAG, "using basic auth")
+      val data = "$user:$password"
+      val base64Data = data.toByteArray().encodeToString(Base64.DEFAULT)
+      "Basic $base64Data"
+    }
+  }
+
+  //Commands
+  fun createOptions(): String {
+    val options = "OPTIONS rtsp://$host:$port$path RTSP/1.0\r\n" + addHeaders() + "\r\n"
+    Log.i(TAG, options)
+    return options
+  }
+
+  open fun createSetup(track: Int): String {
+    val udpPorts = if (track == RtpConstants.trackVideo) videoClientPorts else audioClientPorts
+    val params = if (protocol === Protocol.UDP) {
+      "UDP;unicast;client_port=${udpPorts[0]}-${udpPorts[1]};mode=record"
+    } else {
+      "TCP;unicast;interleaved=${2 * track}-${2 * track + 1};mode=record"
+    }
+    val setup = "SETUP rtsp://$host:$port$path/streamid=$track RTSP/1.0\r\n" +
+        "Transport: RTP/AVP/$params\r\n" +
+        addHeaders() + "\r\n"
+    Log.i(TAG, setup)
+    return setup
+  }
+
+  fun createRecord(): String {
+    val record = "RECORD rtsp://$host:$port$path RTSP/1.0\r\n" +
+        "Range: npt=0.000-\r\n" + addHeaders() + "\r\n"
+    Log.i(TAG, record)
+    return record
+  }
+
+  fun createAnnounce(): String {
+    val body = createBody()
+    val announce = "ANNOUNCE rtsp://$host:$port$path RTSP/1.0\r\n" +
+        "Content-Type: application/sdp\r\n" +
+        addHeaders() +
+        "Content-Length: ${body.length}\r\n\r\n" +
+        body
+    Log.i(TAG, announce)
+    return announce
+  }
+
+  fun createAnnounceWithAuth(authResponse: String): String {
+    authorization = createAuth(authResponse)
+    Log.i("Auth", "$authorization")
+    return createAnnounce()
+  }
+
+  fun createTeardown(): String {
+    val teardown = "TEARDOWN rtsp://$host:$port$path RTSP/1.0\r\n" + addHeaders() + "\r\n"
+    Log.i(TAG, teardown)
+    return teardown
+  }
+
+  @Throws(IOException::class)
+  fun getResponse(reader: BufferedReader, method: Method = Method.UNKNOWN): Command {
+    var response = ""
+    var line: String?
+    while (reader.readLine().also { line = it } != null) {
+      response += "${line ?: ""}\n"
+      //end of response
+      if (line?.length ?: 0 < 3) break
+    }
+    Log.i(TAG, response)
+    return if (method == Method.UNKNOWN) {
+      commandParser.parseCommand(response)
+    } else {
+      val command = commandParser.parseResponse(method, response)
+      sessionId = commandParser.getSessionId(command)
+      if (command.method == Method.SETUP && protocol == Protocol.UDP) {
+        commandParser.loadServerPorts(command, protocol, audioClientPorts, videoClientPorts,
+          audioServerPorts, videoServerPorts)
+      }
+      command
+    }
+  }
+
+  //Unused commands
+  fun createPause(): String {
+    return ""
+  }
+
+  fun createPlay(): String {
+    return ""
+  }
+
+  fun createGetParameter(): String {
+    return ""
+  }
+
+  fun createSetParameter(): String {
+    return ""
+  }
+
+  fun createRedirect(): String {
+    return ""
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/Method.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/Method.kt
new file mode 100644
index 0000000..1b79698
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/Method.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp.commands
+
+/**
+ * Created by pedro on 7/04/21.
+ */
+enum class Method {
+  OPTIONS, ANNOUNCE, RECORD, SETUP, DESCRIBE, TEARDOWN, PLAY, PAUSE, SET_PARAMETERS, GET_PARAMETERS, REDIRECT, UNKNOWN
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/SdpBody.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/SdpBody.kt
new file mode 100644
index 0000000..c97a6c1
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/rtsp/commands/SdpBody.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp.commands
+
+import com.pedro.rtsp.utils.RtpConstants
+
+/**
+ * Created by pedro on 21/02/17.
+ */
+object SdpBody {
+
+  /** supported sampleRates.  */
+  private val AUDIO_SAMPLING_RATES = intArrayOf(
+      96000,  // 0
+      88200,  // 1
+      64000,  // 2
+      48000,  // 3
+      44100,  // 4
+      32000,  // 5
+      24000,  // 6
+      22050,  // 7
+      16000,  // 8
+      12000,  // 9
+      11025,  // 10
+      8000,  // 11
+      7350,  // 12
+      -1,  // 13
+      -1,  // 14
+      -1)
+
+  fun createAacBody(trackAudio: Int, sampleRate: Int, isStereo: Boolean): String {
+    val sampleRateNum = AUDIO_SAMPLING_RATES.toList().indexOf(sampleRate)
+    val channel = if (isStereo) 2 else 1
+    val config = 2 and 0x1F shl 11 or (sampleRateNum and 0x0F shl 7) or (channel and 0x0F shl 3)
+    val payload = RtpConstants.payloadType + trackAudio
+    return "m=audio 0 RTP/AVP ${payload}\r\n" +
+        "a=rtpmap:$payload MPEG4-GENERIC/$sampleRate/$channel\r\n" +
+        "a=fmtp:$payload profile-level-id=1; mode=AAC-hbr; config=${Integer.toHexString(config)}; sizelength=13; indexlength=3; indexdeltalength=3\r\n" +
+        "a=control:streamid=$trackAudio\r\n"
+  }
+
+  fun createH264Body(trackVideo: Int, sps: String, pps: String): String {
+    val payload = RtpConstants.payloadType + trackVideo
+    return "m=video 0 RTP/AVP $payload\r\n" +
+        "a=rtpmap:$payload H264/${RtpConstants.clockVideoFrequency}\r\n" +
+        "a=fmtp:$payload packetization-mode=1; sprop-parameter-sets=$sps,$pps\r\n" +
+        "a=control:streamid=$trackVideo\r\n"
+  }
+
+  fun createH265Body(trackVideo: Int, sps: String, pps: String, vps: String): String {
+    val payload = RtpConstants.payloadType + trackVideo
+    return "m=video 0 RTP/AVP ${payload}\r\n" +
+        "a=rtpmap:$payload H265/${RtpConstants.clockVideoFrequency}\r\n" +
+        "a=fmtp:$payload packetization-mode=1; sprop-sps=$sps; sprop-pps=$pps; sprop-vps=$vps\r\n" +
+        "a=control:streamid=$trackVideo\r\n"
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/AuthUtil.java b/rtsp/src/main/java/com/pedro/rtsp/utils/AuthUtil.java
deleted file mode 100644
index a3ba03a..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/utils/AuthUtil.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.pedro.rtsp.utils;
-
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * Created by pedro on 22/02/17.
- */
-
-public class AuthUtil {
-
-  private static char[] hexArray =
-      { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-
-  public static String getMd5Hash(String buffer) {
-    MessageDigest md;
-    try {
-      md = MessageDigest.getInstance("MD5");
-      return bytesToHex(md.digest(buffer.getBytes("UTF-8")));
-    } catch (NoSuchAlgorithmException | UnsupportedEncodingException ignore) {
-    }
-    return "";
-  }
-
-  private static String bytesToHex(byte[] bytes) {
-    char[] hexChars = new char[bytes.length * 2];
-    int v;
-    for (int j = 0; j < bytes.length; j++) {
-      v = bytes[j] & 0xFF;
-      hexChars[j * 2] = hexArray[v >>> 4];
-      hexChars[j * 2 + 1] = hexArray[v & 0x0F];
-    }
-    return new String(hexChars);
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/AuthUtil.kt b/rtsp/src/main/java/com/pedro/rtsp/utils/AuthUtil.kt
new file mode 100644
index 0000000..154a9bb
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/utils/AuthUtil.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.utils
+
+import java.io.UnsupportedEncodingException
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+
+object AuthUtil {
+
+  @JvmStatic
+  fun getMd5Hash(buffer: String): String {
+    val md: MessageDigest
+    try {
+      md = MessageDigest.getInstance("MD5")
+      return bytesToHex(md.digest(buffer.toByteArray()))
+    } catch (ignore: NoSuchAlgorithmException) {
+    } catch (ignore: UnsupportedEncodingException) {
+    }
+    return ""
+  }
+
+  private fun bytesToHex(raw: ByteArray): String {
+    return raw.joinToString("") { "%02x".format(it) }
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/BitrateManager.java b/rtsp/src/main/java/com/pedro/rtsp/utils/BitrateManager.java
deleted file mode 100644
index ca11132..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/utils/BitrateManager.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.pedro.rtsp.utils;
-
-/**
- * Created by pedro on 10/07/19.
- *
- * Calculate video and audio bitrate per second
- */
-public class BitrateManager {
-
-  private long bitrate;
-  private long timeStamp = System.currentTimeMillis();
-  private ConnectCheckerRtsp connectCheckerRtsp;
-
-  public BitrateManager(ConnectCheckerRtsp connectCheckerRtsp) {
-    this.connectCheckerRtsp = connectCheckerRtsp;
-  }
-
-  public synchronized void calculateBitrate(long size) {
-    bitrate += size;
-    long timeDiff = System.currentTimeMillis() - timeStamp;
-    if (timeDiff >= 1000) {
-      connectCheckerRtsp.onNewBitrateRtsp((int) (bitrate / (timeDiff / 1000f)));
-      timeStamp = System.currentTimeMillis();
-      bitrate = 0;
-    }
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/BitrateManager.kt b/rtsp/src/main/java/com/pedro/rtsp/utils/BitrateManager.kt
new file mode 100644
index 0000000..41fcb10
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/utils/BitrateManager.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.utils
+
+/**
+ * Created by pedro on 10/07/19.
+ *
+ * Calculate video and audio bitrate per second
+ */
+open class BitrateManager(private val connectCheckerRtsp: ConnectCheckerRtsp) {
+
+  private var bitrate: Long = 0
+  private var timeStamp = System.currentTimeMillis()
+
+  @Synchronized
+  fun calculateBitrate(size: Long) {
+    bitrate += size
+    val timeDiff = System.currentTimeMillis() - timeStamp
+    if (timeDiff >= 1000) {
+      connectCheckerRtsp.onNewBitrateRtsp((bitrate / (timeDiff / 1000f)).toLong())
+      timeStamp = System.currentTimeMillis()
+      bitrate = 0
+    }
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/ConnectCheckerRtsp.java b/rtsp/src/main/java/com/pedro/rtsp/utils/ConnectCheckerRtsp.java
deleted file mode 100644
index ef86aaa..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/utils/ConnectCheckerRtsp.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.pedro.rtsp.utils;
-
-/**
- * Created by pedro on 20/02/17.
- */
-
-public interface ConnectCheckerRtsp {
-
-  void onConnectionSuccessRtsp();
-
-  void onConnectionFailedRtsp(String reason);
-
-  void onNewBitrateRtsp(long bitrate);
-
-  void onDisconnectRtsp();
-
-  void onAuthErrorRtsp();
-
-  void onAuthSuccessRtsp();
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/ConnectCheckerRtsp.kt b/rtsp/src/main/java/com/pedro/rtsp/utils/ConnectCheckerRtsp.kt
new file mode 100644
index 0000000..9ce5ff7
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/utils/ConnectCheckerRtsp.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.utils
+
+/**
+ * Created by pedro on 20/02/17.
+ */
+interface ConnectCheckerRtsp {
+  fun onConnectionStartedRtsp(rtspUrl: String)
+  fun onConnectionSuccessRtsp()
+  fun onConnectionFailedRtsp(reason: String)
+  fun onNewBitrateRtsp(bitrate: Long)
+  fun onDisconnectRtsp()
+  fun onAuthErrorRtsp()
+  fun onAuthSuccessRtsp()
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/CreateSSLSocket.java b/rtsp/src/main/java/com/pedro/rtsp/utils/CreateSSLSocket.java
deleted file mode 100644
index 9b39851..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/utils/CreateSSLSocket.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.pedro.rtsp.utils;
-
-import android.util.Log;
-import java.io.IOException;
-import java.net.Socket;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * Created by pedro on 25/02/17.
- *
- * this class is used for secure transport, to use replace socket on RtmpConnection with this and
- * you will have a secure stream under ssl/tls.
- */
-
-public class CreateSSLSocket {
-
-  /**
-   * @param host variable from RtspConnection
-   * @param port variable from RtspConnection
-   */
-  public static Socket createSSlSocket(String host, int port) {
-    try {
-      TLSSocketFactory socketFactory = new TLSSocketFactory();
-      return socketFactory.createSocket(host, port);
-    } catch (NoSuchAlgorithmException | KeyManagementException | IOException e) {
-      Log.e("CreateSSLSocket", "Error", e);
-      return null;
-    }
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/CreateSSLSocket.kt b/rtsp/src/main/java/com/pedro/rtsp/utils/CreateSSLSocket.kt
new file mode 100644
index 0000000..faaf43f
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/utils/CreateSSLSocket.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.utils
+
+import android.util.Log
+import java.io.IOException
+import java.net.Socket
+import java.security.KeyManagementException
+import java.security.NoSuchAlgorithmException
+
+/**
+ * Created by pedro on 25/02/17.
+ *
+ * this class is used for secure transport, to use replace socket on RtspClient with this and
+ * you will have a secure stream under ssl/tls.
+ */
+object CreateSSLSocket {
+  /**
+   * @param host variable from RtspClient
+   * @param port variable from RtspClient
+   */
+  @JvmStatic
+  fun createSSlSocket(host: String, port: Int): Socket? {
+    return try {
+      val socketFactory = TLSSocketFactory()
+      socketFactory.createSocket(host, port)
+    } catch (e: NoSuchAlgorithmException) {
+      Log.e("CreateSSLSocket", "Error", e)
+      null
+    } catch (e: KeyManagementException) {
+      Log.e("CreateSSLSocket", "Error", e)
+      null
+    } catch (e: IOException) {
+      Log.e("CreateSSLSocket", "Error", e)
+      null
+    }
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/Extensions.kt b/rtsp/src/main/java/com/pedro/rtsp/utils/Extensions.kt
new file mode 100644
index 0000000..4d0ea9d
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/utils/Extensions.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.utils
+
+import android.util.Base64
+import java.nio.ByteBuffer
+
+fun ByteArray.encodeToString(flags: Int = Base64.NO_WRAP): String {
+  return Base64.encodeToString(this, flags)
+}
+
+fun ByteBuffer.getData(): ByteArray {
+  val startCodeSize = this.getVideoStartCodeSize()
+  val bytes = ByteArray(this.capacity() - startCodeSize)
+  this.position(startCodeSize)
+  this.get(bytes, 0, bytes.size)
+  return bytes
+}
+
+fun ByteArray.setLong(n: Long, begin: Int, end: Int) {
+  var value = n
+  for (i in end - 1 downTo begin step 1) {
+    this[i] = (value % 256).toByte()
+    value = value shr 8
+  }
+}
+
+fun ByteBuffer.getVideoStartCodeSize(): Int {
+  var startCodeSize = 0
+  if (this.get(0).toInt() == 0x00 && this.get(1).toInt() == 0x00
+    && this.get(2).toInt() == 0x00 && this.get(3).toInt() == 0x01) {
+    //match 00 00 00 01
+    startCodeSize = 4
+  } else if (this.get(0).toInt() == 0x00 && this.get(1).toInt() == 0x00
+    && this.get(2).toInt() == 0x01) {
+    //match 00 00 01
+    startCodeSize = 3
+  }
+  return startCodeSize
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/RtpConstants.java b/rtsp/src/main/java/com/pedro/rtsp/utils/RtpConstants.java
deleted file mode 100644
index d01d2ba..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/utils/RtpConstants.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.pedro.rtsp.utils;
-
-/**
- * Created by pedro on 19/02/17.
- */
-
-public class RtpConstants {
-  public static final long clockVideoFrequency = 90000L;
-  public static final int RTP_HEADER_LENGTH = 12;
-  public static final int MTU = 1300;
-  public static final int payloadType = 96;
-  //H264 IDR
-  public static final int IDR = 5;
-  //H265 IDR
-  public static final int IDR_N_LP = 20;
-  public static final int IDR_W_DLP = 19;
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/RtpConstants.kt b/rtsp/src/main/java/com/pedro/rtsp/utils/RtpConstants.kt
new file mode 100644
index 0000000..78a2fd5
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/utils/RtpConstants.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.utils
+
+/**
+ * Created by pedro on 19/02/17.
+ */
+object RtpConstants {
+
+  @JvmField
+  val lock = Any()
+  var trackAudio = 1
+  var trackVideo = 0
+  const val clockVideoFrequency = 90000L
+  const val RTP_HEADER_LENGTH = 12
+  const val MTU = 1500
+  const val payloadType = 96
+
+  //H264 IDR
+  const val IDR = 5
+
+  //H265 IDR
+  const val IDR_N_LP = 20
+  const val IDR_W_DLP = 19
+}
\ No newline at end of file
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/TLSSocketFactory.java b/rtsp/src/main/java/com/pedro/rtsp/utils/TLSSocketFactory.java
deleted file mode 100644
index 349824e..0000000
--- a/rtsp/src/main/java/com/pedro/rtsp/utils/TLSSocketFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.pedro.rtsp.utils;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-/**
- * @author fkrauthan
- */
-public class TLSSocketFactory extends SSLSocketFactory {
-
-  private SSLSocketFactory internalSSLSocketFactory;
-
-  public TLSSocketFactory() throws KeyManagementException, NoSuchAlgorithmException {
-    SSLContext context = SSLContext.getInstance("TLS");
-    context.init(null, null, null);
-    internalSSLSocketFactory = context.getSocketFactory();
-  }
-
-  @Override
-  public String[] getDefaultCipherSuites() {
-    return internalSSLSocketFactory.getDefaultCipherSuites();
-  }
-
-  @Override
-  public String[] getSupportedCipherSuites() {
-    return internalSSLSocketFactory.getSupportedCipherSuites();
-  }
-
-  @Override
-  public Socket createSocket() throws IOException {
-    return enableTLSOnSocket(internalSSLSocketFactory.createSocket());
-  }
-
-  @Override
-  public Socket createSocket(Socket s, String host, int port, boolean autoClose)
-      throws IOException {
-    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(s, host, port, autoClose));
-  }
-
-  @Override
-  public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
-  }
-
-  @Override
-  public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
-      throws IOException, UnknownHostException {
-    return enableTLSOnSocket(
-        internalSSLSocketFactory.createSocket(host, port, localHost, localPort));
-  }
-
-  @Override
-  public Socket createSocket(InetAddress host, int port) throws IOException {
-    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
-  }
-
-  @Override
-  public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
-      throws IOException {
-    return enableTLSOnSocket(
-        internalSSLSocketFactory.createSocket(address, port, localAddress, localPort));
-  }
-
-  private Socket enableTLSOnSocket(Socket socket) {
-    if (socket != null && (socket instanceof SSLSocket)) {
-      ((SSLSocket) socket).setEnabledProtocols(new String[] { "TLSv1.1", "TLSv1.2" });
-    }
-    return socket;
-  }
-}
diff --git a/rtsp/src/main/java/com/pedro/rtsp/utils/TLSSocketFactory.kt b/rtsp/src/main/java/com/pedro/rtsp/utils/TLSSocketFactory.kt
new file mode 100644
index 0000000..c3cf21d
--- /dev/null
+++ b/rtsp/src/main/java/com/pedro/rtsp/utils/TLSSocketFactory.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.utils
+
+import java.io.IOException
+import java.net.InetAddress
+import java.net.Socket
+import java.net.UnknownHostException
+import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
+
+/**
+ * @author fkrauthan
+ */
+open class TLSSocketFactory : SSLSocketFactory() {
+
+  private val internalSSLSocketFactory: SSLSocketFactory
+
+  init {
+    val context = SSLContext.getInstance("TLS")
+    context.init(null, null, null)
+    internalSSLSocketFactory = context.socketFactory
+  }
+
+  override fun getDefaultCipherSuites(): Array<String> {
+    return internalSSLSocketFactory.defaultCipherSuites
+  }
+
+  override fun getSupportedCipherSuites(): Array<String> {
+    return internalSSLSocketFactory.supportedCipherSuites
+  }
+
+  @Throws(IOException::class)
+  override fun createSocket(): Socket {
+    return enableTLSOnSocket(internalSSLSocketFactory.createSocket())
+  }
+
+  @Throws(IOException::class)
+  override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket {
+    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(s, host, port, autoClose))
+  }
+
+  @Throws(IOException::class, UnknownHostException::class)
+  override fun createSocket(host: String, port: Int): Socket {
+    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port))
+  }
+
+  @Throws(IOException::class, UnknownHostException::class)
+  override fun createSocket(host: String, port: Int, localHost: InetAddress, localPort: Int): Socket {
+    return enableTLSOnSocket(
+        internalSSLSocketFactory.createSocket(host, port, localHost, localPort))
+  }
+
+  @Throws(IOException::class)
+  override fun createSocket(host: InetAddress, port: Int): Socket {
+    return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port))
+  }
+
+  @Throws(IOException::class)
+  override fun createSocket(address: InetAddress, port: Int, localAddress: InetAddress, localPort: Int): Socket {
+    return enableTLSOnSocket(
+        internalSSLSocketFactory.createSocket(address, port, localAddress, localPort))
+  }
+
+  private fun enableTLSOnSocket(socket: Socket): Socket {
+    if (socket is SSLSocket) {
+      socket.enabledProtocols = arrayOf("TLSv1.1", "TLSv1.2")
+    }
+    return socket
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/test/java/android/util/Base64.java b/rtsp/src/test/java/android/util/Base64.java
new file mode 100644
index 0000000..d5fc913
--- /dev/null
+++ b/rtsp/src/test/java/android/util/Base64.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 android.util;
+
+/**
+ * Created by pedro on 16/6/21.
+ *
+ * Replace Base64 class of Android for testing purpose
+ */
+public class Base64 {
+  public static String encodeToString(byte[] input, int flags) {
+    return java.util.Base64.getEncoder().encodeToString(input);
+  }
+}
diff --git a/rtsp/src/test/java/android/util/Log.java b/rtsp/src/test/java/android/util/Log.java
new file mode 100644
index 0000000..51f84d9
--- /dev/null
+++ b/rtsp/src/test/java/android/util/Log.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 android.util;
+
+/**
+ * Created by pedro on 16/6/21.
+ *
+ * Replace Log class of Android for testing purpose
+ */
+public class Log {
+
+  public static int i(String tag, String message, Throwable throwable) {
+    return println(tag, message, throwable);
+  }
+
+  public static int i(String tag, String message) {
+    return println(tag, message, null);
+  }
+
+  public static int e(String tag, String message, Throwable throwable) {
+    return printlnError(tag, message, throwable);
+  }
+
+  public static int e(String tag, String message) {
+    return printlnError(tag, message, null);
+  }
+
+  private static int println(String tag, String message, Throwable throwable) {
+    System.out.println("" + tag + ": " + message);
+    if (throwable != null) throwable.printStackTrace();
+    return 0;
+  }
+
+  private static int printlnError(String tag, String message, Throwable throwable) {
+    System.err.println("" + tag + ": " + message);
+    if (throwable != null) throwable.printStackTrace();
+    return 0;
+  }
+}
diff --git a/rtsp/src/test/java/com/pedro/rtsp/rtp/AacPacketTest.kt b/rtsp/src/test/java/com/pedro/rtsp/rtp/AacPacketTest.kt
new file mode 100644
index 0000000..c07cf9a
--- /dev/null
+++ b/rtsp/src/test/java/com/pedro/rtsp/rtp/AacPacketTest.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp
+
+import android.media.MediaCodec
+import com.pedro.rtsp.rtp.packets.AacPacket
+import com.pedro.rtsp.rtp.packets.AudioPacketCallback
+import com.pedro.rtsp.rtsp.RtpFrame
+import com.pedro.rtsp.utils.RtpConstants
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import java.nio.ByteBuffer
+
+/**
+ * Created by pedro on 15/4/22.
+ */
+@RunWith(MockitoJUnitRunner::class)
+class AacPacketTest {
+
+  @Mock
+  private lateinit var audioPacketCallback: AudioPacketCallback
+
+  @Test
+  fun `GIVEN a ByteBuffer raw aac WHEN create a packet THEN get a RTP aac packet`() {
+    val timestamp = 123456789L
+    val fakeAac = ByteArray(300) { 0x00 }
+
+    val info = MediaCodec.BufferInfo()
+    info.presentationTimeUs = timestamp
+    info.offset = 0
+    info.size = fakeAac.size
+    info.flags = 1
+
+    val aacPacket = AacPacket(44100, audioPacketCallback)
+    aacPacket.setPorts(1, 2)
+    aacPacket.setSSRC(123456789)
+    aacPacket.createAndSendPacket(ByteBuffer.wrap(fakeAac), info)
+
+    val expectedRtp = byteArrayOf(-128, -31, 0, 1, 0, 83, 19, 92, 7, 91, -51, 21, 0, 16, 9, 96).plus(fakeAac)
+    val expectedTimeStamp = 5444444L
+    val expectedSize = RtpConstants.RTP_HEADER_LENGTH + info.size + 4
+    val packetResult = RtpFrame(expectedRtp, expectedTimeStamp, expectedSize, 1, 2, RtpConstants.trackAudio)
+
+    verify(audioPacketCallback, times(1)).onAudioFrameCreated(packetResult)
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/test/java/com/pedro/rtsp/rtp/H264PacketTest.kt b/rtsp/src/test/java/com/pedro/rtsp/rtp/H264PacketTest.kt
new file mode 100644
index 0000000..dcce259
--- /dev/null
+++ b/rtsp/src/test/java/com/pedro/rtsp/rtp/H264PacketTest.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp
+
+import android.media.MediaCodec
+import com.pedro.rtsp.rtp.packets.H264Packet
+import com.pedro.rtsp.rtp.packets.VideoPacketCallback
+import com.pedro.rtsp.rtsp.RtpFrame
+import com.pedro.rtsp.utils.RtpConstants
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import java.nio.ByteBuffer
+
+/**
+ * Created by pedro on 15/4/22.
+ */
+@RunWith(MockitoJUnitRunner::class)
+class H264PacketTest {
+
+  @Mock
+  private lateinit var videoPacketCallback: VideoPacketCallback
+
+  @Test
+  fun `GIVEN a small ByteBuffer raw h264 WHEN create a packet THEN get a RTP h264 packet`() {
+    val timestamp = 123456789L
+    val header = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x05)
+    val fakeH264 = header.plus(ByteArray(300) { 0x00 })
+
+    val info = MediaCodec.BufferInfo()
+    info.presentationTimeUs = timestamp
+    info.offset = 0
+    info.size = fakeH264.size
+    info.flags = 1
+
+    val fakeSps = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04)
+    val fakePps = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x0A, 0x0B, 0x0C)
+    val h264Packet = H264Packet(fakeSps, fakePps, videoPacketCallback)
+    h264Packet.setPorts(1, 2)
+    h264Packet.setSSRC(123456789)
+    h264Packet.createAndSendPacket(ByteBuffer.wrap(fakeH264), info)
+
+    val expectedRtp = byteArrayOf(-128, -32, 0, 2, 0, -87, -118, -57, 7, 91, -51, 21, 5).plus(fakeH264.copyOfRange(header.size, fakeH264.size))
+    val expectedStapA = byteArrayOf(-128, -32, 0, 1, 0, -87, -118, -57, 7, 91, -51, 21, 24, 0, 7, 0, 0, 0, 1, 2, 3, 4, 0, 7, 0, 0, 0, 1, 10, 11, 12)
+    val expectedTimeStamp = 11111111L
+    val expectedSize = RtpConstants.RTP_HEADER_LENGTH + 1 + info.size - header.size
+    val expectedStapAResult = RtpFrame(expectedStapA, expectedTimeStamp, fakePps.size + fakePps.size + 5 + RtpConstants.RTP_HEADER_LENGTH, 1, 2, RtpConstants.trackVideo)
+    val expectedPacketResult = RtpFrame(expectedRtp, expectedTimeStamp, expectedSize, 1, 2, RtpConstants.trackVideo)
+
+    val resultValue = argumentCaptor<RtpFrame>()
+    verify(videoPacketCallback, times(2)).onVideoFrameCreated(resultValue.capture())
+    assertNotNull(resultValue)
+    assertTrue(resultValue.allValues.size == 2)
+    assertEquals(expectedStapAResult, resultValue.firstValue)
+    assertEquals(expectedPacketResult, resultValue.secondValue)
+  }
+
+  @Test
+  fun `GIVEN a big ByteBuffer raw h264 WHEN create a packet THEN get a RTP h264 packet`() {
+    val timestamp = 123456789L
+    val header = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x05)
+    val fakeH264 = header.plus(ByteArray(2500) { 0x00 })
+
+    val info = MediaCodec.BufferInfo()
+    info.presentationTimeUs = timestamp
+    info.offset = 0
+    info.size = fakeH264.size
+    info.flags = 1
+
+    val fakeSps = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04)
+    val fakePps = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x0A, 0x0B, 0x0C)
+    val h264Packet = H264Packet(fakeSps, fakePps, videoPacketCallback)
+    h264Packet.setPorts(1, 2)
+    h264Packet.setSSRC(123456789)
+    h264Packet.createAndSendPacket(ByteBuffer.wrap(fakeH264), info)
+
+    val packet1Size = RtpConstants.MTU - 28 - RtpConstants.RTP_HEADER_LENGTH - 2
+    val chunk1 = fakeH264.copyOfRange(header.size, header.size + packet1Size)
+    val chunk2 = fakeH264.copyOfRange(header.size + packet1Size, fakeH264.size)
+    val expectedRtp = byteArrayOf(-128, 96, 0, 2, 0, -87, -118, -57, 7, 91, -51, 21, 28, -123).plus(chunk1)
+    val expectedRtp2 = byteArrayOf(-128, -32, 0, 3, 0, -87, -118, -57, 7, 91, -51, 21, 28, 69).plus(chunk2)
+
+    val expectedStapA = byteArrayOf(-128, -32, 0, 1, 0, -87, -118, -57, 7, 91, -51, 21, 24, 0, 7, 0, 0, 0, 1, 2, 3, 4, 0, 7, 0, 0, 0, 1, 10, 11, 12)
+    val expectedTimeStamp = 11111111L
+    val expectedSize = chunk1.size + RtpConstants.RTP_HEADER_LENGTH + 2
+    val expectedSize2 = chunk2.size + RtpConstants.RTP_HEADER_LENGTH + 2
+    val expectedStapAResult = RtpFrame(expectedStapA, expectedTimeStamp, fakePps.size + fakePps.size + 5 + RtpConstants.RTP_HEADER_LENGTH, 1, 2, RtpConstants.trackVideo)
+
+    val expectedPacketResult = RtpFrame(expectedRtp, expectedTimeStamp, expectedSize, 1, 2, RtpConstants.trackVideo)
+    val expectedPacketResult2 = RtpFrame(expectedRtp2, expectedTimeStamp, expectedSize2, 1, 2, RtpConstants.trackVideo)
+
+    val resultValue = argumentCaptor<RtpFrame>()
+    verify(videoPacketCallback, times(3)).onVideoFrameCreated(resultValue.capture())
+    assertNotNull(resultValue)
+    assertTrue(resultValue.allValues.size == 3)
+    assertEquals(expectedStapAResult, resultValue.firstValue)
+    assertEquals(expectedPacketResult, resultValue.secondValue)
+    assertEquals(expectedPacketResult2, resultValue.thirdValue)
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/test/java/com/pedro/rtsp/rtp/H265PacketTest.kt b/rtsp/src/test/java/com/pedro/rtsp/rtp/H265PacketTest.kt
new file mode 100644
index 0000000..a841c8c
--- /dev/null
+++ b/rtsp/src/test/java/com/pedro/rtsp/rtp/H265PacketTest.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtp
+
+import android.media.MediaCodec
+import com.pedro.rtsp.rtp.packets.H265Packet
+import com.pedro.rtsp.rtp.packets.VideoPacketCallback
+import com.pedro.rtsp.rtsp.RtpFrame
+import com.pedro.rtsp.utils.RtpConstants
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import java.nio.ByteBuffer
+
+/**
+ * Created by pedro on 15/4/22.
+ */
+@RunWith(MockitoJUnitRunner::class)
+class H265PacketTest {
+
+  @Mock
+  private lateinit var videoPacketCallback: VideoPacketCallback
+
+  @Test
+  fun `GIVEN a small ByteBuffer raw h265 WHEN create a packet THEN get a RTP h265 packet`() {
+    val timestamp = 123456789L
+    val header = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x05, 0x00)
+    val fakeH265 = header.plus(ByteArray(300) { 0x00 })
+
+    val info = MediaCodec.BufferInfo()
+    info.presentationTimeUs = timestamp
+    info.offset = 0
+    info.size = fakeH265.size
+    info.flags = 1
+
+    val fakeSps = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04)
+    val fakePps = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x0A, 0x0B, 0x0C)
+    val fakeVps = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x0D, 0x0E, 0x0F)
+    val h265Packet = H265Packet(fakeSps, fakePps, fakeVps, videoPacketCallback)
+    h265Packet.setPorts(1, 2)
+    h265Packet.setSSRC(123456789)
+    h265Packet.createAndSendPacket(ByteBuffer.wrap(fakeH265), info)
+
+    val expectedRtp = byteArrayOf(-128, -32, 0, 2, 0, -87, -118, -57, 7, 91, -51, 21, 5, 0).plus(fakeH265.copyOfRange(header.size, fakeH265.size))
+    val expectedStapA = byteArrayOf(-128, -32, 0, 1, 0, -87, -118, -57, 7, 91, -51, 21, 96, 1, 0, 7, 0, 0, 0, 1, 2, 3, 4, 0, 7, 0, 0, 0, 1, 10, 11, 12)
+    val expectedTimeStamp = 11111111L
+    val expectedSize = RtpConstants.RTP_HEADER_LENGTH + 2 + info.size - header.size
+    val expectedStapAResult = RtpFrame(expectedStapA, expectedTimeStamp, fakePps.size + fakePps.size + 6 + RtpConstants.RTP_HEADER_LENGTH, 1, 2, RtpConstants.trackVideo)
+    val expectedPacketResult = RtpFrame(expectedRtp, expectedTimeStamp, expectedSize, 1, 2, RtpConstants.trackVideo)
+
+    val resultValue = argumentCaptor<RtpFrame>()
+    verify(videoPacketCallback, times(2)).onVideoFrameCreated(resultValue.capture())
+    assertNotNull(resultValue)
+    assertTrue(resultValue.allValues.size == 2)
+    assertEquals(expectedStapAResult, resultValue.firstValue)
+    assertEquals(expectedPacketResult, resultValue.secondValue)
+  }
+
+  @Test
+  fun `GIVEN a big ByteBuffer raw h265 WHEN create a packet THEN get a RTP h265 packet`() {
+    val timestamp = 123456789L
+    val header = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x05, 0x00)
+    val fakeH265 = header.plus(ByteArray(2500) { 0x00 })
+
+    val info = MediaCodec.BufferInfo()
+    info.presentationTimeUs = timestamp
+    info.offset = 0
+    info.size = fakeH265.size
+    info.flags = 1
+
+    val fakeSps = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04)
+    val fakePps = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x0A, 0x0B, 0x0C)
+    val fakeVps = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x0D, 0x0E, 0x0F)
+    val h265Packet = H265Packet(fakeSps, fakePps, fakeVps, videoPacketCallback)
+    h265Packet.setPorts(1, 2)
+    h265Packet.setSSRC(123456789)
+    h265Packet.createAndSendPacket(ByteBuffer.wrap(fakeH265), info)
+
+    val packet1Size = RtpConstants.MTU - 28 - RtpConstants.RTP_HEADER_LENGTH - 3
+    val chunk1 = fakeH265.copyOfRange(header.size, header.size + packet1Size)
+    val chunk2 = fakeH265.copyOfRange(header.size + packet1Size, fakeH265.size)
+    val expectedRtp = byteArrayOf(-128, 96, 0, 2, 0, -87, -118, -57, 7, 91, -51, 21, 98, 1, -126).plus(chunk1)
+    val expectedRtp2 = byteArrayOf(-128, -32, 0, 3, 0, -87, -118, -57, 7, 91, -51, 21, 98, 1, 66).plus(chunk2)
+
+    val expectedStapA = byteArrayOf(-128, -32, 0, 1, 0, -87, -118, -57, 7, 91, -51, 21, 96, 1, 0, 7, 0, 0, 0, 1, 2, 3, 4, 0, 7, 0, 0, 0, 1, 10, 11, 12)
+    val expectedTimeStamp = 11111111L
+    val expectedSize = chunk1.size + RtpConstants.RTP_HEADER_LENGTH + 3
+    val expectedSize2 = chunk2.size + RtpConstants.RTP_HEADER_LENGTH + 3
+    val expectedStapAResult = RtpFrame(expectedStapA, expectedTimeStamp, fakePps.size + fakePps.size + 6 + RtpConstants.RTP_HEADER_LENGTH, 1, 2, RtpConstants.trackVideo)
+
+    val expectedPacketResult = RtpFrame(expectedRtp, expectedTimeStamp, expectedSize, 1, 2, RtpConstants.trackVideo)
+    val expectedPacketResult2 = RtpFrame(expectedRtp2, expectedTimeStamp, expectedSize2, 1, 2, RtpConstants.trackVideo)
+
+    val resultValue = argumentCaptor<RtpFrame>()
+    verify(videoPacketCallback, times(3)).onVideoFrameCreated(resultValue.capture())
+    assertNotNull(resultValue)
+    assertTrue(resultValue.allValues.size == 3)
+    assertEquals(expectedStapAResult, resultValue.firstValue)
+    assertEquals(expectedPacketResult, resultValue.secondValue)
+    assertEquals(expectedPacketResult2, resultValue.thirdValue)
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/test/java/com/pedro/rtsp/rtsp/CommandParserTest.kt b/rtsp/src/test/java/com/pedro/rtsp/rtsp/CommandParserTest.kt
new file mode 100644
index 0000000..4a5d50a
--- /dev/null
+++ b/rtsp/src/test/java/com/pedro/rtsp/rtsp/CommandParserTest.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp
+
+import com.pedro.rtsp.BuildConfig
+import com.pedro.rtsp.rtsp.commands.Command
+import com.pedro.rtsp.rtsp.commands.CommandParser
+import com.pedro.rtsp.rtsp.commands.Method
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * Created by pedro on 14/4/22.
+ */
+class CommandParserTest {
+
+  private val commandParser = CommandParser()
+
+  @Test
+  fun `GIVEN a SETUP command with text from server WHEN parse using udp protocol THEN change server ports`() {
+    val audioClientPorts = intArrayOf(5000, 5001)
+    val videoClientPorts = intArrayOf(5002, 5003)
+    val audioServerPorts = intArrayOf(5004, 5005)
+    val videoServerPorts = intArrayOf(5006, 5007)
+
+    val expectedAudioServerPorts = intArrayOf(5014, 5015)
+    val expectedVideoServerPorts = intArrayOf(5016, 5017)
+    val serverCommandAudio = "RTSP/1.0 200 OK\r\n" +
+        "Date: Fri, 15 Apr 2022 16:16:30 UTC\r\n" +
+        "Expires: Fri, 15 Apr 2022 16:16:30 UTC\r\n" +
+        "Transport: RTP/AVP/UDP;unicast;client_port=${audioClientPorts[0]}-${audioClientPorts[1]};server_port=${expectedAudioServerPorts[0]}-${expectedAudioServerPorts[1]}\r\n" +
+        "Session: 57168112;timeout=60\r\n" +
+        "CSeq: 3\r\n" +
+        "Cache-Control: no-cache\r\n\r\n"
+    val serverCommandVideo = "RTSP/1.0 200 OK\r\n" +
+        "Date: Fri, 15 Apr 2022 16:16:30 UTC\r\n" +
+        "Expires: Fri, 15 Apr 2022 16:16:30 UTC\r\n" +
+        "Transport: RTP/AVP/UDP;unicast;client_port=${videoClientPorts[0]}-${videoClientPorts[1]};server_port=${expectedVideoServerPorts[0]}-${expectedVideoServerPorts[1]}\r\n" +
+        "Session: 57168112;timeout=60\r\n" +
+        "CSeq: 3\r\n" +
+        "Cache-Control: no-cache\r\n\r\n"
+    val commandAudio = Command(Method.SETUP, 1, 200, serverCommandAudio)
+    val commandVideo = Command(Method.SETUP, 1, 200, serverCommandVideo)
+
+    commandParser.loadServerPorts(commandAudio, Protocol.UDP, audioClientPorts, videoClientPorts, audioServerPorts, videoServerPorts)
+    commandParser.loadServerPorts(commandVideo, Protocol.UDP, audioClientPorts, videoClientPorts, audioServerPorts, videoServerPorts)
+    assertArrayEquals(audioServerPorts, expectedAudioServerPorts)
+    assertArrayEquals(videoServerPorts, expectedVideoServerPorts)
+  }
+
+  @Test
+  fun `GIVEN a command with sessionId from server WHEN parse THEN get a sessionId`() {
+    val expectedSessionId = "7d73E09a-096 a?$<>_!.,^+*%&05/()=42"
+    val serverCommand = "RECORD rtsp://192.168.0.196:80/live/pedro RTSP/1.0\r\n" +
+        "Range: npt=0.000-\r\n" +
+        "CSeq: 5\r\n" +
+        "User-Agent: com.pedro.rtsp 2.1.7\r\n" +
+        "Session: $expectedSessionId;timeout=30\r\n\r\n"
+    val command = Command(Method.UNKNOWN, 1, 200, serverCommand)
+    val result = commandParser.getSessionId(command)
+    assertEquals(expectedSessionId, result)
+  }
+
+  @Test
+  fun `GIVEN server command string WHEN parse THEN get a command with cSeq and status`() {
+    val serverCommand = "RTSP/1.0 200 OK\r\n" +
+        "Server: pedroSG94 Server\r\n" +
+        "CSeq: 1\r\n" +
+        "Public: DESCRIBE, SETUP, TEARDOWN, PLAY, PAUSE, ANNOUNCE, RECORD\r\n" +
+        "\r\n"
+    val command = commandParser.parseResponse(Method.OPTIONS, serverCommand)
+    val expectedCommand = Command(Method.OPTIONS, 1, 200, serverCommand)
+    assertEquals(expectedCommand, command)
+  }
+
+  @Test
+  fun `GIVEN pusher or player command string WHEN parse THEN get a command with cSeq and method`() {
+    val pusherCommand = "OPTIONS rtsp://192.168.1.132:554/live/pedro RTSP/1.0\r\n" +
+        "CSeq: 1\r\n" +
+        "User-Agent: ${BuildConfig.LIBRARY_PACKAGE_NAME} ${BuildConfig.VERSION_NAME}\r\n" +
+        "\r\n"
+    val command = commandParser.parseCommand(pusherCommand)
+    val expectedCommand = Command(Method.OPTIONS, 1, -1, pusherCommand)
+    assertEquals(expectedCommand, command)
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/test/java/com/pedro/rtsp/rtsp/SdpBodyTest.kt b/rtsp/src/test/java/com/pedro/rtsp/rtsp/SdpBodyTest.kt
new file mode 100644
index 0000000..254476e
--- /dev/null
+++ b/rtsp/src/test/java/com/pedro/rtsp/rtsp/SdpBodyTest.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.rtsp
+
+import com.pedro.rtsp.rtsp.commands.SdpBody
+import com.pedro.rtsp.utils.RtpConstants
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+/**
+ * Created by pedro on 15/4/22.
+ */
+class SdpBodyTest {
+
+  @Test
+  fun `GIVEN aac info WHEN create aac body THEN get expected string`() {
+    val track = 1
+    val sampleRate = 44100
+    val channels = 2
+
+    val expectedType = "MPEG4-GENERIC/$sampleRate/$channels"
+    val expectedConfig = "config=1210;"
+    val expectedPayload = "a=rtpmap:${RtpConstants.payloadType + track}"
+    val expectedTrack = "a=control:streamid=${track}"
+
+    val result = SdpBody.createAacBody(track, sampleRate, channels == 2)
+    assertTrue(result.contains(expectedType))
+    assertTrue(result.contains(expectedConfig))
+    assertTrue(result.contains(expectedPayload))
+    assertTrue(result.contains(expectedTrack))
+  }
+
+  @Test
+  fun `GIVEN h264 info WHEN create h264 body THEN get expected string`() {
+    val track = 1
+    val sps = "abcd1234"
+    val pps = "efgh5678"
+
+    val expectedType = "H264/${RtpConstants.clockVideoFrequency}"
+    val expectedConfig = "sprop-parameter-sets=$sps,$pps"
+    val expectedPayload = "a=rtpmap:${RtpConstants.payloadType + track}"
+    val expectedTrack = "a=control:streamid=${track}"
+
+    val result = SdpBody.createH264Body(track, sps, pps)
+    assertTrue(result.contains(expectedType))
+    assertTrue(result.contains(expectedConfig))
+    assertTrue(result.contains(expectedPayload))
+    assertTrue(result.contains(expectedTrack))
+  }
+
+  @Test
+  fun `GIVEN h265 info WHEN create h265 body THEN get expected string`() {
+    val track = 1
+    val sps = "abcd1234"
+    val pps = "efgh5678"
+    val vps = "ijk90"
+
+    val expectedType = "H265/${RtpConstants.clockVideoFrequency}"
+    val expectedConfig = "sprop-sps=$sps; sprop-pps=$pps; sprop-vps=$vps"
+    val expectedPayload = "a=rtpmap:${RtpConstants.payloadType + track}"
+    val expectedTrack = "a=control:streamid=${track}"
+
+    val result = SdpBody.createH265Body(track, sps, pps, vps)
+    assertTrue(result.contains(expectedType))
+    assertTrue(result.contains(expectedConfig))
+    assertTrue(result.contains(expectedPayload))
+    assertTrue(result.contains(expectedTrack))
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/test/java/com/pedro/rtsp/utils/AuthUtilTest.kt b/rtsp/src/test/java/com/pedro/rtsp/utils/AuthUtilTest.kt
new file mode 100644
index 0000000..1621efb
--- /dev/null
+++ b/rtsp/src/test/java/com/pedro/rtsp/utils/AuthUtilTest.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.utils
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * Created by pedro on 14/4/22.
+ */
+class AuthUtilTest {
+
+  @Test
+  fun `GIVEN String WHEN generate hash THEN return a MD5 hash String`() {
+    val fakeBuffer = "hello world"
+    val expectedResult = "5eb63bbbe01eeed093cb22bb8f5acdc3"
+    val md5Hash = AuthUtil.getMd5Hash(fakeBuffer)
+    assertEquals(expectedResult, md5Hash)
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/test/java/com/pedro/rtsp/utils/BitrateManagerTest.kt b/rtsp/src/test/java/com/pedro/rtsp/utils/BitrateManagerTest.kt
new file mode 100644
index 0000000..723eaed
--- /dev/null
+++ b/rtsp/src/test/java/com/pedro/rtsp/utils/BitrateManagerTest.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.utils
+
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+
+
+/**
+ * Created by pedro on 14/4/22.
+ */
+@RunWith(MockitoJUnitRunner::class)
+class BitrateManagerTest {
+
+  @Mock
+  private lateinit var connectCheckerRtsp: ConnectCheckerRtsp
+
+  @Test
+  fun `WHEN set multiple values THEN return total of values each second`() {
+    val bitrateManager = BitrateManager(connectCheckerRtsp)
+    val fakeValues = arrayOf(100L, 200L, 300L, 400L, 500L)
+    var expectedResult = 0L
+    fakeValues.forEach {
+      bitrateManager.calculateBitrate(it)
+      expectedResult += it
+    }
+    Thread.sleep(1000)
+    val value = 100L
+    bitrateManager.calculateBitrate(value)
+    expectedResult += value
+    val resultValue = argumentCaptor<Long>()
+    verify(connectCheckerRtsp, times(1)).onNewBitrateRtsp(resultValue.capture())
+    val marginError = 20
+    assertTrue(expectedResult - marginError <= resultValue.firstValue && resultValue.firstValue <= expectedResult + marginError)
+  }
+}
\ No newline at end of file
diff --git a/rtsp/src/test/java/com/pedro/rtsp/utils/ExtensionsTest.kt b/rtsp/src/test/java/com/pedro/rtsp/utils/ExtensionsTest.kt
new file mode 100644
index 0000000..97895e6
--- /dev/null
+++ b/rtsp/src/test/java/com/pedro/rtsp/utils/ExtensionsTest.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2021 pedroSG94.
+ *
+ * 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 com.pedro.rtsp.utils
+
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import java.nio.ByteBuffer
+
+/**
+ * Created by pedro on 14/4/22.
+ */
+class ExtensionsTest {
+
+  @Test
+  fun `GIVEN a ByteArray WHEN encode THEN get a base64 String`() {
+    val fakeBytes = byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01)
+    val expectedString = "AAAAAQEAAAABAQ=="
+    val result = fakeBytes.encodeToString()
+    assertEquals(expectedString, result)
+  }
+
+  @Test
+  fun `GIVEN a ByteBuffer WHEN get data THEN get bytearray without startVideoCode`() {
+    val fakeByteBuffer = ByteBuffer.wrap(byteArrayOf(0x00, 0x00, 0x00, 0x01, 0x01))
+    val expectedResult = byteArrayOf(0x01)
+    val result = fakeByteBuffer.getData()
+    assertArrayEquals(expectedResult, result)
+  }
+
+  @Test
+  fun `GIVEN ByteArray WHEN set long value in a position with a limit THEN get array with long put`() {
+    val fakeBuffer = byteArrayOf(0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0)
+    val expectedResult = byteArrayOf(0, 0, 0, -106, 0, 0, 0, 0, 0, 0, 0, 0)
+    val value = 150L
+    fakeBuffer.setLong(value, 0, 4)
+    assertArrayEquals(expectedResult, fakeBuffer)
+  }
+
+  @Test
+  fun `GIVEN ByteBuffer WHEN video start code has 3 bytes THEN return 3`() {
+    val fakeBuffer = ByteBuffer.wrap(byteArrayOf(0x0, 0x0, 0x1, 0x0))
+    val index = fakeBuffer.getVideoStartCodeSize()
+    assertEquals(3, index)
+  }
+
+  @Test
+  fun `GIVEN ByteBuffer WHEN video start code has 4 bytes THEN return 4`() {
+    val fakeBuffer = ByteBuffer.wrap(byteArrayOf(0x0, 0x0, 0x0, 0x1, 0x0))
+    val index = fakeBuffer.getVideoStartCodeSize()
+    assertEquals(4, index)
+  }
+
+  @Test
+  fun `GIVEN ByteBuffer WHEN video start code not found THEN return 0`() {
+    val fakeBuffer = ByteBuffer.wrap(byteArrayOf(0x0, 0x0, 0x0, 0x0, 0x0))
+    val index = fakeBuffer.getVideoStartCodeSize()
+    assertEquals(0, index)
+  }
+}
\ No newline at end of file

From 82dae368e08b8a51d9c737b11b0d03b8ef9ee92f Mon Sep 17 00:00:00 2001
From: Schoumi <anthony@mob-dev.fr>
Date: Thu, 14 Jul 2022 13:33:30 +0200
Subject: [PATCH 2/5] fix stream orientation

---
 .idea/misc.xml                                |  2 +-
 .../peertubelive/activity/StreamActivity.kt   | 15 ++++++-----
 .../encoder/input/gl/render/ScreenRender.java |  6 ++---
 .../input/gl/render/SimpleCameraRender.java   |  2 +-
 .../encoder/utils/gl/SizeCalculator.java      | 20 +++++++-------
 .../com/pedro/encoder/video/VideoEncoder.java | 20 +++++++++++---
 .../pedro/rtplibrary/base/Camera2Base.java    | 27 ++++++++++++++-----
 7 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9bbb4ab..9a056b0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="app/src/main/res/layout/stream.xml" value="0.1983695652173913" />
+        <entry key="../../../../../layout/custom_preview.xml" value="0.14448441247002397" />
       </map>
     </option>
   </component>
diff --git a/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt b/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt
index ad52aa5..73d641e 100644
--- a/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt
+++ b/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt
@@ -53,7 +53,7 @@ class StreamActivity : AppCompatActivity() {
     private var screenOrientation: Int = 0
     private var lastScreenOrientation: Int = 0
     private var orientationCounter: Int = 0
-    private var rotationIsLanternEnabled: Boolean = true
+    private var rotationIsEnabled: Boolean = true
 
     companion object {
         const val BACKGROUND :Int = 1
@@ -71,8 +71,9 @@ class StreamActivity : AppCompatActivity() {
 
         orientationEventListener = object: OrientationEventListener(this, SensorManager.SENSOR_DELAY_NORMAL){
             override fun onOrientationChanged(orientation: Int) {
-                if(orientation < 0 || !rotationIsLanternEnabled)
+                if(orientation < 0 || !rotationIsEnabled) {
                     return
+                }
                 var localOrientation: Int
                 localOrientation = when (orientation) {
                     in 45..135 -> {
@@ -108,6 +109,7 @@ class StreamActivity : AppCompatActivity() {
                     binding.flash.rotation = localOrientation.toFloat()
                     binding.muteMicro.rotation = localOrientation.toFloat()
                     binding.switchCamera.rotation = localOrientation.toFloat()
+                    binding.rotation.rotation = localOrientation.toFloat()
                 }
             }
         }
@@ -144,12 +146,12 @@ class StreamActivity : AppCompatActivity() {
         binding.flash.visibility = View.GONE
 
         binding.rotation.setOnClickListener {
-            if (rotationIsLanternEnabled) {
-                rotationIsLanternEnabled = !rotationIsLanternEnabled
+            if (rotationIsEnabled) {
+                rotationIsEnabled = !rotationIsEnabled
                 binding.rotation.setImageResource(R.drawable.baseline_screen_lock_rotation_24)
             }
             else {
-                rotationIsLanternEnabled = !rotationIsLanternEnabled
+                rotationIsEnabled = !rotationIsEnabled
                 binding.rotation.setImageResource(R.drawable.baseline_screen_rotation_24)
             }
         }
@@ -351,7 +353,8 @@ class StreamActivity : AppCompatActivity() {
 
 //start stream
 
-        if (rtmpCamera2.prepareAudio() && rtmpCamera2.prepareVideo(width,height,30, (width*height*30*0.076).toInt(),CameraHelper.getCameraOrientation(this))) {
+        if (rtmpCamera2.prepareAudio() && rtmpCamera2.prepareVideo(width,height,30, (width*height*30*0.076).toInt(),CameraHelper.getCameraOrientation(this),true)) {
+            println("peertubeurl "+streamData.url+"/"+streamData.key)
             rtmpCamera2.startStream(streamData.url+"/"+streamData.key)
         } else {
             /**This device cant init encoders, this could be for 2 reasons: The encoder selected doesnt support any configuration setted or your device hasnt a H264 or AAC encoder (in this case you can see log error valid encoder not found) */
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
index a2ede8d..0210ad7 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
@@ -95,7 +95,7 @@ public class ScreenRender {
       boolean flipStreamVertical, boolean flipStreamHorizontal) {
     GlUtil.checkGlError("drawScreen start");
 
-    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical, MVPMatrix);
+    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical,width,height,true,keepAspectRatio, MVPMatrix);
     SizeCalculator.calculateViewPort(keepAspectRatio, mode, width, height, streamWidth,
         streamHeight);
 
@@ -106,7 +106,7 @@ public class ScreenRender {
       boolean flipStreamVertical, boolean flipStreamHorizontal) {
     GlUtil.checkGlError("drawScreen start");
 
-    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical, MVPMatrix);
+    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical,width, height, isPortrait,false, MVPMatrix);
     SizeCalculator.calculateViewPortEncoder(width, height, isPortrait);
 
     draw(width, height);
@@ -116,7 +116,7 @@ public class ScreenRender {
       int mode, int rotation, boolean flipStreamVertical, boolean flipStreamHorizontal) {
     GlUtil.checkGlError("drawScreen start");
 
-    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical, MVPMatrix);
+    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical, width, height, isPortrait,true, MVPMatrix);
     float factor = (float) streamWidth / (float) streamHeight;
     int w;
     int h;
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
index 574a16f..e4435ab 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
@@ -105,7 +105,7 @@ public class SimpleCameraRender {
     GlUtil.checkGlError("drawFrame start");
     surfaceTexture.getTransformMatrix(STMatrix);
 
-    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical, MVPMatrix);
+    SizeCalculator.processMatrix(rotation, flipStreamHorizontal, flipStreamVertical, width, height, true, false, MVPMatrix);
     SizeCalculator.calculateViewPort(keepAspectRatio, mode, width, height, streamWidth,
         streamHeight);
 
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java b/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
index 064f09f..4fa62b1 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
@@ -96,13 +96,14 @@ public class SizeCalculator {
       }
       return new Pair<>(new Point(xo, yo), new Point(xf, yf));
     } else {
-      return new Pair<>(new Point(0, 0), new Point(previewWidth, previewHeight));
+      //return new Pair<>(new Point(0, 0), new Point(previewWidth,previewHeight));
+      return new Pair<>(new Point(0, 0), new Point(previewHeight, previewWidth));
     }
   }
 
   public static void processMatrix(int rotation, boolean flipStreamHorizontal,
-      boolean flipStreamVertical, float[] MVPMatrix) {
-    PointF scale = new PointF(1f, 1f);
+      boolean flipStreamVertical, int width, int height, boolean isPortrait, boolean isPreview, float[] MVPMatrix) {
+    PointF scale = getScale(rotation,width,height, isPortrait, isPreview);
 
     float xFlip = flipStreamHorizontal ? -1f : 1f;
     float yFlip = flipStreamVertical ? -1f : 1f;
@@ -117,18 +118,17 @@ public class SizeCalculator {
     Matrix.rotateM(MVPMatrix, 0, rotation, 0f, 0f, -1f);
   }
 
-  private static PointF getScale(int rotation, int width, int height, boolean isPortrait,
-      boolean isPreview) {
+  private static PointF getScale(int rotation, int width, int height, boolean isPortrait, boolean isPreview) {
     float scaleX = 1f;
     float scaleY = 1f;
     if (!isPreview) {
-      if (isPortrait && rotation != 0 && rotation != 180) { //portrait
+      if (isPortrait && rotation != 90 && rotation != 270) { //portrait
         final float adjustedWidth = width * (width / (float) height);
-        scaleY = adjustedWidth / height;
-      } else if (!isPortrait && rotation != 90 && rotation != 270) { //landscape
+        scaleX = adjustedWidth / height;
+      } /*else if (isPortrait && rotation != 0 && rotation != 180) { //landscape
         final float adjustedWidth = height * (height / (float) width);
-        scaleX = adjustedWidth / width;
-      }
+        scaleY = adjustedWidth / width;
+      }*/
     }
     return new PointF(scaleX, scaleY);
   }
diff --git a/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java b/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java
index 56b5911..4d4cdfe 100644
--- a/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java
+++ b/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java
@@ -77,7 +77,20 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
   public boolean prepareVideoEncoder(int width, int height, int fps, int bitRate, int rotation,
       int iFrameInterval, FormatVideoEncoder formatVideoEncoder) {
     return prepareVideoEncoder(width, height, fps, bitRate, rotation, iFrameInterval,
-        formatVideoEncoder, -1, -1);
+        formatVideoEncoder, -1, -1, false);
+  }
+
+  public boolean prepareVideoEncoder(int width, int height, int fps, int bitRate, int rotation,
+                                     int iFrameInterval, FormatVideoEncoder formatVideoEncoder, boolean landscape) {
+    return prepareVideoEncoder(width, height, fps, bitRate, rotation, iFrameInterval,
+            formatVideoEncoder, -1, -1, landscape);
+  }
+
+  public boolean prepareVideoEncoder(int width, int height, int fps, int bitRate, int rotation,
+                                     int iFrameInterval, FormatVideoEncoder formatVideoEncoder, int avcProfile,
+                                     int avcProfileLevel) {
+    return prepareVideoEncoder(width, height, fps, bitRate, rotation, iFrameInterval,
+            formatVideoEncoder, avcProfile, avcProfileLevel, false);
   }
 
   /**
@@ -85,7 +98,7 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
    */
   public boolean prepareVideoEncoder(int width, int height, int fps, int bitRate, int rotation,
       int iFrameInterval, FormatVideoEncoder formatVideoEncoder, int avcProfile,
-      int avcProfileLevel) {
+      int avcProfileLevel, boolean landscape) {
     this.width = width;
     this.height = height;
     this.fps = fps;
@@ -116,10 +129,11 @@ public class VideoEncoder extends BaseEncoder implements GetCameraData {
       //if you dont use mediacodec rotation you need swap width and height in rotation 90 or 270
       // for correct encoding resolution
       String resolution;
-      if ((rotation == 90 || rotation == 270)) {
+      if (!landscape && (rotation == 90 || rotation == 270)) {
         resolution = height + "x" + width;
         videoFormat = MediaFormat.createVideoFormat(type, height, width);
       } else {
+        System.out.println("resolution "+width+"x"+height);
         resolution = width + "x" + height;
         videoFormat = MediaFormat.createVideoFormat(type, width, height);
       }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
index e100706..4010c44 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
@@ -318,6 +318,7 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
       stopPreview();
       onPreview = true;
     }
+
     boolean result = videoEncoder.prepareVideoEncoder(width, height, fps, bitrate, rotation,
         iFrameInterval, FormatVideoEncoder.SURFACE, avcProfile, avcProfileLevel);
     prepareCameraManager();
@@ -325,20 +326,34 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
   }
 
   public boolean prepareVideo(int width, int height, int fps, int bitrate, int iFrameInterval,
-      int rotation) {
-    return prepareVideo(width, height, fps, bitrate, iFrameInterval, rotation, -1, -1);
+                              int rotation, int avcProfile, int avcProfileLevel, boolean landscape) {
+    if (onPreview && glInterface != null && (width != previewWidth || height != previewHeight
+            || fps != videoEncoder.getFps() || rotation != videoEncoder.getRotation())) {
+      stopPreview();
+      onPreview = true;
+    }
+
+    boolean result = videoEncoder.prepareVideoEncoder(width, height, fps, bitrate, rotation,
+            iFrameInterval, FormatVideoEncoder.SURFACE, avcProfile, avcProfileLevel,landscape);
+    prepareCameraManager();
+    return result;
+  }
+
+  public boolean prepareVideo(int width, int height, int fps, int bitrate, int iFrameInterval,
+      int rotation, boolean landscape) {
+    return prepareVideo(width, height, fps, bitrate, iFrameInterval, rotation, -1, -1,landscape);
   }
 
   /**
    * backward compatibility reason
    */
-  public boolean prepareVideo(int width, int height, int fps, int bitrate, int rotation) {
-    return prepareVideo(width, height, fps, bitrate, 2, rotation);
+  public boolean prepareVideo(int width, int height, int fps, int bitrate, int rotation, boolean landscape) {
+    return prepareVideo(width, height, fps, bitrate, 2, rotation,landscape);
   }
 
   public boolean prepareVideo(int width, int height, int bitrate) {
     int rotation = CameraHelper.getCameraOrientation(context);
-    return prepareVideo(width, height, 30, bitrate, 2, rotation);
+    return prepareVideo(width, height, 30, bitrate, 2, rotation, false);
   }
 
   protected abstract void prepareAudioRtp(boolean isStereo, int sampleRate);
@@ -385,7 +400,7 @@ public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrop
    */
   public boolean prepareVideo() {
     int rotation = CameraHelper.getCameraOrientation(context);
-    return prepareVideo(640, 480, 30, 1200 * 1024, rotation);
+    return prepareVideo(640, 480, 30, 1200 * 1024, rotation,false);
   }
 
   /**

From 556bca46222eedb1715ff2aa73124f38019e60eb Mon Sep 17 00:00:00 2001
From: Schoumi <anthony@mob-dev.fr>
Date: Thu, 14 Jul 2022 13:38:36 +0200
Subject: [PATCH 3/5] Update ci to woodpecker

---
 .woodpecker.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .woodpecker.yml

diff --git a/.woodpecker.yml b/.woodpecker.yml
new file mode 100644
index 0000000..a3f4ee7
--- /dev/null
+++ b/.woodpecker.yml
@@ -0,0 +1,5 @@
+pipeline:
+  build:
+    image: eclipse-temurin:11
+    commands:
+      - bash ./gradlew assembleDebug

From 3abf6c3554aa591863519f95cd0bc6a56b4c338d Mon Sep 17 00:00:00 2001
From: Schoumi <anthony@mob-dev.fr>
Date: Thu, 14 Jul 2022 13:38:36 +0200
Subject: [PATCH 4/5] Update ci to woodpecker

---
 .drone.yml      | 9 ---------
 .woodpecker.yml | 4 ++++
 2 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 .drone.yml

diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 7939515..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-kind: pipeline
-type: exec
-name: default
-
-steps:
-- name: build
-  commands:
-  - bash ./gradlew assembleDebug
diff --git a/.woodpecker.yml b/.woodpecker.yml
index a3f4ee7..96b0754 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -3,3 +3,7 @@ pipeline:
     image: eclipse-temurin:11
     commands:
       - bash ./gradlew assembleDebug
+    environment:
+      - ANDROID_HOME=/mnt/sdk
+    volumes:
+      - /home/woodpecker/sdk:/mnt/sdk

From cfffa2e41809a3a16770c6d3831bb7358cd060d8 Mon Sep 17 00:00:00 2001
From: Schoumi <anthony@mob-dev.fr>
Date: Tue, 4 Oct 2022 17:31:53 +0200
Subject: [PATCH 5/5] Fix some rotation issue

---
 .../peertubelive/activity/StreamActivity.kt   | 105 ++++++++++--------
 1 file changed, 57 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt b/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt
index 73d641e..36334d9 100644
--- a/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt
+++ b/app/src/main/java/fr/mobdev/peertubelive/activity/StreamActivity.kt
@@ -38,6 +38,8 @@ import fr.mobdev.peertubelive.R
 import fr.mobdev.peertubelive.databinding.StreamBinding
 import fr.mobdev.peertubelive.manager.InstanceManager.EXTRA_DATA
 import fr.mobdev.peertubelive.objects.StreamData
+import java.util.*
+import kotlin.collections.ArrayList
 
 class StreamActivity : AppCompatActivity() {
 
@@ -50,11 +52,12 @@ class StreamActivity : AppCompatActivity() {
     private var surfaceInit: Boolean = false
     private var permissionGiven: Boolean = false
     private var streamIsActive: Boolean = false
-    private var screenOrientation: Int = 0
+    private var screenOrientation: Int = -1
     private var lastScreenOrientation: Int = 0
-    private var orientationCounter: Int = 0
     private var rotationIsEnabled: Boolean = true
 
+    private var orientationTimer: Timer = Timer()
+
     companion object {
         const val BACKGROUND :Int = 1
         const val LOCK :Int = 2
@@ -69,48 +72,11 @@ class StreamActivity : AppCompatActivity() {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         binding = DataBindingUtil.setContentView(this, R.layout.stream)
 
+
+
         orientationEventListener = object: OrientationEventListener(this, SensorManager.SENSOR_DELAY_NORMAL){
             override fun onOrientationChanged(orientation: Int) {
-                if(orientation < 0 || !rotationIsEnabled) {
-                    return
-                }
-                var localOrientation: Int
-                localOrientation = when (orientation) {
-                    in 45..135 -> {
-                        90
-                    }
-                    in 135..225 -> {
-                        180
-                    }
-                    in 225..315 -> {
-                        270
-                    }
-                    else -> {
-                        0
-                    }
-                }
-
-                if(localOrientation != lastScreenOrientation) {
-                    lastScreenOrientation = localOrientation
-                    orientationCounter = 0
-                } else {
-                    orientationCounter++
-                }
-
-                if (lastScreenOrientation != screenOrientation && orientationCounter > 30) {
-                    screenOrientation = lastScreenOrientation
-                    rtmpCamera2.glInterface.setStreamRotation(screenOrientation)
-
-                    if (screenOrientation == 90) {
-                        localOrientation = 270
-                    } else if(screenOrientation == 270) {
-                        localOrientation = 90
-                    }
-                    binding.flash.rotation = localOrientation.toFloat()
-                    binding.muteMicro.rotation = localOrientation.toFloat()
-                    binding.switchCamera.rotation = localOrientation.toFloat()
-                    binding.rotation.rotation = localOrientation.toFloat()
-                }
+                handlerOrientation(orientation)
             }
         }
         orientationEventListener.enable()
@@ -146,14 +112,11 @@ class StreamActivity : AppCompatActivity() {
         binding.flash.visibility = View.GONE
 
         binding.rotation.setOnClickListener {
-            if (rotationIsEnabled) {
-                rotationIsEnabled = !rotationIsEnabled
+            if (rotationIsEnabled)
                 binding.rotation.setImageResource(R.drawable.baseline_screen_lock_rotation_24)
-            }
-            else {
-                rotationIsEnabled = !rotationIsEnabled
+            else
                 binding.rotation.setImageResource(R.drawable.baseline_screen_rotation_24)
-            }
+            rotationIsEnabled = !rotationIsEnabled
         }
         binding.rotation.visibility = View.GONE
         binding.surfaceView.holder.addCallback(object: SurfaceHolder.Callback {
@@ -262,6 +225,52 @@ class StreamActivity : AppCompatActivity() {
         }
     }
 
+    private fun handlerOrientation(orientation: Int) {
+        if(orientation < 0 || !rotationIsEnabled) {
+            return
+        }
+        var localOrientation: Int
+        localOrientation = when (orientation) {
+            in 45..135 -> {
+                90
+            }
+            in 135..225 -> {
+                180
+            }
+            in 225..315 -> {
+                270
+            }
+            else -> {
+                0
+            }
+        }
+
+        if(localOrientation != lastScreenOrientation) {
+            lastScreenOrientation = localOrientation
+            orientationTimer.cancel()
+            orientationTimer.purge()
+            orientationTimer = Timer()
+            orientationTimer.schedule(object : TimerTask() {
+                override fun run() {
+                    if (lastScreenOrientation != screenOrientation) {
+                        screenOrientation = lastScreenOrientation
+                        rtmpCamera2.glInterface.setStreamRotation(screenOrientation)
+
+                        if (screenOrientation == 90) {
+                            localOrientation = 270
+                        } else if(screenOrientation == 270) {
+                            localOrientation = 90
+                        }
+                        binding.flash.rotation = localOrientation.toFloat()
+                        binding.muteMicro.rotation = localOrientation.toFloat()
+                        binding.switchCamera.rotation = localOrientation.toFloat()
+                        binding.rotation.rotation = localOrientation.toFloat()
+                    }
+                }
+            },3000)
+        }
+    }
+
     private fun startStream() {
         streamIsActive = true
         binding.permissionInfo.visibility = View.GONE