Skip to content

Commit 80d66a0

Browse files
committed
remove lots of ununsed camerax stuff
now all jni libs seems to be nicely aligned for 16kB === ELF alignment === lib/arm64-v8a/libiocipher2.so: ALIGNED (2**14) lib/arm64-v8a/libsqlitejdbc.so: ALIGNED (2**14) lib/arm64-v8a/libloggingstdout.so: ALIGNED (2**14) lib/arm64-v8a/libnative-audio-jni.so: ALIGNED (2**14) lib/arm64-v8a/libjni-c-toxcore.so: ALIGNED (2**14) lib/x86_64/libiocipher2.so: ALIGNED (2**14) lib/x86_64/libsqlitejdbc.so: ALIGNED (2**14) lib/x86_64/libloggingstdout.so: ALIGNED (2**14) lib/x86_64/libnative-audio-jni.so: ALIGNED (2**14) lib/x86_64/libjni-c-toxcore.so: ALIGNED (2**14) lib/x86/libiocipher2.so: ALIGNED (2**14) lib/x86/libsqlitejdbc.so: ALIGNED (2**14) lib/x86/libloggingstdout.so: ALIGNED (2**14) lib/x86/libnative-audio-jni.so: ALIGNED (2**14) lib/x86/libjni-c-toxcore.so: ALIGNED (2**14) lib/armeabi-v7a/libiocipher2.so: ALIGNED (2**14) lib/armeabi-v7a/libsqlitejdbc.so: ALIGNED (2**14) lib/armeabi-v7a/libloggingstdout.so: ALIGNED (2**14) lib/armeabi-v7a/libnative-audio-jni.so: ALIGNED (2**14) lib/armeabi-v7a/libjni-c-toxcore.so: ALIGNED (2**14) ELF Verification Successful =====================
1 parent e0b0776 commit 80d66a0

File tree

5 files changed

+260
-245
lines changed

5 files changed

+260
-245
lines changed

android-refimpl-app/app/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -408,14 +408,6 @@ dependencies {
408408
testImplementation 'androidx.test.ext:truth:1.5.0'
409409
androidTestUtil "androidx.test.services:test-services:1.5.0"
410410
// ---------------------
411-
// --------- background blur ------------
412-
// ---------------------
413-
// CameraX dependencies
414-
implementation "androidx.camera:camera-lifecycle:1.3.4"
415-
implementation 'androidx.camera:camera-camera2:1.3.4'
416-
implementation 'androidx.camera:camera-view:1.3.4'
417-
implementation 'androidx.camera:camera-extensions:1.3.4'
418-
//
419411
}
420412

421413
apply from: 'gradle_witness_ng.gradle'

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

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import android.content.Context;
2929
import android.content.Intent;
3030
import android.content.SharedPreferences;
31-
import android.content.res.AssetFileDescriptor;
3231
import android.graphics.Color;
3332
import android.graphics.drawable.Drawable;
3433
import android.hardware.Sensor;
@@ -49,7 +48,6 @@
4948
import android.preference.PreferenceManager;
5049
import android.util.Log;
5150
import android.view.MotionEvent;
52-
import android.view.OrientationEventListener;
5351
import android.view.SurfaceHolder;
5452
import android.view.View;
5553
import android.view.ViewGroup;
@@ -61,28 +59,15 @@
6159
import android.widget.TextView;
6260

6361
import com.etiennelawlor.discreteslider.library.ui.DiscreteSlider;
64-
import com.google.common.util.concurrent.ListenableFuture;
6562
import com.google.speech.levelmeter.BarLevelDrawable;
6663
import com.mikepenz.google_material_typeface_library.GoogleMaterial;
6764
import com.mikepenz.iconics.IconicsDrawable;
6865

69-
import java.io.FileInputStream;
7066
import java.io.IOException;
7167
import java.nio.ByteBuffer;
72-
import java.nio.MappedByteBuffer;
73-
import java.nio.channels.FileChannel;
74-
import java.util.concurrent.Executors;
7568

76-
import androidx.annotation.NonNull;
7769
import androidx.annotation.RequiresApi;
7870
import androidx.appcompat.app.AppCompatActivity;
79-
import androidx.camera.core.CameraSelector;
80-
import androidx.camera.core.ImageAnalysis;
81-
import androidx.camera.core.Preview;
82-
import androidx.camera.lifecycle.ProcessCameraProvider;
83-
import androidx.camera.view.PreviewView;
84-
import androidx.core.content.ContextCompat;
85-
import androidx.lifecycle.LifecycleOwner;
8671

