diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_framework_common.h | 1 | ||||
| -rw-r--r-- | include/media/AudioRecord.h | 2 | ||||
| -rw-r--r-- | include/media/AudioSystem.h | 2 | ||||
| -rw-r--r-- | include/media/MediaRecorderBase.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/AudioSource.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 9 | ||||
| -rw-r--r-- | include/media/stagefright/MediaErrors.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/openmax/OMX_Video.h | 1 |
9 files changed, 17 insertions, 4 deletions
diff --git a/include/drm/drm_framework_common.h b/include/drm/drm_framework_common.h index 3330ebc..2632cbd 100644 --- a/include/drm/drm_framework_common.h +++ b/include/drm/drm_framework_common.h @@ -42,6 +42,7 @@ enum { DRM_ERROR_DECRYPT_UNIT_NOT_INITIALIZED = ERROR_BASE - 4, DRM_ERROR_DECRYPT = ERROR_BASE - 5, DRM_ERROR_CANNOT_HANDLE = ERROR_BASE - 6, + DRM_ERROR_TAMPER_DETECTED = ERROR_BASE - 7, DRM_NO_ERROR = NO_ERROR }; diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index def3612..baab2e8 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -30,7 +30,7 @@ #include <binder/IMemory.h> #include <utils/threads.h> -#include <hardware/audio.h> +#include <system/audio.h> namespace android { diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index eb61a87..68cd188 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -21,7 +21,7 @@ #include <utils/threads.h> #include <media/IAudioFlinger.h> -#include <hardware/audio.h> +#include <system/audio.h> #include <hardware/audio_policy.h> /* XXX: Should be include by all the users instead */ diff --git a/include/media/MediaRecorderBase.h b/include/media/MediaRecorderBase.h index 5fe7722..7e22a24 100644 --- a/include/media/MediaRecorderBase.h +++ b/include/media/MediaRecorderBase.h @@ -20,7 +20,7 @@ #include <media/mediarecorder.h> -#include <hardware/audio.h> +#include <system/audio.h> namespace android { diff --git a/include/media/stagefright/AudioSource.h b/include/media/stagefright/AudioSource.h index 20a9e16..19bd31b 100644 --- a/include/media/stagefright/AudioSource.h +++ b/include/media/stagefright/AudioSource.h @@ -24,7 +24,7 @@ #include <media/stagefright/MediaBuffer.h> #include <utils/List.h> -#include <hardware/audio.h> +#include <system/audio.h> namespace android { diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 4b5674e..2d75728 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -55,6 +55,8 @@ public: status_t setInterleaveDuration(uint32_t duration); int32_t getTimeScale() const { return mTimeScale; } + status_t setGeoData(int latitudex10000, int longitudex10000); + protected: virtual ~MPEG4Writer(); @@ -79,6 +81,9 @@ private: uint32_t mInterleaveDurationUs; int32_t mTimeScale; int64_t mStartTimestampUs; + int mLatitudex10000; + int mLongitudex10000; + bool mAreGeoTagsAvailable; Mutex mLock; @@ -169,6 +174,10 @@ private: void writeMvhdBox(int64_t durationUs); void writeMoovBox(int64_t durationUs); void writeFtypBox(const MetaData *param); + void writeUdtaBox(); + void writeGeoDataBox(); + void writeLatitude(int degreex10000); + void writeLongitude(int degreex10000); void sendSessionSummary(); MPEG4Writer(const MPEG4Writer &); diff --git a/include/media/stagefright/MediaErrors.h b/include/media/stagefright/MediaErrors.h index 7cc993c..21d00b8 100644 --- a/include/media/stagefright/MediaErrors.h +++ b/include/media/stagefright/MediaErrors.h @@ -52,6 +52,7 @@ enum { ERROR_DRM_DECRYPT_UNIT_NOT_INITIALIZED = DRM_ERROR_BASE - 4, ERROR_DRM_DECRYPT = DRM_ERROR_BASE - 5, ERROR_DRM_CANNOT_HANDLE = DRM_ERROR_BASE - 6, + ERROR_DRM_TAMPER_DETECTED = DRM_ERROR_BASE - 7, // Heartbeat Error Codes HEARTBEAT_ERROR_BASE = -3000, diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 93b5d24..70daafa 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -214,6 +214,7 @@ private: void setAMRFormat(bool isWAMR, int32_t bitRate); void setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bitRate); + void setG711Format(int32_t numChannels); status_t setVideoPortFormatType( OMX_U32 portIndex, diff --git a/include/media/stagefright/openmax/OMX_Video.h b/include/media/stagefright/openmax/OMX_Video.h index 2738bdc..4f8485d 100644 --- a/include/media/stagefright/openmax/OMX_Video.h +++ b/include/media/stagefright/openmax/OMX_Video.h @@ -85,6 +85,7 @@ typedef enum OMX_VIDEO_CODINGTYPE { OMX_VIDEO_CodingRV, /**< all versions of Real Video */ OMX_VIDEO_CodingAVC, /**< H.264/AVC */ OMX_VIDEO_CodingMJPEG, /**< Motion JPEG */ + OMX_VIDEO_CodingVPX, /**< Google VPX, formerly known as On2 VP8 */ OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_CodingMax = 0x7FFFFFFF |