Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#92584884] Fix broadcasting on lolipop [WIP] #101

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,9 @@ gen/
local.properties
custom_rules.xml
ant.properties
*~
*~
*.iml
.gradle/
.idea/
target/
build/
50 changes: 50 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
apply plugin: 'com.android.library'
apply plugin: 'maven'


group = 'net.majorkernelpanic'
version = '3.0'

description = """libstreaming"""

buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
}
}

android {
compileSdkVersion 21
buildToolsVersion "21.1.1"

defaultConfig {
minSdkVersion 16
targetSdkVersion 21
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
}

repositories {
mavenCentral()
}


dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
}

uploadArchives {
repositories {
mavenDeployer {
repository url: 'file://' + new File(System.getProperty('user.home'), '.m3/repository').absolutePath
}
}
}
task install(dependsOn: uploadArchives)
10 changes: 10 additions & 0 deletions src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.majorkernelpanic.streaming"
android:versionCode="40"
android:versionName="4.0" >

<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="19" />

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,24 @@

package net.majorkernelpanic.streaming;

import java.io.IOException;
import java.io.OutputStream;
import java.net.InetAddress;
import java.util.Random;

import net.majorkernelpanic.streaming.audio.AudioStream;
import net.majorkernelpanic.streaming.rtp.AbstractPacketizer;
import net.majorkernelpanic.streaming.video.VideoStream;
import android.annotation.SuppressLint;
import android.media.MediaCodec;
import android.media.MediaRecorder;
import android.net.LocalServerSocket;
import android.net.LocalSocket;
import android.net.LocalSocketAddress;
import android.os.ParcelFileDescriptor;
import android.util.Log;

import net.majorkernelpanic.streaming.audio.AudioStream;
import net.majorkernelpanic.streaming.rtp.AbstractPacketizer;
import net.majorkernelpanic.streaming.video.VideoStream;

import java.io.IOException;
import java.io.OutputStream;
import java.net.InetAddress;
import java.util.Random;

/**
* A MediaRecorder that streams what it records using a packetizer from the RTP package.
* You can't use this class directly !
Expand Down Expand Up @@ -73,6 +75,9 @@ public abstract class MediaStream implements Stream {

protected MediaRecorder mMediaRecorder;
protected MediaCodec mMediaCodec;

protected ParcelFileDescriptor mParcelRead;
protected ParcelFileDescriptor mParcelWrite;

static {
// We determine whether or not the MediaCodec API should be used
Expand Down Expand Up @@ -315,25 +320,52 @@ protected void createSockets() throws IOException {
mSender.setSendBufferSize(500000);
}

protected void setMediaRecorderOutputFile(MediaRecorder mediaRecorder) {
ParcelFileDescriptor[] parcelFileDescriptors = new ParcelFileDescriptor[0];

try {
parcelFileDescriptors = ParcelFileDescriptor.createPipe();
} catch (IOException e) {
Log.e("Zeemi", "ParcelFileDescriptor initialize fail");
}

mParcelRead = new ParcelFileDescriptor(parcelFileDescriptors[0]);
mParcelWrite = new ParcelFileDescriptor(parcelFileDescriptors[1]);
mediaRecorder.setOutputFile(mParcelWrite.getFileDescriptor());
}

protected void closeSockets() {
try {
mReceiver.close();
} catch (Exception e) {
e.printStackTrace();
}
try {
mSender.close();
} catch (Exception e) {
e.printStackTrace();
}
try {
mLss.close();
} catch (Exception e) {
e.printStackTrace();
}
mLss = null;
mSender = null;
mReceiver = null;
try {
mReceiver.close();
} catch (Exception e) {
e.printStackTrace();
}
try {
mSender.close();
} catch (Exception e) {
e.printStackTrace();
}
try {
mLss.close();
} catch (Exception e) {
e.printStackTrace();
}
try {
mParcelRead.close();
}
catch(Exception e){
e.printStackTrace();
}
try {
mParcelWrite.close();
} catch (Exception e) {
e.printStackTrace();
}
mLss = null;
mSender = null;
mReceiver = null;
mParcelRead = null;
mParcelWrite = null;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -525,14 +525,20 @@ private void convertToNV21(int k) {
* Instantiates and starts the encoder.
*/
private void configureEncoder() {
mEncoder = MediaCodec.createByCodecName(mEncoderName);
MediaFormat mediaFormat = MediaFormat.createVideoFormat(MIME_TYPE, mWidth, mHeight);
mediaFormat.setInteger(MediaFormat.KEY_BIT_RATE, BITRATE);
mediaFormat.setInteger(MediaFormat.KEY_FRAME_RATE, FRAMERATE);
mediaFormat.setInteger(MediaFormat.KEY_COLOR_FORMAT, mEncoderColorFormat);
mediaFormat.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, 1);
mEncoder.configure(mediaFormat, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
mEncoder.start();
try{
mEncoder = MediaCodec.createByCodecName(mEncoderName);
MediaFormat mediaFormat = MediaFormat.createVideoFormat(MIME_TYPE, mWidth, mHeight);
mediaFormat.setInteger(MediaFormat.KEY_BIT_RATE, BITRATE);
mediaFormat.setInteger(MediaFormat.KEY_FRAME_RATE, FRAMERATE);
mediaFormat.setInteger(MediaFormat.KEY_COLOR_FORMAT, mEncoderColorFormat);
mediaFormat.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, 1);
mEncoder.configure(mediaFormat, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
mEncoder.start();
}
catch (Exception e) {
Log.e(getClass().getSimpleName(),"configureEncoder");
Log.e(getClass().getSimpleName(), e.getStackTrace().toString());
}
}

