summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Camera: Make ProCamera connect take the same paths as Camera connectIgor Murashkin2013-03-114-164/+130
| | | | | | | | * ProCamera uses the app ops manager * Refactored connect calls to be as common as possible * Removed some useless not implemented function calls in ProClient Change-Id: I5dab30d20f0c202a494a07b2cfe4c1fa04a2a076
* (Camera)ProCamera: Remove unused functions from binder interfaceIgor Murashkin2013-03-1112-199/+51
| | | | Change-Id: I0582268cef6e84b630bc87c8a03dcd69d54c440d
* (Camera)FrameProcessor: Refactor to share code with ProFrameProcessorIgor Murashkin2013-03-1111-203/+106
| | | | Change-Id: Ie8cd0df7caf83f9d0134f560ae31ab72f2f7d1fc
* CameraService: Refactor Camera2Client to share a base with ProCameraClientIgor Murashkin2013-03-1115-470/+583
| | | | Change-Id: I249e2a0fc47ae84f29c9d9c4a223fba13da3ee66
* Merge "Increase size of statistics buffer" into jb-mr2-devGlenn Kasten2013-03-111-1/+1
|\
| * Increase size of statistics bufferGlenn Kasten2013-03-111-1/+1
| | | | | | | | | | Bug: 8354576 Change-Id: I327e9dc203e09df8abc21e589ce9056540618abd
* | am c5604b08: am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: ↵Jean-Baptiste Queru2013-03-110-0/+0
|\ \ | |/ |/| | | | | | | (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c5604b081b6cac558ed94dce88dedf1a467185b7':
| * am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) ↵Jean-Baptiste Queru2013-03-110-0/+0
| |\ | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not merge * commit '0fe40641db3759088edc1bc7f0182556d77bede6':
| | * am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with ↵Jean-Baptiste Queru2013-03-110-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit '72c7cf9d13f5a51a71dccc6d94317727bd0feec3':
| | | * am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release ↵Jean-Baptiste Queru2013-03-110-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit 'a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c':
| | | | * am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\ | | | |/ / | | | | | | | | | | * commit '56f387a4a8f319f3e6080b5e5963a4b177053cbe':
| | | | * Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\
* | | | | \ Merge "Clean up the native code to match Java update" into jb-mr2-devztenghui2013-03-083-12/+33
|\ \ \ \ \ \
| * | | | | | Clean up the native code to match Java updateztenghui2013-03-083-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add flags to match the java side change. 2. Update the interface. bug:7991013 Change-Id: I8ffe84c466b2a68e2e1e48b35b78db9e44640265
* | | | | | | Merge "Disable our fancy logic to respect both sink and source's native ↵Andreas Huber2013-03-074-21/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | formats" into jb-mr2-dev
| * | | | | | | Disable our fancy logic to respect both sink and source's native formatsAndreas Huber2013-03-074-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since it isn't actually supported by anything in the field. Change-Id: I9cd038d7631105de26303312ca87c472d67034d4
* | | | | | | | Merge "Camera: Log warning on out-of-range face detect scores" into jb-mr2-devAlex Ray2013-03-071-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Camera: Log warning on out-of-range face detect scoresAlex Ray2013-03-061-0/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7368364 Change-Id: I7b1e995dd15e87c816b89ccf9968a222fd66d140
* | | | | | | | The transport stream HDCP descriptor belongs in the program_info sectionAndreas Huber2013-03-074-30/+70
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of being included in the per-stream descriptors Change-Id: If5251c0c02456646e2fdbb5e62acf66c356cf13e
* | | | | | | Merge "Correct MediaCodec + Surface behavior" into jb-mr2-devAndy McFadden2013-03-067-41/+74
|\ \ \ \ \ \ \
| * | | | | | | Correct MediaCodec + Surface behaviorAndy McFadden2013-03-057-41/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assorted tweaks: - Allow signalEndOfInputStream() before ACodec is in Executing state (added message to two more states). - Return an error if signalEndOfInputStream() is called a second time on the same stream. - Require AndroidOpaque color format in createInputSurface(). - Disallow dequeueInputBuffer() after an input surface has been created (boolean flag in MediaCodec tracks it). - Discard input surface when encoder is re-configure()ed (drop OMXNodeInstance's ref when we go back to Loaded). Bug 7991062 Change-Id: Iff30f3036e14eb5a2f6536910dcf11aba33031ee
* | | | | | | | Merge "Add template class SingleStateQueue" into jb-mr2-devGlenn Kasten2013-03-066-1/+272
|\ \ \ \ \ \ \ \
| * | | | | | | | Add template class SingleStateQueueGlenn Kasten2013-03-056-1/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If7e2bc9b2a216524ee9cbb68682e2634933b4973
* | | | | | | | | Merge "Squashed commit of the following:" into jb-mr2-devAndreas Huber2013-03-0535-3177/+4317
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Squashed commit of the following:Andreas Huber2013-03-0535-3177/+4317
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit e5919b1f57ea61fa1d380dfdb4e3e832ce73d79d Author: Andreas Huber <andih@google.com> Date: Wed Feb 27 16:38:48 2013 -0800 Configure TCP datagram sockets to be TCP_NODELAY. Change-Id: Ia724a81e6e27dccd00ac84603e712d69ca77a0cd commit 1b52b393183db8a6dc000a7c31baac544ccfc50c Author: Andreas Huber <andih@google.com> Date: Wed Feb 27 14:26:01 2013 -0800 Send IDR frame requests on packet loss. Change-Id: I53b7fb85cbd6923491113b93ec3e2175726d654a commit 68d76b4b3a0181b30abc57cd2915273210530a6d Author: Andreas Huber <andih@google.com> Date: Tue Feb 26 15:12:34 2013 -0800 Revive TunnelRenderer Change-Id: I8c5a9d982793b1c5b841c828227b354f1dab618c commit 3df28a8e9d8bcdc1430016bb088d097eca653b56 Author: Andreas Huber <andih@google.com> Date: Tue Feb 26 13:53:14 2013 -0800 Disable suspension of video updates. Change-Id: I7e3a16b8d7dd7a55d9f962a2236388931f664106 commit 2ec7a79de019a26ec415016c1478afd762f069cd Author: Andreas Huber <andih@google.com> Date: Tue Feb 26 08:54:40 2013 -0800 Adds an SNTP client to wfd. Change-Id: Icd7d6104e951e1443e4c1b81ccf6b3731d79d3ec commit c81c3bb5725bb4079a4d7fb02151ad0bb540632f Author: Andreas Huber <andih@google.com> Date: Mon Feb 25 10:00:58 2013 -0800 Squashed commit of the following: commit b83a4ec96659ef6f6b7c2090fdd866abe3ab78ba Author: Andreas Huber <andih@google.com> Date: Mon Feb 25 09:28:11 2013 -0800 Some reorganization of the rtp code, renamed StreamHub -> MediaSender Change-Id: I8cf67444960e60426bf74880af1acce41e8b2fef commit 7769cbd739f2a67c58e0c6a7b1a21a12210c7c4d Author: Andreas Huber <andih@google.com> Date: Fri Feb 22 16:12:18 2013 -0800 Choose a smaller MTU to avoid fragmented IPv4 packets, fix AVC assembler. Change-Id: I274b3cc1483c4e9f4d146dbf9f3d9f7557ef7ef9 commit 1f687ee80a88b56d614c2cf408ff729114ff86a0 Author: Andreas Huber <andih@google.com> Date: Fri Feb 22 11:38:31 2013 -0800 better reporting. Change-Id: I67f0bb51f106ea77f5cc75938b053c8e8e8f688e commit 7950c1cd59213eb5f281fcde44a772ecffae473d Author: Andreas Huber <andih@google.com> Date: Fri Feb 22 09:07:41 2013 -0800 stuff Change-Id: Ib99416366d3eec6e6ad69b4d791a8a9408410f3b commit 33c09045b0f86fcaa4619cbd679b47a074f71231 Author: Andreas Huber <andih@google.com> Date: Thu Feb 21 15:54:01 2013 -0800 Render frames according to their timestamps. Change-Id: I8143a95cffe775799d6a4bb093558bd7abb1f063 commit d8b6daae2160bf1c016d7c6251256b46bb89db42 Author: Andreas Huber <andih@google.com> Date: Thu Feb 21 15:01:27 2013 -0800 Better packet-lost logic. Change-Id: I611eee5a42bd089638cf45b0e16f628ff2a955ab commit 782c6b15717e2d062d96665a089d06c0577733d0 Author: Andreas Huber <andih@google.com> Date: Wed Feb 20 15:06:47 2013 -0800 Add a dedicated looper for the MediaReceiver Change-Id: I3b79cad367fb69c9a160a8d009af8c5f5142b98e commit 4c7b8b10861674b773270103bcabd1a99486a691 Author: Andreas Huber <andih@google.com> Date: Wed Feb 20 14:30:28 2013 -0800 Tweaks to RTPSender and RTPReceiver Change-Id: Ib535552f289a26cfead6df8c63e4c63d3987d4e9 commit 39226b28177a816cda5c67b321745d396b18277d Author: Andreas Huber <andih@google.com> Date: Tue Feb 19 08:48:25 2013 -0800 Playing around with non muxed delivery Change-Id: I845375f6938d04bc30502840c2ceb7688dc9b237 commit c16d21de75d8ecdbcd9abce14934afe484970061 Author: Andreas Huber <andih@google.com> Date: Wed Feb 13 14:43:35 2013 -0800 A more solid base for RTP communication. Change-Id: I52033eeb0feba0ff029d61553a821c82f2fa1c3f Change-Id: I57e3bcfc1c59a012b15aaaa42ed81f09c34c26bb Change-Id: I4b09db4a44d0eeded7a1658f6dc6c97d4b8be720
* | | | | | | | Merge "Implement Surface input to MediaCodec." into jb-mr2-devAndy McFadden2013-03-0515-20/+1148
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Implement Surface input to MediaCodec.Andy McFadden2013-03-0415-20/+1148
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, renamed a CHECK_INTERFACE macro that was clashing with the Binder version. Bug 7991062 Change-Id: If5e6ed0a06d9f67975497676e4b05abe3aa3d6c0
* | | | | | | Merge "Miscellaneous cleanup" into jb-mr2-devGlenn Kasten2013-03-048-24/+17
|\ \ \ \ \ \ \
| * | | | | | | Miscellaneous cleanupGlenn Kasten2013-03-048-24/+17
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Abbreviation framesReady to fRdy for new systrace. Put inline const on one line. Use local copy of mState in state. Improve logging. Line length 100. Change-Id: I8201c3ce0e53fd464fd33d02544e52c342d40b68
* | | | | | | Modified udptest to sync time across devices.Andreas Huber2013-03-041-52/+92
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ib055cd8ab5931395907d017331e27f5d781d7019
* | | | | | Merge "media.log cleanup" into jb-mr2-devGlenn Kasten2013-03-027-40/+24
|\ \ \ \ \ \
| * | | | | | media.log cleanupGlenn Kasten2013-03-017-40/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove almost all of the specific logs, but leave the media.log logging infrastructure in place for the next time we need it. Re-apply a few good changes that were reverted earlier: - check logf format vs. argument list compatibility - distinguish potentially modified and actually modified tracks in FastMixer - fix benign bug where sq->end() was called more than once - fix a build warning Bug: 6490974 Change-Id: I02d3e83646c738acaebb415bd0d6b548638b4ef5
* | | | | | | am c0048178: Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen2013-03-011-1/+16
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'c0048178a1d312e7e05557ba99becd6a89b9e97a': Avoid invalid memory access when using extractMetadata()
| * | | | | | Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen2013-03-011-1/+16
| |\ \ \ \ \ \
| | * | | | | | Avoid invalid memory access when using extractMetadata()Sangkyu Lee2013-02-281-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BpMediaMetadataRetriever::extractMetadata() returns a string which is returned by readCString() function of the reply parcel object. However, the parcel object is destroyed at the end of the extractMetadata() function, and so the returned pointer is invalid. This patch fixes this problem by storing the metadata string value. Change-Id: I2a2ccba78246175b2845a237679d6cebe881e83b Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
* | | | | | | | Merge "Remove tee sink debugging at compile time" into jb-mr2-devGlenn Kasten2013-03-016-23/+70
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Remove tee sink debugging at compile timeGlenn Kasten2013-02-266-23/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8223560 Change-Id: Iddbfb06c45d43d9f20bb428215dd4094931e19a7
* | | | | | | | Merge changes I25423a2b,I24680f1a into jb-mr2-devIgor Murashkin2013-03-0114-22/+668
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: ProCamera: Add CpuConsumer asynchronous mode support Camera: Drop ProCamera connections when a Camera connection happens
| * | | | | | | | ProCamera: Add CpuConsumer asynchronous mode supportIgor Murashkin2013-02-283-3/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8290146 Bug: 8291751 Change-Id: I25423a2b8a70ac7169911b1c7b482aa17190fe0f
| * | | | | | | | Camera: Drop ProCamera connections when a Camera connection happensIgor Murashkin2013-02-2813-19/+587
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also adds an ICameraServiceListener with available/not available statuses Bug: 8291653 Change-Id: I24680f1a2dc109510caf451cf7c7bd180b670d84
* | | | | | | | | Merge "ProCameraTest: Drop frames test move processing delay between ↵Igor Murashkin2013-03-011-5/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | lock/unlock" into jb-mr2-dev
| * | | | | | | | ProCameraTest: Drop frames test move processing delay between lock/unlockIgor Murashkin2013-02-281-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This makes it more likely to find races with the buffer being unlocked by itself Change-Id: I1fa7dbfb73f60664a02a35678b58bcc9b06893a2
* | | | | | | | | am ceb83b8d: Merge "SoftAMR: Signal the right frame format"Andreas Huber2013-02-271-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ceb83b8d8919dc778402bf610c073987d4f9f89b': SoftAMR: Signal the right frame format
| * | | | | | | | Merge "SoftAMR: Signal the right frame format"Andreas Huber2013-02-271-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | SoftAMR: Signal the right frame formatMartin Storsjo2013-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct enum for the format used is OMX_AUDIO_AMRFrameFormatFSF, which is the same as is used in amrnb/enc/SoftAMRNBEncoder.cpp, amrwbenc/SoftAMRWBEncoder.cpp and in OMXCodec and ACodec. The OMX_AUDIO_AMRFrameFormatConformance enum refers to an odd file format only used for conformance tests, not used in the wild. Change-Id: Idc395fc1d4969e33453522d6ec6526876438c526
* | | | | | | | | | am ccf51ec4: Merge "SoftVorbis: Set the right encoding in the port definition"Andreas Huber2013-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | | * commit 'ccf51ec41652a7e2db8cbee37bca91a95908d5ff': SoftVorbis: Set the right encoding in the port definition
| * | | | | | | | Merge "SoftVorbis: Set the right encoding in the port definition"Andreas Huber2013-02-271-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | SoftVorbis: Set the right encoding in the port definitionMartin Storsjo2013-01-311-1/+1
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, it set the encoding type to AAC, which is just a typo. Change-Id: I2dcae1f579e9feb0b35b6f5d334028c534275042
* | | | | | | | | Camera: Start of support for version 3.0 of camera device HALEino-Ville Talvala2013-02-2718-247/+881
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactor common CameraDevice interface out of Camera2Device - Initial skeleton only for Camera3Device Change-Id: I097cc76e2ad102a51712ac114235163245f5482c
* | | | | | | | | Merge "camera_client: refactor Camera/ProCamera commonalities into ↵Igor Murashkin2013-02-2712-358/+465
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BasicCamera" into jb-mr2-dev
generated by cgit v1.1 at 2024-11-12 11:08:09 +0000