Remove libbinder dependency from libmedia2_jni.
-BufferingSettings doesn't need to be a parcelable.
-Use libstagefright_foundation_without_imemory.
Test: build and MediaPlayer2Test
Bug: 123361167
Change-Id: I1c02bc4ed38a697950a9fd31f9fa395a219927e4
diff --git a/media/libmedia/BufferingSettings.cpp b/media/libmedia/BufferingSettings.cpp
index 271a238..1cc30c2 100644
--- a/media/libmedia/BufferingSettings.cpp
+++ b/media/libmedia/BufferingSettings.cpp
@@ -27,26 +27,6 @@
: mInitialMarkMs(kNoMark),
mResumePlaybackMarkMs(kNoMark) { }
-status_t BufferingSettings::readFromParcel(const Parcel* parcel) {
- if (parcel == nullptr) {
- return BAD_VALUE;
- }
- mInitialMarkMs = parcel->readInt32();
- mResumePlaybackMarkMs = parcel->readInt32();
-
- return OK;
-}
-
-status_t BufferingSettings::writeToParcel(Parcel* parcel) const {
- if (parcel == nullptr) {
- return BAD_VALUE;
- }
- parcel->writeInt32(mInitialMarkMs);
- parcel->writeInt32(mResumePlaybackMarkMs);
-
- return OK;
-}
-
String8 BufferingSettings::toString() const {
String8 s;
s.appendFormat(
diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp
index e2eccdd..ea06665 100644
--- a/media/libmedia/IMediaPlayer.cpp
+++ b/media/libmedia/IMediaPlayer.cpp
@@ -179,7 +179,8 @@
{
Parcel data, reply;
data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());
- buffering.writeToParcel(&data);
+ data.writeInt32(buffering.mInitialMarkMs);
+ data.writeInt32(buffering.mResumePlaybackMarkMs);
remote()->transact(SET_BUFFERING_SETTINGS, data, &reply);
return reply.readInt32();
}
@@ -194,7 +195,8 @@
remote()->transact(GET_BUFFERING_SETTINGS, data, &reply);
status_t err = reply.readInt32();
if (err == OK) {
- err = buffering->readFromParcel(&reply);
+ buffering->mInitialMarkMs = reply.readInt32();
+ buffering->mResumePlaybackMarkMs = reply.readInt32();
}
return err;
}
@@ -696,7 +698,8 @@
case SET_BUFFERING_SETTINGS: {
CHECK_INTERFACE(IMediaPlayer, data, reply);
BufferingSettings buffering;
- buffering.readFromParcel(&data);
+ buffering.mInitialMarkMs = data.readInt32();
+ buffering.mResumePlaybackMarkMs = data.readInt32();
reply->writeInt32(setBufferingSettings(buffering));
return NO_ERROR;
} break;
@@ -706,7 +709,8 @@
status_t err = getBufferingSettings(&buffering);
reply->writeInt32(err);
if (err == OK) {
- buffering.writeToParcel(reply);
+ reply->writeInt32(buffering.mInitialMarkMs);
+ reply->writeInt32(buffering.mResumePlaybackMarkMs);
}
return NO_ERROR;
} break;
diff --git a/media/libmedia/include/media/BufferingSettings.h b/media/libmedia/include/media/BufferingSettings.h
index d2a3e40..d97cc00 100644
--- a/media/libmedia/include/media/BufferingSettings.h
+++ b/media/libmedia/include/media/BufferingSettings.h
@@ -17,11 +17,11 @@
#ifndef ANDROID_BUFFERING_SETTINGS_H
#define ANDROID_BUFFERING_SETTINGS_H
-#include <binder/Parcelable.h>
+#include <utils/String8.h>
namespace android {
-struct BufferingSettings : public Parcelable {
+struct BufferingSettings {
static const int kNoMark = -1;
int mInitialMarkMs;
@@ -32,9 +32,6 @@
BufferingSettings();
- status_t writeToParcel(Parcel* parcel) const override;
- status_t readFromParcel(const Parcel* parcel) override;
-
String8 toString() const;
};
diff --git a/media/libmediaplayer2/Android.bp b/media/libmediaplayer2/Android.bp
index b3f7404..00f537d 100644
--- a/media/libmediaplayer2/Android.bp
+++ b/media/libmediaplayer2/Android.bp
@@ -21,7 +21,6 @@
"libgui",
"liblog",
"libmedia_omx",
- "libstagefright_foundation",
"libui",
"libutils",
@@ -55,6 +54,7 @@
"libmediaplayer2-protos",
"libmedia_player2_util",
"libprotobuf-cpp-lite",
+ "libstagefright_foundation_without_imemory",
"libstagefright_nuplayer2",
"libstagefright_player2",
"libstagefright_rtsp",