| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 922 } | 922 } |
| 923 }); | 923 }); |
| 924 } | 924 } |
| 925 | 925 |
| 926 private void changeCaptureFormatInternal(int width, int height, int framerate)
{ | 926 private void changeCaptureFormatInternal(int width, int height, int framerate)
{ |
| 927 if (!videoCallEnabled || isError || videoCapturer == null) { | 927 if (!videoCallEnabled || isError || videoCapturer == null) { |
| 928 Log.e(TAG, "Failed to change capture format. Video: " + videoCallEnabled +
". Error : " | 928 Log.e(TAG, "Failed to change capture format. Video: " + videoCallEnabled +
". Error : " |
| 929 + isError); | 929 + isError); |
| 930 return; | 930 return; |
| 931 } | 931 } |
| 932 Log.d(TAG, "changeCaptureFormat: " + width + "x" + height + "@" + framerate)
; |
| 932 videoCapturer.onOutputFormatRequest(width, height, framerate); | 933 videoCapturer.onOutputFormatRequest(width, height, framerate); |
| 933 } | 934 } |
| 934 | 935 |
| 935 // Implementation detail: observe ICE & stream changes and react accordingly. | 936 // Implementation detail: observe ICE & stream changes and react accordingly. |
| 936 private class PCObserver implements PeerConnection.Observer { | 937 private class PCObserver implements PeerConnection.Observer { |
| 937 @Override | 938 @Override |
| 938 public void onIceCandidate(final IceCandidate candidate){ | 939 public void onIceCandidate(final IceCandidate candidate){ |
| 939 executor.execute(new Runnable() { | 940 executor.execute(new Runnable() { |
| 940 @Override | 941 @Override |
| 941 public void run() { | 942 public void run() { |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1107 public void onCreateFailure(final String error) { | 1108 public void onCreateFailure(final String error) { |
| 1108 reportError("createSDP error: " + error); | 1109 reportError("createSDP error: " + error); |
| 1109 } | 1110 } |
| 1110 | 1111 |
| 1111 @Override | 1112 @Override |
| 1112 public void onSetFailure(final String error) { | 1113 public void onSetFailure(final String error) { |
| 1113 reportError("setSDP error: " + error); | 1114 reportError("setSDP error: " + error); |
| 1114 } | 1115 } |
| 1115 } | 1116 } |
| 1116 } | 1117 } |
| OLD | NEW |