drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,650 Commits 1 Branch 0 Tags
Commit Graph

4982 Commits

Author SHA1 Message Date
Kristian Monsen
3192e397af Fix for bug 5049763 HLS: Cookies set in main playlist request aren't being passed to subsequent HTTP requests 
Cookies should be store between requests in memory with this.

Tell me if you want to store the cookies on disk as well.

Change-Id: I9afe5796a3d395afcf54d669c86cf7da432f8d9a
 2011-07-22 14:11:31 +01:00
James Dong
ce78dc5baa Log setVideoSurface() and setVideoSurfaceTexture() failures. 
Change-Id: Iaea34e74a0cf569fc85b926949253dea6baa6142
related-to-bug: 5063370
 2011-07-21 17:38:18 -07:00
Pannag Sanketi
f48987db67 Renaming SurfaceEncoder to SurfaceMediaSource 
Related to bug id: 4529323

Change-Id: Id820d45a536bd2c65e0a59def564eb5b3ea4a71c
 2011-07-21 17:12:50 -07:00
Pannag Sanketi
26a197120c Adding SurfaceEncoder for encoding FilterFrames 
Adding SurfaceEncoder which can be used to encode
custom frame data. In a sense, it is reverse
of what SurfaceTexture does.

SurfaceEncoder takes in frames from a native window and
passes them to an encoder, thus acting like a MediaSource.
It uses GRAlloc buffers underneath for passing data.
The client side sets the geometry, format in the beginning,
which cannot be changed while the recording is going on.

Currently, there is no common pixel format that both
GRAlloc and HAL understand.
Also, the encoder cannot encode using the data from the GRAlloc
buffers.

The SurfaceEncoder_test examines mainly the buffer passage
since true encoding cannot be done at this point.
SimpleDummyRecorder 'reads' the frames in the same thread
as the start(), whereas DummyRecorder 'reads' in a separate
thread much like the MPEG4Writer. The test with DummyRecorder
is much closer to the real encoding implementation.

Related to bug id: 4529323

Change-Id: I58ec19a150f8fe4d6195196dc44f55002b46c7c8
 2011-07-21 17:12:50 -07:00
Chih-Chung Chang
25ba294d1f Add filename and line number in the debug messages. 
Change-Id: I0e19215cd6f26ccd97bcbff765194adda5faf940
 2011-07-22 05:08:39 +08:00
Hong Teng
432fb8ecbe Merge "fix for issue 4142219 Don't hard code platform-specific limitations-jni/java part" 2011-07-21 11:13:43 -07:00
Eric Laurent
0eecc27714 Merge "AudioRecord JAVA: expose audio session Id" 2011-07-20 19:25:34 -07:00
Jeff Brown
5da67f4f69 Merge "Untangle MediaScanner error handling. Bug: 5056917" 2011-07-20 18:03:47 -07:00
Eric Laurent
ae7c092649 Merge "Audio framework: support for audio pre processing" 2011-07-20 17:45:37 -07:00
Jeff Brown
2c70d4a372 Untangle MediaScanner error handling. 
Bug: 5056917

Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
 2011-07-20 17:33:13 -07:00
Hong Teng
600acf14ff fix for issue 4142219 
Don't hard code platform-specific limitations-jni/java part

Change-Id: Icde261b1caf29a8cf552884c97f3c9d0b41741a3
 2011-07-20 16:51:39 -07:00
James Dong
0f4e81df99 Merge "Let the media recording framework release the Camera object when it is the owner" 2011-07-20 16:08:32 -07:00
James Dong
e02802306d Let the media recording framework release the Camera object when it is the owner 
related-to-bug: 5050535,5036813,5051707

Change-Id: I88e10f65f087931e7f95ab26a018d59f7361103e
 2011-07-20 15:15:31 -07:00
Mike Lockwood
a331cdbb40 Merge "MediaScanner: Do separate bulk inserts for different media types" 2011-07-20 12:15:48 -07:00
Eric Laurent
5531a3a3cf Merge "Fix issue 5012047: silent mode mutes music" 2011-07-20 11:04:18 -07:00
Mike Lockwood
e19572ccb5 MediaScanner: Do separate bulk inserts for different media types 
This should fix a bunch of problems introduced in the original bulk insert implementation

Also reverted two changes that are no longer necessary:

Revert "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files"

This reverts commit 92e1314ad9ddbacfb806405e9aceeea4a8aae19f.

Revert "MediaScanner: fix breakage in updates"

This reverts commit 45aaa2a345292bb6d600822db602f25e261c0e50.

Change-Id: Ibed66393467761c2c1ce48deb09bcac505b7d221
 2011-07-20 10:58:45 -07:00
Jamie Gennis
7f60a81a2a Merge "MediaPlayer: add a disconnect from ANativeWindow" 2011-07-20 10:47:04 -07:00
Andreas Huber
85111ee501 Merge "Content found in the wild violated the MPEG4 systems specs" 2011-07-20 08:05:06 -07:00
Eric Laurent
c3d84701e0 Merge "Fix issue 4499450: Unknown Ringer Mode" 2011-07-19 17:27:24 -07:00
Andreas Huber
80d9064a14 Content found in the wild violated the MPEG4 systems specs 
but other players apparently worked around it as well, so we do to.

