summaryrefslogtreecommitdiffstats
path: root/media/cast/cast_receiver_impl.cc
diff options
context:
space:
mode:
authormiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 06:40:49 +0000
committermiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 06:40:49 +0000
commitb72e681f5bcf702e54e52b11bd89954eb098c9f3 (patch)
treeb124b21e12592adbf0fa8ac3956d19f270464dbf /media/cast/cast_receiver_impl.cc
parentc045994a5013011f05264de8a7b47d2a9e6fb1ab (diff)
downloadchromium_src-b72e681f5bcf702e54e52b11bd89954eb098c9f3.zip
chromium_src-b72e681f5bcf702e54e52b11bd89954eb098c9f3.tar.gz
chromium_src-b72e681f5bcf702e54e52b11bd89954eb098c9f3.tar.bz2
[Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame
Replace the use of struct EncodedAudioFrame and struct EncodedVideoFrame with a unified struct EncodedFrame throughout src/media/cast. This allows for later merging of duplicated code throughout the stack. The new struct drops the unused codec data member and adds a new data member, reference_time. codec is unnecessary because this is known in all contexts where an EncodedFrame is produced/consumed. The new reference_time data member is added because virtually all interfaces that passed around an EncodedXXXFrame were also passing the frame's reference_time alongside. Testing: Updated and ran all cast_unittests, plus manual testing between multiple Cast sender and receiver implementations. Review URL: https://codereview.chromium.org/288103002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cast/cast_receiver_impl.cc')
-rw-r--r--media/cast/cast_receiver_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/cast/cast_receiver_impl.cc b/media/cast/cast_receiver_impl.cc
index b38cd99..f502a0f 100644
--- a/media/cast/cast_receiver_impl.cc
+++ b/media/cast/cast_receiver_impl.cc
@@ -33,7 +33,7 @@ class LocalFrameReceiver : public FrameReceiver {
callback));
}
- virtual void GetEncodedVideoFrame(const VideoFrameEncodedCallback& callback)
+ virtual void GetEncodedVideoFrame(const FrameEncodedCallback& callback)
OVERRIDE {
cast_environment_->PostTask(CastEnvironment::MAIN,
FROM_HERE,
@@ -51,7 +51,7 @@ class LocalFrameReceiver : public FrameReceiver {
callback));
}
- virtual void GetCodedAudioFrame(const AudioFrameEncodedCallback& callback)
+ virtual void GetCodedAudioFrame(const FrameEncodedCallback& callback)
OVERRIDE {
cast_environment_->PostTask(CastEnvironment::MAIN,
FROM_HERE,