Loading media/libmediaplayerservice/nuplayer/GenericSource.cpp +0 −1 Original line number Diff line number Diff line Loading @@ -33,7 +33,6 @@ #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/Utils.h> #include "../../libstagefright/include/DRMExtractor.h" #include "../../libstagefright/include/NuCachedSource2.h" #include "../../libstagefright/include/HTTPBase.h" Loading media/libstagefright/DataSource.cpp +3 −14 Original line number Diff line number Diff line Loading @@ -16,23 +16,9 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "DataSource" #include "include/AMRExtractor.h" #include "include/AACExtractor.h" #include "include/CallbackDataSource.h" #include "include/DRMExtractor.h" #include "include/FLACExtractor.h" #include "include/HTTPBase.h" #include "include/MidiExtractor.h" #include "include/MP3Extractor.h" #include "include/MPEG2PSExtractor.h" #include "include/MPEG2TSExtractor.h" #include "include/MPEG4Extractor.h" #include "include/NuCachedSource2.h" #include "include/OggExtractor.h" #include "include/WAVExtractor.h" #include "matroska/MatroskaExtractor.h" #include <media/IMediaHTTPConnection.h> #include <media/IMediaHTTPService.h> Loading @@ -43,12 +29,15 @@ #include <media/stagefright/FileSource.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MediaHTTP.h> #include <media/stagefright/Utils.h> #include <utils/String8.h> #include <cutils/properties.h> #include <private/android_filesystem_config.h> #include <arpa/inet.h> namespace android { bool DataSource::getUInt16(off64_t offset, uint16_t *x) { Loading Loading
media/libmediaplayerservice/nuplayer/GenericSource.cpp +0 −1 Original line number Diff line number Diff line Loading @@ -33,7 +33,6 @@ #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/Utils.h> #include "../../libstagefright/include/DRMExtractor.h" #include "../../libstagefright/include/NuCachedSource2.h" #include "../../libstagefright/include/HTTPBase.h" Loading
media/libstagefright/DataSource.cpp +3 −14 Original line number Diff line number Diff line Loading @@ -16,23 +16,9 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "DataSource" #include "include/AMRExtractor.h" #include "include/AACExtractor.h" #include "include/CallbackDataSource.h" #include "include/DRMExtractor.h" #include "include/FLACExtractor.h" #include "include/HTTPBase.h" #include "include/MidiExtractor.h" #include "include/MP3Extractor.h" #include "include/MPEG2PSExtractor.h" #include "include/MPEG2TSExtractor.h" #include "include/MPEG4Extractor.h" #include "include/NuCachedSource2.h" #include "include/OggExtractor.h" #include "include/WAVExtractor.h" #include "matroska/MatroskaExtractor.h" #include <media/IMediaHTTPConnection.h> #include <media/IMediaHTTPService.h> Loading @@ -43,12 +29,15 @@ #include <media/stagefright/FileSource.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MediaHTTP.h> #include <media/stagefright/Utils.h> #include <utils/String8.h> #include <cutils/properties.h> #include <private/android_filesystem_config.h> #include <arpa/inet.h> namespace android { bool DataSource::getUInt16(off64_t offset, uint16_t *x) { Loading