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

Delete local convenience alias Buffer

Browse Source 
Bug: webrtc:10524
Change-Id: I01d8e02b3b625288df7d41d08c36caeba08dd3aa
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132006
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27512}
This commit is contained in:
Niels Möller
2019-04-09 10:27:34 +02:00
committed by Commit Bot
parent 00d1adf880
commit 1f44bc1df2
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/video_coding/codecs/vp8/default_temporal_layers.cc
View File

@ -37,7 +37,6 @@ DefaultTemporalLayers::PendingFrame::PendingFrame(
dependency_info(dependency_info) {} dependency_info(dependency_info) {}
namespace { namespace {
using Buffer = Vp8FrameConfig::Buffer;
using BufferFlags = Vp8FrameConfig::BufferFlags; using BufferFlags = Vp8FrameConfig::BufferFlags;
using FreezeEntropy = Vp8FrameConfig::FreezeEntropy; using FreezeEntropy = Vp8FrameConfig::FreezeEntropy;
using Vp8BufferReference = Vp8FrameConfig::Vp8BufferReference; using Vp8BufferReference = Vp8FrameConfig::Vp8BufferReference;
@ -505,14 +504,16 @@ void DefaultTemporalLayers::OnEncodeDone(size_t stream_index,
RTC_DCHECK_EQ(vp8_info.referencedBuffersCount, 0u); RTC_DCHECK_EQ(vp8_info.referencedBuffersCount, 0u);
RTC_DCHECK_EQ(vp8_info.updatedBuffersCount, 0u); RTC_DCHECK_EQ(vp8_info.updatedBuffersCount, 0u);
for (int i = 0; i < static_cast<int>(Buffer::kCount); ++i) { for (int i = 0; i < static_cast<int>(Vp8FrameConfig::Buffer::kCount); ++i) {
if (!is_keyframe && frame_config.References(static_cast<Buffer>(i))) { if (!is_keyframe &&
frame_config.References(static_cast<Vp8FrameConfig::Buffer>(i))) {
RTC_DCHECK_LT(vp8_info.referencedBuffersCount, RTC_DCHECK_LT(vp8_info.referencedBuffersCount,
arraysize(CodecSpecificInfoVP8::referencedBuffers)); arraysize(CodecSpecificInfoVP8::referencedBuffers));
vp8_info.referencedBuffers[vp8_info.referencedBuffersCount++] = i; vp8_info.referencedBuffers[vp8_info.referencedBuffersCount++] = i;
} }
if (is_keyframe || frame_config.Updates(static_cast<Buffer>(i))) { if (is_keyframe ||
frame_config.Updates(static_cast<Vp8FrameConfig::Buffer>(i))) {
RTC_DCHECK_LT(vp8_info.updatedBuffersCount, RTC_DCHECK_LT(vp8_info.updatedBuffersCount,
arraysize(CodecSpecificInfoVP8::updatedBuffers)); arraysize(CodecSpecificInfoVP8::updatedBuffers));
vp8_info.updatedBuffers[vp8_info.updatedBuffersCount++] = i; vp8_info.updatedBuffers[vp8_info.updatedBuffersCount++] = i;

11
modules/video_coding/codecs/vp8/screenshare_layers.cc
View File

@ -23,7 +23,6 @@
namespace webrtc { namespace webrtc {
namespace { namespace {
using Buffer = Vp8FrameConfig::Buffer;
using BufferFlags = Vp8FrameConfig::BufferFlags; using BufferFlags = Vp8FrameConfig::BufferFlags;
constexpr BufferFlags kNone = Vp8FrameConfig::BufferFlags::kNone; constexpr BufferFlags kNone = Vp8FrameConfig::BufferFlags::kNone;
@ -340,16 +339,16 @@ void ScreenshareLayers::OnEncodeDone(size_t stream_index,
// Note that |frame_config| is not derefernced if |is_keyframe|, // Note that |frame_config| is not derefernced if |is_keyframe|,
// meaning it's never dereferenced if the optional may be unset. // meaning it's never dereferenced if the optional may be unset.
for (int i = 0; i < static_cast<int>(Buffer::kCount); ++i) { for (int i = 0; i < static_cast<int>(Vp8FrameConfig::Buffer::kCount); ++i) {
if (!is_keyframe && if (!is_keyframe && dependency_info->frame_config.References(
dependency_info->frame_config.References(static_cast<Buffer>(i))) { static_cast<Vp8FrameConfig::Buffer>(i))) {
RTC_DCHECK_LT(vp8_info.referencedBuffersCount, RTC_DCHECK_LT(vp8_info.referencedBuffersCount,
arraysize(CodecSpecificInfoVP8::referencedBuffers)); arraysize(CodecSpecificInfoVP8::referencedBuffers));
vp8_info.referencedBuffers[vp8_info.referencedBuffersCount++] = i; vp8_info.referencedBuffers[vp8_info.referencedBuffersCount++] = i;
} }
if (is_keyframe || if (is_keyframe || dependency_info->frame_config.Updates(
dependency_info->frame_config.Updates(static_cast<Buffer>(i))) { static_cast<Vp8FrameConfig::Buffer>(i))) {
RTC_DCHECK_LT(vp8_info.updatedBuffersCount, RTC_DCHECK_LT(vp8_info.updatedBuffersCount,
arraysize(CodecSpecificInfoVP8::updatedBuffers)); arraysize(CodecSpecificInfoVP8::updatedBuffers));
vp8_info.updatedBuffers[vp8_info.updatedBuffersCount++] = i; vp8_info.updatedBuffers[vp8_info.updatedBuffersCount++] = i;