diff options
| author | Andreas Huber <andih@google.com> | 2010-12-03 16:12:25 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-12-06 08:28:36 -0800 |
| commit | b5590846c035a28399818451201aaf1256913ec3 (patch) | |
| tree | 94841822da5b896e8c05e581bb040b87041f7fe0 /cmds | |
| parent | 768ec6f2be1ca7bd7ac5ae34498bdfaa1fbe19dc (diff) | |
| download | frameworks_base-b5590846c035a28399818451201aaf1256913ec3.zip frameworks_base-b5590846c035a28399818451201aaf1256913ec3.tar.gz frameworks_base-b5590846c035a28399818451201aaf1256913ec3.tar.bz2 | |
Squashed commit of the following:
commit 9254c845d7c82976fd4b8be406ce4b17eeb0e119
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 15:26:12 2010 -0800
Remove obsolete code from the cached data source.
Change-Id: I794b986ac8977cbc834dff189221a636ba564e36
commit 2ee33711064c58c53ba65ed9e63dd4b01ec2380e
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 15:23:13 2010 -0800
LiveSource is dead, long live LiveSession.
Change-Id: Ibcd0731ecf9c94f0b3e5db3d53d012d9da2a1c66
commit 9eabb2c3cd8571ab859bdeae0aa7f655c414d8fa
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 12:49:31 2010 -0800
Respect explicitly signalled discontinuities.
Change-Id: I3c0c16a2de7a99742d25db7d1b2ff0258de52271
commit 7f7f7b6b906b6ece6e4d43af7fd5f494e805c5e5
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 11:45:57 2010 -0800
Better protection against syncword emulation in AAC ADTS content.
Change-Id: I867e80a4556dd46d24ab3e781177c248a5221719
commit fe765766582efcc350aed01135ea603576adccf6
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 09:15:59 2010 -0800
New implementation of http live driving code.
Change-Id: I31ddf3d6a0d5929b121be704a2b9c3d6775f7737
Change-Id: Id8d1829c8fcb173756965013f848c1d426ef1048
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index 07e506a..7ba5291 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -31,7 +31,7 @@ #include <media/IMediaPlayerService.h> #include <media/stagefright/foundation/ALooper.h> #include "include/ARTSPController.h" -#include "include/LiveSource.h" +#include "include/LiveSession.h" #include "include/NuCachedSource2.h" #include <media/stagefright/AudioPlayer.h> #include <media/stagefright/DataSource.h> @@ -560,6 +560,7 @@ int main(int argc, char **argv) { sp<ALooper> looper; sp<ARTSPController> rtspController; + sp<LiveSession> liveSession; int res; while ((res = getopt(argc, argv, "han:lm:b:ptsow:kx")) >= 0) { @@ -852,8 +853,15 @@ int main(int argc, char **argv) { String8 uri("http://"); uri.append(filename + 11); - dataSource = new LiveSource(uri.string()); - dataSource = new NuCachedSource2(dataSource); + if (looper == NULL) { + looper = new ALooper; + looper->start(); + } + liveSession = new LiveSession; + looper->registerHandler(liveSession); + + liveSession->connect(uri.string()); + dataSource = liveSession->getDataSource(); extractor = MediaExtractor::Create( |