Skip to content

Commit 20446e5

Browse files
committed
Revert "DEBUG: revert 39e1c46"
This reverts commit cc8a4ed.
1 parent cc8a4ed commit 20446e5

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/CallingActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public class CallingActivity extends AppCompatActivity implements CameraWrapper.
224224
private static int BUFFER_DEQUEUE_TIMEOUT_US = 0; // "us" fetch encoded data from encoder
225225
private static int BUFFER_DEQUEUE_FEEDER_TIMEOUT_US = 0; // "us" feed raw data to encoder
226226

227-
// static Object VIDEO_ROTATION_LOCK = new Object();
227+
static Object VIDEO_ROTATION_LOCK = new Object();
228228

229229
@Override
230230
protected void onCreate(Bundle savedInstanceState)
@@ -2275,7 +2275,7 @@ else if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER)
22752275
//Log.d(TAG, "onSensorChanged: x=" + event.values[0] + " y=" + event.values[1] + " z=" +
22762276
// event.values[2]);
22772277

2278-
//*DISABLE*// synchronized(VIDEO_ROTATION_LOCK)
2278+
synchronized(VIDEO_ROTATION_LOCK)
22792279
{
22802280
float x = event.values[0];
22812281
float y = event.values[1];

android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/CustomVideoImageView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import android.view.MotionEvent;
1111
import android.view.View;
1212

13-
// import static com.zoffcc.applications.trifa.CallingActivity.VIDEO_ROTATION_LOCK;
13+
import static com.zoffcc.applications.trifa.CallingActivity.VIDEO_ROTATION_LOCK;
1414
import static com.zoffcc.applications.trifa.CallingActivity.device_orientation;
1515
import static com.zoffcc.applications.trifa.MainActivity.PREF__X_zoom_incoming_video;
1616

@@ -118,7 +118,7 @@ public static void video_output_orentation_update()
118118

119119
public void setBitmap(Bitmap bitmap)
120120
{
121-
//*DISABLE*// synchronized(VIDEO_ROTATION_LOCK)
121+
synchronized(VIDEO_ROTATION_LOCK)
122122
{
123123
if (bitmap != null)
124124
{

0 commit comments

Comments
 (0)