Merge change Ibd7b43bb into eclair-mr2 (c642199d) · Commits · e / os / android_frameworks_base

include/media/stagefright/HTTPDataSource.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -19,10 +19,11 @@
		#define HTTP_DATASOURCE_H_

		#include <media/stagefright/DataSource.h>
		#include <media/stagefright/HTTPStream.h>

		namespace android {

		class HTTPStream;

		class HTTPDataSource : public DataSource {
		public:
		HTTPDataSource(const char host, int port, const char path);
		@@ -40,7 +41,7 @@ private:
		kBufferSize = 64 * 1024
		};

		HTTPStream mHttp;
		HTTPStream *mHttp;
		char *mHost;
		int mPort;
		char *mPath;

media/libstagefright/ESDS.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		#include <media/stagefright/ESDS.h>
		#include "include/ESDS.h"

		#include <string.h>

media/libstagefright/HTTPDataSource.cpp

+23 −17

Original line number	Diff line number	Diff line
		@@ -14,17 +14,19 @@
		* limitations under the License.
		*/

		#include "include/string.h"
		#include "include/HTTPStream.h"

		#include <stdlib.h>

		#include <media/stagefright/HTTPDataSource.h>
		#include <media/stagefright/HTTPStream.h>
		#include <media/stagefright/MediaDebug.h>
		#include <media/stagefright/string.h>

		namespace android {

		HTTPDataSource::HTTPDataSource(const char *uri)
		: mHost(NULL),
		: mHttp(new HTTPStream),
		mHost(NULL),
		mPort(0),
		mPath(NULL),
		mBuffer(malloc(kBufferSize)),
		@@ -65,29 +67,33 @@ HTTPDataSource::HTTPDataSource(const char *uri)
		mPort = port;
		mPath = strdup(path.c_str());

		status_t err = mHttp.connect(mHost, mPort);
		status_t err = mHttp->connect(mHost, mPort);
		CHECK_EQ(err, OK);
		}

		HTTPDataSource::HTTPDataSource(const char host, int port, const char path)
		: mHost(strdup(host)),
		: mHttp(new HTTPStream),
		mHost(strdup(host)),
		mPort(port),
		mPath(strdup(path)),
		mBuffer(malloc(kBufferSize)),
		mBufferLength(0),
		mBufferOffset(0) {
		status_t err = mHttp.connect(mHost, mPort);
		status_t err = mHttp->connect(mHost, mPort);
		CHECK_EQ(err, OK);
		}

		HTTPDataSource::~HTTPDataSource() {
		mHttp.disconnect();
		mHttp->disconnect();

		free(mBuffer);
		mBuffer = NULL;

		free(mPath);
		mPath = NULL;

		delete mHttp;
		mHttp = NULL;
		}

		ssize_t HTTPDataSource::read_at(off_t offset, void *data, size_t size) {
		@@ -120,19 +126,19 @@ ssize_t HTTPDataSource::read_at(off_t offset, void *data, size_t size) {
		status_t err;
		int attempt = 1;
		for (;;) {
		if ((err = mHttp.send("GET ")) != OK
		\|\| (err = mHttp.send(mPath)) != OK
		\|\| (err = mHttp.send(" HTTP/1.1\r\n")) != OK
		\|\| (err = mHttp.send(host)) != OK
		\|\| (err = mHttp.send(range)) != OK
		\|\| (err = mHttp.send("\r\n")) != OK
		\|\| (err = mHttp.receive_header(&http_status)) != OK) {
		if ((err = mHttp->send("GET ")) != OK
		\|\| (err = mHttp->send(mPath)) != OK
		\|\| (err = mHttp->send(" HTTP/1.1\r\n")) != OK
		\|\| (err = mHttp->send(host)) != OK
		\|\| (err = mHttp->send(range)) != OK
		\|\| (err = mHttp->send("\r\n")) != OK
		\|\| (err = mHttp->receive_header(&http_status)) != OK) {

		if (attempt == 3) {
		return err;
		}

		mHttp.connect(mHost, mPort);
		mHttp->connect(mHost, mPort);
		++attempt;
		} else {
		break;
		@@ -144,14 +150,14 @@ ssize_t HTTPDataSource::read_at(off_t offset, void *data, size_t size) {
		}

		string value;
		if (!mHttp.find_header_value("Content-Length", &value)) {
		if (!mHttp->find_header_value("Content-Length", &value)) {
		return UNKNOWN_ERROR;
		}

		char *end;
		unsigned long contentLength = strtoul(value.c_str(), &end, 10);

		ssize_t num_bytes_received = mHttp.receive(mBuffer, contentLength);
		ssize_t num_bytes_received = mHttp->receive(mBuffer, contentLength);

		if (num_bytes_received <= 0) {
		return num_bytes_received;

media/libstagefright/HTTPStream.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,8 @@
		* limitations under the License.
		*/

		#include "include/HTTPStream.h"

		#include <sys/socket.h>

		#include <arpa/inet.h>
		@@ -25,7 +27,6 @@
		#include <string.h>
		#include <unistd.h>

		#include <media/stagefright/HTTPStream.h>
		#include <media/stagefright/MediaDebug.h>

		namespace android {

media/libstagefright/MPEG4Extractor.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		#define LOG_TAG "MPEG4Extractor"
		#include <utils/Log.h>

		#include "include/SampleTable.h"

		#include <arpa/inet.h>

		#include <ctype.h>
		@@ -32,7 +34,6 @@
		#include <media/stagefright/MediaDefs.h>
		#include <media/stagefright/MediaSource.h>
		#include <media/stagefright/MetaData.h>
		#include <media/stagefright/SampleTable.h>
		#include <media/stagefright/Utils.h>
		#include <utils/String8.h>