Merge remote-tracking branch 'origin/remotecontrolling' into remotecontrolling

Author: skp-github

.github/workflows/assemble.yml

@@ -1,6 +1,9 @@
 name: Assemble
 
-on: [push, workflow_dispatch]
+on:
+  push:
+    branches:
+      - do-not-use
 
 jobs:
   assemble:
@@ -23,8 +26,22 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+            
+      - name: Decode Keystore
+        env:
+          ENCODED_STRING: ${{ secrets.JKS_FILE }}
+          SIGNING_KEY_STORE_PATH: ${{ secrets.KEYSTOREPATH }}
+
+        run: |
+          echo $ENCODED_STRING | base64 -i -d - > "${SIGNING_KEY_STORE_PATH}"
+          
 
       - name: Assemble release
+        env:
+          SIGNING_KEY_STORE_PATH: ${{ secrets.KEYSTOREPATH }}
+          SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          SIGNING_KEY_PASSWORD: ${{ secrets.JKS_PASSWORD }}
+          SIGNING_STORE_PASSWORD: ${{ secrets.JKS_PASSWORD }}
         run: ./gradlew assembleRelease
 
       - name: Run lint for release
@@ -41,7 +58,21 @@ jobs:
         with:
           name: lint-results
           path: app/build/reports/lint-results-*.*
+          
+
+      - name: Upload Debug
+        uses: actions/upload-artifact@v2
+        with:
+          name: debug-apk
+          path: app/build/outputs/apk/debug/app-debug.apk
+
 