private void releaseEncoder() {
Expand All @@ -558,12 +564,18 @@ private void configureDecoder() {
csd0.put(new byte[] {0x00,0x00,0x00,0x01});
csd0.put(mPPS);

mDecoder = MediaCodec.createByCodecName(mDecoderName);
MediaFormat mediaFormat = MediaFormat.createVideoFormat(MIME_TYPE, mWidth, mHeight);
mediaFormat.setByteBuffer("csd-0", csd0);
mediaFormat.setInteger(MediaFormat.KEY_COLOR_FORMAT, mDecoderColorFormat);
mDecoder.configure(mediaFormat, null, null, 0);
mDecoder.start();
try{
mDecoder = MediaCodec.createByCodecName(mDecoderName);
MediaFormat mediaFormat = MediaFormat.createVideoFormat(MIME_TYPE, mWidth, mHeight);
mediaFormat.setByteBuffer("csd-0", csd0);
mediaFormat.setInteger(MediaFormat.KEY_COLOR_FORMAT, mDecoderColorFormat);
mDecoder.configure(mediaFormat, null, null, 0);
mDecoder.start();
}
catch (Exception e) {
Log.e(getClass().getSimpleName(),"configureDecoder");
Log.e(getClass().getSimpleName(), e.getStackTrace().toString());
}

ByteBuffer[] decInputBuffers = mDecoder.getInputBuffers();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,6 @@

package net.majorkernelpanic.streaming.video;

import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;

import net.majorkernelpanic.streaming.MediaStream;
import net.majorkernelpanic.streaming.Stream;
import net.majorkernelpanic.streaming.exceptions.CameraInUseException;
import net.majorkernelpanic.streaming.exceptions.ConfNotSupportedException;
import net.majorkernelpanic.streaming.exceptions.InvalidSurfaceException;
import net.majorkernelpanic.streaming.gl.SurfaceView;
import net.majorkernelpanic.streaming.hw.EncoderDebugger;
import net.majorkernelpanic.streaming.hw.NV21Convertor;
import net.majorkernelpanic.streaming.rtp.MediaCodecInputStream;
import android.annotation.SuppressLint;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
Expand All @@ -45,12 +30,30 @@
import android.media.MediaCodecInfo;
import android.media.MediaFormat;
import android.media.MediaRecorder;
import android.os.Build;
import android.os.Looper;
import android.os.ParcelFileDescriptor;
import android.util.Log;
import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceHolder.Callback;

import net.majorkernelpanic.streaming.MediaStream;
import net.majorkernelpanic.streaming.Stream;
import net.majorkernelpanic.streaming.exceptions.CameraInUseException;
import net.majorkernelpanic.streaming.exceptions.ConfNotSupportedException;
import net.majorkernelpanic.streaming.exceptions.InvalidSurfaceException;
import net.majorkernelpanic.streaming.gl.SurfaceView;
import net.majorkernelpanic.streaming.hw.EncoderDebugger;
import net.majorkernelpanic.streaming.hw.NV21Convertor;
import net.majorkernelpanic.streaming.rtp.MediaCodecInputStream;

import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;

/**
* Don't use this class directly.
*/
Expand Down Expand Up @@ -80,9 +83,9 @@ public abstract class VideoStream extends MediaStream {
protected String mEncoderName;
protected int mEncoderColorFormat;
protected int mCameraImageFormat;
protected int mMaxFps = 0;
protected int mMaxFps = 0;

/**
/**
* Don't use this class directly.
* Uses CAMERA_FACING_BACK by default.
*/
Expand Down Expand Up @@ -328,6 +331,7 @@ public synchronized void stopPreview() {
protected void encodeWithMediaRecorder() throws IOException, ConfNotSupportedException {

Log.d(TAG,"Video encoded using the MediaRecorder API");
Log.e(TAG, "VideoStream Initial 1152");

// We need a local socket to forward data output by the camera to the packetizer
createSockets();
Expand Down Expand Up @@ -355,7 +359,12 @@ protected void encodeWithMediaRecorder() throws IOException, ConfNotSupportedExc
// We write the ouput of the camera in a local socket instead of a file !
// This one little trick makes streaming feasible quiet simply: data from the camera
// can then be manipulated at the other end of the socket
mMediaRecorder.setOutputFile(mSender.getFileDescriptor());
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
setMediaRecorderOutputFile(mMediaRecorder);
}
else {
mMediaRecorder.setOutputFile(mSender.getFileDescriptor());
}

mMediaRecorder.prepare();
mMediaRecorder.start();
Expand All @@ -365,13 +374,20 @@ protected void encodeWithMediaRecorder() throws IOException, ConfNotSupportedExc
}

// This will skip the MPEG4 header if this step fails we can't stream anything :(
InputStream is = mReceiver.getInputStream();
try {
InputStream inputStream;
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
inputStream = new ParcelFileDescriptor.AutoCloseInputStream(mParcelRead);
}
else {
inputStream = mReceiver.getInputStream();
}

try {
byte buffer[] = new byte[4];
// Skip all atoms preceding mdat atom
while (!Thread.interrupted()) {
while (is.read() != 'm');
is.read(buffer,0,3);
while (inputStream.read() != 'm');
inputStream.read(buffer, 0, 3);
if (buffer[0] == 'd' && buffer[1] == 'a' && buffer[2] == 't') break;
}
} catch (IOException e) {
Expand All @@ -381,9 +397,15 @@ protected void encodeWithMediaRecorder() throws IOException, ConfNotSupportedExc
}

// The packetizer encapsulates the bit stream in an RTP stream and send it over the network
mPacketizer.setInputStream(mReceiver.getInputStream());
mPacketizer.start();

if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
mPacketizer.setInputStream(inputStream);
}
else {
mPacketizer.setInputStream(mReceiver.getInputStream());
}

mPacketizer.start();
mStreaming = true;

}
Expand Down Expand Up @@ -585,9 +607,10 @@ public void onError(int error, Camera camera) {
if (parameters.getFlashMode()!=null) {
parameters.setFlashMode(mFlashEnabled?Parameters.FLASH_MODE_TORCH:Parameters.FLASH_MODE_OFF);
}
parameters.setRecordingHint(true);
mCamera.setParameters(parameters);
mCamera.setDisplayOrientation(mOrientation);
parameters.setRecordingHint(true);
parameters.set("cam_mode", 1);
mCamera.setParameters(parameters);
mCamera.setDisplayOrientation(mOrientation);

try {
if (mMode == MODE_MEDIACODEC_API_2) {
Expand Down