Add namespace vp9

angiebird committed 7 years ago

Commit 38b63601 parent 9b79c513 files · +12 −3Browse files

Unified · Split

3 files

@@ -4,7 +4,8 @@ · 3 unmodified lines
4	#include "third_party/googletest/src/include/gtest/gtest.h"	4	#include "third_party/googletest/src/include/gtest/gtest.h"
5	#include "vp9/simple_encode.h"	5	#include "vp9/simple_encode.h"
6		6
7	namespace {	7	namespace vp9 {
		8
8	const int w = 352;	9	const int w = 352;
9	const int h = 288;	10	const int h = 288;
10	const int frame_rate_num = 30;	11	const int frame_rate_num = 30;
@@ -105,4 +106,4 @@ TEST(SimpleEncode, EncodeFrameWithQuantizeIndex) { · 94 unmodified lines
105	simple_encode.EndEncode();	106	simple_encode.EndEncode();
106	}	107	}
107		108
108	} // namespace	109	} // namespace vp9

 #include "vp9/simple_encode.h"
 #include "vp9/vp9_cx_iface.h"
+namespace vp9 {
 // TODO(angiebird): Merge this function with vpx_img_plane_width()
 static int img_plane_width(const vpx_image_t *img, int plane) {
   if (plane > 0 && img->x_chroma_shift > 0)
     fclose(this->file);
   }
 }
+}  // namespace vp9

 #include <memory>
 #include <vector>
+namespace vp9 {
 enum FrameType {
   kKeyFrame = 0,
   kInterFrame,
   SimpleEncode(SimpleEncode &&) = delete;
   SimpleEncode &operator=(SimpleEncode &&) = delete;
-  // Make encoder compute the first pass stats and store it internally for
+  // Makes encoder compute the first pass stats and store it internally for
   // future encode
   void ComputeFirstPassStats();
   FILE *file;
   std::unique_ptr<impl> pimpl;
 };
+}  // namespace vp9
 #endif  // VPX_VP9_SIMPLE_ENCODE

Keyboard shortcuts