Move EncodedImage class to api/video/
Bug: webrtc:9378
Change-Id: I8fb3b19cad0ad428abc6c8e6b507180d461882ba
Reviewed-on: https://webrtc-review.googlesource.com/c/104002
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Peter Slatala <psla@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25033}diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index e759a4a..82ac132 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -17,8 +17,8 @@
deps = [
":video_codec_interface",
"../../:webrtc_common",
+ "../../api/video:encoded_image",
"../../api/video:video_frame_i420",
- "../../common_video:common_video",
"../../modules:module_api",
"../../modules:module_api_public",
"../../modules/video_coding:video_coding_utility",
@@ -261,6 +261,7 @@
":video_codec_interface",
"..:module_api",
"../..:webrtc_common",
+ "../../api/video:encoded_image",
"../../api/video:video_bitrate_allocator",
"../../api/video_codecs:video_codecs_api",
"../../common_video",
@@ -376,6 +377,7 @@
":video_coding_utility",
"..:module_api",
"../..:webrtc_common",
+ "../../api/video:encoded_image",
"../../api/video:video_frame",
"../../api/video:video_frame_i420",
"../../api/video_codecs:video_codecs_api",
@@ -420,6 +422,7 @@
":video_coding_utility",
"..:module_api",
"../..:webrtc_common",
+ "../../api/video:encoded_image",
"../../api/video:video_frame",
"../../api/video_codecs:video_codecs_api",
"../../common_video",
@@ -575,6 +578,7 @@
":video_coding_utility",
"../../:webrtc_common",
"../../api:simulcast_test_fixture_api",
+ "../../api/video:encoded_image",
"../../api/video:video_frame",
"../../api/video:video_frame_i420",
"../../api/video_codecs:video_codecs_api",
diff --git a/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc b/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc
index cc588d0..a27bc8d 100644
--- a/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc
+++ b/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc
@@ -10,9 +10,9 @@
#include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h"
+#include "api/video/encoded_image.h"
#include "api/video/i420_buffer.h"
#include "api/video/video_frame_buffer.h"
-#include "common_video/include/video_frame.h"
#include "common_video/include/video_frame_buffer.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h"
diff --git a/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h b/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h
index ea37f0c..0d2f9fa 100644
--- a/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h
+++ b/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h
@@ -14,8 +14,8 @@
#include <memory>
#include <vector>
+#include "api/video/encoded_image.h"
#include "common_types.h" // NOLINT(build/include)
-#include "common_video/include/video_frame.h"
namespace webrtc {
diff --git a/modules/video_coding/codecs/multiplex/multiplex_encoder_adapter.cc b/modules/video_coding/codecs/multiplex/multiplex_encoder_adapter.cc
index c3a7506..ce64574 100644
--- a/modules/video_coding/codecs/multiplex/multiplex_encoder_adapter.cc
+++ b/modules/video_coding/codecs/multiplex/multiplex_encoder_adapter.cc
@@ -12,7 +12,7 @@
#include <cstring>
-#include "common_video/include/video_frame.h"
+#include "api/video/encoded_image.h"
#include "common_video/include/video_frame_buffer.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "modules/include/module_common_types.h"
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
index 20684d1..48838e9 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
@@ -12,7 +12,6 @@
#include <string>
#include "absl/memory/memory.h"
-#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h"
#include "rtc_base/checks.h"
#include "rtc_base/numerics/exp_filter.h"
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h
index 3a6cf92..cff9e89 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h
@@ -13,10 +13,10 @@
#include <memory>
+#include "api/video/encoded_image.h"
#include "api/video_codecs/video_decoder.h"
#include "common_types.h" // NOLINT(build/include)
#include "common_video/include/i420_buffer_pool.h"
-#include "common_video/include/video_frame.h"
#include "modules/include/module_common_types.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/include/video_codec_interface.h"
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
index 3c20672..93888e8 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
@@ -14,10 +14,10 @@
#include <memory>
#include <vector>
+#include "api/video/encoded_image.h"
#include "api/video/video_frame.h"
#include "api/video_codecs/video_encoder.h"
#include "common_types.h" // NOLINT(build/include)
-#include "common_video/include/video_frame.h"
#include "modules/video_coding/codecs/vp8/include/temporal_layers_checker.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/codecs/vp8/include/vp8_temporal_layers.h"
diff --git a/modules/video_coding/encoded_frame.h b/modules/video_coding/encoded_frame.h
index a08eb07..dae383c 100644
--- a/modules/video_coding/encoded_frame.h
+++ b/modules/video_coding/encoded_frame.h
@@ -13,8 +13,8 @@
#include <vector>
+#include "api/video/encoded_image.h"
#include "common_types.h" // NOLINT(build/include)
-#include "common_video/include/video_frame.h"
#include "modules/include/module_common_types.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/include/video_coding_defines.h"
diff --git a/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h
index 7fb6f58..023fc73 100644
--- a/modules/video_coding/include/video_coding_defines.h
+++ b/modules/video_coding/include/video_coding_defines.h
@@ -15,8 +15,6 @@
#include <vector>
#include "api/video/video_frame.h"
-// For EncodedImage
-#include "common_video/include/video_frame.h"
#include "modules/include/module_common_types.h"
namespace webrtc {
diff --git a/modules/video_coding/utility/ivf_file_writer.h b/modules/video_coding/utility/ivf_file_writer.h
index 7d917ed..4775bed 100644
--- a/modules/video_coding/utility/ivf_file_writer.h
+++ b/modules/video_coding/utility/ivf_file_writer.h
@@ -14,7 +14,7 @@
#include <memory>
#include <string>
-#include "common_video/include/video_frame.h"
+#include "api/video/encoded_image.h"
#include "modules/include/module_common_types.h"
#include "rtc_base/constructormagic.h"
#include "rtc_base/file.h"
diff --git a/modules/video_coding/utility/simulcast_test_fixture_impl.cc b/modules/video_coding/utility/simulcast_test_fixture_impl.cc
index 4af526c..2573593 100644
--- a/modules/video_coding/utility/simulcast_test_fixture_impl.cc
+++ b/modules/video_coding/utility/simulcast_test_fixture_impl.cc
@@ -15,8 +15,8 @@
#include <memory>
#include <vector>
+#include "api/video/encoded_image.h"
#include "api/video_codecs/sdp_video_format.h"
-#include "common_video/include/video_frame.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "modules/video_coding/include/video_coding_defines.h"
#include "rtc_base/checks.h"