Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c2a7a63 authored by Wei Jia's avatar Wei Jia Committed by Android (Google) Code Review
Browse files

Merge "mediaplayer: move MediaClock from NuPlayer to libstagefright."

parents 0ad38cd9 5833b6aa

media/libmediaplayerservice/nuplayer/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES:=                       \

        GenericSource.cpp               \

        HTTPLiveSource.cpp              \

        MediaClock.cpp                  \

        NuPlayer.cpp                    \

        NuPlayerCCDecoder.cpp           \

        NuPlayerDecoder.cpp             \

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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>

media/libstagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ LOCAL_SRC_FILES:= \ 
        MediaAdapter.cpp                  \

        MediaBuffer.cpp                   \

        MediaBufferGroup.cpp              \

        MediaClock.cpp                    \

        MediaCodec.cpp                    \

        MediaCodecList.cpp                \

        MediaCodecSource.cpp              \

media/libmediaplayerservice/nuplayer/MediaClock.cpp→media/libstagefright/MediaClock.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>