summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 74ae6973: am 17a765a1: Merge "Support for RTP packets arriving ↵Andreas Huber2010-08-266-21/+216
|\ | | | | | | | | | | | | | | | | interleaved with RTSP responses." into gingerbread Merge commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4' * commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4': Support for RTP packets arriving interleaved with RTSP responses.
| * am 17a765a1: Merge "Support for RTP packets arriving interleaved with RTSP ↵Andreas Huber2010-08-266-21/+216
| |\ | | | | | | | | | | | | | | | | | | | | | | | | responses." into gingerbread Merge commit '17a765a139f5a0b10768937cb11ecd9e7941b039' into gingerbread-plus-aosp * commit '17a765a139f5a0b10768937cb11ecd9e7941b039': Support for RTP packets arriving interleaved with RTSP responses.
| | * Merge "Support for RTP packets arriving interleaved with RTSP responses." ↵Andreas Huber2010-08-266-21/+216
| | |\ | | | | | | | | | | | | into gingerbread
| | | * Support for RTP packets arriving interleaved with RTSP responses.Andreas Huber2010-08-266-21/+216
| | | | | | | | | | | | | | | | Change-Id: Ib32fba257da32a199134cf8943117cf3eaa07a25
* | | | am d0faf5a2: am c6d7a895: Merge "Changed type of reverb presets from int to ↵Eric Laurent2010-08-261-7/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | short" into gingerbread Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05' * commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05': Changed type of reverb presets from int to short
| * | | am c6d7a895: Merge "Changed type of reverb presets from int to short" into ↵Eric Laurent2010-08-261-7/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp * commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d': Changed type of reverb presets from int to short
| | * | Changed type of reverb presets from int to shortEric Laurent2010-08-261-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the type of reverb preset constants exposed by the PresetReverb API to match the type of the setPreset() method parameter. Change-Id: I786764b5279c60f2368f5a0372f78da65ec54e4f
* | | | Merge "Disable all the hardware decoders except for h.264 video decode, ↵Andreas Huber2010-08-261-6/+7
|\ \ \ \ | | | | | | | | | | | | | | | since the software decoders are faster."
| * | | | Disable all the hardware decoders except for h.264 video decode, since the ↵Andreas Huber2010-08-261-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | software decoders are faster. Change-Id: Ia41194752ef72feb4ed1d5199e97b1649075b646
* | | | | am 2db73305: am dfded35b: Merge "Added automated tests for reverb audio ↵Eric Laurent2010-08-267-141/+970
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effect." into gingerbread Merge commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305' * commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305': Added automated tests for reverb audio effect.
| * | | | am dfded35b: Merge "Added automated tests for reverb audio effect." into ↵Eric Laurent2010-08-267-141/+970
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a' into gingerbread-plus-aosp * commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a': Added automated tests for reverb audio effect.
| | * | | Merge "Added automated tests for reverb audio effect." into gingerbreadEric Laurent2010-08-267-141/+970
| | |\ \ \
| | | * | | Added automated tests for reverb audio effect.Eric Laurent2010-08-267-141/+970
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go ↵James Dong2010-08-261-2/+2
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | backward in MP4 file writer" into gingerbread Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1' * commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1': Make sure that timestamp does not go backward in MP4 file writer
| * | | am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 ↵James Dong2010-08-261-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Merge "Make sure that timestamp does not go backward in MP4 file writer" ↵James Dong2010-08-261-2/+2
| | |\ \ | | | |/ | | |/| | | | | into gingerbread
| | | * Make sure that timestamp does not go backward in MP4 file writerJames Dong2010-08-241-2/+2
| | | | | | | | | | | | | | | | Change-Id: I90745b9df7f19d61f3ab826bf9d2419fe788554e
* | | | am e58cd37d: am 8ac0983e: Merge "Fix support for per-frame unsynchronization ↵Andreas Huber2010-08-252-4/+85
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | in ID3V2.4 tags." into gingerbread Merge commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96' * commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96': Fix support for per-frame unsynchronization in ID3V2.4 tags.
| * | | am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 ↵Andreas Huber2010-08-252-4/+85
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | tags." into gingerbread Merge commit '8ac0983edafa064126c4480dd31047d1bb4ce111' into gingerbread-plus-aosp * commit '8ac0983edafa064126c4480dd31047d1bb4ce111': Fix support for per-frame unsynchronization in ID3V2.4 tags.
| | * | Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into ↵Andreas Huber2010-08-252-4/+85
| | |\ \ | | | | | | | | | | | | | | | gingerbread
| | | * | Fix support for per-frame unsynchronization in ID3V2.4 tags.Andreas Huber2010-08-252-4/+85
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6874b596f88817347756a375d9fb1c9bff418eca related-to-bug: 2949149
* | | | | MTP: Fix build break due to integer constant too largeMike Lockwood2010-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia03ebe171d68bdfb04913abafc11dcb9c9071595 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | Merge "MTP: work in progress on expanded property support"Mike Lockwood2010-08-257-72/+222
|\ \ \ \ \
| * | | | | MTP: work in progress on expanded property supportMike Lockwood2010-08-257-72/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | am 8ca5df27: am c14f9ca6: Merge "Added preset reverb." into gingerbreadEric Laurent2010-08-252-54/+199
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8ca5df27df8a2b6435486f9b5a163bf222f8fed1' * commit '8ca5df27df8a2b6435486f9b5a163bf222f8fed1': Added preset reverb.
| * | | | | am c14f9ca6: Merge "Added preset reverb." into gingerbreadEric Laurent2010-08-252-54/+199
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c14f9ca6e5e795b641e7809786b4e51e13493907' into gingerbread-plus-aosp * commit 'c14f9ca6e5e795b641e7809786b4e51e13493907': Added preset reverb.
| | * | | | Merge "Added preset reverb." into gingerbreadEric Laurent2010-08-252-54/+199
| | |\ \ \ \
| | | * | | | Added preset reverb.Eric Laurent2010-08-242-54/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified lvm reverb wrapper code to expose a preset reverb interface. Also removed debug log from bundle and reverb wrapper. Change-Id: If9b95d91e25a6ff834decdfdda34b17df9b46967
* | | | | | | am cec075cc: am 23584022: Merge "Ensure that buffering updates eventually ↵Andreas Huber2010-08-251-12/+19
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hit 100% after we download everything." into gingerbread Merge commit 'cec075cc420e601602d6bfe16272c30006d262a6' * commit 'cec075cc420e601602d6bfe16272c30006d262a6': Ensure that buffering updates eventually hit 100% after we download everything.
| * | | | | | am 23584022: Merge "Ensure that buffering updates eventually hit 100% after ↵Andreas Huber2010-08-251-12/+19
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Merge "Ensure that buffering updates eventually hit 100% after we download ↵Andreas Huber2010-08-251-12/+19
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | everything." into gingerbread
| | | * | | | Ensure that buffering updates eventually hit 100% after we download everything.Andreas Huber2010-08-251-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I43bb85b1128fa9c1bc8632970d7101006393bcc8 related-to-bug: 2844095
* | | | | | | am 96dc4559: am b8814dce: Merge "Allow sniffers to return a packet of opaque ↵Andreas Huber2010-08-2516-30/+80
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | am b8814dce: Merge "Allow sniffers to return a packet of opaque data that ↵Andreas Huber2010-08-2516-30/+80
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Merge "Allow sniffers to return a packet of opaque data that the ↵Andreas Huber2010-08-2516-30/+80
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread
| | | * | | | | Allow sniffers to return a packet of opaque data that the corresponding ↵Andreas Huber2010-08-2516-30/+80
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbreadEric Laurent2010-08-251-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64' * commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64': Fix the simulator build.
| * | | | | am 67b50606: Merge "Fix the simulator build." into gingerbreadEric Laurent2010-08-251-0/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp * commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9': Fix the simulator build.
| | * | | | Fix the simulator build.Eric Laurent2010-08-251-0/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the sim build broken by commit 58d3bd08107f44cba79938dd8430e69c0fda4202. Change-Id: I5a63623363d558783dc5254fdd322080cc2f3525
* | | | | am 67ca90b3: am 6b6ae996: Merge "A first shot at proper support for seeking ↵Andreas Huber2010-08-247-59/+144
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of rtsp streams." into gingerbread Merge commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2' * commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2': A first shot at proper support for seeking of rtsp streams.
| * | | | am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp ↵Andreas Huber2010-08-247-59/+144
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | streams." into gingerbread Merge commit '6b6ae996b2e84af030397cff3a7f0087de93e01c' into gingerbread-plus-aosp * commit '6b6ae996b2e84af030397cff3a7f0087de93e01c': A first shot at proper support for seeking of rtsp streams.
| | * | | Merge "A first shot at proper support for seeking of rtsp streams." into ↵Andreas Huber2010-08-247-59/+144
| | |\ \ \ | | | |/ / | | |/| | | | | | | gingerbread
| | | * | A first shot at proper support for seeking of rtsp streams.Andreas Huber2010-08-247-59/+144
| | | |/ | | | | | | | | | | | | | | | | Change-Id: I9604f2d09feedc0074c0e715be58e719d4483760 related-to-bug: 2556656
* | | | Have the band tag parsed into album artist.Neel Parekh2010-08-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some vendors don't use the albumartist tag, but instead put the album artist tag in the band tag. Change-Id: Iea3144d55e4db3a28853bcd06bc72366de4421dc
* | | | am 33e0d834: am b6d71351: Merge "LVM release 1.05 delivery" into gingerbreadEric Laurent2010-08-2426-154/+5051
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '33e0d8343174339cc9622d63c23d47c0ba0d3baa' * commit '33e0d8343174339cc9622d63c23d47c0ba0d3baa': LVM release 1.05 delivery
| * | | am b6d71351: Merge "LVM release 1.05 delivery" into gingerbreadEric Laurent2010-08-2426-154/+5051
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'b6d71351c074d5c0bc13a91544d776f1524eaabd' into gingerbread-plus-aosp * commit 'b6d71351c074d5c0bc13a91544d776f1524eaabd': LVM release 1.05 delivery
| | * | Merge "LVM release 1.05 delivery" into gingerbreadEric Laurent2010-08-2426-154/+5051
| | |\ \ | | | |/ | | |/|
| | | * LVM release 1.05 deliveryEric Laurent2010-08-2026-154/+5051
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Click have been removed from the HP filter activation in the BassBosst Effect. - SessionId is now stored as a SessionNo - Effects now stop being called after a delay - Unix EOL fixed for .java and .xml - Updated lines limited to 100 characters. - Removed the remaining warnings from the wrapper code - Added reverb Change-Id: I03a2b3b5ee2286958f4901acc8d9b0daf9e2d7c6
* | | | am 31e71131: am 3e22ef1e: Merge "Better handling of rtsp connection and ↵Andreas Huber2010-08-243-14/+99
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | disconnection." into gingerbread Merge commit '31e71131049c943a388134e796087e109248efcc' * commit '31e71131049c943a388134e796087e109248efcc': Better handling of rtsp connection and disconnection.
| * | | am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." ↵Andreas Huber2010-08-233-14/+99
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '3e22ef1e111966df6ad527632fdc35d105c73916' into gingerbread-plus-aosp * commit '3e22ef1e111966df6ad527632fdc35d105c73916': Better handling of rtsp connection and disconnection.