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

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

Issue 1505253004: Support for remote audio into tracks (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Change when we fire callbacks for external media Created 5 years 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 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 return track_.get(); 61 return track_.get();
62 } 62 }
63 63
64 std::string id() const override { return id_; } 64 std::string id() const override { return id_; }
65 65
66 void Stop() override; 66 void Stop() override;
67 67
68 private: 68 private:
69 void Reconfigure(); 69 void Reconfigure();
70 70
71 std::string id_; 71 const std::string id_;
72 rtc::scoped_refptr<AudioTrackInterface> track_; 72 const rtc::scoped_refptr<AudioTrackInterface> track_;
73 uint32_t ssrc_; 73 const uint32_t ssrc_;
74 AudioProviderInterface* provider_; 74 AudioProviderInterface* provider_; // Set to null in Stop().
perkj_webrtc 2015/12/10 12:24:05 Can you make sure |provider_| in remote source is
tommi 2015/12/10 22:37:25 As discussed offline, it's handled in OnClose() (a
75 bool cached_track_enabled_; 75 bool cached_track_enabled_;
76 }; 76 };
77 77
78 class VideoRtpReceiver : public rtc::RefCountedObject<RtpReceiverInterface> { 78 class VideoRtpReceiver : public rtc::RefCountedObject<RtpReceiverInterface> {
79 public: 79 public:
80 VideoRtpReceiver(VideoTrackInterface* track, 80 VideoRtpReceiver(VideoTrackInterface* track,
81 uint32_t ssrc, 81 uint32_t ssrc,
82 VideoProviderInterface* provider); 82 VideoProviderInterface* provider);
83 83
84 virtual ~VideoRtpReceiver(); 84 virtual ~VideoRtpReceiver();
(...skipping 10 matching lines...) Expand all
95 private: 95 private:
96 std::string id_; 96 std::string id_;
97 rtc::scoped_refptr<VideoTrackInterface> track_; 97 rtc::scoped_refptr<VideoTrackInterface> track_;
98 uint32_t ssrc_; 98 uint32_t ssrc_;
99 VideoProviderInterface* provider_; 99 VideoProviderInterface* provider_;
100 }; 100 };
101 101
102 } // namespace webrtc 102 } // namespace webrtc
103 103
104 #endif // TALK_APP_WEBRTC_RTPRECEIVER_H_ 104 #endif // TALK_APP_WEBRTC_RTPRECEIVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698