feat: per-slot Turn in the camera settings, H.264/H.265 turned by the decoder (#201)

README.md

@@ -63,7 +63,7 @@ A beta channel is available on [Google Play](https://play.google.com/apps/intern
    ```
    rtsp://username:password@ip_address:554/stream=0
    ```
-   Under the URL you can choose the transport; Auto (UDP, falling back to TCP) is the default for a new slot. Other URL types: [Transports](docs/transports.md).
+   Under the URL you can choose the transport; Auto (UDP, falling back to TCP) is the default for a new slot. Below it, **Turn** turns the picture of a camera mounted sideways or upside down. Other URL types: [Transports](docs/transports.md).
 4. Press **Save**. The app connects straight away and reconnects automatically if the stream drops.
 
 ## Controls

README.ru.md

@@ -63,7 +63,7 @@
    ```
    rtsp://username:password@ip_address:554/stream=0
    ```
-   Под адресом можно выбрать транспорт; у нового слота по умолчанию Auto (UDP с откатом на TCP). Другие виды адресов — в [Transports](docs/transports.md) (на английском).
+   Под адресом можно выбрать транспорт; у нового слота по умолчанию Auto (UDP с откатом на TCP). Ниже настройка **Turn** поворачивает картинку камеры, установленной боком или вверх ногами. Другие виды адресов — в [Transports](docs/transports.md) (на английском).
 4. Нажмите **Save**. Приложение сразу подключится и само переподключится, если поток прервётся.
 
 ## Управление

README.zh-CN.md

@@ -63,7 +63,7 @@
    ```
    rtsp://username:password@ip_address:554/stream=0
    ```
-   地址下方可选择传输方式，新槽位默认为 Auto（优先 UDP，必要时回退到 TCP）。其他地址格式见 [Transports](docs/transports.md)（英文）。
+   地址下方可选择传输方式，新槽位默认为 Auto（优先 UDP，必要时回退到 TCP）。其下的 **Turn** 可旋转画面，适用于侧装或倒装的摄像机。其他地址格式见 [Transports](docs/transports.md)（英文）。
 4. 点击 **Save**。应用会立即连接；视频流中断时会自动重连。
 
 ## 操作说明

android/app/build.gradle

@@ -23,8 +23,8 @@ android {
         applicationId "com.openipc.decoder"
         minSdk 21
         targetSdk 36
-        versionCode 41
-        versionName "2.16"
+        versionCode 43
+        versionName "2.18"
 
         buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
     }

android/app/src/main/java/com/openipc/decoder/Decoder.java

@@ -138,6 +138,8 @@ public class Decoder extends Activity
     private final String[] mHosts = new String[CAM_COUNT];
     /** RTP transport per slot (#67): TCP, UDP or Auto (UDP with fallback to TCP). */
     private final Transport.Mode[] mTransports = new Transport.Mode[CAM_COUNT];
+    /** Per slot (#201): degrees counter-clockwise, -1 for Auto (from the URL). */
+    private final int[] mRotates = new int[CAM_COUNT];
     private int mActive;
     private volatile String mHost;
     private String mVersion;
@@ -209,7 +211,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // --- Create managers ---
         videoDecoder = new MediaCodecManager(new MediaCodecManager.Listener() {
-            @Override public void onResolutionChanged(int w, int h) { updateResolution(w, h); }
+            @Override public void onResolutionChanged(int w, int h) {
+                // The decoder turns the picture (#201): a quarter turn swaps its sides
+                RtspClient c = rtspClient;
+                int r = c != null ? c.rotate() : 0;
+                if (r == 90 || r == 270) updateResolution(h, w);
+                else updateResolution(w, h);
+            }
             @Override public void onDecoderStarted() { removeClearOverlay(); }
             @Override public void onDecoderFailed() {}
         });
@@ -396,7 +404,7 @@ public void onToggleQuad() {
             if (configured) {
                 // A probe of this camera ends first: some take one client only (#100)
                 streamProbes.willShow(mHost);
-                rtspClient.configure(mHost, mUserAgent, mTransports[mActive]);
+                configureClient();
                 startListener();
                 rtspClient.start();
             }
@@ -580,7 +588,9 @@ private void restartClean() {
     }
 
     @Override
-    public void onShowSettings() { menuManager.showUrlEditor(mActive, mHosts, mTransports); }
+    public void onShowSettings() {
+        menuManager.showUrlEditor(mActive, mHosts, mTransports, mRotates);
+    }
 
     @Override
     public void onWebUI() { menuManager.startBrowser(mHost); }
@@ -590,8 +600,16 @@ private void restartClean() {
 
     // ====================== Video lifecycle ======================
 
+    /** The single view's client for the active slot, with the slot's turn (#201). */
+    private void configureClient() {
+        rtspClient.configure(mHost, mUserAgent, mTransports[mActive]);
+        rtspClient.setSlotTurn(mRotates[mActive]);
+    }
+
     private void createDecoder() {
         videoDecoder.setSurface(mVideoSurface);
+        RtspClient c = rtspClient;
+        videoDecoder.setRotation(c != null ? c.rotate() : 0);
         videoDecoder.createDecoder(codecH265);
     }
 
@@ -631,6 +649,7 @@ private void loadSettings() {
             mUnreadable[i] = url == null && stored != null ? stored : null;
             // Auto for a slot that has never stored one (#112)
             mTransports[i] = Transport.Mode.stored(pref.getString("transport_" + i, null));
+            mRotates[i] = pref.getInt("rotate_" + i, -1);
             // Plain URLs from older versions are re-saved encrypted right away
             if (credentials.needsMigration(stored)) {
                 if (migrate == null) migrate = pref.edit();
@@ -693,6 +712,7 @@ private void saveSettings() {
             edit.putString("host_" + i,
                     credentials.sealForSlot(mHosts[i], mUnreadable[i], DEFAULT_URL));
             edit.putString("transport_" + i, mTransports[i].name());
+            edit.putInt("rotate_" + i, mRotates[i]);
         }
         edit.apply();
 
@@ -715,7 +735,7 @@ private void saveSettings() {
 
         // A probe of this camera ends first: some take one client only (#100)
         streamProbes.willShow(mHost);
-        rtspClient.configure(mHost, mUserAgent, mTransports[mActive]);
+        configureClient();
         startListener();
         rtspClient.start();
     }
@@ -1002,6 +1022,7 @@ private void createQuadCells() {
             Transport.Mode mode = i == U_CELL ? Transport.Mode.UDP : mTransports[i];
             quadCells[i] = new QuadCell(i, url, mode, quadViews[i], framePool, mUserAgent,
                     index -> runOnUiThread(() -> removeQuadOverlay(index)));
+            quadCells[i].setSlotTurn(i < CAM_COUNT ? mRotates[i] : -1);
             quadCells[i].start();
         }
         quadAudio = getSharedPreferences("settings", MODE_PRIVATE).getInt("quad_audio", -1);
@@ -1603,8 +1624,8 @@ private Map<String, Object> debugState() {
             if (jl != null) single.put("jieli", jl);
             Map<String, Object> hb = rtspClient != null ? rtspClient.heartbeatStats() : null;
             if (hb != null) single.put("heartbeat", hb);
-            // MJPEG turned counter-clockwise, "size" is the turned one (#200)
-            int rotate = rtspClient != null && rtspClient.isJpeg() ? rtspClient.rotate() : 0;
+            // Turned counter-clockwise, "size" is the turned one (#200, #201)
+            int rotate = rtspClient != null ? rtspClient.rotate() : 0;
             if (rotate != 0) single.put("rotate", rotate);
             m.put("single", single);
         }
@@ -2600,7 +2621,7 @@ private void startStreams() {
             if (configured) {
                 // A probe of this camera ends first: some take one client only (#100)
                 streamProbes.willShow(mHost);
-                rtspClient.configure(mHost, mUserAgent, mTransports[mActive]);
+                configureClient();
                 startListener();
                 rtspClient.start();
             }

android/app/src/main/java/com/openipc/decoder/JpegCodec.java

@@ -11,6 +11,7 @@
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
 import android.media.MediaFormat;
+import android.os.Build;
 import android.util.Log;
 import android.view.Surface;
 
@@ -42,6 +43,8 @@ final class JpegCodec {
     private Surface surface;
     private int width;
     private int height;
+    /** Degrees counter-clockwise the decoder turns its output (#201). */
+    private int rotation;
     private final MediaCodec.BufferInfo info = new MediaCodec.BufferInfo();
 
     /** {name, mime} of a hardware-or-vendor JPEG decoder, or null; looked up once. */
@@ -123,10 +126,11 @@ interface Current {
         boolean holds();
     }
 
-    synchronized boolean decode(Frame frame, Surface target, int w, int h, Current current)
-            throws Exception {
+    synchronized boolean decode(Frame frame, Surface target, int w, int h, int rotate,
+            Current current) throws Exception {
         if (!current.holds()) return false;
-        if (codec == null || target != surface || w != width || h != height) {
+        if (codec == null || target != surface || w != width || h != height
+                || rotate != rotation) {
             releaseLocked();
             MediaCodec c;
             String[] dec;
@@ -149,6 +153,10 @@ synchronized boolean decode(Frame frame, Surface target, int w, int h, Current c
                     MediaFormat format = MediaFormat.createVideoFormat(dec[1], w, h);
                     format.setInteger(MediaFormat.KEY_MAX_INPUT_SIZE,
                             Math.max(frame.length() * 2, 512 * 1024));
+                    // Turned by the decoder on the surface, clockwise degrees here (#201)
+                    if (rotate != 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        format.setInteger(MediaFormat.KEY_ROTATION, (360 - rotate) % 360);
+                    }
                     c.configure(format, target, null, 0);
                     c.start();
                 } catch (Exception e) {
@@ -164,6 +172,7 @@ synchronized boolean decode(Frame frame, Surface target, int w, int h, Current c
             surface = target;
             width = w;
             height = h;
+            rotation = rotate;
             Log.i(TAG, "Start MJPEG decoder " + dec[0] + " " + w + "x" + h);
         }
         int in = codec.dequeueInputBuffer(40_000);

android/app/src/main/java/com/openipc/decoder/JpegRenderer.java

@@ -14,6 +14,7 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.os.Build;
 import android.util.Log;
 import android.view.Surface;
 
@@ -49,14 +50,16 @@ final class JpegRenderer {
      */
     int[] render(Frame frame, Surface s, int rotate, JpegCodec.Current current) {
         if (s == null || !s.isValid() || !current.holds()) return null;
-        // The hardware JPEG decoder first, where there is one (#132); a turned frame is drawn
-        // by the app, which turns it while drawing (#200)
-        if (rotate == 0 && !hwFailed && !drawn && JpegCodec.candidate() != null) {
+        // The hardware JPEG decoder first, where there is one (#132); it turns the frame itself
+        // from Android 6 on (#201), before that a turned frame is drawn by the app (#200)
+        boolean hwTurns = rotate == 0 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
+        if (hwTurns && !hwFailed && !drawn && JpegCodec.candidate() != null) {
             int[] size = JpegAssembler.size(frame.data(), frame.length());
             if (size != null) {
                 try {
                     software = false;
-                    return codec.decode(frame, s, size[0], size[1], current) ? size : null;
+                    return codec.decode(frame, s, size[0], size[1], rotate, current)
+                            ? shownSize(size[0], size[1], rotate) : null;
                 } catch (Exception e) {
                     codec.release();
                     // The surface was replaced meanwhile: not the decoder's fault, try again

android/app/src/main/java/com/openipc/decoder/MediaCodecManager.java

@@ -56,6 +56,8 @@ class MediaCodecManager {
 
     // Surface set by the owning activity
     private volatile Surface surface;
+    /** Degrees counter-clockwise the decoder turns the picture (#201); 0 for none. */
+    private volatile int rotation;
 
     /** Frames rendered so far (#82): with the frames received this gives the real decode rate. */
     private volatile int framesOut;
@@ -255,6 +257,11 @@ void setSurface(Surface s) {
         this.surface = s;
     }
 
+    /** See {@link #rotation}; takes effect with the next decoder. */
+    void setRotation(int degreesCcw) {
+        rotation = ((degreesCcw % 360) + 360) % 360;
+    }
+
     /** Enable or disable decoding; disabling also releases the decoder. */
     /**
      * Enable or disable decoding. Never blocks the caller (the UI thread): disabling only
@@ -375,6 +382,11 @@ void createDecoder(boolean codecH265) {
                 local = MediaCodec.createDecoderByType(type);
                 learnLimits(local, type);
             }
+            int turn = rotation;
+            if (turn != 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                // The decoder turns its output on the surface: clockwise degrees here (#201)
+                format.setInteger(MediaFormat.KEY_ROTATION, (360 - turn) % 360);
+            }
             try {
                 local.configure(format, s, null, 0);
                 local.start();

android/app/src/main/java/com/openipc/decoder/MenuManager.java

@@ -28,6 +28,7 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.EditText;
+import android.widget.HorizontalScrollView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.RadioButton;
@@ -540,7 +541,8 @@ private EditText createEdit(String title) {
         return text;
     }
 
-    void showUrlEditor(int mActive, String[] mHosts, Transport.Mode[] mTransports) {
+    void showUrlEditor(int mActive, String[] mHosts, Transport.Mode[] mTransports,
+            int[] mRotates) {
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         builder.setTitle("Camera " + (mActive + 1) + " URL");
 
@@ -564,11 +566,29 @@ void showUrlEditor(int mActive, String[] mHosts, Transport.Mode[] mTransports) {
             if (modes[i] == mTransports[mActive]) b.setChecked(true);
         }
 
+        // Turn of the picture (#201): Auto leaves it to the URL's ?rotate= or a toy's default;
+        // the degrees are counter-clockwise, as in ?rotate=
+        RadioGroup turn = new RadioGroup(activity);
+        turn.setOrientation(RadioGroup.HORIZONTAL);
+        int[] turns = {-1, 0, 90, 180, 270};
+        String[] turnLabels = {"Auto", "0°", "90° ↺", "180°", "270° ↺"};
+        for (int i = 0; i < turns.length; i++) {
+            RadioButton b = new RadioButton(activity);
+            b.setId(View.generateViewId());
+            b.setText(turnLabels[i]);
+            b.setTag(turns[i]);
+            turn.addView(b);
+            if (turns[i] == mRotates[mActive]) b.setChecked(true);
+        }
         LinearLayout content = new LinearLayout(activity);
         content.setOrientation(LinearLayout.VERTICAL);
         content.setPadding(dp(16), dp(8), dp(16), 0);
         content.addView(input);
         content.addView(transport);
+        // Five choices do not fit a phone's width: the row scrolls (Qodo on #225)
+        HorizontalScrollView turnRow = new HorizontalScrollView(activity);
+        turnRow.addView(turn);
+        content.addView(turnRow);
         builder.setView(content);
 
         final int slot = mActive;
@@ -577,6 +597,8 @@ void showUrlEditor(int mActive, String[] mHosts, Transport.Mode[] mTransports) {
             mHosts[slot] = Decoder.sanitizeUrl(url);
             View checked = transport.findViewById(transport.getCheckedRadioButtonId());
             if (checked != null) mTransports[slot] = (Transport.Mode) checked.getTag();
+            View turned = turn.findViewById(turn.getCheckedRadioButtonId());
+            if (turned != null) mRotates[slot] = (Integer) turned.getTag();
             if (listener != null) listener.onSaveSettings(); // triggers save + reconnect
         });
         builder.setNegativeButton("Cancel", (dialog, which) -> dialog.cancel());

android/app/src/main/java/com/openipc/decoder/QuadCell.java

@@ -437,8 +437,9 @@ static boolean isKeyFrameNal(int type, boolean h265) {
     /** The cooingdv heartbeat of an RTSP cell once it used one (#187), else null. */
     java.util.Map<String, Object> heartbeatStats() { return session.heartbeatStats(); }
 
-    /** Degrees counter-clockwise the MJPEG frames are turned (#200), 0 for none. */
-    int rotate() { return jpeg ? session.rotate() : 0; }
+    /** Degrees counter-clockwise the frames are turned (#200, #201), 0 for none. */
+    int rotate() { return session.rotate(); }
+    void setSlotTurn(int rotate) { session.setSlotTurn(rotate); }
 
     /** Transport in use, with the mode after a fallback (#112). */
     String transportLabel() { return Transport.label(session.transportInUse(), transport); }
@@ -694,6 +695,7 @@ private void decode(Frame buffer) {
             Surface s = surface;
             if (s == null || !s.isValid()) return;
             decoder.setSurface(s);
+            decoder.setRotation(session.rotate());
             decoder.createDecoder(codecH265);
             // Feed the frame that triggered creation (often the SPS) to the new decoder
             decoder.decodeFrame(buffer, codecH265, 0);

android/app/src/main/java/com/openipc/decoder/RtspClient.java

@@ -97,6 +97,7 @@ void configure(String host, String userAgent, Transport.Mode transport) {
 
     /** Degrees counter-clockwise the MJPEG frames are turned (#200), 0 for none. */
     int rotate() { return session.rotate(); }
+    void setSlotTurn(int rotate) { session.setSlotTurn(rotate); }
 
     void start() {
         nalAssembler.reset();