Merge "Remove unused includes and forward declarations in libmediaextractor/include" (ad698c25) · Commits · e / os / android_frameworks_av

media/extractors/mp4/MPEG4Extractor.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@

		#include <media/DataSource.h>
		#include <media/MediaExtractor.h>
		#include <media/stagefright/foundation/AString.h>
		#include <utils/List.h>
		#include <utils/Vector.h>
		#include <utils/String8.h>

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include <stdio.h>

		#include <binder/IMemory.h>
		#include <binder/MemoryDealer.h>
		#include <drm/drm_framework_common.h>
		#include <media/IDataSource.h>
		#include <media/mediametadataretriever.h>

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include <media/DataSource.h>
		#include <media/MediaBufferHolder.h>
		#include <media/IMediaExtractorService.h>
		#include <media/IMediaSource.h>
		#include <media/MediaHTTPService.h>
		#include <media/MediaExtractor.h>
		#include <media/MediaSource.h>

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ struct AnotherPacketSource;
		struct ARTSPController;
		class DataSource;
		class IDataSource;
		class IMediaSource;
		struct MediaHTTPService;
		struct MediaSource;
		class MediaBuffer;

+0 −8

Original line number	Diff line number	Diff line
		@@ -19,23 +19,15 @@
		#define DATA_SOURCE_H_

		#include <sys/types.h>
		#include <media/stagefright/foundation/ADebug.h>
		#include <media/stagefright/MediaErrors.h>
		#include <utils/Errors.h>
		#include <utils/KeyedVector.h>
		#include <utils/List.h>
		#include <utils/RefBase.h>
		#include <utils/threads.h>
		#include <drm/DrmManagerClient.h>

		namespace android {

		struct AMessage;
		struct AString;
		class IDataSource;
		struct IMediaHTTPService;
		class String8;
		struct HTTPBase;

		class DataSource : public RefBase {
		public: