summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the ↵Deckard Autoverifier2011-07-181-2/+7
|\ | | | | | | | | | | | | mem_malloc function 64-bit safe" * commit '29fd8cdbe554ca65c57dd9eea59dc57e3392acc3': stagefright aacenc: Make the mem_malloc function 64-bit safe
| * am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit ↵Deckard Autoverifier2011-07-181-2/+7
| |\ | | | | | | | | | | | | | | | | | | safe" * commit 'c06c3603e09a85136eb97d1d8ba1a49fcebae93b': stagefright aacenc: Make the mem_malloc function 64-bit safe
| | * Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"Deckard Autoverifier2011-07-181-2/+7
| | |\
| | | * stagefright aacenc: Make the mem_malloc function 64-bit safeMartin Storsjo2011-06-221-2/+7
| | | | | | | | | | | | | | | | Change-Id: I720109133bf5e13388b26a3bdbd66ff1f5320b70
* | | | am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 ↵Deckard Autoverifier2011-07-181-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | on MSVC, not on all win32 compilers" * commit '691257b1812ffd8172b01c17b9ba23a48eb76594': stagefright: Only use __int64 on MSVC, not on all win32 compilers
| * | | am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 ↵Deckard Autoverifier2011-07-181-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | compilers" * commit '55f115a3214343c826acf27fcbc4bf2927049083': stagefright: Only use __int64 on MSVC, not on all win32 compilers
| | * | Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"Deckard Autoverifier2011-07-181-1/+1
| | |\ \
| | | * | stagefright: Only use __int64 on MSVC, not on all win32 compilersMartin Storsjo2011-06-221-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: I9eef7e1cb762753b792ab602333dc5a2fd8a173c
* | | | am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: ↵Conley Owens2011-07-18150-5154/+5154
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Remove trailing whitespace" * commit '45ddd42544167494cee7213ecddcb6f8057c86c0': stagefright aacenc/amrwbenc: Remove trailing whitespace
| * | | am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"Conley Owens2011-07-18150-5154/+5154
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2': stagefright aacenc/amrwbenc: Remove trailing whitespace
| | * | Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"Conley Owens2011-07-18150-5154/+5154
| | |\ \ | | | |/ | | |/|
| | | * stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2011-04-23150-5154/+5154
| | | | | | | | | | | | | | | | Change-Id: I3c85d8ba4cfb164455d137cdbf3b5ecc941dc6b8
* | | | am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 ↵James Dong2011-06-092-12/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seconds - do not merge."" into honeycomb-mr2 * commit '2488a94350e0c0b088da2646557c9a0f3a0e9847': Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
| * \ \ \ am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do ↵James Dong2011-06-092-12/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not merge."" into honeycomb-mr2 * commit 'e3b80c838753fe8c9049950216c6379098465810': Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
| | * \ \ \ Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" ↵James Dong2011-06-092-12/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2
| | | * | | | Revert "Add avg bandwidth estimate every 2 seconds - do not merge."James Dong2011-05-192-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec78f551b575b0274cbe796f8e08a9df1a706680.
* | | | | | | am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line ↵Conley Owens2011-06-09185-30089/+30089
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | breaks to Unix style" * commit '644f36eab4eb9911ad897c9caae68b9c5a72388f': stagefright aacenc/amrwbenc: Convert line breaks to Unix style
| * | | | | | am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix ↵Conley Owens2011-06-09185-30089/+30089
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style" * commit 'd8b027b18f5a922ef729c6ee363eecb053358d47': stagefright aacenc/amrwbenc: Convert line breaks to Unix style
| | * | | | | Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"Conley Owens2011-06-09185-30089/+30089
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | | | | | | am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | * commit '90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f': Make sure we don't read from invalid fds
| * | | | | am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e': Make sure we don't read from invalid fds
| | * | | | | Make sure we don't read from invalid fdsMarco Nelissen2011-06-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/4580570 Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
| * | | | | | am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket ↵Andreas Huber2011-06-021-17/+79
| |\ \ \ \ \ \ | | |/ / / / / | | | / / / / | | |/ / / / | |/| | | | | | | | | | | | | | | | descriptor does not abort pending recv/send calls. * commit '8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d': DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
| | * | | | DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not ↵Andreas Huber2011-06-011-17/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abort pending recv/send calls. Change-Id: Iaee1821257a25a5257d93c9f5ba3976748cad619 related-to-bug: 3362836, 4439092
| * | | | | am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately ↵Andreas Huber2011-04-183-12/+26
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when trying to satisfy a read. * commit 'f0f1ceeb517ff226532a407da6d55602f195e5b5': DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
| | * | | | DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to ↵Andreas Huber2011-04-143-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | satisfy a read. Change-Id: I27c2b5d20ae577e71936d32522f70f6ba08cc247 related-to-bug: 4286618
| * | | | | am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative ↵James Dong2011-04-041-2/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | value, report an error to application. DO NOT MERGE." into gingerbread * commit 'ea5d2c584490424be6bbc27dec58b4f9868d631e': When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
| | * | | | When read() from AudioRecord returns 0 or negative value, report an error to ↵James Dong2011-03-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application. DO NOT MERGE. Change-Id: I3a66fd0ed3f6b90350d706a608a39d8b4a398e32 related-to-bug: 4195127
| * | | | | am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into ↵James Dong2011-03-112-8/+47
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '68f66b945e7a69549689becd2e656d9056f1e7f5': MP3Extractor and MP3 decoder fixes - DO NOT MERGE
| | * | | | MP3Extractor and MP3 decoder fixes - DO NOT MERGEJames Dong2011-03-112-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-picked the following patches from HC branch: o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode o When the temp buffer wraps around, the next read position should start from what have been read to avoid reading the same remaining bytes in the buffer again. o Speed up MP3Extractor using cached reads bug - 4083532 Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
* | | | | | am c1ded373: Merge "Revert "Use pread() to get the decrypted data for ↵James Dong2011-05-251-7/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | container based DRM file."" into honeycomb-mr2 * commit 'c1ded373951f8bd489401e93f2dd512ff9705a49': Revert "Use pread() to get the decrypted data for container based DRM file."
| * | | | | Revert "Use pread() to get the decrypted data for container based DRM file."James Dong2011-05-251-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a6f1104b9d829c636b60b9387e379f9667b5df09.
* | | | | | am ef89cc14: Merge "Multi-repository checkin, goes with ↵Jeffrey Tinker2011-05-232-19/+19
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/111038" into honeycomb-mr2 * commit 'ef89cc14957ab631346564801841190346632ac9': Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
| * | | | | Merge "Multi-repository checkin, goes with ↵Jeffrey Tinker2011-05-232-19/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/111038" into honeycomb-mr2
| | * | | | | Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038Jeffrey Tinker2011-05-232-19/+19
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for b/4198446 HC - Support for Widevine Adaptive VOD Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
* | | | | | am a5293d1c: Add some logging to track down where ANR happens during ↵James Dong2011-05-232-1/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer._release(). * commit 'a5293d1ca4459293f4993ea39c09ea703a022844': Add some logging to track down where ANR happens during MediaPlayer._release().
| * | | | | Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-232-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o add a log message in AwesomePlayer::reset before acquiring the lock Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb related-to-bug: 4409547
* | | | | | am a6f1104b: Use pread() to get the decrypted data for container based DRM ↵Gloria Wang2011-05-201-0/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file. For bug 4392094. * commit 'a6f1104b9d829c636b60b9387e379f9667b5df09': Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
| * | | | | Use pread() to get the decrypted data for container based DRM file.Gloria Wang2011-05-201-0/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | For bug 4392094. Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
* | | | | am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content ↵James Dong2011-05-184-29/+155
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | no longer" into honeycomb-mr2 * commit 'd148a499c27145e0473f89ece0500ebed38f875f': Using widevine:// to stream adaptive bitrate wvm content no longer
| * | | | Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" ↵James Dong2011-05-184-29/+155
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into honeycomb-mr2
| | * | | | Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-104-29/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses stagefright's http cache but defers caching to the WVMExtractor, which now has the responsibility of reporting buffer status/duration. Change-Id: Ieec64a20203977fd0a61d0c6834da124de78bfa2 related-to-bug: 4390283
* | | | | | am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the ↵Gloria Wang2011-05-182-8/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | following:" into honeycomb-mr2 * commit '07e9267d33bb199d0a2b8de221c64541bdf2465a': DO NOT MERGE For bug 4422428 Squashed commit of the following:
| * | | | | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into ↵Gloria Wang2011-05-182-8/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2
| | * | | | | DO NOT MERGEGloria Wang2011-05-132-8/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For bug 4422428 Squashed commit of the following: commit ae2e13783db2284f40d3891e70e152dab941edfc Author: Gloria Wang <gwang@google.com> Date: Fri May 13 11:43:11 2011 -0700 Add one more DRM error code. For bug 4422428. Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6 commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2 Author: Gloria Wang <gwang@google.com> Date: Fri Apr 29 10:44:46 2011 -0700 Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394 Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
* | | | | | am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even ↵Andreas Huber2011-05-171-1/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if sizeof(codec-specific-data) != 2" into honeycomb-mr2 * commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c': DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
| * | | | | DO NOT MERGE: Properly construct the ESDS metadata even if ↵Andreas Huber2011-05-041-1/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sizeof(codec-specific-data) != 2 Change-Id: Ie711ea8d6956fa8370c78e23bf795325627164d1 related-to-bug: 4381047
* | | | | am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-292-0/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ec78f551b575b0274cbe796f8e08a9df1a706680': Add avg bandwidth estimate every 2 seconds - do not merge.
| * | | | Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-282-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is meant for testing only. We will remove this patch once we tracked down all those spinning issues. related-to-bug: 4339075 Change-Id: I4cf1927f1067d4f7dbc589ceb3c47407eaf40ae7
generated by cgit v1.1 at 2024-09-17 02:34:32 +0000