Skip to content

Commit 2f2fa24

Browse files
chriszeng87chriszeng87
authored
Merge pull request #92 from ksvc/v4.0.3
Update to v4.0.3
2 parents cb50a59 + 1ed1c0a commit 2f2fa24

File tree

21 files changed

+1487
-150
lines changed

21 files changed

+1487
-150
lines changed

‎demo/res/layout/demo_activity.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
android:layout_height="wrap_content"
129129
android:layout_below="@id/encode_group"
130130
android:orientation="vertical">
131-
131+
132132
<CheckBox
133133
android:id="@+id/autoStart"
134134
android:layout_width="wrap_content"

‎demo/res/values-w820dp/dimens.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎demo/src/com/ksyun/media/streamer/demo/CameraActivity.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import android.widget.TextView;
3030
import android.widget.Toast;
3131

32+
import com.ksyun.media.player.IMediaPlayer;
3233
import com.ksyun.media.streamer.capture.camera.CameraTouchHelper;
3334
import com.ksyun.media.streamer.filter.audio.AudioFilterBase;
3435
import com.ksyun.media.streamer.filter.audio.AudioReverbFilter;
@@ -40,7 +41,6 @@
4041
import com.ksyun.media.streamer.kit.OnPreviewFrameListener;
4142
import com.ksyun.media.streamer.kit.StreamerConstants;
4243
import com.ksyun.media.streamer.logstats.StatsLogReport;
43-
import com.ksyun.media.streamer.util.audio.KSYBgmPlayer;
4444

