summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-145-0/+8
|\ | | | | | | Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
| * am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-146-0/+10
| |\ | | | | | | | | | | | | * commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9': mediaserver and associated services are 32-bit only
| | * Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-146-0/+10
| | |\
| | | * mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-126-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
* | | | am f1ac623f: am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f1ac623fcc6bbda2faff9752cd611182a897afe1': Implemented support for RTSP 301 Redirect
| * | | am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '4a67fc49d926c75fa6a96160ba5627fb0e209db6': Implemented support for RTSP 301 Redirect
| | * | Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
| | |\ \ | | | |/ | | |/|
| | | * Implemented support for RTSP 301 RedirectDavid Williams2012-12-031-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | RTSP 301 (Permament Redirect) support has been implemented. Change-Id: If82ffc87f4e7dcbdf98e0a662a35cc086750fc1b
| * | | am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * commit '466786b25b262f4f6e5737b3a88e8d7f6916e45c': LiveSession: fix incorrect stream key (subtitle"s") M3UParser: trim spaces when parsing comma separated codecs.
| | * \ \ am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '70cc5bdc0fca3f67f3602f04152c29323cad99df': LiveSession: fix incorrect stream key (subtitle"s") M3UParser: trim spaces when parsing comma separated codecs.
| | | * \ \ Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-122-1/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: LiveSession: fix incorrect stream key (subtitle"s") M3UParser: trim spaces when parsing comma separated codecs.
| | | | * | | LiveSession: fix incorrect stream key (subtitle"s")Robert Shih2014-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13402087 Change-Id: Ic46e3069c6e41f90ead47cae84cbe0123d11002a
| | | | * | | M3UParser: trim spaces when parsing comma separated codecs.Robert Shih2014-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13402087 Change-Id: Idc92716bfefd6d1b0cb371d0d97d990d53288090
| * | | | | | am 5b297ba7: am 67a10c52: Merge "httplive: clear access units before ↵Lajos Molnar2014-03-144-15/+42
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | returning from seekTo." into klp-dev * commit '5b297ba76271e8554758cbd569e73720bc914af6': httplive: clear access units before returning from seekTo.
| | * | | | | am 67a10c52: Merge "httplive: clear access units before returning from ↵Lajos Molnar2014-03-144-15/+42
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seekTo." into klp-dev * commit '67a10c522898d8223f5a2d389a846b7e2327148a': httplive: clear access units before returning from seekTo.
| | | * | | | Merge "httplive: clear access units before returning from seekTo." into klp-devLajos Molnar2014-03-124-15/+42
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | httplive: clear access units before returning from seekTo.Robert Shih2014-03-114-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12060952 Change-Id: I6a69a718c082501003ee9b78a948a2f8bbfbb14e
| * | | | | | am bd77a1b5: am cf49a51f: fix codec buffer leak in error handling when ↵Chong Zhang2014-03-131-7/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timestamp goes backward * commit 'bd77a1b5115d355eb1e2bc270fe9aa4ceb3d8e65': fix codec buffer leak in error handling when timestamp goes backward
| | * | | | | am cf49a51f: fix codec buffer leak in error handling when timestamp goes ↵Chong Zhang2014-03-131-7/+7
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backward * commit 'cf49a51ff59c3cd228d178d23252ac0d39d5a893': fix codec buffer leak in error handling when timestamp goes backward
| | | * | | | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-03-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't touch codec buffer if we decided to drop a frame with bad pts Bug: 11971963 Change-Id: I9b4c56210f64258f1be257b14184381a1133e0d6 (cherry picked from commit b63d2433350d56bda9f3477549086c90bb6d535e)
| * | | | | | am a671f943: am c69bc40a: Merge "Cap pts gap between adjacent frames to ↵Chong Zhang2014-03-134-6/+167
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specified value" into klp-dev * commit 'a671f943b72155460f0c94cdd92d829cb059b571': Cap pts gap between adjacent frames to specified value
| | * | | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" ↵Chong Zhang2014-03-134-6/+167
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec': Cap pts gap between adjacent frames to specified value
| | | * | | | Merge "Cap pts gap between adjacent frames to specified value" into klp-devChong Zhang2014-03-114-6/+167
| | | |\ \ \ \
| | | | * | | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-03-114-6/+167
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In the scenario of cast mirroring, encoding could be suspended for prolonged periods. Limiting the pts gap to workaround the problem where encoder's rate control logic produces huge frames after a long period of suspension. - Repeat last frame a couple more times to get better quality on static scenes. - Fix the timestamp on repeat frames (it was not set) Bug: 11971963 Change-Id: I1d68ab3d269874bf3921aa429a985c5f63e428c7 (cherry picked from commit 94ee4b708acfa941581160b267afb79192b1d816)
| * | | | | | am 1e001f92: am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspendedChong Zhang2014-03-131-0/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '1e001f92e748de00a3e20effa464d59d75a746b3': save mGraphicBuffer pointer even when we're suspended
| | * | | | | am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspendedChong Zhang2014-03-131-0/+6
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '1c608ab33acab82d4a87f1abedcc99a623d1b53a': save mGraphicBuffer pointer even when we're suspended
| | | * | | | save mGraphicBuffer pointer even when we're suspendedChong Zhang2014-03-111-0/+6
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12609966 Change-Id: Ifd41fd973876da69039113fcaeacdccf39472b37 (cherry picked from commit 49270665e7a20cd120724fc388da8b166ff0b4f1)
* | | | | | Merge changes I1455bfc6,I90c7e34b,I06e001dfLajos Molnar2014-03-149-229/+640
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: NuPlayer: use MediaCodec instead of ACodec MediaCodec: add getInputFormat() method Revert "NuPlayer: Use a software renderer when using software codecs"
| * | | | | | NuPlayer: use MediaCodec instead of ACodecLajos Molnar2014-03-104-108/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11785204 Change-Id: I1455bfc683469c7a69e565b179aceacbc5c459f5
| * | | | | | MediaCodec: add getInputFormat() methodLajos Molnar2014-03-103-81/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional input-port format item: int32: "adaptive-playback" video decoders only whether codec is configured for adaptive playback. In this case, if codec has max-width/height limits, those limits are also exposed (int32: "max-width", "max-height") Also, getInput/OutputFormat() is now callable in CONFIGURED and STARTING states, although output format may be missing CSD fields until INFO_OUTPUT_FORMAT_CHANGED message. Includes missing OMX support for MP3 software decoder. Bug: 11785204 Change-Id: I90c7e34ba81c7b81c43641599f3f496e838958c6
| * | | | | | Revert "NuPlayer: Use a software renderer when using software codecs"Lajos Molnar2014-03-104-42/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove software renderer support from NuPlayer because it is included in MediaCodec. Change-Id: I06e001df76df2e18ea8169620ff33aeec57e5ca2
* | | | | | | Merge "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-132-30/+55
|\ \ \ \ \ \ \
| * | | | | | | mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-112-30/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change OMX buffer allocation policy to allocate nBufferCountMin + what is required for the BQ. For the BQ, try to allocate 2 additional buffers than the minimum undequeued count. Also account for the fact that BQ may return one less than the actual minimum undequeued count. In most cases the resulting number of buffers ends up being the same as with the previous policy, but we keep more buffers with the BQ. Change-Id: I826db8bf7dd333b620299dba60bf1b81b228275d Bug: 12080418
* | | | | | | | am f4431278: am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-125-6/+5
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'f4431278a9613f55ecd944ab2e3eb615b372f269': Remove streaming URI from default logs
| * | | | | | | am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-125-6/+5
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '19afb3869eb6a3e3733dc1f7420e1d4c3c03d376': Remove streaming URI from default logs
| | * | | | | | Remove streaming URI from default logsDavid Williams2014-03-105-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Streaming URI should not be visible in default logcat logs Change-Id: I104cc56b5335f8c5621013e4c5be8028f0379833
| * | | | | | | am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached ↵Eric Laurent2014-03-081-3/+22
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback position" into klp-dev * commit '38efe8eb08e08610d535a164768851ac7c13d654': AudioTrack: When paused, return cached playback position
| | * | | | | | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback ↵Eric Laurent2014-03-081-3/+22
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position" into klp-dev * commit '6db20dcb54dad932a3ea2e3a5dca41fce5802eb4': AudioTrack: When paused, return cached playback position
| | | * | | | | Merge "AudioTrack: When paused, return cached playback position" into klp-devEric Laurent2014-03-081-3/+22
| | | |\ \ \ \ \
| | | | * | | | | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-061-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An offload output can be re-used between two audio tracks having the same configuration. A timestamp query for a paused track while the other is running would return an incorrect time. To fix this, cache the playback position on a pause() and return this time when requested until the track is resumed. Bug: 12826612. Change-Id: Ia42b8b8fd2ba8993dfcc9abca72da48d71d78d74
| * | | | | | | | am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix ↵Glenn Kasten2014-03-071-17/+15
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | race" into klp-dev * commit '4ee774f322ad3292fcfbb3c120cf250643419425': Simplify AudioTrack stream end and fix race
| | * | | | | | | am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-071-17/+15
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f55c2c03b17795e94b325d402ac5b409e3ba0e8': Simplify AudioTrack stream end and fix race
| | | * | | | | | Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-071-17/+15
| | | |\ \ \ \ \ \
| | | | * | | | | | Simplify AudioTrack stream end and fix raceGlenn Kasten2014-03-071-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10994052 Change-Id: Ib2e38e7a600bcffef8cbc68c1722e40fbbc7ea67
| * | | | | | | | | am 4293011d: am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4293011df9caa1c5dce0f02d7a6d35e702bdfef4': Allow for larger codec private data
| | * | | | | | | | am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5874615f26a6ba9cda8ba359e5035b21f6e3818b': Allow for larger codec private data
| | | * | | | | | | Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds support for multibyte sizes in the ESDS. Previously the Matroska extractor only supported single byte sizes, so codec private data had to be less than 108 bytes, and would crash if it was bigger. b/12584090 Change-Id: I9edfc2f687187d1e98bcfd2fe56576312435df3e
| | | * | | | | | Merge "Fix SIGABRT when playing mp4 file" into klp-devMarco Nelissen2014-03-071-0/+6
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix SIGABRT when playing mp4 fileMarco Nelissen2014-03-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the track duration was shorter than the segment duration, the calculated encoder padding would be negative, resulting in a crash. b/11823061 https://code.google.com/p/android/issues/detail?id=62610 Change-Id: I3989ad88caea38d212b61355c15aec13382c6116
* | | | | | | | | | Merge "MTP: Add support for device property changed events"Mike Lockwood2014-03-123-2/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
generated by cgit v1.1 at 2024-05-28 18:22:32 +0000