diff options
| author | Andreas Huber <andih@google.com> | 2013-07-18 14:36:18 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2013-07-18 15:11:50 -0700 |
| commit | 8060060217ff16cd67c8f6a15c649f44c343acf0 (patch) | |
| tree | fa0d2d4f680f2303a88e3bcfba2b897fc435e76f /media/libstagefright/wifi-display/source | |
| parent | 9d7376a7a4910a61ee4e9b1ad94b125d157882cc (diff) | |
| download | frameworks_av-8060060217ff16cd67c8f6a15c649f44c343acf0.zip frameworks_av-8060060217ff16cd67c8f6a15c649f44c343acf0.tar.gz frameworks_av-8060060217ff16cd67c8f6a15c649f44c343acf0.tar.bz2 | |
ANetworkSession and ParsedMessage are now part of stagefright foundation.
Also fixes some bugs in ParseMessage and adds "WebSocket" mode to
ANetworkSession, something that's opt-in and should not affect existing clients
of the API.
Change-Id: I86d5748e0d818231d85d3590d86c2b41d4f8b1f1
Diffstat (limited to 'media/libstagefright/wifi-display/source')
3 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/wifi-display/source/MediaPuller.cpp b/media/libstagefright/wifi-display/source/MediaPuller.cpp index 189bea3..7e8891d 100644 --- a/media/libstagefright/wifi-display/source/MediaPuller.cpp +++ b/media/libstagefright/wifi-display/source/MediaPuller.cpp @@ -93,6 +93,9 @@ void MediaPuller::onMessageReceived(const sp<AMessage> &msg) { err = mSource->start(params.get()); } else { err = mSource->start(); + if (err != OK) { + ALOGE("source failed to start w/ err %d", err); + } } if (err == OK) { diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp index b421b35..4b59e62 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp @@ -21,7 +21,6 @@ #include "WifiDisplaySource.h" #include "PlaybackSession.h" #include "Parameters.h" -#include "ParsedMessage.h" #include "rtp/RTPSender.h" #include "TimeSyncer.h" @@ -33,6 +32,7 @@ #include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/AMessage.h> +#include <media/stagefright/foundation/ParsedMessage.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/Utils.h> diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index 64186fc..4f11712 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -18,10 +18,10 @@ #define WIFI_DISPLAY_SOURCE_H_ -#include "ANetworkSession.h" #include "VideoFormats.h" #include <media/stagefright/foundation/AHandler.h> +#include <media/stagefright/foundation/ANetworkSession.h> #include <netinet/in.h> |