diff options
| -rw-r--r-- | cmds/stagefright/Android.mk | 1 | ||||
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 3 | ||||
| -rw-r--r-- | include/media/stagefright/JPEGSource.h (renamed from cmds/stagefright/JPEGSource.h) | 1 | ||||
| -rw-r--r-- | media/libstagefright/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/JPEGSource.cpp (renamed from cmds/stagefright/JPEGSource.cpp) | 3 |
5 files changed, 3 insertions, 6 deletions
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index 51a0649..4550d1a 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -3,7 +3,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - JPEGSource.cpp \ stagefright.cpp LOCAL_SHARED_LIBRARIES := \ diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index d1926b4..73215d3 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -25,6 +25,7 @@ #include <media/IMediaPlayerService.h> #include <media/stagefright/CachingDataSource.h> #include <media/stagefright/HTTPDataSource.h> +#include <media/stagefright/JPEGSource.h> #include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MediaPlayerImpl.h> @@ -35,8 +36,6 @@ #include <media/stagefright/OMXClient.h> #include <media/stagefright/OMXCodec.h> -#include "JPEGSource.h" - using namespace android; static long gNumRepetitions; diff --git a/cmds/stagefright/JPEGSource.h b/include/media/stagefright/JPEGSource.h index 051c034..9d0a700 100644 --- a/cmds/stagefright/JPEGSource.h +++ b/include/media/stagefright/JPEGSource.h @@ -26,7 +26,6 @@ class DataSource; class MediaBufferGroup; struct JPEGSource : public MediaSource { - // Assumes ownership of "source". JPEGSource(const sp<DataSource> &source); virtual status_t start(MetaData *params = NULL); diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index a4f2c79..22769ba 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -8,6 +8,7 @@ LOCAL_SRC_FILES:= \ FileSource.cpp \ HTTPDataSource.cpp \ HTTPStream.cpp \ + JPEGSource.cpp \ MP3Extractor.cpp \ MPEG4Extractor.cpp \ MPEG4Writer.cpp \ diff --git a/cmds/stagefright/JPEGSource.cpp b/media/libstagefright/JPEGSource.cpp index 25c772f..d1dfd83 100644 --- a/cmds/stagefright/JPEGSource.cpp +++ b/media/libstagefright/JPEGSource.cpp @@ -18,9 +18,8 @@ #define LOG_TAG "JPEGSource" #include <utils/Log.h> -#include "JPEGSource.h" - #include <media/stagefright/DataSource.h> +#include <media/stagefright/JPEGSource.h> #include <media/stagefright/MediaBufferGroup.h> #include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaDefs.h> |