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

2530 Commits

Author SHA1 Message Date
Andreas Huber
84ecebb922 am e25e0361: am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread 
Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944'

* commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944':
  We accidentally always aborted after 10 secs, even if the connection was fine.
 2010-08-27 18:09:21 -07:00
Nipun Kwatra
cf66e47ddd Merge "Added MediaSourceSplitter to split single source to multiple ones." 2010-08-27 13:48:15 -07:00
Nipun Kwatra
f83cba77b6 Added MediaSourceSplitter to split single source to multiple ones. 
MediaSourceSplitter provides a way to split a single mediaSource
into multiple sources. It takes in the real mediaSource and multiple
clients can then be created which serve from the same real mediaSource.

Change-Id: I7254ead24b4c26c784b033e6bc7ff5a0d083a0c3
 2010-08-27 13:46:41 -07:00
Andreas Huber
e25e03612e am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread 
Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp

* commit 'e250c220d1bb3bd117641add94ee7465a82f085c':
  We accidentally always aborted after 10 secs, even if the connection was fine.
 2010-08-27 13:46:14 -07:00
Andreas Huber
d6a4004741 We accidentally always aborted after 10 secs, even if the connection was fine. 
Change-Id: I3f2ae2f46ae62b84b1e253658d7182c04ee3dfae
 2010-08-27 10:11:04 -07:00
Andreas Huber
178e1d0a59 am 74ae6973: am 17a765a1: Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread 
Merge commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4'

* commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4':
  Support for RTP packets arriving interleaved with RTSP responses.
 2010-08-26 15:52:40 -07:00
Eric Laurent
0a84244d92 am d0faf5a2: am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread 
Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05'

* commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05':
  Changed type of reverb presets from int to short
 2010-08-26 15:51:37 -07:00
Andreas Huber
8ed880d776 Merge "Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster." 2010-08-26 15:20:31 -07:00
Andreas Huber
d222c84047 Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster. 
Change-Id: Ia41194752ef72feb4ed1d5199e97b1649075b646
 2010-08-26 14:33:09 -07:00
Andreas Huber
74ae6973f8 am 17a765a1: Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread 
Merge commit '17a765a139f5a0b10768937cb11ecd9e7941b039' into gingerbread-plus-aosp

* commit '17a765a139f5a0b10768937cb11ecd9e7941b039':
  Support for RTP packets arriving interleaved with RTSP responses.
 2010-08-26 13:49:32 -07:00
Andreas Huber
17a765a139 Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread 2010-08-26 13:47:16 -07:00
Eric Laurent
832aa58a30 am 2db73305: am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread 
Merge commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305'

* commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305':
  Added automated tests for reverb audio effect.
 2010-08-26 13:15:09 -07:00
James Dong
8c26c127b7 am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 
Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1'

* commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1':
  Make sure that timestamp does not go backward in MP4 file writer
 2010-08-26 13:15:00 -07:00
Andreas Huber
0416da73a0 Support for RTP packets arriving interleaved with RTSP responses. 
Change-Id: Ib32fba257da32a199134cf8943117cf3eaa07a25
 2010-08-26 11:19:08 -07:00
Eric Laurent
d0faf5a2dd am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread 
Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp

* commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d':
  Changed type of reverb presets from int to short
 2010-08-26 11:04:01 -07:00
Eric Laurent
71450f8139 Changed type of reverb presets from int to short 
Changed the type of reverb preset constants exposed by the PresetReverb API to
match the type of the setPreset() method parameter.

Change-Id: I786764b5279c60f2368f5a0372f78da65ec54e4f
 2010-08-26 10:42:38 -07:00
Eric Laurent
2db7330578 am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread 
Merge commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a' into gingerbread-plus-aosp

* commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a':
  Added automated tests for reverb audio effect.
 2010-08-26 10:19:23 -07:00
