af612d5e07
Original cl description: This removes the none const pointer entry and SwapFrame. Since frames delivered using VideoSendStream no longer use the external capture module, VideoSendStream will not get an incoming framerate callback. VideoSendStream now uses a rtc::RateTracker. Also, the video engine must ensure that time stamps are always increasing. With this, time stamps (ntp, render_time and rtp timestamps ) are checked and set in ViECapturer::OnIncomingCapturedFrame This cl was previously reverted in https://webrtc-codereview.appspot.com/46549004/. Patchset 1 contains the original patch after rebase. Patshet 2 fix webrtc_perf_tests reported in chromium:465306 Note that chromium:465287 is being fixed in https://webrtc-codereview.appspot.com/43829004/ BUG=1128 R=magjed@webrtc.org, mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/47629004 Cr-Commit-Position: refs/heads/master@{#8776} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8776 4adac7df-926f-26a2-2b94-8c16560cd09d
47 lines
1.5 KiB
C++
47 lines
1.5 KiB
C++
/*
|
|
* Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
#ifndef WEBRTC_VIDEO_ENGINE_TEST_COMMON_VCM_CAPTURER_H_
|
|
#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_VCM_CAPTURER_H_
|
|
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
|
|
#include "webrtc/modules/video_capture/include/video_capture.h"
|
|
#include "webrtc/test/video_capturer.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
class VcmCapturer : public VideoCapturer, public VideoCaptureDataCallback {
|
|
public:
|
|
static VcmCapturer* Create(VideoSendStreamInput* input, size_t width,
|
|
size_t height, size_t target_fps);
|
|
virtual ~VcmCapturer();
|
|
|
|
void Start() override;
|
|
void Stop() override;
|
|
|
|
void OnIncomingCapturedFrame(const int32_t id,
|
|
const I420VideoFrame& frame) override; // NOLINT
|
|
void OnCaptureDelayChanged(const int32_t id, const int32_t delay) override;
|
|
|
|
private:
|
|
explicit VcmCapturer(VideoSendStreamInput* input);
|
|
bool Init(size_t width, size_t height, size_t target_fps);
|
|
void Destroy();
|
|
|
|
bool started_;
|
|
VideoCaptureModule* vcm_;
|
|
VideoCaptureCapability capability_;
|
|
};
|
|
} // test
|
|
} // webrtc
|
|
|
|
#endif // WEBRTC_VIDEO_ENGINE_TEST_COMMON_VCM_CAPTURER_H_
|