summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Fix build error when verbose logging is enabledGlenn Kasten2011-12-151-1/+1
| | | | Change-Id: I30f4e5d35d1b24dce2e6152a13fd0fb61414a3e2
* Merge "Update onVideoSizeChanged() callback method Java doc to explicitly ↵James Dong2011-12-071-0/+3
|\ | | | | | | specify the conditions under which the width/height passed to the callback could be 0."
| * Update onVideoSizeChanged() callback method Java doc to explicitly specify ↵James Dong2011-12-061-0/+3
| | | | | | | | | | | | | | | | | | the conditions under which the width/height passed to the callback could be 0. Change-Id: Ie921f0af8284eccfd02c4a5826ed41fe19f9676f related-to-bug: 5613451
* | Merge "Fix audio effect tests"Eric Laurent2011-12-073-0/+18
|\ \
| * | Fix audio effect testsEric Laurent2011-11-183-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that audio effect tests relying on audio to actually play on the music stream are not affected by current ringer mode. Silent mode can mute music stream on tablets. Issue 5638685. Change-Id: Icdf14696986145ae3f50fc15d358335487d3525f
* | | am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 ↵Dave Burke2011-12-071-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | sniffer from blocking on data." into ics-mr1 * commit '6727a43f6d8ff193b86ca90b2daa761c47157638': Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
| * | | Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.Andreas Huber2011-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59 related-to-bug: 5666532
* | | | Merge "Allow data uris to be data sources"Narayan Kamath2011-12-074-2/+156
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow data uris to be data sourcesNarayan Kamath2011-12-064-2/+156
| | | | | | | | | | | | | | | | | | | | bug:5571010 Change-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58
* | | | am 2be608f8: am 6db79c35: Merge "Fix for issue 5712743 video editor ↵Hong Teng2011-12-061-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray an * commit '2be608f88cd469b40a472551f22a9d40903beede': Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
| * | | Merge "Fix for issue 5712743 video editor functional test : ↵Hong Teng2011-12-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1
| | * | | Fix for issue 5712743 video editor functional test : testPreviewDuringExport ↵Hong Teng2011-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime. Change-Id: I77862e55e8ee990f72f617a804f26fd724914b5b
* | | | | am d49ec62c: am f3364080: Merge "New and improved silent mode on ↵Amith Yamasani2011-12-061-2/+8
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | lockscreen." into ics-mr1 * commit 'd49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7': New and improved silent mode on lockscreen.
| * | | Merge "New and improved silent mode on lockscreen." into ics-mr1Amith Yamasani2011-12-061-2/+8
| |\ \ \
| | * | | New and improved silent mode on lockscreen.Amith Yamasani2011-12-061-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu. No volume dialog on lockscreen, unless Power menu is up. Set VIBRATE_IN_SILENT=1 when upgrading device. Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
| * | | | Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching ↵James Dong2011-12-061-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | for sync frames" into ics-mr1
| | * | | | DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync ↵James Dong2011-12-051-0/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frames The current logic does not check the I-frame at zeroeth position and therefore for the files with only 1 I-Frame at zeroeth postion does not play. Originally authored by Braganza Sam Robertsh <sam.braganza@samsung.com> Do not merge to master branch since we made some improvement to SampleTable.cpp in the master branch. Change-Id: I068184dec71986f14a586f769c2af1f52b4bcf94 related-to-bug: 5711942
| * | | | DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
| |/ / / | | | | | | | | | | | | Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
* | | | resolved conflicts for merge of 07bacabe to masterAndreas Huber2011-12-052-26/+134
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
| * | | Properly identify how much metadata we need to cache in order to instantiateAndreas Huber2011-12-053-41/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the extractor without blocking (and therefore be able to abort). Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3 related-to-bug: 5666532
| * | | MTP: Add support for restricting PTP to only certain subdirectories of the ↵Mike Lockwood2011-12-022-42/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage DO NOT MERGE Bug: 5527220 Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c Signed-off-by: Mike Lockwood <lockwood@google.com>
| * | | MTP: Don't attempt to read more than 16K at a time from the MTP driver DO ↵Mike Lockwood2011-12-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE This could happen sometimes if other operations increased the size of the data packet buffer to > 16K Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | am f8dad0b3: am afd01086: Merge "Further volume improvements." into ics-mr1Amith Yamasani2011-12-021-8/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f8dad0b37d9aa2476ef3ab84b9f4a7a9f4c960e4': Further volume improvements.
| * | | Merge "Further volume improvements." into ics-mr1Amith Yamasani2011-12-021-8/+2
| |\ \ \ | | |/ / | |/| |
| | * | Further volume improvements.Amith Yamasani2011-12-011-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove silent mode from Power menu - Show volume dialog on lockscreen - Allow beeps when adjusting volume in lockscreen Bug: 5586083 Change-Id: I93052a8ec5004c784f20e04488af9382d495e711
* | | | am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while ↵Hong Teng2011-12-024-6/+51
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, * commit '5126f1d413b4fcb0aff5b364e1e5a41c89ca665c': Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
| * | | Merge "Fixd for 5490443 Native crash while exporting a video - Add new ↵Hong Teng2011-12-024-6/+51
| |\ \ \ | | | | | | | | | | | | | | | onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly." into ics-mr1
| | * | | Fixd for 5490443 Native crash while exporting a videoHong Teng2011-12-014-6/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly. Change-Id: I15610b8907fcf8bd35a3c69ad7c07b5175a6e309
* | | | | Remove unused variable and imports in AudioManagerJean-Michel Trivi2011-12-021-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused imports. Remove private mHandler variable: it was assigned a new Handler object but was never accessed. Change-Id: I63cd08aa38701ea157fef7d3185a58a6e2a95822
* | | | | Merge "MTP: Add support for restricting PTP to only certain subdirectories ↵Mike Lockwood2011-12-022-42/+157
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | of the storage"
| * | | | | MTP: Add support for restricting PTP to only certain subdirectories of the ↵Mike Lockwood2011-12-022-42/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage Bug: 5527220 Change-Id: If68e7481617ecb62abd24e2d89e6b7dfdf95ba2b Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | | Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver"Mike Lockwood2011-12-021-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MTP: Don't attempt to read more than 16K at a time from the MTP driverMike Lockwood2011-12-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen sometimes if other operations increased the size of the data packet buffer to > 16K Change-Id: I4d316c7e2e558d3dd861d39accae6514fd9a62f5 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | | am 6cfa9e6c: am 0d3a2e93: Merge "AudioService: strengthen A2DP device ↵Eric Laurent2011-12-011-159/+239
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | detection" into ics-mr1 * commit '6cfa9e6c507a721f647518569c89db9560056079': AudioService: strengthen A2DP device detection
| * | | | Merge "AudioService: strengthen A2DP device detection" into ics-mr1Eric Laurent2011-12-011-159/+239
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | AudioService: strengthen A2DP device detectionEric Laurent2011-11-301-159/+239
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the intent BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED is broadcast before AudioService is started, The A2DP device connection is never detected by the audio framework resulting in audio not being routed to A2DP unless the device is rebooted or the A2DP headset reconnected. Make sure that A2DP device connection state is sampled when boot completed event is received. Issue 5665159 Change-Id: I04d82020afc00af28c5ea0bb9879ed55bcc9b6f3
* | | | Merge "Add README for media "automated" tests"Glenn Kasten2011-12-011-0/+10
|\ \ \ \
| * | | | Add README for media "automated" testsGlenn Kasten2011-12-011-0/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I92e611fb6df2d870ded9e246963277ecc35b0d15
* | | | | am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would ↵Andreas Huber2011-12-011-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | advertise the wrong video dimensions" into ics-mr1 * commit '10526a0bfe070ac4d1e550a81ed68be35d261b16': Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
| * | | Fixes a typo in AVIExtractor that would advertise the wrong video dimensionsAndreas Huber2011-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab related-to-bug: 5696324
* | | | am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage ↵Jamie Gennis2011-11-301-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | bit" into ics-mr1 * commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6': SurfaceMediaSource: use the vid enc usage bit
| * | | Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1Jamie Gennis2011-11-291-1/+1
| |\ \ \
| | * | | SurfaceMediaSource: use the vid enc usage bitJamie Gennis2011-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when allocating its GraphicBuffers rather than the HW_TEXTURE bit. Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
* | | | | resolved conflicts for merge of 3d630e86 to masterAndreas Huber2011-11-302-2/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
| * | | | Merge "Make sure we can properly shutdown even if" into ics-mr1Andreas Huber2011-11-292-2/+20
| |\ \ \ \
| | * | | | Make sure we can properly shutdown even ifAndreas Huber2011-11-282-2/+20
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a) one of the two decoders has a pending discontinuity b) the renderer holds on to all output buffers for that decoder c) the renderer is paused if all three conditions are met the decoder won't ask for more input data and therefore never see the discontinuity. To avoid this we briefly resume the renderer just before shutting down. Change-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a related-to-bug: 5655016
* | | | | Fix the broken buildJames Dong2011-11-291-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f
* | | | | am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from ↵Andreas Huber2011-11-291-0/+32
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | reallocating buffers during a format change" into ics-mr1 * commit '52607c5364446df6ac5b2f55cb50e146e6023a4f': If an error occurs that prevents us from reallocating buffers during a format change
| * | | | Merge "If an error occurs that prevents us from reallocating buffers during ↵Andreas Huber2011-11-291-0/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | a format change" into ics-mr1
| | * | | | If an error occurs that prevents us from reallocating buffers during a ↵Andreas Huber2011-11-281-0/+32
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format change we need to transition to executing state anyway to be able to properly flush/shutdown in the future. Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f related-to-bug: 5655016
generated by cgit v1.1 at 2025-02-11 01:22:58 +0000