summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Collapse)AuthorAgeFilesLines
* am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" ↵James Dong2010-10-211-0/+1
|\ | | | | | | | | | | | | | | | | into gingerbread Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99' * commit '8ad6335d2c22900de5b46460473495b5bcea9f99': File writer size estimation improvement
| * File writer size estimation improvementJames Dong2010-10-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | o Do not count the reserved space for moov if the meta data size is small o Do not count the extra 1KB disturbing small file estimation. o Reduce the default minimum reserved space from 4 KB to 3 KB. o Estimate the moov size based on both duration AND file size limit is set and set it to the smaller estimated value. low risk change bug - 3111983 Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
* | Add decode-to-ANativeWindow support to Stagefright.Jamie Gennis2010-10-203-2/+28
| | | | | | | | | | | | | | | | | | | | This change adds support to Stagefright for doing OMX video decoding directly into buffers dequeued from an ANativeWindow. It does this by registering the dequeued buffers with the OMX component using an Android-specific OMX extension, and then exchanging buffers between the OMX component and the ANativeWindow. Change-Id: Ida66f836503255a68d378c6903d96dfe9747ce87
* | Make camera source ready for handling meta-data video buffers.James Dong2010-10-191-5/+54
| | | | | | | | | | | | bug - 3042125 Change-Id: I877b265c6bf8e0593121c8d5a95ae5599cdc6fb9
* | am 9b2f18df: am bc96c284: Merge "For thumbnail extraction make sure we ↵Andreas Huber2010-10-191-1/+5
|\ \ | |/ | | | | | | | | | | | | | | instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread Merge commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2' * commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2': For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
| * For thumbnail extraction make sure we instantiate a decoder that allows ↵Andreas Huber2010-10-181-1/+5
| | | | | | | | | | | | | | access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder. related-to-bug: 3106534 Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
* | am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX ↵Andreas Huber2010-10-1810-0/+6937
|\ \ | |/ | | | | | | | | | | | | | | headers formerly included from external/opencore." into gingerbread Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4' * commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4': Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
| * Check-in of a copy of the Khronos OpenMAX headers formerly included from ↵Andreas Huber2010-10-1510-0/+6937
| | | | | | | | | | | | | | external/opencore. Change-Id: Ie2ecf9558d4ee80cb5a2bbe66ad49f2165a7b09c related-to-bug: 3101573
* | resolved conflicts for merge of a127c07c to masterKenny Root2010-10-142-0/+8
|\ \ | |/ | | | | Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
| * Merge "Support for writing to MPEG2 transport stream files." into gingerbreadAndreas Huber2010-10-132-0/+8
| |\
| | * Support for writing to MPEG2 transport stream files.Andreas Huber2010-10-122-0/+8
| | | | | | | | | | | | Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
* | | am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as ↵Andreas Huber2010-10-141-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | complete are now seekable." into gingerbread Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0' * commit '28b93967d0e702304c7edec854a29d5ab88bfce0': HTTP Live content that are tagged as complete are now seekable.
| * | HTTP Live content that are tagged as complete are now seekable.Andreas Huber2010-10-121-0/+1
| |/ | | | | | | | | Change-Id: I9d0d2f009f883e5baf3e9de8c5c0aa05760e4bde related-to-bug: 2368598
* | am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for ↵Andreas Huber2010-10-102-3/+5
|\ \ | |/ | | | | | | | | | | | | | | rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7' * commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7': Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
| * Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very ↵Andreas Huber2010-10-082-3/+5
| |\ | | | | | | | | | expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
| | * Disable 10secs forward/backward seeking for rtsp as seek is a very expensive ↵Andreas Huber2010-10-082-3/+5
| | | | | | | | | | | | | | | | | | | | | operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality. Change-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2 related-to-bug: 3073955
* | | am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" ↵Eric Laurent2010-10-101-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '4f21e517d09b9d793d20d64547df330fba705b3c' * commit '4f21e517d09b9d793d20d64547df330fba705b3c': Added getter for session Id to AudioSink
| * | Added getter for session Id to AudioSinkEric Laurent2010-10-071-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | Added a method to expose the audio session id at AudioSink interface so that the AudioPlayer in stagefright can retrieve it. Also: - Fixed audio effect send level not being initialized in mediaplayer. - Fixed compilation error when LOGV is enabled in mediaplayer JNI Change-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb
* | am bb708373: am 949f7d90: Merge "Work to support switching transport streams ↵Andreas Huber2010-10-102-2/+4
|\ \ | |/ | | | | | | | | | | | | | | mid-stream and signalling discontinuities to the decoder." into gingerbread Merge commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43' * commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43': Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
| * Work to support switching transport streams mid-stream and signalling ↵Andreas Huber2010-10-072-2/+4
| | | | | | | | | | | | | | discontinuities to the decoder. Change-Id: I7150e5e7342e1117c524856b204aadcb763e06ed related-to-bug: 2368598
* | am 45bd1159: am 02654f01: Merge "On this particular device the hardware ↵Andreas Huber2010-10-102-1/+5
|\ \ | |/ | | | | | | | | | | | | | | video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread Merge commit '45bd1159fa34b51ba077e0cde760d171ca092552' * commit '45bd1159fa34b51ba077e0cde760d171ca092552': On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
| * On this particular device the hardware video decoder spits out buffers that ↵Andreas Huber2010-10-072-1/+5
| | | | | | | | | | | | | | don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume. Change-Id: I1b8fe68c1766299844fe84ebbff49cb8b3e4cc7c related-to-bug: 3070094
* | 0-memcpy video recording frameworkJames Dong2010-10-091-1/+1
| | | | | | | | | | | | | | Part III: Move startRecording() call earlier, asking camera hal to allocate video buffers before CameraSource.start() is called. Change-Id: I3f1d7d5636ca2644fe52af61f297d48c6b1ce89d
* | Move Camera specific logic out from StagefrightRecorder to CameraSourceJames Dong2010-10-082-17/+93
| | | | | | | | | | | | | | o updated comments and streamlined the logic in checkVideoSize() and checkFrameRate() as suggested Change-Id: I49d04ac7998d4a215997aa63555dfb6e814e38d3
* | am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() ↵Andreas Huber2010-10-071-3/+3
|\ \ | |/ | | | | | | | | | | | | | | instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread Merge commit '56ee1080f004110bff622e5b60c243d9cabfe120' * commit '56ee1080f004110bff622e5b60c243d9cabfe120': Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
| * Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after ↵Andreas Huber2010-10-051-3/+3
| | | | | | | | | | | | submitting all samples to AudioTrack to make sure those remaining samples are actually played out. Change-Id: Id574a0203efcb5e565f1b0fe77869fc33b9a9d56
* | am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free ↵James Dong2010-10-061-0/+1
|\ \ | |/ | | | | | | | | | | | | | | space in the file writer was larger than intended" into gingerbread Merge commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe' * commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe': Fixed an issue where the reserved free space in the file writer was larger than intended
| * Fixed an issue where the reserved free space in the file writer was larger ↵James Dong2010-10-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than intended The problem was that even though user does not explicitly request the max file size limit via MediaRecorder.setMaxFileSize(), the file writer sets an implicit file size limit if 32-bit file offset is used on user's behalf. The reserved free space is estimated based on the file size, if the file size limit is set by the user. The fix is to add an extra bool to tell the difference between an explit requested file size and an implicit file limit and use that to set the estimated moov box size accordingly. Change-Id: I731aca6c7833aa764ed7b905edb77721577471b3
* | am d6c30e8c: am be045061: Merge "Instead of constantly polling the ↵Andreas Huber2010-09-281-1/+5
|\ \ | |/ | | | | | | | | | | | | | | AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread Merge commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023' * commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023': Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
| * Merge "Instead of constantly polling the AudioPlayer to see if it reached ↵Andreas Huber2010-09-281-1/+5
| |\ | | | | | | | | | EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
| | * Instead of constantly polling the AudioPlayer to see if it reached EOS or ↵Andreas Huber2010-09-281-1/+5
| | | | | | | | | | | | | | | | | | | | | finished seeking, initiate the notification from the AudioPlayer when the event happens. Change-Id: I43875b6adaf96d4e982ef3dfc3d6c8f7034ac51d related-to-bug: 3036592
* | | am c889bbfa: am 4769f579: Merge "Vorbis files may have more samples encoded ↵Andreas Huber2010-09-281-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread Merge commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06' * commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06': Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
| * | Merge "Vorbis files may have more samples encoded that should be used, i.e. ↵Andreas Huber2010-09-281-0/+2
| |\ \ | | |/ | | | | | | we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread
| | * Vorbis files may have more samples encoded that should be used, i.e. we have ↵Andreas Huber2010-09-281-0/+2
| | | | | | | | | | | | | | | | | | | | | to trim samples at the end of the stream. This is crucial for proper looping of some audio files. related-to-bug: 3036592 Change-Id: Ib142b171c829ed74156c0281d9d4543fcc96c802
* | | am 9d591860: am 3a9cc8ce: Merge "Squashed commit of the following:" into ↵Andreas Huber2010-09-281-0/+72
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '9d59186068891834272c2e3ee6f9c4228af24656' * commit '9d59186068891834272c2e3ee6f9c4228af24656': Squashed commit of the following:
| * | Squashed commit of the following:Andreas Huber2010-09-271-0/+72
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 29a4d3effb05a2e074cb0693316ab1977baeb0b6 Author: Andreas Huber <andih@google.com> Date: Mon Sep 27 12:01:32 2010 -0700 Fully working implementation of MPEG2TSWriter (for AAC and AVC sources). Change-Id: I8a32a47565b647bf6c078c520e39565e08ea0d84 commit f4dec4c3899f3be393508e180d6c07e249d3335e Author: Andreas Huber <andih@google.com> Date: Mon Sep 27 10:36:31 2010 -0700 More reliable identification of MPEG2 transport streams. Don't keep scanning forever in case the stream does not have both audio and video tracks. Change-Id: Icc5b4e8be145b2805e8776559546a6818342aea7 commit 4fe3cc942f9b3d3cf54138b828c41214aa916dd2 Author: Andreas Huber <andih@google.com> Date: Mon Sep 27 08:23:39 2010 -0700 test code Change-Id: I16560a17661407d06497f99ff88230724bb898af commit 64d988b24f49f179a90fa677be11c823959e734b Author: Andreas Huber <andih@google.com> Date: Thu Sep 23 14:42:52 2010 -0700 First shot at supporting writing to an MPEG2 transport stream. Change-Id: Ie537939a99fa3ddc0c7661c47c18277584817c74 Change-Id: If78fd034af8f6e8ceac8dbeff96d5ecb3f6b96dc
* | am af909581: am 67738486: Merge "Remove stagefright foundation\'s ↵Andreas Huber2010-09-211-37/+12
|\ \ | |/ | | | | | | | | | | | | | | incompatible logging interface and update callsites." into gingerbread Merge commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6' * commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6': Remove stagefright foundation's incompatible logging interface and update callsites.
| * Remove stagefright foundation's incompatible logging interface and update ↵Andreas Huber2010-09-211-37/+12
| | | | | | | | | | | | callsites. Change-Id: I45fba7d60530ea0f233ac3695a97306b6dc1795c
* | Merge "Adding default profiles for specific levels."Nipun Kwatra2010-09-171-4/+19
|\ \
| * | Adding default profiles for specific levels.Nipun Kwatra2010-09-171-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The low and high profiles should each match one of the specific profiles. So we need to add the specific profiles corresponding to the low/high profiles. This makes the default profile compliant to documentation + cts. Also fixed javadoc to account time lapse profiles. Change-Id: I34e7307d00ce261c69dc10ead2900025c7f6d428
* | | Implemented frequent read returns for quick stop in time lapse.Nipun Kwatra2010-09-171-1/+60
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the frame capture interval is large, read will block for a long time. Due to the way the mediaRecorder framework works, a stop() call from mediaRecorder waits until the read returns, causing a long wait for stop() to return. To avoid this, we return a copy of the last read frame with the same time stamp if a frame is not available quickly. This keeps the read() call from blocking too long. This method is triggered when startQuickReadReturns() is called on CameraSourceTimeLapse. In the still camera case, also using waitRelative on Condition instaed of sleeping, so that we can wake it up. Also for the idle check instead of sleeping, we now wait on a condition variable, which is woken up when the last takePicture callback gets called. Change-Id: Ia74386e175536aee0f44ae2f8b114c353d3d72f5
* | Media scanner support for tracking files of arbitrary type.Mike Lockwood2010-09-121-5/+3
| | | | | | | | | | | | | | | | | | | | The native media scanner no longer filters files based on file extension. Audio, video, image and playlist files are handled as before, but non-media files are now inserted into the "files" table, which was originally added to support MTP. Change-Id: I9053218fb6d2671a3bb181405c34442b94678afc Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Exposing specific profile levels + hasProfile().Nipun Kwatra2010-09-101-6/+8
| | | | | | | | | | | | | | | | | | - Exposing the specific resolution profile levels QUALITY_{QCIF,CIF,480P,720P,1080P} and the new time lapse profiles QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,CIF,480P,720P,1080P} - Unhiding the hasProfile() function used to test if a given profile exists. Change-Id: I5d8b9e1ba61718f304235e76d85244e428e68643
* | Merge "Adding hasProfile."Nipun Kwatra2010-09-101-0/+8
|\ \
| * | Adding hasProfile.Nipun Kwatra2010-09-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Added hasProfile to CamcorderProfile and JNI. - Added hasCamcorderProfile to MediaProfiles. - using android.hardware.Camera.CAMERA_ID_DEFAULT for default camera in get(). Change-Id: Ib57bb49ae79492d7cbc0ec6c7b6efcbf74f80013
* | | Merge "Added specific resolution and time lapse profiles."Nipun Kwatra2010-09-101-1/+14
|\ \ \ | |/ /
| * | Added specific resolution and time lapse profiles.Nipun Kwatra2010-09-101-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added enums QUALITY_{QCIF,480P,720P,1080P} QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,480P,720P,1080P} in CamcorderProfile and corresponding ones in MediaProfiles. - Added functions createDefaultCamcorderTimeLapseLowProfile, createDefaultCamcorderTimeLapseHighProfile to set default values. - Moved javadoc for constants to the get() function. Change-Id: Ib8b3f8d29395dff77a397d1e6b44cfaf8c481d4d
* | | am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via ↵James Dong2010-09-081-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | kKeyTime from each input buffer" into gingerbread Merge commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334' * commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334': HW audio encoder expects timestamp via kKeyTime from each input buffer
| * | Merge "HW audio encoder expects timestamp via kKeyTime from each input ↵James Dong2010-09-081-0/+1
| |\ \ | | | | | | | | | | | | buffer" into gingerbread
| | * | HW audio encoder expects timestamp via kKeyTime from each input bufferJames Dong2010-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | - This fixes media server crashes on droid Change-Id: I7191cadc5275107425ec3ee3d437b2c5295858dc
generated by cgit v1.1 at 2025-01-15 01:55:40 +0000