summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 00bbca96: Merge "Don\'t even try to verify the native resolution validity ↵Andreas Huber2013-05-021-2/+11
|\ | | | | | | | | | | | | a" into jb-mr2-dev * commit '00bbca96684cb995458fedd2e1f9dec5f047100b': Don't even try to verify the native resolution validity a
| * Merge "Don't even try to verify the native resolution validity a" into ↵Andreas Huber2013-05-021-2/+11
| |\ | | | | | | | | | jb-mr2-dev
| | * Don't even try to verify the native resolution validity aAndreas Huber2013-05-011-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | miracast sink advertises, even if it were valid we couldn't use it since it's not consistently implemented by sinks. Change-Id: Ibee6b3e23b5a55270fc3c419a581e2626530e3af related-to-bug: 8772006
* | | am de6bf9cc: Merge "Fix miracast source code to ignore the encoder output ↵Andreas Huber2013-05-021-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | format change" into jb-mr2-dev * commit 'de6bf9cc0fd94452ffcd6685e1469092db74a454': Fix miracast source code to ignore the encoder output format change
| * | Merge "Fix miracast source code to ignore the encoder output format change" ↵Andreas Huber2013-05-021-0/+7
| |\ \ | | | | | | | | | | | | into jb-mr2-dev
| | * | Fix miracast source code to ignore the encoder output format changeAndreas Huber2013-05-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it doesn't care about. Change-Id: Iec1594775a98b0c1aba662cc9f08652d2f8d4805 related-to-bug: 8616651
* | | | am bf2bb00e: Merge "Fix reverb at 48kHz" into jb-mr2-devEric Laurent2013-05-011-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'bf2bb00e29f69b0de1cde8d31a6f1431d984388b': Fix reverb at 48kHz
| * | | Merge "Fix reverb at 48kHz" into jb-mr2-devEric Laurent2013-05-011-6/+6
| |\ \ \ | | |/ / | |/| |
| | * | Fix reverb at 48kHzEric Laurent2013-05-011-6/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LVM reverb wrapper had a test to only accept input sampling rate of 44.1 kHz. As the LVM reberb engine supports multiple sampling rate we can remove this test. The fix for issue 8512027 (commit 2a9c5cd4) caused a regression because the framework now checks the return code of the effect configure command and ignores subsequent commands in case of error. Bug: 8630044 Change-Id: I3146871f1ad8f7945a2e63ea763dd7b87368337d
* | | am deff6910: Merge "Support MediaCodec::getOutputFormat for encoders" into ↵Andreas Huber2013-05-013-85/+265
|\ \ \ | |/ / | | | | | | | | | | | | | | | jb-mr2-dev * commit 'deff69107566cfe76dc33eff1b4250893956a244': Support MediaCodec::getOutputFormat for encoders
| * | Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-devAndreas Huber2013-05-013-85/+265
| |\ \
| | * | Support MediaCodec::getOutputFormat for encodersAndreas Huber2013-04-303-85/+265
| | |/ | | | | | | | | | | | | | | | | | | codec specific data is provided as part of the MediaFormat if available. Change-Id: I5a79c936e2411fe66ebc694791071faefc33941e related-to-bug: 8616651
* | | am 3c7c39af: Merge "Camera3: Add missing buffer listener include (for ZSL)" ↵Igor Murashkin2013-05-011-0/+48
|\ \ \ | |/ / | | | | | | | | | | | | | | | into jb-mr2-dev * commit '3c7c39afbc8931ef2cec1bed3c477a19c139f87e': Camera3: Add missing buffer listener include (for ZSL)
| * | Merge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-devIgor Murashkin2013-05-011-0/+48
| |\ \
| | * | Camera3: Add missing buffer listener include (for ZSL)Igor Murashkin2013-05-011-0/+48
| | | | | | | | | | | | | | | | | | | | Bug: 8563838 Change-Id: Ie053655f5583d20003abdabccee68980d7cdcbfd
* | | | am d24b0653: Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-devIgor Murashkin2013-05-0124-93/+2759
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * commit 'd24b0653c7620e07e92308c05b41f7df9943f83b': Camera3: Add ZSL stream support camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames Camera3: Add input stream support
| * | | Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-devIgor Murashkin2013-05-0124-93/+2759
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | * changes: Camera3: Add ZSL stream support camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames Camera3: Add input stream support
| | * | Camera3: Add ZSL stream supportIgor Murashkin2013-04-2919-66/+1751
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8563838 Change-Id: I2feda142ff5172aba17ade5c8d502f9bb5d5b766
| | * | camera: Add new RingBufferConsumer to keep a ring buffer of acquired framesIgor Murashkin2013-04-293-1/+537
| | | | | | | | | | | | | | | | | | | | Bug: 8563838 Change-Id: I5a95e0be94e5388b30639905efae42d3c3279f72
| | * | Camera3: Add input stream supportIgor Murashkin2013-04-267-28/+473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Untested with actual CAMERA3_STREAM_INPUT streams. Bug: 8629088 Change-Id: Ia0c21ef0a2c951e401ea8babd15d3cceb4bb25a1
* | | | am d8c7ad1c: Camera: Don\'t complain repeatedly about missing ↵Igor Murashkin2013-04-302-4/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | android.led.availableLeds * commit 'd8c7ad1cbc2e6830560a085380a5828cc3d41010': Camera: Don't complain repeatedly about missing android.led.availableLeds
| * | | Camera: Don't complain repeatedly about missing android.led.availableLedsIgor Murashkin2013-04-302-4/+6
| | |/ | |/| | | | | | | | | | Bug: 8765726 Change-Id: I78f5f98315068aaad3a39d56698b9c8a18cc8f4a
* | | am b7e2ef14: Merge "ProCamera: Add security permission checks for disabling ↵Igor Murashkin2013-04-263-0/+82
|\ \ \ | |/ / | | | | | | | | | | | | | | | transmit LED" into jb-mr2-dev * commit 'b7e2ef14a93974935783e71829f4b3174001a0fb': ProCamera: Add security permission checks for disabling transmit LED
| * | Merge "ProCamera: Add security permission checks for disabling transmit LED" ↵Igor Murashkin2013-04-273-0/+82
| |\ \ | | | | | | | | | | | | into jb-mr2-dev
| | * | ProCamera: Add security permission checks for disabling transmit LEDIgor Murashkin2013-04-253-0/+82
| | | | | | | | | | | | | | | | | | | | Bug: 8554573 Change-Id: Ie909908a4cab3700bd622282e8342e8fa5b72376
* | | | am a307beb6: Merge "Camera2: Fix deadlock on shutdown due to client getting ↵Eino-Ville Talvala2013-04-2611-149/+263
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | killed." into jb-mr2-dev * commit 'a307beb68ac08d59525bbcb37ffb56bb3d4728c9': Camera2: Fix deadlock on shutdown due to client getting killed.
| * | | Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into ↵Eino-Ville Talvala2013-04-2711-149/+263
| |\ \ \ | | | |/ | | |/| | | | | jb-mr2-dev
| | * | Camera2: Fix deadlock on shutdown due to client getting killed.Eino-Ville Talvala2013-04-2611-149/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the binder connection dies and is the only holder of a strong pointer to the Camera2Client, disconnect is called from the destructor. At this point, all weak pointers to Camera2Client are no longer promotable, and lots of cleanup code paths are broken as a result. Rework all such code paths to not need the client pointer, and to discard image buffers that arrive during shutdown. Bug: 8696047 Change-Id: Ic0672ecde7c1baaf65079f925a45bd5be45f1fb3
* | | | am dd309b97: Merge "Handle the case where an asynchronous prepare was ↵Andreas Huber2013-04-252-0/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | initiated and then" into jb-mr2-dev * commit 'dd309b97f3e30cb8ab30892b4bf6b5d824853a86': Handle the case where an asynchronous prepare was initiated and then
| * | | Merge "Handle the case where an asynchronous prepare was initiated and then" ↵Andreas Huber2013-04-252-0/+23
| |\ \ \ | | | | | | | | | | | | | | | into jb-mr2-dev
| | * | | Handle the case where an asynchronous prepare was initiated and thenAndreas Huber2013-04-252-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mediaplayer was reset. Change-Id: Ib241747c5dc002b88a3854569c1f8340b2a8ef41 related-to-bug: 8688986
* | | | | am 8d2d4932: audioflinger: fix duplicating track sampling rateEric Laurent2013-04-251-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8d2d4932b96632e9eb3af4a3d4000192ef603960': audioflinger: fix duplicating track sampling rate
| * | | | audioflinger: fix duplicating track sampling rateEric Laurent2013-04-251-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing initialization of client proxy sampling rate and volumes in OutputTrack constructor. Bug: 8687522 Change-Id: I813e700315bb97083a63dd32279f1998ac775483
* | | | am 0dbff625: Merge "Fix overflow of rand in ARTPConnection"Andreas Huber2013-04-241-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '0dbff625c3128962b48f3476ceacb3ac80a3f421': Fix overflow of rand in ARTPConnection
| * \ \ \ Merge "Fix overflow of rand in ARTPConnection"Andreas Huber2013-04-241-1/+2
| |\ \ \ \
| | * | | | Fix overflow of rand in ARTPConnectionYajun Zeng2013-04-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without this fix, (rand()*1000)/RAND_MAX is mainly 0. Change-Id: I48ae940a7b6974b197d81732774c9dcea107bcf1 Signed-off-by: Yajun Zeng <beanz@marvell.com>
* | | | | | am 628a8c0e: Merge "fix a race condition of MediaPlayerServce::Client::mClient"Andreas Huber2013-04-241-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '628a8c0ed91531468f5c615fea8745f63cc812aa': fix a race condition of MediaPlayerServce::Client::mClient
| * | | | | Merge "fix a race condition of MediaPlayerServce::Client::mClient"Andreas Huber2013-04-241-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix a race condition of MediaPlayerServce::Client::mClientbeanz2012-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there will be race condition between mClient.clear in MediaPlayerServce::Client::disconnect method and c=client->mClient in in MediaPlayerServce::Client::notify method Change-Id: I767294c4cb864c08e9c0e9f23d6d304a39016205 Signed-off-by: beanz <beanz@marvell.com>
* | | | | | am 7f86d983: Merge "Remove all traces of wifi display sink implementation ↵Andreas Huber2013-04-2426-6049/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | and supporting code." into jb-mr2-dev * commit '7f86d98317843838c4a5248c733bf95f9574fcab': Remove all traces of wifi display sink implementation and supporting code.
| * | | | | Merge "Remove all traces of wifi display sink implementation and supporting ↵Andreas Huber2013-04-2426-6049/+4
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | code." into jb-mr2-dev
| | * | | | Remove all traces of wifi display sink implementation and supporting code.Andreas Huber2013-04-2326-6049/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64b681b7e3df1ef0dd80c0d261cacae293d5e684 related-to-bug: 8698812
* | | | | | am 5e437722: Merge "Camera3: Register all stream buffers at stream ↵Eino-Ville Talvala2013-04-231-0/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration time." into jb-mr2-dev * commit '5e43772296d7c5b8faf4b0ce4efe68778729bc74': Camera3: Register all stream buffers at stream configuration time.
| * | | | | Merge "Camera3: Register all stream buffers at stream configuration time." ↵Eino-Ville Talvala2013-04-231-0/+22
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | into jb-mr2-dev
| | * | | | Camera3: Register all stream buffers at stream configuration time.Eino-Ville Talvala2013-04-191-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While registering them later would be nice for startup time, current hardware will have to reinitialize everything, resulting in glitches. Bug: 8657740 Change-Id: I1ed1f0a65d648f219f5228c8df15ffcf2a4b272e
* | | | | | am 3030f344: Merge "Fixed the wrong timestamps issue about camera recording"Marco Nelissen2013-04-221-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit '3030f344e77d14cf688c34f79c83a045c888825d': Fixed the wrong timestamps issue about camera recording
| * | | | | Merge "Fixed the wrong timestamps issue about camera recording"Marco Nelissen2013-04-221-1/+1
| |\ \ \ \ \
| | * | | | | Fixed the wrong timestamps issue about camera recordingJun Tian2013-04-221-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On emulator, the camera video recording crashes randomly. It's caused by wrong timestamp when encoding the video frame. The element of the vector is erased before accessing it. Therefore, when reading the timestamp from the element, the memory of the element has been changed. Change-Id: I9750417fbb9dc4697ccae1e78e286b23925d3764 Signed-off-by: Panfeng Chang <panfengx.chang@intel.com> Signed-off-by: Jun Tian <jun.j.tian@intel.com>
* | | | | | am 4613b7e3: Merge "3rd time\'s the charm, right? Fix another instance where ↵Andreas Huber2013-04-222-26/+29
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodec would" into jb-mr2-dev * commit '4613b7e38b1830535cbf00e962afdfa5fe1308ba': 3rd time's the charm, right? Fix another instance where MediaCodec would
| * | | | | Merge "3rd time's the charm, right? Fix another instance where MediaCodec ↵Andreas Huber2013-04-222-26/+29
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | would" into jb-mr2-dev
generated by cgit v1.1 at 2024-09-29 08:21:20 +0000