summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* DRM framework support:Gloria Wang2010-10-2510-41/+793
| | | | | | | | | | - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
* 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
* 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.
| * 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 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
* | 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
* | | 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
* | | 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
* | | | 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
* | | A new OggExtractor/VorbisDecoder combo to support approximate seeking.Andreas Huber2010-05-0714-371/+964
| | | | | | | | | | | | | | | Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95 related-to-bug: 2654400
* | | 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
* | | | For issue #2651381, allow library prelinking.Dan Bornstein2010-05-055-10/+0
|/ / / | | | | | | | | | Change-Id: I119348b55ad0015a286e9c94709977cd1973a7e1
* | | Support for Ogg Vorbis decoding in stagefright.Andreas Huber2010-05-047-7/+413
| | | | | | | | | | | | | | | | | | | | | Set the magic property media.stagefright.enable-vorbis to true to use the new implementation instead of the standalon vorbis player for file-based playback. HTTP streaming of vorbis content will always go through stagefright. Change-Id: Ie3843a99fadb22372f89540d0f8d65196e0c2af8 related-to-bug: 2654400
* | | Switch to use software MP3 decoderJames Dong2010-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low. bug - 2608400 Change-Id: Ia0b5b6521015fc8d3e086117fa914dcc20ace5bd
* | | Apparently select() does not immediately return if one of the masked socket ↵Andreas Huber2010-04-202-27/+14
| | | | | | | | | | | | | | | | | | | | | descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead. Change-Id: Ic2d4a8f5b6bbf16772fba39377809ec68d249c1f related-to-bug: 2611257
* | | Don't coalesce more than 250ms worth of encoded data into a single codec ↵Andreas Huber2010-04-201-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place. In certain edge cases (encoded audio track contains silence), each buffer would turn out to be an amazing 6(!!!) bytes, we'd spend lots and lots of time streaming network data to fill the codec's buffers of size 6144 bytes with .. silence. Change-Id: I9f449f310fc64ca384bd02e4a783e33cf5b46fcc related-to-bug: 2609049 QA-Impact: streamed (http) playback of aac audio content on Droid.
* | | Use PV_PLAYER to handle RTSP streamingJames Dong2010-04-141-0/+5
| | | | | | | | | | | | | | | | | | bug - 2594865 Change-Id: Ice5b89b1d53bbc4da033892fe545bdf51ac7267f
* | | Snif more 3GPP file types according to http://www.ftyps.com/3gpp.htmlJames Dong2010-04-131-0/+2
| | | | | | | | | | | | | | | | | | bug - 2575956 Change-Id: Iaa79e74d3b0585397a7e833ec45472710fc52fa6
* | | Merge "Better diagnostics in the stagefright commandline tool, support for ↵Andreas Huber2010-04-131-1/+1
|\ \ \ | | | | | | | | | | | | playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." into froyo
| * | | Better diagnostics in the stagefright commandline tool, support for playing ↵Andreas Huber2010-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a". related-to-bug: 2553359 Change-Id: Ic49eb89feb62474d9513bc21571e0e8fe3a15e0b
* | | | Merge "Don't set encoder component role while we query decoders" into froyoJames Dong2010-04-131-1/+1
|\ \ \ \
| * | | | Don't set encoder component role while we query decodersJames Dong2010-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug - 2558515 Change-Id: I29683507d234d963994c782c07508034ea807739
* | | | | Fix for 2581725. Keep the last frame after resume(), and delete itGloria Wang2010-04-131-2/+14
| |/ / / |/| | | | | | | | | | | | | | | | | | | in the next suspend() or reuse it if no new frame is available. Change-Id: I84286030eaae9061077d6ccb485b7dd53ef05341
* | | | Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we ↵Andreas Huber2010-04-125-11/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks. Change-Id: Ic9a9198413431db4ea40bb63b9de91aa8a7183af related-to-bug: 2587341
* | | | Fix a race condition in TimedEventQueue, an event may be cancelled while ↵Andreas Huber2010-04-122-9/+36
|/ / / | | | | | | | | | | | | | | | | | | we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice. Change-Id: I4e42e318fd5373d1f352f54027d4bf823126266d related-to-bug: 2585276
* | | Merge "Fix a case where the aac hardware decoder is in a transition state ↵Andreas Huber2010-04-121-1/+7
|\ \ \ | | | | | | | | | | | | and refused a fillbuffer request." into froyo
| * | | Fix a case where the aac hardware decoder is in a transition state and ↵Andreas Huber2010-04-121-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | refused a fillbuffer request. Change-Id: I4cabd18709c29db0a2763a01cc86525ba0b0aeb7 related-to-bug: 2575976
* | | | Merge "Ignore corrupt aac audio frames and substitute silence." into froyoAndreas Huber2010-04-121-12/+19
|\ \ \ \
| * | | | Ignore corrupt aac audio frames and substitute silence.Andreas Huber2010-04-121-12/+19
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I544f98a5c00d912061db7921fc4518435209b168 related-to-bug: 2575976
* | | | Start sending out buffering updates earlier (after preparation has ↵Andreas Huber2010-04-121-2/+4
|/ / / | | | | | | | | | | | | | | | | | | completed) instead of only after playback has started. Change-Id: Ieaa90cc9b54bd56963aa5f4daced2ba243801acf related-to-bug: 2585913
* | | Merge "Support for ID3 V2.4 tags." into froyoAndreas Huber2010-04-092-24/+118
|\ \ \
| * | | Support for ID3 V2.4 tags.Andreas Huber2010-04-082-24/+118
| | | | | | | | | | | | | | | | | | | | Change-Id: I74ee02451bdfd7e50f0d5ff6fa5da5147b683e4c related-to-bug: 2581869
* | | | Refactor connection/redirection code, support redirects on reconnection.Andreas Huber2010-04-081-140/+96
| | | | | | | | | | | | | | | | | | | | Change-Id: Id2517568000e028b01553c06a4893813a6883168 related-to-bug: 2580785
* | | | Increase the size of the pages used in CachingDataSource (total amount of ↵Andreas Huber2010-04-083-5/+24
|/ / / | | | | | | | | | | | | | | | | | | memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection. Change-Id: Ic9a6ef204362bc9afdc61e081c76bc62e5ef92ad related-to-bug: 2580785
* | | Report the requested seek time while seek is in progress.Andreas Huber2010-04-071-2/+5
| | | | | | | | | | | | | | | Change-Id: I862bfb801701f9ce54dede51c492e4eb37591894 related-to-bug: 2576102
* | | Partial revert of previous change to improve hardware AAC decoder ↵Andreas Huber2010-04-061-20/+0
| | | | | | | | | | | | | | | | | | | | | performance, increasing the input buffer size so dramatically accidentally broke streaming performance. Change-Id: I14e9fbc1fdff61bcf89218d83cb1d2e3d6eb8438 related-to-bug: 2574491
generated by cgit v1.1 at 2025-01-11 09:15:13 +0000