delay data source creation for GenericSource prepare time
Bug: 16708180
Change-Id: I9d578ef5e2edaed50279d28d3831c68556468f39
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index ba6fb7d..fe115c6 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -232,12 +232,12 @@
// The correct flags will be updated in Source::kWhatFlagsChanged
// handler when GenericSource is prepared.
- status_t err = genericSource->init(httpService, url, headers);
+ status_t err = genericSource->setDataSource(httpService, url, headers);
if (err == OK) {
source = genericSource;
} else {
- ALOGE("Failed to initialize generic source!");
+ ALOGE("Failed to set data source!");
}
}
msg->setObject("source", source);
@@ -252,10 +252,10 @@
sp<GenericSource> source =
new GenericSource(notify, mUIDValid, mUID);
- status_t err = source->init(fd, offset, length);
+ status_t err = source->setDataSource(fd, offset, length);
if (err != OK) {
- ALOGE("Failed to initialize generic source!");
+ ALOGE("Failed to set data source!");
source = NULL;
}