4545
import java.util.LinkedList;
4646
import java.util.List;
@@ -307,6 +307,7 @@ private void startStream() {
307307

308308
private void stopStream() {
309309
mStreamer.stopStream();
310+
mChronometer.setBase(SystemClock.elapsedRealtime());
310311
mChronometer.stop();
311312
mShootingText.setText(START_STRING);
312313
mShootingText.postInvalidate();
@@ -349,10 +350,10 @@ private void updateDebugInfo() {
349350
private void showWaterMark() {
350351
if (!mIsLandscape) {
351352
mStreamer.showWaterMarkLogo(mLogoPath, 0.08f, 0.04f, 0.20f, 0, 0.8f);
352-
mStreamer.showWaterMarkTime(0.03f, 0.01f, 0.35f, Color.RED, 1.0f);
353+
mStreamer.showWaterMarkTime(0.03f, 0.01f, 0.35f, Color.WHITE, 1.0f);
353354
} else {
354355
mStreamer.showWaterMarkLogo(mLogoPath, 0.05f, 0.09f, 0, 0.20f, 0.8f);
355-
mStreamer.showWaterMarkTime(0.01f, 0.03f, 0.22f, Color.RED, 1.0f);
356+
mStreamer.showWaterMarkTime(0.01f, 0.03f, 0.22f, Color.WHITE, 1.0f);
356357
}
357358
}
358359

@@ -676,24 +677,26 @@ private void onAudioFilterChecked(boolean isChecked) {
676677

677678
private void onBgmChecked(boolean isChecked) {
678679
if (isChecked) {
679-
mStreamer.getAudioPlayerCapture().getBgmPlayer()
680-
.setOnCompletionListener(new KSYBgmPlayer.OnCompletionListener() {
680+
// use KSYMediaPlayer instead of KSYBgmPlayer
681+
mStreamer.getAudioPlayerCapture().setEnableMediaPlayer(true);
682+
mStreamer.getAudioPlayerCapture().getMediaPlayer()
683+
.setOnCompletionListener(new IMediaPlayer.OnCompletionListener() {
681684
@Override
682-
public void onCompletion(KSYBgmPlayer bgmPlayer) {
685+
public void onCompletion(IMediaPlayer iMediaPlayer) {
683686
Log.d(TAG, "End of the currently playing music");
684687
}
685688
});
686-
mStreamer.getAudioPlayerCapture().getBgmPlayer()
687-
.setOnErrorListener(new KSYBgmPlayer.OnErrorListener() {
689+
mStreamer.getAudioPlayerCapture().getMediaPlayer()
690+
.setOnErrorListener(new IMediaPlayer.OnErrorListener() {
688691
@Override
689-
public void onError(KSYBgmPlayer bgmPlayer, int what, int extra) {
690-
Log.e(TAG, "onBgmError: " + what);
692+
public boolean onError(IMediaPlayer iMediaPlayer, int what, int extra) {
693+
Log.e(TAG, "OnErrorListener, Error:" + what + ", extra:" + extra);
694+
return false;
691695
}
692696
});
693-
mStreamer.getAudioPlayerCapture().getBgmPlayer().setVolume(1.0f);
694-
mStreamer.getAudioPlayerCapture().getBgmPlayer().setMute(false);
697+
mStreamer.getAudioPlayerCapture().getMediaPlayer().setVolume(0.4f, 0.4f);
698+
mStreamer.setEnableAudioMix(true);
695699
mStreamer.startBgm(mBgmPath, true);
696-
mStreamer.setHeadsetPlugged(true);
697700
} else {
698701
mStreamer.stopBgm();
699702
}

‎demo/src/com/ksyun/media/streamer/demo/DemoFilter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
import android.opengl.GLES20;
55

6-
import com.ksyun.media.streamer.util.gles.GLRender;
7-
import com.ksyun.media.streamer.util.gles.GlUtil;
86
import com.ksyun.media.streamer.filter.imgtex.ImgTexFilter;
7+
import com.ksyun.media.streamer.util.gles.GLRender;
98

109
/**
1110
* Demo filter.

‎demo/src/com/ksyun/media/streamer/demo/DemoFilter2.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
import android.opengl.GLES20;
55

6-
import com.ksyun.media.streamer.util.gles.GLRender;
7-
import com.ksyun.media.streamer.util.gles.GlUtil;
86
import com.ksyun.media.streamer.filter.imgtex.ImgTexFilter;
7+
import com.ksyun.media.streamer.util.gles.GLRender;
98

109
/**
1110
* Demo filter.

‎demo/src/com/ksyun/media/streamer/demo/DemoFilter3.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
import android.opengl.GLES20;
55

6-
import com.ksyun.media.streamer.util.gles.GLRender;
7-
import com.ksyun.media.streamer.util.gles.GlUtil;
86
import com.ksyun.media.streamer.filter.imgtex.ImgTexFilter;
7+
import com.ksyun.media.streamer.util.gles.GLRender;
98

109
/**
1110
* Demo filter.

‎demo/src/com/ksyun/media/streamer/demo/DemoFilter4.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
import android.opengl.GLES20;
55

6-
import com.ksyun.media.streamer.util.gles.GLRender;
7-
import com.ksyun.media.streamer.util.gles.GlUtil;
86
import com.ksyun.media.streamer.filter.imgtex.ImgTexFilter;
7+
import com.ksyun.media.streamer.util.gles.GLRender;
98

109
/**
1110
* Demo filter.

‎docs/reference/classes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ <h2 id="letter_A">A</h2>
290290

291291
<tr class=" api apilevel-" >
292292
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/capture/AudioPlayerCapture.html">AudioPlayerCapture</a></td>
293-
<td class="jd-descrcol" width="100%">Bgm player capture.&nbsp;</td>
293+
<td class="jd-descrcol" width="100%">Audio player capture.&nbsp;</td>
294294
</tr>
295295

296296

‎docs/reference/com/ksyun/media/streamer/capture/AudioPlayerCapture.html

Lines changed: 146 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ <h1>AudioPlayerCapture</h1>
338338

339339

340340
<h2>Class Overview</h2>
341-
<p>Bgm player capture.
341+
<p>Audio player capture.
342342
</p>
343343

344344

@@ -425,7 +425,7 @@ <h2>Summary</h2>
425425

426426
</td>
427427
<td class="jd-linkcol" width="100%">
428-
<span class="sympad"><a href="../../../../../com/ksyun/media/streamer/capture/AudioPlayerCapture.html#AudioPlayerCapture()">AudioPlayerCapture</a></span>()
428+
<span class="sympad"><a href="../../../../../com/ksyun/media/streamer/capture/AudioPlayerCapture.html#AudioPlayerCapture(Context)">AudioPlayerCapture</a></span>(Context context)
429429

430430
</td></tr>
431431

@@ -467,6 +467,22 @@ <h2>Summary</h2>
467467

468468

469469

470+
KSYMediaPlayer
471+
</td>
472+
<td class="jd-linkcol" width="100%">
473+
<span class="sympad"><a href="../../../../../com/ksyun/media/streamer/capture/AudioPlayerCapture.html#getMediaPlayer()">getMediaPlayer</a></span>()
474+
475+
</td></tr>
476+
477+
478+
479+
<tr class="alt-color api apilevel-" >
480+
<td class="jd-typecol">
481+
482+
483+
484+
485+
470486
void
471487
</td>
472488
<td class="jd-linkcol" width="100%">
@@ -476,6 +492,22 @@ <h2>Summary</h2>
476492

477493

478494

495+
<tr class=" api apilevel-" >
496+
<td class="jd-typecol">
497+
498+
499+
500+
501+
502+
void
503+
</td>
504+
<td class="jd-linkcol" width="100%">
505+
<span class="sympad"><a href="../../../../../com/ksyun/media/streamer/capture/AudioPlayerCapture.html#setEnableMediaPlayer(boolean)">setEnableMediaPlayer</a></span>(boolean enable)
506+
507+
</td></tr>
508+
509+
510+
479511
<tr class="alt-color api apilevel-" >
480512
<td class="jd-typecol">
481513

@@ -486,7 +518,7 @@ <h2>Summary</h2>
486518
void
487519
</td>
488520
<td class="jd-linkcol" width="100%">
489-
<span class="sympad"><a href="../../../../../com/ksyun/media/streamer/capture/AudioPlayerCapture.html#start(java.lang.String, boolean)">start</a></span>(String path, boolean loop)
521+
<span class="sympad"><a href="../../../../../com/ksyun/media/streamer/capture/AudioPlayerCapture.html#setMute(boolean)">setMute</a></span>(boolean mute)
490522

491523
</td></tr>
492524

@@ -499,6 +531,22 @@ <h2>Summary</h2>
499531

500532

501533

534+
void
535+
</td>
536+
<td class="jd-linkcol" width="100%">
537+
<span class="sympad"><a href="../../../../../com/ksyun/media/streamer/capture/AudioPlayerCapture.html#start(java.lang.String, boolean)">start</a></span>(String path, boolean loop)
538+
539+
</td></tr>
540+
541+
542+
543+
<tr class="alt-color api apilevel-" >
544+
<td class="jd-typecol">
545+
546+
547+
548+
549+
502550
void
503551
</td>
504552
<td class="jd-linkcol" width="100%">
@@ -794,7 +842,7 @@ <h2>Public Constructors</h2>
794842

795843

796844

797-
<a id="AudioPlayerCapture()"></a>
845+
<a id="AudioPlayerCapture(Context)"></a>
798846

799847
<div class="jd-details api apilevel-">
800848
<h4 class="jd-details-title">
@@ -807,7 +855,7 @@ <h4 class="jd-details-title">
807855

808856
</span>
809857
<span class="sympad">AudioPlayerCapture</span>
810-
<span class="normal">()</span>
858+
<span class="normal">(Context context)</span>
811859
</h4>
812860
<div class="api-level">
813861
<div>
@@ -871,6 +919,37 @@ <h4 class="jd-details-title">
871919
</div>
872920

873921

922+
<a id="getMediaPlayer()"></a>
923+
924+
<div class="jd-details api apilevel-">
925+
<h4 class="jd-details-title">
926+
<span class="normal">
927+
public
928+
929+
930+
931+
932+
KSYMediaPlayer
933+
</span>
934+
<span class="sympad">getMediaPlayer</span>
935+
<span class="normal">()</span>
936+
</h4>
937+
<div class="api-level">
938+
<div>
939+
940+
</div>
941+
942+
943+
944+
</div>
945+
<div class="jd-details-descr">
946+
947+
<div class="jd-tagdata jd-tagdescr"><p></p></div>
948+
949+
</div>
950+
</div>
951+
952+
874953
<a id="release()"></a>
875954

876955
<div class="jd-details api apilevel-">
@@ -902,6 +981,68 @@ <h4 class="jd-details-title">
902981
</div>
903982

904983

984+
<a id="setEnableMediaPlayer(boolean)"></a>
985+
986+
<div class="jd-details api apilevel-">
987+
<h4 class="jd-details-title">
988+
<span class="normal">
989+
public
990+
991+
992+
993+
994+
void
995+
</span>
996+
<span class="sympad">setEnableMediaPlayer</span>
997+
<span class="normal">(boolean enable)</span>
998+
</h4>
999+
<div class="api-level">
1000+
<div>
1001+
1002+
</div>
1003+
1004+
1005+
1006+
</div>
1007+
<div class="jd-details-descr">
1008+
1009+
<div class="jd-tagdata jd-tagdescr"><p></p></div>
1010+
1011+
</div>
1012+
</div>
1013+
1014+
1015+
<a id="setMute(boolean)"></a>
1016+
1017+
<div class="jd-details api apilevel-">
1018+
<h4 class="jd-details-title">
1019+
<span class="normal">
1020+
public
1021+
1022+
1023+
1024+
1025+
void
1026+
</span>
1027+
<span class="sympad">setMute</span>
1028+
<span class="normal">(boolean mute)</span>
1029+
</h4>
1030+
<div class="api-level">
1031+
<div>
1032+
1033+
</div>
1034+
1035+
1036+
1037+
</div>
1038+
<div class="jd-details-descr">
1039+
1040+
<div class="jd-tagdata jd-tagdescr"><p></p></div>
1041+
1042+
</div>
1043+
</div>
1044+
1045+
9051046
<a id="start(java.lang.String, boolean)"></a>
9061047

9071048
<div class="jd-details api apilevel-">

0 commit comments

Comments
 (0)