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

Commit ee31e56a authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext."

parents 1b3d01de 3008f032

media/libstagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ LOCAL_SRC_FILES:= \ 
LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

        $(TOP)/frameworks/base/include/media/stagefright/openmax \

        $(TOP)/frameworks/base/include/media/stagefright/timedtext \

        $(TOP)/external/flac/include \

        $(TOP)/external/tremolo \

        $(TOP)/external/openssl/include \

media/libstagefright/AwesomePlayer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -30,13 +30,12 @@ 
#include "include/MPEG2TSExtractor.h"

#include "include/WVMExtractor.h"



#include "timedtext/TimedTextDriver.h"



#include <binder/IPCThreadState.h>

#include <binder/IServiceManager.h>

#include <media/IMediaPlayerService.h>

#include <media/stagefright/foundation/hexdump.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/timedtext/TimedTextDriver.h>

#include <media/stagefright/AudioPlayer.h>

#include <media/stagefright/DataSource.h>

#include <media/stagefright/FileSource.h>

media/libstagefright/timedtext/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ LOCAL_SRC_FILES:= \ 
LOCAL_CFLAGS += -Wno-multichar

LOCAL_C_INCLUDES:= \

        $(JNI_H_INCLUDE) \

        $(TOP)/frameworks/base/include/media/stagefright/timedtext \

        $(TOP)/frameworks/base/media/libstagefright



LOCAL_MODULE:= libstagefright_timedtext

media/libstagefright/timedtext/TimedTextDriver.cpp

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
#include <media/stagefright/Utils.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/ALooper.h>



#include "TimedTextDriver.h"

#include <media/stagefright/timedtext/TimedTextDriver.h>



#include "TextDescriptions.h"

#include "TimedTextPlayer.h"