91d6edef35
We must remove dependency on Chromium, i.e. we can't use Chromium's base/logging.h. That means we need to define these macros in WebRTC also when doing Chromium builds. And this causes redefinition. Alternative solutions: * Check if we already have defined e.g. CHECK, and don't define them in that case. This makes us depend on include order in Chromium, which is not acceptable. * Don't allow using the macros in WebRTC headers. Error prone since if someone adds it there by mistake it may compile fine, but later break if a header in added or order is changed in Chromium. That will be confusing and hard to enforce. * Ensure that headers that are included by an embedder don't include our macros. This would require some heavy refactoring to be maintainable and enforcable. * Changes in Chromium for this is obviously not an option. BUG=chromium:468375 NOTRY=true Review URL: https://codereview.webrtc.org/1335923002 Cr-Commit-Position: refs/heads/master@{#9964}
41 lines
1.3 KiB
C++
41 lines
1.3 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.
|
|
*/
|
|
|
|
#include "webrtc/video/encoded_frame_callback_adapter.h"
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/modules/video_coding/main/source/encoded_frame.h"
|
|
|
|
namespace webrtc {
|
|
namespace internal {
|
|
|
|
EncodedFrameCallbackAdapter::EncodedFrameCallbackAdapter(
|
|
EncodedFrameObserver* observer) : observer_(observer) {
|
|
}
|
|
|
|
EncodedFrameCallbackAdapter::~EncodedFrameCallbackAdapter() {}
|
|
|
|
int32_t EncodedFrameCallbackAdapter::Encoded(
|
|
const EncodedImage& encodedImage,
|
|
const CodecSpecificInfo* codecSpecificInfo,
|
|
const RTPFragmentationHeader* fragmentation) {
|
|
RTC_DCHECK(observer_ != nullptr);
|
|
FrameType frame_type =
|
|
VCMEncodedFrame::ConvertFrameType(encodedImage._frameType);
|
|
const EncodedFrame frame(encodedImage._buffer,
|
|
encodedImage._length,
|
|
frame_type);
|
|
observer_->EncodedFrameCallback(frame);
|
|
return 0;
|
|
}
|
|
|
|
} // namespace internal
|
|
} // namespace webrtc
|