summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am fed1594d: am 9916dcb6: am 0d64fcb4: Merge "Clean up some makefiles."Dan Albert2014-09-122-6/+1
|\ | | | | | | | | * commit 'fed1594d707b4623015e538b2f69faf76bc38d5b': Clean up some makefiles.
| * am 9916dcb6: am 0d64fcb4: Merge "Clean up some makefiles."Dan Albert2014-09-122-6/+1
| |\ | | | | | | | | | | | | * commit '9916dcb6ef041752fda5f13192ee6a36e51e73a5': Clean up some makefiles.
| | * am 0d64fcb4: Merge "Clean up some makefiles."Dan Albert2014-09-122-6/+1
| | |\ | | | | | | | | | | | | | | | | * commit '0d64fcb46f594a89484cd112bc979903eaeda4b3': Clean up some makefiles.
| | | * Merge "Clean up some makefiles."Dan Albert2014-09-112-6/+1
| | | |\
| | | | * Clean up some makefiles.Dan Albert2014-09-112-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build system takes care of these things for you. Change-Id: Ife9605f15786e11d6a3578f56ed83dd9ae7fd799
* | | | | am bd014b81: am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-121-14/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'bd014b81ef227752150bdbd1bb6a235db09f3616': Clean up test makefiles.
| * | | | am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-121-14/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'fe80b7ee58b394b0cd958470aeea3c5a09f6b2bf': Clean up test makefiles.
| | * | | am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-121-14/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '6bf7c5cfc981ce4ecbd671d73a9eab8398dc8dd4': Clean up test makefiles.
| | | * | Merge "Clean up test makefiles."Dan Albert2014-09-111-14/+2
| | | |\ \ | | | | |/ | | | |/|
| | | | * Clean up test makefiles.Dan Albert2014-09-111-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build system takes care of linking the correct STL and gtest libraries for you, and specifying them manually confuses the build system when using libc++. Change-Id: I6ac66c2f4e97cd3c55efb7a85e10922420554e7f
* | | | | am 236688e8: am 97187317: Merge "stagefright: add adaptive playback support ↵Ronghua Wu2014-09-125-107/+130
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | to SoftAVC decoder." into lmp-dev * commit '236688e800455c3a9d2a31a437f635dd7ff91fc7': stagefright: add adaptive playback support to SoftAVC decoder.
| * | | | am 97187317: Merge "stagefright: add adaptive playback support to SoftAVC ↵Ronghua Wu2014-09-115-107/+130
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder." into lmp-dev * commit '971873179cf202ad8aa1ddc4ec737795f1e03ce3': stagefright: add adaptive playback support to SoftAVC decoder.
| | * \ \ \ Merge "stagefright: add adaptive playback support to SoftAVC decoder." into ↵Ronghua Wu2014-09-115-107/+130
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-dev
| | | * | | | stagefright: add adaptive playback support to SoftAVC decoder.Ronghua Wu2014-09-105-107/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change SoftVPX decoder to use common handlePortSettingsChanged and copyYV12FrameToOutputBuffer method. Bug: 17326758 Change-Id: I6fb2ee8fb9291f69c70493b8558af341adc1f4b2
* | | | | | | am 75a39a7e: am 951c2197: am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-122-0/+170
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '75a39a7eda320e958ea9919f4867f8581117639e': Add test for AMR-NB decoder
| * | | | | | am 951c2197: am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit '951c2197cc0cf1d7a91388299b74eb12ee04a3e6': Add test for AMR-NB decoder
| | * | | | | am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit '2b16391d066d20f38f3556d65bce827a8d134e4d': Add test for AMR-NB decoder
| | | * | | | Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Add test for AMR-NB decoderAshok Bhat2014-06-162-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test accepts a .amr file as input and dumps output PCM in a wav file. To run the test, use following command libstagefright_amrnbdec_test <input amr> <output wav> Change-Id: I2492c2ed4e670c9fd8cb4213201ccbd0cb9bf8fe Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | Merge "stagefright: finish implementing MediaFilter flush"David Smith2014-09-111-3/+20
|\ \ \ \ \ \ \
| * | | | | | | stagefright: finish implementing MediaFilter flushDavid Smith2014-09-091-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17203044 Change-Id: I6a967ead4dd9588caafe0041f2f4a39637368a62
* | | | | | | | am 87088150: am fd732779: Merge "stagefright: don\'t use AAtomizer in ↵Lajos Molnar2014-09-111-30/+93
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AMessage" into lmp-dev * commit '87088150423676a8a0d6a0094e6b6e77e11fb3b5': stagefright: don't use AAtomizer in AMessage
| * | | | | | | am fd732779: Merge "stagefright: don\'t use AAtomizer in AMessage" into lmp-devLajos Molnar2014-09-111-30/+93
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'fd7327797fe1d21cb225cae34616b8f7b67ad29d': stagefright: don't use AAtomizer in AMessage
| | * | | | | | Merge "stagefright: don't use AAtomizer in AMessage" into lmp-devLajos Molnar2014-09-111-30/+93
| | |\ \ \ \ \ \
| | | * | | | | | stagefright: don't use AAtomizer in AMessageLajos Molnar2014-09-101-30/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15094301 Change-Id: Ib82fb6d8fb6b48402d81f411123b3d924368eb93
* | | | | | | | | am ebea445f: am b9b87fe9: mediaplayer: release MediaBuffer in stale input ↵Lajos Molnar2014-09-111-0/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers * commit 'ebea445f9344dbbe2ad560e340fb0ee3b9151650': mediaplayer: release MediaBuffer in stale input buffers
| * | | | | | | | am b9b87fe9: mediaplayer: release MediaBuffer in stale input buffersLajos Molnar2014-09-111-0/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b9b87fe9d9f3d91c05300a22920d7227a3f8eb83': mediaplayer: release MediaBuffer in stale input buffers
| | * | | | | | | mediaplayer: release MediaBuffer in stale input buffersLajos Molnar2014-09-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17454455 Change-Id: If63a6e42f96851d6c10fdec11360f0dabae9bf50
* | | | | | | | | resolved conflicts for merge of 42db212e to masterWei Jia2014-09-111-6/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I1d8fe79a591b0e2a9e279f6c2c70d9e13c72924b
| * | | | | | | | am e4c8b32f: Merge "NuPlayerDriver: do not set to paused state when ↵Wei Jia2014-09-101-5/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receiving playback complete and reset is in progress." into lmp-dev * commit 'e4c8b32f1123aa639f46d234203ad5c5e7926628': NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress.
| | * | | | | | | Merge "NuPlayerDriver: do not set to paused state when receiving playback ↵Wei Jia2014-09-101-5/+8
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | complete and reset is in progress." into lmp-dev
| | | * | | | | | | NuPlayerDriver: do not set to paused state when receiving playback complete ↵Wei Jia2014-09-101-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and reset is in progress. Bug: 17453240 Change-Id: If243e2232779681fc84dc767feaed00f23d8fdb1
* | | | | | | | | | am 3eef436c: am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac ↵Marco Nelissen2014-09-112-194/+128
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frames per input buffer"" into lmp-dev * commit '3eef436cea1928f96b789449ea144d1a529d2651': Revert "Fix AAC timestamps for multiple aac frames per input buffer"
| * | | | | | | | | am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac frames per ↵Marco Nelissen2014-09-102-194/+128
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input buffer"" into lmp-dev * commit '43f2e3cf20c2a99cd3e9b99c8b507143e2954756': Revert "Fix AAC timestamps for multiple aac frames per input buffer"
| | * | | | | | | | Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" ↵Marco Nelissen2014-09-102-194/+128
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| | | * | | | | | | | Revert "Fix AAC timestamps for multiple aac frames per input buffer"Marco Nelissen2014-09-102-194/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e086387c805311ac87904c3c4d6d4eb08d4b4ee2. (broke multichannel movie playback) Bug: 17454025 Change-Id: I95b82359f87f8beca66f35c34b7e125850a44747
* | | | | | | | | | | am f2745669: am 74848665: Merge "fix failure in ↵Chong Zhang2014-09-111-1/+14
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodecTest#testException" into lmp-dev * commit 'f2745669be588f8bc8fdb3dea60a12d91f6eb9c9': fix failure in MediaCodecTest#testException
| * | | | | | | | | | am 74848665: Merge "fix failure in MediaCodecTest#testException" into lmp-devChong Zhang2014-09-101-1/+14
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '748486657623fc0753d11bc2d91c113bca584a1e': fix failure in MediaCodecTest#testException
| | * | | | | | | | | Merge "fix failure in MediaCodecTest#testException" into lmp-devChong Zhang2014-09-101-1/+14
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | fix failure in MediaCodecTest#testExceptionChong Zhang2014-09-101-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset codec after failed configure() Bug: 17418876 Change-Id: I21ff8a0751dae6a164678015142e11d481403bed
* | | | | | | | | | | am 55e9e267: am b606de81: Merge "mediaplayer: limit number of outstanding ↵Lajos Molnar2014-09-111-6/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer requests" into lmp-dev * commit '55e9e26779b2e08b460da1af2a420767655bde12': mediaplayer: limit number of outstanding buffer requests
| * | | | | | | | | | am b606de81: Merge "mediaplayer: limit number of outstanding buffer ↵Lajos Molnar2014-09-101-6/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requests" into lmp-dev * commit 'b606de81ce5fffc8923c53cb7d5d00f5b423c9b9': mediaplayer: limit number of outstanding buffer requests
| | * | | | | | | | | Merge "mediaplayer: limit number of outstanding buffer requests" into lmp-devLajos Molnar2014-09-101-6/+7
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | mediaplayer: limit number of outstanding buffer requestsLajos Molnar2014-09-091-6/+7
| | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14679336 Change-Id: I94a20ada30a9a25065329a85fc884d32d154d029
* | | | | | | | | | am ef2e3619: am 83ee5564: Merge "CamcorderProfile: Add ↵Zhijun He2014-09-101-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QUALITY_HIGH_SPEED_2160P" into lmp-dev * commit 'ef2e361980531f0d315f89b783c2de3ea2abae95': CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
| * | | | | | | | | am 83ee5564: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-devZhijun He2014-09-101-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '83ee5564965408307e6f045ce5faed72bc3437b0': CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
| | * | | | | | | | Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-devZhijun He2014-09-101-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | CamcorderProfile: Add QUALITY_HIGH_SPEED_2160PZhijun He2014-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17059255 Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
* | | | | | | | | | am 59424ee1: am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete ↵Wei Jia2014-09-101-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when reset is done." into lmp-dev * commit '59424ee18cc68d5802bae05e15fd6f41f3f1113f': NuPlayer: make previous decoders obsolete when reset is done.
| * | | | | | | | | am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete when reset is ↵Wei Jia2014-09-101-0/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | done." into lmp-dev * commit '8716e3f386f37abd3d759404ca8b3deaf46afde8': NuPlayer: make previous decoders obsolete when reset is done.
generated by cgit v1.1 at 2024-05-18 00:47:58 +0000