summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | MediaPlayerService: fix AudioSink latencyEric Laurent2012-03-163-5/+9
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AudioSink latency is currently cached when the associated AudioTrack is created. However, the AudioTrack latency can change if the AudioTrack is moved from one output stream to another. The AudioPlayer must also periodically update its view of the latency as it is needed to compensate the real audio time used for A/V sync. This fixes an A/V sync problem seen when switching A2DP on and off while playing a video. Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4 Conflicts: media/libmediaplayerservice/MediaPlayerService.cpp
| * | | | am 3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1Eric Laurent2012-03-161-6/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '3fe7ee651db0aae9485ead227c89db1e24b9e245': AudioTrack: relax check on minimum buffer size
| | * | | AudioTrack: relax check on minimum buffer sizeEric Laurent2012-03-161-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current AudioTrack implementation enforces that the requested audio buffer size is at least corresponding the audio latency. This requirement is too strong and leads to problems with current stagefright and AudioSink implementations when playing over output streams with long latency. Ultimately, the AudioSink design should be changed to specify a minimum buffer size in time or frames units but not in buffer count units. Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f Conflicts: media/libmedia/AudioTrack.cpp
| * | | | am 4d7bc655: Doc change: String changes for Android MarketDirk Dougherty2012-03-051-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219': Doc change: String changes for Android Market
| * | | | Add batch volume adjust support to adjustMasterVolume() in AudioManager andLei Zhang2012-03-022-33/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioService. Change-Id: I34382839622a5cc5f2a8768aed011e8224cadff9
| * | | | am eb4f3256: Set the video encoding bit rate for the media recorder stress test.Yu Shan Emily Lau2012-02-291-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'eb4f3256b77fe7fd783297a550a64ea441c41169': Set the video encoding bit rate for the media recorder stress test.
| * | | | am ee329930: Merge "Adding time lapse test to mediaframework stress suite." ↵Jason Noguchi2012-02-282-12/+102
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8': Adding time lapse test to mediaframework stress suite.
| * | | | | Fix Audio ramping codeRoboErik2012-02-241-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio ramping was being ignored and we were always adjusting by the same amount. Change-Id: I1dc122e033c382f556844c5acadcfb698c8d2092
| * | | | | Switch the way we configure for MediaPlayer retransmission.John Grossman2012-02-239-92/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move in the direction of a more publishable API for configuring a media player for retransmission. It used to be that we used a custom invoke and a modified URL (prefixed with aahTX://). There are many issues with this technique and it was never meant to stand the test of time. This CL gets rid of all that. A new (but currently hidden) method was introduced to the java level MediaPlayer API, called setRetransmitTarget(InetSocketAddress), which allows an app writer to set the retransmit target. For now, this method needs to be called before a call to setDataSource (which is pretty unusual for the MediaPlayer API) because this mid level code uses this as a cue to instantiate an aahTX player instead of relying on the data source to select a player. When retranmit functionality becomes part of the existing android player implemenation, this set-retrans-before-set-data-source behavior can go away, along with the aahTX player itself. Change-Id: I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd
| * | | | | Revert "Add a way to play file descriptor data sources using the A@H ↵John Grossman2012-02-236-89/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transmitter media player." This reverts commit 64006cb1642b2ec0ee74c66007d869b884391fd1. Back out this change in order to get ready to implement a longer term, more media-team approved way of selecting a retransmit player. Change-Id: I97b68b9859a174eab858598cb00d4445a14fbc17
| * | | | | LibAAH_RTP: Add support for AAC in MP4.John Grossman2012-02-216-104/+399
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie8298eb9d253fc6ede448da87660a60d23170987
| * | | | | am 52bfc243: docs: fix misc doc bugs from external issue trackerScott Main2012-02-091-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6': docs: fix misc doc bugs from external issue tracker
| * | | | | | Add support for non-linear ramping of master volume adjustmentMike Lockwood2012-02-091-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5472584 Change-Id: Id75f8835f6693ae3fcb7ca451ada01f22faba1aa Signed-off-by: Mike Lockwood <lockwood@google.com>
| * | | | | | Explicitly manage common clock client lifetimes.John Grossman2012-02-066-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the CCHelper class to be an instanced instead of a static pattern. The CCHelper instances all share an interface to the common clock service and register/unregister a callback handler in response to there being CCHelper instance in the system or not. This brings usage of the CCHelper into like with the new auto-disable functionality of the common time service. For any given process, whenever there are CCHelper instances active, the process will maintain a callback target to the common clock service and will be considered to be an active client. Also change all of the users of the CCHelper interface to manage the lifecycle of their new CCHelper instances. Change-Id: I7c28c5d70d9b07ba7407b4ac706e7e7d7253001b
| * | | | | | De-AAH-ify the common time service.John Grossman2012-02-034-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bulk name change to remove references to Android@Home from the common time service in preparation for cleanup and up-integration into the master branch. Basically, aah_timesrv is now common_time. Change-Id: I3d3db212f96e8ba171aa36b9c58e27e4a336cb0a
| * | | | | | Only send master volume or mute updates if the settings have changedJason Simmons2012-02-021-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If12ec3b7a4b4bf5165d7538013759f07a845d8c4
| * | | | | | Add a way to play file descriptor data sources using the A@H transmitter ↵Jason Simmons2012-01-298-6/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | media player. * Added a MediaPlayer.setMediaPlayerType API that be called to specify the desired media player implementation before calling setDataSource * Implemented setDataSource(fd) in the AAH_TxPlayer Change-Id: I359075d9c7d6fd699dda14eb85ec50da19307639
| * | | | | | Make AudioManager.adjustMasterVolume public and hiddenJason Simmons2012-01-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied4d07c2f67f24d1e1963f4ff30650042334d563
| * | | | | | Enhance Visualizer behavior in the case of mediaserver death.John Grossman2012-01-125-18/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring the Visualizer class into line with the SDK documentation by returning ERROR_DEAD_OBJECT instead of ERROR_INVALID_OPERATION when the Visualizer loses its binder connection to the mediaserver because of a mediaserver restart. Also add a new callback interface to allow clients to be asynchronously notified in the case of server death. Right now, the interface definition and the registration method are flagged as hidden pending API council review/approval. See http://b/issue?id=5717519 for details. Change-Id: Id428fb946d6d7676bffd2a597366e8444ebe24f2 Signed-off-by: John Grossman <johngro@google.com>
| * | | | | | Reuse callback buffers in the Visualizer.John Grossman2012-01-122-6/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't re-allocate buffers used by Visualizer callbacks as this causes an unacceptable amount of GC thrash. Instead, lazily allocate the buffers and only reallocate them when the required size changes. See http://b/issue?id=5717519 for details. Change-Id: I50458961992a64d9b3c46db7e5e8e6414a92228f Signed-off-by: John Grossman <johngro@google.com>
| * | | | | | am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ↵Eric Laurent2012-01-111-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'c15cf3d286f3d63d141b73f639a5a61ddb028029': stagefright: limit audio gap for looped playback
| * | | | | | | libaah_rtp: address http://b/issue?id=5755419John Grossman2012-01-092-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a heartbeat timeout for TX senders. If none of the TX sender's clients send any packets for this timeout period (10 minutes right now), then the sender will stop sending keep-alive heartbeats. This should cause RX clients to release any held media resources, including any timed audio track. Releasing timeed audio tracks allows the audio system to go into its idle state, which allows the power amp in Tungsten to power all of the way down, saving both heat and power. Change-Id: Ib7a96d334e1064ddea3f07a6b21e6efedefc549a Signed-off-by: John Grossman <johngro@google.com>
| * | | | | | | Restore persisted master volume if the media server restartsMike Lockwood2012-01-061-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5755071 Change-Id: I6934276049b4a9d713bb4754aa3bb2cd3b898604 Signed-off-by: Mike Lockwood <lockwood@google.com>
| * | | | | | | Don't allow changing master volume when mutedMike Lockwood2012-01-051-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5793021 Change-Id: If93a41c4e61f1bc730759e77ee5b5f8165025c42 Signed-off-by: Mike Lockwood <lockwood@google.com>
| * | | | | | | AudioService: remove logging from adjustMasterVolume that was left in by mistakeMike Lockwood2011-12-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75c430d2c50c4cab3b6207efab5a6f11aed728d2 Signed-off-by: Mike Lockwood <lockwood@google.com>
| * | | | | | | Merge "Defer persisting master data to avoid excessive database writes" into ↵Mike Lockwood2011-12-161-5/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-aah
| | * | | | | | | Defer persisting master data to avoid excessive database writesMike Lockwood2011-12-151-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5705192 Change-Id: I252bd72ff72ef4a40174d4597059e89691acb34f Signed-off-by: Mike Lockwood <lockwood@google.com>
| * | | | | | | | am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ↵Dave Burke2011-12-151-1/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f': SurfaceMediaSource: use the HW_TEXTURE usage bit
| * | | | | | | | Merge "logging" into ics-aahJoe Onorato2011-12-142-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | loggingJoe Onorato2011-12-132-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6fde5617365f479884937615e0d3f0f4ecc2dc14
| * | | | | | | | | am d70c64db: Revert the following patches because they may lead to power ↵James Dong2011-12-146-81/+25
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. * commit 'd70c64db9f67dbe8f888de6b1bdcc835226ec526': Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
| * | | | | | | | | am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP ↵Andreas Huber2011-12-132-9/+31
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | header values" into ics-mr1 * commit '3ab630084071eb5dc7f92b4a8a617f8cef10c514': DO NOT MERGE: Support for parsing of "folded" RTSP header values
| * \ \ \ \ \ \ \ \ \ am ef664f62: Merge "Fix drm flag setting missed in false drm recognition ↵Jeff Tinker2011-12-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix." into ics-mr1 * commit 'ef664f62a1525e8f53d0937e889333544ffef3ad': Fix drm flag setting missed in false drm recognition fix.
| * \ \ \ \ \ \ \ \ \ \ Merge "Remove reference counting and client death notification for master ↵Mike Lockwood2011-12-091-120/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mute" into ics-aah
| | * | | | | | | | | | | Remove reference counting and client death notification for master muteMike Lockwood2011-12-071-120/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use case for master mute is to toggle it on and off from a KEYCODE_VOLUME_MUTE event, so this was unnecessary and prevented unmuting in certain cases Bug: 5724755 Change-Id: I041a112cd39e1c00dcae27e2266a95ce225e9b64 Signed-off-by: Mike Lockwood <lockwood@google.com>
| * | | | | | | | | | | | am aadbd80b: Fixed the false drm recognition.James Dong2011-12-092-10/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aadbd80b307c817698ce5110ff8e002804d1b230': Fixed the false drm recognition.
| * \ \ \ \ \ \ \ \ \ \ \ \ am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for ↵Andreas Huber2011-12-082-4/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 200ms" into ics-mr1 * commit '68f592a8210af27df4339089bbee47fb602cae6a': Don't perform RTSP seeks right away but queue them for 200ms
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we ↵Andreas Huber2011-12-084-13/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emulate timestamps" into ics-mr1 * commit '0ba9380a337d5e2eae9fd9e4eb8039403ed3815b': Fix Bitreader "putBits" implementation, make sure we emulate timestamps
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too ↵Jeff Tinker2011-12-085-15/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | long." into ics-mr1 * commit 'a693a4b5553584a01b8b6b3640dc0393d2d88f28': Fix ANRs due to Widevine DRM plugin sniff taking too long.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from ↵Dave Burke2011-12-071-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blocking on data." into ics-mr1 * commit '54a53841a9ff48ba4cd004469ae4ff77caed900a': Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
| * | | | | | | | | | | | | | | | am 6db79c35: Merge "Fix for issue 5712743 video editor functional test : ↵Hong Teng2011-12-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." int * commit '6db79c35c0cb4e26c6aff4a913777fd21069fd3c': Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1Amith Yamasani2011-12-071-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f336408000c4be36045401fb4df89528249e7383': New and improved silent mode on lockscreen.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when ↵James Dong2011-12-071-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | searching for sync frames" into ics-mr1 * commit '6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3': DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1Andreas Huber2011-12-073-6/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '05d630691127c022befd071b2bede87c707112a9': DO NOT MERGE: Remove the AVI extractor.
| * | | | | | | | | | | | | | | | | | | | Tungsten: Improve RX player error handling.John Grossman2011-12-065-7/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, clear an issue which was causing an assert to fire. Basically, once a decoder pump had entered the error state and was shutdown, it was not clearing its status, and when a substream attempt to recycle the pump, startup was failing an assert (no thread had been created, meaning that the system was not initialized, yet status indicated an error). This was a small one-liner in aah_decoder_pump.cpp. Second, try to become a little nuanced about how we handle errors in the decoder pump. A comment in the code pretty much says it all, but the summary is that we don't want to completely abort playback because a single chunk of ES failed to decode, but if nothing is decoding and we are making no progress at all, we probably need to put the MediaPlayer instance into the fatal Error state and signal the app level so that further action can be taken (automatic recovery attempts followed by bug reports and signalling the user if those fail). This is to address the fallout of http://b/issue?id=5498460, where something at the OMX decoder level becomes unhappy about not being able to obtain an output buffer which eventually unwinds to this assert which results in a dead mediaserver. After this change, the mediaserver will no longer crash, and may even recover (depending on whether or not the OMX unhappiness is transient or not), but the primary issue (unhappy OMX) is probably still around. It is quite difficult to reproduce, I will probably need to open a different bug to track that issue. Change-Id: I5b65b818378a5ae9c915e91b7db7129f0bda6837 Signed-off-by: John Grossman <johngro@google.com>
| * | | | | | | | | | | | | | | | | | | | Merge "AudioService: Send broadcasts when master volume and mute state ↵Eric Laurent2011-12-052-6/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change" into ics-aah
| | * | | | | | | | | | | | | | | | | | | | AudioService: Send broadcasts when master volume and mute state changeMike Lockwood2011-12-052-6/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7eb5041f0c14f419317e29ea6fa7faa9159cf165 Signed-off-by: Mike Lockwood <lockwood@google.com>
| * | | | | | | | | | | | | | | | | | | | | am f2e12498: Merge "Properly identify how much metadata we need to cache in ↵Andreas Huber2011-12-053-41/+136
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order to instantiate" into ics-mr1 * commit 'f2e1249846a17c69d728189a8dc67f37261f0a59': Properly identify how much metadata we need to cache in order to instantiate
| * | | | | | | | | | | | | | | | | | | | | am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain ↵Mike Lockwood2011-12-022-42/+157
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subdirectories of the storage DO NOT MERGE" into ics-mr1 * commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd': MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from ↵Mike Lockwood2011-12-021-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the MTP driver DO NOT MERGE" into ics-mr1 * commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1': MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
generated by cgit v1.1 at 2025-02-04 21:09:15 +0000