Modify sea into yasea

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
camera2
Leo Ma 9 years ago
parent 5ee43c681e
commit 91dac74d9e

@ -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.

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

@ -1,4 +1,4 @@
package net.ossrs.sea;
package net.ossrs.yasea;
import android.app.Application;
import android.test.ApplicationTestCase;

@ -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" />

@ -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.Button;
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;

@ -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.MediaCodecList;
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;

@ -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.ArrayList;
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 @@ import net.ossrs.sea.rtmp.RtmpPublisher;
* @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);

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

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

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

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

@ -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

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

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

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

@ -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

@ -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;

@ -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

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

@ -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;
/**
*

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

@ -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;

@ -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 {

@ -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

@ -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

@ -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.logging.Logger;
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

@ -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;
/**
*

@ -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;
/**
*

@ -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

@ -1,4 +1,4 @@
package net.ossrs.sea.rtmp.io;
package net.ossrs.yasea.rtmp.io;
import java.io.IOException;
import java.io.OutputStream;
@ -8,10 +8,10 @@ import java.util.concurrent.atomic.AtomicInteger;
import android.util.Log;
import net.ossrs.sea.rtmp.RtmpPublisher;
import net.ossrs.sea.rtmp.packets.Command;
import net.ossrs.sea.rtmp.packets.RtmpPacket;
import net.ossrs.sea.rtmp.packets.Video;
import net.ossrs.yasea.rtmp.RtmpPublisher;
import net.ossrs.yasea.rtmp.packets.Command;
import net.ossrs.yasea.rtmp.packets.RtmpPacket;
import net.ossrs.yasea.rtmp.packets.Video;
/**
* RTMPConnection's write thread

@ -1,10 +1,11 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import net.ossrs.sea.rtmp.Util;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.Util;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
/**
* A "Abort" RTMP control message, received on chunk stream ID 2 (control channel)

@ -1,10 +1,11 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import net.ossrs.sea.rtmp.Util;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.Util;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
/**
* (Window) Acknowledgement

@ -1,6 +1,6 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
/**
* Audio data packet

@ -1,11 +1,12 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import net.ossrs.sea.rtmp.amf.AmfNumber;
import net.ossrs.sea.rtmp.amf.AmfString;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.amf.AmfNumber;
import net.ossrs.yasea.rtmp.amf.AmfString;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
/**
* Encapsulates an command/"invoke" RTMP packet

@ -1,9 +1,10 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import net.ossrs.sea.rtmp.Util;
import net.ossrs.yasea.rtmp.Util;
/**
* Content (audio/video) data packet base

@ -1,10 +1,11 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import net.ossrs.sea.rtmp.amf.AmfString;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.amf.AmfString;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
/**
* AMF Data packet

@ -1,12 +1,14 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Random;
import android.util.Log;
import net.ossrs.sea.rtmp.Crypto;
import net.ossrs.sea.rtmp.Util;
import net.ossrs.yasea.rtmp.Crypto;
import net.ossrs.yasea.rtmp.Util;
/**
* Handles the RTMP handshake song 'n dance

@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.EOFException;
import java.io.IOException;
@ -10,10 +10,12 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
import android.util.Log;
import net.ossrs.sea.rtmp.Util;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.sea.rtmp.io.RtmpSessionInfo;
import net.ossrs.yasea.rtmp.Util;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.io.RtmpSessionInfo;
/**
*

@ -1,14 +1,15 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
/**
*
* @author francois
* @author francois, leo
*/
public abstract class RtmpPacket {

@ -1,10 +1,11 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import net.ossrs.sea.rtmp.Util;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.Util;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
/**
* A "Set chunk size" RTMP message, received on chunk stream ID 2 (control channel)

@ -1,12 +1,13 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
import net.ossrs.sea.rtmp.Util;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.Util;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
/**
* Set Peer Bandwidth

@ -1,12 +1,13 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
import net.ossrs.sea.rtmp.Util;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.Util;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
/**
* User Control message, such as ping

@ -1,16 +1,17 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
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.amf.AmfBoolean;
import net.ossrs.sea.rtmp.amf.AmfData;
import net.ossrs.sea.rtmp.amf.AmfDecoder;
import net.ossrs.sea.rtmp.amf.AmfNull;
import net.ossrs.sea.rtmp.amf.AmfNumber;
import net.ossrs.sea.rtmp.amf.AmfString;
import net.ossrs.yasea.rtmp.amf.AmfBoolean;
import net.ossrs.yasea.rtmp.amf.AmfData;
import net.ossrs.yasea.rtmp.amf.AmfDecoder;
import net.ossrs.yasea.rtmp.amf.AmfNull;
import net.ossrs.yasea.rtmp.amf.AmfNumber;
import net.ossrs.yasea.rtmp.amf.AmfString;
/**
* RTMP packet with a "variable" body structure (i.e. the structure of the

@ -1,6 +1,6 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
/**
* Video data packet

@ -1,10 +1,11 @@
package net.ossrs.sea.rtmp.packets;
package net.ossrs.yasea.rtmp.packets;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import net.ossrs.sea.rtmp.Util;
import net.ossrs.sea.rtmp.io.ChunkStreamInfo;
import net.ossrs.yasea.rtmp.Util;
import net.ossrs.yasea.rtmp.io.ChunkStreamInfo;
/**
* Window Acknowledgement Size

@ -7,7 +7,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="net.ossrs.sea.MainActivity">
tools:context="net.ossrs.yasea.MainActivity">
<Button
android:layout_width="wrap_content"

@ -1,6 +1,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" tools:context="net.ossrs.sea.MainActivity">
xmlns:tools="http://schemas.android.com/tools" tools:context="net.ossrs.yasea.MainActivity">
<item android:id="@+id/action_settings" android:title="action_settings"
android:orderInCategory="100" app:showAsAction="never" />
</menu>

@ -1,4 +1,4 @@
package net.ossrs.sea;
package net.ossrs.yasea;
import org.junit.Test;
Loading…
Cancel
Save