Eric Laurent
dfded35b3a Merge "Added automated tests for reverb audio effect." into gingerbread 2010-08-26 10:16:26 -07:00
James Dong
9509a0ce7e am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 
Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp

* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
  Make sure that timestamp does not go backward in MP4 file writer
 2010-08-26 09:53:30 -07:00
James Dong
318a759e3c Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 2010-08-26 09:47:12 -07:00
Eric Laurent
391e2d0d88 Added automated tests for reverb audio effect. 
- Added tests for preset and environmental reverb to functional media frame work tests.
- created a new class for energy probing used by all audio effect tests and corrected energy calculation.

Change-Id: Ib8109e70020176a87538309eb028109b81b93dde
 2010-08-26 09:42:49 -07:00
Andreas Huber
05643cc0d8 am e58cd37d: am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread 
Merge commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96'

* commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96':
  Fix support for per-frame unsynchronization in ID3V2.4 tags.
 2010-08-25 16:40:33 -07:00
Mike Lockwood
53b8f17376 MTP: Fix build break due to integer constant too large 
Change-Id: Ia03ebe171d68bdfb04913abafc11dcb9c9071595
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-25 19:10:24 -04:00
Mike Lockwood
48114f72fd Merge "MTP: work in progress on expanded property support" 2010-08-25 15:44:03 -07:00
Andreas Huber
e58cd37d66 am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread 
Merge commit '8ac0983edafa064126c4480dd31047d1bb4ce111' into gingerbread-plus-aosp

* commit '8ac0983edafa064126c4480dd31047d1bb4ce111':
  Fix support for per-frame unsynchronization in ID3V2.4 tags.
 2010-08-25 15:43:20 -07:00
Mike Lockwood
828d19dd96 MTP: work in progress on expanded property support 
GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.

Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-25 18:42:22 -04:00
Andreas Huber
8ac0983eda Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread 2010-08-25 15:35:53 -07:00
Eric Laurent
ec95d93254 am 8ca5df27: am c14f9ca6: Merge "Added preset reverb." into gingerbread 
Merge commit '8ca5df27df8a2b6435486f9b5a163bf222f8fed1'

* commit '8ca5df27df8a2b6435486f9b5a163bf222f8fed1':
  Added preset reverb.
 2010-08-25 15:16:00 -07:00
Andreas Huber
bf4c0c8808 am cec075cc: am 23584022: Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread 
Merge commit 'cec075cc420e601602d6bfe16272c30006d262a6'

* commit 'cec075cc420e601602d6bfe16272c30006d262a6':
  Ensure that buffering updates eventually hit 100% after we download everything.
 2010-08-25 15:12:42 -07:00
Eric Laurent
8ca5df27df am c14f9ca6: Merge "Added preset reverb." into gingerbread 
Merge commit 'c14f9ca6e5e795b641e7809786b4e51e13493907' into gingerbread-plus-aosp

* commit 'c14f9ca6e5e795b641e7809786b4e51e13493907':
  Added preset reverb.
 2010-08-25 15:11:30 -07:00
Eric Laurent
c14f9ca6e5 Merge "Added preset reverb." into gingerbread 2010-08-25 15:09:10 -07:00
Andreas Huber
cec075cc42 am 23584022: Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread 
Merge commit '235840228b0692b66d854ff499b5c4060f883e03' into gingerbread-plus-aosp

* commit '235840228b0692b66d854ff499b5c4060f883e03':
  Ensure that buffering updates eventually hit 100% after we download everything.
 2010-08-25 15:01:45 -07:00
Andreas Huber
8735f8984a Fix support for per-frame unsynchronization in ID3V2.4 tags. 
Change-Id: I6874b596f88817347756a375d9fb1c9bff418eca
related-to-bug: 2949149
 2010-08-25 14:55:53 -07:00
Andreas Huber
235840228b Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread 2010-08-25 14:54:36 -07:00
Andreas Huber
a1644109bb am 96dc4559: am b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread 
Merge commit '96dc45597e53742a2c8453f9ce03f7d501a75668'

