summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation errors in libmedia, libstagefright.Rene Bolldorf2010-08-172-4/+4
| | | | | | (invalid conversion from 'const char*' to 'char*') Change-Id: Idef85606b7cff629b2778ed8134c79c892af54c2
* fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+3
| | | | Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
* move native services under services/Mathias Agopian2010-07-221-2/+2
| | | | | | | | moved surfaceflinger, audioflinger, cameraservice all native services should now reside in this location. Change-Id: Icd7336f7289db35df9c8c1857a5122bb8a6f1c86
* merge from open-source masterThe Android Open Source Project2010-06-181-1/+5
|\ | | | | | | Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
| * Change in media scanner to set correct dateMikael2 Svensson2010-06-061-1/+5
| | | | | | | | | | | | | | | | | | | | When the media scanner scanned a single file, the modified date (DATE_MODIFIED) was not correctly set in the content provider. It was set as milliseconds but should have been set as seconds. This caused downloaded media items to display wrongly in the camera album, since the date was wrong. Change-Id: I24cd92215c26f579eb33a4a3890f96c6ef9ec8c0
* | am 39e876ad: Merge "When filling the cache, we always time out waiting for a ↵James Dong2010-06-171-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo Merge commit '39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp * commit '39e876ad743f203fe005333947c61383772b0d14': When filling the cache, we always time out waiting for a condition that won't occur.
| * \ Merge "When filling the cache, we always time out waiting for a condition ↵James Dong2010-06-161-1/+3
| |\ \ | | | | | | | | | | | | that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
| | * | When filling the cache, we always time out waiting for a condition that ↵James Dong2010-06-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | won't occur. We are actually improving the power consumption for streaming applications like Pandora. Change-Id: Id32bacbc962e8c69c056599479b308d6a07b7a20
* | | | am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free ↵Dave Sparks2010-06-171-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into froyo-plus-aosp * commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b': TimedEventQueue is apparently important for glitch-free media playback, and so
| * | | TimedEventQueue is apparently important for glitch-free media playback, and soMarco Nelissen2010-06-161-0/+3
| |/ / | | | | | | | | | | | | | | | | | | having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal. Change-Id: I01843f24905790ce2e2cde5d11a99346cfbf968d
* | | am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to ↵Andreas Huber2010-06-031-12/+50
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo Merge commit '2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp * commit '2e3761ba43f634e97ac493f4b79e5e53954a1491': Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
| * | Merge "Changes to the prefetcher to allow for bursts of data to be ↵Andreas Huber2010-06-031-12/+50
| |\ \ | | | | | | | | | | | | transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
| | * | Changes to the prefetcher to allow for bursts of data to be transferred, ↵Andreas Huber2010-06-031-12/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | hopefully allowing the radio to go to low-power mode while idle. Change-Id: I03dbdac3cd250340059ea43b341129b30acce4e2 related-to-bug: 2736779
* | | | am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() ↵James Dong2010-06-031-2/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | should be called." into froyo Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp * commit '28a92b2e76a13c18dc23e5239717b122a174182f': Fix a Javadoc to clarify when setAudioStreamType() should be called.
| * | | Fix a Javadoc to clarify when setAudioStreamType() should be called.James Dong2010-06-031-2/+6
| |/ / | | | | | | | | | | | | | | | bug - 2737926 Change-Id: I8718c3d1a544cf5cb1b7e98b6c24fe0e6d3574ba
* | | am b0016e2b: Merge "Added the runtime parameters for the mediarecorder ↵Yu Shan Emily Lau2010-05-253-20/+126
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo Merge commit 'b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp * commit 'b0016e2b2162c916289d022f1572c0bc95158543': Added the runtime parameters for the mediarecorder stress test.
| * | Added the runtime parameters for the mediarecorder stress test.Yu Shan Emily Lau2010-05-253-20/+126
| | | | | | | | | | | | | | | | | | Set the total number of the stress loops of camera preview memory test to 200. Change-Id: I5a0278095155afd669ffee9bd599ddfffdcc42bf
* | | am 2723e092: Merge "Better handling of codec initialization failure in the ↵Andreas Huber2010-05-203-5/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo Merge commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp * commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e': Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
| * | Better handling of codec initialization failure in the player and thumbnail ↵Andreas Huber2010-05-203-5/+20
| | | | | | | | | | | | | | | | | | | | | extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize. Change-Id: I5cba02ee85a41e43c2623053de40f26e2cf2efe4 related-to-bug: 2699505
* | | merge from open-source masterThe Android Open Source Project2010-05-172-1/+5
|\ \ \ | | |/ | |/| | | | Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
| * | Merge "Modified libdrm to support SuperH platform"Jeff Hamilton2010-05-142-1/+5
| |\ \
| | * | Modified libdrm to support SuperH platformShin-ichiro KAWASAKI2009-07-032-1/+5
| | | | | | | | | | | | | | | | Added USTL_ANDROID_SH defination while build on SuperH platform
* | | | am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample ↵Andreas Huber2010-05-141-1/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | table refers to the custom datasource that caches the metadata to prevent needless seeking. Merge commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd' into froyo-plus-aosp * commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd': Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
| * | | Fix sampleTable instantiation, this makes sure that the sample table refers ↵Andreas Huber2010-05-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the custom datasource that caches the metadata to prevent needless seeking. Change-Id: I576178144ffd753b809e1c4ae269ffc3aa34b511 related-to-bug: 2686604 QA-Impact: well, ..., everything related to streaming mpeg4/aac content over http
* | | | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
| * | | Merge "Accept media files by file extension in case insensitive manner."Jean-Baptiste Queru2010-05-141-1/+1
| |\ \ \
| | * | | Accept media files by file extension in case insensitive manner.Atsushi Eno2010-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8e246010c96802ae87960797607fc8f8f2ab6031
* | | | | am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder ↵Andreas Huber2010-05-132-3/+10
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is passed an unsupported config. Merge commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp * commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b': Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
| * | | | Return a runtime error instead of asserting if the AACDecoder is passed an ↵Andreas Huber2010-05-132-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unsupported config. Change-Id: Ie084ed4df5a5d286abd36d9149c2138f8e7ed08a related-to-bug: 2682221 QA-impact: none
* | | | | am b1235a57: Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-121-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp * commit 'b1235a57a09174179553acecef2370354bdcbf41': Hide two audio focus methods.
| * | | | Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-111-0/+2
| |\ \ \ \
| | * | | | Hide two audio focus methods.Xavier Ducrohet2010-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I53ddf736892cde8edfaffa7d69dd9c234df52efa
* | | | | | am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, ↵Marco Nelissen2010-05-121-2/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo Merge commit '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp * commit '836b2d75ef86487ecae0ae834ecbab324fd99471': Don't clear the _data column in the audio_meta table, since it isn't
| * | | | | Don't clear the _data column in the audio_meta table, since it isn'tMarco Nelissen2010-05-111-2/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed, and causes a sqlite constraint exception. Bug 2671792. Change-Id: Ie6e5d0369c3750739fa155e651be4d87c016a41f
* | | | | am e0dc80f8: Merge "Support for customizable socket-read timeouts through ↵Andreas Huber2010-05-123-4/+33
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the HTTP response." into froyo Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp * commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc': Support for customizable socket-read timeouts through the HTTP response.
| * | | | Merge "Support for customizable socket-read timeouts through the HTTP ↵Andreas Huber2010-05-113-4/+33
| |\ \ \ \ | | | | | | | | | | | | | | | | | | response." into froyo
| | * | | | Support for customizable socket-read timeouts through the HTTP response.Andreas Huber2010-05-113-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify a response header of "X-SocketTimeout: 15" to override the default timeout of 5 secs with a timeout of 15 seconds. Specify a negative value to disable the timeout altogether. Change-Id: I545adf3d8b3f7efe5f8d081a641c6404440a77db related-to-bug: 2675721
* | | | | | am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis ↵Andreas Huber2010-05-122-9/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder after a discontinuity (seek)" into froyo Merge commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e' into froyo-plus-aosp * commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e': Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
| * | | | | Merge "Better seek handling and proper reset of the vorbis decoder after a ↵Andreas Huber2010-05-112-9/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | discontinuity (seek)" into froyo
| | * | | | | Better seek handling and proper reset of the vorbis decoder after a ↵Andreas Huber2010-05-112-9/+22
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discontinuity (seek) Change-Id: I3c76d35da48e0964f7a0fa2816f8573b5e1a9436 related-to-bug: 2674036 QA-impact: low, only affects ogg-vorbis playback through http
* | | | | | am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide ↵Jean-Michel Trivi2010-05-121-9/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the registerAudioFocusListener() methods." into froyo Merge commit '3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp * commit '3e90c76c12803cd1b116030fd124b7b870d25342': Update javadoc in android.media.AudioManager to not hide the
| * | | | | Update javadoc in android.media.AudioManager to not hide theJean-Michel Trivi2010-05-111-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | registerAudioFocusListener() methods. Change-Id: I8df37bd89df6f492aeb70fa636200552140578f9
* | | | | | am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user ↵Jean-Michel Trivi2010-05-122-22/+25
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listen Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp * commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c': Fix bug 2670395 and 2599698
| * | | | | Fix bug 2670395 and 2599698Jean-Michel Trivi2010-05-112-22/+25
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listener to not be called, which with the AudioFocus logic causes the Music app to pause and never resume. The NotificationPlayer modifications cause the MediaPlayer for the notification to only request audio focus when the data source is not empty. The audio focus code in AudioService is defensively synchronized against a unique lock, and the exception observed in bug 2670395 is explicitely caught in case another edge case wasn't caught by this fix. The AudioFocus handling in AudioManager is modified so only the requestAudioFocus and abandonAudioFocus methods are meant to be used, as registerAudioFocusListener and unregisterAudioFocusListener provided no additional functionality over the request/abandon methods. abandonAudioFocus() also removes the listener from the map in AudioManager since after abandonning focus, the listener would no longer be called. Change-Id: I3b553ee8a8163c25e01117d7e5479dd5fdfa7c6b
* | | | | am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support ↵Andreas Huber2010-05-1014-371/+964
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | approximate seeking." into froyo Merge commit 'd13efb20089e44e6958cb9704864c03821f19e1c' into froyo-plus-aosp * commit 'd13efb20089e44e6958cb9704864c03821f19e1c': A new OggExtractor/VorbisDecoder combo to support approximate seeking.
| * | | | A new OggExtractor/VorbisDecoder combo to support approximate seeking.Andreas Huber2010-05-0714-371/+964
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95 related-to-bug: 2654400
* | | | | am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into ↵Andreas Huber2010-05-068-5/+106
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | froyo Merge commit '100ef9bee48c9beb83d885d233de6a42c64f55af' into froyo-plus-aosp * commit '100ef9bee48c9beb83d885d233de6a42c64f55af': Disable vorbis seek when streaming from localhost.
| * | | | Merge "Disable vorbis seek when streaming from localhost." into froyoAndreas Huber2010-05-068-5/+106
| |\ \ \ \
| | * | | | Disable vorbis seek when streaming from localhost.Andreas Huber2010-05-068-5/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icda523ae1c89e26482f1c1767fe3a8b9222bb30f related-to-bug: 2654400
* | | | | | am 2d315667: For issue #2651381, allow library prelinking.Dan Bornstein2010-05-055-10/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2' into froyo-plus-aosp * commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2': For issue #2651381, allow library prelinking.
generated by cgit v1.1 at 2025-01-10 19:20:14 +0000