summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | am bff77217: am 17e95f40: stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-071-0/+108
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bff7721722138b652e9a8f38e9d36a0ea12c38f1': stagefright: add media_codecs_google_video_le.xml
| | * | | | | | | stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-061-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used by low-end devices Bug: 19027495 Change-Id: I2cf90bf5a9a95b3f38c32eef2a950c9e33c70a7a
* | | | | | | | | am a23eea5d: am 5dc38beb: am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-092-4/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | * commit 'a23eea5d6160e2ebddb925f20becfc3c52639243': Fix GSM WAV playback
| * | | | | | | am 5dc38beb: am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-072-4/+21
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '5dc38bebd45edbcc17b2f5cf3c3b2929b5842f3c': Fix GSM WAV playback
| | * | | | | | Fix GSM WAV playbackMarco Nelissen2015-02-062-4/+21
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:19289381 Change-Id: If7bbf1ecf1cb8796188e61bc2c42f8a099510424
| * | | | | | am bdb1112d: am 35395ea6: DO NOT MERGE: stagefright: add support for ↵Lajos Molnar2015-02-071-1/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel\'s YUV420SP format in SoftwareRenderer * commit 'bdb1112d2c9a818d34094e58c74055131fc27f45': DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer
| | * | | | | DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in ↵Lajos Molnar2015-02-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftwareRenderer This seems to have the same layout as OMX_COLOR_FormatYUV420SemiPlanar Bug: 19246722 Change-Id: Ief41bfaf997426a6900c3632dadaf8f4a6a38baf
* | | | | | | Merge "audio policy service: fix possible memory overflow"Eric Laurent2015-02-061-2/+20
|\ \ \ \ \ \ \
| * | | | | | | audio policy service: fix possible memory overflowEric Laurent2015-02-061-2/+20
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add limit on number of audio ports and patches requested by listaudioPorts() and listAudioPatches(). Bug: 19261727. Change-Id: I21dfdf11cf805734cc3b7b2a85762c5598f60580
* | | | | | | am bb7ea7fd: am 29eb8045: am 99cef1ef: allow HLS streams with ↵Chong Zhang2015-02-061-0/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CLOSED-CAPTIONS tag to play * commit 'bb7ea7fd0e8738043a13c7c25178e2acc54796cc': allow HLS streams with CLOSED-CAPTIONS tag to play
| * | | | | | am 29eb8045: am 99cef1ef: allow HLS streams with CLOSED-CAPTIONS tag to playChong Zhang2015-02-061-0/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '29eb804501a993ecdd4d1073240f2998264508ff': allow HLS streams with CLOSED-CAPTIONS tag to play
| | * | | | | allow HLS streams with CLOSED-CAPTIONS tag to playChong Zhang2015-02-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19284568 Change-Id: I2ccf1c5952c13d1332b6a91f967af0bd3ee67451
* | | | | | | resolved conflicts for merge of ca509506 to masterLajos Molnar2015-02-061-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: I93a81bf167407307f209cf46249a8d65d26589f3
| * | | | | | am 696cfefd: am 9578a90c: stagefright: add software renderer support to ↵Lajos Molnar2015-02-061-4/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMX_COLOR_YUV420SemiPlanar * commit '696cfefd49335fef13414d52daa95544298359e5': stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanar
| | * | | | | stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanarLajos Molnar2015-02-051-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19179927 Change-Id: I3accaa655e9bad2b0efcac98c5dd95a23f8d6671
* | | | | | | am 2b0fc07a: am c5a6db8d: am 5a52a060: stagefright: set consumer usage flags ↵Lajos Molnar2015-02-062-4/+52
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and desribe YV12 HAL format * commit '2b0fc07a5f87d15ef9ccb7f682a811bf7121c636': stagefright: set consumer usage flags and desribe YV12 HAL format
| * | | | | | am c5a6db8d: am 5a52a060: stagefright: set consumer usage flags and desribe ↵Lajos Molnar2015-02-062-4/+52
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | YV12 HAL format * commit 'c5a6db8de459f25c72b0ca7b55942ddd4f90b1a8': stagefright: set consumer usage flags and desribe YV12 HAL format
| | * | | | | stagefright: set consumer usage flags and desribe YV12 HAL formatLajos Molnar2015-02-052-4/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17906609 Bug: 19179288 Bug: 19179927 Change-Id: I3713d4e894d3350d46e25dc0206b21c0ff3b9009
* | | | | | | am 78a0d1ac: am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video ↵Chong Zhang2015-02-061-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discontinuity" into lmp-mr1-dev * commit '78a0d1acd4cb7103bba349f8a23fd1814bed483b': reuse CCDecoder on video discontinuity
| * | | | | | am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" ↵Chong Zhang2015-02-061-1/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '04d2804a212c2625425cb23b2b778ab4f3683769': reuse CCDecoder on video discontinuity
| | * | | | | Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-devChong Zhang2015-02-041-1/+3
| | |\ \ \ \ \
| | | * | | | | reuse CCDecoder on video discontinuityChong Zhang2015-02-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19266084 Change-Id: I06ef57b09b048a85f77be4dee27599c4f60aacc9
* | | | | | | | am e5760862: am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for ↵Lajos Molnar2015-02-062-19/+82
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | native flex-YUV support" into lmp-mr1-dev * commit 'e576086224f6e630159eaeec59ab5146c8533dc7': stagefright: add fallback for native flex-YUV support
| * | | | | | am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native ↵Lajos Molnar2015-02-062-19/+82
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flex-YUV support" into lmp-mr1-dev * commit 'bcd22f0f3a4cd5f78e03af23aafadb2d1aec6794': stagefright: add fallback for native flex-YUV support
| | * | | | | Merge "stagefright: add fallback for native flex-YUV support" into lmp-mr1-devLajos Molnar2015-02-042-19/+82
| | |\ \ \ \ \
| | | * | | | | stagefright: add fallback for native flex-YUV supportLajos Molnar2015-02-042-19/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use software renderer if codec cannot support flex-YUV on a surface Bug: 17906609 Change-Id: I3d0e3ff5fee7d7b3e2416892968fa18f6139598a
* | | | | | | | Merge "opus: Support for > 2 channels"Vignesh Venkatasubramanian2015-02-052-3/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | opus: Support for > 2 channelsVignesh Venkatasubramanian2015-01-262-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds support for Opus streams that have more than 2 channels. It also fixes a bug where codec delay and seek preroll are not transferred during metadata to message conversion. Change-Id: Ia9748d4f7024368b2aa3c5cbd27f8016c859ea00
* | | | | | | | | Add additional info to AudioPort for enum/selection API.Paul McLean2015-02-052-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "device name" member to AudioPort. Moved unique device ID from DevicePort to AudioPort. Straighten out confusion between "name" and "address" Created string constants for Intent "extra" data keys. Combine card/address data into "address" at sender.Add additional info to AudioPort for enum/selection API. Change-Id: I1be308e12b09cd0ead9a3e9fbc9c385462299fb5
* | | | | | | | | Merge "mediaplayer: Add MediaClock component and use it in NuPlayerRenderer."Wei Jia2015-02-045-295/+396
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | mediaplayer: Add MediaClock component and use it in NuPlayerRenderer.Wei Jia2015-02-035-295/+396
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix some racing conditions, remove unused code in NuPlayerRenderer. This obsoletes https://googleplex-android-review.git.corp.google.com/#/c/609880/. Bug: 19196501 Change-Id: I0eebeb573ce7229dd8bacecd0e1c5d6f5634a72f
* | | | | | | | | am 7dbbc7ec: am a291dabc: am 6fbcf633: Merge "httplive: Set start time and ↵Robert Shih2015-02-042-6/+14
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | segment start time in conjunction." into lmp-mr1-dev * commit '7dbbc7ec95c3040668388162a0ffbc45b68af6f1': httplive: Set start time and segment start time in conjunction.
| * | | | | | | | am a291dabc: am 6fbcf633: Merge "httplive: Set start time and segment start ↵Robert Shih2015-02-042-6/+14
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time in conjunction." into lmp-mr1-dev * commit 'a291dabcab10cafc1749d1d9493d269049502256': httplive: Set start time and segment start time in conjunction.
| | * | | | | | | Merge "httplive: Set start time and segment start time in conjunction." into ↵Robert Shih2015-02-042-6/+14
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | | | | httplive: Set start time and segment start time in conjunction.Robert Shih2015-02-042-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add comments describing how start time and segment start time are used. Based on AOSP CL https://android-review.googlesource.com/127653 by Joakim Johansson <joakim.c.johansson@sonymobile.com> but uses the lowest segment start time instead of highest. Bug: 18821145 Change-Id: I14cf1186d0daf517a24e8423c3a708b4c9ba06c4
* | | | | | | | | am 3b5d1195: am 7b66f713: am 57f75272: Merge "stagefright: add support for ↵Lajos Molnar2015-02-042-36/+90
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native flex-YUV formats" into lmp-mr1-dev * commit '3b5d119522bdf9c23be622be395d7a95d465616e': stagefright: add support for native flex-YUV formats
| * | | | | | | | am 7b66f713: am 57f75272: Merge "stagefright: add support for native ↵Lajos Molnar2015-02-042-36/+90
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flex-YUV formats" into lmp-mr1-dev * commit '7b66f713fc53ee81453763788c02f3c741d19520': stagefright: add support for native flex-YUV formats
| | * | | | | | | stagefright: add support for native flex-YUV formatsLajos Molnar2015-02-042-36/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17906609 Change-Id: I14116796eaa94aa8ae62dcc29f67cb7d2c060d34
* | | | | | | | | am e91c3dd0: am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf ↵Elliott Hughes2015-02-0412-52/+52
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out of the way." * commit 'e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7': Move AString's StringPrintf out of the way.
| * | | | | | | | am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."Elliott Hughes2015-02-0412-52/+52
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '6a025acb630a3ac4a84715d188aeb48f1946bc3f': Move AString's StringPrintf out of the way.
| | * | | | | | | am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."Elliott Hughes2015-02-0412-52/+52
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'ec0472ba9c1cfaee293636536f3951c0e6e671b4': Move AString's StringPrintf out of the way.
| | | * | | | | | Move AString's StringPrintf out of the way.Elliott Hughes2015-02-0412-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should come back and replace AString with std::string and switch to the "real" StringPrintf family, but this fixes the ODR violation that was preventing us from booting. Bug: 19265750 Change-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35
* | | | | | | | | am 07840f75: am 3a7ed550: am efbb6195: NuPlayer: pause playback when ↵Chong Zhang2015-02-046-34/+251
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | buffering is low * commit '07840f7544de883fe5c00cbd18bc6458a20e2691': NuPlayer: pause playback when buffering is low
| * | | | | | | am 3a7ed550: am efbb6195: NuPlayer: pause playback when buffering is lowChong Zhang2015-02-046-34/+251
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '3a7ed550579b5ecd99439c44ce13a48b3f0639ae': NuPlayer: pause playback when buffering is low
| | * | | | | | NuPlayer: pause playback when buffering is lowChong Zhang2015-02-036-34/+251
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fix buffering percentage report (should be the buffered position) bug: 18730095 Change-Id: I11e7ca4ba9e772a1ae76861ca1ff1725b62f65ae
* | | | | | | am 3097dafa: am 0d8e85f9: am 77f877f8: Merge "Acodec: reset sideband handle ↵Rachad2015-02-021-0/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for all non tunneled mode video playback" into lmp-mr1-dev * commit '3097dafa3ee60440c10b5bf9ed4d355fee1c1ae5': Acodec: reset sideband handle for all non tunneled mode video playback
| * | | | | | am 0d8e85f9: am 77f877f8: Merge "Acodec: reset sideband handle for all non ↵Rachad2015-02-021-0/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tunneled mode video playback" into lmp-mr1-dev * commit '0d8e85f929f0257a3af5ec743365b0140b5e75b4': Acodec: reset sideband handle for all non tunneled mode video playback
| | * | | | | Merge "Acodec: reset sideband handle for all non tunneled mode video ↵Rachad2015-01-311-0/+9
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | playback" into lmp-mr1-dev
| | | * | | | | Acodec: reset sideband handle for all non tunneled mode video playbackRachad2015-01-311-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19202023 Change-Id: I414847d72a3c9fd79f858c4ee457270ec65470b6
* | | | | | | | am a601b862: am c9e11696: am 36dca156: Merge "Acodec: Send framerate ↵Rachad2015-02-021-2/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information to OMX decoder if available" into lmp-mr1-dev * commit 'a601b86287ab5437a7e9aaf6f09bc171803cdc3d': Acodec: Send framerate information to OMX decoder if available