summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/AwesomePlayer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Audio player must not be used as a timesource before it's started.Andreas Huber2011-09-081-1/+3
| | | | | | | | Otherwise it'll trigger a division-by-zero exception since the audio sample rate is as yet unknown. Change-Id: I0793aa7c1c348ffa2611272bb646eff6ecf6ff53 related-to-bug: 5242451
* Guard the audio notifications with a separate lock to avoid deadlocks during ↵Andreas Huber2011-09-011-16/+15
| | | | | | | reset. Change-Id: I9a97372e1f777d1cbd6774cac2ed34b4b8cd9392 related-to-bug: 5179827
* Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULLGloria Wang2011-08-311-1/+2
| | | | | | | and AudioPlayer was not started. Fix for 5236419. Change-Id: I5eadd069118c3533a19b5d6f6dca2ce16d8505fb
* Return an error to the client instead of asserting if decoder instantiation ↵Andreas Huber2011-08-291-8/+19
| | | | | | | | | fails after a surface change. Change-Id: Ic7758cbeb107032db68a1c3b8e2984710a12dd8b related-to-bug: 5212725
* Set mSeekNotificationSent as false for RTSP seeking.Gloria Wang2011-08-251-0/+1
| | | | | | Fix for bug 5208736. Change-Id: Ib1d74608ec289509082d8dcad080769f48098853
* Merge "When switching surface, do not set mSeekNotificationSent as true, ↵Gloria Wang2011-08-181-4/+5
|\ | | | | | | because there could be a previous uncompleted seeking which needs to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent as true here, then mediaplayer.cpp will be waiting for message MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp. Fix for bug 5181272."
| * When switching surface, do not set mSeekNotificationSent as true,Gloria Wang2011-08-181-4/+5
| | | | | | | | | | | | | | | | | | | | | | because there could be a previous uncompleted seeking which needs to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent as true here, then mediaplayer.cpp will be waiting for message MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp. Fix for bug 5181272. Change-Id: I290aff29b6d9ec8db67c66abbe1f352a43f57073
* | Merge "Some decoders require more gentle treatment"Andreas Huber2011-08-181-14/+42
|\ \
| * | Some decoders require more gentle treatmentJames Dong2011-08-181-14/+42
| |/ | | | | | | | | | | | | | | We sacrifice A/V sync to some extent to enable the decoder to recover from temporary bottlenecks. Change-Id: I16195091ad752bfad4c70869cdd7e9f28ca3a118 related-to-bug: 5180142
* | Disable vorbis-auto-looping if the audio sink used is not realtime, i.e. ↵Andreas Huber2011-08-181-1/+6
|/ | | | | | | recording. Change-Id: I982e740e8488ff8717ca5f081db9def55aabc9ec related-to-bug: 5179033
* Properly initialize some instance variables.Andreas Huber2011-08-161-0/+2
| | | | Change-Id: I190b889be343dca14fe8109528be14cc3cdd4c34
* Merge "To reduce the bytes need to be buffered before start playing the ↵Gloria Wang2011-08-101-1/+1
|\ | | | | | | streaming video. We might revert this change if too many spinnings were introduced. For bug 4448008."
| * To reduce the bytes need to be buffered before start playing the streaming ↵Gloria Wang2011-08-101-1/+1
| | | | | | | | | | | | | | | | | | video. We might revert this change if too many spinnings were introduced. For bug 4448008. Change-Id: I3248bba9237d71c2bd99feebc9c73f7bd45260de
* | To support for switching from a non-null surface/ surface texture toGloria Wang2011-08-091-1/+4
|/ | | | | | | a null one, and vice versa. Fix for bug 5137445. Change-Id: Ifca2997f8ad27a843abbdaa7e89a56329bc40fde
* Bug 4599730 Get audio channel count on MediaPlayerGlenn Kasten2011-07-271-1/+16
| | | | | | | Related changes: - Fix bug in get/setParameter* to recycle Parcels when done with them. Change-Id: Iaff05e91bbd99a14fccb79d816dd873359b6ae65
* Merge "Revert "Add some logging to track down where ANR happens during ↵James Dong2011-07-141-4/+0
|\ | | | | | | MediaPlayer._release().""
| * Revert "Add some logging to track down where ANR happens during ↵James Dong2011-07-141-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer._release()." This reverts commit a5293d1ca4459293f4993ea39c09ea703a022844. Conflicts: media/libstagefright/AwesomePlayer.cpp Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426
* | If audio startup fails while executing MediaPlayer::start() do NOT post an errorAndreas Huber2011-07-141-4/+11
|/ | | | | | | notification, the error returned by MediaPlayer::start() will suffice. Change-Id: I49bd8d42078f039e5e6d8d4fed4f7f55dc5ff82a related-to-bug: 5020200
* Merge "Bug 4571308 Provide correct video frame timestamps"Glenn Kasten2011-07-011-0/+3
|\
| * Bug 4571308 Provide correct video frame timestampsGlenn Kasten2011-06-271-0/+3
| | | | | | | | Change-Id: I0f726817fc02d3e2a4cf82ed801ef977994e6bcc
* | Charge network traffic to the uid of the process using the MediaPlayer.Andreas Huber2011-07-011-0/+16
|/ | | | | Change-Id: I2bcb54b8232afd3fc7ee16289f37c7a7b3f23067 related-to-bug: 4517282
* Make dumpsys(media.player) more useful by having AwesomePlayer populate it.Andreas Huber2011-06-081-44/+212
| | | | Change-Id: I12ba7d542331a8293d67a0d47378b8be4f777759
* Do not call getEstimatedBandwidth if the streaming is not HTTP-basedJames Dong2011-06-021-1/+1
| | | | Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
* Send estimated bandwidth value as informational event when cache fetcher pausesJames Dong2011-05-311-0/+28
| | | | | | | | | | o Application can make informed decision about the available network bandwidth when cache fetcher pauses. o Application can also adjust how frequently the bandwidth is estimated within a range from one second to one minute. Change-Id: I90068001343e79da1886de03c565537787e1580b
* Merge "For out of band timed text support (timed text in a separate file)."Gloria Wang2011-05-251-4/+22
|\
| * For out of band timed text support (timed text in a separate file).Gloria Wang2011-05-251-4/+22
| | | | | | | | Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
* | resolved conflicts for merge of d5762583 to masterJames Dong2011-05-241-0/+5
|\ \ | |/ |/| | | Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
| * Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-231-0/+5
| | | | | | | | | | | | | | o add a log message in AwesomePlayer::reset before acquiring the lock Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb related-to-bug: 4409547
* | resolved conflicts for merge of a8939e0d to masterJames Dong2011-05-191-29/+119
|\ \ | |/ | | | | Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
| * Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" ↵James Dong2011-05-181-28/+111
| |\ | | | | | | | | | into honeycomb-mr2
| | * Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-101-28/+111
| | | | | | | | | | | | | | | | | | | | | | | | uses stagefright's http cache but defers caching to the WVMExtractor, which now has the responsibility of reporting buffer status/duration. Change-Id: Ieec64a20203977fd0a61d0c6834da124de78bfa2 related-to-bug: 4390283
| * | DO NOT MERGEGloria Wang2011-05-131-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For bug 4422428 Squashed commit of the following: commit ae2e13783db2284f40d3891e70e152dab941edfc Author: Gloria Wang <gwang@google.com> Date: Fri May 13 11:43:11 2011 -0700 Add one more DRM error code. For bug 4422428. Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6 commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2 Author: Gloria Wang <gwang@google.com> Date: Fri Apr 29 10:44:46 2011 -0700 Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394 Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
* | Squashed commit of the following:Andreas Huber2011-05-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c80992e419ed567abef451042f09c4958534b90d Author: Andreas Huber <andih@google.com> Date: Wed May 11 14:00:07 2011 -0700 Support for the mp3 audio decoder as a software OMX component. Change-Id: I66e10c4d0be4c3aecdef1c21b15a2c7359ceb807 commit a358d0e1bf2a88897887445f42ccdda0f5f2f528 Author: Andreas Huber <andih@google.com> Date: Wed May 11 13:11:23 2011 -0700 Support for G.711 alaw and mulaw decoders as software OMX components Change-Id: Ia5c76c02cb83a9f94ce39a27b2251e5880218f03 commit 79088b9c9a5c8b8c97ea66cb4f90a2b0f0d34553 Author: Andreas Huber <andih@google.com> Date: Thu May 5 15:43:32 2011 -0700 Instead of using an RGB surface and conversion yuv420->rgb565 convert from OMX_COLOR_FormatYUV420Planar to HAL_PIXEL_FORMAT_YV12 instead. Change-Id: I8c4fc3c54c963f0d4ba6377f3c4ab4e0013152e5 related-to-bug: 4394005 commit 69469d3bd84425777b11b9fc938c5e0c61af26a7 Author: Andreas Huber <andih@google.com> Date: Tue May 10 15:46:42 2011 -0700 voip mustn't link against libstagefright.so Change-Id: I4d0ba9a8b9dc9380b792a1bd04bcda231964862c commit 2a9a9eeeeeb36ae3a9e680469c3016d509ff08c3 Author: Andreas Huber <andih@google.com> Date: Tue May 10 14:37:10 2011 -0700 Remove most non-OMX software decoders by default Change-Id: Ic56514bc1b56b8fa952e8c4a164ea7379ecb69d0 commit a4de62c37b335c318217765403a9fb282b20a216 Author: Andreas Huber <andih@google.com> Date: Mon May 9 16:50:02 2011 -0700 Conditionally build the old-style software decoders. Change-Id: I5de609e1d76c92d26d6eb81d1551462258f3f15f commit 5d8b039f9449dc3dad1e77c42c80cc0b54b0c846 Author: Andreas Huber <andih@google.com> Date: Mon May 9 16:13:12 2011 -0700 Support for MPEG4 and H.263 video decoders as soft OMX components. Change-Id: I5e3a4835afab89f98e3aa128d013628f5830eafe commit b25a1bfbeb0ff6e62e1cc694ce2599c91489c7d0 Author: Andreas Huber <andih@google.com> Date: Mon May 9 11:49:10 2011 -0700 Boost Soft OMX thread priority, fix timestamp handling in vorbis Soft OMX decoder. Change-Id: I68d26d4999f06fcc451d69e5303663fab0cba9e8 commit c0574362f8dc3319ce84d981097867062a698527 Author: Andreas Huber <andih@google.com> Date: Mon May 9 11:28:53 2011 -0700 Support for the AMR decoders (NB and WB) as Soft OMX components. Change-Id: Ia565f59833fb52653e23f26536e7e41fc329a754 commit 3e5575a8f0e27a490cb7bde77bd9456087837f08 Author: Andreas Huber <andih@google.com> Date: Wed May 4 13:41:25 2011 -0700 Signal an error if the aac decoder failed to initialize from codec specific data. Change-Id: I01da7831bdf722edd7d6dc5974486daa2cf2b209 related-to-bug: 4272179 commit f94aeaa9886e772ff4823e671ed237096649f4af Author: Andreas Huber <andih@google.com> Date: Tue May 3 13:07:38 2011 -0700 Software OMX nodes don't (yet?) support native_window mode. Change-Id: I7d9ca9164ef4abf66b573ca21dba12d672f8b12d commit eefdfabac8dc659e00daa56da69aea705c49cb67 Author: Andreas Huber <andih@google.com> Date: Tue May 3 12:57:16 2011 -0700 Fixing the OMX tests to refer to appropriate files from test content. Change-Id: I5b61c3498749bfb876abbd3946a5132356e3f6ff commit f31b7326aef14b6a1b7946520a9688f092e844d5 Author: Andreas Huber <andih@google.com> Date: Tue May 3 11:08:38 2011 -0700 Soft OMX components are now dynamiclly loaded/unloaded, not directly linked against. Change-Id: I1e2ecfbfab67a8869886f738eaf0c7b3c948b6d9 commit b7f0343879e4df06f0a1c9bfece24df557954e2f Author: Andreas Huber <andih@google.com> Date: Mon May 2 15:58:36 2011 -0700 Support for the AVC software decoder as an OMX component. Change-Id: I13c12df435ba4afbd968a9fc659f66b91c818bc2 commit 5bb9e616d6c8e1b13d531fe996b9a9affdfb2977 Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 12:05:37 2011 -0700 Fix Vorbis OMX decoder's component role. Change-Id: I5e871e5e11b3f951c93590210e63fd7987c467b5 commit 089c91f2333062e196c7afd5fb0ca914878aa474 Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 12:05:18 2011 -0700 Support vorbis_decoder OMX testing. Change-Id: I1985be178a12ae3f8768bc72067d9236238be170 commit 56e241fa36fc37219bc536b823bdc2ab82dc1fad Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 12:01:46 2011 -0700 SoftVorbis OMX component now respects the number of valid frames per page. Change-Id: I82a117a064d9b083fc58a54ad900a987a763ef03 commit fcd618ec520c376fdb78f4cbb44b8d9f5d213e2b Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 10:59:38 2011 -0700 Support for the vorbis audio decoder as a soft OMX component. Change-Id: Iaeb057e58ca306d3dce205c0445b74d5aefef492 commit d1fcc3203fc8003ad79c6e96b3a1fc4261743f16 Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 10:07:50 2011 -0700 VPX decoder now properly resizes buffers after a port settings change. Change-Id: I110749a31b6cba087891d8e5dfe420830bdbf831 commit 35c7168243cb69849d88911144a2c7fdfed5c54e Author: Andreas Huber <andih@google.com> Date: Thu Apr 28 13:23:34 2011 -0700 Support for the VPX video decoder as a Software OMX component. Change-Id: Ic345add2d6d768d4af631160153f2e9b97fcea71 commit 923b2534b4211fc5405377b5190bfa6f2dd27f32 Author: Andreas Huber <andih@google.com> Date: Thu Apr 28 11:34:40 2011 -0700 Table-based registration of soft omx components. Change-Id: I7f45f0fa5b3a7950776e69c66349731f7674e937 commit 04a88f3edb2266a463da9c4481b80178be460902 Author: Andreas Huber <andih@google.com> Date: Thu Apr 28 11:22:31 2011 -0700 Apparently OMX_GetParameter is valid in any state other than OMX_StateInvalid OMX_SetParameter is still constrained to OMX_StateLoaded or a disabled port. Change-Id: I1032d7cf4011982d306aa369d4158a82830d26fb commit 9d70ca68445e7c40f5c9b2d12466e468f514de88 Author: Andreas Huber <andih@google.com> Date: Wed Apr 27 15:03:18 2011 -0700 Use the new soft OMX aac decoder for HTTP live playback. Change-Id: Ifbcfb732a9edb855cb46b49f6d0ac942170ee28f commit 213fe4a10ea93cce08e8622dc3908053f29878a1 Author: Andreas Huber <andih@google.com> Date: Tue Apr 12 16:39:45 2011 -0700 Foundation for supporting software decoders as OMX components Change-Id: I7fdab256563b35d1d090617abaea9a26b198d816 Change-Id: I83e9236beed4af985d10333c203f065df9e09a42
* | Properly honour any pending seek request when reading the first buffer afterAndreas Huber2011-05-101-0/+13
| | | | | | | | | | | | starting the audio player. Change-Id: Ibedc1804a8c444e4d0f5be4eb87b22ed5d2c367d
* | Initial CL for the timed text support:Gloria Wang2011-05-031-6/+64
| | | | | | | | | | | | | | | | - Add support for MP4 timed text - Add API for app to turn on/off a text track - Add timed text metadata(language) in the MediaMetadataRetriever Change-Id: I0055beba38ac761627dbcc6d581ae9582d68bb94
* | Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947"Gloria Wang2011-04-291-0/+7
|\ \
| * | Add setParameter/getParameter to MediaPlayer API.Gloria Wang2011-04-291-0/+7
| | | | | | | | | | | | | | | | | | for bug 1982947 Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
* | | Add DRM errors in the DRM frameworks to MediaErrors also.Gloria Wang2011-04-291-2/+2
|/ / | | | | | | | | | | For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
* | am 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
|\ \ | |/ | | | | | | * commit '8d2e14daa752d657b9747fc9734fbfd7b34c1f7a': Bug 4167061 remove debugging code
| * Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
| | | | | | | | Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
* | Merge "Experimental support for changing the video surface/texture on an ↵Andreas Huber2011-04-121-19/+56
|\ \ | | | | | | | | | active mediaplayer"
| * | Experimental support for changing the video surface/texture on an active ↵Andreas Huber2011-03-141-19/+56
| | | | | | | | | | | | | | | | | | mediaplayer Change-Id: Ia7a5126e9311dc1c721ab2aef54bd698151c88cd
* | | am a7e8385c: am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright ↵Glenn Kasten2011-04-111-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | (1 of 2) * commit 'a7e8385cb34a19e47fb67bf8f632a8b47503242d': Enable HDCP debugging in Stagefright (1 of 2)
| * | Enable HDCP debugging in Stagefright (1 of 2)Glenn Kasten2011-04-111-1/+1
| | | | | | | | | | | | Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
* | | Avoid a race condition while signaling audio EOS/seek complete by acquiring ↵Andreas Huber2011-04-041-0/+2
| | | | | | | | | | | | | | | | | | | | | the lock. Change-Id: Idfea452ff661b264e013fe515bcd2a2762bd959c related-to-bug: 4193552
* | | Remove legacy hack to only drop frames every other late frameAndreas Huber2011-04-011-13/+6
| | | | | | | | | | | | | | | Change-Id: I197e568d292341c330efb394c41aa9af0e74b081 related-to-bug: 4203195
* | | am 69250839: am 4ed59de6: am ffa670b5: Bug 4167061Glenn Kasten2011-03-311-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '69250839bb0ae94305ee1ac9a452b98d67acc5cf': Bug 4167061
| * | Bug 4167061Glenn Kasten2011-03-301-1/+1
| | | | | | | | | | | | Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
* | | Stagefright DataSources now expose the underlying content mime type.Andreas Huber2011-03-301-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | Use that mime type to determine if we should do upfront buffering at the start of playback and don't for audio streams to ensure playback starts fairly instantly. Change-Id: If21e36d1b024f0e5c723911bceadaa2e0307ab42 related-to-bug: 4090916
* | | am e2cb08bd: am 2fee96bc: am 1457ef74: Merge "Make sure we post a video ↵Andreas Huber2011-03-251-2/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | event when seeking after seeing video EOS before." into honeycomb-mr1 * commit 'e2cb08bd4c3bc7e7045e107af41f7228d780be04': Make sure we post a video event when seeking after seeing video EOS before.