diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:02:17 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:37:41 -0700 |
| commit | aa98968601ddb19d92790bf76bddd351dbc4c640 (patch) | |
| tree | 465e1907f96ee6a67504dada03cff5c2a3326b01 /include/media | |
| parent | a5ec3545f879e882ed5397707f65a4757f7232d5 (diff) | |
| parent | 1f24c730ab6ca5aff1e3137b340b8aeaeda4bdbc (diff) | |
| download | frameworks_av-aa98968601ddb19d92790bf76bddd351dbc4c640.zip frameworks_av-aa98968601ddb19d92790bf76bddd351dbc4c640.tar.gz frameworks_av-aa98968601ddb19d92790bf76bddd351dbc4c640.tar.bz2 | |
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z)
Change-Id: Ic86e42d5fb8f81fe5c4f58d2e76852829c609760
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/IMediaDeathNotifier.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/CameraSource.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/media/IMediaDeathNotifier.h b/include/media/IMediaDeathNotifier.h index bb3d0d8..aca6678 100644 --- a/include/media/IMediaDeathNotifier.h +++ b/include/media/IMediaDeathNotifier.h @@ -30,7 +30,7 @@ public: virtual ~IMediaDeathNotifier() { removeObitRecipient(this); } virtual void died() = 0; - static const sp<IMediaPlayerService>& getMediaPlayerService(); + static const sp<IMediaPlayerService> getMediaPlayerService(); private: IMediaDeathNotifier &operator=(const IMediaDeathNotifier &); diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index 70149cc..3dcfe4e 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -243,6 +243,9 @@ protected: status_t checkFrameRate(const CameraParameters& params, int32_t frameRate); + static void adjustIncomingANWBuffer(IMemory* data); + static void adjustOutgoingANWBuffer(IMemory* data); + void stopCameraRecording(); status_t reset(); |