summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "stagefright: make more warnings errors"Lajos Molnar2015-04-1724-44/+46
|\
| * stagefright: make more warnings errorsLajos Molnar2015-04-1724-44/+46
| | | | | | | | Change-Id: I9b1ad60fbfb866dbf9c00843e06553c3eb25c113
* | libmedia: fix all warning, make warnings errors, use clangLajos Molnar2015-04-1712-16/+16
|/ | | | Change-Id: Ic00d2c5d0bbb1605e96666e25c9ccc22bea6d3ff
* stagefright: warnings be gone, some are now errors, use clangLajos Molnar2015-04-1795-227/+295
| | | | Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
* Merge "NuPlayerDriver: Maintain the timeStamp after seek"Wei Jia2015-04-171-0/+3
|\
| * NuPlayerDriver: Maintain the timeStamp after seekHaynes Mathew George2015-04-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While offload playback is going on, if user pause and seeks to new position before offload tear-down, on resume playback starts from old time-stamp. Once tear-down happens NuPlayer loses updated time-stamp so while resuming it resumes playback with stale time-stamp. Make sure the updated time-stamp is maintained in NuPlayerDriver which is used while starting the playback after resume. authored-by: Sharad Sangle <assangle@codeaurora.org> Change-Id: Ie125cf0fab1b0a237e67e43b0e5b4a704483ef99
* | Merge "stagefright: initial timed id3 support in hls"Robert Shih2015-04-1720-84/+402
|\ \
| * | stagefright: initial timed id3 support in hlsRobert Shih2015-04-1620-84/+402
| |/ | | | | | | Change-Id: I00a8a786b3f4b74742c34770edd94e937abe20a8
* | MediaSync: sanity check native sample rate.Wei Jia2015-04-161-0/+5
|/ | | | | Bug: 19666434 Change-Id: I0eb7a70c81c4fcc336f52f014eeb6d261ac2c501
* MediaCodec: hold input buffers during FLUSHED stateChong Zhang2015-04-162-2/+12
| | | | | bug: 20267388 Change-Id: I21a12cb2ebb74e17dcdb7b502c3f674e9e64b5dc
* Merge "Work around lack of pitch adjustment in Timestretcher"Andy Hung2015-04-161-12/+40
|\
| * Work around lack of pitch adjustment in TimestretcherAndy Hung2015-04-161-12/+40
| | | | | | | | Change-Id: I3e057b97c250a826133248b6aa1ff9ed677d88df
* | am 6705a49f: am 541a9ac7: am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end ↵Marco Nelissen2015-04-164-1/+33
|\ \ | | | | | | | | | | | | | | | | | | of mpeg video to flush out final sample" * commit '6705a49f6481ad1728215a2a72472fe43c786cd0': Signal EOS at end of mpeg video to flush out final sample
| * \ am 541a9ac7: am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end of mpeg ↵Marco Nelissen2015-04-164-1/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | video to flush out final sample" * commit '541a9ac77ecaa26449fcad5c116fb93657ca17c1': Signal EOS at end of mpeg video to flush out final sample
| | * \ am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush ↵Marco Nelissen2015-04-164-1/+33
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out final sample" * commit '8cd4132a85239fd318193e10c0817ac7784c304a': Signal EOS at end of mpeg video to flush out final sample
| | | * \ am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f22f5a2d95699650a454041bcaa1d5a248cca88': Signal EOS at end of mpeg video to flush out final sample
| | | | * \ Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | | | |\ \
| | | | | * | Signal EOS at end of mpeg video to flush out final sampleMarco Nelissen2015-04-154-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27196a4a4b7fe37da52d3ee99da8cb80294d36d0
* | | | | | | Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-1633-29/+552
|\ \ \ \ \ \ \
| * | | | | | | Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-1533-29/+552
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows apps to implement MediaDataSource, which is modeled on stagefright's DataSource, to supply media data to the framework. This was already implemented for MediaExtractor, but it was renamed from DataSource. MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new overload: #setDataSource(android.media.MediaDataSource) Only NuPlayer supports this new data source. The change introduces: * IDataSource: The binder interface for DataSource. * JMediaDataSource: The native counterpart to the java interface. It implements IDataSource. * CallbackDataSource: A stagefright DataSource that wraps an IDataSource. Change-Id: Ib3c944b49cc8a792c8eb9c85e5015c07f298ebc1
* | | | | | | | Merge "CameraService: Add support for module init, some logging updates"Eino-Ville Talvala2015-04-164-72/+120
|\ \ \ \ \ \ \ \
| * | | | | | | | CameraService: Add support for module init, some logging updatesEino-Ville Talvala2015-04-154-72/+120
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add support for camera HAL module init() method on v2.4 - Add logging for service errors such as failure to init - Minor cleanup to dumping of event log Bug: 20016050 Change-Id: I94e18b52c186f16fb096457015f7ae761e867fd8
* | | | | | | | am 5c16a387: am 382bcd5a: am 6a2dffb1: am 4491a4ab: Merge "libstagefright: ↵Lajos Molnar2015-04-161-0/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | free mMoovBoxBuffer" * commit '5c16a3877c0b32f21cbee7f1bdc77a2a4d2b79c6': libstagefright: free mMoovBoxBuffer
| * | | | | | | am 382bcd5a: am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free ↵Lajos Molnar2015-04-161-0/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mMoovBoxBuffer" * commit '382bcd5a63d3edba3950e120e452f4dd42c608c2': libstagefright: free mMoovBoxBuffer
| | * | | | | | am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '6a2dffb1c7a0e45388257bc5d2ec763f234f8cca': libstagefright: free mMoovBoxBuffer
| | | * | | | | am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | * commit '4491a4ab2d6991baa1ce15f24025aa24430d15d1': libstagefright: free mMoovBoxBuffer
| | | | * | | | Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | | | |\ \ \ \
| | | | | * | | | libstagefright: free mMoovBoxBufferSuresh Choudhary2015-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add free(mMoovBoxBuffer) in MPEG4Writer::release() Change-Id: Ic396e64e9e238bdc23cb0b02b7aa341d879d2237
* | | | | | | | | am f16511ca: am 0a4d22e5: am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set ↵Lajos Molnar2015-04-161-2/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the correct audio bit rate for camera recorded content" * commit 'f16511ca737b8bf8a33ce589a28630e98c3aaae5': MPEG4Writer: Set the correct audio bit rate for camera recorded content
| * | | | | | | | am 0a4d22e5: am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set the correct ↵Lajos Molnar2015-04-161-2/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio bit rate for camera recorded content" * commit '0a4d22e5385755049bb2ebc684255ba5e9ae2ec7': MPEG4Writer: Set the correct audio bit rate for camera recorded content
| | * | | | | | | am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate ↵Lajos Molnar2015-04-161-2/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for camera recorded content" * commit '9985f6af71061c9340fffa9a6e7c8fea5dac04ab': MPEG4Writer: Set the correct audio bit rate for camera recorded content
| | | * | | | | | am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate for camera ↵Lajos Molnar2015-04-161-2/+4
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recorded content" * commit '30d7b4883bf3198bfba0d0acf14e0bcbb67716d1': MPEG4Writer: Set the correct audio bit rate for camera recorded content
| | | | * | | | | Merge "MPEG4Writer: Set the correct audio bit rate for camera recorded content"Lajos Molnar2015-04-161-2/+4
| | | | |\ \ \ \ \
| | | | | * | | | | MPEG4Writer: Set the correct audio bit rate for camera recorded contentDaniel Bonnevier2015-04-151-2/+4
| | | | | | |_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the hard coded value for bit rate. Use the audio bit rate from the stream format, if it is specified, otherwise default to 96kpbs. Change-Id: Ib643c79bbdddaafb3dc703448645606267f7ca4d
* | | | | | | | | am 655084f9: am e7a53499: am 0a45cda6: am 187b196e: Merge changes ↵Lajos Molnar2015-04-1611-11/+3668
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ic51e92e9,Ie808aa82,I74f5f4a1 * commit '655084f979b3067cb5a6fd2d4de148b411fbec23': stagefright: add SoftAVCEnc using libavc stagefright: add SoftAVCDec using libavc stagefright: add SoftMPEG2 decoder using libmpeg2
| * | | | | | | | am e7a53499: am 0a45cda6: am 187b196e: Merge changes ↵Lajos Molnar2015-04-1611-11/+3668
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ic51e92e9,Ie808aa82,I74f5f4a1 * commit 'e7a53499125586272adb2c7592db5c4038dabe3b': stagefright: add SoftAVCEnc using libavc stagefright: add SoftAVCDec using libavc stagefright: add SoftMPEG2 decoder using libmpeg2
| | * | | | | | | am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a45cda68209717767412d040c24e8253c1b5847': stagefright: add SoftAVCEnc using libavc stagefright: add SoftAVCDec using libavc stagefright: add SoftMPEG2 decoder using libmpeg2
| | | * | | | | | am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '187b196e48ed6ea655c7a0e48908d92d670627a8': stagefright: add SoftAVCEnc using libavc stagefright: add SoftAVCDec using libavc stagefright: add SoftMPEG2 decoder using libmpeg2
| | | | * | | | | Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: stagefright: add SoftAVCEnc using libavc stagefright: add SoftAVCDec using libavc stagefright: add SoftMPEG2 decoder using libmpeg2
| | | | | * | | | stagefright: add SoftAVCEnc using libavcVenkatarama Avadhani2015-04-155-6/+1680
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic51e92e9d86db21109b8714e822697869e184cd1
| | | | | * | | | stagefright: add SoftAVCDec using libavcVenkatarama Avadhani2015-04-155-5/+1017
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie808aa82c624dbbcaeb6b41662c9b7770bc80bd9
| | | | | * | | | stagefright: add SoftMPEG2 decoder using libmpeg2Venkatarama Avadhani2015-04-155-0/+971
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74f5f4a1e6d7be8df45bcbc83a965111454b97ea
* | | | | | | | Merge "camera2: remove unnecessary flashlight error messages"Chien-Yu Chen2015-04-161-15/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | camera2: remove unnecessary flashlight error messagesChien-Yu Chen2015-04-151-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20069129 Change-Id: I0e721bfad1f0218744d3554397e3ec9b8bc07a19
* | | | | | | | | Merge "Camera3: allow reconfiguring the input stream"Chien-Yu Chen2015-04-151-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera3: allow reconfiguring the input streamChien-Yu Chen2015-04-151-5/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9d0db1f3378264fc9173bfc8706c8f955b79182
* | | | | | | | | audio policy: add binder calls for audio source controlEric Laurent2015-04-1510-0/+147
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add binder methods to IAudioPolicyService to control activity of external audio sources (e.g FM tuner). Change-Id: I2008308a6a996baeae502b68a790d87281efe2ff
* | | | | | | | Merge "fix NuPlayerDecoder discontinuity handling with async mode"Chong Zhang2015-04-151-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | fix NuPlayerDecoder discontinuity handling with async modeChong Zhang2015-04-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20234224 Change-Id: I317b52b089f1e1432255100ef5f36322a231a399
* | | | | | | | | Merge "AudioPolicyManager: notification of dynamic policy mix activity"Jean-Michel Trivi2015-04-1512-6/+139
|\ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-12 20:36:31 +0000