diff options
author | Bodam Nam <bodamnam@google.com> | 2023-03-31 01:14:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-03-31 01:14:55 +0000 |
commit | b57f1978a9c13d465a243f3ba59e3274c52c257f (patch) | |
tree | 1248e7a64b3e8d6035da6b0b5c54a65738e18952 /service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/IVideoSourceNode.cpp | |
parent | 7bd2a617bc4658fa9c4b14a0d1eeda86ae9ebfd6 (diff) | |
parent | 9eb25d8b85594f7de0efa0a78129c0405a703379 (diff) | |
download | ImsMedia-b57f1978a9c13d465a243f3ba59e3274c52c257f.tar.gz |
Merge "Fix the video call crash in processOutputBuffer" into udc-dev
Diffstat (limited to 'service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/IVideoSourceNode.cpp')
-rw-r--r-- | service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/IVideoSourceNode.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/IVideoSourceNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/IVideoSourceNode.cpp index 65b429e2..a54dc377 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/IVideoSourceNode.cpp +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/nodes/IVideoSourceNode.cpp @@ -57,7 +57,6 @@ kBaseNodeId IVideoSourceNode::GetNodeId() ImsMediaResult IVideoSourceNode::Start() { IMLOGD3("[Start] codec[%d], mode[%d], cameraId[%d]", mCodecType, mVideoMode, mCameraId); - std::lock_guard<std::mutex> guard(mMutex); if (mVideoSource) { @@ -99,7 +98,6 @@ ImsMediaResult IVideoSourceNode::Start() void IVideoSourceNode::Stop() { IMLOGD0("[Stop]"); - std::lock_guard<std::mutex> guard(mMutex); if (mVideoSource) { @@ -263,9 +261,9 @@ void IVideoSourceNode::UpdateSurface(ANativeWindow* window) mWindow = window; } -void IVideoSourceNode::OnUplinkEvent(uint8_t* data, uint32_t size, int64_t timestamp, uint32_t flag) +void IVideoSourceNode::OnUplinkEvent( + uint8_t* data, uint32_t size, int64_t timestamp, uint32_t /*flag*/) { - (void)flag; IMLOGD_PACKET2( IM_PACKET_LOG_VIDEO, "[OnUplinkEvent] size[%zu], timestamp[%ld]", size, timestamp); std::lock_guard<std::mutex> guard(mMutex); |