summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* Allowing setting of time lapse parameters through MediaRecorder.javaNipun Kwatra2010-07-221-7/+5
| | | | | | | | 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.
| * Support finer seek control on MediaSources.Andreas Huber2010-07-2128-65/+446
| | | | | | | | | | | | related-to-bug: 2858448 Change-Id: Ifb4b13b990fd5889113e47e2c62249ac43391fa1
* | am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbreadJames Dong2010-07-202-27/+51
|\ \ | |/ | | | | | | | | | | Merge commit '9049fe60c20640bd606741c8f45f3f781a1684f5' * commit '9049fe60c20640bd606741c8f45f3f781a1684f5': Progress status notification
| * Merge "Progress status notification" into gingerbreadJames Dong2010-07-202-27/+51
| |\
| | * Progress status notificationJames Dong2010-07-202-27/+51
| | | | | | | | | | | | | | | | | | - Keep track of per-track progress Change-Id: Ibd36f0e8c78581928c8aa2f5e23c5e7e0615c2cc
* | | 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
* | | Merge "Adding support for timelapse capture using still camera's ↵Nipun Kwatra2010-07-203-53/+254
|\ \ \ | | | | | | | | | | | | 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-193-53/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.James Dong2010-07-192-13/+79
| | | | | | | | | | | | Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8
* | | am 5e782937: am faf775e7: Fix simulator build (1st attempt)James Dong2010-07-181-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '5e782937ead3042255d83f9c1192f2cc7b688d74' * commit '5e782937ead3042255d83f9c1192f2cc7b688d74': Fix simulator build (1st attempt)
| * | Fix simulator build (1st attempt)James Dong2010-07-181-0/+1
| |/ | | | | | | Change-Id: I65a824c17929170b7b2bc75a13e756e92d8fe50a
* | am 10f8baa4: am 42ef0c71: Initial check-in for software m4v_h263 encoderJames Dong2010-07-1540-0/+26358
|\ \ | |/ | | | | | | | | | | Merge commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd' * commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd': Initial check-in for software m4v_h263 encoder
| * Initial check-in for software m4v_h263 encoderJames Dong2010-07-1540-0/+26358
| | | | | | | | Change-Id: I4b49fa5c3a5e6e21cfd2419441d98dd784046367
* | Merge changes I93364c74,I5ca831b8Mike Lockwood2010-07-155-5/+5
|\ \ | | | | | | | | | | | | | | | * changes: Exclude MTP implementation from simulator build Fixes for simulator build on lucid
| * | Fixes for simulator build on lucidMike Lockwood2010-07-155-5/+5
| | | | | | | | | | | | | | | | | | | | | strchr and strrchr now return const char* instead of char* Change-Id: I5ca831b8951af7e6306eb9d9d6f78ed2ec13d649 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for ↵James Dong2010-07-152-39/+69
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | authoring" into gingerbread Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c' * commit 'b068b47c6d0214256116a0c661740bddf7acc18c': Support user-supplied timescales for authoring
| * Support user-supplied timescales for authoringJames Dong2010-07-142-39/+69
| | | | | | | | | | | | - also, change all the real time unit to microseconds in MPEG4Writer Change-Id: I260f512f2eb670ade7b8858a56335a5d639de756
* | am 7a72f848: am 70c6c9a1: Fix simulator build - missing header file ↵James Dong2010-07-132-0/+4
|\ \ | |/ | | | | | | | | | | | | | | <string.h> - need to define -D__arm__ Merge commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911' * commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911': Fix simulator build
| * Fix simulator buildJames Dong2010-07-132-0/+4
| | | | | | | | | | | | | | - missing header file <string.h> - need to define -D__arm__ Change-Id: I18d2f1908684150784cf728234b5aedbc02447d1
* | am f6bdc764: am 9d8bea11: Merge "Initial checkin for software AVC encoder" ↵James Dong2010-07-1326-0/+17907
|\ \ | |/ | | | | | | | | | | | | | | into gingerbread Merge commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea' * commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea': Initial checkin for software AVC encoder
| * Initial checkin for software AVC encoderJames Dong2010-07-1326-0/+17907
| | | | | | | | | | | | | | | | | | | | - Since the software encoder assumes the input is YUV420 planar, color conversion needs to be added when the input color format does not meet the requirement. With this patch, I only added a single color conversion from YUV420 semi planar to YUV420 planar. We can add more as we go. Change-Id: If8640c9e5a4f73d385ae9bb2022e57f7f62b91b9
* | am a60337ce: am 6bb14e08: Merge "Enable the support for decoding audio with ↵James Dong2010-07-092-45/+65
|\ \ | |/ | | | | | | | | | | | | | | AAC+ and eAAC+ features" into gingerbread Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96' * commit 'a60337ce578f91926a5e8ea30cb47740b994fc96': Enable the support for decoding audio with AAC+ and eAAC+ features
| * Enable the support for decoding audio with AAC+ and eAAC+ featuresJames Dong2010-07-082-45/+65
| | | | | | | | | | | | bug - 282684 Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
* | am 4f440632: am 929642ee: Add runtime dumpsys support for media recorder clientJames Dong2010-07-091-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '4f4406322dafd6e128b437edbc541327f0b38d04' * commit '4f4406322dafd6e128b437edbc541327f0b38d04': Add runtime dumpsys support for media recorder client
| * Add runtime dumpsys support for media recorder clientJames Dong2010-07-081-1/+1
| | | | | | | | Change-Id: I4c8a81720f3be2db54678a7e84fe12849255046b
* | am b3598832: am c4243342: Merge "Allow application to set two more encoding ↵James Dong2010-07-071-15/+90
|\ \ | |/ | | | | | | | | | | | | | | paramters: video profile and level" into gingerbread Merge commit 'b35988329ac1a574898db9226039e37e352c57a8' * commit 'b35988329ac1a574898db9226039e37e352c57a8': Allow application to set two more encoding paramters: video profile and level
| * Merge "Allow application to set two more encoding paramters: video profile ↵James Dong2010-07-071-15/+90
| |\ | | | | | | | | | and level" into gingerbread
| | * Allow application to set two more encoding paramters: video profile and levelJames Dong2010-07-071-15/+90
| | | | | | | | | | | | Change-Id: I673e681cefe184d5c556c612c54600a24a2143e5
* | | am dcf872dc: am c34c8c3f: Merge "Only send the playback complete ↵Andreas Huber2010-07-072-20/+37
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing." into gingerbrea Merge commit 'dcf872dcfa6439514c886f8b9bf997beeeb3be85' * commit 'dcf872dcfa6439514c886f8b9bf997beeeb3be85': Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing.
| * | Only send the playback complete notification if a) an error occurred on any ↵Andreas Huber2010-07-072-20/+37
| |/ | | | | | | | | | | track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing. Change-Id: Icac8104d14f18b719aa0b8f1ab3215f24003b152
* | am f5b4e342: am 2e6aff8e: Merge "ALooperRoster no longer holds strong ↵Andreas Huber2010-07-071-6/+38
|\ \ | |/ | | | | | | | | | | | | | | references to handlers and loopers." into gingerbread Merge commit 'f5b4e342b581a6e219b49141861b353fb139d00b' * commit 'f5b4e342b581a6e219b49141861b353fb139d00b': ALooperRoster no longer holds strong references to handlers and loopers.
| * Merge "ALooperRoster no longer holds strong references to handlers and ↵Andreas Huber2010-07-071-6/+38
| |\ | | | | | | | | | loopers." into gingerbread
| | * ALooperRoster no longer holds strong references to handlers and loopers.Andreas Huber2010-07-071-6/+38
| | | | | | | | | | | | Change-Id: I038d69b0a34eda1bfc5216d92c837a5ddf4fb802
* | | am ff119e74: am 6615defd: Make sure the OMX callback thread is properly ↵Andreas Huber2010-07-071-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | shutdown after the node goes away. Merge commit 'ff119e746afe834040afb1631caee355d94237e8' * commit 'ff119e746afe834040afb1631caee355d94237e8': Make sure the OMX callback thread is properly shutdown after the node goes away.
| * | Make sure the OMX callback thread is properly shutdown after the node goes away.Andreas Huber2010-07-071-0/+9
| |/ | | | | | | Change-Id: Ib0b25855b0dfc191e5529193b4cb519f644a8412
* | am 877045aa: am 9406f626: Merge "An AHandler can now find its associated ↵Andreas Huber2010-07-073-0/+46
|\ \ | |/ | | | | | | | | | | | | | | ALooper." into gingerbread Merge commit '877045aa853aaf6e58ca3ac7bfa2bde9165b55ae' * commit '877045aa853aaf6e58ca3ac7bfa2bde9165b55ae': An AHandler can now find its associated ALooper.
| * Merge "An AHandler can now find its associated ALooper." into gingerbreadAndreas Huber2010-07-073-0/+46
| |\
| | * An AHandler can now find its associated ALooper.Andreas Huber2010-07-023-0/+46
| | | | | | | | | | | | Change-Id: Ic7087b8dcbc0d9abda272df0cb01b04b006f82ad
* | | am c4be155a: am 2cfd8198: Merge "Add an option to ALooper::start that allows ↵Andreas Huber2010-07-021-4/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | it to call back into java or not." into gingerbread Merge commit 'c4be155a540695c42bcd6589604f86d300f4548f' * commit 'c4be155a540695c42bcd6589604f86d300f4548f': Add an option to ALooper::start that allows it to call back into java or not.
| * | Merge "Add an option to ALooper::start that allows it to call back into java ↵Andreas Huber2010-07-021-4/+5
| |\ \ | | |/ | |/| | | | or not." into gingerbread
| | * Add an option to ALooper::start that allows it to call back into java or not.Andreas Huber2010-07-021-4/+5
| | | | | | | | | | | | Change-Id: Iec172901a04a575d8d350bd162565f04677c3f26
* | | am 9f8c490e: am 5460d126: Merge "Added AMessage::debugString() for debugging ↵Andreas Huber2010-07-021-0/+103
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | purposes." into gingerbread Merge commit '9f8c490e05f86cca1d60d6b6f383a1a98d7985fb' * commit '9f8c490e05f86cca1d60d6b6f383a1a98d7985fb': Added AMessage::debugString() for debugging purposes.