Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(731)

Side by Side Diff: webrtc/modules/audio_mixer/output_mixer.cc

Issue 2104363003: A simple copy of the old mixer to a new directory. I also plan to run 'git cl format'. In another C… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « webrtc/modules/audio_mixer/output_mixer.h ('k') | webrtc/modules/audio_mixer/source/OWNERS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 22 matching lines...) Expand all
33 33
34 _audioFrame.CopyFrom(generalAudioFrame); 34 _audioFrame.CopyFrom(generalAudioFrame);
35 _audioFrame.id_ = id; 35 _audioFrame.id_ = id;
36 } 36 }
37 37
38 void OutputMixer::PlayNotification(int32_t id, uint32_t durationMs) 38 void OutputMixer::PlayNotification(int32_t id, uint32_t durationMs)
39 { 39 {
40 WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,-1), 40 WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,-1),
41 "OutputMixer::PlayNotification(id=%d, durationMs=%d)", 41 "OutputMixer::PlayNotification(id=%d, durationMs=%d)",
42 id, durationMs); 42 id, durationMs);
43 // Not implement yet 43 // Not implement yet
ossu 2016/06/30 15:44:02 This ...
44 } 44 }
45 45
46 void OutputMixer::RecordNotification(int32_t id, 46 void OutputMixer::RecordNotification(int32_t id,
47 uint32_t durationMs) 47 uint32_t durationMs)
48 { 48 {
49 WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,-1), 49 WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,-1),
50 "OutputMixer::RecordNotification(id=%d, durationMs=%d)", 50 "OutputMixer::RecordNotification(id=%d, durationMs=%d)",
51 id, durationMs); 51 id, durationMs);
52 52
53 // Not implement yet 53 // Not implement yet
ossu 2016/06/30 15:44:03 ... is ...
54 } 54 }
55 55
56 void OutputMixer::PlayFileEnded(int32_t id) 56 void OutputMixer::PlayFileEnded(int32_t id)
57 { 57 {
58 WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,-1), 58 WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,-1),
59 "OutputMixer::PlayFileEnded(id=%d)", id); 59 "OutputMixer::PlayFileEnded(id=%d)", id);
60 60
61 // not needed 61 // not needed
ossu 2016/06/30 15:44:03 ... lovely :)
62 } 62 }
63 63
64 void OutputMixer::RecordFileEnded(int32_t id) 64 void OutputMixer::RecordFileEnded(int32_t id)
65 { 65 {
66 WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,-1), 66 WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,-1),
67 "OutputMixer::RecordFileEnded(id=%d)", id); 67 "OutputMixer::RecordFileEnded(id=%d)", id);
68 assert(id == _instanceId); 68 assert(id == _instanceId);
69 69
70 rtc::CritScope cs(&_fileCritSect); 70 rtc::CritScope cs(&_fileCritSect);
71 _outputFileRecording = false; 71 _outputFileRecording = false;
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 } 518 }
519 } 519 }
520 520
521 // --- Measure audio level (0-9) for the combined signal 521 // --- Measure audio level (0-9) for the combined signal
522 _audioLevel.ComputeLevel(_audioFrame); 522 _audioLevel.ComputeLevel(_audioFrame);
523 523
524 return 0; 524 return 0;
525 } 525 }
526 } // namespace voe 526 } // namespace voe
527 } // namespace webrtc 527 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_mixer/output_mixer.h ('k') | webrtc/modules/audio_mixer/source/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698