summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of a127c07c to masterKenny Root2010-10-142-0/+8
|\ | | | | | | Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
| * am 312644cd: Merge "Support for writing to MPEG2 transport stream files." ↵Andreas Huber2010-10-132-0/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp * commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7': Support for writing to MPEG2 transport stream files.
| | * 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.
| * | | am 165c6579: Merge "HTTP Live content that are tagged as complete are now ↵Andreas Huber2010-10-131-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | seekable." into gingerbread Merge commit '165c6579660c22edafb61fee2a0cf39334a2a905' into gingerbread-plus-aosp * commit '165c6579660c22edafb61fee2a0cf39334a2a905': 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.
| * | am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek ↵Andreas Huber2010-10-082-3/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp * commit 'f72dd0190ee64914161d361be1213eda8cab7b90': 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
| * | | am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbreadEric Laurent2010-10-081-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp * commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5': 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 9580b8ce: resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aospGloria Wang2010-10-104-24/+55
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382' * commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382': Update of DRM framework.
| * | resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aospGloria Wang2010-10-074-24/+55
| |\ \ | | | | | | | | | | | | Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76
| | * | Update of DRM framework.Takeshi Aimi2010-10-044-24/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change "void" type of return value to "int" for returning status. - Add some of overloaded Java APIs which accept database Uri as input. - Add asynchronous APIs - Add OnEventListener and OnErrorListener for asynchronous APIs - Disable debug log - Change decrypt() API to accept an optional buffer needed by some of DRM schemes Changes are incorporated by Sony Corporation. Change-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c
* | | | 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.
| * | | am 949f7d90: Merge "Work to support switching transport streams mid-stream ↵Andreas Huber2010-10-072-2/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | and signalling discontinuities to the decoder." into gingerbread Merge commit '949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp * commit '949f7d9066e09768e570686a5695aaba4a1dafd0': 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.
| * | | am 02654f01: Merge "On this particular device the hardware video decoder ↵Andreas Huber2010-10-072-1/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp * commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2': 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.
| * | | am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of ↵Andreas Huber2010-10-051-3/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread Merge commit '17bc4f65324a823598e7671256c815bf32ddcc95' into gingerbread-plus-aosp * commit '17bc4f65324a823598e7671256c815bf32ddcc95': 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
* | | | Merge "0-memcpy video recording framework"James Dong2010-10-071-0/+53
|\ \ \ \
| * | | | 0-memcpy video recording frameworkJames Dong2010-10-071-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part II: proposed camera hal change Change-Id: I51663cf5de2b00f71e4ff1828080094676065444
* | | | | am ff04e97f: am f4619308: Merge "fix [2835280] Add support for cancelling ↵Mathias Agopian2010-10-061-4/+6
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers to ANativeWindow" into gingerbread Merge commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb' * commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb': fix [2835280] Add support for cancelling buffers to ANativeWindow
| * | | | am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ↵Mathias Agopian2010-10-041-4/+6
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANativeWindow" into gingerbread Merge commit 'f461930872beb4362998642c115691bdd2e94617' into gingerbread-plus-aosp * commit 'f461930872beb4362998642c115691bdd2e94617': fix [2835280] Add support for cancelling buffers to ANativeWindow
| | * | | fix [2835280] Add support for cancelling buffers to ANativeWindowMathias Agopian2010-10-041-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a new ANativeWindow::cancelBuffer() API that can be used to cancel any dequeued buffer, BEFORE it's been enqueued. The buffer is returned to the list of availlable buffers. dequeue and cancel are not mutually thread safe, they must be called from the same thread or external synchronization must be used. Change-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61
* | | | | 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
| * | | am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file ↵James Dong2010-10-041-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | writer was larger than intended" into gingerbread Merge commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54' into gingerbread-plus-aosp * commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54': 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
* | | | Video size retrieval/configuration support in camera halJames Dong2010-10-031-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first part of the camera hal change required for 0-memcpy of input video frames for video recording. o removed check in setVideoSize()/getVideoSize() for impl consistency Change-Id: I01274a62b9f9eaf32154d98f8d0bfedacf645698
* | | | am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery ↵Eric Laurent2010-09-301-2/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | time" into gingerbread Merge commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9' * commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9': Issue 3032913: improve AudioTrack recovery time
| * | | am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into ↵Eric Laurent2010-09-301-2/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '220ab8877b234e6807b7f6d9028ba55d23220301' into gingerbread-plus-aosp * commit '220ab8877b234e6807b7f6d9028ba55d23220301': Issue 3032913: improve AudioTrack recovery time
| | * | Issue 3032913: improve AudioTrack recovery timeEric Laurent2010-09-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue showed that when an AudioTrack underruns during a too long period of time and is therefore disabled by audioflinger mixer, it takes an additional delay of up to 3 seconds to recover. This fix adds a simple mechanism to recover immediately when the client application is ready to write data again in the AudioTrack buffer Also throttle warnings on record overflows Change-Id: I8b2c71578dd134b9e60a15ee4d91b70f3799cb3d
* | | | 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.
| * | | am be045061: Merge "Instead of constantly polling the AudioPlayer to see if ↵Andreas Huber2010-09-281-1/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread Merge commit 'be0450619528e65eebfa1d7eab78fde757d094cc' into gingerbread-plus-aosp * commit 'be0450619528e65eebfa1d7eab78fde757d094cc': 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.
| * | | | am 4769f579: Merge "Vorbis files may have more samples encoded that should ↵Andreas Huber2010-09-281-0/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '4769f57948455277d0670ef18f64824ca5d894c1' into gingerbread-plus-aosp * commit '4769f57948455277d0670ef18f64824ca5d894c1': 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:
| * | | | am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-09-281-0/+72
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp * commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7': Squashed commit of the following:
generated by cgit v1.1 at 2024-07-15 17:57:18 +0000