summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Initial checkin of support for acting as a wifi display source" into ↵Andreas Huber2012-08-2925-38/+4470
|\ | | | | | | jb-mr1-dev
| * Initial checkin of support for acting as a wifi display sourceAndreas Huber2012-08-2925-38/+4470
| | | | | | | | Change-Id: I08f17efa0c7d007e17408feb7d4fbef0a19f531a
* | Merge "Preliminary support for HDCP as a binder service for wifi display ↵Andreas Huber2012-08-295-0/+434
|\ \ | | | | | | | | | support." into jb-mr1-dev
| * | Preliminary support for HDCP as a binder service for wifi display support.Andreas Huber2012-08-295-0/+434
| |/ | | | | | | Change-Id: Ie0de1c086c629a668d1c7863992eef56fb94157c
* | am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an ↵Jean-Baptiste Queru2012-08-291-0/+2
|\ \ | | | | | | | | | | | | | | | | | | empty buffer is received" * commit '8836f8e0bfc64dce81963db89dfc5d0f11c29483': MPEG2TSWriter: Read more immediately if an empty buffer is received
| * \ am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer ↵Jean-Baptiste Queru2012-08-291-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | is received" * commit '5b15adfe9e5ee9a92b5f0a2853246fce170d4eef': MPEG2TSWriter: Read more immediately if an empty buffer is received
| | * \ Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"Jean-Baptiste Queru2012-08-291-0/+2
| | |\ \
| | | * | MPEG2TSWriter: Read more immediately if an empty buffer is receivedMartin Storsjo2012-08-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If writing encoded data from an OMXCodec, the last buffer can be an empty buffer (with the EOS flag set, which isn't propagated to MediaBuffer). If we don't retry reading, we won't ever get the EOS error and thus won't properly signal that the source is done. Change-Id: Ibe01dbcd0637fbf0c2529a277e9f208c48e0e8ab
* | | | | am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo ↵Jean-Baptiste Queru2012-08-291-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | before reading info from it" * commit 'bf30787f2694057e775f3b527b649a9f8074237b': avcenc: Don't erase the InputBufferInfo before reading info from it
| * | | | am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading ↵Jean-Baptiste Queru2012-08-291-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | info from it" * commit '735d1b926fa3e057c92d74cebacca2f243ead274': avcenc: Don't erase the InputBufferInfo before reading info from it
| | * | | Merge "avcenc: Don't erase the InputBufferInfo before reading info from it"Jean-Baptiste Queru2012-08-291-1/+1
| | |\ \ \
| | | * | | avcenc: Don't erase the InputBufferInfo before reading info from itMartin Storsjo2012-08-291-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the timestamp and flags were read from the InputBufferInfo struct after it had been erased. This fixes cases where the output timestamp from the avc encoder could spuriously be garbage every now and then. Change-Id: I21acf23cfac93bcc201a603feace6499ec6d8e76
* | | | | am 0924dd88: am 2aa37a7d: Merge "recordvideo: Add an option for choosing ↵Jean-Baptiste Queru2012-08-291-2/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | software encoders" * commit '0924dd88790ba9cda0d5a86df7d68b7446470fc7': recordvideo: Add an option for choosing software encoders
| * | | | am 2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"Jean-Baptiste Queru2012-08-291-2/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2aa37a7d15f5e2246b8996d2600269684904c581': recordvideo: Add an option for choosing software encoders
| | * | | Merge "recordvideo: Add an option for choosing software encoders"Jean-Baptiste Queru2012-08-291-2/+11
| | |\ \ \
| | | * | | recordvideo: Add an option for choosing software encodersMartin Storsjo2012-08-291-2/+11
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar to the same option in the 'stagefright' test application. Change-Id: I2a2e5201bd93460df0911ef12865c9030c0183e5
* | | | | am 3f9e843d: am 9ce74352: Merge "recordvideo: Sleep while waiting for the ↵Jean-Baptiste Queru2012-08-291-0/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | encoding to finish" * commit '3f9e843d924f220f6094241bc765cd69d8fc6d7b': recordvideo: Sleep while waiting for the encoding to finish
| * | | am 9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"Jean-Baptiste Queru2012-08-291-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '9ce74352d23d833f9627b7be58be964206e6ff6d': recordvideo: Sleep while waiting for the encoding to finish
| | * | Merge "recordvideo: Sleep while waiting for the encoding to finish"Jean-Baptiste Queru2012-08-291-0/+1
| | |\ \ | | | |/ | | |/|
| | | * recordvideo: Sleep while waiting for the encoding to finishMartin Storsjo2012-08-291-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids busy looping while e.g. waiting for the software encoder to finish. This is similar to what the 'record' and 'stagefright' test apps do. Change-Id: Idce55b15396ce78b621a521229603bec1e799f33
* | | Merge "Camera2: Factor out Camera2Client::Parameters" into jb-mr1-devEino-Ville Talvala2012-08-289-2017/+2140
|\ \ \
| * | | Camera2: Factor out Camera2Client::ParametersEino-Ville Talvala2012-08-289-2017/+2140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the parameter structure and the various utility methods using it to its own class. Rename LockedParameters to SharedParameters to match the Mutex naming convention. Also move CameraMetadata to camera2 directory for organization. No functional changes. Bug: 6243944 Change-Id: Ie60b535936ecfda9bf23361d52604abf515c83d0
* | | | Merge "Fix retries when server doesn't support range requests." into jb-mr1-devAndreas Huber2012-08-281-2/+10
|\ \ \ \
| * | | | Fix retries when server doesn't support range requests.Andreas Huber2012-08-281-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2d137f3e799b87af36a279473c0077d860c14477 related-to-bug: 7021436
* | | | | Merge "Test to measure UDP roundtrip time between two devices on the same ↵Andreas Huber2012-08-286-0/+1822
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | network." into jb-mr1-dev
| * | | | Test to measure UDP roundtrip time between two devices on the same network.Andreas Huber2012-08-286-0/+1822
| |/ / / | | | | | | | | | | | | Change-Id: I4c9a5190efe18da8b6be7d68bda91df878c4118c
* | | | Merge "Use new surface flinger API." into jb-mr1-devJeff Brown2012-08-275-7/+9
|\ \ \ \
| * | | | Use new surface flinger API.Jeff Brown2012-08-245-7/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I594c6e15db5f617d2feaac1a65b5316daa3812d0
* | | | | Merge "Camera2: Fix metering/focusing region coordinates, minor bugs" into ↵Eino-Ville Talvala2012-08-272-10/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | Camera2: Fix metering/focusing region coordinates, minor bugsEino-Ville Talvala2012-08-272-10/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use active pixel array-based coordinates instead of the normalized camera API coordinates for ae/awb/af regions - Fix calculation of UV stride for YV12 format Bug: 6243944 Change-Id: I80cbd989858b0a3cb75c6f536c145e16e44fdb25
* | | | | | Merge "Camera2: Move frame processing to its own thread." into jb-mr1-devEino-Ville Talvala2012-08-274-77/+119
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Camera2: Move frame processing to its own thread.Eino-Ville Talvala2012-08-274-77/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid blocking the HAL on possibly long-running binder calls, move frame receiption and processing to its own thread. Bug: 6243944 Change-Id: I6385be4410b2f68e2331755027afc10c342187cf
* | | | | | Merge "Camera2: Use CameraMetadata wrapper class." into jb-mr1-devEino-Ville Talvala2012-08-277-294/+680
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Camera2: Use CameraMetadata wrapper class.Eino-Ville Talvala2012-08-277-294/+680
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap the use of the camera_metadata library inside a CameraMetadata class to avoid memory leaks, improve code clarity, and increase type safety. Bug: 6243944 Change-Id: I90ca592b5875e27e4c58ea1ca680582dc3c3b56a
* | | | | Merge "Fixed a potential/rare race condtion in ↵James Dong2012-08-271-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | MediaPlayerService::Client::notify() method" into jb-mr1-dev
| * | | | | Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() ↵James Dong2012-08-261-2/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method o The mClient could be disconnected before the notify message is sent out. Use a local reference could help resolve this issue. o related-to-bug: 6782035 Change-Id: Ia2047bd7f2666100fed83c6e5417a3bf2e20cd2c
* | | | | Merge "Fixed a native crash due to unexpected state at destroy time when ↵James Dong2012-08-272-6/+16
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | encoder component's source fails to start" into jb-mr1-dev
| * | | | Fixed a native crash due to unexpected state at destroy time when encoder ↵James Dong2012-08-242-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | component's source fails to start o Encoder component initializes to be in the state of EXECUTING before its source gets started, because we wanted to be able to configure the source to use the advertised number of input buffers. However, if the source fails to start, then the encoder ends up in the state of EXECUTING when OMXCodec object gets destroyed. As a result, the assertion on the expected state in OMXCodec's constructor fails. The fix is to stop the video encoder component right way when its source fails to start so to bring the state of the encoder component back to the expected state. o related-to-bug: 7045494 Change-Id: I6d4a221eb809d7137f53e58098a04816998f7a25
* | | | | Merge "SurfaceMediaSource: a few fixes / cleanups" into jb-mr1-devJamie Gennis2012-08-262-22/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | SurfaceMediaSource: a few fixes / cleanupsJamie Gennis2012-08-262-22/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove the setting of mStopped to true in onBuffersReleased - Cleaned up a few function call logs - Removed the 'reset' method. Change-Id: I56bab1d5cb2f3e6d59d54698c2e045d796d1849f
* | | | | Merge "Fix deadlock" into jb-mr1-devMarco Nelissen2012-08-241-1/+17
|\ \ \ \ \
| * | | | | Fix deadlockMarco Nelissen2012-08-241-1/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I wanted to save some space, and ended up with a deadlock. This change basically restores setDataSource(fd, offset, size) to the way it was before I added the new setDataSource(DataSource) method, instead of calling through to it. Change-Id: Iacf4627c8745369fa84b467530189a9f64f8726b
* | | | | Merge "Reduce THD when equalizer is ON." into jb-mr1-devEric Laurent2012-08-242-3/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reduce THD when equalizer is ON.Eric Laurent2012-08-242-3/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase headroom in LVM bundle to reduce THD when equalizer is ON with high band gains. Also add a workaround for a bug in headroom parameter control. Change-Id: I1d67c9ae475f6cf852c2e0e49bacfc82a5e484fd
* | | | Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-devMarco Nelissen2012-08-242-3/+15
|\ \ \ \
| * | | | Allow directly setting a DataSource for NuMediaExtractorMarco Nelissen2012-08-242-3/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds NuMediaExtractor::setDataSource(const sp<DataSource> &source), which some new code under frameworks/av will use to let applications provide a custom data source for extractors. Change-Id: I8fb743441d04b4eadbda3c2d76858c3d60e2a3b2
* | | | Merge "Add a missing NULL check." into jb-mr1-devJohn Grossman2012-08-241-1/+2
|\ \ \ \
| * | | | Add a missing NULL check.John Grossman2012-08-231-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't crash if its time to start the next media player in a media player chain, but the current player's client has a NULL mAudioOutput, as is the case when the low level player implements MediaPlayerHWInterface. Change-Id: If555da3a46960cbee91ff26e5b1fd05e52c8ef28
* | | | am 07315f82: am 4b60ac04: Merge "Fixed redefinition of \'i\' with a ↵Jean-Baptiste Queru2012-08-241-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | different type error" * commit '07315f8262f843f3624c70974642e4fb733a661c': Fixed redefinition of 'i' with a different type error
| * | | am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"Jean-Baptiste Queru2012-08-231-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '4b60ac04a878eaf8344b56189509ccd6925855c2': Fixed redefinition of 'i' with a different type error
generated by cgit v1.1 at 2025-02-03 17:20:29 +0000