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

Remove more remnants of MediaPlayer2

Browse Source 
Bug: 141546997
Test: build

Change-Id: Iaa4d9e4205f78d4b4d465b4f128a28a419ff603b
gugelfrei
Marco Nelissen 5 years ago
parent fb1fb155f9
commit 273fd36992
6 changed files with 0 additions and 1525 deletions
Show Stats Download Patch File Download Diff File

61
media/libmedia/Android.bp
Unescape View File

@ -369,64 +369,3 @@ cc_library {
cfi: true,
},
}
cc_library_static {
name: "libmedia_player2_util",
srcs: [
"AudioParameter.cpp",
"BufferingSettings.cpp",
"DataSourceDesc.cpp",
"MediaCodecBuffer.cpp",
"Metadata.cpp",
"NdkWrapper.cpp",
],
shared_libs: [
"libbinder",
"libcutils",
"liblog",
"libmediandk",
"libnativewindow",
"libmediandk_utils",
"libstagefright_foundation",
"libui",
"libutils",
],
export_shared_lib_headers: [
"libbinder",
"libmediandk",
],
header_libs: [
"media_plugin_headers",
],
include_dirs: [
"frameworks/av/media/ndk",
],
static_libs: [
"libstagefright_rtsp",
"libstagefright_timedtext",
],
export_include_dirs: [
"include",
],
cflags: [
"-Werror",
"-Wno-error=deprecated-declarations",
"-Wall",
],
sanitize: {
misc_undefined: [
"unsigned-integer-overflow",
"signed-integer-overflow",
],
cfi: true,
},
}

37
media/libmedia/DataSourceDesc.cpp
Unescape View File

@ -1,37 +0,0 @@
/*
* Copyright 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
//#define LOG_NDEBUG 0
#define LOG_TAG "DataSourceDesc"
#include <media/DataSource.h>
#include <media/DataSourceDesc.h>
#include <media/MediaHTTPService.h>
namespace android {
static const int64_t kLongMax = 0x7ffffffffffffffL;
DataSourceDesc::DataSourceDesc()
: mType(TYPE_NONE),
mFDOffset(0),
mFDLength(kLongMax),
mId(0),
mStartPositionMs(0),
mEndPositionMs(0) {
}
} // namespace android

1290
media/libmedia/NdkWrapper.cpp
View File

File diff suppressed because it is too large Load Diff

73
media/libmedia/include/media/DataSourceDesc.h
Unescape View File

@ -1,73 +0,0 @@
/*
* Copyright 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ANDROID_DATASOURCEDESC_H
#define ANDROID_DATASOURCEDESC_H
#include <media/stagefright/foundation/ABase.h>
#include <utils/RefBase.h>
#include <utils/KeyedVector.h>
#include <utils/String8.h>
namespace android {
class DataSource;
struct MediaHTTPService;
// A binder interface for implementing a stagefright DataSource remotely.
struct DataSourceDesc : public RefBase {
public:
// intentionally less than INT64_MAX
// keep consistent with JAVA code
static const int64_t kMaxTimeMs = 0x7ffffffffffffffll / 1000;
static const int64_t kMaxTimeUs = kMaxTimeMs * 1000;
enum {
/* No data source has been set yet */
TYPE_NONE = 0,
/* data source is type of MediaDataSource */
TYPE_CALLBACK = 1,
/* data source is type of FileDescriptor */
TYPE_FD = 2,
/* data source is type of Url */
TYPE_URL = 3,
};
DataSourceDesc();
int mType;
sp<MediaHTTPService> mHttpService;
String8 mUrl;
KeyedVector<String8, String8> mHeaders;
int mFD;
int64_t mFDOffset;
int64_t mFDLength;
sp<DataSource> mCallbackSource;
int64_t mId;
int64_t mStartPositionMs;
int64_t mEndPositionMs;
private:
DISALLOW_EVIL_CONSTRUCTORS(DataSourceDesc);
};
}; // namespace android
#endif // ANDROID_DATASOURCEDESC_H

33
media/libstagefright/NdkUtils.cpp
Unescape View File

@ -1,33 +0,0 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
//#define LOG_NDEBUG 0
#include <media/stagefright/NdkUtils.h>
#include <media/stagefright/Utils.h>
#include <media/stagefright/foundation/AMessage.h>
namespace android {
sp<MetaData> convertMediaFormatWrapperToMetaData(const sp<AMediaFormatWrapper> &fmt) {
sp<AMessage> msg = fmt->toAMessage();
sp<MetaData> meta = new MetaData;
convertMessageToMetaData(msg, meta);
return meta;
}
} // namespace android

31
media/libstagefright/include/media/stagefright/NdkUtils.h
Unescape View File

@ -1,31 +0,0 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef NDK_UTILS_H_
#define NDK_UTILS_H_
#include <media/stagefright/MetaData.h>
#include <media/NdkWrapper.h>
namespace android {
sp<MetaData> convertMediaFormatWrapperToMetaData(
const sp<AMediaFormatWrapper> &fmt);
} // namespace android
#endif // NDK_UTILS_H_
Write Preview
Loading…
Cancel
Save