* commit '96dc45597e53742a2c8453f9ce03f7d501a75668':
  Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
 2010-08-25 13:17:44 -07:00
Andreas Huber
96dc45597e am b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread 
Merge commit 'b8814dce287552c1bdf13fa999296ebc7387776d' into gingerbread-plus-aosp

* commit 'b8814dce287552c1bdf13fa999296ebc7387776d':
  Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
 2010-08-25 13:13:57 -07:00
Andreas Huber
b8814dce28 Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread 2010-08-25 13:10:04 -07:00
Andreas Huber
efdd088a71 Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now. 
Change-Id: Icb77ae3ee95a69c7da25b4d3b8696c0a2d33028a
related-to-bug: 2948754
 2010-08-25 13:08:38 -07:00
Andreas Huber
c23296ef2d Ensure that buffering updates eventually hit 100% after we download everything. 
Change-Id: I43bb85b1128fa9c1bc8632970d7101006393bcc8
related-to-bug: 2844095
 2010-08-25 12:31:48 -07:00
Eric Laurent
0ae6d2e826 am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread 
Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64'

* commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64':
  Fix the simulator build.
 2010-08-25 10:41:55 -07:00
Eric Laurent
74ede9e4fd am 67b50606: Merge "Fix the simulator build." into gingerbread 
Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp

* commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9':
  Fix the simulator build.
 2010-08-25 10:39:21 -07:00
Eric Laurent
cd295c11ab Fix the simulator build. 
Fixes the sim build broken by commit 58d3bd08107f44cba79938dd8430e69c0fda4202.

Change-Id: I5a63623363d558783dc5254fdd322080cc2f3525
 2010-08-25 10:00:53 -07:00
Andreas Huber
8d9d751a8f am 67ca90b3: am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread 
Merge commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2'

* commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2':
  A first shot at proper support for seeking of rtsp streams.
 2010-08-24 17:56:12 -07:00
Eric Laurent
a7e5648d61 Added preset reverb. 
Modified lvm reverb wrapper code to expose a preset reverb interface.
Also removed debug log from bundle and reverb wrapper.

Change-Id: If9b95d91e25a6ff834decdfdda34b17df9b46967
 2010-08-24 17:32:48 -07:00
Andreas Huber
67ca90b339 am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread 
Merge commit '6b6ae996b2e84af030397cff3a7f0087de93e01c' into gingerbread-plus-aosp

* commit '6b6ae996b2e84af030397cff3a7f0087de93e01c':
  A first shot at proper support for seeking of rtsp streams.
 2010-08-24 15:06:31 -07:00
Andreas Huber
6b6ae996b2 Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread 2010-08-24 15:01:14 -07:00
Neel Parekh
ed8188711a Have the band tag parsed into album artist. 
Some vendors don't use the albumartist tag, but instead put the
album artist tag in the band tag.

Change-Id: Iea3144d55e4db3a28853bcd06bc72366de4421dc
 2010-08-24 14:51:47 -07:00
Eric Laurent
0e30200ed1 am 33e0d834: am b6d71351: Merge "LVM release 1.05 delivery" into gingerbread 
Merge commit '33e0d8343174339cc9622d63c23d47c0ba0d3baa'

* commit '33e0d8343174339cc9622d63c23d47c0ba0d3baa':
  LVM release 1.05 delivery
 2010-08-24 14:43:54 -07:00
Andreas Huber
e0dd7d3960 A first shot at proper support for seeking of rtsp streams. 
Change-Id: I9604f2d09feedc0074c0e715be58e719d4483760
related-to-bug: 2556656
 2010-08-24 14:33:58 -07:00
James Dong
05e80b4c1c Make sure that timestamp does not go backward in MP4 file writer 
Change-Id: I90745b9df7f19d61f3ab826bf9d2419fe788554e
 2010-08-24 12:28:02 -07:00