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

Removing codecType from capture API

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/964005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3013 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org
2012-10-29 15:59:40 +00:00
parent 6f19b1b651
commit e83d3111d4
6 changed files with 31 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/video_capture/main/interface/video_capture_defines.h
View File

@@ -133,11 +133,9 @@ class VideoCaptureDataCallback
{ {
public: public:
virtual void OnIncomingCapturedFrame(const WebRtc_Word32 id, virtual void OnIncomingCapturedFrame(const WebRtc_Word32 id,
I420VideoFrame& videoFrame, I420VideoFrame& videoFrame) = 0;
VideoCodecType codecType) = 0;
virtual void OnIncomingCapturedEncodedFrame(const WebRtc_Word32 id, virtual void OnIncomingCapturedEncodedFrame(const WebRtc_Word32 id,
VideoFrame& videoFrame, VideoFrame& videoFrame) = 0;
VideoCodecType codecType) = 0;
virtual void OnCaptureDelayChanged(const WebRtc_Word32 id, virtual void OnCaptureDelayChanged(const WebRtc_Word32 id,
const WebRtc_Word32 delay) = 0; const WebRtc_Word32 delay) = 0;
protected: protected:

17
webrtc/modules/video_capture/main/source/video_capture_impl.cc
View File

@@ -182,7 +182,7 @@ WebRtc_Word32 VideoCaptureImpl::CaptureDelay()
} }
WebRtc_Word32 VideoCaptureImpl::DeliverCapturedFrame(I420VideoFrame& WebRtc_Word32 VideoCaptureImpl::DeliverCapturedFrame(I420VideoFrame&
captureFrame, WebRtc_Word64 capture_time, VideoCodecType codec_type) { captureFrame, WebRtc_Word64 capture_time) {
UpdateFrameCount(); // frame count used for local frame rate callback. UpdateFrameCount(); // frame count used for local frame rate callback.
const bool callOnCaptureDelayChanged = _setCaptureDelay != _captureDelay; const bool callOnCaptureDelayChanged = _setCaptureDelay != _captureDelay;
@@ -209,15 +209,14 @@ WebRtc_Word32 VideoCaptureImpl::DeliverCapturedFrame(I420VideoFrame&
if (callOnCaptureDelayChanged) { if (callOnCaptureDelayChanged) {
_dataCallBack->OnCaptureDelayChanged(_id, _captureDelay); _dataCallBack->OnCaptureDelayChanged(_id, _captureDelay);
} }
_dataCallBack->OnIncomingCapturedFrame(_id, captureFrame, codec_type); _dataCallBack->OnIncomingCapturedFrame(_id, captureFrame);
} }
return 0; return 0;
} }
WebRtc_Word32 VideoCaptureImpl::DeliverEncodedCapturedFrame( WebRtc_Word32 VideoCaptureImpl::DeliverEncodedCapturedFrame(
VideoFrame& captureFrame, WebRtc_Word64 capture_time, VideoFrame& captureFrame, WebRtc_Word64 capture_time) {
VideoCodecType codec_type) {
UpdateFrameCount(); // frame count used for local frame rate callback. UpdateFrameCount(); // frame count used for local frame rate callback.
const bool callOnCaptureDelayChanged = _setCaptureDelay != _captureDelay; const bool callOnCaptureDelayChanged = _setCaptureDelay != _captureDelay;
@@ -244,8 +243,7 @@ WebRtc_Word32 VideoCaptureImpl::DeliverEncodedCapturedFrame(
if (callOnCaptureDelayChanged) { if (callOnCaptureDelayChanged) {
_dataCallBack->OnCaptureDelayChanged(_id, _captureDelay); _dataCallBack->OnCaptureDelayChanged(_id, _captureDelay);
} }
_dataCallBack->OnIncomingCapturedEncodedFrame(_id, captureFrame, _dataCallBack->OnIncomingCapturedEncodedFrame(_id, captureFrame);
codec_type);
} }
return 0; return 0;
@@ -309,7 +307,7 @@ WebRtc_Word32 VideoCaptureImpl::IncomingFrame(
frameInfo.rawType); frameInfo.rawType);
return -1; return -1;
} }
DeliverCapturedFrame(_captureFrame, captureTime, frameInfo.codecType); DeliverCapturedFrame(_captureFrame, captureTime);
} }
else // Encoded format else // Encoded format
{ {
@@ -319,8 +317,7 @@ WebRtc_Word32 VideoCaptureImpl::IncomingFrame(
"Failed to copy captured frame of length %d", "Failed to copy captured frame of length %d",
static_cast<int>(videoFrameLength)); static_cast<int>(videoFrameLength));
} }
DeliverEncodedCapturedFrame(_capture_encoded_frame, captureTime, DeliverEncodedCapturedFrame(_capture_encoded_frame, captureTime);
frameInfo.codecType);
} }
const WebRtc_UWord32 processTime = const WebRtc_UWord32 processTime =
@@ -356,7 +353,7 @@ WebRtc_Word32 VideoCaptureImpl::IncomingFrameI420(
return -1; return -1;
} }
DeliverCapturedFrame(_captureFrame, captureTime, kVideoCodecUnknown); DeliverCapturedFrame(_captureFrame, captureTime);
return 0; return 0;
} }

