Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/video_render/test/testAPI/testAPI.cc

Issue 1813173002: Deletes the class VideoRendererCallback. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase, and tweak of DEPS files. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/modules/video_render/external/video_render_external_impl.h ('K') | « webrtc/modules/video_render/mac/video_render_nsopengl.mm ('k') | webrtc/modules/video_render/video_render.h » ('j') | webrtc/modules/video_render/video_render.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_render/test/testAPI/testAPI.cc
diff --git a/webrtc/modules/video_render/test/testAPI/testAPI.cc b/webrtc/modules/video_render/test/testAPI/testAPI.cc
index cea2f6b56fe0bc33d99c812ea5543621218ee45b..94350e96cf678d1ac9dde0f3299bef3a493ccdd1 100644
--- a/webrtc/modules/video_render/test/testAPI/testAPI.cc
+++ b/webrtc/modules/video_render/test/testAPI/testAPI.cc
@@ -248,7 +248,7 @@ int WebRtcCreateWindow(Window *outWindow, Display **outDisplay, int winNum, int
// Note: Mac code is in testApi_mac.mm.
-class MyRenderCallback: public VideoRenderCallback
+class MyRenderCallback: public rtc::VideoSinkInterface<VideoFrame>
{
public:
MyRenderCallback() :
@@ -260,14 +260,12 @@ public:
{
}
;
- virtual int32_t RenderFrame(const uint32_t streamId,
- const VideoFrame& videoFrame) {
+ void OnFrame(const VideoFrame& videoFrame) override {
_cnt++;
if (_cnt % 100 == 0)
{
printf("Render callback %d \n",_cnt);
}
- return 0;
}
int32_t _cnt;
};
@@ -288,7 +286,7 @@ int TestSingleStream(VideoRender* renderModule) {
// Add settings for a stream to render
printf("Add stream 0 to entire window\n");
const int streamId0 = 0;
- VideoRenderCallback* renderCallback0 = renderModule->AddIncomingRenderStream(streamId0, 0, 0.0f, 0.0f, 1.0f, 1.0f);
+ rtc::VideoSinkInterface<VideoFrame>* renderCallback0 = renderModule->AddIncomingRenderStream(streamId0, 0, 0.0f, 0.0f, 1.0f, 1.0f);
perkj_webrtc 2016/03/31 05:11:58 line length
nisse-webrtc 2016/03/31 07:07:20 Done.
assert(renderCallback0 != NULL);
printf("Start render\n");
@@ -315,7 +313,7 @@ int TestSingleStream(VideoRender* renderModule) {
// Render this frame with the specified delay
videoFrame0.set_render_time_ms(TickTime::MillisecondTimestamp()
+ renderDelayMs);
- renderCallback0->RenderFrame(streamId0, videoFrame0);
+ renderCallback0->OnFrame(videoFrame0);
SleepMs(1000/TEST_FRAME_RATE);
}
@@ -352,7 +350,7 @@ int TestBitmapText(VideoRender* renderModule) {
// Add settings for a stream to render
printf("Add stream 0 to entire window\n");
const int streamId0 = 0;
- VideoRenderCallback* renderCallback0 = renderModule->AddIncomingRenderStream(streamId0, 0, 0.0f, 0.0f, 1.0f, 1.0f);
+ rtc::VideoSinkInterface<VideoFrame>* renderCallback0 = renderModule->AddIncomingRenderStream(streamId0, 0, 0.0f, 0.0f, 1.0f, 1.0f);
perkj_webrtc 2016/03/31 05:11:58 line length
assert(renderCallback0 != NULL);
printf("Adding Bitmap\n");
@@ -389,7 +387,7 @@ int TestBitmapText(VideoRender* renderModule) {
// Render this frame with the specified delay
videoFrame0.set_render_time_ms(TickTime::MillisecondTimestamp() +
renderDelayMs);
- renderCallback0->RenderFrame(streamId0, videoFrame0);
+ renderCallback0->OnFrame(videoFrame0);
SleepMs(1000/TEST_FRAME_RATE);
}
// Sleep and let all frames be rendered before closing
@@ -420,22 +418,22 @@ int TestMultipleStreams(VideoRender* renderModule) {
// Add settings for a stream to render
printf("Add stream 0\n");
const int streamId0 = 0;
- VideoRenderCallback* renderCallback0 =
+ rtc::VideoSinkInterface<VideoFrame>* renderCallback0 =
perkj_webrtc 2016/03/31 05:11:58 line length here and below
nisse-webrtc 2016/03/31 07:07:20 Not my lines... But I'll break them anyway.
renderModule->AddIncomingRenderStream(streamId0, 0, 0.0f, 0.0f, 0.45f, 0.45f);
assert(renderCallback0 != NULL);
printf("Add stream 1\n");
const int streamId1 = 1;
- VideoRenderCallback* renderCallback1 =
+ rtc::VideoSinkInterface<VideoFrame>* renderCallback1 =
renderModule->AddIncomingRenderStream(streamId1, 0, 0.55f, 0.0f, 1.0f, 0.45f);
assert(renderCallback1 != NULL);
printf("Add stream 2\n");
const int streamId2 = 2;
- VideoRenderCallback* renderCallback2 =
+ rtc::VideoSinkInterface<VideoFrame>* renderCallback2 =
renderModule->AddIncomingRenderStream(streamId2, 0, 0.0f, 0.55f, 0.45f, 1.0f);
assert(renderCallback2 != NULL);
printf("Add stream 3\n");
const int streamId3 = 3;
- VideoRenderCallback* renderCallback3 =
+ rtc::VideoSinkInterface<VideoFrame>* renderCallback3 =
renderModule->AddIncomingRenderStream(streamId3, 0, 0.55f, 0.55f, 1.0f, 1.0f);
assert(renderCallback3 != NULL);
error = renderModule->StartRender(streamId0);
@@ -474,22 +472,22 @@ int TestMultipleStreams(VideoRender* renderModule) {
videoFrame0.set_render_time_ms(TickTime::MillisecondTimestamp() +
renderDelayMs);
- renderCallback0->RenderFrame(streamId0, videoFrame0);
+ renderCallback0->OnFrame(videoFrame0);
GetTestVideoFrame(&videoFrame1, TEST_STREAM1_START_COLOR);
videoFrame1.set_render_time_ms(TickTime::MillisecondTimestamp() +
renderDelayMs);
- renderCallback1->RenderFrame(streamId1, videoFrame1);
+ renderCallback1->OnFrame(videoFrame1);
GetTestVideoFrame(&videoFrame2, TEST_STREAM2_START_COLOR);
videoFrame2.set_render_time_ms(TickTime::MillisecondTimestamp() +
renderDelayMs);
- renderCallback2->RenderFrame(streamId2, videoFrame2);
+ renderCallback2->OnFrame(videoFrame2);
GetTestVideoFrame(&videoFrame3, TEST_STREAM3_START_COLOR);
videoFrame3.set_render_time_ms(TickTime::MillisecondTimestamp() +
renderDelayMs);
- renderCallback3->RenderFrame(streamId3, videoFrame3);
+ renderCallback3->OnFrame(videoFrame3);
SleepMs(1000/TEST_FRAME_RATE);
}
@@ -521,7 +519,7 @@ int TestExternalRender(VideoRender* renderModule) {
MyRenderCallback *externalRender = new MyRenderCallback();
const int streamId0 = 0;
- VideoRenderCallback* renderCallback0 =
+ rtc::VideoSinkInterface<VideoFrame>* renderCallback0 =
renderModule->AddIncomingRenderStream(streamId0, 0, 0.0f, 0.0f,
1.0f, 1.0f);
assert(renderCallback0 != NULL);
@@ -547,7 +545,7 @@ int TestExternalRender(VideoRender* renderModule) {
for (int i=0; i<frameCount; i++) {
videoFrame0.set_render_time_ms(TickTime::MillisecondTimestamp() +
renderDelayMs);
- renderCallback0->RenderFrame(streamId0, videoFrame0);
+ renderCallback0->OnFrame(videoFrame0);
SleepMs(33);
}
« webrtc/modules/video_render/external/video_render_external_impl.h ('K') | « webrtc/modules/video_render/mac/video_render_nsopengl.mm ('k') | webrtc/modules/video_render/video_render.h » ('j') | webrtc/modules/video_render/video_render.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698