diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/mediametadataretriever.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/AudioSource.h | 4 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 1 | ||||
| -rw-r--r-- | include/ui/GraphicBuffer.h | 15 | ||||
| -rw-r--r-- | include/ui/GraphicBufferAllocator.h | 1 | ||||
| -rw-r--r-- | include/ui/android_native_buffer.h | 8 |
6 files changed, 25 insertions, 5 deletions
diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h index dbbcc49..ddc07f6 100644 --- a/include/media/mediametadataretriever.h +++ b/include/media/mediametadataretriever.h @@ -56,6 +56,7 @@ enum { METADATA_KEY_MIMETYPE = 22, METADATA_KEY_DISC_NUMBER = 23, METADATA_KEY_ALBUMARTIST = 24, + METADATA_KEY_COMPILATION = 25, // Add more here... }; diff --git a/include/media/stagefright/AudioSource.h b/include/media/stagefright/AudioSource.h index a5cec78..d484d60 100644 --- a/include/media/stagefright/AudioSource.h +++ b/include/media/stagefright/AudioSource.h @@ -54,11 +54,11 @@ private: // After the initial mute, we raise the volume linearly // over kAutoRampDurationUs. - kAutoRampDurationUs = 300000, + kAutoRampDurationUs = 700000, // This is the initial mute duration to suppress // the video recording signal tone - kAutoRampStartUs = 700000, + kAutoRampStartUs = 1000000, }; AudioRecord *mRecord; diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index a69d9af..ea2fa52 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -75,6 +75,7 @@ enum { kKeyDiscNumber = 'dnum', // cstring kKeyDate = 'date', // cstring kKeyWriter = 'writ', // cstring + kKeyCompilation = 'cpil', // cstring kKeyTimeScale = 'tmsl', // int32_t // video profile and level diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index a3e85a9..0be26a7 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -26,6 +26,8 @@ #include <utils/Flattenable.h> #include <pixelflinger/pixelflinger.h> +#include <hardware/hardware.h> + struct android_native_buffer_t; namespace android { @@ -63,6 +65,13 @@ public: USAGE_HW_MASK = GRALLOC_USAGE_HW_MASK }; + enum { + TRANSFORM_IDENTITY = 0, + TRANSFORM_ROT_90 = HAL_TRANSFORM_ROT_90, + TRANSFORM_ROT_180 = HAL_TRANSFORM_ROT_180, + TRANSFORM_ROT_270 = HAL_TRANSFORM_ROT_270 + }; + GraphicBuffer(); // creates w * h buffer @@ -79,6 +88,7 @@ public: uint32_t getHeight() const { return height; } uint32_t getStride() const { return stride; } uint32_t getUsage() const { return usage; } + uint32_t getTransform() const { return transform; } PixelFormat getPixelFormat() const { return format; } Rect getBounds() const { return Rect(width, height); } @@ -88,12 +98,15 @@ public: status_t lock(uint32_t usage, const Rect& rect, void** vaddr); status_t lock(GGLSurface* surface, uint32_t usage); status_t unlock(); - + android_native_buffer_t* getNativeBuffer() const; void setIndex(int index); int getIndex() const; + // for debugging + static void dumpAllocationsToSystemLog(); + private: virtual ~GraphicBuffer(); diff --git a/include/ui/GraphicBufferAllocator.h b/include/ui/GraphicBufferAllocator.h index 54b8236..dffa788 100644 --- a/include/ui/GraphicBufferAllocator.h +++ b/include/ui/GraphicBufferAllocator.h @@ -68,6 +68,7 @@ public: status_t free(buffer_handle_t handle); void dump(String8& res) const; + static void dumpToSystemLog(); private: struct alloc_rec_t { diff --git a/include/ui/android_native_buffer.h b/include/ui/android_native_buffer.h index 402843e..a472824 100644 --- a/include/ui/android_native_buffer.h +++ b/include/ui/android_native_buffer.h @@ -51,8 +51,12 @@ typedef struct android_native_buffer_t int stride; int format; int usage; - - void* reserved[2]; + + /* transformation as defined in hardware.h */ + uint8_t transform; + + uint8_t reserved_bytes[3]; + void* reserved[1]; buffer_handle_t handle; |