summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Unifying TimedTextDriver's resume() and start().Insun Kang2012-08-022-23/+20
| | | | | | (cherry picked from gtv bb23a2b7e06c59f56e353fd4a2a66a9b8179d425) Change-Id: If5f14549fa315c34e32d6fed7c1ea09deabceb63
* Fix: status checking in TimedTextDriver.Insun Kang2012-08-023-32/+84
| | | | | | | | | | | o fixes seeking error when there's no enabled text track. o clean up status checking code for deselectTrack. o fixes a potential bug : pause->backward seek can trigger unwanted resume. Bug: 6682160 Change-Id: I03d8788b27fb9c0a6092be83ad3578ccf3266905 (cherry picked from commit 2dafb6071d4f14e0e208912500694912211aa26b)
* Adds resume() functionInsun Kang2012-08-024-13/+52
| | | | | | | | o Revived resume() function to fix pause/resume bug. (Bug: 6663740) o Mannually cherry-picked from GTV change. (commit: ad1197226d1c6745959f0e469f510ca06f99489f) Change-Id: I77ac90085fb1f1d2e7eb706642978a4fa4d28b49
* Adjust fire time of a timed text message before firing it.Insun Kang2012-08-022-18/+40
| | | | | | | | | | related-to-bug: 6501328 o When Video/Audio is stuttering, subtitle's firing time should be adjusted. Change-Id: I0e7e8a1796cb2b3c8a09c8fbd41690bce2689e85 (cherry picked from gtv: commit b2c3aedcb6c145e33ded39ef81e3202b2419469f)
* Merge "Shutter sound is heard at the end of the recorded video" into jb-mr1-devEino-Ville Talvala2012-08-011-1/+1
|\
| * Shutter sound is heard at the end of the recorded videoPatric Frederiksen2012-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | On fast hardware, which is more common, the shutter sound is played and recorded before video recording is stopped. Before we call play shutter sound before calling stop recording. With this fix we call play shutter sound after calling stop recording. Change-Id: I06a3e65fd2700f1d2457fea5ff0f64500eac436f
* | Don't wait for presentation complete if terminatedGlenn Kasten2012-08-011-6/+6
| | | | | | | | Change-Id: Ia04cf6c620693457dca87b4ffea5dd0fe71efdce
* | Merge "Allows MediaMetadataRetriever to retrieve video rotation angle" into ↵James Dong2012-08-012-0/+8
|\ \ | | | | | | | | | jb-mr1-dev
| * | Allows MediaMetadataRetriever to retrieve video rotation angleJames Dong2012-07-312-0/+8
| |/ | | | | | | | | | | o related-to-bug: 6872687 Change-Id: I34e74b0756f8269edefdf3a25d8806c76fd1e2f8
* | Merge "Start adding support for multiple record tracks" into jb-mr1-devGlenn Kasten2012-08-012-39/+141
|\ \
| * | Start adding support for multiple record tracksGlenn Kasten2012-08-012-39/+141
| |/ | | | | | | | | | | | | | | Replace single mTrack by vector mTracks. Destroy record tracks similarly to playback tracks. Dump all record tracks, in addition to the active record track. Change-Id: I503f10b51928b6b92698fe1c51a9ddd3215df1f4
* | Camera2: Improve formatting of debugging dumpEino-Ville Talvala2012-07-313-6/+16
| | | | | | | | | | Bug: 6243944 Change-Id: Id8730357f3adcd96923132f9f702e296e0dfd357
* | Camera2: Improve threading safetyEino-Ville Talvala2012-07-312-253/+308
|/ | | | | | | | Merge mutex lock for accessing internal parameters with the parameter structure, forcing a lock to be held before the parameters can be accessed. Bug: 6243944 Change-Id: I86e44f395de0d80ff7c3ff3530f25b60015512d2
* Should really compare the pos to the total number of values in get() and ↵James Dong2012-07-301-2/+2
| | | | | | | | set() methods in ListTableEntries class o related-to-bug: 6435176 Change-Id: Ib6f6e598304e7c9becfa6cb3fc925c55b2df2682
* Refactoring how the box table entries are stored in MPEG4WriterJames Dong2012-07-301-193/+228
| | | | | | | | | o Helps drastically reduce the time writing all the box table entries for long duration video recording sessions. Experiments showed that the time is reduced from multiple seconds to less than one second for around 2.5 hours of video recording. Change-Id: I6a696823e2938b76fcf2c73605f51bf5e5c2d749 related-to-bug: 6435176
* Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-devEd Heyl2012-07-294-13/+27
|\ | | | | | | | | | | | | Conflicts: services/audioflinger/AudioFlinger.cpp Change-Id: If27e4ff35de1e182394cc149e1557a49f0f7c95b
| * NuPlayer: Prevents creation of Video Decoder when we use Music PlayerHaynes Mathew George2012-07-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | - Prevents instantion of Video Decoder when we use applications like Music Player which do not support Video Playback - Adds a check to prevent scanning for sources when it is either an Audio only clip or a video only clip or an AV clip played with a Music Player. Change-Id: I74dd9bc53e54fd4f3682536c987289ac252690b0 Signed-off-by: Arvind Thatikonda <arvindt@codeaurora.org>
| * Synchronize access to OMX class member variablesHaynes Mathew George2012-07-201-7/+10
| | | | | | | | | | | | - Protect access to mLiveNodes KeyedVector member variable in freeNode function Change-Id: Ic86844aabc2bc897ffb7fc91cd1f54254f5e29fe
| * am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into ↵Edwin Wong2012-07-170-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit '65e8d62a5b243518795cdafa498df4a49baf6940': Fixed sample video corrupted in MediaCodec mode. Revert input buffer count for the SoftAAC* decoders back to 4. Reduce underruns in screen off, esp. with EQ Added some informational log messages to track down ANR related issues audioflinger: change session check in createTrack. Fix static track activity ref counting Don't allow AudioTrack frameCount to decrease Fix race in AudioTrack destruction AudioFlinger: fix tracks ready for mixing logic. Fix regression in AudioTrack::pause() Fix ToneGenerator regression
| * | Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGEEdwin Wong2012-07-175-24/+19
| | | | | | | | | | | | | | | | | | | | | jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36 Change-Id: I4f08b9c8e9682a998db01c509a390e51bae60c2d related-to-bug: 6732061
| * | libstagefright: dynamically load libstagefright_chromium_httpColin Cross2012-07-027-12/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | dlopen libstagefright_chromium_http to allow it to be on the platform side of the pdk without getting overwritten during a pdk fusion build. Bug: 6772533 Change-Id: I391e81d98beab165c3313bc8a71bb370ebb8584d
| * | am 109347d4: audioflinger: fix regression in attachAuxEffect().Eric Laurent2012-07-021-4/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '109347d421413303eb1678dd9e2aa9d40acf89d2': audioflinger: fix regression in attachAuxEffect().
| * \ \ am 717e1286: audioflinger: fix auxiliary effect attachmentEric Laurent2012-07-012-0/+65
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '717e128691f083a9469a1d0e363ac6ecd5c65d58': audioflinger: fix auxiliary effect attachment
| * | | | Process EBD and FBD messages in ERROR stateHaynes Mathew George2012-06-281-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - OMXCodec::on_message() function drops all OMX messages if OMXCodec is in ERROR state - This can cause EBD/FBD messages containing valid buffers to be dropped - Avoid dropping EBD/FBD messages so that buffer book-keeping is still possible Change-Id: Idc1174b3fa946b26458d49394b87fba1738b228e Signed-off-by: Iliyan Malchev <malchev@google.com>
| * | | | am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into ↵Jamie Gennis2012-06-252-60/+58
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit '33e28dd3c033641f4db9d1b99c7c88d6d08c61f7': SurfaceMediaSource: keep refs to current buffers
| * | | | | Add vendor specific output color formatHaynes Mathew George2012-06-212-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add Qualcomm specific color format support to OMXCodec and ACodec - This is the default color format supported on QCom chipsets Change-Id: Id947b158c3b403c2d347f708bc1e780b4d65e220
| * | | | | am 39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.Andreas Huber2012-06-202-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '39a3113539f9bcc86a8efe562780c23ac8731098': Revert input buffer count for the SoftAAC* decoders back to 4.
| * \ \ \ \ \ am eb15716b: Change definition of warmup periodGlenn Kasten2012-06-151-2/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb15716b59020f342df62bce5b293f0603b94861': Change definition of warmup period
| * \ \ \ \ \ \ am 972af221: FastMixer compensates for SRC jitter in audio HALGlenn Kasten2012-06-151-6/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '972af221ae7253e406e0e1ea853e56a3010ed6b1': FastMixer compensates for SRC jitter in audio HAL
| * \ \ \ \ \ \ \ am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-devJames Dong2012-06-151-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc42e16d96b7e1b18b573f40df1319c56f8ab933': Fix track selection code in AwesomePlayer
| * \ \ \ \ \ \ \ \ am 0a14c4ce: Make CPU frequency statistics optionalGlenn Kasten2012-06-153-4/+24
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a14c4ce1a41bc09eb7855fa531a3af629a69139': Make CPU frequency statistics optional
| * \ \ \ \ \ \ \ \ \ am 362ebcbf: (-s ours) DO NOT MERGE Remove log spam for fast track deniedGlenn Kasten2012-06-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '362ebcbf100f7fccd37551c77e67c4faa7241b63': DO NOT MERGE Remove log spam for fast track denied
* | \ \ \ \ \ \ \ \ \ \ am b3192c5a: Reconcile with jb-releaseThe Android Open Source Project2012-07-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3192c5abf7321cb3437a3aedacd632311634bff':
| * \ \ \ \ \ \ \ \ \ \ \ Reconcile with jb-releaseThe Android Open Source Project2012-07-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab9b19384ab6706f1dfca89f21ffc142f47225a3
| | * \ \ \ \ \ \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-07-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
* | | | | | | | | | | | | | Swap the order of creating IAudioTrack and threadGlenn Kasten2012-07-272-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplifies the error recovery in case IAudioTrack fails. Change-Id: I6aee41a2ac747a5689fb4836b04174e6107bf32f
* | | | | | | | | | | | | | Clean up start() parametersGlenn Kasten2012-07-274-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document where int is used instead of AudioSystem::sync_event_t (probably because of a header file dependency). TrackBase::start() and RecordTrack::start() don't need default parameters. Change-Id: I82f4a4d078be900f3aa4bd926697e32f5ed68ec8
* | | | | | | | | | | | | | Extract methods to enter standby and standby modeGlenn Kasten2012-07-272-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also move initial standby from to threadLoop to avoid a race condition. Change-Id: I65afca83c36fb41b983b3b1d3dab35d4029560e3
* | | | | | | | | | | | | | update to new getDisplayInfo APIMathias Agopian2012-07-252-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie273677e34b9e8475abfa0ae27620d98b3a15b77
* | | | | | | | | | | | | | Merge "Camera2: Use more buffers for video encoding."Eino-Ville Talvala2012-07-252-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Camera2: Use more buffers for video encoding.Eino-Ville Talvala2012-07-252-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid starvation, set the number of simultaneously available buffers to the encoder to 8. Bug: 6243944 Change-Id: I6d0e9f3c0426d62d374c0ae0d427bf5189141adf
* | | | | | | | | | | | | | | Merge "Camera2: Revamp recording support to allow opaque formats."Eino-Ville Talvala2012-07-255-30/+390
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Camera2: Revamp recording support to allow opaque formats.Eino-Ville Talvala2012-07-245-30/+390
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoid memcpy of buffer data by using metadata mode - Temporarily add MediaConsumer BufferQueue class Bug: 6243944 Change-Id: I7a8c4222b7dbd14f1b1d86fda06d38eb640e87c1
* | | | | | | | | | | | | | | Use valueAt instead of editValueAt when possibleGlenn Kasten2012-07-252-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I885b169f4b176a6b5c2ca9a534214b4ffff1700e
* | | | | | | | | | | | | | | effect_descriptor_t const correctnessGlenn Kasten2012-07-257-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad008f20d35a18acf500f773900164552fd0c19e
* | | | | | | | | | | | | | | Fix races in AudioRecord stop()Glenn Kasten2012-07-252-25/+32
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id0ac1915f57fef4a938c7f90989c1162a8b6c51c
* | | | | | | | | | | | | | Codecs: Add MetaDataMode support to software video encoders.Eino-Ville Talvala2012-07-249-17/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This support is needed to enable efficient video recording with emulator and camera HAL 2. - Update SoftAVCEncoder and SoftMPEG4Encoder to support MetaDataMode extension. - Allow CameraSource to handle opaque pixel formats, so that MetaDataMode can be used. - Remove hardware codec restriction for MetaDataMode Bug: 6243944 Change-Id: I970eb3d55542a413b6d75a78f76d3a8583155601
* | | | | | | | | | | | | | Merge "Don't make the decrypted content available to Java applications via ↵James Dong2012-07-231-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaExtractor.java API"
| * | | | | | | | | | | | | | Don't make the decrypted content available to Java applications via ↵James Dong2012-07-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaExtractor.java API Change-Id: I38df6a6be30a34ce3f2640f79784dc94c8ca1158