webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc - Issue 1371043003: Unify FrameType and VideoFrameType.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc

Issue 1371043003: Unify FrameType and VideoFrameType. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc ('k') | webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc

diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc

index 014227584619f6a60fee934c57d45a77629114da..12ea300fe5760634b4698736abf2b15921f8a186 100644

--- a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc

+++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc

@@ -46,7 +46,7 @@ class AcmReceiverTestOldApi : public AudioPacketizationCallback,

: timestamp_(0),

packet_sent_(false),

last_packet_send_timestamp_(timestamp_),

- last_frame_type_(kFrameEmpty) {

+ last_frame_type_(kEmptyFrame) {

AudioCodingModule::Config config;

acm_.reset(new AudioCodingModuleImpl(config));

receiver_.reset(new AcmReceiver(config));

@@ -120,7 +120,7 @@ class AcmReceiverTestOldApi : public AudioPacketizationCallback,

const uint8_t* payload_data,

size_t payload_len_bytes,

const RTPFragmentationHeader* fragmentation) override {

- if (frame_type == kFrameEmpty)

+ if (frame_type == kEmptyFrame)

return 0;

rtp_header_.header.payloadType = payload_type;