2.0. Updated namespaces.

[casparcg] / modules / ffmpeg / producer / format / flv.cpp

diff --git a/modules/ffmpeg/producer/format/flv.cpp b/modules/ffmpeg/producer/format/flv.cpp
index 0e87dcbeaef36befb0a7c978a128ebf46fb91f09..37b1977172e9c04366480777b56c89d9f5111afe 100644 (file)
--- a/modules/ffmpeg/producer/format/flv.cpp
+++ b/modules/ffmpeg/producer/format/flv.cpp
@@ -10,42 +10,8 @@
 \r
 #include <unordered_map>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
-double next_double(std::fstream& fileStream)\r
-{\r
-       std::vector<char> bytes(8);\r
-\r
-       auto tmp2 = fileStream.tellg();\r
-       tmp2;\r
-\r
-    fileStream.read(bytes.data(), 8);\r
-       \r
-       auto tmp3 = fileStream.gcount();\r
-       tmp3;\r
-\r
-       tmp2 = fileStream.tellg();\r
-       tmp2;\r
-\r
-       fileStream.seekg(1, std::ios::cur);\r
-       \r
-       tmp2 = fileStream.tellg();\r
-       tmp2;\r
-\r
-       std::reverse(bytes.begin(), bytes.end());\r
-       double* tmp = (double*)bytes.data();\r
-       \r
-    return *tmp;\r
-} \r
-\r
-bool next_bool(std::fstream& fileStream)\r
-{\r
-       std::vector<char> bytes(1);\r
-    fileStream.read(bytes.data(), bytes.size());\r
-       fileStream.seekg(1, std::ios::cur);\r
-    return bytes[0] != 0;\r
-}\r
-\r
 std::map<std::string, std::string> read_flv_meta_info(const std::string& filename)\r
 {\r
        std::map<std::string, std::string>  values;\r
@@ -84,15 +50,16 @@ std::map<std::string, std::string> read_flv_meta_info(const std::string& filenam
                                char data_type = *ptr++;\r
                                switch(data_type)\r
                                {\r
-                               case 0:\r
+                               case 0: // double\r
                                        {\r
+                                               static_assert(sizeof(double) == 8, "");\r
                                                std::reverse(ptr, ptr+8);\r
                                                values[name] = boost::lexical_cast<std::string>(*(double*)(ptr));\r
                                                ptr += 9;\r
 \r
                                                break;\r
                                        }\r
-                               case 1:\r
+                               case 1: // bool\r
                                        {\r
                                                values[name] = boost::lexical_cast<std::string>(*ptr != 0);\r
                                                ptr += 2;\r
@@ -111,4 +78,4 @@ std::map<std::string, std::string> read_flv_meta_info(const std::string& filenam
     return values;\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file