Set matching resolution

OpenIPC · Aug 30, 2024 · 9753743 · 9753743
1 parent eac2f17
commit 9753743
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/src/main/java/com/openipc/pixelpilot/VideoActivity.java b/app/src/main/java/com/openipc/pixelpilot/VideoActivity.java
@@ -29,6 +29,7 @@
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.documentfile.provider.DocumentFile;
 
 import com.github.mikephil.charting.charts.PieChart;
@@ -124,6 +125,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = ActivityVideoBinding.inflate(getLayoutInflater());
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
         wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
 
         // Init wfb ng.
@@ -494,6 +496,13 @@ public void onChannelSettingChanged(int channel) {
     public void onVideoRatioChanged(final int videoW, final int videoH) {
         lastVideoW = videoW;
         lastVideoH = videoH;
+
+        Log.d(TAG, "Set resolution: " + videoW + "x" + videoH);
+        View mSurface = findViewById(R.id.mainVideo);
+        ConstraintLayout.LayoutParams params =
+                (ConstraintLayout.LayoutParams) mSurface.getLayoutParams();
+        params.dimensionRatio = videoW + ":" + videoH;
+        runOnUiThread(() -> mSurface.setLayoutParams(params));
     }
 
     @Override

diff --git a/app/videonative/src/main/cpp/VideoDecoder.cpp b/app/videonative/src/main/cpp/VideoDecoder.cpp
@@ -227,16 +227,14 @@ void VideoDecoder::checkOutputLoop() {
                                                               BUFFER_TIMEOUT_US);
         if (index >= 0) {
             const auto now = steady_clock::now();
-            const int64_t nowNS = (int64_t) duration_cast<nanoseconds>(
-                    now.time_since_epoch()).count();
             const int64_t nowUS = (int64_t) duration_cast<microseconds>(
                     now.time_since_epoch()).count();
             //the timestamp for releasing the buffer is in NS, just release as fast as possible (e.g. now)
             //https://android.googlesource.com/platform/frameworks/av/+/master/media/ndk/NdkMediaCodec.cpp
             //-> renderOutputBufferAndRelease which is in https://android.googlesource.com/platform/frameworks/av/+/3fdb405/media/libstagefright/MediaCodec.cpp
             //-> Message kWhatReleaseOutputBuffer -> onReleaseOutputBuffer
             // also https://android.googlesource.com/platform/frameworks/native/+/5c1139f/libs/gui/SurfaceTexture.cpp
-            AMediaCodec_releaseOutputBufferAtTime(decoder.codec, (size_t) index, nowNS);
+            AMediaCodec_releaseOutputBuffer(decoder.codec, (size_t) index, true);
             //but the presentationTime is in US
             decodingTime.add(std::chrono::microseconds(nowUS - info.presentationTimeUs));
             nDecodedFrames.add(1);