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

Unified Diff: media/cast/receiver/audio_decoder.h

Issue 308043006: [Cast] Clean-up: Merge RtpReceiver+AudioReceiver+VideoReceiver-->FrameReceiver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed hclam's comments. Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/cast_testing.gypi ('k') | media/cast/receiver/audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/receiver/audio_decoder.h
diff --git a/media/cast/audio_receiver/audio_decoder.h b/media/cast/receiver/audio_decoder.h
similarity index 89%
rename from media/cast/audio_receiver/audio_decoder.h
rename to media/cast/receiver/audio_decoder.h
index a8e264dc94d7d5a52d220d4b022561c8a422acd6..49faecdc70cf7e3ce61d66fea3414b03cacb606c 100644
--- a/media/cast/audio_receiver/audio_decoder.h
+++ b/media/cast/receiver/audio_decoder.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MEDIA_CAST_AUDIO_RECEIVER_AUDIO_DECODER_H_
-#define MEDIA_CAST_AUDIO_RECEIVER_AUDIO_DECODER_H_
+#ifndef MEDIA_CAST_RECEIVER_AUDIO_DECODER_H_
+#define MEDIA_CAST_RECEIVER_AUDIO_DECODER_H_
#include "base/callback.h"
#include "base/memory/ref_counted.h"
@@ -27,7 +27,9 @@ class AudioDecoder {
bool is_continuous)> DecodeFrameCallback;
AudioDecoder(const scoped_refptr<CastEnvironment>& cast_environment,
- const FrameReceiverConfig& audio_config);
+ int channels,
+ int sampling_rate,
+ transport::AudioCodec codec);
virtual ~AudioDecoder();
// Returns STATUS_AUDIO_INITIALIZED if the decoder was successfully
@@ -59,4 +61,4 @@ class AudioDecoder {
} // namespace cast
} // namespace media
-#endif // MEDIA_CAST_AUDIO_RECEIVER_AUDIO_DECODER_H_
+#endif // MEDIA_CAST_RECEIVER_AUDIO_DECODER_H_
« no previous file with comments | « media/cast/cast_testing.gypi ('k') | media/cast/receiver/audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698