summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "MediaPlayer: add ANativeWindow (dis)connect calls"Jamie Gennis2011-07-181-0/+6
|\
| * MediaPlayer: add ANativeWindow (dis)connect callsJamie Gennis2011-07-141-0/+6
| | | | | | | | | | | | | | This change makes MediaPlayer connect to the ANativeWindow to which it is going to render video frames and disconnect when it is done. Change-Id: I88ab5c2fe62493aabdc84a283ff31634f795d415
* | Merge "move lock/unlock implementaion outside of Surface into ↵Mathias Agopian2011-07-182-95/+52
|\ \ | | | | | | | | | SurfaceTextureClient"
| * | move lock/unlock implementaion outside of Surface into SurfaceTextureClientMathias Agopian2011-07-152-95/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes ANativeWindow_lock/ANativeWindow_unlockAndPost work with ANativeWindows implemented by Surface and SurfaceTextureClient. Also, Surface now inherits directly from SurfaceTextureClient. Bug: 5003724 Change-Id: I9f285877c7bae9a262e9a7af91c2bae78804b2ef
* | | Merge "Add option to query hardware decoders only"Jean-Michel Trivi2011-07-181-1/+1
|\ \ \ | |/ / |/| |
| * | Add option to query hardware decoders onlyJean-Michel Trivi2011-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to OMXCodec::QueryCodecs() to filter out software codecs. Update stagefright command line tool to list the roles of codecs. Change-Id: Icddb79118c30fe13cc3aea20f340174cc082c4e0
* | | Merge "CPU statistics library"Glenn Kasten2011-07-153-0/+194
|\ \ \
| * | | CPU statistics libraryGlenn Kasten2011-07-153-0/+194
| | | | | | | | | | | | | | | | Change-Id: I113e2a926466cc410cfa5602ceb165b390a290fc
* | | | Merge changes Id9aa1003,I8c154189Jamie Gennis2011-07-143-3/+42
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | * changes: SurfaceTexture: make (dis)connect into an IPC SurfaceTexture: add support for new connect values
| * | | SurfaceTexture: make (dis)connect into an IPCJamie Gennis2011-07-143-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the ANativeWindow connect and disconnect calls result in an IPC to the SurfaceTexture object. This will allow us to prevent multiple simultaneous connections from different processes. Change-Id: Id9aa1003b1335b96ca6bd4a1f5a67aa433d42efb
* | | | Merge "Support profile and level query for SW video decoders"James Dong2011-07-142-5/+5
|\ \ \ \
| * | | | Support profile and level query for SW video decodersJames Dong2011-07-112-5/+5
| |/ / / | | | | | | | | | | | | Change-Id: I9c20db128be96cd36cf2083e08e8c21f5e6d1fdf
* | | | Merge "Remove legacy http support from stagefright, chromium is the new ↵Andreas Huber2011-07-141-61/+0
|\ \ \ \ | | | | | | | | | | | | | | | hotness."
| * | | | Remove legacy http support from stagefright, chromium is the new hotness.Andreas Huber2011-07-131-61/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I6725d42d38b91e6a1cbca43174870f445aeb3d99
* | | | | Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator buildMike Lockwood2011-07-131-115/+0
|/ / / / | | | | | | | | | | | | | | | | Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Enable signalling of a stream discontinuity involving a format-changeAndreas Huber2011-07-131-0/+11
| |_|/ |/| | | | | | | | | | | | | | | | | through IStreamListener. Change-Id: Ic0409cdc4891ad26b61f2f98bdda3c7fb2e2de6a related-to-bug: 5022434
* | | Make MetadataBufferType.h C-friendlyJames Dong2011-07-121-0/+7
| | | | | | | | | | | | Change-Id: I4388d8f6cf30f08858aec73aa971647feae4a5e3
* | | Merge "EGL: fix the ANativeWindow size/fmt override"Jamie Gennis2011-07-111-1/+4
|\ \ \
| * | | EGL: fix the ANativeWindow size/fmt overrideJamie Gennis2011-07-111-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes how the Android EGL layer overrides the size and format of an ANativeWindow in eglCreateWindowSurface. The new behavior is to leave the size untouched when overriding the format. The previous behavior was to reset the ANativeWindow to use the default size set by the ANativeWindow implementation. It also adds two new 'perform' methods to the ANativeWindow interface: set_buffers_dimensions and set_buffers_format, and redefines the behavior of set_buffers_geometry to be the combination of these two new methods. Additionally, this change adds an error check for the return value of the new native_window_set_buffers_format call, which required adding a (stub) handler for to FramebufferNativeWindow. Change-Id: I805c7ccd8d4730dfb132d10d8bc3fb058a0b9df1
* | | Merge "Eliminate single-process mode. Bug: 5010576"Jeff Brown2011-07-111-4/+0
|\ \ \
| * | | Eliminate single-process mode.Jeff Brown2011-07-081-4/+0
| |/ / | | | | | | | | | | | | | | | Bug: 5010576 Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
* | | Merge "Do not wait for unlaunched threads in stop()"James Dong2011-07-111-1/+3
|\ \ \
| * | | Do not wait for unlaunched threads in stop()James Dong2011-07-111-1/+3
| |/ / | | | | | | | | | Change-Id: If681749753bb96ee98c1539658cfd919eeb0cb65
* | | Release camera if CameraSource::start() has not been calledJames Dong2011-07-101-0/+6
|/ / | | | | | | Change-Id: I2f7e4b8501db3d80b9aa6f99d896d778bec29e8c
* | Moved and renamed effect API header filesEric Laurent2011-07-077-325/+1
|/ | | | | | | | Moved specific effect header files to system/media/audio_effects/include/audio_effects and renamed to lower case (effect_xxx.h). Change-Id: Icfc2264bfd013cab0395d7e310ada636b9fe3621
* Merge "Add Thread::join"Glenn Kasten2011-07-061-0/+4
|\
| * Add Thread::joinGlenn Kasten2011-06-231-0/+4
| | | | | | | | | | | | | | | | | | This new API will be used by applications that previously used the lower-level pthread APIs (including pthread_join). Centralizing on the Thread class instead of pthread will permit additional functionality to be added later in only one location. Change-Id: I8460169ac9c61ac9f85752405ed54c94651058d7
* | Merge "return an error code with gralloc buffer allocation failures"Mathias Agopian2011-07-061-1/+1
|\ \
| * | return an error code with gralloc buffer allocation failuresMathias Agopian2011-07-011-1/+1
| | | | | | | | | | | | Change-Id: I471e5d37ea7a42fc8a0f93446ee3b4229da37807
* | | Merge "- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in ↵Gloria Wang2011-07-062-1/+9
|\ \ \ | | | | | | | | | | | | MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager"
| * | | - Retrieve is_drm in MediaMetadataRetriever.Gloria Wang2011-07-012-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692
* | | | Merge "Thread ID zero for androidSetThreadSchedulingGroup"Glenn Kasten2011-07-051-2/+2
|\ \ \ \
| * | | | Thread ID zero for androidSetThreadSchedulingGroupGlenn Kasten2011-06-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Already implemented by androidSetThreadPriority but not documented Change-Id: I85302b17092952065f3f3a4214d8d8abdd465dbd
* | | | | Workaround apps that make assumptions about pointer ids.Jeff Brown2011-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the touch input mapper to assign pointer ids sequentially starting from 0 instead of using the tracking id or slot index supplied by the driver. Applications should not depend on this ordering but some do. (sigh) Bug: 4980884 Change-Id: I0dfeb3ac27c57a7102a13c960c760e2a02eb7669
* | | | | Merge "Charge network traffic to the uid of the process using the MediaPlayer."Andreas Huber2011-07-011-0/+4
|\ \ \ \ \
| * | | | | Charge network traffic to the uid of the process using the MediaPlayer.Andreas Huber2011-07-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2bcb54b8232afd3fc7ee16289f37c7a7b3f23067 related-to-bug: 4517282
* | | | | | Merge "Add extended metadata buffer support by defining different types of ↵James Dong2011-07-011-0/+77
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | metadata buffers"
| * | | | | Add extended metadata buffer support by defining different types of metadata ↵James Dong2011-06-281-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers Change-Id: I6aa6b5da004c240c9986f6b9036950e234c8bd42
* | | | | | Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec.Andreas Huber2011-07-013-6/+26
| |/ / / / |/| | | | | | | | | | | | | | Change-Id: Ie03b285265099dbac9b12f3f41d9ad758d0b50ad
* | | | | Merge "Minor fix in SurfaceTexture"Pannag Sanketi2011-06-301-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Minor fix in SurfaceTexturePannag Sanketi2011-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic859715becf3e6d5107bd8beb8c577034d00ec52
* | | | | Merge "SF transactions are now O(1) wrt IPC instead of O(N)."Mathias Agopian2011-06-296-29/+47
|\ \ \ \ \
| * | | | | SF transactions are now O(1) wrt IPC instead of O(N).Mathias Agopian2011-06-296-29/+47
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I57669852cbf6aabae244ea86940a08a5a27ffc43
* | | | | | Merge "Add a linear transform library to libutils"Jason Simmons2011-06-291-0/+64
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add a linear transform library to libutilsJason Simmons2011-06-281-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icdec5a6bebd9d8f24b3f335f8ec8b09a5810a774
* | | | | | Merge "Support for writing output data to a provided callback function ↵Andreas Huber2011-06-281-0/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | instead of a file"
| * | | | | Support for writing output data to a provided callback function instead of a ↵Andreas Huber2011-06-281-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file in MPEG2TSWriter Change-Id: Ie54a5677c7b789a973aa50b7f197c6db238425bc
* | | | | | Merge changes I9fb59763,I8b2c6e00Jamie Gennis2011-06-281-10/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * changes: SurfaceTexture: consume buffers after err checks SurfaceTexture: change onFrameAvailable behavior
| * | | | | SurfaceTexture: change onFrameAvailable behaviorJamie Gennis2011-06-271-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change alters the conditions under which the onFrameAvailable callback gets called by the C++ SurfaceTexture class. The new behavior is to call the callback whenever a frame gets queued that will be visible to the buffer consumer. This means that buffers queued in synchronous mode always trigger the callback, as those buffers will remain pending until they are consumed. Buffers queued in asynchronous mode will only trigger the callback if there was not previously an unconsumed buffer pending. The new behavior means that a consumer should perform a draw operation exactly once for every onFrameAvailable call that it recieves. This change also modifies SurfaceFlinger and the SurfaceTexture JNI to support of the new behavior. Change-Id: I8b2c6e00961d3d58b11c6af50b555b6e4c5f5b40
* | | | | | Multiple changes to ACodec/codec tools:Andreas Huber2011-06-281-6/+7
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure sf2 does not coalesce input buffers, generalize ACodec's codec instantiation based on OMXCodec's list of eligible component names. Some changes/additions to the "sf2" commandline tool Make surface options consistent with stagefright tool, i.e. use '-S' instead of '-s' New option '-R' renders surface-allocated buffers. Also fixes a longstanding bug introduced when generalizing from surfaces to native windows that never used surface-allocated buffers in sf2 even when the option was specified. Change-Id: I59fd533f0f6ef0337ebe2806ddc81a46878eb3ae