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

Side by Side Diff: talk/app/webrtc/mediastreamhandler.h

Issue 1224093003: Update audio code to use size_t more correctly, talk/ portion. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 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 | « no previous file | talk/app/webrtc/mediastreamhandler.cc » ('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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 public: 75 public:
76 LocalAudioSinkAdapter(); 76 LocalAudioSinkAdapter();
77 virtual ~LocalAudioSinkAdapter(); 77 virtual ~LocalAudioSinkAdapter();
78 78
79 private: 79 private:
80 // AudioSinkInterface implementation. 80 // AudioSinkInterface implementation.
81 void OnData(const void* audio_data, 81 void OnData(const void* audio_data,
82 int bits_per_sample, 82 int bits_per_sample,
83 int sample_rate, 83 int sample_rate,
84 int number_of_channels, 84 int number_of_channels,
85 int number_of_frames) override; 85 size_t number_of_frames) override;
86 86
87 // cricket::AudioRenderer implementation. 87 // cricket::AudioRenderer implementation.
88 void SetSink(cricket::AudioRenderer::Sink* sink) override; 88 void SetSink(cricket::AudioRenderer::Sink* sink) override;
89 89
90 cricket::AudioRenderer::Sink* sink_; 90 cricket::AudioRenderer::Sink* sink_;
91 // Critical section protecting |sink_|. 91 // Critical section protecting |sink_|.
92 rtc::CriticalSection lock_; 92 rtc::CriticalSection lock_;
93 }; 93 };
94 94
95 // LocalAudioTrackHandler listen to events on a local AudioTrack instance 95 // LocalAudioTrackHandler listen to events on a local AudioTrack instance
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 284
285 StreamHandlerList local_streams_handlers_; 285 StreamHandlerList local_streams_handlers_;
286 StreamHandlerList remote_streams_handlers_; 286 StreamHandlerList remote_streams_handlers_;
287 AudioProviderInterface* audio_provider_; 287 AudioProviderInterface* audio_provider_;
288 VideoProviderInterface* video_provider_; 288 VideoProviderInterface* video_provider_;
289 }; 289 };
290 290
291 } // namespace webrtc 291 } // namespace webrtc
292 292
293 #endif // TALK_APP_WEBRTC_MEDIASTREAMHANDLER_H_ 293 #endif // TALK_APP_WEBRTC_MEDIASTREAMHANDLER_H_
OLDNEW
« no previous file with comments | « no previous file | talk/app/webrtc/mediastreamhandler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698