OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/media/rtc_video_renderer.h" | 5 #include "content/renderer/media/rtc_video_renderer.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/message_loop_proxy.h" | 11 #include "base/message_loop_proxy.h" |
| 12 #include "content/renderer/media/native_handle_impl.h" |
12 #include "media/base/video_frame.h" | 13 #include "media/base/video_frame.h" |
13 #include "media/base/video_util.h" | 14 #include "media/base/video_util.h" |
14 #include "third_party/libjingle/source/talk/media/base/videoframe.h" | 15 #include "third_party/libjingle/source/talk/media/base/videoframe.h" |
15 | 16 |
16 using media::CopyYPlane; | 17 using media::CopyYPlane; |
17 using media::CopyUPlane; | 18 using media::CopyUPlane; |
18 using media::CopyVPlane; | 19 using media::CopyVPlane; |
19 | 20 |
20 namespace content { | 21 namespace content { |
21 | 22 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 frame->GetTimeStamp() / talk_base::kNumNanosecsPerMillisec); | 78 frame->GetTimeStamp() / talk_base::kNumNanosecsPerMillisec); |
78 | 79 |
79 TRACE_EVENT_INSTANT2("rtc_video_renderer", | 80 TRACE_EVENT_INSTANT2("rtc_video_renderer", |
80 "RenderFrame", | 81 "RenderFrame", |
81 TRACE_EVENT_SCOPE_THREAD, | 82 TRACE_EVENT_SCOPE_THREAD, |
82 "elapsed time", | 83 "elapsed time", |
83 frame->GetElapsedTime(), | 84 frame->GetElapsedTime(), |
84 "timestamp_ms", | 85 "timestamp_ms", |
85 timestamp.InMilliseconds()); | 86 timestamp.InMilliseconds()); |
86 | 87 |
87 gfx::Size size(frame->GetWidth(), frame->GetHeight()); | 88 scoped_refptr<media::VideoFrame> video_frame; |
88 scoped_refptr<media::VideoFrame> video_frame = | 89 if (frame->GetNativeHandle() != NULL) { |
89 media::VideoFrame::CreateFrame(media::VideoFrame::YV12, | 90 NativeHandleImpl* handle = |
90 size, | 91 static_cast<NativeHandleImpl*>(frame->GetNativeHandle()); |
91 gfx::Rect(size), | 92 video_frame = static_cast<media::VideoFrame*>(handle->GetHandle()); |
92 size, | 93 video_frame->SetTimestamp(timestamp); |
93 timestamp); | 94 } else { |
| 95 gfx::Size size(frame->GetWidth(), frame->GetHeight()); |
| 96 video_frame = |
| 97 media::VideoFrame::CreateFrame(media::VideoFrame::YV12, |
| 98 size, |
| 99 gfx::Rect(size), |
| 100 size, |
| 101 timestamp); |
94 | 102 |
95 // Aspect ratio unsupported; DCHECK when there are non-square pixels. | 103 // Aspect ratio unsupported; DCHECK when there are non-square pixels. |
96 DCHECK_EQ(frame->GetPixelWidth(), 1u); | 104 DCHECK_EQ(frame->GetPixelWidth(), 1u); |
97 DCHECK_EQ(frame->GetPixelHeight(), 1u); | 105 DCHECK_EQ(frame->GetPixelHeight(), 1u); |
98 | 106 |
99 int y_rows = frame->GetHeight(); | 107 int y_rows = frame->GetHeight(); |
100 int uv_rows = frame->GetHeight() / 2; // YV12 format. | 108 int uv_rows = frame->GetHeight() / 2; // YV12 format. |
101 CopyYPlane(frame->GetYPlane(), frame->GetYPitch(), y_rows, video_frame); | 109 CopyYPlane(frame->GetYPlane(), frame->GetYPitch(), y_rows, video_frame); |
102 CopyUPlane(frame->GetUPlane(), frame->GetUPitch(), uv_rows, video_frame); | 110 CopyUPlane(frame->GetUPlane(), frame->GetUPitch(), uv_rows, video_frame); |
103 CopyVPlane(frame->GetVPlane(), frame->GetVPitch(), uv_rows, video_frame); | 111 CopyVPlane(frame->GetVPlane(), frame->GetVPitch(), uv_rows, video_frame); |
| 112 } |
104 | 113 |
105 message_loop_proxy_->PostTask( | 114 message_loop_proxy_->PostTask( |
106 FROM_HERE, base::Bind(&RTCVideoRenderer::DoRenderFrameOnMainThread, | 115 FROM_HERE, base::Bind(&RTCVideoRenderer::DoRenderFrameOnMainThread, |
107 this, video_frame)); | 116 this, video_frame)); |
108 } | 117 } |
109 | 118 |
110 void RTCVideoRenderer::OnChanged() { | 119 void RTCVideoRenderer::OnChanged() { |
111 DCHECK(message_loop_proxy_->BelongsToCurrentThread()); | 120 DCHECK(message_loop_proxy_->BelongsToCurrentThread()); |
112 MaybeRenderSignalingFrame(); | 121 MaybeRenderSignalingFrame(); |
113 } | 122 } |
(...skipping 17 matching lines...) Expand all Loading... |
131 | 140 |
132 if (state_ != kStarted) { | 141 if (state_ != kStarted) { |
133 return; | 142 return; |
134 } | 143 } |
135 | 144 |
136 TRACE_EVENT0("video", "DoRenderFrameOnMainThread"); | 145 TRACE_EVENT0("video", "DoRenderFrameOnMainThread"); |
137 repaint_cb_.Run(video_frame); | 146 repaint_cb_.Run(video_frame); |
138 } | 147 } |
139 | 148 |
140 } // namespace content | 149 } // namespace content |
OLD | NEW |