zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates to VCMDecodedFrameCallback, VideoReceiver and a few related classes/tests.

Browse Source 
* The _receiveCallback member of VCMDecodedFrameCallback does actually not require locking now that the threading model is slightly clearer. Documentation and checks have been added.
* UserReceiveCallback() never returns null and must always be called on the decoder thread. Checks have been added and the two test suites that were failing to set this callback, have been fixed and a new mock class added.  (looks like sakal@ may have hit some issues with flaky tests there).
* Changed VcmPayloadSink to use move semantics which I suspect was the intention at the time the code was written (when we didn't have move semantics).
* Added thread checker to a couple of classes and started adding thread checks for known behavior.  There's more to be  done there.
* Remove the |_decoder| member variable in VideoReceiver. It is not needed and as it could be used, left us open to a race.
* TODOs added for places where we can reduce locking. I suspect that we can get away with not needing a lock around _codecDataBase in VideoReceiver once we've got a clear picture of the threading model and ensured that all adhere to it.

BUG=webrtc:7328

Review-Url: https://codereview.webrtc.org/2744013002
Cr-Commit-Position: refs/heads/master@{#17226}
This commit is contained in:
tommi
2017-03-14 04:16:20 -07:00
committed by Commit bot
parent 4262f1f892
commit d0a71ba1ae
12 changed files with 158 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/video_coding/video_coding_impl.cc
View File

@ -14,6 +14,7 @@
#include <utility>
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/thread_checker.h"
#include "webrtc/common_types.h"
#include "webrtc/common_video/include/video_bitrate_allocator.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
@ -98,8 +99,8 @@ class VideoCodingModuleImpl : public VideoCodingModule {
int64_t TimeUntilNextProcess() override {
int64_t sender_time = sender_.TimeUntilNextProcess();
int64_t receiver_time = receiver_.TimeUntilNextProcess();
assert(sender_time >= 0);
assert(receiver_time >= 0);
RTC_DCHECK_GE(sender_time, 0);
RTC_DCHECK_GE(receiver_time, 0);
return VCM_MIN(sender_time, receiver_time);
}
@ -190,6 +191,7 @@ class VideoCodingModuleImpl : public VideoCodingModule {
int32_t RegisterReceiveCallback(
VCMReceiveCallback* receiveCallback) override {
RTC_DCHECK(construction_thread_.CalledOnValidThread());
return receiver_.RegisterReceiveCallback(receiveCallback);
}
@ -210,6 +212,7 @@ class VideoCodingModuleImpl : public VideoCodingModule {
int32_t RegisterPacketRequestCallback(
VCMPacketRequestCallback* callback) override {
RTC_DCHECK(construction_thread_.CalledOnValidThread());
return receiver_.RegisterPacketRequestCallback(callback);
}
@ -277,6 +280,7 @@ class VideoCodingModuleImpl : public VideoCodingModule {
void TriggerDecoderShutdown() override { receiver_.TriggerDecoderShutdown(); }
private:
rtc::ThreadChecker construction_thread_;
EncodedImageCallbackWrapper post_encode_callback_;
vcm::VideoSender sender_;
std::unique_ptr<VideoBitrateAllocator> rate_allocator_;
@ -316,8 +320,8 @@ VideoCodingModule* VideoCodingModule::Create(
EventFactory* event_factory,
NackSender* nack_sender,
KeyFrameRequestSender* keyframe_request_sender) {
assert(clock);
assert(event_factory);
RTC_DCHECK(clock);
RTC_DCHECK(event_factory);
return new VideoCodingModuleImpl(clock, event_factory, nack_sender,
keyframe_request_sender, nullptr);
}