summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-08-31 14:03:25 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-31 14:03:25 -0700
commitcd89e8014368af1bbdfa08406d5d2eb0bbbfcca1 (patch)
tree372818c0898b8c0db85e0ebd482359e14ddba066 /media/libmedia
parent892020e46b97adfa012be7a9dd688a2d6d528de4 (diff)
parentda7ff5321539ac07ec76d0d03bd1b9b09a1823bf (diff)
downloadframeworks_av-cd89e8014368af1bbdfa08406d5d2eb0bbbfcca1.zip
frameworks_av-cd89e8014368af1bbdfa08406d5d2eb0bbbfcca1.tar.gz
frameworks_av-cd89e8014368af1bbdfa08406d5d2eb0bbbfcca1.tar.bz2
Merge "Added an additional virtual method IStreamSource::flags()." into jb-mr1-dev
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/IStreamSource.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/media/libmedia/IStreamSource.cpp b/media/libmedia/IStreamSource.cpp
index 078be94..78d810d 100644
--- a/media/libmedia/IStreamSource.cpp
+++ b/media/libmedia/IStreamSource.cpp
@@ -37,6 +37,7 @@ enum {
SET_LISTENER = IBinder::FIRST_CALL_TRANSACTION,
SET_BUFFERS,
ON_BUFFER_AVAILABLE,
+ FLAGS,
// IStreamListener
QUEUE_BUFFER,
@@ -72,6 +73,14 @@ struct BpStreamSource : public BpInterface<IStreamSource> {
remote()->transact(
ON_BUFFER_AVAILABLE, data, &reply, IBinder::FLAG_ONEWAY);
}
+
+ virtual uint32_t flags() const {
+ Parcel data, reply;
+ data.writeInterfaceToken(IStreamSource::getInterfaceDescriptor());
+ remote()->transact(FLAGS, data, &reply);
+
+ return reply.readInt32();
+ }
};
IMPLEMENT_META_INTERFACE(StreamSource, "android.hardware.IStreamSource");
@@ -109,6 +118,13 @@ status_t BnStreamSource::onTransact(
break;
}
+ case FLAGS:
+ {
+ CHECK_INTERFACE(IStreamSource, data, reply);
+ reply->writeInt32(this->flags());
+ break;
+ }
+
default:
return BBinder::onTransact(code, data, reply, flags);
}