← Back to branch summary

~morphis/aethercast/audio-streaming

~morphis/aethercast/audio-streaming

« back to all changes in this revision

Viewing changes to src/mcs/mir/sourcemediamanager.h

Committer: CI Train Bot
Author(s): Simon Fels
Date: 2016-04-29 09:54:49 UTC
mfrom: (136.1.17 trunk)
Revision ID: ci-train-bot@canonical.com-20160429095449-diyen52l869w9siw

Various fixes and improvements for stability

* React on RTSP timeouts and disconnect when one happens
* Don't save state on shutdown as its already saved
* Implement state saving / property guards
* Implement proper dbus errors and fix spec
* Fix H264Encoder tests
* Implement backend logic for the Enabled property
* Add Enabled property for our manager interface
* Bring back resending of failed packets
* Handle error/terminate cases for buffer queue
Approved by: Alfonso Sanchez-Beato

files added:
debian/aethercast.dirs

src/mcs/dbuserrors.cpp

src/mcs/dbuserrors.h

src/mcs/network/stream.cpp

src/mcs/streaming/transportsender.cpp

src/w11tng/rfkillmanager.cpp

src/w11tng/rfkillmanager.h

files modified:
data/org.aethercast.xml

docs/device-api.txt

docs/manager-api.txt

src/CMakeLists.txt

src/client/application.cpp

src/client/application.h

src/gdbus/CMakeLists.txt

src/mcs/android/h264encoder.cpp

src/mcs/android/h264encoder.h

src/mcs/basesourcemediamanager.cpp

src/mcs/basesourcemediamanager.h

src/mcs/config.h.in

src/mcs/forwardingmiracastcontroller.cpp

src/mcs/forwardingmiracastcontroller.h

src/mcs/mir/screencast.cpp

src/mcs/mir/sourcemediamanager.cpp

src/mcs/mir/sourcemediamanager.h

src/mcs/miracastcontroller.h

src/mcs/miracastcontrollerskeleton.cpp

src/mcs/miracastcontrollerskeleton.h

src/mcs/miracastservice.cpp

src/mcs/miracastservice.h

src/mcs/miracastsourceclient.cpp

src/mcs/miracastsourceclient.h

src/mcs/network/udpstream.cpp

src/mcs/networkdeviceskeleton.cpp

src/mcs/networkmanager.h

src/mcs/networkmanagerfactory.cpp

src/mcs/networkmanagerfactory.h

src/mcs/streaming/rtpsender.cpp

src/mcs/streaming/rtpsender.h

src/mcs/streaming/transportsender.h

src/mcs/types.cpp

src/mcs/types.h

src/mcs/utils.cpp

src/mcs/utils.h

src/mcs/video/bufferqueue.cpp

src/w11tng/networkmanager.cpp

src/w11tng/networkmanager.h

tests/mcs/android/h264encoder_tests.cpp

tests/mcs/forwardingmiracastcontroller_tests.cpp

tests/mcs/miracastcontrollerskeleton_tests.cpp

Show diffs side-by-side

added added

removed removed

src/mcs/mir/sourcemediamanager.h

40

40

namespace mcs {

41

41

namespace mir {

42

42

43

class SourceMediaManager : public mcs::BaseSourceMediaManager {

43

class SourceMediaManager : public std::enable_shared_from_this<SourceMediaManager>,

44

public mcs::BaseSourceMediaManager,

45

public mcs::streaming::TransportSender::Delegate {

44

46

public:

45

47

typedef std::shared_ptr<SourceMediaManager> Ptr;

46

48

68

70

69

71

int GetLocalRtpPort() const override;

70

72

73

void OnTransportNetworkError() override;

74

71

75

protected:

72

76

bool Configure() override;

73

77

Older »