d72262dc01
Rolling to the latest Chromium picks up a new clang, which catches a fresh error:
error: 'reinterpret_cast' to class 'webrtc::VideoEngineImpl *' from its base at non-zero offset 'webrtc::VideoEngine *' behaves differently from 'static_cast' [-Werror,-Wreinterpret-base-class]
VideoEngineImpl* vie_impl = reinterpret_cast<VideoEngineImpl*>(video_engine);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../webrtc/video_engine/vie_codec_impl.cc:36:31: note: use 'static_cast' to adjust the pointer correctly while downcasting
VideoEngineImpl* vie_impl = reinterpret_cast<VideoEngineImpl*>(video_engine);
^~~~~~~~~~~~~~~~
static_cast
This was triggered by André's change here:
https://code.google.com/p/webrtc/source/detail?r=3986
which made VideoEngineImpl a derived class of VideoEngine (good).
Picked up one other error as well:
error: implicit conversion from 'long' to 'int' changes value from 9223372036854775807 to -1 [-Werror,-Wconstant-conversion]
AutoTestSleep(std::numeric_limits<long>::max());
~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This fixes the errors and is required before stable can be rolled in Chromium.
TBR=mflodman,andresp
Review URL: https://webrtc-codereview.appspot.com/1450004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3989 4adac7df-926f-26a2-2b94-8c16560cd09d
112 lines
3.9 KiB
C++
112 lines
3.9 KiB
C++
/*
|
|
* Copyright (c) 2011 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.
|
|
*/
|
|
|
|
#include "video_engine/vie_encryption_impl.h"
|
|
|
|
#include "system_wrappers/interface/trace.h"
|
|
#include "video_engine/include/vie_errors.h"
|
|
#include "video_engine/vie_channel.h"
|
|
#include "video_engine/vie_channel_manager.h"
|
|
#include "video_engine/vie_defines.h"
|
|
#include "video_engine/vie_impl.h"
|
|
#include "video_engine/vie_shared_data.h"
|
|
|
|
namespace webrtc {
|
|
|
|
ViEEncryption* ViEEncryption::GetInterface(VideoEngine* video_engine) {
|
|
#ifdef WEBRTC_VIDEO_ENGINE_ENCRYPTION_API
|
|
if (video_engine == NULL) {
|
|
return NULL;
|
|
}
|
|
VideoEngineImpl* vie_impl = static_cast<VideoEngineImpl*>(video_engine);
|
|
ViEEncryptionImpl* vie_encryption_impl = vie_impl;
|
|
// Increase ref count.
|
|
(*vie_encryption_impl)++;
|
|
return vie_encryption_impl;
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
int ViEEncryptionImpl::Release() {
|
|
WEBRTC_TRACE(kTraceApiCall, kTraceVideo, shared_data_->instance_id(),
|
|
"ViEEncryptionImpl::Release()");
|
|
// Decrease ref count.
|
|
(*this)--;
|
|
|
|
int32_t ref_count = GetCount();
|
|
if (ref_count < 0) {
|
|
WEBRTC_TRACE(kTraceWarning, kTraceVideo, shared_data_->instance_id(),
|
|
"ViEEncryptionImpl release too many times");
|
|
shared_data_->SetLastError(kViEAPIDoesNotExist);
|
|
return -1;
|
|
}
|
|
WEBRTC_TRACE(kTraceInfo, kTraceVideo, shared_data_->instance_id(),
|
|
"ViEEncryptionImpl reference count: %d", ref_count);
|
|
return ref_count;
|
|
}
|
|
|
|
ViEEncryptionImpl::ViEEncryptionImpl(ViESharedData* shared_data)
|
|
: shared_data_(shared_data) {
|
|
WEBRTC_TRACE(kTraceMemory, kTraceVideo, shared_data_->instance_id(),
|
|
"ViEEncryptionImpl::ViEEncryptionImpl() Ctor");
|
|
}
|
|
|
|
ViEEncryptionImpl::~ViEEncryptionImpl() {
|
|
WEBRTC_TRACE(kTraceMemory, kTraceVideo, shared_data_->instance_id(),
|
|
"ViEEncryptionImpl::~ViEEncryptionImpl() Dtor");
|
|
}
|
|
|
|
int ViEEncryptionImpl::RegisterExternalEncryption(const int video_channel,
|
|
Encryption& encryption) {
|
|
WEBRTC_TRACE(kTraceApiCall, kTraceVideo,
|
|
ViEId(shared_data_->instance_id(), video_channel),
|
|
"RegisterExternalEncryption(video_channel=%d)", video_channel);
|
|
|
|
ViEChannelManagerScoped cs(*(shared_data_->channel_manager()));
|
|
ViEChannel* vie_channel = cs.Channel(video_channel);
|
|
if (vie_channel == NULL) {
|
|
WEBRTC_TRACE(kTraceError, kTraceVideo,
|
|
ViEId(shared_data_->instance_id(), video_channel),
|
|
"%s: No channel %d", __FUNCTION__, video_channel);
|
|
shared_data_->SetLastError(kViEEncryptionInvalidChannelId);
|
|
return -1;
|
|
}
|
|
if (vie_channel->RegisterExternalEncryption(&encryption) != 0) {
|
|
shared_data_->SetLastError(kViEEncryptionUnknownError);
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int ViEEncryptionImpl::DeregisterExternalEncryption(const int video_channel) {
|
|
WEBRTC_TRACE(kTraceApiCall, kTraceVideo,
|
|
ViEId(shared_data_->instance_id(), video_channel),
|
|
"RegisterExternalEncryption(video_channel=%d)", video_channel);
|
|
|
|
ViEChannelManagerScoped cs(*(shared_data_->channel_manager()));
|
|
ViEChannel* vie_channel = cs.Channel(video_channel);
|
|
if (vie_channel == NULL) {
|
|
WEBRTC_TRACE(kTraceError, kTraceVideo,
|
|
ViEId(shared_data_->instance_id(), video_channel),
|
|
"%s: No channel %d", __FUNCTION__, video_channel);
|
|
shared_data_->SetLastError(kViEEncryptionInvalidChannelId);
|
|
return -1;
|
|
}
|
|
|
|
if (vie_channel->DeRegisterExternalEncryption() != 0) {
|
|
shared_data_->SetLastError(kViEEncryptionUnknownError);
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
} // namespace webrtc
|