summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Some instrumentation of OMXCodec for future investigation and a ↵Andreas Huber2010-10-072-0/+26
|\ | | | | | | possibly temporary fix for the green tinge on video playback."
| * Some instrumentation of OMXCodec for future investigation and a possibly ↵Andreas Huber2010-10-072-0/+26
| | | | | | | | | | | | | | temporary fix for the green tinge on video playback. Change-Id: Iee9cd7b0c326bac96382007b4ea077d4368d7d01 related-to-bug: 3051572
* | am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() ↵Andreas Huber2010-10-073-11/+26
|\ \ | |/ |/| | | | | | | | | | | | | 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-053-11/+26
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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-053-11/+26
| | | | | | | | | | | | | | | | | | 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-2/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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-2/+14
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | 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-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Use setVideoSize API in StagefrightRecorder"James Dong2010-10-052-2/+72
|\ \ \
| * | | Use setVideoSize API in StagefrightRecorderJames Dong2010-10-042-2/+72
| | | | | | | | | | | | | | | | Change-Id: Ia7ddf5e8d2b931453d2cb801169906191349ca07
* | | | am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into ↵James Dong2010-10-051-24/+181
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db' * commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db': Resilent media time stamp adjustment
| * | | am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbreadJames Dong2010-10-041-24/+181
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit 'b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp * commit 'b99f0c7eae365f788a21944fef28de580c7f5f92': Resilent media time stamp adjustment
| | * | Merge "Resilent media time stamp adjustment" into gingerbreadJames Dong2010-10-041-24/+181
| | |\ \
| | | * | Resilent media time stamp adjustmentJames Dong2010-10-041-24/+181
| | | | | | | | | | | | | | | | | | | | Change-Id: I13ab87c05f26bb11a3cc9bf8559f98e6ea0752db
* | | | | am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase ↵Andreas Huber2010-10-041-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even EOS occurs before we consider the cache to be completely filled up." into gingerbread Merge commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c' * commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c': Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
| * | | | am aa1a694d: Merge "Make sure to finish the preparation phase even EOS ↵Andreas Huber2010-10-041-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | occurs before we consider the cache to be completely filled up." into gingerbread Merge commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a' into gingerbread-plus-aosp * commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a': Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
| | * | | Make sure to finish the preparation phase even EOS occurs before we consider ↵Andreas Huber2010-10-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the cache to be completely filled up. Change-Id: I29143e357fb6ea7b860636100e010f2ea7436798 related-to-bug: 3037389
* | | | | am bb506dab: am 7fa69374: Merge "Don\'t retrieve metadata unless necessary ↵Andreas Huber2010-10-041-5/+11
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | for ogg-vorbis ringtone auto-looping." into gingerbread Merge commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80' * commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80': Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
| * | | am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ↵Andreas Huber2010-10-041-5/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ringtone auto-looping." into gingerbread Merge commit '7fa693740756123fa9d05e62fb47aae5d703c71d' into gingerbread-plus-aosp * commit '7fa693740756123fa9d05e62fb47aae5d703c71d': Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
| | * | Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.Andreas Huber2010-10-041-5/+11
| | |/ | | | | | | | | | | | | Change-Id: Iaf5880bb3376f9cbf22aefe198878eaf6f3f08c7 related-to-bug: 3037389
* | | am 2bf74b8f: am 6c609b6a: Merge "Turn off media time adjustment by default" ↵James Dong2010-10-011-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2' * commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2': Turn off media time adjustment by default
| * | am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbreadJames Dong2010-10-011-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '6c609b6a60e533a93c6d0088222bd8da209b9953' into gingerbread-plus-aosp * commit '6c609b6a60e533a93c6d0088222bd8da209b9953': Turn off media time adjustment by default
| | * Merge "Turn off media time adjustment by default" into gingerbreadJames Dong2010-10-011-1/+1
| | |\
| | | * Turn off media time adjustment by defaultJames Dong2010-10-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: I1f8021d605d0fd896e0639607a84e3f7c459612e
* | | | am 57853559: am e619a9da: Merge "Start playing live streams from the start, ↵Andreas Huber2010-10-011-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | no the middle..." into gingerbread Merge commit '57853559c31154db9c202d653065c592169c5027' * commit '57853559c31154db9c202d653065c592169c5027': Start playing live streams from the start, no the middle...
| * | | am e619a9da: Merge "Start playing live streams from the start, no the ↵Andreas Huber2010-10-011-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | middle..." into gingerbread Merge commit 'e619a9da44e4c00f9034917aef67f86da0bc207f' into gingerbread-plus-aosp * commit 'e619a9da44e4c00f9034917aef67f86da0bc207f': Start playing live streams from the start, no the middle...
| | * | Merge "Start playing live streams from the start, no the middle..." into ↵Andreas Huber2010-10-011-1/+1
| | |\ \ | | | | | | | | | | | | | | | gingerbread
| | | * | Start playing live streams from the start, no the middle...Andreas Huber2010-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie01ba1250b51155cb1fb32fc3340189a16c01476 related-to-bug: 2368598
* | | | | am d6d5cfb9: am 469b8033: Merge "Remove development-only code." into gingerbreadAndreas Huber2010-10-011-15/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16' * commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16': Remove development-only code.
| * | | | am 469b8033: Merge "Remove development-only code." into gingerbreadAndreas Huber2010-10-011-15/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '469b80336368bef3742e97c15e9017c1f2d404ae' into gingerbread-plus-aosp * commit '469b80336368bef3742e97c15e9017c1f2d404ae': Remove development-only code.
| | * | | Remove development-only code.Andreas Huber2010-10-011-15/+0
| | |/ / | | | | | | | | | | | | | | | | Change-Id: Ic2ca0efb631eb779ca157fb01b02aa19a1222c06 related-to-bug: 2368598
* | | | am 14401bf7: am d1398db3: Merge "Squashed commit of the following:" into ↵Andreas Huber2010-10-019-357/+597
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '14401bf7bca34c692f248406c78bd8b49783217a' * commit '14401bf7bca34c692f248406c78bd8b49783217a': Squashed commit of the following:
| * | | am d1398db3: Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-10-019-357/+597
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'd1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp * commit 'd1398db35cb2e4d918fc631dda35cacb8540b187': Squashed commit of the following:
| | * | Squashed commit of the following:Andreas Huber2010-10-019-357/+597
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 46744c7697f29aec71aed8de3c95ce035c284d97 Author: Andreas Huber <andih@google.com> Date: Thu Sep 30 16:44:57 2010 -0700 better separation of access units Change-Id: I5a9e2138aed341f0bcf22cfe368a15ca5ea5a73c commit d34952ac0feb1ae722ff65824d7353335502219b Author: Andreas Huber <andih@google.com> Date: Thu Sep 30 15:35:01 2010 -0700 Support for ES packets that do not start on PES packet boundaries. Change-Id: I2cf012833948eddfb20b16a1901206cf22ce71e4 related-to-bug: 2368598 Change-Id: Ib9329bd6bb7149b5a6e2483788a96b1b158952fc
* | | am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery ↵Eric Laurent2010-09-301-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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-0/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | 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-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 10b15c08: am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in ↵Chia-chi Yeh2010-09-283-55/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | frame_type_3gpp.h instead." into gingerbread Merge commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de' * commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de': AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
| * | am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h ↵Chia-chi Yeh2010-09-283-55/+19
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | instead." into gingerbread Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp * commit 'd6877fa4971710150de20453bf4ba54dca863429': AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
| | * Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." ↵Chia-chi Yeh2010-09-283-55/+19
| | |\ | | | | | | | | | | | | into gingerbread
| | | * AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.Chia-chi Yeh2010-09-293-55/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows gsmamr_enc.h and gsmamr_dec.h to be included in the same file without conflict definition. Change-Id: I1c8dac235c122735ba14a1af2fda48c0f8d9f87b
* | | | am b047e3cd: am aeb2c62e: Merge "Fix several audio effects problems." into ↵Eric Laurent2010-09-282-126/+211
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c' * commit 'b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c': Fix several audio effects problems.
| * | | am aeb2c62e: Merge "Fix several audio effects problems." into gingerbreadEric Laurent2010-09-282-126/+211
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68' into gingerbread-plus-aosp * commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68': Fix several audio effects problems.
| | * | Fix several audio effects problems.Eric Laurent2010-09-282-126/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the following issues in LVM effect bundle wrapper: - memory leaks in EffectCreate() in case effect creation fails at various stages - Added saturation when accumulating to output buffer - Fixed problems with enabled effects count when an effect is released while enabled - Do not allocate temporary buffer for accumulation each time process() is called Fixed the following issues in effects framework (AudioFlinger) - Release effect synchronously in the library when deleted from effect chain - Do not call the effect process function if no tracks are present in the same audio session Change-Id: Ifbd80a163415cfb3c0a337c12082853ea45d9c91
* | | | am 387bdcda: am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on ↵Andreas Huber2010-09-283-0/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread Merge commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd' * commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd': Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
| * | | am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek ↵Andreas Huber2010-09-283-0/+14
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread Merge commit '88a995edcf3c371845cb32aed8bcddb7509bf875' into gingerbread-plus-aosp * commit '88a995edcf3c371845cb32aed8bcddb7509bf875': Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
| | * | Merge "Properly flush the AudioTrack/AudioSink on a seek request and make ↵Andreas Huber2010-09-283-0/+14
| | |\ \ | | | | | | | | | | | | | | | sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread
| | | * | Properly flush the AudioTrack/AudioSink on a seek request and make sure that ↵Andreas Huber2010-09-283-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content. Change-Id: I4909fdf19518dbabb6c340e2a31b50dfe6c5b067 related-to-bug: 3029947
* | | | | am d6c30e8c: am be045061: Merge "Instead of constantly polling the ↵Andreas Huber2010-09-283-8/+27
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-283-8/+27
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.