pull/696/head
Mattia Iavarone 6 years ago
parent a9beb8a7f8
commit e1b6da7ed1
  1. 2
      .github/workflows/emulator_script.sh
  2. 5
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java
  3. 1
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
adb logcat -c adb logcat -c
adb logcat CameraOrchestrator:I CameraEngine:I CameraView:I CameraCallbacks:I CameraIntegrationTest:I MediaEncoderEngine:I AudioMediaEncoder:I VideoMediaEncoder:I TextureMediaEncoder:I *:E -v color & adb logcat CameraOrchestrator:I CameraEngine:I CameraView:I CameraCallbacks:I CameraIntegrationTest:I MediaEncoderEngine:I MediaEncoder:I AudioMediaEncoder:I VideoMediaEncoder:I TextureMediaEncoder:I *:E -v color &
./gradlew cameraview:connectedCheck ./gradlew cameraview:connectedCheck

@ -534,7 +534,9 @@ public abstract class MediaEncoder {
* max length allowed. We will move to {@link #STATE_LIMIT_REACHED} and request a stop. * max length allowed. We will move to {@link #STATE_LIMIT_REACHED} and request a stop.
*/ */
private void onMaxLengthReached() { private void onMaxLengthReached() {
if (mMaxLengthReached) return; if (mMaxLengthReached) {
LOG.w(mName, "onMaxLengthReached: Called twice.");
} else {
mMaxLengthReached = true; mMaxLengthReached = true;
if (mState >= STATE_LIMIT_REACHED) { if (mState >= STATE_LIMIT_REACHED) {
LOG.w(mName, "onMaxLengthReached: Reached in wrong state. Aborting.", mState); LOG.w(mName, "onMaxLengthReached: Reached in wrong state. Aborting.", mState);
@ -544,6 +546,7 @@ public abstract class MediaEncoder {
mController.requestStop(mTrackIndex); mController.requestStop(mTrackIndex);
} }
} }
}
/** /**
* Should be called by subclasses to pass the milliseconds of the first frame - as soon * Should be called by subclasses to pass the milliseconds of the first frame - as soon

@ -181,6 +181,7 @@ public class TextureMediaEncoder extends VideoMediaEncoder<TextureConfig> {
LOG.i("onEvent -", LOG.i("onEvent -",
"frameNumber:", mFrameNumber, "frameNumber:", mFrameNumber,
"timestampUs:", frame.timestampUs(), "timestampUs:", frame.timestampUs(),
"hasReachedMaxLength:", hasReachedMaxLength(),
"- draining."); "- draining.");
drainOutput(false); drainOutput(false);

Loading…
Cancel
Save