summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-04-29 16:35:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-04-29 16:35:26 -0700
commitd2b0088df550e3ddfa44dbdfd1cd9a79ff80a2de (patch)
treee52a03cf0ad294d515ec00c187b8cab5e98e3212 /media/libstagefright
parenta092c0a095ed3f49e367e2f132ddb27525fb0e57 (diff)
parent4f9e47f2c03ce36261c4717cd7e131d7940bb068 (diff)
downloadframeworks_av-d2b0088df550e3ddfa44dbdfd1cd9a79ff80a2de.zip
frameworks_av-d2b0088df550e3ddfa44dbdfd1cd9a79ff80a2de.tar.gz
frameworks_av-d2b0088df550e3ddfa44dbdfd1cd9a79ff80a2de.tar.bz2
Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947"
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/AwesomePlayer.cpp7
-rw-r--r--media/libstagefright/include/AwesomePlayer.h3
2 files changed, 10 insertions, 0 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 70b3fbd..974efa7 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -1905,4 +1905,11 @@ void AwesomePlayer::postAudioSeekComplete() {
postCheckAudioStatusEvent_l(0 /* delayUs */);
}
+status_t AwesomePlayer::setParameter(int key, const Parcel &request) {
+ return OK;
+}
+
+status_t AwesomePlayer::getParameter(int key, Parcel *reply) {
+ return OK;
+}
} // namespace android
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h
index 8c61064..2c17d92 100644
--- a/media/libstagefright/include/AwesomePlayer.h
+++ b/media/libstagefright/include/AwesomePlayer.h
@@ -88,6 +88,9 @@ struct AwesomePlayer {
status_t getDuration(int64_t *durationUs);
status_t getPosition(int64_t *positionUs);
+ status_t setParameter(int key, const Parcel &request);
+ status_t getParameter(int key, Parcel *reply);
+
status_t seekTo(int64_t timeUs);
// This is a mask of MediaExtractor::Flags.