gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove header symlinks"

Browse Source
gugelfrei
Marco Nelissen 5 years ago committed by Android (Google) Code Review
parent fe0d920edd 7291da64f5
commit b7b2f5d865
50 changed files with 47 additions and 51 deletions
Show Stats Download Patch File Download Diff File

2
cmds/stagefright/AudioPlayer.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <binder/IPCThreadState.h>
#include <media/AudioTrack.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/openmax/OMX_Audio.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/ALookup.h>

2
cmds/stagefright/AudioPlayer.h
Unescape View File

@ -18,7 +18,7 @@
#define AUDIO_PLAYER_H_
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/MediaPlayerInterface.h>
#include <media/stagefright/MediaBuffer.h>
#include <utils/threads.h>

2
cmds/stagefright/SineSource.h
Unescape View File

@ -2,7 +2,7 @@
#define SINE_SOURCE_H_
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <utils/Compat.h>
namespace android {

2
cmds/stagefright/stagefright.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <binder/ProcessState.h>
#include <datasource/DataSourceFactory.h>
#include <media/DataSource.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/IMediaHTTPService.h>
#include <media/IMediaPlayerService.h>
#include <media/stagefright/foundation/ABuffer.h>

2
cmds/stagefright/stream.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <media/IMediaHTTPService.h>
#include <media/IStreamSource.h>
#include <media/mediaplayer.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AMessage.h>
#include <media/stagefright/InterfaceUtils.h>

2
include/media/DataSource.h
Unescape View File

@ -22,7 +22,7 @@
#include <android/IDataSource.h>
#include <media/stagefright/MediaErrors.h>
#include <media/DataSourceBase.h>
#include <media/stagefright/DataSourceBase.h>
#include <media/MediaExtractorPluginApi.h>
#include <utils/Errors.h>
#include <utils/RefBase.h>

1
include/media/DataSourceBase.h
Unescape View File

@ -1 +0,0 @@
stagefright/DataSourceBase.h

1
include/media/MediaSource.h
Unescape View File

@ -1 +0,0 @@
../../media/libstagefright/include/media/stagefright/MediaSource.h

2
media/codec2/components/cmds/codec2.cpp
Unescape View File

@ -34,7 +34,7 @@
#include <media/DataSource.h>
#include <mediadrm/ICrypto.h>
#include <media/IMediaHTTPService.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ALooper.h>
#include <media/stagefright/foundation/AMessage.h>

2
media/extractors/mkv/MatroskaExtractor.cpp
Unescape View File

@ -22,7 +22,7 @@
#include "MatroskaExtractor.h"
#include "common/webmids.h"
#include <media/DataSourceBase.h>
#include <media/stagefright/DataSourceBase.h>
#include <media/ExtractorUtils.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AUtils.h>

2
media/extractors/mp4/MPEG4Extractor.cpp
Unescape View File

@ -33,7 +33,7 @@
#include "ItemTable.h"
#include "include/ESDS.h"
#include <media/DataSourceBase.h>
#include <media/stagefright/DataSourceBase.h>
#include <media/ExtractorUtils.h>
#include <media/stagefright/foundation/ABitReader.h>
#include <media/stagefright/foundation/ABuffer.h>

2
media/extractors/mpeg2/MPEG2TSExtractor.cpp
Unescape View File

@ -24,13 +24,13 @@
#include "MPEG2TSExtractor.h"
#include <media/DataSourceBase.h>
#include <media/IStreamSource.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/ALooper.h>
#include <media/stagefright/foundation/AUtils.h>
#include <media/stagefright/foundation/MediaKeys.h>
#include <media/stagefright/DataSourceBase.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaData.h>

2
media/extractors/ogg/OggExtractor.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <cutils/properties.h>
#include <utils/Vector.h>
#include <media/DataSourceBase.h>
#include <media/stagefright/DataSourceBase.h>
#include <media/ExtractorUtils.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ADebug.h>

2
media/libheif/HeifDecoderImpl.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <binder/MemoryDealer.h>
#include <drm/drm_framework_common.h>
#include <media/mediametadataretriever.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ADebug.h>
#include <private/media/VideoFrame.h>
#include <utils/Log.h>

2
media/libmedia/IMediaSource.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <media/IMediaSource.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/MetaData.h>
namespace android {

2
media/libmedia/include/media/IMediaPlayer.h
Unescape View File

@ -23,7 +23,7 @@
#include <utils/KeyedVector.h>
#include <system/audio.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/VolumeShaper.h>
// Fwd decl to make sure everyone agrees that the scope of struct sockaddr_in is

2
media/libmedia/include/media/IMediaSource.h
Unescape View File

@ -22,7 +22,7 @@
#include <binder/IInterface.h>
#include <binder/IMemory.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaErrors.h>

2
media/libmedia/include/media/MidiIoWrapper.h
Unescape View File

@ -19,8 +19,6 @@
#include <libsonivox/eas_types.h>
#include <media/DataSourceBase.h>
namespace android {
struct CDataSource;

2
media/libmedia/include/media/NdkWrapper.h
Unescape View File

@ -19,7 +19,7 @@
#define NDK_WRAPPER_H_
#include <media/DataSource.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/NdkMediaDataSource.h>
#include <media/NdkMediaError.h>
#include <media/NdkMediaExtractor.h>

2
media/libmediaplayerservice/nuplayer/GenericSource.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <datasource/NuCachedSource2.h>
#include <media/DataSource.h>
#include <media/MediaBufferHolder.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <android/IMediaExtractorService.h>
#include <media/IMediaHTTPService.h>
#include <media/stagefright/foundation/ABuffer.h>

2
media/libmediaplayerservice/nuplayer/StreamingSource.cpp
Unescape View File

@ -24,7 +24,7 @@
#include "AnotherPacketSource.h"
#include "NuPlayerStreamListener.h"
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AMessage.h>

2
media/libstagefright/AACWriter.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaData.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/mediarecorder.h>
namespace android {

2
media/libstagefright/AMRWriter.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaData.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/mediarecorder.h>
namespace android {

2
media/libstagefright/MPEG2TSWriter.cpp
Unescape View File

@ -17,7 +17,7 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "MPEG2TSWriter"
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/hexdump.h>
#include <media/stagefright/foundation/ABuffer.h>

2
media/libstagefright/MPEG4Writer.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <functional>
#include <fcntl.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AMessage.h>
#include <media/stagefright/foundation/AUtils.h>

2
media/libstagefright/MediaCodecSource.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <mediadrm/ICrypto.h>
#include <media/MediaBufferHolder.h>
#include <media/MediaCodecBuffer.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/ALooper.h>

2
media/libstagefright/MediaMuxer.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <media/stagefright/MediaMuxer.h>
#include <media/mediarecorder.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AMessage.h>

2
media/libstagefright/MediaSource.cpp
Unescape View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/IMediaSource.h>
namespace android {

2
media/libstagefright/NuMediaExtractor.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <datasource/DataSourceFactory.h>
#include <datasource/FileSource.h>
#include <media/DataSource.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AMessage.h>

2
media/libstagefright/OggWriter.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/mediarecorder.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaDefs.h>

2
media/libstagefright/RemoteMediaExtractor.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <binder/IPCThreadState.h>
#include <media/stagefright/InterfaceUtils.h>
#include <media/MediaMetricsItem.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/RemoteMediaExtractor.h>
// still doing some on/off toggling here.

2
media/libstagefright/include/FrameDecoder.h
Unescape View File

@ -22,7 +22,7 @@
#include <media/stagefright/foundation/AString.h>
#include <media/stagefright/foundation/ABase.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/openmax/OMX_Video.h>
#include <ui/GraphicTypes.h>

2
media/libstagefright/include/media/stagefright/AudioSource.h
Unescape View File

@ -20,7 +20,7 @@
#include <media/AudioRecord.h>
#include <media/AudioSystem.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/MicrophoneInfo.h>
#include <media/stagefright/MediaBuffer.h>
#include <utils/List.h>

2
media/libstagefright/include/media/stagefright/CallbackMediaSource.h
Unescape View File

@ -17,7 +17,7 @@
#ifndef CALLBACK_MEDIA_SOURCE_H_
#define CALLBACK_MEDIA_SOURCE_H_
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABase.h>
namespace android {

2
media/libstagefright/include/media/stagefright/CameraSource.h
Unescape View File

@ -19,7 +19,7 @@
#define CAMERA_SOURCE_H_
#include <deque>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/MediaBuffer.h>
#include <camera/android/hardware/ICamera.h>
#include <camera/ICameraRecordingProxy.h>

2
media/libstagefright/include/media/stagefright/InterfaceUtils.h
Unescape View File

@ -19,7 +19,7 @@
#include <utils/RefBase.h>
#include <media/stagefright/RemoteMediaExtractor.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <android/IMediaExtractor.h>
#include <media/IMediaSource.h>

2
media/libstagefright/include/media/stagefright/JPEGSource.h
Unescape View File

@ -18,7 +18,7 @@
#define JPEG_SOURCE_H_
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
namespace android {

2
media/libstagefright/include/media/stagefright/MediaAdapter.h
Unescape View File

@ -17,7 +17,7 @@
#ifndef MEDIA_ADAPTER_H
#define MEDIA_ADAPTER_H
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABase.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MetaData.h>

2
media/libstagefright/include/media/stagefright/MediaCodecSource.h
Unescape View File

@ -17,7 +17,7 @@
#ifndef MediaCodecSource_H_
#define MediaCodecSource_H_
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABase.h>
#include <media/stagefright/foundation/AHandlerReflector.h>
#include <media/stagefright/foundation/Mutexed.h>

2
media/libstagefright/include/media/stagefright/MediaWriter.h
Unescape View File

@ -19,7 +19,7 @@
#define MEDIA_WRITER_H_
#include <utils/RefBase.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/IMediaRecorderClient.h>
#include <media/stagefright/MediaMuxer.h>

2
media/libstagefright/include/media/stagefright/NuMediaExtractor.h
Unescape View File

@ -22,7 +22,7 @@
#include <media/stagefright/foundation/ABase.h>
#include <media/stagefright/foundation/AudioPresentationInfo.h>
#include <android/IMediaExtractor.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <utils/Errors.h>
#include <utils/KeyedVector.h>
#include <utils/RefBase.h>

2
media/libstagefright/include/media/stagefright/RemoteMediaSource.h
Unescape View File

@ -18,7 +18,7 @@
#define REMOTE_MEDIA_SOURCE_H_
#include <media/IMediaSource.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABase.h>
namespace android {

2
media/libstagefright/include/media/stagefright/SimpleDecodingSource.h
Unescape View File

@ -17,7 +17,7 @@
#ifndef SIMPLE_DECODING_SOURCE_H_
#define SIMPLE_DECODING_SOURCE_H_
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/AString.h>
#include <media/stagefright/foundation/Mutexed.h>

2
media/libstagefright/mpeg2ts/ATSParser.h
Unescape View File

@ -20,7 +20,7 @@
#include <sys/types.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABase.h>
#include <media/stagefright/foundation/AMessage.h>
#include <media/stagefright/foundation/AudioPresentationInfo.h>

2
media/libstagefright/mpeg2ts/AnotherPacketSource.h
Unescape View File

@ -18,7 +18,7 @@
#define ANOTHER_PACKET_SOURCE_H_
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABase.h>
#include <utils/threads.h>
#include <utils/List.h>

2
media/libstagefright/omx/tests/OMXHarness.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <datasource/DataSourceFactory.h>
#include <media/DataSource.h>
#include <media/IMediaHTTPService.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/OMXBuffer.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/ALooper.h>

2
media/libstagefright/rtsp/ARTPWriter.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <fcntl.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AMessage.h>

2
media/libstagefright/rtsp/VideoSource.h
Unescape View File

@ -18,7 +18,7 @@
#define VIDEO_SOURCE_H_
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MetaData.h>

2
media/libstagefright/webm/WebmFrameThread.h
Unescape View File

@ -21,7 +21,7 @@
#include "LinkedBlockingQueue.h"
#include <datasource/FileSource.h>
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <utils/List.h>
#include <utils/Errors.h>

2
media/libstagefright/webm/WebmWriter.h
Unescape View File

@ -21,7 +21,7 @@
#include "WebmFrameThread.h"
#include "LinkedBlockingQueue.h"
#include <media/MediaSource.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/MediaWriter.h>
#include <utils/Errors.h>

Write Preview
Loading…
Cancel
Save