Merge branch 'remotecontrolling' of https://github.com/DFKI-SignLanguage/RecSync-android into remotecontrolling

Author: fnunnari

app/src/main/java/com/googleresearch/capturesync/MainActivity.java

@@ -1156,9 +1156,9 @@ private MediaRecorder setUpMediaRecorder(Surface surface, boolean specifyOutput,
         lastVideoPath = getOutputMediaFilePath(prefixText);
         recorder.setOutputFile(lastVideoPath);
 
-        CamcorderProfile profile = CamcorderProfile.get(CamcorderProfile.QUALITY_1080P);
+        CamcorderProfile profile = CamcorderProfile.get(CamcorderProfile.QUALITY_2160P);
         recorder.setVideoSize(profile.videoFrameWidth, profile.videoFrameHeight);
-        recorder.setVideoEncodingBitRate(8000000);
+        recorder.setVideoEncodingBitRate(60*1000*1000);
         recorder.setVideoFrameRate(30);
         Log.d(TAG, profile.videoBitRate + " Bitrate");
 
@@ -1187,22 +1187,17 @@ public void deleteAllFiles() {
         String csvFilePath = sdcard.getAbsolutePath()+ "/RecSync/";
         File path = new File(videoFilePath);
         File fileList[] = path.listFiles();
-        Log.i(TAG,"Video File Path:"+videoFilePath );
-        Log.i(TAG,"No of files to delete: "+fileList.length );
         String filename;
         for(int i=0; i< fileList.length; i++){
             filename = fileList[i].getName();
             try{
-                Log.i(TAG,"inside  deleteall" );
                 File vFile = new File(videoFilePath + filename);
                 vFile.delete();
-                Log.i(TAG,"csv_file_path : " + csvFilePath + filename.split("\\.")[0] + ".csv" );
                 File csvFile = new File(csvFilePath + filename.split("\\.")[0] + ".csv");
                 csvFile.delete();
             }catch (Exception e){
                 e.printStackTrace();
             }
-
         }
     }
 

app/src/main/java/com/googleresearch/capturesync/SoftwareSyncController.java

@@ -221,23 +221,25 @@ private void setupSoftwareSync() {
                         );
                     });
             clientRpcs.put(
-                    METHOD_PREFIX_LIST,
+                    METHOD_EMPTY_DEVICE,
                     payload -> {
-                        Log.v(TAG, "Sending Files List");
+                        Log.v(TAG, "Deleting All Recordings and Related Files");
                         context.runOnUiThread(
-                                () -> context.sendPrefixList()
+                                () -> context.deleteAllFiles()
                         );
                     });
 
             clientRpcs.put(
-                    METHOD_EMPTY_DEVICE,
+                    METHOD_PREFIX_LIST,
                     payload -> {
-                        Log.v(TAG, "Deleting All Recordings and Related Files");
+                        Log.v(TAG, "Sending Files List");
                         context.runOnUiThread(
-                                () -> context.deleteAllFiles()
+                                () -> context.sendPrefixList()
                         );
                     });
 
+
+
             clientRpcs.put(
                     SyncConstants.METHOD_MSG_OFFSET_UPDATED,
                     payload ->

remote_control/remote_control.py

@@ -156,17 +156,12 @@ def setupUi(self, MainWindow):
         MainWindow.resize(800, 800)
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
-        self.label = QtWidgets.QLabel(self.centralwidget)
-        self.label.setGeometry(QtCore.QRect(290, 10, 161, 61))
         font = QtGui.QFont()
-        #font.setFamily("Source Code Pro")
         font.setPointSize(19)
-        self.label.setFont(font)
-        self.label.setObjectName("label")
 
 
         self.record_icon_btn = QtWidgets.QPushButton(self.centralwidget)
-        self.record_icon_btn.setGeometry(QtCore.QRect(300, 120, 120, 61))
+        self.record_icon_btn.setGeometry(QtCore.QRect(350, 140, 40, 30))
         self.record_icon_btn.setFont(font)
         self.record_icon_btn.setObjectName("record_icon_btn")
 
@@ -248,7 +243,6 @@ def setupUi(self, MainWindow):
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate
         MainWindow.setWindowTitle(_translate("MainWindow", "Remote Control App"))
-        self.label.setText(_translate("MainWindow", "RC APP"))
         self.record_icon_btn.setText(_translate("MainWindow", ""))
         self.start_btn.setText(_translate("MainWindow", "Start"))
         self.stop_btn.setText(_translate("MainWindow", "Stop"))