summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 2381f06f: am 24605338: Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
|\ | | | | | | | | * commit '2381f06f374ee0cb8bca0edf5388394432b00e6d': Fix metadata access
| * am 24605338: Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
| |\ | | | | | | | | | | | | * commit '246053380a9f628405a29a055a3f1f4fba13ed5b': Fix metadata access
| | * Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
| | |\
| | | * Fix metadata accessMarco Nelissen2013-11-152-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Metadata string pointers become invalid after setting more metadata, so don't cache them. b/11692062 Change-Id: Iaf1afb24cf53f7fa36f49ce759355693494076e5
* | | | am 576e89b5: am 7dae71d6: Merge "AwesomePlayer: correct stream type for ↵Eric Laurent2013-11-153-4/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | offload" into klp-dev * commit '576e89b523d7705545032edc67d98d9ab1dedbd2': AwesomePlayer: correct stream type for offload
| * | | am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-devEric Laurent2013-11-153-4/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7dae71d606ded1dbc2aa9733c3d98ffac57988f2': AwesomePlayer: correct stream type for offload
| | * | AwesomePlayer: correct stream type for offloadEric Laurent2013-11-143-4/+17
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | canOffloadStream() function in stagefright utils forces the stream type to AUDIO_STREAM_MUSIC when querying the audio policy manager if a particular track is offloadable or not. This causes MP3 ringtones to be offloaded which is not a validated use case. The fix consists in using the actual stream type read from the AudioSink. Bug: 11410937. Change-Id: I44b8e033a8e785a79cdc291b142f80b5580bdc4d
* | | Merge "Fixed StagefrightRecorder::setupVideoEncoder to use the clipped ↵Robert Shih2013-11-152-28/+12
|\ \ \ | | | | | | | | | | | | bitrate value mVideoBitRate; removed unused arguments after refactoring."
| * | | Fixed StagefrightRecorder::setupVideoEncoder to use the clipped bitrate valueRobert Shih2013-11-112-28/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mVideoBitRate; removed unused arguments after refactoring. Bug: 11074303 Change-Id: Ieb5dd7dc67e5bc16b6e580ba11b157e4365f3cd6
* | | | am ec89a75e: am 92092b39: Merge "stagefright: limit default max-input-size ↵Lajos Molnar2013-11-131-7/+18
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | for AVC" into klp-dev * commit 'ec89a75e386c61cf4ace3bc5ab80d064562ebf11': stagefright: limit default max-input-size for AVC
| * | | am 92092b39: Merge "stagefright: limit default max-input-size for AVC" into ↵Lajos Molnar2013-11-131-7/+18
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | klp-dev * commit '92092b395d59e8943a461d344f617f1dc85375a3': stagefright: limit default max-input-size for AVC
| | * | Merge "stagefright: limit default max-input-size for AVC" into klp-devLajos Molnar2013-11-131-7/+18
| | |\ \
| | | * | stagefright: limit default max-input-size for AVCLajos Molnar2013-11-131-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AVC has a compression ratio of at least 2. Account for this, as some codecs refuse exorbitant max-input-size requests. Change-Id: Ib68b485879ba33a12a486f2ce18fe100be977699 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11599364
* | | | | am 47afcc5f: am 069bcc50: Merge "AwesomePlayer: Improve performance on ↵Lajos Molnar2013-11-131-1/+36
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | high-fps clips" into klp-dev * commit '47afcc5f5fb94263977717bd12433d594fbbc43f': AwesomePlayer: Improve performance on high-fps clips
| * | | | am 069bcc50: Merge "AwesomePlayer: Improve performance on high-fps clips" ↵Lajos Molnar2013-11-131-1/+36
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '069bcc5084c3d8c6f9373a2890d40a0d1a36a94e': AwesomePlayer: Improve performance on high-fps clips
| | * | | Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-devLajos Molnar2013-11-131-1/+36
| | |\ \ \ | | | |/ / | | |/| |
| | | * | AwesomePlayer: Improve performance on high-fps clipsLajos Molnar2013-11-121-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Immediately retry rendering next frame after frame skip. - Schedule next videoEvent based on the timestamp of the next frame. Change-Id: Ia106382c4c225321b682c1f7c2d126d7eab7d56d Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11159147
| * | | | am 5595f6de: Merge "Only initialize sniffers once, don\'t hold mutex while ↵Marco Nelissen2013-11-131-16/+27
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | sniffing" into klp-dev * commit '5595f6de606f51ec61fbf40a269b52312507aded': Only initialize sniffers once, don't hold mutex while sniffing
| | * | | Merge "Only initialize sniffers once, don't hold mutex while sniffing" into ↵Marco Nelissen2013-11-131-16/+27
| | |\ \ \ | | | | | | | | | | | | | | | | | | klp-dev
| | | * | | Only initialize sniffers once, don't hold mutex while sniffingMarco Nelissen2013-11-111-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/11482896 Change-Id: Ie036554b4c9e7e8863cb07901d414ea457f1b2f1 (cherry picked from commit 377fce69297a0e5b7c3b266a7602b17146785635)
* | | | | | am 5274e21e: am 26c8f714: Merge "Ignore transport stream packets with the ↵Andreas Huber2013-11-131-1/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "transport_error_indicator" bit set" into klp-dev * commit '5274e21ea6d9e8009c13817d75f9423735964700': Ignore transport stream packets with the "transport_error_indicator" bit set
| * | | | | am 26c8f714: Merge "Ignore transport stream packets with the ↵Andreas Huber2013-11-131-1/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "transport_error_indicator" bit set" into klp-dev * commit '26c8f714361bfb6403a7c457adfb8b55c89a634a': Ignore transport stream packets with the "transport_error_indicator" bit set
| | * | | | Merge "Ignore transport stream packets with the "transport_error_indicator" ↵Andreas Huber2013-11-131-1/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | bit set" into klp-dev
| | | * | | | Ignore transport stream packets with the "transport_error_indicator" bit setAndreas Huber2013-11-121-1/+4
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which indicates that they contain at least one bitstream error that was unrecoverable. Change-Id: I10665fd190194fdd2568175fe00b6063d3fc10a5 related-to-bug: 11537029
* | | | | | am 728549e3: am 56477eb7: am 27ae268a: am 00cb884f: Merge "StageFright: ↵Adam Hampson2013-11-132-9/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev * commit '728549e39be9b8fcc701ef0f4623bc50d8726bd7': StageFright: Removes hacks for Nvidia MPEG2 decoder
| * | | | | am 56477eb7: am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for ↵Adam Hampson2013-11-132-9/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nvidia MPEG2 decoder" into jb-mr2-dev * commit '56477eb724972c2fe0441dfa7baaad00b7927add': StageFright: Removes hacks for Nvidia MPEG2 decoder
| | * | | | am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 ↵Adam Hampson2013-11-132-9/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | decoder" into jb-mr2-dev * commit '27ae268af29b25d85f83aa34e92ac8b7f6c87c6f': StageFright: Removes hacks for Nvidia MPEG2 decoder
| | | * | | am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" ↵Adam Hampson2013-11-132-9/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '00cb884fc870aba4052c8d187a45e4aec50a6b43': StageFright: Removes hacks for Nvidia MPEG2 decoder
| | | | * | | StageFright: Removes hacks for Nvidia MPEG2 decoderSuresh Choudhary2013-08-092-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the NVIDIA MPEG2 decoder specific hacks in legacy code as Nvidia HW MPEG2 decoder is enabled and tested now. Change-Id: Ifc67e1119d9741551336753f85f9cfdfd3fc8600
* | | | | | | am 073dec19: am 22990fe1: Merge "Back to the old way of making sure that no ↵Andreas Huber2013-11-121-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more buffers are submitted" into klp-dev * commit '073dec19db486290a02d9952e392df9cda5700ad': Back to the old way of making sure that no more buffers are submitted
| * | | | | | am 22990fe1: Merge "Back to the old way of making sure that no more buffers ↵Andreas Huber2013-11-121-2/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are submitted" into klp-dev * commit '22990fe1ee3531e84dbadb7ff9ffd68d5bbe9060': Back to the old way of making sure that no more buffers are submitted
| | * | | | | Merge "Back to the old way of making sure that no more buffers are ↵Andreas Huber2013-11-121-2/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | submitted" into klp-dev
| | | * | | | | Back to the old way of making sure that no more buffers are submittedAndreas Huber2013-11-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the component while in executing->idle state. Change-Id: Ia207f0a112025ed0e2c4d62f404afbbfa694cbab related-to-bug: 11557463, 11573543
* | | | | | | | am db50cb5f: am caee8747: Merge "configure bitrate and bitrate mode at ↵Andreas Huber2013-11-111-0/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encoder initialization for VP8/9" into klp-dev * commit 'db50cb5f7ae6d2beacd8a4fa4a8991035b3c88e7': configure bitrate and bitrate mode at encoder initialization for VP8/9
| * | | | | | | am caee8747: Merge "configure bitrate and bitrate mode at encoder ↵Andreas Huber2013-11-111-0/+16
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialization for VP8/9" into klp-dev * commit 'caee8747b7df3b1119426594d4ba1c0e300ff6db': configure bitrate and bitrate mode at encoder initialization for VP8/9
| | * | | | | | Merge "configure bitrate and bitrate mode at encoder initialization for ↵Andreas Huber2013-11-121-0/+16
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | VP8/9" into klp-dev
| | | * | | | | configure bitrate and bitrate mode at encoder initialization for VP8/9Andreas Huber2013-11-051-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0389264db4102cabb0c6fcb4ca223d85cc9e86fb related-to-bug: 11536167
* | | | | | | | am cc5aeced: am e100b813: Merge "StageFrightRecorder: do not use meta-data ↵Lajos Molnar2013-11-113-11/+35
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | mode for software encoders" into klp-dev * commit 'cc5aeced30609326c7495eca1286163af3933fe1': StageFrightRecorder: do not use meta-data mode for software encoders
| * | | | | | am e100b813: Merge "StageFrightRecorder: do not use meta-data mode for ↵Lajos Molnar2013-11-113-11/+35
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | software encoders" into klp-dev * commit 'e100b813c4d833b48b48b74100ad0b9a82c46954': StageFrightRecorder: do not use meta-data mode for software encoders
| | * | | | | Merge "StageFrightRecorder: do not use meta-data mode for software encoders" ↵Lajos Molnar2013-11-113-11/+35
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev
| | | * | | | | StageFrightRecorder: do not use meta-data mode for software encodersLajos Molnar2013-10-303-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera HAL v1 uses vendor-specific camera-source meta-data mode, but software encoders use generic gralloc-source mode, so they are not compatible. Change-Id: I0d1bab8eada26dcb70c97b1eec83f06d1f331239 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11446505
* | | | | | | | am 5b5f76dc: am a7291156: Merge "TimedEventQueue: improve wakelock ↵Eric Laurent2013-11-112-43/+55
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | management" into klp-dev * commit '5b5f76dcb29792830baca1f25e51a732b80241df': TimedEventQueue: improve wakelock management
| * | | | | | | am a7291156: Merge "TimedEventQueue: improve wakelock management" into klp-devEric Laurent2013-11-102-43/+55
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a72911563b0e5b21b196d40249b53975bf8d8f85': TimedEventQueue: improve wakelock management
| | * | | | | | Merge "TimedEventQueue: improve wakelock management" into klp-devEric Laurent2013-11-112-43/+55
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | TimedEventQueue: improve wakelock managementEric Laurent2013-11-072-43/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not acquire a wakelock unless the event is delayed by more than a given time. This prevents from acquiring/releasing wakelocks too often which has adverse effects on performance. Bug: 11509471. Change-Id: Id06803b393b40c4db5095a6e7ec02339fa581a38
* | | | | | | | Only initialize sniffers once, don't hold mutex while sniffingMarco Nelissen2013-11-111-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/11482896 Change-Id: Ie036554b4c9e7e8863cb07901d414ea457f1b2f1
* | | | | | | | Merge "Remove default channel mask for AudioTrack"Glenn Kasten2013-11-081-7/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove default channel mask for AudioTrackGlenn Kasten2013-11-081-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't make sense to have a default channel mask, since the caller needs to know what format it will use when supplying data, and there is currently no API to return the channel mask of an AudioTrack. audio_is_output_channel() does not allow 0, so it will catch any stragglers (I'm not aware of any). Also move channel mask validation earlier. Change-Id: Ia018ded8711455581a2a935f37432b049422d492
* | | | | | | | | am 86f79f23: am 51ac2d64: Merge "Properly handle executing->idle in ↵Andreas Huber2013-11-083-7/+29
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GraphicBufferSource" into klp-dev * commit '86f79f2332efad4862a4dd56f9552c93bbb52bcf': Properly handle executing->idle in GraphicBufferSource
| * | | | | | | | am 51ac2d64: Merge "Properly handle executing->idle in GraphicBufferSource" ↵Andreas Huber2013-11-083-7/+29
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '51ac2d6451b8614aaad83e5bd29ccb7a3fc4651c': Properly handle executing->idle in GraphicBufferSource
generated by cgit v1.1 at 2024-06-25 11:47:23 +0000