commit 4dc66c53d0e76f3a34b38ee068abfa40e92be726
author Niels Möller <nisse@webrtc.org> Fri Oct 05 14:17:58 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Oct 08 07:37:10 2018 +0000
tree cc6935030a621760c9f0c02ce1cdff381b0def82
parent 38537edf5979e85f1fab0fb65ab71ceba226ae58

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}

sdk/BUILD.gn

diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index b4f193d..c4bee38 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -756,8 +756,8 @@
       deps = [
         ":base_objc",
         ":helpers_objc",
+        "../api/video:encoded_image",
         "../api/video_codecs:video_codecs_api",
-        "../common_video",
         "../modules:module_api",
         "../modules/video_coding:video_codec_interface",
         "../rtc_base:rtc_base",

sdk/android/BUILD.gn

diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 63c5bd2..64aece0 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -570,6 +570,7 @@
       ":vp9_jni",  # TODO(bugs.webrtc.org/7925): Remove.
       "../..:webrtc_common",
       "../../api:libjingle_peerconnection_api",
+      "../../api/video:encoded_image",
       "../../api/video:video_frame",
       "../../api/video_codecs:builtin_video_decoder_factory",
       "../../api/video_codecs:builtin_video_encoder_factory",

sdk/android/src/jni/encodedimage.cc

diff --git a/sdk/android/src/jni/encodedimage.cc b/sdk/android/src/jni/encodedimage.cc
index c0ea28e..21f8336 100644
--- a/sdk/android/src/jni/encodedimage.cc
+++ b/sdk/android/src/jni/encodedimage.cc
@@ -10,7 +10,7 @@
 
 #include "sdk/android/src/jni/encodedimage.h"
 
-#include "common_video/include/video_frame.h"
+#include "api/video/encoded_image.h"
 #include "rtc_base/timeutils.h"
 #include "sdk/android/generated_video_jni/jni/EncodedImage_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"

sdk/objc/api/peerconnection/RTCEncodedImage+Private.h

diff --git a/sdk/objc/api/peerconnection/RTCEncodedImage+Private.h b/sdk/objc/api/peerconnection/RTCEncodedImage+Private.h
index 1b125f1..c77a7ad 100644
--- a/sdk/objc/api/peerconnection/RTCEncodedImage+Private.h
+++ b/sdk/objc/api/peerconnection/RTCEncodedImage+Private.h
@@ -10,7 +10,7 @@
 
 #import "base/RTCEncodedImage.h"
 
-#include "common_video/include/video_frame.h"
+#include "api/video/encoded_image.h"
 
 NS_ASSUME_NONNULL_BEGIN