|
|
|
@ -245,9 +245,6 @@ public class Camera2VideoActivity extends AppCompatActivity {
|
|
|
|
|
|
|
|
|
|
mTimeMask = 0;
|
|
|
|
|
if (!TextUtils.isEmpty(mOSDLeftTop)) {
|
|
|
|
|
mOSDLeftTop = mOSDLeftTop.replace("\r\n", "\n");
|
|
|
|
|
mOSDLeftTop = mOSDLeftTop.replace("\n\r", "\n");
|
|
|
|
|
mOSDLeftTop = mOSDLeftTop.replace("\r", "\n");
|
|
|
|
|
if (mOSDLeftTop.indexOf(TIME_MICRO_TS) != 0) {
|
|
|
|
|
mTimeMask |= TIME_MASK_LT_TS;
|
|
|
|
|
}
|
|
|
|
@ -259,9 +256,6 @@ public class Camera2VideoActivity extends AppCompatActivity {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!TextUtils.isEmpty(mOSDRightTop)) {
|
|
|
|
|
mOSDRightTop = mOSDRightTop.replace("\r\n", "\n");
|
|
|
|
|
mOSDRightTop = mOSDRightTop.replace("\n\r", "\n");
|
|
|
|
|
mOSDRightTop = mOSDRightTop.replace("\r", "\n");
|
|
|
|
|
if (mOSDRightTop.indexOf(TIME_MICRO_TS) != 0) {
|
|
|
|
|
mTimeMask |= TIME_MASK_RT_TS;
|
|
|
|
|
}
|
|
|
|
@ -273,9 +267,6 @@ public class Camera2VideoActivity extends AppCompatActivity {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!TextUtils.isEmpty(mOSDRightBottom)) {
|
|
|
|
|
mOSDRightBottom = mOSDRightBottom.replace("\r\n", "\n");
|
|
|
|
|
mOSDRightBottom = mOSDRightBottom.replace("\n\r", "\n");
|
|
|
|
|
mOSDRightBottom = mOSDRightBottom.replace("\r", "\n");
|
|
|
|
|
if (mOSDRightBottom.indexOf(TIME_MICRO_TS) != 0) {
|
|
|
|
|
mTimeMask |= TIME_MASK_RB_TS;
|
|
|
|
|
}
|
|
|
|
@ -288,9 +279,6 @@ public class Camera2VideoActivity extends AppCompatActivity {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!TextUtils.isEmpty(mOSDLeftBottom)) {
|
|
|
|
|
mOSDLeftBottom = mOSDLeftBottom.replace("\r\n", "\n");
|
|
|
|
|
mOSDLeftBottom = mOSDLeftBottom.replace("\n\r", "\n");
|
|
|
|
|
mOSDLeftBottom = mOSDLeftBottom.replace("\r", "\n");
|
|
|
|
|
if (mOSDLeftBottom.indexOf(TIME_MICRO_TS) != 0) {
|
|
|
|
|
mTimeMask |= TIME_MASK_LB_TS;
|
|
|
|
|
}
|
|
|
|
|