summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter ↵Eric Laurent2010-07-2810-30/+62
|\ | | | | | | | | | | | | | | | | types." into gingerbread Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf' * commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf': Audio effects: modified command() parameter types.
| * Audio effects: modified command() parameter types.Eric Laurent2010-07-2810-30/+62
| | | | | | | | | | | | | | The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command() function have been modified from int to uint32_t. This is more consistent with their role. Change-Id: I84d289fc262d6753747910f06f485597dfee6591
* | MTP host: Reduce buffer size for readObject so we don't clog our pipe.Mike Lockwood2010-07-271-1/+1
| | | | | | | | | | Change-Id: I24d2b1551af5843e48c0a63b84925b3a6451e36a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | MTP: Turn off excessive loggingMike Lockwood2010-07-275-16/+12
| | | | | | | | | | Change-Id: Ib0dd8cb99efa324d0b4e742bffeb913d6122ace2 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | resolved conflicts for merge of d306cc81 to masterEric Laurent2010-07-274-89/+71
|\ \ | |/ | | | | Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
| * Audio Effects: added methods to effects java classes to store and load ↵Eric Laurent2010-07-275-85/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | current effect settings in a single call. Addional changes: - Fixed simulator build - Use effect interface UUIDs from OpenSL ES includes when available - Added cleanspec rules to remove now obsolete test effect libraries - Fixed bug in AudioEffect JNI setParameter function. Change-Id: Ic25ddb135e2cec5a68c181d727321f5ac7a1ab6b
* | Merge "MTP host: Add support for reading files from an MTP device via ↵Mike Lockwood2010-07-264-2/+263
|\ \ | | | | | | | | | ParcelFileDescriptor"
| * | MTP host: Add support for reading files from an MTP device via ↵Mike Lockwood2010-07-264-2/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ParcelFileDescriptor Also added some support for sending files to the device that hasn't been debugged yet. Add locking to MtpDevice to prevent it from attempting multiple transactions simultaneously. Change-Id: I2b995ba0af086cc6920bd6b8c869f540ad78560a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Merge "MTP: Don't request thumbnails for folder objects in MtpCursor"Mike Lockwood2010-07-262-13/+19
|\ \ \ | |/ /
| * | MTP: Don't request thumbnails for folder objects in MtpCursorMike Lockwood2010-07-262-13/+19
| | | | | | | | | | | | | | | Change-Id: I75a0a834ab746bed0a35883539c8dbc104789157 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Merge "MTP: Add hard coded support to recognize a couple MTP music players ↵Mike Lockwood2010-07-261-3/+37
|\ \ \ | |/ / | | | | | | for testing purposes."
| * | MTP: Add hard coded support to recognize a couple MTP music players for ↵Mike Lockwood2010-07-261-3/+37
| | | | | | | | | | | | | | | | | | | | | testing purposes. Change-Id: I2d09d78e83d13cfb3edff02372a6fc34b1e4d8b1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am e80c30c6: am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper ↵Eric Laurent2010-07-261-33/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | effect init function." into gingerbread Merge commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338' * commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338': Fixed bug in vlm effect bunde wrapper effect init function.
| * | Merge "Fixed bug in vlm effect bunde wrapper effect init function." into ↵Eric Laurent2010-07-261-33/+7
| |\ \ | | | | | | | | | | | | gingerbread
| | * | Fixed bug in vlm effect bunde wrapper effect init function.Eric Laurent2010-07-261-33/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The status in the command reply field was not initialized by Effect_command() for EFFECT_CMD_INIT causing unpredictable failures when initializing an effect. Change-Id: I7dccb094c9244fad4ed9aea3062a395db295e082
* | | | am df5c3b50: am 739bf285: Merge "LVM release 1.04." into gingerbreadEric Laurent2010-07-2613-112/+97
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | Merge commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365' * commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365': LVM release 1.04.
| * | LVM release 1.04.Eric Laurent2010-07-2613-112/+97
| |/ | | | | | | | | | | | | Remaining warnings in the code have been removed Core components support seamless insertion in the audio stream at playtime (Enabling / Disabling the effect). Change-Id: Icae7085305fad663faeb5a94cb673b41cec5a9f1
* | am 08f2b10c: am 021697ad: Audio effects: lvm bundle wrapper update after ↵Eric Laurent2010-07-232-729/+1062
|\ \ | |/ | | | | | | | | | | | | | | first integration tests. Merge commit '08f2b10c4b2e7fc1c666cc1d896e227289206b24' * commit '08f2b10c4b2e7fc1c666cc1d896e227289206b24': Audio effects: lvm bundle wrapper update after first integration tests.
| * Audio effects: lvm bundle wrapper update after first integration tests.Eric Laurent2010-07-232-729/+1062
| | | | | | | | Change-Id: I20cb55282833bd6e3a160e0dae1cc1fcb6b1ca30
* | Allowing setting of time lapse parameters through MediaRecorder.javaNipun Kwatra2010-07-223-15/+67
| | | | | | | | | | | | | | | | added setTimeLapseParameters() to MediaRecorder.java and SetParameter support in StagefrightRecorder to allow enabling time lapse and setting the corresponding parameters. Change-Id: I509040aa71f8d3fc37337b0894a81d9c0fd7a40a
* | am 9bc4dc11: am 53d4e0d5: Allows the authoring engine to skip frame.James Dong2010-07-225-54/+124
|\ \ | |/ | | | | | | | | | | Merge commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae' * commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae': Allows the authoring engine to skip frame.
| * Allows the authoring engine to skip frame.James Dong2010-07-225-54/+124
| | | | | | | | | | | | | | | | | | | | | | This is 1st part of the work to allow audio and video resync if we found out that audio and video are out of sync during authoring - also fixed a problem in AACEncoder::read() where the buffer acquired from the buffer group does not release when error out at reading from source. Change-Id: I8a2740097fcfdf85e6178869afeb9f3687a99118
* | am b72d3180: am 81046c8c: Merge "Various changes to improve rtsp networking, ↵Andreas Huber2010-07-224-6/+38
|\ \ | |/ | | | | | | | | | | | | | | reduce packet loss and adapt to ALooper API changes." into gingerbread Merge commit 'b72d3180dc8d41d6269664bea808b04410bbe40f' * commit 'b72d3180dc8d41d6269664bea808b04410bbe40f': Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
| * Various changes to improve rtsp networking, reduce packet loss and adapt to ↵Andreas Huber2010-07-224-6/+38
| | | | | | | | | | | | ALooper API changes. Change-Id: I110e19d5ce33e597add3ffbd3e3ff3815862396d
* | am 8a9a931f: am 8138e841: Merge "Support finer seek control on ↵Andreas Huber2010-07-2128-65/+446
|\ \ | |/ | | | | | | | | | | | | | | MediaSources." into gingerbread Merge commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd' * commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd': Support finer seek control on MediaSources.
| * Merge "Support finer seek control on MediaSources." into gingerbreadAndreas Huber2010-07-2128-65/+446
| |\
| | * Support finer seek control on MediaSources.Andreas Huber2010-07-2128-65/+446
| | | | | | | | | | | | | | | | | | related-to-bug: 2858448 Change-Id: Ifb4b13b990fd5889113e47e2c62249ac43391fa1
* | | am 34161132: am 7070b365: Added support for auxiliary audio effects to ↵Eric Laurent2010-07-215-5/+119
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | AudioTrack and MediaPlayer. Merge commit '34161132030254bac7dd64c9713832e2f961a061' * commit '34161132030254bac7dd64c9713832e2f961a061': Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
| * | Added support for auxiliary audio effects to AudioTrack and MediaPlayer.Eric Laurent2010-07-215-5/+119
| |/ | | | | | | | | | | | | | | Added methods to AudioTrack and MediaPlayer java classes to enable use of auxiliary audio effects. The effect can be attached and detached by specifying its ID and the send level controlled. Change-Id: Ie74ff54a453096a742688476f612ce355543b6f3
* | am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbreadJames Dong2010-07-204-50/+51
|\ \ | |/ | | | | | | | | | | Merge commit '9049fe60c20640bd606741c8f45f3f781a1684f5' * commit '9049fe60c20640bd606741c8f45f3f781a1684f5': Progress status notification
| * Merge "Progress status notification" into gingerbreadJames Dong2010-07-204-50/+51
| |\
| | * Progress status notificationJames Dong2010-07-204-50/+51
| | | | | | | | | | | | | | | | | | - Keep track of per-track progress Change-Id: Ibd36f0e8c78581928c8aa2f5e23c5e7e0615c2cc
* | | Merge "Restart preview after each takePicture is done."Nipun Kwatra2010-07-201-6/+38
|\ \ \
| * | | Restart preview after each takePicture is done.Nipun Kwatra2010-07-201-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview is called when CAMERA_MSG_COMPRESSED_IMAGE is recieved by dataCallback(). It needs to be started as a new thread so that the callback can return, and the camera can know that takePicture() is done. Change-Id: I4d0febbc993aac43b37f9f4a824e9c7b8785f19e
* | | | resolved conflicts for merge of dd206093 to masterEric Laurent2010-07-205-24/+194
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae
| * | Merge "Audio policy manager changes for audio effects" into gingerbreadEric Laurent2010-07-205-24/+194
| |\ \
| | * | Audio policy manager changes for audio effectsEric Laurent2010-07-205-24/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added methods for audio effects management by audio policy manager. - control of total CPU load and memory used by effect engines - selection of output stream for global effects - added audio session id in parameter list for startOutput() and stopOutput(). this is not used in default audio policy manager implementation. Modifications of audio effect framework in AudioFlinger to allow moving and reconfiguring effect engines from one output mixer thread to another when audio tracks in the same session are moved or when requested by audio policy manager. Also fixed mutex deadlock problem with effect chains locks. Change-Id: Ida43484b06e9b890d6b9e53c13958d042720ebdb
* | | | Use software encoder for time lapse capture.Nipun Kwatra2010-07-201-1/+3
| | | | | | | | | | | | | | | | Change-Id: I7f60eb1af95590c84b0cd98134f5a5a8963338dd
* | | | Merge "Adding support for timelapse capture using still camera's ↵Nipun Kwatra2010-07-204-57/+258
|\ \ \ \ | | | | | | | | | | | | | | | takepicture. Also moving entire implementation into a new class CameraSourceTimeLapse which inherits from CameraSource."
| * | | | Adding support for timelapse capture using still camera's takepicture.Nipun Kwatra2010-07-194-57/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moving entire implementation into a new class CameraSourceTimeLapse which inherits from CameraSource. For timelapse capture using still camera, we start a thread which runs a loop in which it calls Camera::takePicture() and then sleeps until the next frame should be captured. The function dataCallback() handles the callback from the camera with the raw image data. This function copies the data and creates an artificial timestamp corresponding to one frame time ahead of the last encoded frame's time stamp. It then calls dataCallbackTimestamp() of the base class which will think that it recieved the frame from a video camera and proceed as usual. For moving the implementation to the subclass CameraSourceTimeLapse, added a few virtual functions to CameraSource, which do the current thing for the base class, but specialized things for CameraSourceTimeLapse. E.g. startCameraRecording() in the base class just calls mCamera->startRecording(), while in CameraSourceTimeLapse it may start a thread for the still camera case. Change-Id: Ib787f24bd2e1f41681513f0257e1c4ca10a2b4de
* | | | | am ff45709f: am cc14a839: Support a single format change at the beginning of ↵Andreas Huber2010-07-202-67/+60
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly. Merge commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe' * commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe': Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
| * | | | Support a single format change at the beginning of audio playback. This way ↵Andreas Huber2010-07-202-67/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly. Change-Id: Icc790122744745e9a88099788d4818ca1e265a82 related-to-bug: 2826841
* | | | | am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling ↵Andreas Huber2010-07-202-13/+79
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frequency correctly when SBR is enabled." into gingerbread Merge commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f' * commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f': Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
| * | | | Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR ↵Andreas Huber2010-07-202-13/+79
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | is enabled." into gingerbread
| | * | | Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.James Dong2010-07-192-13/+79
| | | | | | | | | | | | | | | | | | | | Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8
* | | | | Merge "MTP host fixes:"Mike Lockwood2010-07-202-39/+53
|\ \ \ \ \
| * | | | | MTP host fixes:Mike Lockwood2010-07-202-39/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for detecting android MTP devices Fix problem reading data packet with header sent separately from payload. Change-Id: I07b34af6783ebe2e63a317796ba0c8223df86edf Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | Fix sim-eng build.Andy McFadden2010-07-201-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LOCAL_PATH assignment was not available to the new host library on simulator builds. Change-Id: I7727f17ecc8f457f92bd6fa9ec13025dd8a56390
* | | | | MTP: Remove race condition in initial device enumeration for host mode.Mike Lockwood2010-07-202-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee01aaae3f8cca4234daa289bef6631da4d6c2b6 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | MTP: Fix problems reading and writing arrays in property values.Mike Lockwood2010-07-203-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idd53b63fd32698a3ffc90f174d16ae597b4feb36 Signed-off-by: Mike Lockwood <lockwood@android.com>
generated by cgit v1.1 at 2024-06-10 21:55:01 +0000