5
webrtc/modules/video_capture/main/source/video_capture_impl.h
View File

@@ -100,11 +100,10 @@ protected:
virtual ~VideoCaptureImpl(); virtual ~VideoCaptureImpl();
// TODO(mikhal): Remove codec_type. // TODO(mikhal): Remove codec_type.
WebRtc_Word32 DeliverCapturedFrame(I420VideoFrame& captureFrame, WebRtc_Word32 DeliverCapturedFrame(I420VideoFrame& captureFrame,
WebRtc_Word64 capture_time, WebRtc_Word64 capture_time);
VideoCodecType codec_type);
WebRtc_Word32 DeliverEncodedCapturedFrame( WebRtc_Word32 DeliverEncodedCapturedFrame(
VideoFrame& captureFrame, VideoFrame& captureFrame,
WebRtc_Word64 capture_time, VideoCodecType codec_type); WebRtc_Word64 capture_time);
WebRtc_Word32 _id; // Module ID WebRtc_Word32 _id; // Module ID
char* _deviceUniqueId; // current Device unique name; char* _deviceUniqueId; // current Device unique name;

6
webrtc/modules/video_capture/main/test/video_capture_unittest.cc
View File

@@ -154,8 +154,7 @@ class TestVideoCaptureCallback : public VideoCaptureDataCallback {
} }
virtual void OnIncomingCapturedFrame(const WebRtc_Word32 id, virtual void OnIncomingCapturedFrame(const WebRtc_Word32 id,
webrtc::I420VideoFrame& videoFrame, webrtc::I420VideoFrame& videoFrame) {
webrtc::VideoCodecType codecType) {
CriticalSectionScoped cs(capture_cs_.get()); CriticalSectionScoped cs(capture_cs_.get());
int height = videoFrame.height(); int height = videoFrame.height();
@@ -181,8 +180,7 @@ class TestVideoCaptureCallback : public VideoCaptureDataCallback {
last_frame_.CopyFrame(videoFrame); last_frame_.CopyFrame(videoFrame);
} }
virtual void OnIncomingCapturedEncodedFrame(const WebRtc_Word32 id, virtual void OnIncomingCapturedEncodedFrame(const WebRtc_Word32 id,
webrtc::VideoFrame& videoFrame, webrtc::VideoFrame& videoFrame)
webrtc::VideoCodecType codecType)
{ {
assert(!"NOTIMPLEMENTED"); assert(!"NOTIMPLEMENTED");
} }

36
webrtc/video_engine/vie_capturer.cc
View File

@@ -345,8 +345,7 @@ int ViECapturer::IncomingFrameI420(const ViEVideoFrameI420& video_frame,
} }
void ViECapturer::OnIncomingCapturedFrame(const WebRtc_Word32 capture_id, void ViECapturer::OnIncomingCapturedFrame(const WebRtc_Word32 capture_id,
I420VideoFrame& video_frame, I420VideoFrame& video_frame) {
VideoCodecType codec_type) {
WEBRTC_TRACE(kTraceStream, kTraceVideo, ViEId(engine_id_, capture_id_), WEBRTC_TRACE(kTraceStream, kTraceVideo, ViEId(engine_id_, capture_id_),
"%s(capture_id: %d)", __FUNCTION__, capture_id); "%s(capture_id: %d)", __FUNCTION__, capture_id);
CriticalSectionScoped cs(capture_cs_.get()); CriticalSectionScoped cs(capture_cs_.get());
@@ -360,8 +359,7 @@ void ViECapturer::OnIncomingCapturedFrame(const WebRtc_Word32 capture_id,
} }
void ViECapturer::OnIncomingCapturedEncodedFrame(const WebRtc_Word32 capture_id, void ViECapturer::OnIncomingCapturedEncodedFrame(const WebRtc_Word32 capture_id,
VideoFrame& video_frame, VideoFrame& video_frame) {
VideoCodecType codec_type) {
WEBRTC_TRACE(kTraceStream, kTraceVideo, ViEId(engine_id_, capture_id_), WEBRTC_TRACE(kTraceStream, kTraceVideo, ViEId(engine_id_, capture_id_),
"%s(capture_id: %d)", __FUNCTION__, capture_id); "%s(capture_id: %d)", __FUNCTION__, capture_id);
CriticalSectionScoped cs(capture_cs_.get()); CriticalSectionScoped cs(capture_cs_.get());
@@ -369,23 +367,21 @@ void ViECapturer::OnIncomingCapturedEncodedFrame(const WebRtc_Word32 capture_id,
// is slightly off since it's being set when the frame has been received from // is slightly off since it's being set when the frame has been received from
// the camera, and not when the camera actually captured the frame. // the camera, and not when the camera actually captured the frame.
video_frame.SetRenderTime(video_frame.RenderTimeMs() - FrameDelay()); video_frame.SetRenderTime(video_frame.RenderTimeMs() - FrameDelay());
if (codec_type != kVideoCodecUnknown) { if (encoded_frame_.Length() != 0) {
if (encoded_frame_.Length() != 0) { // The last encoded frame has not been sent yet. Need to wait.
// The last encoded frame has not been sent yet. Need to wait. deliver_event_.Reset();
deliver_event_.Reset(); WEBRTC_TRACE(kTraceWarning, kTraceVideo, ViEId(engine_id_, capture_id_),
WEBRTC_TRACE(kTraceWarning, kTraceVideo, ViEId(engine_id_, capture_id_), "%s(capture_id: %d) Last encoded frame not yet delivered.",
"%s(capture_id: %d) Last encoded frame not yet delivered.", __FUNCTION__, capture_id);
__FUNCTION__, capture_id); capture_cs_->Leave();
capture_cs_->Leave(); // Wait for the coded frame to be sent before unblocking this.
// Wait for the coded frame to be sent before unblocking this. deliver_event_.Wait(kMaxDeliverWaitTime);
deliver_event_.Wait(kMaxDeliverWaitTime); assert(encoded_frame_.Length() == 0);
assert(encoded_frame_.Length() == 0); capture_cs_->Enter();
capture_cs_->Enter(); } else {
} else { assert(false);
assert(false);
}
encoded_frame_.SwapFrame(video_frame);
} }
encoded_frame_.SwapFrame(video_frame);
capture_event_.Set(); capture_event_.Set();
return; return;
} }

6
webrtc/video_engine/vie_capturer.h
View File

@@ -116,11 +116,9 @@ class ViECapturer
// Implements VideoCaptureDataCallback. // Implements VideoCaptureDataCallback.
virtual void OnIncomingCapturedFrame(const WebRtc_Word32 id, virtual void OnIncomingCapturedFrame(const WebRtc_Word32 id,
I420VideoFrame& video_frame, I420VideoFrame& video_frame);
VideoCodecType codec_type);
virtual void OnIncomingCapturedEncodedFrame(const WebRtc_Word32 capture_id, virtual void OnIncomingCapturedEncodedFrame(const WebRtc_Word32 capture_id,
VideoFrame& video_frame, VideoFrame& video_frame);
VideoCodecType codec_type);
virtual void OnCaptureDelayChanged(const WebRtc_Word32 id, virtual void OnCaptureDelayChanged(const WebRtc_Word32 id,
const WebRtc_Word32 delay); const WebRtc_Word32 delay);