commit 22b70ff1d4308cb56c08d16e06f2f6945b984831
author Niels Möller <nisse@webrtc.org> Tue Nov 20 11:06:58 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Tue Nov 20 13:12:57 2018 +0000
tree ade452ad970bfe749be3cc0037e730742f527c78
parent 22ff1a437a52c8ab82ed3bcc31a972759fc745a7

Move VideoCodecType from common_types.h to api/video/video_codec_type.h

Bug: webrtc:7660
Change-Id: I9381364a64113dbb622b26acbf2b71228c3c4b96
Reviewed-on: https://webrtc-review.googlesource.com/c/111480
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25710}

api/video/BUILD.gn

diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index b184dd1..5ed7089 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -15,6 +15,7 @@
     "color_space.h",
     "hdr_metadata.cc",
     "hdr_metadata.h",
+    "video_codec_type.h",
     "video_content_type.cc",
     "video_content_type.h",
     "video_frame.cc",

api/video/encoded_image.h

diff --git a/api/video/encoded_image.h b/api/video/encoded_image.h
index b04e1ca..4cf410b 100644
--- a/api/video/encoded_image.h
+++ b/api/video/encoded_image.h
@@ -16,6 +16,7 @@
 #include "absl/types/optional.h"
 #include "api/video/hdr_metadata.h"
 #include "api/video/video_bitrate_allocation.h"
+#include "api/video/video_codec_type.h"
 #include "api/video/video_content_type.h"
 #include "api/video/video_rotation.h"
 #include "api/video/video_timing.h"

api/video/video_codec_type.h

diff --git a/api/video/video_codec_type.h b/api/video/video_codec_type.h
new file mode 100644
index 0000000..447723c
--- /dev/null
+++ b/api/video/video_codec_type.h
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_VIDEO_VIDEO_CODEC_TYPE_H_
+#define API_VIDEO_VIDEO_CODEC_TYPE_H_
+
+namespace webrtc {
+
+// Video codec types
+enum VideoCodecType {
+  // There are various memset(..., 0, ...) calls in the code that rely on
+  // kVideoCodecGeneric being zero.
+  kVideoCodecGeneric = 0,
+  kVideoCodecVP8,
+  kVideoCodecVP9,
+  kVideoCodecH264,
+  kVideoCodecI420,
+  kVideoCodecMultiplex,
+};
+
+}  // namespace webrtc
+
+#endif  // API_VIDEO_VIDEO_CODEC_TYPE_H_

api/video_codecs/video_codec.h

diff --git a/api/video_codecs/video_codec.h b/api/video_codecs/video_codec.h
index 95a1d84..9fba60c 100644
--- a/api/video_codecs/video_codec.h
+++ b/api/video_codecs/video_codec.h
@@ -16,6 +16,7 @@
 #include <string>
 
 #include "api/video/video_bitrate_allocation.h"
+#include "api/video/video_codec_type.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/system/rtc_export.h"