+      - name: Upload Release
+        uses: actions/upload-artifact@v2
+        with:
+          name: release-apk
+          path: app/build/outputs/apk/release/*.apk 
+          
       - name: Cleanup Gradle Cache
         # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
         # Restoring these files from a GitHub Actions cache might cause problems for future builds.

.gitignore

@@ -46,3 +46,8 @@ opencamera-extended-firebase-adminsdk-yv5yz-e33a8ce5c1.json
 #
 # Python stuff
 *.pyc
+
+#
+# Project specific
+venv
+PythonTools/uploads

CaptureSync.iml

@@ -0,0 +1,118 @@
+import argparse
+from pathlib import Path
+import subprocess
+import math
+
+from video import video_info
+
+from typing import List, Tuple
+
+# See https://ffmpeg.org/ffmpeg-filters.html#xstack-1 for documentation on the xstack filter
+# Example (assuming HD input videos):
+"""
+ffmpeg -y -i video1.mp4 \
+-i video2.mp4 \
+-i video3.mp4 \
+-filter_complex \
+"\
+[0:v]scale=w=960:h=540[v0]; \
+[1:v]scale=w=960:h=540[v1]; \
+[2:v]scale=w=960:h=540[v2]; \
+[v0][v1][v2]xstack=inputs=3:layout=0_0|960_0|0_540[v]\
+" \
+-map "[v]" \
+finalOutput.mp4
+"""
+
+
+def create_video_grid_collage(video_files: List[str], output_file: str, grid_size: Tuple[int, int]) -> None:
+    # Determine the dimensions of each grid cell
+    grid_width, grid_height = grid_size
+    input_width, input_height, _ = video_info(video_files[0])
+    cell_width = input_width // grid_width
+    cell_height = input_height // grid_height
+
+    # Compose the ffmpeg command to create the collage
+    cmd = [
+        "ffmpeg",
+        "-y",  # Overwrite output file if it exists
+    ]
+
+    # Set the list of input videos
+    for i, video_file in enumerate(video_files):
+        cmd.extend(["-i", video_file])
+
+    #
+    # Generate the ffmpeg filtergraph
+    filtergraph = ""
+
+    # First, created the scaled video instances
+    for i, video_file in enumerate(video_files):
+        filtergraph += f"[{i}:v]scale=w={cell_width}:h={cell_height}[v{i}];"
+
+    # Now compose the layout for the xstack filter
+    xscale_positions = []
+    for i, video_file in enumerate(video_files):
+        col = i % grid_width
+        row = i // grid_width
+        xscale_positions.append(f"{cell_width*col}_{cell_height*row}")
+
+    filtergraph += "".join([f"[v{i}]" for i in range(len(video_files))])
+    filtergraph += f"xstack=inputs={len(xscale_positions)}:layout="
+    filtergraph += "|".join(xscale_positions)  # Compose the xstack layout (e.g.: "0_0|960_0|0_540")
+    filtergraph += "[v]"
+
+    # Append the complex filter and the remaining parameters
+    cmd.extend([
+        "-filter_complex", filtergraph,
+        "-map", "[v]",
+        "-c:v", "libx264",
+        "-crf", "18",
+        "-preset", "fast",
+        "-pix_fmt", "yuv420p",
+        output_file
+    ])
+    print("CMD:", cmd)
+    subprocess.run(cmd, capture_output=False)
+
+
+#
+# MAIN
+if __name__ == "__main__":
+
+    parser = argparse.ArgumentParser(
+        description="Fixes the videos produced by the RecSync recording sessions."
+                    "Converts the input recorder videos into videos with the same number of frames,"
+                    "with missing/dropped frames inserted as (black) artificial data."
+    )
+    parser.add_argument(
+        "--infolder", "-i", type=str, help="The folder containing the fixed videos.",
+        required=True
+    )
+    parser.add_argument(
+        "--outvideo", "-o", type=str, help="The filename to save the generated video.",
+        required=True
+    )
+
+    args = parser.parse_args()
+
+    input_dir = Path(args.infolder)
+    out_filename = args.outvideo
+
+    input_video_paths = input_dir.glob("*.mp4")
+    video_list = [str(p) for p in input_video_paths]
+    # print("Input videos: ", video_list)
+
+    # Compute the most squared grid to contain the given number of input videos (drops a row if needed)
+    n_videos = len(video_list)
+    n_cols = math.ceil(math.sqrt(n_videos))
+    n_rows = math.ceil(n_videos / n_cols)
+    # print(f"Composing grid of (cols X rows): {n_cols}X{n_rows}")
+
+    # Number of rows will be the same as number of columns, or one less
+    assert n_rows * n_cols >= n_videos
+    assert n_cols - 1 <= n_rows <= n_cols
+
+    grid_size = (n_cols, n_rows)
+
+    create_video_grid_collage(video_list, out_filename, grid_size)

Pics/RemoteController-GUI.png

@@ -1,10 +1,7 @@
 # TODO:// Need to do changes based on file storage idea. i.e what folder structure etc 
-from flask import Flask, json, request, jsonify
+from flask import Flask, request, jsonify
 import os
-import urllib.request
-import base64
 from werkzeug.utils import secure_filename
-import multipart as mp
 
 try:
     from io import BytesIO
@@ -14,21 +11,24 @@
 
 app.secret_key = "recSync-fileserver"
 
-UPLOAD_FOLDER = 'static/uploads/'
+UPLOAD_FOLDER = 'uploads/'
 app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
 
 ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif', 'mov', 'mp4', 'csv'])
 
+
 def allowed_file(filename):
     return '.' in filename and filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS
 
+
 @app.route('/')
 def main():
     return 'Homepage'
 
+
 @app.route('/upload', methods=['POST'])
 def upload_file():
-   #import pdb; pdb.set_trace()
+
    if 'file' not in request.files:
            resp = jsonify({'message' : 'No file part in the request'})
            resp.status_code = 400
@@ -60,6 +60,7 @@ def upload_file():
    resp.status_code = 201
    return resp
 
+
 @app.route('/namelist', methods=['POST'])
 def print_filelist():
     print("CLIENT ID:" + request.form.get("client_id", "") +" have these FILES:" +  request.form.get("file_list", [])  )
@@ -68,8 +69,8 @@ def print_filelist():
     return resp
 
 
-
-
-
+#
+# MAIN
+#
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=5000,debug=True)

Pics/Screenshot-Terminal-FileServer.png

@@ -0,0 +1,40 @@
+ifndef RECSYNC_DOWNLOAD_DIR
+$(error RECSYNC_DOWNLOAD_DIR variable is not set)
+endif
+
+# Remove trailing slash, if any
+RECSYNC_DOWNLOAD_DIR := $(patsubst %/,%,$(RECSYNC_DOWNLOAD_DIR))
+
+# E.g.: path/to/230531-ExposureTests
+
+ALL_SESSIONS := $(wildcard $(RECSYNC_DOWNLOAD_DIR)/*)
+
+PARENT_DIR = $(dir $(RECSYNC_DOWNLOAD_DIR))
+DIR_NAME = $(notdir $(RECSYNC_DOWNLOAD_DIR))
+DEST_DIR = $(PARENT_DIR)$(DIR_NAME)-postproc
+
+# Compose the names of the target dirs
+DEST_SESSIONS = $(subst $(RECSYNC_DOWNLOAD_DIR),$(DEST_DIR),$(ALL_SESSIONS))
+# Append a "/_done", which will be used as destination target file
+DEST_SESSIONS := $(addsuffix /_done,$(DEST_SESSIONS))
+
+# Debugging ...
+#@echo $(ALL_SESSIONS)
+#@echo PARENT: $(PARENT_DIR)
+#@echo DIR_NAME: $(DIR_NAME)
+#@echo DEST_DIR: $(DEST_DIR)
+#@echo Wanna create: $(DEST_SESSIONS)
+
+all: $(DEST_SESSIONS)
+	@echo Filled dir $(DEST_DIR)
+
+# Rule matching the pattern in the DEST_SESSIONS items
+$(DEST_DIR)/%/_done: $(RECSYNC_DOWNLOAD_DIR)/% | $(DEST_DIR)
+	$(eval tgt_dir = $(dir $@))
+	@echo "Processing $< into $(tgt_dir)..."
+	mkdir -p "$(tgt_dir)"
+	python PostProcessVideos.py -i "$<" -o "$(tgt_dir)"
+	touch "$@"
+
+$(DEST_DIR):
+	mkdir -p $@