Change-Id: I8269d2344b010d1d704028c8a9c05bddab53828d
related-to-bug: 5049979
 2011-07-19 16:05:50 -07:00
Eric Laurent
72668b2c04 Fix issue 4499450: Unknown Ringer Mode 
Added a validity check on ringer mode values in AudioManager.setRingerMode().

Change-Id: Ie780edc1d347009d90f000018a71520b04e0c4a1
 2011-07-19 16:04:27 -07:00
Andreas Huber
6461c97331 Merge "More HLS fixes" 2011-07-19 15:33:25 -07:00
Andreas Huber
9073725c1b More HLS fixes 
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
 2011-07-19 15:04:53 -07:00
Jamie Gennis
5129b6838b MediaPlayer: add a disconnect from ANativeWindow 
This change makes MediaPlayer::disconnect disconnect from the
ANativeWindow once the player has been disconnected.

Change-Id: I6744559030d1edc520cf77402d1f5ce841742340
 2011-07-19 14:50:43 -07:00
Eric Laurent
c1d4166289 Fix issue 5012047: silent mode mutes music 
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
 2011-07-19 14:46:32 -07:00
Mathias Agopian
ff86f37b95 use SurfaceTexture new scaling mode in SF 
SF now obeys SurfaceTexture's scaling mode instead
of inferring it from the buffer's size

Change-Id: I4d50e9851abedd7e64bfcfc8af9eefb9fb668529
 2011-07-19 13:05:12 -07:00
James Dong
8a08b0c5a1 Merge "Remove PV AVC decoder" 2011-07-19 11:00:50 -07:00
James Dong
d2a9852c13 Remove PV AVC decoder 
Change-Id: Icf056c852f95b5d6a07473728ddbf5b641990381
 2011-07-19 09:42:42 -07:00
Narayan Kamath
06e0333c7e Return the play stayed locked. 
I believe the the synchronized block is required to allow
other threads to observe changes to mPlayState in a timely
manner.

Change-Id: I502b7401196c42932c9667ef73eb4cae16c3da16
 2011-07-19 15:43:52 +01:00
Conley Owens
9fd12cfb56 am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" 
* commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d':
  stagefright aacenc: Mark codeWord as UWord16
 2011-07-18 16:57:04 -07:00
Conley Owens
e5143d6c09 am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" 
* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362':
  stagefright aacenc: Mark codeWord as UWord16
 2011-07-18 16:55:33 -07:00
Conley Owens
a74774fd91 am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" 
* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
  stagefright aacenc: Mark codeWord as UWord16
 2011-07-18 16:52:26 -07:00
Conley Owens
4d8f6a38e7 Merge "stagefright aacenc: Mark codeWord as UWord16" 2011-07-18 16:49:43 -07:00
Deckard Autoverifier
2b15115fee am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '3ab6ccda447c605c35c8854a2ec8c49c2a0653a6':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:46:26 -07:00
Deckard Autoverifier
d1cada2ad8 am b32af642: am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit 'b32af642454f3113cb1539821eb3b0dbf4174974':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:46:21 -07:00
Deckard Autoverifier
a09fe88148 am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:46:18 -07:00
Deckard Autoverifier
e1928190ff am b7f0d825: am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit 'b7f0d825c56dced10bb7df7cfc624ef9ebffe21c':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:46:14 -07:00
Deckard Autoverifier
3ab6ccda44 am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:44:03 -07:00
Deckard Autoverifier
b32af64245 am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit '31140598866c668047fc6dede7944e146aa21a0a':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:44:01 -07:00
Deckard Autoverifier
d4dee1a57f am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit '29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:43:58 -07:00
Deckard Autoverifier
b7f0d825c5 am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '691257b1812ffd8172b01c17b9ba23a48eb76594':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:43:54 -07:00
Deckard Autoverifier
89bac1820f am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '88409911aebed6c3663e51d51fca67f527c0c2fb':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:38:30 -07:00
Deckard Autoverifier
16db83c264 am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit 'eb07c531498f4dc881ad2b4d1a32cacab25950ff':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:38:27 -07:00
Deckard Autoverifier
80ef1745d0 am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit 'c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:38:25 -07:00
Deckard Autoverifier
68e37dacc0 am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '55f115a3214343c826acf27fcbc4bf2927049083':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:38:22 -07:00
Deckard Autoverifier
88409911ae Merge "stagefright: Include stdlib.h for malloc/free" 2011-07-18 15:23:41 -07:00
Deckard Autoverifier
eb07c53149 Merge "stagefright amrwbenc: Remove a duplicate, unused file" 2011-07-18 15:23:31 -07:00
Deckard Autoverifier
c06c3603e0 Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 2011-07-18 15:23:20 -07:00
Deckard Autoverifier
55f115a321 Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 2011-07-18 15:23:09 -07:00
Jamie Gennis
5a4ab16eba Merge "MediaPlayer: add ANativeWindow (dis)connect calls" 2011-07-18 15:18:43 -07:00