Video Processing + image classificaiton

dasatomic · Jun 15, 2021 · c1606e8 · c1606e8
1 parent 66d3c03
commit c1606e8
Show file tree

Hide file tree

Showing 20 changed files with 687 additions and 348 deletions.
diff --git a/MetadataManager/MetadataColumns.cs b/MetadataManager/MetadataColumns.cs
@@ -25,6 +25,11 @@ public MetadataColumn(int columnId, int tableId, string columnName, ColumnInfo c
             this.ColumnName = columnName;
             this.ColumnType = columnInfo;
         }
+
+        public MetadataColumn SetNewColumnPosition(int columnId)
+        {
+            return new MetadataColumn(columnId, this.TableId, this.ColumnName, this.ColumnType);
+        }
     }
 
     /// <summary>

diff --git a/ParserLexerFSharp/Sql.fs b/ParserLexerFSharp/Sql.fs
@@ -57,6 +57,7 @@ and sqlStatementOrId =
     | FileSystemProvider of value 
     // Subquery + chunksize in seconds
     | VideoChunkProviderSubquery of sqlStatement * int
+    | VideoImageProviderSubquery of sqlStatement * int * int
 
 type columntype = IntCType | StringCType | DoubleCType
 // columntype + rep count + name.

diff --git a/ParserLexerFSharp/SqlLexer.fs b/ParserLexerFSharp/SqlLexer.fs
@@ -20,6 +20,7 @@ let keywords =
         "FROM", FROM;
         "FILESYSTEM", FILESYSTEM;
         "VIDEO_CHUNKER", VIDEO_CHUNKER;
+        "VIDEO_TO_IMAGE", VIDEO_TO_IMAGE;
         "WHERE", WHERE;
         "ORDER", ORDER;
         "BY", BY;
@@ -49,7 +50,7 @@ let ops =
         ">=",   GE;
     ] |> Map.ofList
 
-# 52 "SqlLexer.fs"
+# 53 "SqlLexer.fs"
 let trans : uint16[] array = 
     [| 
     (* State 0 *)
@@ -102,66 +103,66 @@ let rec _fslex_dummy () = _fslex_dummy()
 and tokenize  lexbuf =
   match _fslex_tables.Interpret(0,lexbuf) with
   | 0 -> ( 
-# 66 "SqlLexer.fsl"
+# 67 "SqlLexer.fsl"
                                  tokenize lexbuf 
-# 107 "SqlLexer.fs"
+# 108 "SqlLexer.fs"
           )
   | 1 -> ( 
-# 67 "SqlLexer.fsl"
+# 68 "SqlLexer.fsl"
                                  lexbuf.EndPos <- lexbuf.EndPos.NextLine; tokenize lexbuf; 
-# 112 "SqlLexer.fs"
+# 113 "SqlLexer.fs"
           )
   | 2 -> ( 
-# 68 "SqlLexer.fsl"
+# 69 "SqlLexer.fsl"
                                  INT(Int32.Parse(LexBuffer<_>.LexemeString lexbuf)) 
-# 117 "SqlLexer.fs"
+# 118 "SqlLexer.fs"
           )
   | 3 -> ( 
-# 69 "SqlLexer.fsl"
+# 70 "SqlLexer.fsl"
                                  FLOAT(Double.Parse(LexBuffer<_>.LexemeString lexbuf)) 
-# 122 "SqlLexer.fs"
+# 123 "SqlLexer.fs"
           )
   | 4 -> ( 
-# 70 "SqlLexer.fsl"
+# 71 "SqlLexer.fsl"
                                  ops.[LexBuffer<_>.LexemeString lexbuf] 
-# 127 "SqlLexer.fs"
+# 128 "SqlLexer.fs"
           )
   | 5 -> ( 
-# 71 "SqlLexer.fsl"
+# 72 "SqlLexer.fsl"
                                  match keywords.TryFind(LexBuffer<_>.LexemeString lexbuf) with
                                  | Some(token) -> token
                                  | None -> ID(LexBuffer<_>.LexemeString lexbuf) 
-# 134 "SqlLexer.fs"
+# 135 "SqlLexer.fs"
           )
   | 6 -> ( 
-# 74 "SqlLexer.fsl"
+# 75 "SqlLexer.fsl"
                                  COMMA 
-# 139 "SqlLexer.fs"
+# 140 "SqlLexer.fs"
           )
   | 7 -> ( 
-# 75 "SqlLexer.fsl"
+# 76 "SqlLexer.fsl"
                                  EOF 
-# 144 "SqlLexer.fs"
+# 145 "SqlLexer.fs"
           )
   | 8 -> ( 
-# 76 "SqlLexer.fsl"
+# 77 "SqlLexer.fsl"
                                  OBRCK 
-# 149 "SqlLexer.fs"
+# 150 "SqlLexer.fs"
           )
   | 9 -> ( 
-# 77 "SqlLexer.fsl"
+# 78 "SqlLexer.fsl"
                                  CBRCK 
-# 154 "SqlLexer.fs"
+# 155 "SqlLexer.fs"
           )
   | 10 -> ( 
-# 78 "SqlLexer.fsl"
+# 79 "SqlLexer.fsl"
                                  QUOT 
-# 159 "SqlLexer.fs"
+# 160 "SqlLexer.fs"
           )
   | 11 -> ( 
-# 79 "SqlLexer.fsl"
+# 80 "SqlLexer.fsl"
                                  STAR 
-# 164 "SqlLexer.fs"
+# 165 "SqlLexer.fs"
           )
   | _ -> failwith "tokenize"
 

diff --git a/ParserLexerFSharp/SqlLexer.fsl b/ParserLexerFSharp/SqlLexer.fsl
@@ -19,6 +19,7 @@ let keywords =
         "FROM", FROM;
         "FILESYSTEM", FILESYSTEM;
         "VIDEO_CHUNKER", VIDEO_CHUNKER;
+        "VIDEO_TO_IMAGE", VIDEO_TO_IMAGE;
         "WHERE", WHERE;
         "ORDER", ORDER;
         "BY", BY;