webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.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/audio_coding_module_impl.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:

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

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

index a65227866169677e0b57f4d91a2dfa45a050c661..879af49bd235c7b2d5eaa19c49419ed6df69bdc5 100644

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

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

@@ -171,7 +171,7 @@ int32_t AudioCodingModuleImpl::Encode(const InputData& input_data) {

ConvertEncodedInfoToFragmentationHeader(encoded_info, &my_fragmentation);

FrameType frame_type;

if (encode_buffer_.size() == 0 && encoded_info.send_even_if_empty) {

- frame_type = kFrameEmpty;

+ frame_type = kEmptyFrame;

encoded_info.payload_type = previous_pltype;

} else {

RTC_DCHECK_GT(encode_buffer_.size(), 0u);