summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 "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
| * | | | | camera_client: refactor Camera/ProCamera commonalities into BasicCameraIgor Murashkin2013-02-2611-357/+464
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie10a4094522d49683657665fe94ab0b7ccd280e9
| * | | | | am ceb388d6: CameraService and Stagefright: Support AppOpsEino-Ville Talvala2013-02-2626-78/+388
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit 'ceb388d6c03c38b96dc41c0ea4804b749aa077c4': CameraService and Stagefright: Support AppOps
| * | | | | Merge "Handles duplicated NAL start code to fix crash on HLS streams."Andreas Huber2013-02-251-1/+1
| |\ \ \ \ \
| | * | | | | Handles duplicated NAL start code to fix crash on HLS streams.Insun Kang2013-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some youtube live streams are encoded having duplicated NAL start code, for instance, 00 00 01 00 00 00 01 .... In previous code, zero NAL size causes crash by CHECK_GT(nalsize, 0) macro. With this patch, duplicated NAL start code will be just ignored. TESTED=Played problematic Youtube Live streams. Change-Id: I1d76f111a34bd29cb09b037eb1b0626fe5f5b140
* | | | | | | Merge "Revert "Logging to investigate a crash"" into jb-mr2-devGlenn Kasten2013-02-272-17/+1
|\ \ \ \ \ \ \
| * | | | | | | Revert "Logging to investigate a crash"Glenn Kasten2013-02-272-17/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | This reverts commit f0ff908da019a44115109f1b4d1b6864b35a8a29.
* | | | | | | am 801726ef: Merge "MPEG4Writer: Write a zero-length compressor string"Andreas Huber2013-02-271-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | * commit '801726efb2dcc6ea19e9f55c7c43fe41f0c6643e': MPEG4Writer: Write a zero-length compressor string
| * | | | | Merge "MPEG4Writer: Write a zero-length compressor string"Andreas Huber2013-02-271-1/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | MPEG4Writer: Write a zero-length compressor stringMartin Storsjo2013-01-311-1/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first byte is the number of bytes in the string to display, the rest is the actual string (see ISO/IEC 14496-12:2008 page 29, compressorname in VisualSampleEntry) to display. Currently, all 31 space characters are displayed in certain players (such as Apple QuickTime Player) instead of the plain codec name (e.g. "H.264"). By writing the string length properly, the actual content of the remaining 31 bytes is ignored instead of displayed. Change-Id: I7f93a8966d74a4e86abc46c3dcb70f71780d9cd6
* | | | | CameraService and Stagefright: Support AppOpsEino-Ville Talvala2013-02-2526-78/+388
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera: - Signal to AppOpsService when camera usage starts and stops - Listen to permissions revocations and act on them - Currently just kill camera connection when permissions lost Stagefright: - Pass on client name, UID to camera as needed Bug: 8181262 Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
* | | | Merge "Update tee sink"Glenn Kasten2013-02-236-32/+164
|\ \ \ \
| * | | | Update tee sinkGlenn Kasten2013-02-226-32/+164
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement rotation to reduce long-term storage use. Implement optional per-track tee. Dynamically enable at runtime based on property, instead of at compile-time. Dynamic frame count not yet implemented. Bug: 8223560 Change-Id: I3706443c6ec0cb0c6656dc288715a02ad5fea63a
* | | | ProCamera: Fix waitForFrameBuffer not handling multiple outstanding framesIgor Murashkin2013-02-223-13/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the CpuConsumer triggered multiple onFrameAvailable callbacks in between a single waitForFrameBuffer call, the old code would only handle 1 callback. This meant on two subsequent waitForFrameBuffer calls the second would always timeout when two buffers were already available to be unlocked. Bug: 8238112 Change-Id: Ibefca35005ac5c408e5ada97ec4a4344a9e3e497
* | | | ProCamera: add waitForFrameBuffer/waitForFrameResult blocking callsIgor Murashkin2013-02-223-23/+304
| | | | | | | | | | | | | | | | Change-Id: I851d41aeecaa15245d5b9d622132e8706d6e292c
* | | | Camera: ProCameraTests: clean up a bit, still needs more cleanupIgor Murashkin2013-02-221-79/+116
| | | | | | | | | | | | | | | | Change-Id: Ia7e18c81002c8d98176f21553cf13cbd13cfdf5d
* | | | ProCamera: Add getInfo for getting static metadata (and a test)Igor Murashkin2013-02-227-6/+103
| | | | | | | | | | | | | | | | Change-Id: I3b87dfbc621d98bf41f37a892a1012baf85b5166
* | | | Camera: ProCamera - implement onResultReceived callback for metadata callbacksIgor Murashkin2013-02-2210-20/+474
| | | | | | | | | | | | | | | | Change-Id: I46775402b007244bc383d6343a620eebbd492aad
* | | | Camera: ProCameraTests - add CpuConsumer tests for dual streamsIgor Murashkin2013-02-221-2/+166
| | | | | | | | | | | | | | | | Change-Id: Ia010450dc79ac2841645b8c2e1553c9ec74ee5e3
* | | | Camera: ProCamera - add createStreamCpu and unit testIgor Murashkin2013-02-224-63/+316
| | | | | | | | | | | | | | | | Change-Id: I468172dbfdd78510b273bf9d119c950cbeda7ea3
* | | | Camera: Change ProCamera to take IGraphicBufferProducerIgor Murashkin2013-02-225-17/+30
| | | | | | | | | | | | | | | | Change-Id: Iec62eead6d179aa5486f7719143340976bb76e7d
* | | | Camera: ProCamera2Client implement createStream,createDefaultRequestIgor Murashkin2013-02-222-15/+54
| | | | | | | | | | | | | | | | | | | | | | | | The StreamingImage unit test should now work when TEST_DISPLAY_SECS is set. Change-Id: I9cf3ad5bd5a76096ab21bd39e631d636c4ff3d3f
* | | | Camera: ProCamera2Client - add createStream (service is stubbed) and unit testIgor Murashkin2013-02-229-56/+736
| | | | | | | | | | | | | | | | Change-Id: I1ae7ba9b24f5883c214c19a7ed0eaf0c802d69c1
* | | | Camera: ProCamera - add createStream stub and unit test for itIgor Murashkin2013-02-223-1/+220
| | | | | | | | | | | | | | | | Change-Id: Ic05130e63f4f2c0c3278ba348b192992169f105f
* | | | Camera: ProCameraTests - add asynchronous locking unit testIgor Murashkin2013-02-221-5/+41
| | | | | | | | | | | | | | | | Change-Id: Ib79eb84046c9ed898bfb086a6600265fc351924c
* | | | Camera: ProClient add asynchronous locks and suchIgor Murashkin2013-02-226-6/+234
| | | | | | | | | | | | | | | | Change-Id: I551e5e5e76d9be733fab5224beaa7309268c0f38
* | | | Camera: Add ProCamera private binder interface for an API2-light functionalityIgor Murashkin2013-02-2214-56/+1434
| | | | | | | | | | | | | | | | Change-Id: I2af7a807c99df75ea659e6e6acc9c4fca6a56274
* | | | Camera: Add unit test infrastructure for libcameraclientIgor Murashkin2013-02-225-3/+70
| | | | | | | | | | | | | | | | Change-Id: I957538663ae8332d26f3640c63a75efc79f4ac5c
* | | | Camera: Add exists function to CameraMetadataIgor Murashkin2013-02-222-0/+11
| | | | | | | | | | | | | | | | Change-Id: I081f61417fca7c8408e9e767129647ddce5364ab
* | | | Camera: Move CameraMetadata.h from service to client libraryIgor Murashkin2013-02-2215-23/+23
|/ / / | | | | | | | | | Change-Id: I940ce86f318f37ae5b73f912a6e589415150125f