8772
import static android.media.MediaCodec.BUFFER_FLAG_END_OF_STREAM;
8873
import static com.zoffcc.applications.nativeaudio.NativeAudio.get_aec_active;
@@ -174,14 +159,8 @@ public class CallingActivity extends AppCompatActivity implements CameraWrapper.
174159
static boolean trifa_is_MicrophoneMute = false;
175160
private static final String TAG = "trifa.CallingActivity";
176161
static CameraSurfacePreview cameraSurfacePreview = null;
177-
static PreviewView cameraXPreview = null;
178162
static CameraDrawingOverlay drawingOverlay = null;
179-
static ProcessCameraProvider cameraProvider = null;
180-
static ListenableFuture<ProcessCameraProvider> cameraProviderListenableFuture = null;
181163
static float mPreviewRate = -1f;
182-
// static int front_camera_id = -1;
183-
// static int back_camera_id = -1;
184-
// static int active_camera_id = 0;
185164
static AudioRecording audio_thread = null;
186165
static AudioReceiver audio_receiver_thread = null;
187166
private SensorManager sensor_manager = null;
@@ -515,8 +494,8 @@ public void onProgressChanged(SeekBar s, int progress_value, boolean from_user)
515494
try
516495
{
517496
int res = toxav_option_set(tox_friend_by_public_key__wrapper(Callstate.friend_pubkey),
518-
ToxVars.TOXAV_OPTIONS_OPTION.TOXAV_DECODER_VIDEO_ADD_DELAY_MS.value,
519-
-PREF__video_play_delay_ms);
497+
ToxVars.TOXAV_OPTIONS_OPTION.TOXAV_DECODER_VIDEO_ADD_DELAY_MS.value,
498+
-PREF__video_play_delay_ms);
520499
Log.i(TAG, "play_delay_ms=" + -PREF__video_play_delay_ms + ":res=" + res);
521500
}
522501
catch (Exception e)
@@ -1254,7 +1233,8 @@ public boolean onTouch(View v, MotionEvent event)
12541233
}
12551234
else
12561235
{
1257-
Log.i(TAG, "accept_button:onTouch:003 " + Callstate.accepted_call + " " + Callstate.friend_pubkey);
1236+
Log.i(TAG,
1237+
"accept_button:onTouch:003 " + Callstate.accepted_call + " " + Callstate.friend_pubkey);
12581238
if (Callstate.accepted_call != 1)
12591239
{
12601240
Log.i(TAG, "answer button pressed");
@@ -1677,7 +1657,7 @@ protected void onResume()
16771657
sensor_manager.registerListener(this, proximity_sensor, SensorManager.SENSOR_DELAY_NORMAL);
16781658
sensor_manager.registerListener(this, accelerometer_sensor, SensorManager.SENSOR_DELAY_NORMAL);
16791659

1680-
Log.i(TAG,"restart_audio_system__normal_call:101");
1660+
Log.i(TAG, "restart_audio_system__normal_call:101");
16811661
HelperGeneric.restart_audio_system();
16821662

16831663
// update call time every second -----------
@@ -1818,7 +1798,7 @@ protected void onPause()
18181798
{
18191799
set_rec_preset(true);
18201800
}
1821-
catch(Exception ignored)
1801+
catch (Exception ignored)
18221802
{
18231803
}
18241804

@@ -1834,7 +1814,7 @@ else if (Callstate.audio_ngc_group_active)
18341814
}
18351815
else
18361816
{
1837-
Log.i(TAG,"restart_audio_system__normal_call:005:preset_TRUE");
1817+
Log.i(TAG, "restart_audio_system__normal_call:005:preset_TRUE");
18381818
HelperGeneric.restart_audio_system();
18391819
}
18401820
}
@@ -2004,11 +1984,9 @@ public void run()
20041984

20051985
private void initUI()
20061986
{
2007-
cameraXPreview = findViewById(R.id.camera_preview_view);
20081987
drawingOverlay = findViewById(R.id.camera_drawing_overlay);
20091988
cameraSurfacePreview = (CameraSurfacePreview) findViewById(R.id.camera_surfaceview);
20101989

2011-
cameraXPreview.setVisibility(View.INVISIBLE);
20121990
drawingOverlay.setVisibility(View.INVISIBLE);
20131991
}
20141992

@@ -2074,7 +2052,6 @@ public void turnOnScreen__new()
20742052
{
20752053
try
20762054
{
2077-
// calling_activity_top_viewgroup_vg.setVisibility(View.VISIBLE);
20782055
mContentView.setVisibility(View.VISIBLE);
20792056
}
20802057
catch (Exception e)
@@ -2093,7 +2070,6 @@ public void turnOffScreen__new()
20932070
{
20942071
// in case the phone does not really turn the screen off
20952072
mContentView.setVisibility(View.INVISIBLE);
2096-
// calling_activity_top_viewgroup_vg.setVisibility(View.INVISIBLE);
20972073
}
20982074
catch (Exception e)
20992075
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ protected void onDraw(Canvas canvas)
116116
{
117117
if (canvas != null)
118118
{
119-
// canvas.drawBitmap(RotateBitmap(maskBitmap, 0), null, r, null);
120119
canvas.drawBitmap(maskBitmap, null, r, null);
121120
}
122121
}

0 commit comments

Comments
 (0)