| author | Lei Qian <lei.qian@amlogic.com> | 2018-01-10 15:44:50 (GMT) |
|---|---|---|
| committer | Lei Qian <lei.qian@amlogic.com> | 2018-01-11 03:10:16 (GMT) |
| commit | 973601bd4d11ded1a44cd0157c6359c4307c7dbd (patch) | |
| tree | 3914019ef046a5db06505c7314c93fe34df499d4 | |
| parent | e8719944b168280e66b10daee89042786122103d (diff) | |
| download | TvInput-973601bd4d11ded1a44cd0157c6359c4307c7dbd.zip TvInput-973601bd4d11ded1a44cd0157c6359c4307c7dbd.tar.gz TvInput-973601bd4d11ded1a44cd0157c6359c4307c7dbd.tar.bz2 | |
AVInputService: fix null point error[1/1]
PD# 158505
Change-Id: I53d2db5233fd0d39ed982d874194cdcdf8658faa
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
| -rw-r--r-- | DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV1InputService.java | 16 | ||||
| -rw-r--r-- | DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV2InputService.java | 16 |
2 files changed, 24 insertions, 8 deletions
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV1InputService.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV1InputService.java index 29deacc..ee16530 100644 --- a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV1InputService.java +++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV1InputService.java @@ -156,6 +156,8 @@ public class AV1InputService extends DroidLogicTvInputService { protected CaptioningManager mCaptioningManager = null; protected SystemControlManager mSystemControlManager; private static final int DELAY_TRY_PREFER_CC = 2000; + // void receiving vbi too late when switching to this source + private boolean needRestartCC = false; private class CCStyleParams { protected int fg_color; @@ -236,9 +238,15 @@ public class AV1InputService extends DroidLogicTvInputService { @Override public void notifyVideoAvailable() { super.notifyVideoAvailable(); - stopSubtitle(); - startSubtitleAutoAnalog(); - mSubtitleView.setVisible(is_subtitle_enable); + if (needRestartCC) { + stopSubtitle(); + startSubtitleAutoAnalog(); + } + needRestartCC = true; + + if (mSubtitleView != null) { + mSubtitleView.setVisible(is_subtitle_enable); + } } @Override @@ -246,8 +254,8 @@ public class AV1InputService extends DroidLogicTvInputService { super.notifyVideoUnavailable(reason); if (mOverlayView != null) { mOverlayView.setTextVisibility(true); + mSubtitleView.setVisible(false); } - mSubtitleView.setVisible(false); } @Override diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV2InputService.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV2InputService.java index 6454d4c..5db5903 100644 --- a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV2InputService.java +++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AV2InputService.java @@ -156,6 +156,8 @@ public class AV2InputService extends DroidLogicTvInputService { protected CaptioningManager mCaptioningManager = null; protected SystemControlManager mSystemControlManager; private static final int DELAY_TRY_PREFER_CC = 2000; + // void receiving vbi too late when switching to this source + private boolean needRestartCC = false; private class CCStyleParams { protected int fg_color; @@ -236,9 +238,15 @@ public class AV2InputService extends DroidLogicTvInputService { @Override public void notifyVideoAvailable() { super.notifyVideoAvailable(); - stopSubtitle(); - startSubtitleAutoAnalog(); - mSubtitleView.setVisible(is_subtitle_enable); + if (needRestartCC) { + stopSubtitle(); + startSubtitleAutoAnalog(); + } + needRestartCC = true; + + if (mSubtitleView != null) { + mSubtitleView.setVisible(is_subtitle_enable); + } } @Override @@ -246,8 +254,8 @@ public class AV2InputService extends DroidLogicTvInputService { super.notifyVideoUnavailable(reason); if (mOverlayView != null) { mOverlayView.setTextVisibility(true); + mSubtitleView.setVisible(false); } - mSubtitleView.setVisible(false); } @Override |