Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Dong
2012-02-28 18:49:34 -08:00
committed by Android (Google) Code Review
parent 1b3d01de38 3008f0329b
commit ee31e56a16
6 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
media/libstagefright/timedtext/TimedTextDriver.h → include/media/stagefright/timedtext/TimedTextDriver.h
View File

1
media/libstagefright/Android.mk
View File

@@ -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 \

3
media/libstagefright/AwesomePlayer.cpp
View File

@@ -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>

1
media/libstagefright/timedtext/Android.mk
View File

@@ -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

3
media/libstagefright/timedtext/TimedTextDriver.cpp
View File

@@ -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"

2
media/libstagefright/timedtext/TimedTextPlayer.cpp
View File

@@ -20,12 +20,12 @@
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AMessage.h>
#include <media/stagefright/timedtext/TimedTextDriver.h>
#include <media/stagefright/MediaErrors.h>
#include <media/MediaPlayerInterface.h>
#include "TimedTextPlayer.h"
#include "TimedTextDriver.h"
#include "TimedTextSource.h"
namespace android {