generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move IncomingVideoFrames to common_video/.

Browse Source 
Permits using IncomingVideoFrame in VideoReceiveStream without depending
on VideoRender.

BUG=4588
R=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/49199004

Cr-Commit-Position: refs/heads/master@{#9184}
This commit is contained in:
Peter Boström 2015-05-13 13:28:11 +02:00
parent 4feb50500d
commit 9a63866272
13 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/common_video/BUILD.gn
View File

@ -19,13 +19,17 @@ source_set("common_video") {
sources = [
"i420_buffer_pool.cc",
"i420_video_frame.cc",
"incoming_video_stream.cc",
"interface/i420_buffer_pool.h",
"interface/incoming_video_stream.h",
"interface/video_frame_buffer.h",
"libyuv/include/scaler.h",
"libyuv/include/webrtc_libyuv.h",
"libyuv/scaler.cc",
"libyuv/webrtc_libyuv.cc",
"video_frame_buffer.cc",
"video_render_frames.cc",
"video_render_frames.h",
]
include_dirs = [ "../modules/interface" ]

4
webrtc/common_video/common_video.gyp
View File

@ -41,13 +41,17 @@
'sources': [
'i420_buffer_pool.cc',
'i420_video_frame.cc',
'incoming_video_stream.cc',
'interface/i420_buffer_pool.h',
'interface/incoming_video_stream.h',
'interface/video_frame_buffer.h',
'libyuv/include/scaler.h',
'libyuv/include/webrtc_libyuv.h',
'libyuv/scaler.cc',
'libyuv/webrtc_libyuv.cc',
'video_frame_buffer.cc',
'video_render_frames.cc',
'video_render_frames.h',
],
},
], # targets

4
webrtc/modules/video_render/incoming_video_stream.cc → webrtc/common_video/incoming_video_stream.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/modules/video_render/incoming_video_stream.h"
#include "webrtc/common_video/interface/incoming_video_stream.h"
#include <assert.h>
@ -22,7 +22,7 @@
#endif
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_render/video_render_frames.h"
#include "webrtc/common_video/video_render_frames.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/thread_wrapper.h"

18
webrtc/modules/video_render/incoming_video_stream.h → webrtc/common_video/interface/incoming_video_stream.h
View File

@ -8,19 +8,25 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_INCOMING_VIDEO_STREAM_H_
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_INCOMING_VIDEO_STREAM_H_
#ifndef WEBRTC_COMMON_VIDEO_INTERFACE_INCOMING_VIDEO_STREAM_H_
#define WEBRTC_COMMON_VIDEO_INTERFACE_INCOMING_VIDEO_STREAM_H_
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/video_render/include/video_render.h"
#include "webrtc/common_video/video_render_frames.h"
namespace webrtc {
class CriticalSectionWrapper;
class EventTimerWrapper;
class ThreadWrapper;
class VideoRenderCallback;
class VideoRenderFrames;
class VideoRenderCallback {
public:
virtual int32_t RenderFrame(const uint32_t streamId,
const I420VideoFrame& videoFrame) = 0;
protected:
virtual ~VideoRenderCallback() {}
};
class IncomingVideoStream : public VideoRenderCallback {
public:
@ -92,4 +98,4 @@ class IncomingVideoStream : public VideoRenderCallback {
} // namespace webrtc
#endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_INCOMING_VIDEO_STREAM_H_
#endif // WEBRTC_COMMON_VIDEO_INTERFACE_INCOMING_VIDEO_STREAM_H_

2
webrtc/modules/video_render/video_render_frames.cc → webrtc/common_video/video_render_frames.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/modules/video_render/video_render_frames.h"
#include "webrtc/common_video/video_render_frames.h"
#include <assert.h>

10
webrtc/modules/video_render/video_render_frames.h → webrtc/common_video/video_render_frames.h
View File

@ -8,12 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_VIDEO_RENDER_FRAMES_H_ // NOLINT
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_VIDEO_RENDER_FRAMES_H_ // NOLINT
#ifndef WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_
#define WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_
#include <stdint.h>
#include <list>
#include "webrtc/modules/video_render/include/video_render.h"
#include "webrtc/video_frame.h"
namespace webrtc {
@ -54,4 +56,4 @@ class VideoRenderFrames {
} // namespace webrtc
#endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_VIDEO_RENDER_FRAMES_H_ // NOLINT
#endif // WEBRTC_COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_

4
webrtc/modules/video_render/BUILD.gn
View File

@ -15,10 +15,6 @@ source_set("video_render_module") {
"i_video_render.h",
"include/video_render.h",
"include/video_render_defines.h",
"incoming_video_stream.cc",
"incoming_video_stream.h",
"video_render_frames.cc",
"video_render_frames.h",
"video_render_impl.h",
]

16
webrtc/modules/video_render/include/video_render_defines.h
View File

@ -12,8 +12,8 @@
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_DEFINES_H_
#include "webrtc/common_types.h"
#include "webrtc/common_video/interface/incoming_video_stream.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/video_frame.h"
namespace webrtc
{
@ -42,20 +42,6 @@ enum VideoRenderError
kRenderPerformanceAlarm = 1
};
// The object a module user uses to send new frames to the renderer
// One object is used for each incoming stream
class VideoRenderCallback
{
public:
virtual int32_t RenderFrame(const uint32_t streamId,
const I420VideoFrame& videoFrame) = 0;
protected:
virtual ~VideoRenderCallback()
{
}
};
// Feedback class to be implemented by module user
class VideoRenderFeedback
{

4
webrtc/modules/video_render/video_render.gypi
View File

@ -27,10 +27,6 @@
'i_video_render.h',
'include/video_render.h',
'include/video_render_defines.h',
'incoming_video_stream.cc',
'incoming_video_stream.h',
'video_render_frames.cc',
'video_render_frames.h',
'video_render_impl.h',
],
},

4
webrtc/modules/video_render/video_render_impl.cc
View File

@ -10,11 +10,11 @@
#include <assert.h>
#include "webrtc/common_video/interface/incoming_video_stream.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_render/external/video_render_external_impl.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#include "webrtc/modules/video_render/incoming_video_stream.h"
#include "webrtc/modules/video_render/i_video_render.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#include "webrtc/modules/video_render/video_render_impl.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"

2
webrtc/modules/video_render/video_render_internal_impl.cc
View File

@ -10,10 +10,10 @@
#include <assert.h>
#include "webrtc/common_video/interface/incoming_video_stream.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_render/i_video_render.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#include "webrtc/modules/video_render/incoming_video_stream.h"
#include "webrtc/modules/video_render/video_render_impl.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"

2
webrtc/video/video_receive_stream.h
View File

@ -15,9 +15,9 @@
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/call.h"
#include "webrtc/common_video/interface/incoming_video_stream.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#include "webrtc/modules/video_render/incoming_video_stream.h"
#include "webrtc/system_wrappers/interface/clock.h"
#include "webrtc/video/encoded_frame_callback_adapter.h"
#include "webrtc/video/receive_statistics_proxy.h"

2
webrtc/video_engine/vie_channel.cc
View File

@ -15,6 +15,7 @@
#include "webrtc/base/checks.h"
#include "webrtc/common.h"
#include "webrtc/common_video/interface/incoming_video_stream.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/experiments.h"
#include "webrtc/frame_callback.h"
@ -26,7 +27,6 @@
#include "webrtc/modules/video_coding/main/interface/video_coding.h"
#include "webrtc/modules/video_processing/main/interface/video_processing.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#include "webrtc/modules/video_render/incoming_video_stream.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/logging.h"
#include "webrtc/system_wrappers/interface/metrics.h"