Skip to content
Snippets Groups Projects
Commit da863658 authored by Leo Ma's avatar Leo Ma
Browse files

Open camera after connection and encoder enabled


Signed-off-by: default avatarLeo Ma <begeekmyfriend@gmail.com>
parent 3e0874b0
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -25,6 +25,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:appcompat-v7:25.1.1'
compile project(path: ':library')
}
Loading
Loading
@@ -84,8 +84,8 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL
editor.putString("rtmpUrl", rtmpUrl);
editor.apply();
 
mPublisher.startCamera();
mPublisher.startPublish(rtmpUrl);
mPublisher.startCamera();
 
if (btnSwitchEncoder.getText().toString().contentEquals("soft encoder")) {
Toast.makeText(getApplicationContext(), "Use hard encoder", Toast.LENGTH_SHORT).show();
Loading
Loading
@@ -243,8 +243,8 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL
btnRecord.setText("record");
mPublisher.setScreenOrientation(newConfig.orientation);
if (btnPublish.getText().toString().contentEquals("stop")) {
mPublisher.startCamera();
mPublisher.startEncode();
mPublisher.startCamera();
}
}
 
Loading
Loading
Loading
Loading
@@ -28,6 +28,6 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:appcompat-v7:25.1.1'
testCompile 'junit:junit:4.12'
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment