summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into ↵Andreas Huber2011-01-283-20/+46
|\ | | | | | | | | | | | | honeycomb * commit 'b0eb8bb76c585e5e9d426fa8b8f4df17a240e6c4': More robust parsing of NPT time ranges in RTSP.
| * More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
| | | | | | | | | | Change-Id: I3674501d2fd66aaface805c0a8678c74671a6dd3 related-to-bug: 3217210
* | am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio ↵Andreas Huber2011-01-261-1/+4
|\ \ | |/ | | | | | | | | | | with extra trailing bytes." into honeycomb * commit '63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73': This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
| * Merge "This particular RTSP server streams MPEG4-LATM audio with extra ↵Andreas Huber2011-01-261-1/+4
| |\ | | | | | | | | | trailing bytes." into honeycomb
| | * This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.Andreas Huber2011-01-261-1/+4
| | | | | | | | | | | | | | | | | | | | | And now we're just ignoring them. Yay standards. Change-Id: I76529ad8d585f143d6f99621ff671d179caf7b35 related-to-bug: 3353752
* | | am a13732e1: Merge "MTP: Fix month off by one error in date parsing and ↵Mike Lockwood2011-01-261-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | formatting code" into honeycomb * commit 'a13732e17a0f3d69df9c418407985b3ad64b1852': MTP: Fix month off by one error in date parsing and formatting code
| * | Merge "MTP: Fix month off by one error in date parsing and formatting code" ↵Mike Lockwood2011-01-261-2/+4
| |\ \ | | |/ | |/| | | | into honeycomb
| | * MTP: Fix month off by one error in date parsing and formatting codeMike Lockwood2011-01-261-2/+4
| | | | | | | | | | | | | | | | | | | | | BUG: 3379100 Change-Id: Ib386f0def9d611529ce0528b8159cef48df9cd85 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am 7fb232c4: Merge "Make sure that key frame is generated for timelapse ↵James Dong2011-01-264-3/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | video recording if there are at least two input video frames from camera source." into honeycomb * commit '7fb232c40cde91d0958be1694db2d97a126b95f9': Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
| * | Make sure that key frame is generated for timelapse video recording if there ↵James Dong2011-01-264-3/+30
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are at least two input video frames from camera source. This will fix the stop failure issue where we have to wait n * time_interval before a key frame can be received by the file writer, where o n is the actual number of buffers advertised by the video encoder o time_interval is the interval settings for timelapse video recording specifying the time distance between neighboring input video frames The fix includes two parts: o OMXCodec will not submit all n buffers at one time, but instead submit one input frame at one time if it become available. o Timelapse camera source made available the first two input frames and do not skip them so that the first compressed output frame data can be received regardless the specified time_interval bug - 3367659 Change-Id: Ia68cc2cb0d71aa7dc54540e9ad82fae911ad530b
* | am 373d357a: Merge "More instrumentation to track down the hardware decoder ↵Andreas Huber2011-01-262-2/+20
|\ \ | |/ | | | | | | | | | | not shutting down bug." into honeycomb * commit '373d357a8b13dc2cdc82d9e1d6144fb26e3bb202': More instrumentation to track down the hardware decoder not shutting down bug.
| * Merge "More instrumentation to track down the hardware decoder not shutting ↵Andreas Huber2011-01-262-2/+20
| |\ | | | | | | | | | down bug." into honeycomb
| | * More instrumentation to track down the hardware decoder not shutting down bug.Andreas Huber2011-01-262-2/+20
| | | | | | | | | | | | | | | Change-Id: I3f31b6fdf5c90b436567bbce578dcbc4666ed7c2 related-to-bug: 3362836
* | | am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." ↵Andreas Huber2011-01-261-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | into honeycomb * commit '6df89fde0db446bb530ab872b373b1faa3ccb06c': Ignore errors returned from native_window_set_crop.
| * | Ignore errors returned from native_window_set_crop.Andreas Huber2011-01-261-2/+3
| |/ | | | | | | | | | | | | If the surface is already invalid, we'll know soon enough. Change-Id: If360ffb8293817afb47df8c1a75722aea74bb335 related-to-bug: 3394601
* | am 7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not ↵Andreas Huber2011-01-261-17/+79
|\ \ | |/ | | | | | | | | | | abort pending recv/send calls." into honeycomb * commit '7765c65dbe1ba8f2229f2fec5a83ba2d1da79733': Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
| * Merge "Linux sockets suck, closing a socket descriptor does not abort ↵Andreas Huber2011-01-261-17/+79
| |\ | | | | | | | | | pending recv/send calls." into honeycomb
| | * Linux sockets suck, closing a socket descriptor does not abort pending ↵Andreas Huber2011-01-261-17/+79
| | | | | | | | | | | | | | | | | | | | | recv/send calls. Change-Id: Id53e7831761619f72ddc61f63571230011c93f16 related-to-bug: 3362836
* | | am d030359f: Merge "Instead of not feeding the AudioTrack any data after ↵Andreas Huber2011-01-261-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | EOS, play silence instead." into honeycomb * commit 'd030359ff10a031c762d4f229d9c1bdfd366cb50': Instead of not feeding the AudioTrack any data after EOS, play silence instead.
| * | Instead of not feeding the AudioTrack any data after EOS, play silence instead.Andreas Huber2011-01-261-1/+3
| |/ | | | | | | | | Change-Id: I9aa797cf5bb58eefed51d732f4e5d09450551158 related-to-bug: 3347428
* | am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after ↵Mike Lockwood2011-01-251-32/+35
|\ \ | |/ | | | | | | | | | | we are done scanning" into honeycomb * commit 'f10d940413000732f1cd35bcb113c41019c7e3b7': StagefrightMediaScanner: Close metadata retriever after we are done scanning
| * Merge "StagefrightMediaScanner: Close metadata retriever after we are done ↵Mike Lockwood2011-01-251-32/+35
| |\ | | | | | | | | | scanning" into honeycomb
| | * StagefrightMediaScanner: Close metadata retriever after we are done scanningMike Lockwood2011-01-251-32/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the mediaserver from leaking a file descriptor after the media scanner runs BUG: 3373546 Change-Id: I82a8bae82306de3da56a5c7da5b03ecf106a4efc Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am 3115dad3: Merge "Report errors to applications if AudioRecord->start() ↵James Dong2011-01-253-13/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | fails" into honeycomb * commit '3115dad3fc8493ff510b9f6a46b18d951bf5c162': Report errors to applications if AudioRecord->start() fails
| * | Report errors to applications if AudioRecord->start() failsJames Dong2011-01-253-13/+27
| |/ | | | | | | | | | | bug - 3385198 Change-Id: I86ac8071eb28a538b333e102192193d1b9eda5eb
* | am 4b440268: am c929677e: Merge "Increase the number of useful bits in the ↵Marco Nelissen2011-01-251-2/+7
|\ \ | |/ |/| | | | | | | | | spectrum." into gingerbread * commit '4b44026879723d924ddc306ea1e330a9e87c3a1c': Increase the number of useful bits in the spectrum.
| * am c929677e: Merge "Increase the number of useful bits in the spectrum." ↵Marco Nelissen2011-01-251-2/+7
| |\ | | | | | | | | | | | | | | | | | | into gingerbread * commit 'c929677e017759047d94599faa1b80ebe278fefb': Increase the number of useful bits in the spectrum.
| | * Merge "Increase the number of useful bits in the spectrum." into gingerbreadMarco Nelissen2011-01-251-2/+7
| | |\
| | | * Increase the number of useful bits in the spectrum.Marco Nelissen2011-01-241-2/+7
| | | | | | | | | | | | | | | | Change-Id: I3efc2ac8db689285566df35cb6f594aab41141db
| * | | am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in ↵Andreas Huber2011-01-243-9/+23
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | MPEG4/H.263 software decoder * commit 'efebdf4bd4da35bc50c7d81450c8473697f6654a': DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
| | * | DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software ↵Andreas Huber2011-01-243-9/+23
| | |/ | | | | | | | | | | | | | | | | | | decoder Change-Id: I6c27c00a6e13cb3635e61089c0db0989f5810c37 related-to-bug: 3384367
| * | am 65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to ↵Dave Sparks2011-01-202-3/+31
| |\ \ | | |/ | | | | | | | | | | | | | | | instantiate the media extractor." into gingerbread * commit '65d39eeb9b032e5507a01daa25afff62b29bffe4': DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
| | * DO NOT MERGE: Prefill the cache before trying to instantiate the media ↵Andreas Huber2011-01-192-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extractor. The latter is an operation that otherwise could block on the datasource for a significant amount of time. During that time we'd be unable to abort the preparation phase without this prefill. Change-Id: I3bc889b264f599bfd5c2bbdf48b88ccb55d86172 related-to-bug: 3362836
| * | am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not ↵Andreas Huber2011-01-191-4/+81
| |\ \ | | |/ | | | | | | | | | | | | | | | return an error from blocking "connect"" into gingerbread * commit 'e9a00235c102d198a702bc665b2ea5b5e8c4bc07': DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
| | * DO NOT MERGE: Apparently our native TCP sockets do not return an error from ↵Andreas Huber2011-01-181-4/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | blocking "connect" if the network interface is shutdown while connecting. Change-Id: I168c6026de24812efa9b7e607a9eb83efded8c1f related-to-bug: 3362836
| * | merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-147-143/+48
| |\ \ | | |/ | | | | | | Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
| | * Squash commits of the following patches, cherry-picked from other branch - ↵James Dong2011-01-127-143/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not merge. o Prepare for publishing MediaMetadataRetriever as public API step one: o replaced captureFrame with getFrameAtTime o removed getMode o Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime() as part of the preparation for publishing MediaMetadataRetriever as public Java API o Remove captureFrame from MediaMetadataRetriever.java class It has been replaced by getFrameAtTime() method o Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java o Publish MediaMetadataRetriever.java as public API o Removed setMode() methods and related mode constants o Removed some of the unused the metadata keys o Updated the javadoc o part of a multi-project change. bug - 3309041 Change-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4
| * | am 7c615360: Fail to parse duration instead of asserting, if the server ↵Andreas Huber2011-01-121-5/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | response cannot be parsed. * commit '7c6153606cc963191362494c8cb5669749e84326': Fail to parse duration instead of asserting, if the server response cannot be parsed.
| | * Fail to parse duration instead of asserting, if the server response cannot ↵Andreas Huber2011-01-121-5/+7
| | | | | | | | | | | | | | | | | | | | | be parsed. Change-Id: I95c61ed83800db82e99c0023b942fb8ae05ed3cf related-to-bug: 3338518
| * | am 7e2f9cc8: DO NOT MERGE: Fix Matroska issuesAndreas Huber2011-01-113-75/+317
| |\ \ | | |/ | | | | | | | | | * commit '7e2f9cc81da788006790365ff11f06551fc1bc26': DO NOT MERGE: Fix Matroska issues
| | * DO NOT MERGE: Fix Matroska issuesAndreas Huber2011-01-113-75/+317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 3331623 Squashed commit of the following: commit 8484811f3784564ce962ec1b6311bac532d73ffc Author: Andreas Huber <andih@google.com> Date: Tue Jan 11 11:56:06 2011 -0800 Properly parse Matroska lacing flags and extract all frames contained in a block. related-to-bug: 3331623 commit 38f1f39381a01659577461b3d35bd22db45ba317 Author: Andreas Huber <andih@google.com> Date: Mon Nov 15 15:10:34 2010 -0800 Proper support for variable NALsize lengths of AVC content in .mkv files. related-to-bug: 3197442 Change-Id: I4b404f3c3d0a2a2fa336b9edff75eb25ffc66a2f
| * | resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosprepo sync2011-01-118-38/+689
| |\ \ | | |/ | | | | | | Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
| | * DO NOT MERGE: Fix parsing of ntp= PLAY response.Andreas Huber2011-01-118-39/+690
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 3340186 Squashed commit of the following: commit b61c36b7228aec9f5360883b1e1c1e0530488974 Author: Andreas Huber <andih@google.com> Date: Wed Oct 27 13:59:59 2010 -0700 Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries. commit b10f322c07e5bebcaf032e8624cb4a5d733dfc15 Author: Andreas Huber <andih@google.com> Date: Mon Oct 25 09:40:52 2010 -0700 We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets. commit 0aa83cf9e4637adf9501708fcdf7d0d6d4dc4fe1 Author: Andreas Huber <andih@google.com> Date: Wed Oct 20 15:00:34 2010 -0700 Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF. related-to-bug: 3084183 Change-Id: I6e512cb73cc8d5624a83f7154aa5699f7fef7534
| * | am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure ↵James Dong2011-01-102-5/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread * commit '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27': Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
| | * Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not ↵James Dong2011-01-102-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hold the last reference of OMXCodec object - do not merge cherry-picked from: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89 bug - 3336424 Change-Id: I2d8ecb79a5422342988c195c012c9e6327ac457a
| * | am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and ↵Marco Nelissen2011-01-065-0/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | also add support for two common ways of specifying album artist in ogg files. b/3311831 * commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75': Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
| | * Add support for the "compilation" tag in mp3, mp4 and ogg, and also addMarco Nelissen2011-01-065-0/+17
| | | | | | | | | | | | | | | | | | | | | support for two common ways of specifying album artist in ogg files. b/3311831 Change-Id: Iba1152013b7577168af71f947d7249560419fa05
| * | am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio ↵Eric Laurent2010-12-161-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | while recording over bluetooth SCO." into gingerbread * commit '5a756fb0f1f3f8cd7612284c889dfc69875577a8': Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
| | * Fix issue 2712130: Sholes: problem when playing audio while recording over ↵Eric Laurent2010-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bluetooth SCO. The problem is that when an input stream is opened for record over bluetooth SCO, the kernel mono audio device should be opened in RW mode to allow further use of this same device by an output stream also routed to bluetooth SCO. This does not happen because of a bug in AudioSystem::isBluetoothScoDevice() that does not return true when the device is DEVICE_IN_BLUETOOTH_SCO_HEADSET (input device for blurtooth SCO). Change-Id: Ic78bf324b4a68e65721d763dc7682ce7a8f14f75
| * | am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the ↵James Dong2010-12-081-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | renderer was initialized, go back to read from source again" into gingerbread * commit '1f5b133ae29090f1807be392874f6b7a5d92c6d4': When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
generated by cgit v1.1 at 2025-01-31 15:16:42 +0000