summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* am d5766875: AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-161-0/+6
|\ | | | | | | | | * commit 'd576687570f19f3956d91c1d3da10d965e34c407': AwesomePlayer: fix concurrent pause and teardown
| * AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a race condition if a pause request was received while we were executing a teardown event. Although we hold a mutex while processing the teardown event, there is a step of the prepare sequence where we release the mutex if streaming. In this case, the pause request is executed but ignored because the player state is still preparing. At the end of the teardown event processing we restore previous playback state and resume. The fix consists in clearing the saved teardown playback state when a pause request is received while processing a teardown event. Bug: 11225491. Change-Id: If0e61855ce5a336322f1ba8e5559bdc190beeb76
* | am aab5b08c: AwesomePlayer: do not send events when paused.Eric Laurent2013-10-082-1/+13
|\ \ | |/ | | | | | | * commit 'aab5b08cb4a3b5a47daece6168f41ec918020739': AwesomePlayer: do not send events when paused.
| * AwesomePlayer: do not send events when paused.Eric Laurent2013-10-082-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | When streaming audio and paused, AwesomePlayer should stop sending BufferingEvents as they will keep a wake lock for no reason. TimedEventQueue should always acquire the wakelock with mediaserver identity so that it is released with the same identity by the event handler thread. Bug: 11104408. Change-Id: Ied0e03acd6ad2f5a4c0ec82d5c2aa4e1c6da772c
* | am da0926af: Merge "TimedEventQueue takes a wake lock" into klp-devEric Laurent2013-10-043-3/+99
|\ \ | |/ | | | | | | * commit 'da0926afdb12794497c93d68eee296f2d92bfa7e': TimedEventQueue takes a wake lock
| * Merge "TimedEventQueue takes a wake lock" into klp-devEric Laurent2013-10-043-3/+99
| |\
| | * TimedEventQueue takes a wake lockEric Laurent2013-10-043-3/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | Take a wake lock when events present in a TimedEventQueue to prevent from going idle before all delayed events are processed. Bug: 11057387. Change-Id: I26a17df68068fde5e879a2fe7568dec439fc540f
* | | am 7bab0248: Merge "MediaCodec: avoid codec EOS if flushing during port ↵Lajos Molnar2013-10-041-4/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | reconfiguration" into klp-dev * commit '7bab024867996bec6dc4e3e31ed4570da9afbc25': MediaCodec: avoid codec EOS if flushing during port reconfiguration
| * | Merge "MediaCodec: avoid codec EOS if flushing during port reconfiguration" ↵Lajos Molnar2013-10-041-4/+3
| |\ \ | | |/ | |/| | | | into klp-dev
| | * MediaCodec: avoid codec EOS if flushing during port reconfigurationLajos Molnar2013-10-021-4/+3
| | | | | | | | | | | | | | | | | | Change-Id: Ic2e93f38feeb2e906f8d6b400ed6df2b7580ca87 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11045434
* | | am 580ed263: Merge "stagefright: enable adaptive playback based on codec ↵Lajos Molnar2013-10-032-5/+49
|\ \ \ | |/ / | | | | | | | | | | | | | | | format key" into klp-dev * commit '580ed263a6ea6c766f9f715e101340c7fe26ab75': stagefright: enable adaptive playback based on codec format key
| * | stagefright: enable adaptive playback based on codec format keyLajos Molnar2013-10-032-5/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for prepareForAdaptivePlayback() call in configureCodec, if max-width and max-height keys are specified in the format. It is OK for this call to fail, if component does not implement adaptive playback. Change-Id: Ie15892bc666df103b635890a0fda799b204bb06c Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 7093648 Bug: 10192531
* | | am 56ce7260: IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-035-0/+60
|\ \ \ | |/ / | | | | | | | | | * commit '56ce726019f700a95ce5b45beebceadae4836e30': IOMX: Add prepareForAdaptivePlayback method
| * | IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-035-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepareForAdaptivePlayback is the fallback mechanism to support seamless resolution change for devices that do not support dynamic output buffers. It is up to the codecs to handle this appropriately, but codecs that do not handle dynamic output buffers would request enough buffers up to the requested size in this method to avoid port reconfiguration on resolution changes. Change-Id: I58d4aa8ef1359ea3472735bbe9140c3132039b3d Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10192531 Related-to-bug: 7093648
* | | am a306ee6b: Remove now unused wfd commandline tool. (also unbreaks the build)Andreas Huber2013-10-032-384/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'a306ee6bc1aef463f8984be26b8a4214490b6c55': Remove now unused wfd commandline tool. (also unbreaks the build)
| * | Remove now unused wfd commandline tool. (also unbreaks the build)Andreas Huber2013-10-032-384/+0
| | | | | | | | | | | | | | | Change-Id: I03320342976e4e355cc6aeb3d2c485985613b3b5 related-to-bug: 11047222
* | | am 6ea551fa: Remove obsolete miracast sink code and friends.Andreas Huber2013-10-0320-5839/+1
|\ \ \ | |/ / | | | | | | | | | * commit '6ea551fa13b69e5ce359a7dba7485d857a005304': Remove obsolete miracast sink code and friends.
| * | Remove obsolete miracast sink code and friends.Andreas Huber2013-10-0220-5839/+1
| |/ | | | | | | | | Change-Id: I8bbb22fb0cfe2d73881d9f05bf8112ae86d8040b related-to-bug: 11047222
* | am 353fb9bf: Merge "MediaTimeProvider support fixes" into klp-devLajos Molnar2013-10-021-3/+17
|\ \ | |/ | | | | | | * commit '353fb9bf940ee34a3885bc85ec7891228e958a4b': MediaTimeProvider support fixes
| * Merge "MediaTimeProvider support fixes" into klp-devLajos Molnar2013-10-011-3/+17
| |\
| | * MediaTimeProvider support fixesLajos Molnar2013-09-301-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add MEDIA_SKIPPED event when resuming at a different time than seeked to. Send MEDIA_STARTED/PAUSED events only when playing (vs. when doing seek previews) Change-Id: I243ebf054303755ea8863229c3211694f2c204a7 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10954008
* | | am 5fd39f77: Merge "MediaCodecInfo: report supported color formats for ↵Lajos Molnar2013-10-021-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | non-native-window mode" into klp-dev * commit '5fd39f777d54368a93fc9d8a6a24da0239d41fcf': MediaCodecInfo: report supported color formats for non-native-window mode
| * | Merge "MediaCodecInfo: report supported color formats for non-native-window ↵Lajos Molnar2013-10-011-6/+6
| |\ \ | | | | | | | | | | | | mode" into klp-dev
| | * | MediaCodecInfo: report supported color formats for non-native-window modeLajos Molnar2013-09-301-6/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Revert the change in behavior when checking for adaptive playback was introduced. Change-Id: I59dc2450a4299b912015f2e4c9ec018a19a20b84 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10921537
* | | am f006989d: Merge "Change VP8 encoder bitrate" into klp-devRachad Alao2013-09-302-1/+36
|\ \ \ | |/ / | | | | | | | | | * commit 'f006989d8f222639ac170067d371e11daf0e76ae': Change VP8 encoder bitrate
| * | Merge "Change VP8 encoder bitrate" into klp-devRachad Alao2013-09-302-1/+36
| |\ \
| | * | Change VP8 encoder bitrateJohann2013-09-272-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the bitrate to be updated while the encoder is running. Bug: 8422347 Change-Id: I8427fe20921b00f92b8f99fe21691709fab354b0
* | | | am 0797fb70: Merge "Indicate sync frames returned by encoder" into klp-devRachad Alao2013-09-301-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '0797fb709d2cdd35fe596b6089b259ad10d345d6': Indicate sync frames returned by encoder
| * | | Merge "Indicate sync frames returned by encoder" into klp-devRachad Alao2013-09-301-0/+2
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Indicate sync frames returned by encoderJohann2013-09-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Set the appropriate OMX flag when the encoder generates a keyframe. This is necessary for any muxer which needs to indicate which frames are seekable. Bug: 8422347 Change-Id: I744a0b3023db24d3de2210bce82f41e50d259505
* | | am 3d97e23f: Merge "Prevent onPrepared callback from being called twice" ↵Marco Nelissen2013-09-302-17/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | into klp-dev * commit '3d97e23fcd78f752443cb6c30a1ee39f49f1f987': Prevent onPrepared callback from being called twice
| * | Merge "Prevent onPrepared callback from being called twice" into klp-devMarco Nelissen2013-09-282-17/+21
| |\ \
| | * | Prevent onPrepared callback from being called twiceMarco Nelissen2013-09-272-17/+21
| | |/ | | | | | | | | | | | | | | | b/10891995 Change-Id: If6845c832d114629282f0b03f904a37c3325208e
* | | am f2c8b027: Merge "fix playback position after switching to offload" into ↵Eric Laurent2013-09-302-13/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | klp-dev * commit 'f2c8b02786c58b98d41d3f7c30e882cacc34e7ab': fix playback position after switching to offload
| * | fix playback position after switching to offloadEric Laurent2013-09-272-13/+28
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After switching from offloaded track to PCM track while paused (e.g. when connecting A2DP), playback restarts from the beginning of the song when resuming. Save current position before recreating an AudioPlayer in AwesomePlayer::play_l() and seek to the saved position before starting playback. Also fix a problem where the position is not reported properly by AudioPlayer if a seek is pending and queried just after start and before the first buffer is read from the MediaSource. Bug: 8174034. Change-Id: I254e65418ff903a9bf2e2111b89a00e2e54876c5
* | am 58dd0786: Merge "Send kWhatConnected in onTimeUpdate() before first ↵Chong Zhang2013-09-251-17/+23
|\ \ | |/ | | | | | | | | | | access unit" into klp-dev * commit '58dd07863571951408b67fa0a7f17cb23606fb1c': Send kWhatConnected in onTimeUpdate() before first access unit
| * Send kWhatConnected in onTimeUpdate() before first access unitChong Zhang2013-09-241-17/+23
| | | | | | | | | | Bug: 10642588 Change-Id: If2b4fbbf250d5307e304f31c7aa4ac480e279484
* | am 6c63fe0f: am ab70649e: Merge "MediaCodec: Pass the crop rect to ↵Lajos Molnar2013-09-251-0/+6
|\ \ | | | | | | | | | | | | | | | | | | SoftwareRenderer" * commit '6c63fe0fdb33e5e7eb8c89f2420262b072cdd83f': MediaCodec: Pass the crop rect to SoftwareRenderer
| * | MediaCodec: Pass the crop rect to SoftwareRendererMartin Storsjo2013-09-251-0/+6
| | | | | | | | | | | | Change-Id: I434411516eb5fafe9d7aeac9882bbc7f1a8415d8
* | | am ab6c93b4: Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE ↵Lajos Molnar2013-09-182-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | value" into klp-dev * commit 'ab6c93b4bea96dc4f44a7acfefee1e11a3abda5b': Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value
| * | Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE valueLajos Molnar2013-09-172-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I157bcafbf705865e66c81517b1eab10c3daa039e Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10461617
* | | am 877c673c: Merge "ACodec: fix flush/resume for decoder-output-meta-data ↵Lajos Molnar2013-09-121-2/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | mode" into klp-dev * commit '877c673c3d3794e89e4677d448f38f77bdee7fdb': ACodec: fix flush/resume for decoder-output-meta-data mode
| * | ACodec: fix flush/resume for decoder-output-meta-data modeLajos Molnar2013-09-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in decoder-output-meta-data mode, ACodec does not hold onto buffers, but they are either with the native window, or with the component/client. However, for flushing we did not release the discarded buffers back to native window (this makes sense because they will be resubmitted shortly.) This logic can be handled by the normal resubmission. Change-Id: Ic472b386422251515ef12f426e187f208f14decc Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10621959 Bug: 10192533
* | | am a911f51c: Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
|\ \ \ | |/ / | | | | | | | | | * commit 'a911f51c21430ac92f1d796b2338878fd98382e9': Pass subtitle track properties to getTrackInfo
| * | Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
| | | | | | | | | | | | | | | | | | Bug: 10326117 Change-Id: I15fcc49ad02e26d7cc92e82ee670bafca62a09a7
* | | am 7f9551f7: MediaMuxer: Hook up setLocation methodZhijun He2013-09-101-0/+10
|\ \ \ | |/ / | | | | | | | | | * commit '7f9551f75eedb3e4e1fe8feaaba48d8080635fc4': MediaMuxer: Hook up setLocation method
| * | MediaMuxer: Hook up setLocation methodZhijun He2013-09-091-0/+10
| | | | | | | | | | | | | | | | | | | | | This method is needed when mediamuxer is used for camera video recording. Bug: 10594784 Change-Id: I9bd006a07e5e2ac7019849e3f4f7cf7b8356d669
* | | am c23981d9: Merge "Better workaround for slow decoders." into klp-devMarco Nelissen2013-09-061-4/+19
|\ \ \ | |/ / | | | | | | | | | * commit 'c23981d9375d4a55f5701a4090b36deecda92f92': Better workaround for slow decoders.
| * | Merge "Better workaround for slow decoders." into klp-devMarco Nelissen2013-09-061-4/+19
| |\ \
| | * | Better workaround for slow decoders.Marco Nelissen2013-09-041-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more in the spirit of the original code. Now it checks whether a codec instantiated by name is a video codec, and enables the extra looper if so. b/10528409 Change-Id: Ia253c04c1283d4ecf66f213ef4bf523279ad7cca