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

Remove VideoFrameType aliases for FrameType.

Browse Source 
No longer used in Chromium, so these can now be removed.

BUG=webrtc:5042
R=mflodman@webrtc.org
TBR=magjed@webrtc.org

Review URL: https://codereview.webrtc.org/1415693002 .

Cr-Commit-Position: refs/heads/master@{#10390}
This commit is contained in:
Peter Boström
2015-10-23 15:58:18 +02:00
parent a99069db63
commit 49e196af40
24 changed files with 111 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/video_coding/main/source/encoded_frame.cc
View File

@ -89,7 +89,7 @@ void VCMEncodedFrame::Reset()
_renderTimeMs = -1;
_timeStamp = 0;
_payloadType = 0;
_frameType = kDeltaFrame;
_frameType = kVideoFrameDelta;
_encodedWidth = 0;
_encodedHeight = 0;
_completeFrame = false;

2
webrtc/modules/video_coding/main/source/media_optimization.cc
View File

@ -372,7 +372,7 @@ int32_t MediaOptimization::UpdateWithEncodedData(
UpdateSentBitrate(now_ms);
UpdateSentFramerate();
if (encoded_length > 0) {
const bool delta_frame = encoded_image._frameType != kKeyFrame;
const bool delta_frame = encoded_image._frameType != kVideoFrameKey;
frame_dropper_->Fill(encoded_length, delta_frame);
if (max_payload_size_ > 0 && encoded_length > 0) {

2
webrtc/modules/video_coding/main/source/media_optimization_unittest.cc
View File

@ -38,7 +38,7 @@ class TestMediaOptimization : public ::testing::Test {
EncodedImage encoded_image;
encoded_image._length = bytes_per_frame;
encoded_image._timeStamp = next_timestamp_;
encoded_image._frameType = kKeyFrame;
encoded_image._frameType = kVideoFrameKey;
ASSERT_EQ(VCM_OK, media_opt_.UpdateWithEncodedData(encoded_image));
}
next_timestamp_ += frame_time_ms_ * kSampleRate / 1000;

12
webrtc/modules/video_coding/main/source/video_sender_unittest.cc
View File

@ -236,16 +236,16 @@ class TestVideoSenderWithMockEncoder : public TestVideoSender {
// No intra request expected.
EXPECT_CALL(
encoder_,
Encode(_,
_,
Pointee(ElementsAre(kDeltaFrame, kDeltaFrame, kDeltaFrame))))
.Times(1).WillRepeatedly(Return(0));
Encode(_, _, Pointee(ElementsAre(kVideoFrameDelta, kVideoFrameDelta,
kVideoFrameDelta))))
.Times(1)
.WillRepeatedly(Return(0));
return;
}
assert(stream >= 0);
assert(stream < kNumberOfStreams);
std::vector<FrameType> frame_types(kNumberOfStreams, kDeltaFrame);
frame_types[stream] = kKeyFrame;
std::vector<FrameType> frame_types(kNumberOfStreams, kVideoFrameDelta);
frame_types[stream] = kVideoFrameKey;
EXPECT_CALL(
encoder_,
Encode(_,