summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Return the play stayed locked.Narayan Kamath2011-07-191-1/+3
| | | | | | | | I believe the the synchronized block is required to allow other threads to observe changes to mPlayState in a timely manner. Change-Id: I502b7401196c42932c9667ef73eb4cae16c3da16
* am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright ↵Conley Owens2011-07-181-1/+1
|\ | | | | | | | | | | | | aacenc: Mark codeWord as UWord16" * commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d': stagefright aacenc: Mark codeWord as UWord16
| * am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark ↵Conley Owens2011-07-181-1/+1
| |\ | | | | | | | | | | | | | | | | | | codeWord as UWord16" * commit 'a4aef41a74a69b0296b88361ffb33d0470a26362': stagefright aacenc: Mark codeWord as UWord16
| | * am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"Conley Owens2011-07-181-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3': stagefright aacenc: Mark codeWord as UWord16
| | | * Merge "stagefright aacenc: Mark codeWord as UWord16"Conley Owens2011-07-181-1/+1
| | | |\
| | | | * stagefright aacenc: Mark codeWord as UWord16Martin Storsjo2011-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, the codeword 0xffff will be expanded to 0xffffffff when passed as a Word32 parameter. All code words set into this variable are UWord16 initially. When it was expanded to 0xffffffff, it could accidentally overwrite earlier cached bits in the bitstream writer. Change-Id: Id91a2b8a4e934876d9cb39eaeeee323202ec8e40
* | | | | am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: ↵Deckard Autoverifier2011-07-181-3/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Include stdlib.h for malloc/free" * commit '3ab6ccda447c605c35c8854a2ec8c49c2a0653a6': stagefright: Include stdlib.h for malloc/free
| * | | | am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h ↵Deckard Autoverifier2011-07-181-3/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | for malloc/free" * commit '2acddc54e1e7a9f41b4b5acc2e8984c46539425a': stagefright: Include stdlib.h for malloc/free
| | * | | am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"Deckard Autoverifier2011-07-181-3/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '88409911aebed6c3663e51d51fca67f527c0c2fb': stagefright: Include stdlib.h for malloc/free
| | | * | Merge "stagefright: Include stdlib.h for malloc/free"Deckard Autoverifier2011-07-181-3/+1
| | | |\ \
| | | | * | stagefright: Include stdlib.h for malloc/freeMartin Storsjo2011-06-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to ANSI C, malloc/free are provided by stdlib.h. Also, string.h is always available according to ANSI C, and provides the memset function, so there's no need to include it conditionally for linux only. This makes the code buildable on OS X, too. Change-Id: Ie5d1da02158797e7e45dea257cbe3e4996dde4db
* | | | | | am b32af642: am 31140598: am 16db83c2: am eb07c531: Merge "stagefright ↵Deckard Autoverifier2011-07-181-73/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | amrwbenc: Remove a duplicate, unused file" * commit 'b32af642454f3113cb1539821eb3b0dbf4174974': stagefright amrwbenc: Remove a duplicate, unused file
| * | | | | am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a ↵Deckard Autoverifier2011-07-181-73/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | duplicate, unused file" * commit '31140598866c668047fc6dede7944e146aa21a0a': stagefright amrwbenc: Remove a duplicate, unused file
| | * | | | am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"Deckard Autoverifier2011-07-181-73/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'eb07c531498f4dc881ad2b4d1a32cacab25950ff': stagefright amrwbenc: Remove a duplicate, unused file
| | | * | | Merge "stagefright amrwbenc: Remove a duplicate, unused file"Deckard Autoverifier2011-07-181-73/+0
| | | |\ \ \
| | | | * | | stagefright amrwbenc: Remove a duplicate, unused fileMartin Storsjo2011-06-231-73/+0
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is identical to common/cmnMemory.c, and that's the file that is used by all the makefiles, not this one. Change-Id: I6a601c24a983285e55e5356bd5569853a1e2d7fe
* | | | | | am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright ↵Deckard Autoverifier2011-07-181-2/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacenc: Make the mem_malloc function 64-bit safe" * commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9': stagefright aacenc: Make the mem_malloc function 64-bit safe
| * | | | | 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 b7f0d825: am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only ↵Deckard Autoverifier2011-07-181-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use __int64 on MSVC, not on all win32 compilers" * commit 'b7f0d825c56dced10bb7df7cfc624ef9ebffe21c': stagefright: Only use __int64 on MSVC, not on all win32 compilers
| * | | | | 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
* | | | | Merge "MediaPlayer: add ANativeWindow (dis)connect calls"Jamie Gennis2011-07-181-5/+101
|\ \ \ \ \
| * | | | | MediaPlayer: add ANativeWindow (dis)connect callsJamie Gennis2011-07-141-5/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes MediaPlayer connect to the ANativeWindow to which it is going to render video frames and disconnect when it is done. Change-Id: I88ab5c2fe62493aabdc84a283ff31634f795d415
* | | | | | Merge "Add option to query hardware decoders only"Jean-Michel Trivi2011-07-181-16/+11
|\ \ \ \ \ \
| * | | | | | Add option to query hardware decoders onlyJean-Michel Trivi2011-07-181-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to OMXCodec::QueryCodecs() to filter out software codecs. Update stagefright command line tool to list the roles of codecs. Change-Id: Icddb79118c30fe13cc3aea20f340174cc082c4e0
* | | | | | | Merge "Always consider playlists corresponding to different bandwidths ↵Andreas Huber2011-07-181-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | different."
| * | | | | | | Always consider playlists corresponding to different bandwidths different.Andreas Huber2011-07-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I07bb3023af5046db93b4f8785eb90c6a4fb15b95
* | | | | | | | Merge "Fix seek behaviour at startup and teardown of media session that ↵Andreas Huber2011-07-182-3/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | hasn't been started"
| * | | | | | | Fix seek behaviour at startup and teardown of media session that hasn't been ↵Andreas Huber2011-07-152-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | started Nuplayer specific. Change-Id: I7b0be52c29bdb7032414d63c503d686df7844bf6
* | | | | | | | Merge "MTP: Use a single packet for the data phase"Mike Lockwood2011-07-183-80/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | MTP: Use a single packet for the data phaseMike Lockwood2011-07-173-80/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of sending 12 byte header in a separate packet. PTP on the Mac is much happier with this approach. Change-Id: I7d1ca498f6346afd88876d24332187b466fc469c Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | Audio preprocessing wrapper for webrtc.Eric Laurent2011-07-172-0/+1641
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This wrapper implements the interworking layer between the audio effect interface defined by the effect framework for audio preprocessing and the native interface of webrtc audio processing module. Change-Id: I3f9319730c102599cdf0dda520a53d90b4165114
* | | | | | | | Merge "Fix for issue 5007510 AssertionFailed for ↵Rajneesh Chowdury2011-07-151-4/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | MediaPropertiesTest#testPropertiesH263QCIF"
| * | | | | | | Fix for issue 5007510 AssertionFailed for ↵Rajneesh Chowdury2011-07-151-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPropertiesTest#testPropertiesH263QCIF Change-Id: I1c7c32fee491871223ad12df4696363415902377
* | | | | | | | Merge "Use unsigned char to store table of contents retrieved from XING ↵Gloria Wang2011-07-152-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | header. Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail."
| * | | | | | | | Use unsigned char to store table of contents retrieved from XING header.Gloria Wang2011-07-152-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail. Change-Id: I725e2d4dfe57ff36fdb1d65fe3184f7ab41ad695
* | | | | | | | | Merge "Refetch playlists according to the HLS specs, varying delay if ↵Andreas Huber2011-07-152-15/+124
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | playlists unchanged"
| * | | | | | | | Refetch playlists according to the HLS specs, varying delay if playlists ↵Andreas Huber2011-07-152-15/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unchanged since the previous fetch. Change-Id: I75e167a650c65a23e284381db5203beba7be7420 related-to-bug: 4983546
* | | | | | | | | Merge "Bug 5031179 possible fix for assert in join"Glenn Kasten2011-07-151-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug 5031179 possible fix for assert in joinGlenn Kasten2011-07-141-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3a24c152579b8fdcfb9d66a11aa11579406a7ec
* | | | | | | | | | MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia filesMike Lockwood2011-07-151-1/+3
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5025615 Change-Id: Ia910cd1c063292599a03b878755edb2e3cdbbb57 Signed-off-by: Mike Lockwood <lockwood@android.com>
generated by cgit v1.1 at 2025-04-03 13:49:54 +0000