3636import java .security .MessageDigest ;
3737import java .security .NoSuchAlgorithmException ;
3838import java .util .Arrays ;
39+ import java .util .Timer ;
40+ import java .util .TimerTask ;
3941import java .util .concurrent .ExecutorService ;
4042import java .util .concurrent .Executors ;
4143
@@ -44,6 +46,7 @@ public class CameraActivity extends Activity {
4446
4547 private static final String TAG = "CameraActivity" ;
4648
49+
4750 private GLSurfaceView mCameraPreview ;
4851
4952 private KSYStreamer mStreamer ;
@@ -62,11 +65,12 @@ public class CameraActivity extends Activity {
6265 private boolean isFlashOpened = false ;
6366 private boolean startAuto = false ;
6467 private boolean audio_mix = false ;
65- private String mUrl ;
68+ private boolean printDebugInfo = false ;
69+ private String mUrl , mDebugInfo = "" ;
6670 private String mBgmPath = "/sdcard/test.mp3" ;
6771 private static final String START_STRING = "开始直播" ;
6872 private static final String STOP_STRING = "停止直播" ;
69- private TextView mUrlTextView ;
73+ private TextView mUrlTextView , mDebugInfoTextView ;
7074 private volatile boolean mAcitivityResumed = false ;
7175 private KSYStreamerConfig .ENCODE_METHOD encode_method = KSYStreamerConfig .ENCODE_METHOD .SOFTWARE ;
7276 public final static String URL = "url" ;
@@ -83,15 +87,18 @@ public class CameraActivity extends Activity {
8387 public final static String FRONT_CAMERA_MIRROR = "front_camera_mirror" ;
8488 public final static String TEST_SW_FILTER = "testSWFilterInterface" ;
8589 public final static String MANUAL_FOCUS = "manual_focus" ;
90+ public static final String SHOW_DEBUGINFO = "SHOW_DEBUGINFO" ;
8691
92+ Timer timer ;
8793 ExecutorService executorService = Executors .newSingleThreadExecutor ();
94+
8895 private int frameCount ;
8996 private boolean testSWFilterInterface ;
9097
9198 public static void startActivity (Context context , int fromType ,
9299 String rtmpUrl , int frameRate , int videoBitrate , int audioBitrate ,
93100 int videoResolution , boolean encodeWithHEVC , boolean isLandscape , boolean mute_audio , boolean audio_mix , boolean isFrontCameraMirror , KSYStreamerConfig .ENCODE_METHOD encodeMethod , boolean startAuto ,
94- boolean testSWFilterInterface , boolean manualFocus ) {
101+ boolean testSWFilterInterface , boolean manualFocus , boolean showDebugInfo ) {
95102 Intent intent = new Intent (context , CameraActivity .class );
96103 intent .addFlags (Intent .FLAG_ACTIVITY_NEW_TASK );
97104 intent .putExtra ("type" , fromType );
@@ -109,6 +116,7 @@ public static void startActivity(Context context, int fromType,
109116 intent .putExtra (FRONT_CAMERA_MIRROR , isFrontCameraMirror );
110117 intent .putExtra (TEST_SW_FILTER , testSWFilterInterface );
111118 intent .putExtra (MANUAL_FOCUS , manualFocus );
119+ intent .putExtra (SHOW_DEBUGINFO , showDebugInfo );
112120 context .startActivity (intent );
113121 }
114122
@@ -149,6 +157,7 @@ public void handleMessage(Message msg) {
149157 chronometer .start ();
150158 mShootingText .setText (STOP_STRING );
151159 mShootingText .postInvalidate ();
160+ beginInfoUploadTimer ();
152161 break ;
153162 case RecorderConstants .KSYVIDEO_ENCODED_FRAMES_THRESHOLD :
154163 chronometer .stop ();
@@ -204,8 +213,8 @@ public void handleMessage(Message msg) {
204213 int videoBitrate = bundle .getInt (VIDEO_BITRATE , 0 );
205214 if (videoBitrate > 0 ) {
206215 builder .setMaxAverageVideoBitrate (videoBitrate );
207- builder .setMinAverageVideoBitrate (videoBitrate * 3 / 5 );
208- builder .setInitAverageVideoBitrate (videoBitrate * 4 / 5 );
216+ builder .setMinAverageVideoBitrate (videoBitrate * 2 / 8 );
217+ builder .setInitAverageVideoBitrate (videoBitrate * 5 / 8 );
209218 }
210219
211220 int audioBitrate = bundle .getInt (AUDIO_BITRATE , 0 );
@@ -228,9 +237,8 @@ public void handleMessage(Message msg) {
228237 builder .setSecretKeySign (skSign );
229238 builder .setTimeSecond (timeSec );
230239
231- builder .setAudioChannels (1 );
232240 builder .setSampleAudioRateInHz (44100 );
233- // builder.setEnableStreamStatModule(false );
241+ builder .setEnableStreamStatModule (true );
234242
235243 boolean landscape = bundle .getBoolean (LANDSCAPE , false );
236244 builder .setDefaultLandscape (landscape );
@@ -250,6 +258,7 @@ public void handleMessage(Message msg) {
250258 testSWFilterInterface = bundle .getBoolean (TEST_SW_FILTER , false );
251259 boolean focus_manual = bundle .getBoolean (MANUAL_FOCUS , false );
252260 builder .setManualFocus (focus_manual );
261+ printDebugInfo = bundle .getBoolean (SHOW_DEBUGINFO , false );
253262 }
254263
255264 mStreamer = new KSYStreamer (this );
@@ -258,8 +267,8 @@ public void handleMessage(Message msg) {
258267 mStreamer .setOnStatusListener (mOnErrorListener );
259268 mStreamer .setOnLogListener (mOnLogListener );
260269 mStreamer .setOnNoiseSuppressionListener (mOnNsListener );
261- mStreamer .enableDebugLog (false );
262-
270+ mStreamer .enableDebugLog (true );
271+ mStreamer . setBeautyFilter ( RecorderConstants . FILTER_BEAUTY_DENOISE );
263272 if (testSWFilterInterface ) {
264273 mStreamer .setOnPreviewFrameListener (new OnPreviewFrameListener () {
265274 @ Override
@@ -343,7 +352,39 @@ public void onClick(View arg0) {
343352 mFlashView .setEnabled (true );
344353
345354 chronometer = (Chronometer ) this .findViewById (R .id .chronometer );
355+ mDebugInfoTextView = (TextView ) this .findViewById (R .id .debuginfo );
356+
357+
358+ }
359+
360+ private void beginInfoUploadTimer () {
361+ if (printDebugInfo && timer == null ) {
362+ timer = new Timer ();
363+ timer .schedule (new TimerTask () {
364+ @ Override
365+ public void run () {
366+ updateDebugInfo ();
367+ runOnUiThread (new Runnable () {
368+ @ Override
369+ public void run () {
370+ mDebugInfoTextView .setText (mDebugInfo );
371+ }
372+ });
373+ }
374+ }, 100 , 3000 );
375+ }
376+ }
346377
378+ private void updateDebugInfo () {
379+ if (mStreamer == null ) return ;
380+ mDebugInfo = String .format ("RtmpHostIP()=%s DroppedFrameCount()=%d \n " +
381+ "ConnectTime()=%d DnsParseTime()=%d \n " +
382+ "UploadedKB()=%d EncodedFrames()=%d \n " +
383+ "CurrentBitrate=%f Version()=%s" ,
384+ mStreamer .getRtmpHostIP (), mStreamer .getDroppedFrameCount (),
385+ mStreamer .getConnectTime (), mStreamer .getDnsParseTime (),
386+ mStreamer .getUploadedKBytes (), mStreamer .getEncodedFrames (),
387+ mStreamer .getCurrentBitrate (), mStreamer .getVersion ());
347388 }
348389
349390
@@ -539,6 +580,9 @@ public void onDestroy() {
539580 mHandler .removeCallbacksAndMessages (null );
540581 mHandler = null ;
541582 }
583+ if (timer != null ) {
584+ timer .cancel ();
585+ }
542586 }
543587
544588 protected int mStopTime = 0 ;
@@ -628,9 +672,6 @@ public void onClick(View view) {
628672 }
629673 }
630674
631- private void printLog () {
632- Log .e (TAG , String .format ("getRtmpHostIP()=%s getDroppedFrameCount()=%d getConnectTime()=%d getDnsParseTime()=%d " , mStreamer .getRtmpHostIP (), mStreamer .getDroppedFrameCount (), mStreamer .getConnectTime (), mStreamer .getDnsParseTime ()));
633- }
634675
635676 private String md5 (String string ) {
636677 byte [] hash ;
0 commit comments