summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Send kWhatConnected in onTimeUpdate() before first access unitChong Zhang2013-09-241-17/+23
| | | | | Bug: 10642588 Change-Id: If2b4fbbf250d5307e304f31c7aa4ac480e279484
* 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
* 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
* Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
| | | | | | Bug: 10326117 Change-Id: I15fcc49ad02e26d7cc92e82ee670bafca62a09a7
* 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
* 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
* | Merge "wifi-display: do not use HDCP's encryptNative method if its ↵Chong Zhang2013-09-041-1/+2
|\ \ | | | | | | | | | unsupported" into klp-dev
| * | wifi-display: do not use HDCP's encryptNative method if its unsupportedChong Zhang2013-09-031-1/+2
| | | | | | | | | | | | | | | Bug: 10609422 Change-Id: I005f1d04a4191b1503b5f3e895a98b8d6560c402
* | | Merge " Fixed timestamp handling in ESQueue Access Unit parser. This ↵Rachad2013-09-041-6/+1
|\ \ \ | | | | | | | | | | | | fixes bug b/10294801" into klp-dev
| * | | Fixed timestamp handling in ESQueue Access Unit parser.Rachad2013-08-301-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes bug b/10294801 Change-Id: Ie96d36e2ff6fdee0c949a85da3602ab04b34bf6e
* | | | Merge "Work around decoder slowness" into klp-devMarco Nelissen2013-09-041-0/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Work around decoder slownessMarco Nelissen2013-09-031-0/+2
| |/ / | | | | | | | | | | | | | | | b/10528409 Change-Id: Ifcaf0488d63e87676b1e9382437943138deb76a6
* | | Merge "AAC encoder: handle missing object types" into klp-devJean-Michel Trivi2013-09-031-0/+4
|\ \ \ | |_|/ |/| |
| * | AAC encoder: handle missing object typesJean-Michel Trivi2013-08-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The audio object type for parametric stereo and lowdelay was not passed to the FDK AAC encoder. Bug 9428126 Change-Id: Ic32822afff8b1da6a2d80c1b65d514f24059fb29
* | | Revert "Fix decoder EOS handling"Eric Laurent2013-08-306-208/+202
| |/ |/| | | | | | | | | | | This reverts commit 9da36a6c8df70a5c8179ac78fab33cfbb5078cb2. Bug: 10571297. Change-Id: I76f20fe34872ea54fce626077462fb86c8c3f02e
* | Merge "Fix decoder EOS handling" into klp-devMarco Nelissen2013-08-306-202/+208
|\ \
| * | Fix decoder EOS handlingMarco Nelissen2013-08-306-202/+208
| |/ | | | | | | | | | | | | | | | | | | Conceptually it should be the same whether EOS is signalled on the last buffer holding data, or an empty buffer that follows. Make it so that this actually behaves the same for mp3, AAC and Vorbis. b/8747869 Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
* | AudioPlayer: timestamp fixes for compress offloadHaynes Mathew George2013-08-291-7/+16
| | | | | | | | | | | | | | Use realtime queried from AudioTrack as the only time for compress offload playback. Change-Id: I314447637715c4864690c94173260165369146cb
* | Set PREPARING flag after setDataSource_l()Chong Zhang2013-08-281-1/+1
|/ | | | | | | | Otherwise the reset_l() inside setDataSource_l() will get stuck waiting for the PREPARING to be cleared. Bug: 10426788 Change-Id: I7ccdf7abcea71cf150544c7cd3f4781e3a946b97
* Merge "wifi-display: pass session info to wifi display settings" into klp-devChong Zhang2013-08-232-6/+10
|\
| * wifi-display: pass session info to wifi display settingsChong Zhang2013-08-212-6/+10
| | | | | | | | | | | | Bug: 9371882 Change-Id: I9e4b8c2154b03ce8ff3e14c465a5224bb6e8db9a
* | Merge "MediaPlayer: add listener for raw track data" into klp-devChong Zhang2013-08-237-18/+168
|\ \
| * | MediaPlayer: add listener for raw track dataChong Zhang2013-08-197-18/+168
| | | | | | | | | | | | | | | | | | Bug: 10326117 Change-Id: I2c0bdf8adc67b11f8dc633423bee66897548f181
* | | Camera1: Rename setPreviewTexture to ...Target for clarityEino-Ville Talvala2013-08-211-1/+1
| |/ |/| | | | | | | Bug: 10312644 Change-Id: I19976188f0359bfd177209fb40145defdae9c740
* | Remove call to enable/disable remote submix from test program.Jeff Brown2013-08-161-26/+0
|/ | | | | | | | The submix will be controlled automatically from now on based on whether there is an active audio recorder. Bug: 10265163 Change-Id: Iea8164182daa037066f60974b54597d20db4903b
* Merge "Add MEDIA_STARTED/PAUSED/STOPPED events to media players" into klp-devLajos Molnar2013-08-162-0/+25
|\
| * Add MEDIA_STARTED/PAUSED/STOPPED events to media playersLajos Molnar2013-08-152-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | This is needed for the MediaTimeProvider java interface, so it does not continually poll for current media time. Note: NuPlayer and AwesomePlayer do not correctly handle stop (pause instead), so for those we will signal PAUSED. Signed-off-by: Lajos Molnar <lajos@google.com> Change-Id: I3c61e1bda475f131323f475c18a42e3ec66c9ae1 Bug: 10326117
* | Merge "You can now opt-in to having the video decoder push blank buffers to ↵Andreas Huber2013-08-151-1/+9
|\ \ | | | | | | | | | the" into klp-dev
| * | You can now opt-in to having the video decoder push blank buffers to theAndreas Huber2013-08-141-1/+9
| | | | | | | | | | | | | | | | | | | | | surface on the transition from executing->idle by specifying the key "push-blank-buffers-on-shutdown" with a value of 1 in the call to configure. Change-Id: I1155fccf89f18e717728c985e590651597595515
* | | Merge "fix build. optional tests broke" into klp-devMathias Agopian2013-08-151-0/+2
|\ \ \
| * | | fix build. optional tests brokeMathias Agopian2013-08-141-0/+2
| |/ / | | | | | | | | | Change-Id: Ifb38fb2a7bd9c3d6305726f8e6d661be05cdcf7e
* | | Merge "Check adaptive playback support via CodecCapabilities" into klp-devLajos Molnar2013-08-142-2/+12
|\ \ \ | |/ / |/| |
| * | Check adaptive playback support via CodecCapabilitiesLajos Molnar2013-08-132-2/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added flags field to CodecCapabilities, so that applications can query whether codecs support various features. For now added one video-decoder feature: kFlagSupportsAdaptivePlayback Media playback applications can query it to see if a codec supports seamless resolution changes, such as by supporting dynamic output buffers. Signed-off-by: Lajos Molnar <lajos@google.com> Change-Id: I09da46e8ab6b8645fa2749e33128e49eda2e865b Related-to-bug: 7093648
* | Merge "Optionally repeat the previously submitted frame to the encoder" into ↵Andreas Huber2013-08-134-9/+244
|\ \ | |/ |/| | | klp-dev
| * Optionally repeat the previously submitted frame to the encoderAndreas Huber2013-08-134-9/+244
| | | | | | | | | | | | | | if no new frame has been delivered by surface flinger within the timeout interval. Change-Id: I282f1b726dfe5646b178d7858d6f5d4f5a264fde
* | Support for "request-sync" parameter in ACodecAndreas Huber2013-08-121-3/+18
|/ | | | | | Also returns errors to caller instead of asserting... Change-Id: Id3018655a2b3da4289167fba16af907350a511ae
* am bcd86896: am d0f5664a: Merge "Handle undefined NAL type for h264 streaming"Andreas Huber2013-08-081-0/+7
|\ | | | | | | | | * commit 'bcd86896e486e303d285e13477e0623b2a920e78': Handle undefined NAL type for h264 streaming
| * Merge "Handle undefined NAL type for h264 streaming"Andreas Huber2013-08-081-0/+7
| |\
| | * Handle undefined NAL type for h264 streamingPatrik2 Carlsson2013-07-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Packages of undefined NAL type (0) was observed but lead to deleting the subsequent package due to the current assembler implementation. Identifying and ignoring this package without returning an error handles undefined packages without side-effects. Change-Id: I02e15b8682bee3154b3c4acf82639a28417f0c85
* | | Merge "IOMX: add updateGraphicBufferInMeta method for metadata mode"Lajos Molnar2013-08-066-6/+57
|\ \ \
| * | | IOMX: add updateGraphicBufferInMeta method for metadata modeLajos Molnar2013-08-066-6/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used to set the handle in the metadata buffer that is valid in the mediaserver process, as well as to keep a reference for the graphic buffers in BufferMeta. Change-Id: I46bb68d8bed894f357eeeb25368360d11b276634 Signed-off-by: Lajos Molnar <lajos@google.com>
* | | | separte producer and consumer interfacesMathias Agopian2013-08-061-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: 9265647 Change-Id: Iefabc11e4bd2e2e8ffd31160476c450affe6629c
* | | | fix fallout from binderizing BufferQueues consumer sideMathias Agopian2013-08-012-9/+4
| | | | | | | | | | | | | | | | Change-Id: I626bac6df4fc3d8478046193f06ecc7ea60dd3a8
* | | | Unregister any handlers still registered on now "dead" ALoopersAndreas Huber2013-07-312-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | upon the death of an ALooper. Change-Id: I64c0835b8db04486204f3d0fa7173ee53708a116 related-to-bug: 10106648
* | | | am b57fb786: am d0ef1ccd: Merge "rtsp handle response line ended with \'\n\'"Andreas Huber2013-07-311-0/+3
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit 'b57fb786a32d4ea78cd8bbf24a65593353d87a88': rtsp handle response line ended with '\n'
| * | rtsp handle response line ended with '\n'Yajun Zeng2013-07-311-0/+3
| |/ | | | | | | | | Change-Id: I5bfafd3fa2c95083e833da2846556282eada2b02 Signed-off-by: Yajun Zeng <beanz@marvell.com>
* | Merge "Fix typo in AwesomePlayer"Andreas Huber2013-07-291-1/+1
|\ \
| * | Fix typo in AwesomePlayerSungsoo Lim2013-07-101-1/+1
| | | | | | | | | | | | Change-Id: I32113e382a3033c9a1b038dc06e4ccddc2a97d7f