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

Side by Side Diff: talk/media/base/fakemediaengine.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 | « talk/media/base/audiorenderer.h ('k') | talk/media/webrtc/fakewebrtcvoiceengine.h » ('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 2004 Google Inc. 3 * Copyright 2004 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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 virtual ~VoiceChannelAudioSink() { 431 virtual ~VoiceChannelAudioSink() {
432 if (renderer_) { 432 if (renderer_) {
433 renderer_->RemoveChannel(0); 433 renderer_->RemoveChannel(0);
434 renderer_->SetSink(NULL); 434 renderer_->SetSink(NULL);
435 } 435 }
436 } 436 }
437 void OnData(const void* audio_data, 437 void OnData(const void* audio_data,
438 int bits_per_sample, 438 int bits_per_sample,
439 int sample_rate, 439 int sample_rate,
440 int number_of_channels, 440 int number_of_channels,
441 int number_of_frames) override {} 441 size_t number_of_frames) override {}
442 void OnClose() override { renderer_ = NULL; } 442 void OnClose() override { renderer_ = NULL; }
443 AudioRenderer* renderer() const { return renderer_; } 443 AudioRenderer* renderer() const { return renderer_; }
444 444
445 private: 445 private:
446 AudioRenderer* renderer_; 446 AudioRenderer* renderer_;
447 }; 447 };
448 448
449 449
450 FakeVoiceEngine* engine_; 450 FakeVoiceEngine* engine_;
451 std::vector<AudioCodec> recv_codecs_; 451 std::vector<AudioCodec> recv_codecs_;
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 1053
1054 private: 1054 private:
1055 std::vector<FakeDataMediaChannel*> channels_; 1055 std::vector<FakeDataMediaChannel*> channels_;
1056 std::vector<DataCodec> data_codecs_; 1056 std::vector<DataCodec> data_codecs_;
1057 DataChannelType last_channel_type_; 1057 DataChannelType last_channel_type_;
1058 }; 1058 };
1059 1059
1060 } // namespace cricket 1060 } // namespace cricket
1061 1061
1062 #endif // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_ 1062 #endif // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_
OLDNEW
« no previous file with comments | « talk/media/base/audiorenderer.h ('k') | talk/media/webrtc/fakewebrtcvoiceengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698