Modify sea into yasea

Signed-off-by: Leo Ma <[email protected]>

README.md

@@ -16,6 +16,6 @@ You may watch the live broadcast at [srs.net](http://www.ossrs.net/players/srs_p
 player. So you need to open the player first and then publish to see the effect.
 
 **NOTE2** since this project has been a bit popular, you had better NOT use the
-default provided public URL such as `rtmp://ossrs.net:1935/live/sea`, try something
+default provided public URL such as `rtmp://ossrs.net:1935/live/yasea`, try something
 different like `rtmp://ossrs.net:1935/begeekmyfriend/puppydog` to avoid conflict.
 Otherwise the server may well cut off the connection.

app/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "23.0.2"
 
     defaultConfig {
-        applicationId "net.ossrs.sea"
+        applicationId "net.ossrs.yasea"
         minSdkVersion 16
         targetSdkVersion 22
         versionCode 1

app/src/androidTest/java/net/ossrs/sea/ApplicationTest.java → app/src/androidTest/java/net/ossrs/yasea/ApplicationTest.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea;
+package net.ossrs.yasea;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
@@ -10,4 +10,4 @@ public class ApplicationTest extends ApplicationTestCase<Application> {
     public ApplicationTest() {
         super(Application.class);
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.ossrs.sea">
+    package="net.ossrs.yasea">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -20,4 +20,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/net/ossrs/sea/MainActivity.java → app/src/main/java/net/ossrs/yasea/MainActivity.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea;
+package net.ossrs.yasea;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
@@ -18,7 +18,7 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
-import net.ossrs.sea.rtmp.RtmpPublisher;
+import net.ossrs.yasea.rtmp.RtmpPublisher;
 
 import java.io.IOException;
 import java.util.List;

app/src/main/java/net/ossrs/sea/SrsEncoder.java → app/src/main/java/net/ossrs/yasea/SrsEncoder.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea;
+package net.ossrs.yasea;
 
 import android.graphics.ImageFormat;
 import android.media.AudioFormat;
@@ -8,7 +8,7 @@
 import android.media.MediaFormat;
 import android.util.Log;
 
-import net.ossrs.sea.rtmp.RtmpPublisher;
+import net.ossrs.yasea.rtmp.RtmpPublisher;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -550,4 +550,4 @@ private static String getRandomAlphaDigitString(int length) {
         }
         return sb.toString();
     }
-}
+}

app/src/main/java/net/ossrs/sea/SrsFlvMuxer.java → app/src/main/java/net/ossrs/yasea/SrsFlvMuxer.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea;
+package net.ossrs.yasea;
 
 import android.media.MediaCodec;
 import android.media.MediaFormat;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import net.ossrs.sea.rtmp.RtmpPublisher;
+import net.ossrs.yasea.rtmp.RtmpPublisher;
 
 /**
  * Created by winlin on 5/2/15.
@@ -20,7 +20,7 @@
  * @see android.media.MediaMuxer https://developer.android.com/reference/android/media/MediaMuxer.html
  *
  * Usage:
- *      muxer = new SrsRtmp("rtmp://ossrs.net/live/sea");
+ *      muxer = new SrsRtmp("rtmp://ossrs.net/live/yasea");
  *      muxer.start();
  *
  *      MediaFormat aformat = MediaFormat.createAudioFormat(MediaFormat.MIMETYPE_AUDIO_AAC, asample_rate, achannel);

app/src/main/java/net/ossrs/sea/SrsRtmpPublisher.java → app/src/main/java/net/ossrs/yasea/SrsRtmpPublisher.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea;
+package net.ossrs.yasea;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;

app/src/main/java/net/ossrs/sea/rtmp/Crypto.java → app/src/main/java/net/ossrs/yasea/rtmp/Crypto.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea.rtmp;
+package net.ossrs.yasea.rtmp;
 
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;

app/src/main/java/net/ossrs/sea/rtmp/RtmpPublisher.java → app/src/main/java/net/ossrs/yasea/rtmp/RtmpPublisher.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea.rtmp;
+package net.ossrs.yasea.rtmp;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;

app/src/main/java/net/ossrs/sea/rtmp/Util.java → app/src/main/java/net/ossrs/yasea/rtmp/Util.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea.rtmp;
+package net.ossrs.yasea.rtmp;
 
 import java.io.IOException;
 import java.io.InputStream;

app/src/main/java/net/ossrs/sea/rtmp/amf/AmfArray.java → app/src/main/java/net/ossrs/yasea/rtmp/amf/AmfArray.java

@@ -1,11 +1,12 @@
-package net.ossrs.sea.rtmp.amf;
+package net.ossrs.yasea.rtmp.amf;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
-import net.ossrs.sea.rtmp.Util;
+
+import net.ossrs.yasea.rtmp.Util;
 
 /**
  * AMF Array

app/src/main/java/net/ossrs/sea/rtmp/amf/AmfBoolean.java → app/src/main/java/net/ossrs/yasea/rtmp/amf/AmfBoolean.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea.rtmp.amf;
+package net.ossrs.yasea.rtmp.amf;
 
 import java.io.IOException;
 import java.io.InputStream;

app/src/main/java/net/ossrs/sea/rtmp/amf/AmfData.java → app/src/main/java/net/ossrs/yasea/rtmp/amf/AmfData.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea.rtmp.amf;
+package net.ossrs.yasea.rtmp.amf;
 
 import java.io.IOException;
 import java.io.InputStream;

app/src/main/java/net/ossrs/sea/rtmp/amf/AmfDecoder.java → app/src/main/java/net/ossrs/yasea/rtmp/amf/AmfDecoder.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea.rtmp.amf;
+package net.ossrs.yasea.rtmp.amf;
 
 import java.io.IOException;
 import java.io.InputStream;

app/src/main/java/net/ossrs/sea/rtmp/amf/AmfMap.java → app/src/main/java/net/ossrs/yasea/rtmp/amf/AmfMap.java

@@ -1,10 +1,11 @@
-package net.ossrs.sea.rtmp.amf;
+package net.ossrs.yasea.rtmp.amf;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Map;
-import net.ossrs.sea.rtmp.Util;
+
+import net.ossrs.yasea.rtmp.Util;
 
 /**
  * AMF map; that is, an "object"-like structure of key/value pairs, but with 

app/src/main/java/net/ossrs/sea/rtmp/amf/AmfNull.java → app/src/main/java/net/ossrs/yasea/rtmp/amf/AmfNull.java

@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package net.ossrs.sea.rtmp.amf;
+package net.ossrs.yasea.rtmp.amf;
 
 import java.io.IOException;
 import java.io.InputStream;

app/src/main/java/net/ossrs/sea/rtmp/amf/AmfNumber.java → app/src/main/java/net/ossrs/yasea/rtmp/amf/AmfNumber.java

@@ -1,9 +1,10 @@
-package net.ossrs.sea.rtmp.amf;
+package net.ossrs.yasea.rtmp.amf;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import net.ossrs.sea.rtmp.Util;
+
+import net.ossrs.yasea.rtmp.Util;
 
 /**
  * AMF0 Number data type

app/src/main/java/net/ossrs/sea/rtmp/amf/AmfObject.java → app/src/main/java/net/ossrs/yasea/rtmp/amf/AmfObject.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea.rtmp.amf;
+package net.ossrs.yasea.rtmp.amf;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;

app/src/main/java/net/ossrs/sea/rtmp/amf/AmfString.java → app/src/main/java/net/ossrs/yasea/rtmp/amf/AmfString.java

@@ -1,12 +1,14 @@
-package net.ossrs.sea.rtmp.amf;
+package net.ossrs.yasea.rtmp.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 net.ossrs.sea.rtmp.Util;
+
+import net.ossrs.yasea.rtmp.Util;
 
 /**
  *

app/src/main/java/net/ossrs/sea/rtmp/amf/AmfType.java → app/src/main/java/net/ossrs/yasea/rtmp/amf/AmfType.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea.rtmp.amf;
+package net.ossrs.yasea.rtmp.amf;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/net/ossrs/sea/rtmp/amf/AmfUndefined.java → app/src/main/java/net/ossrs/yasea/rtmp/amf/AmfUndefined.java

@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package net.ossrs.sea.rtmp.amf;
+package net.ossrs.yasea.rtmp.amf;
 
 import java.io.IOException;
 import java.io.InputStream;

app/src/main/java/net/ossrs/sea/rtmp/io/ChunkStreamInfo.java → app/src/main/java/net/ossrs/yasea/rtmp/io/ChunkStreamInfo.java

@@ -1,16 +1,17 @@
-package net.ossrs.sea.rtmp.io;
+package net.ossrs.yasea.rtmp.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import net.ossrs.sea.rtmp.Util;
-import net.ossrs.sea.rtmp.packets.RtmpHeader;
+
+import net.ossrs.yasea.rtmp.Util;
+import net.ossrs.yasea.rtmp.packets.RtmpHeader;
 
 /**
  * Chunk stream channel information
  * 
- * @author francois
+ * @author francois, leo
  */
 public class ChunkStreamInfo {
 

app/src/main/java/net/ossrs/sea/rtmp/io/PacketRxHandler.java → app/src/main/java/net/ossrs/yasea/rtmp/io/PacketRxHandler.java

@@ -1,6 +1,6 @@
-package net.ossrs.sea.rtmp.io;
+package net.ossrs.yasea.rtmp.io;
 
-import net.ossrs.sea.rtmp.packets.RtmpPacket;
+import net.ossrs.yasea.rtmp.packets.RtmpPacket;
 
 /**
  * Handler interface for received RTMP packets

app/src/main/java/net/ossrs/sea/rtmp/io/ReadThread.java → app/src/main/java/net/ossrs/yasea/rtmp/io/ReadThread.java

@@ -1,11 +1,13 @@
-package net.ossrs.sea.rtmp.io;
+package net.ossrs.yasea.rtmp.io;
 
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.SocketException;
+
 import android.util.Log;
-import net.ossrs.sea.rtmp.packets.RtmpPacket;
+
+import net.ossrs.yasea.rtmp.packets.RtmpPacket;
 
 /**
  * RTMPConnection's read thread

app/src/main/java/net/ossrs/sea/rtmp/io/RtmpConnection.java → app/src/main/java/net/ossrs/yasea/rtmp/io/RtmpConnection.java

@@ -1,4 +1,4 @@
-package net.ossrs.sea.rtmp.io;
+package net.ossrs.yasea.rtmp.io;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -14,23 +14,25 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.concurrent.atomic.AtomicInteger;
+
 import android.util.Log;
-import net.ossrs.sea.rtmp.RtmpPublisher;
-import net.ossrs.sea.rtmp.amf.AmfMap;
-import net.ossrs.sea.rtmp.amf.AmfNull;
-import net.ossrs.sea.rtmp.amf.AmfNumber;
-import net.ossrs.sea.rtmp.amf.AmfObject;
-import net.ossrs.sea.rtmp.amf.AmfString;
-import net.ossrs.sea.rtmp.packets.Abort;
-import net.ossrs.sea.rtmp.packets.Acknowledgement;
-import net.ossrs.sea.rtmp.packets.Data;
-import net.ossrs.sea.rtmp.packets.Handshake;
-import net.ossrs.sea.rtmp.packets.Command;
-import net.ossrs.sea.rtmp.packets.Audio;
-import net.ossrs.sea.rtmp.packets.Video;
-import net.ossrs.sea.rtmp.packets.UserControl;
-import net.ossrs.sea.rtmp.packets.RtmpPacket;
-import net.ossrs.sea.rtmp.packets.WindowAckSize;
+
+import net.ossrs.yasea.rtmp.RtmpPublisher;
+import net.ossrs.yasea.rtmp.amf.AmfMap;
+import net.ossrs.yasea.rtmp.amf.AmfNull;
+import net.ossrs.yasea.rtmp.amf.AmfNumber;
+import net.ossrs.yasea.rtmp.amf.AmfObject;
+import net.ossrs.yasea.rtmp.amf.AmfString;
+import net.ossrs.yasea.rtmp.packets.Abort;
+import net.ossrs.yasea.rtmp.packets.Acknowledgement;
+import net.ossrs.yasea.rtmp.packets.Data;
+import net.ossrs.yasea.rtmp.packets.Handshake;
+import net.ossrs.yasea.rtmp.packets.Command;
+import net.ossrs.yasea.rtmp.packets.Audio;
+import net.ossrs.yasea.rtmp.packets.Video;
+import net.ossrs.yasea.rtmp.packets.UserControl;
+import net.ossrs.yasea.rtmp.packets.RtmpPacket;
+import net.ossrs.yasea.rtmp.packets.WindowAckSize;
 
 /**
  * Main RTMP connection implementation class

app/src/main/java/net/ossrs/sea/rtmp/io/RtmpDecoder.java → app/src/main/java/net/ossrs/yasea/rtmp/io/RtmpDecoder.java

@@ -1,20 +1,22 @@
-package net.ossrs.sea.rtmp.io;
+package net.ossrs.yasea.rtmp.io;
 
 import java.io.IOException;
 import java.io.InputStream;
+
 import android.util.Log;
-import net.ossrs.sea.rtmp.packets.Abort;
-import net.ossrs.sea.rtmp.packets.Audio;
-import net.ossrs.sea.rtmp.packets.Command;
-import net.ossrs.sea.rtmp.packets.Data;
-import net.ossrs.sea.rtmp.packets.RtmpHeader;
-import net.ossrs.sea.rtmp.packets.RtmpPacket;
-import net.ossrs.sea.rtmp.packets.SetChunkSize;
-import net.ossrs.sea.rtmp.packets.SetPeerBandwidth;
-import net.ossrs.sea.rtmp.packets.UserControl;
-import net.ossrs.sea.rtmp.packets.Video;
-import net.ossrs.sea.rtmp.packets.WindowAckSize;
-import net.ossrs.sea.rtmp.packets.Acknowledgement;
+
+import net.ossrs.yasea.rtmp.packets.Abort;
+import net.ossrs.yasea.rtmp.packets.Audio;
+import net.ossrs.yasea.rtmp.packets.Command;
+import net.ossrs.yasea.rtmp.packets.Data;
+import net.ossrs.yasea.rtmp.packets.RtmpHeader;
+import net.ossrs.yasea.rtmp.packets.RtmpPacket;
+import net.ossrs.yasea.rtmp.packets.SetChunkSize;
+import net.ossrs.yasea.rtmp.packets.SetPeerBandwidth;
+import net.ossrs.yasea.rtmp.packets.UserControl;
+import net.ossrs.yasea.rtmp.packets.Video;
+import net.ossrs.yasea.rtmp.packets.WindowAckSize;
+import net.ossrs.yasea.rtmp.packets.Acknowledgement;
 
 /**
  *

app/src/main/java/net/ossrs/sea/rtmp/io/RtmpSessionInfo.java → app/src/main/java/net/ossrs/yasea/rtmp/io/RtmpSessionInfo.java

@@ -1,9 +1,10 @@
-package net.ossrs.sea.rtmp.io;
+package net.ossrs.yasea.rtmp.io;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import net.ossrs.sea.rtmp.packets.RtmpPacket;
+
+import net.ossrs.yasea.rtmp.packets.RtmpPacket;
 
 /**
  *

app/src/main/java/net/ossrs/sea/rtmp/io/WindowAckRequired.java → app/src/main/java/net/ossrs/yasea/rtmp/io/WindowAckRequired.java

@@ -1,6 +1,6 @@
-package net.ossrs.sea.rtmp.io;
+package net.ossrs.yasea.rtmp.io;
 
-import net.ossrs.sea.rtmp.packets.RtmpPacket;
+import net.ossrs.yasea.rtmp.packets.RtmpPacket;
 
 /**
  * Thrown by RTMP read thread when an Acknowledgement packet needs to be sent