diff options
author | Jeff Tinker <jtinker@google.com> | 2013-04-05 01:16:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-05 01:16:19 +0000 |
commit | d5ef30b223b627c21b11f2850eeb48426c74220d (patch) | |
tree | b18fbd5fd00a79f237bb2a5f1973ab70f636ef25 /include | |
parent | f8fae863e8a5d442684634a1d3b2adcbe74b957a (diff) | |
parent | c0d5f1f8405de861ed6f1725f26cd6601e7103ab (diff) | |
download | frameworks_av-d5ef30b223b627c21b11f2850eeb48426c74220d.zip frameworks_av-d5ef30b223b627c21b11f2850eeb48426c74220d.tar.gz frameworks_av-d5ef30b223b627c21b11f2850eeb48426c74220d.tar.bz2 |
Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
Diffstat (limited to 'include')
-rw-r--r-- | include/media/IDrm.h | 3 | ||||
-rw-r--r-- | include/media/IDrmClient.h | 48 |
2 files changed, 51 insertions, 0 deletions
diff --git a/include/media/IDrm.h b/include/media/IDrm.h index 15d0a75..d630c40 100644 --- a/include/media/IDrm.h +++ b/include/media/IDrm.h @@ -17,6 +17,7 @@ #include <binder/IInterface.h> #include <media/stagefright/foundation/ABase.h> #include <media/drm/DrmAPI.h> +#include <media/IDrmClient.h> #ifndef ANDROID_IDRM_H_ @@ -106,6 +107,8 @@ struct IDrm : public IInterface { Vector<uint8_t> const &signature, bool &match) = 0; + virtual status_t setListener(const sp<IDrmClient>& listener) = 0; + private: DISALLOW_EVIL_CONSTRUCTORS(IDrm); }; diff --git a/include/media/IDrmClient.h b/include/media/IDrmClient.h new file mode 100644 index 0000000..3b2fc7c --- /dev/null +++ b/include/media/IDrmClient.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2013 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_IDRMCLIENT_H +#define ANDROID_IDRMCLIENT_H + +#include <utils/RefBase.h> +#include <binder/IInterface.h> +#include <binder/Parcel.h> +#include <media/drm/DrmAPI.h> + +namespace android { + +class IDrmClient: public IInterface +{ +public: + DECLARE_META_INTERFACE(DrmClient); + + virtual void notify(DrmPlugin::EventType eventType, int extra, const Parcel *obj) = 0; +}; + +// ---------------------------------------------------------------------------- + +class BnDrmClient: public BnInterface<IDrmClient> +{ +public: + virtual status_t onTransact(uint32_t code, + const Parcel& data, + Parcel* reply, + uint32_t flags = 0); +}; + +}; // namespace android + +#endif // ANDROID_IDRMCLIENT_H |