| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2015 Google Inc. | 3 * Copyright 2015 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 ++framesCaptured; | 125 ++framesCaptured; |
| 126 frameSize = length; | 126 frameSize = length; |
| 127 frameWidth = width; | 127 frameWidth = width; |
| 128 frameHeight = height; | 128 frameHeight = height; |
| 129 timestamps.add(timeStamp); | 129 timestamps.add(timeStamp); |
| 130 frameLock.notify(); | 130 frameLock.notify(); |
| 131 } | 131 } |
| 132 } | 132 } |
| 133 @Override | 133 @Override |
| 134 public void onTextureFrameCaptured( | 134 public void onTextureFrameCaptured( |
| 135 int width, int height, int oesTextureId, float[] transformMatrix, long t
imeStamp) { | 135 int width, int height, int oesTextureId, float[] transformMatrix, int ro
tation, |
| 136 long timeStamp) { |
| 136 synchronized (frameLock) { | 137 synchronized (frameLock) { |
| 137 ++framesCaptured; | 138 ++framesCaptured; |
| 138 frameWidth = width; | 139 frameWidth = width; |
| 139 frameHeight = height; | 140 frameHeight = height; |
| 140 frameSize = 0; | 141 frameSize = 0; |
| 141 timestamps.add(timeStamp); | 142 timestamps.add(timeStamp); |
| 142 frameLock.notify(); | 143 frameLock.notify(); |
| 143 } | 144 } |
| 144 } | 145 } |
| 145 | 146 |
| (...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 603 source.stop(); | 604 source.stop(); |
| 604 track.dispose(); | 605 track.dispose(); |
| 605 source.dispose(); | 606 source.dispose(); |
| 606 factory.dispose(); | 607 factory.dispose(); |
| 607 assertTrue(capturer.isReleased()); | 608 assertTrue(capturer.isReleased()); |
| 608 | 609 |
| 609 assertTrue(gotExpectedResolution); | 610 assertTrue(gotExpectedResolution); |
| 610 } | 611 } |
| 611 | 612 |
| 612 } | 613 } |
| OLD | NEW |