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

Side by Side Diff: webrtc/modules/audio_mixer/include/audio_mixer_defines.h

Issue 2111293003: Removed callback between old AudioConferenceMixer and OutputMixer. The audio frame with mixed audio… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@new_mixer_format
Patch Set: Renamed variables, removed DCHECK(false), changed back copyright years. 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // This function specifies the sampling frequency needed for the AudioFrame 57 // This function specifies the sampling frequency needed for the AudioFrame
58 // for future GetAudioFrame(..) calls. 58 // for future GetAudioFrame(..) calls.
59 virtual int32_t NeededFrequency(int32_t id) const = 0; 59 virtual int32_t NeededFrequency(int32_t id) const = 0;
60 60
61 NewMixHistory* _mixHistory; 61 NewMixHistory* _mixHistory;
62 62
63 protected: 63 protected:
64 MixerAudioSource(); 64 MixerAudioSource();
65 virtual ~MixerAudioSource(); 65 virtual ~MixerAudioSource();
66 }; 66 };
67
68 class OldAudioMixerOutputReceiver {
69 public:
70 // This callback function provides the mixed audio for this mix iteration.
71 // Note that uniqueAudioFrames is an array of AudioFrame pointers with the
72 // size according to the size parameter.
73 virtual void NewMixedAudio(const int32_t id,
74 const AudioFrame& generalAudioFrame,
75 const AudioFrame** uniqueAudioFrames,
76 const uint32_t size) = 0;
77
78 protected:
79 OldAudioMixerOutputReceiver() {}
80 virtual ~OldAudioMixerOutputReceiver() {}
81 };
82 } // namespace webrtc 67 } // namespace webrtc
83 68
84 #endif // WEBRTC_MODULES_AUDIO_MIXER_INCLUDE_AUDIO_MIXER_DEFINES_H_ 69 #endif // WEBRTC_MODULES_AUDIO_MIXER_INCLUDE_AUDIO_MIXER_DEFINES_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_mixer/audio_mixer.cc ('k') | webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698