diff options
| -rw-r--r-- | media/java/android/media/MediaMetadataRetriever.java | 2 | ||||
| -rw-r--r-- | media/jni/android_media_MediaExtractor.cpp | 5 | ||||
| -rw-r--r-- | media/jni/android_media_MediaExtractor.h | 4 | ||||
| -rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 1 |
4 files changed, 6 insertions, 6 deletions
diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java index 4ea4e3810e03..760cc49bc1e2 100644 --- a/media/java/android/media/MediaMetadataRetriever.java +++ b/media/java/android/media/MediaMetadataRetriever.java @@ -395,7 +395,7 @@ public class MediaMetadataRetriever * @see #getFrameAtTime(long, int) */ /* Do not change these option values without updating their counterparts - * in include/media/stagefright/MediaSource.h! + * in include/media/MediaSource.h! */ /** * This option is used with {@link #getFrameAtTime(long, int)} to retrieve diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp index d2fa8f5f4c2a..5c90d0020d61 100644 --- a/media/jni/android_media_MediaExtractor.cpp +++ b/media/jni/android_media_MediaExtractor.cpp @@ -37,7 +37,8 @@ #include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/AMessage.h> -#include <media/stagefright/DataSource.h> +#include <media/DataSource.h> +#include <media/stagefright/InterfaceUtils.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/NuMediaExtractor.h> @@ -744,7 +745,7 @@ static void android_media_MediaExtractor_setDataSourceCallback( } sp<DataSource> bridge = - DataSource::CreateFromIDataSource(new JMediaDataSource(env, callbackObj)); + CreateDataSourceFromIDataSource(new JMediaDataSource(env, callbackObj)); status_t err = extractor->setDataSource(bridge); if (err != OK) { diff --git a/media/jni/android_media_MediaExtractor.h b/media/jni/android_media_MediaExtractor.h index 94d36f25ae1c..a4638ac43184 100644 --- a/media/jni/android_media_MediaExtractor.h +++ b/media/jni/android_media_MediaExtractor.h @@ -18,8 +18,8 @@ #define _ANDROID_MEDIA_MEDIAEXTRACTOR_H_ #include <media/stagefright/foundation/ABase.h> -#include <media/stagefright/MediaSource.h> -#include <media/stagefright/DataSource.h> +#include <media/MediaSource.h> +#include <media/DataSource.h> #include <utils/Errors.h> #include <utils/KeyedVector.h> #include <utils/RefBase.h> diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index 5f1cf1608942..ab0da072047c 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -26,7 +26,6 @@ #include <media/AudioTrack.h> #include <media/IMediaHTTPService.h> #include <media/mediaplayer.h> -#include <media/stagefright/MediaExtractor.h> #include "SoundPool.h" #include "SoundPoolThread.h" #include <media/AudioPolicyHelper.h> |