drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ImageReader: Fix API doc table misalignment issue" into klp-dev

Browse Source
This commit is contained in:
Zhijun He
2013-08-23 18:49:42 +00:00
committed by Android (Google) Code Review
parent 4359d56420 af753a2dfc
commit 4cabe3eae8
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/java/android/media/Image.java
View File

@ -55,11 +55,11 @@ public interface Image extends AutoCloseable {
* the planes is as follows: * the planes is as follows:
* *
* <table> * <table>
* <th> * <tr>
* <td>Format</td> * <th>Format</th>
* <td>Plane count</td> * <th>Plane count</th>
* <td>Layout details</td> * <th>Layout details</th>
* </th> * </tr>
* <tr> * <tr>
* <td>{@link android.graphics.ImageFormat#JPEG}</td> * <td>{@link android.graphics.ImageFormat#JPEG}</td>
* <td>1</td> * <td>1</td>

1
media/jni/android_media_ImageReader.cpp
View File

@ -35,7 +35,6 @@
#define ALIGN(x, mask) ( ((x) + (mask) - 1) & ~((mask) - 1) ) #define ALIGN(x, mask) ( ((x) + (mask) - 1) & ~((mask) - 1) )
#define ANDROID_MEDIA_IMAGEREADER_JNI_ID "mCpuConsumer"
#define ANDROID_MEDIA_IMAGEREADER_CTX_JNI_ID "mNativeContext" #define ANDROID_MEDIA_IMAGEREADER_CTX_JNI_ID "mNativeContext"
#define ANDROID_MEDIA_SURFACEIMAGE_BUFFER_JNI_ID "mLockedBuffer" #define ANDROID_MEDIA_SURFACEIMAGE_BUFFER_JNI_ID "mLockedBuffer"
#define ANDROID_MEDIA_SURFACEIMAGE_TS_JNI_ID "mTimestamp" #define ANDROID_MEDIA_SURFACEIMAGE_TS_JNI_ID "mTimestamp"