ba7dc723b0
This fix a potential race where the rotation information of a sent frame does not match the encoded frame. BUG=webrtc:5783 TEST= Run ApprtcDemo on IOs and Android with and without capture to texture and both VP8 and H264. R=magjed@webrtc.org, pbos@webrtc.org, tkchin@webrtc.org TBR=tkchin_webrtc // For IOS changes. Review URL: https://codereview.webrtc.org/1886113003 . Cr-Commit-Position: refs/heads/master@{#12426}
81 lines
2.5 KiB
C++
81 lines
2.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_TEST_FRAME_GENERATOR_CAPTURER_H_
|
|
#define WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
|
|
|
|
#include <string>
|
|
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/platform_thread.h"
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
#include "webrtc/common_video/rotation.h"
|
|
#include "webrtc/test/video_capturer.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class CriticalSectionWrapper;
|
|
class EventTimerWrapper;
|
|
|
|
namespace test {
|
|
|
|
class FrameGenerator;
|
|
|
|
class FrameGeneratorCapturer : public VideoCapturer {
|
|
public:
|
|
static FrameGeneratorCapturer* Create(VideoCaptureInput* input,
|
|
size_t width,
|
|
size_t height,
|
|
int target_fps,
|
|
Clock* clock);
|
|
|
|
static FrameGeneratorCapturer* CreateFromYuvFile(VideoCaptureInput* input,
|
|
const std::string& file_name,
|
|
size_t width,
|
|
size_t height,
|
|
int target_fps,
|
|
Clock* clock);
|
|
virtual ~FrameGeneratorCapturer();
|
|
|
|
void Start() override;
|
|
void Stop() override;
|
|
void ForceFrame();
|
|
void SetFakeRotation(VideoRotation rotation);
|
|
|
|
int64_t first_frame_capture_time() const { return first_frame_capture_time_; }
|
|
|
|
FrameGeneratorCapturer(Clock* clock,
|
|
VideoCaptureInput* input,
|
|
FrameGenerator* frame_generator,
|
|
int target_fps);
|
|
bool Init();
|
|
|
|
private:
|
|
void InsertFrame();
|
|
static bool Run(void* obj);
|
|
|
|
Clock* const clock_;
|
|
bool sending_;
|
|
|
|
rtc::scoped_ptr<EventTimerWrapper> tick_;
|
|
rtc::CriticalSection lock_;
|
|
rtc::PlatformThread thread_;
|
|
rtc::scoped_ptr<FrameGenerator> frame_generator_;
|
|
|
|
int target_fps_;
|
|
VideoRotation fake_rotation_ = kVideoRotation_0;
|
|
|
|
int64_t first_frame_capture_time_;
|
|
};
|
|
} // test
|
|
} // webrtc
|
|
|
|
#endif // WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
|