Merge "Network DataSources: implement disconnect in close" (32fddece) · Commits · e / os / android_frameworks_av

media/libmedia/NdkWrapper.cpp

+0 −20

Original line number	Diff line number	Diff line
		@@ -31,18 +31,6 @@
		#include <media/stagefright/foundation/AMessage.h>
		#include <utils/Errors.h>

		// TODO: remove forward declaration when AMediaExtractor_disconnect is offcially added to NDK

		#ifdef __cplusplus
		extern "C" {
		#endif

		media_status_t AMediaExtractor_disconnect(AMediaExtractor *);

		#ifdef __cplusplus
		} // extern "C"
		#endif

		namespace android {

		static const size_t kAESBlockSize = 16; // AES_BLOCK_SIZE
		@@ -1080,14 +1068,6 @@ status_t AMediaExtractorWrapper::release() {
		return OK;
		}

		status_t AMediaExtractorWrapper::disconnect() {
		if (mAMediaExtractor != NULL) {
		media_status_t err = AMediaExtractor_disconnect(mAMediaExtractor);
		return translateErrorCode(err);
		}
		return DEAD_OBJECT;
		}

		AMediaExtractor *AMediaExtractorWrapper::getAMediaExtractor() const {
		return mAMediaExtractor;
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -287,8 +287,6 @@ struct AMediaExtractorWrapper : public RefBase {

		status_t release();

		status_t disconnect();

		status_t setDataSource(int fd, off64_t offset, off64_t length);

		status_t setDataSource(const char *location);

+0 −2

Original line number	Diff line number	Diff line
		@@ -66,8 +66,6 @@ public:

		virtual void close() {};

		virtual void disconnect() {}

		virtual ssize_t getAvailableSize(status_t * /err/) {
		return -1;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -256,6 +256,10 @@ status_t NuCachedSource2::getEstimatedBandwidthKbps(int32_t *kbps) {
		return ERROR_UNSUPPORTED;
		}

		void NuCachedSource2::close() {
		disconnect();
		}

		void NuCachedSource2::disconnect() {
		if (mSource->flags() & kIsHTTPBasedSource) {
		ALOGV("disconnecting HTTPBasedSource");

+0 −6

Original line number	Diff line number	Diff line
		@@ -204,12 +204,6 @@ status_t NuMediaExtractor::setMediaCas(const HInterfaceToken &casToken) {
		return OK;
		}

		void NuMediaExtractor::disconnect() {
		if (mDataSource != NULL) {
		mDataSource->disconnect();
		}
		}

		status_t NuMediaExtractor::updateDurationAndBitrate() {
		if (mImpl->countTracks() > kMaxTrackCount) {
		return ERROR_UNSUPPORTED;