Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread

Browse Source
This commit is contained in:
Andreas Huber
2010-07-22 13:47:41 -07:00
committed by Android (Google) Code Review
parent 13d08515f0 4e4173b0af
commit 81046c8c42
6 changed files with 77 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
cmds/stagefright/stagefright.cpp
View File

@@ -25,6 +25,8 @@
#include <binder/IServiceManager.h>
#include <binder/ProcessState.h>
#include <media/IMediaPlayerService.h>
#include <media/stagefright/foundation/ALooper.h>
#include "include/ARTSPController.h"
#include <media/stagefright/AudioPlayer.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/JPEGSource.h>
@@ -365,6 +367,9 @@ int main(int argc, char **argv) {
gPlaybackAudio = false;
gWriteMP4 = false;
sp<ALooper> looper;
sp<ARTSPController> rtspController;
int res;
while ((res = getopt(argc, argv, "han:lm:b:ptsow:k")) >= 0) {
switch (res) {
@@ -576,7 +581,8 @@ int main(int argc, char **argv) {
sp<DataSource> dataSource = DataSource::CreateFromURI(filename);
if (strncasecmp(filename, "sine:", 5) && dataSource == NULL) {
if ((strncasecmp(filename, "sine:", 5)
&& strncasecmp(filename, "rtsp://", 7)) && dataSource == NULL) {
fprintf(stderr, "Unable to create data source.\n");
return 1;
}
@@ -601,10 +607,28 @@ int main(int argc, char **argv) {
}
mediaSource = new SineSource(sampleRate, 1);
} else {
sp<MediaExtractor> extractor = MediaExtractor::Create(dataSource);
if (extractor == NULL) {
fprintf(stderr, "could not create extractor.\n");
return -1;
sp<MediaExtractor> extractor;
if (!strncasecmp("rtsp://", filename, 7)) {
if (looper == NULL) {
looper = new ALooper;
looper->start();
}
rtspController = new ARTSPController(looper);
status_t err = rtspController->connect(filename);
if (err != OK) {
fprintf(stderr, "could not connect to rtsp server.\n");
return -1;
}
extractor = rtspController.get();
} else {
extractor = MediaExtractor::Create(dataSource);
if (extractor == NULL) {
fprintf(stderr, "could not create extractor.\n");
return -1;
}
}
size_t numTracks = extractor->countTracks();
@@ -654,6 +678,13 @@ int main(int argc, char **argv) {
} else {
playSource(&client, mediaSource);
}
if (rtspController != NULL) {
rtspController->disconnect();
rtspController.clear();
sleep(3);
}
}
client.disconnect();

4
include/media/stagefright/foundation/ALooper.h
View File

@@ -41,7 +41,9 @@ struct ALooper : public RefBase {
status_t start(
bool runOnCallingThread = false,
bool canCallJava = false);
bool canCallJava = false,
int32_t priority = PRIORITY_DEFAULT
);
status_t stop();

5
media/libstagefright/foundation/ALooper.cpp
View File

@@ -73,7 +73,8 @@ void ALooper::unregisterHandler(handler_id handlerID) {
gLooperRoster.unregisterHandler(handlerID);
}
status_t ALooper::start(bool runOnCallingThread, bool canCallJava) {
status_t ALooper::start(
bool runOnCallingThread, bool canCallJava, int32_t priority) {
if (runOnCallingThread) {
{
Mutex::Autolock autoLock(mLock);
@@ -99,7 +100,7 @@ status_t ALooper::start(bool runOnCallingThread, bool canCallJava) {
mThread = new LooperThread(this, canCallJava);
status_t err = mThread->run("ALooper");
status_t err = mThread->run("ALooper", priority);
if (err != OK) {
mThread.clear();
}

5
media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
View File

@@ -144,6 +144,11 @@ void AMPEG4AudioAssembler::submitAccessUnit() {
accessUnit->meta()->setInt64("ntp-time", ntpTime);
#if 0
printf(mAccessUnitDamaged ? "X" : ".");
fflush(stdout);
#endif
if (mAccessUnitDamaged) {
accessUnit->meta()->setInt32("damaged", true);
}

3
media/libstagefright/rtsp/ARTSPController.cpp
View File

@@ -38,6 +38,8 @@ status_t ARTSPController::connect(const char *url) {
}
mHandler = new MyHandler(url, mLooper);
mHandler->connect();
sleep(10);
return OK;
@@ -48,6 +50,7 @@ void ARTSPController::disconnect() {
return;
}
mHandler->disconnect();
mHandler.clear();
}

31
media/libstagefright/rtsp/MyHandler.h
View File

@@ -34,19 +34,33 @@ namespace android {
struct MyHandler : public AHandler {
MyHandler(const char *url, const sp<ALooper> &looper)
: mLooper(looper),
mNetLooper(new ALooper),
mConn(new ARTSPConnection),
mRTPConn(new ARTPConnection),
mSessionURL(url),
mSetupTracksSuccessful(false),
mFirstAccessUnit(true),
mFirstAccessUnitNTP(-1) {
mNetLooper->start(false /* runOnCallingThread */,
false /* canCallJava */,
PRIORITY_HIGHEST);
}
void connect() {
mLooper->registerHandler(this);
mLooper->registerHandler(mConn);
mLooper->registerHandler(mRTPConn);
(1 ? mNetLooper : mLooper)->registerHandler(mRTPConn);
sp<AMessage> reply = new AMessage('conn', id());
mConn->connect(mSessionURL.c_str(), reply);
}
void disconnect() {
sp<AMessage> reply = new AMessage('disc', id());
mConn->disconnect(reply);
}
virtual void onMessageReceived(const sp<AMessage> &msg) {
switch (msg->what()) {
case 'conn':
@@ -290,7 +304,6 @@ struct MyHandler : public AHandler {
case 'quit':
{
mLooper->stop();
break;
}
@@ -320,8 +333,17 @@ struct MyHandler : public AHandler {
accessUnit->meta()->setInt64("ntp-time", ntpTime);
TrackInfo *track = &mTracks.editItemAt(trackIndex);
track->mPacketSource->queueAccessUnit(accessUnit);
#if 0
int32_t damaged;
if (accessUnit->meta()->findInt32("damaged", &damaged)
&& damaged != 0) {
LOG(INFO) << "ignoring damaged AU";
} else
#endif
{
TrackInfo *track = &mTracks.editItemAt(trackIndex);
track->mPacketSource->queueAccessUnit(accessUnit);
}
break;
}
@@ -344,6 +366,7 @@ struct MyHandler : public AHandler {
private:
sp<ALooper> mLooper;
sp<ALooper> mNetLooper;
sp<ARTSPConnection> mConn;
sp<ARTPConnection> mRTPConn;
sp<ASessionDescription> mSessionDesc;