diff options
| author | Wei Jia <wjia@google.com> | 2015-03-10 00:47:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-10 00:47:31 +0000 |
| commit | 1c2a7a6391a5465cb5b059bb004fbbc884ce1a29 (patch) | |
| tree | ad4c1d401c2b63d328d7b047fe1cf51ffe2ce364 | |
| parent | 0ad38cd9674f2f7180d3310820d7dd2820159320 (diff) | |
| parent | 5833b6aad2c46ba516bdc8262f4fc4667e8018ed (diff) | |
| download | frameworks_av-1c2a7a6391a5465cb5b059bb004fbbc884ce1a29.zip frameworks_av-1c2a7a6391a5465cb5b059bb004fbbc884ce1a29.tar.gz frameworks_av-1c2a7a6391a5465cb5b059bb004fbbc884ce1a29.tar.bz2 | |
Merge "mediaplayer: move MediaClock from NuPlayer to libstagefright."
| -rw-r--r-- | include/media/stagefright/MediaClock.h (renamed from media/libmediaplayerservice/nuplayer/MediaClock.h) | 0 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/Android.mk | 1 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 3 | ||||
| -rw-r--r-- | media/libstagefright/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/MediaClock.cpp (renamed from media/libmediaplayerservice/nuplayer/MediaClock.cpp) | 2 |
5 files changed, 3 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/nuplayer/MediaClock.h b/include/media/stagefright/MediaClock.h index 660764f..660764f 100644 --- a/media/libmediaplayerservice/nuplayer/MediaClock.h +++ b/include/media/stagefright/MediaClock.h diff --git a/media/libmediaplayerservice/nuplayer/Android.mk b/media/libmediaplayerservice/nuplayer/Android.mk index e2c72ed..6609874 100644 --- a/media/libmediaplayerservice/nuplayer/Android.mk +++ b/media/libmediaplayerservice/nuplayer/Android.mk @@ -4,7 +4,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ GenericSource.cpp \ HTTPLiveSource.cpp \ - MediaClock.cpp \ NuPlayer.cpp \ NuPlayerCCDecoder.cpp \ NuPlayerDecoder.cpp \ diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index 337f7b1..126c9f4 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -20,13 +20,12 @@ #include "NuPlayerRenderer.h" -#include "MediaClock.h" - #include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/AMessage.h> #include <media/stagefright/foundation/AUtils.h> #include <media/stagefright/foundation/AWakeLock.h> +#include <media/stagefright/MediaClock.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/Utils.h> diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 6d9bbae..38f2e34 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -31,6 +31,7 @@ LOCAL_SRC_FILES:= \ MediaAdapter.cpp \ MediaBuffer.cpp \ MediaBufferGroup.cpp \ + MediaClock.cpp \ MediaCodec.cpp \ MediaCodecList.cpp \ MediaCodecSource.cpp \ diff --git a/media/libmediaplayerservice/nuplayer/MediaClock.cpp b/media/libstagefright/MediaClock.cpp index 9152da1..38db5e4 100644 --- a/media/libmediaplayerservice/nuplayer/MediaClock.cpp +++ b/media/libstagefright/MediaClock.cpp @@ -18,7 +18,7 @@ #define LOG_TAG "MediaClock" #include <utils/Log.h> -#include "MediaClock.h" +#include <media/stagefright/MediaClock.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/ALooper.h> |