zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move EncodedImage class to api/video/

Browse Source 
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}
This commit is contained in:
Niels Möller
2018-10-05 14:17:58 +02:00
committed by Commit Bot
parent 38537edf59
commit 4dc66c53d0
33 changed files with 142 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/video_coding/BUILD.gn
View File

@ -17,8 +17,8 @@ rtc_static_library("encoded_frame") {
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 @@ rtc_source_set("video_coding_utility") {
":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 @@ rtc_static_library("webrtc_multiplex") {
":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 @@ rtc_static_library("webrtc_vp8") {
":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 @@ if (rtc_include_tests) {
":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",

2
modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc
View File

@ -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"

2
modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h
View File

@ -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 {

2
modules/video_coding/codecs/multiplex/multiplex_encoder_adapter.cc
View File

@ -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"

1
modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
View File

@ -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"

2
modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h
View File

@ -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"

2
modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
View File

@ -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"

2
modules/video_coding/encoded_frame.h
View File

@ -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"

2
modules/video_coding/include/video_coding_defines.h
View File

@ -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 {

2
modules/video_coding/utility/ivf_file_writer.h
View File

@ -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"

2
modules/video_coding/utility/simulcast_test_fixture_impl.cc
View File

@ -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"