summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix issue 5012047: silent mode mutes music"Eric Laurent2011-07-201-9/+16
|\
| * Fix issue 5012047: silent mode mutes musicEric Laurent2011-07-191-9/+16
| | | | | | | | | | | | | | | | Implemented different silent mode behaviors for tablets and phones. The behavior inherited from Honeycomb was for tablets only and was muting music in silent mode. Change-Id: Ib053e7b70ca02190debc87648ab8a163f9d39577
* | Merge "MediaPlayer: add a disconnect from ANativeWindow"Jamie Gennis2011-07-201-0/+2
|\ \
| * | MediaPlayer: add a disconnect from ANativeWindowJamie Gennis2011-07-191-0/+2
| | | | | | | | | | | | | | | | | | | | | This change makes MediaPlayer::disconnect disconnect from the ANativeWindow once the player has been disconnected. Change-Id: I6744559030d1edc520cf77402d1f5ce841742340
* | | Merge "Content found in the wild violated the MPEG4 systems specs"Andreas Huber2011-07-201-1/+19
|\ \ \
| * | | Content found in the wild violated the MPEG4 systems specsAndreas Huber2011-07-191-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | but other players apparently worked around it as well, so we do to. Change-Id: I8269d2344b010d1d704028c8a9c05bddab53828d related-to-bug: 5049979
* | | | Merge "Fix issue 4499450: Unknown Ringer Mode"Eric Laurent2011-07-192-0/+27
|\ \ \ \
| * | | | Fix issue 4499450: Unknown Ringer ModeEric Laurent2011-07-192-0/+27
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Added a validity check on ringer mode values in AudioManager.setRingerMode(). Change-Id: Ie780edc1d347009d90f000018a71520b04e0c4a1
* | | | Merge "More HLS fixes"Andreas Huber2011-07-192-10/+30
|\ \ \ \ | |_|_|/ |/| | |
| * | | More HLS fixesAndreas Huber2011-07-192-10/+30
| | |/ | |/| | | | | | | | | | | | | | | | properly expand URLs where the "new" URL is an absolute path. properly include any extra headers even when fetching the key files. Change-Id: I7cd8879015ea8e3d3e2334f4e7e16b8c1a5d48e9
* | | use SurfaceTexture new scaling mode in SFMathias Agopian2011-07-193-0/+19
| |/ |/| | | | | | | | | | | SF now obeys SurfaceTexture's scaling mode instead of inferring it from the buffer's size Change-Id: I4d50e9851abedd7e64bfcfc8af9eefb9fb668529
* | Merge "Remove PV AVC decoder"James Dong2011-07-1919-11185/+0
|\ \
| * | Remove PV AVC decoderJames Dong2011-07-1919-11185/+0
| |/ | | | | | | Change-Id: Icf056c852f95b5d6a07473728ddbf5b641990381
* | 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"
generated by cgit v1.1 at 2025-01-22 23:04:17 +0000