summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Corrected whitespace trespasses.Josh Guilfoyle2011-02-042-5/+5
| | | | | | | | Many small whitespace mistakes slipped into the framework as the themes feature was developed. This patch reverts them to make a cleaner patch set against android-2.3.1_r1. Change-Id: I52223c1d572d4f013e37bebc5c11bb7b1c595eb3
* Merge commit 'android-2.3.1_r1' into themes-exp-2.3.1_r1Josh Guilfoyle2010-12-23848-23892/+173443
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: core/java/android/app/ActivityThread.java core/java/android/content/pm/ApplicationInfo.java core/java/android/content/pm/PackageParser.java core/res/AndroidManifest.xml services/java/com/android/server/PackageManagerService.java services/java/com/android/server/SystemServer.java test-runner/src/android/test/mock/MockPackageManager.java
| * Use back-facing camera as default in camera/camcorder profile.do not mergeWu-cheng Li2010-11-092-5/+29
| | | | | | | | | | bug:3173302 Change-Id: I11eaed32bb393206b560834d52c412f3e5a1a7d9
| * Merge "Update a comment about when setOrientationHint() should be called" ↵James Dong2010-11-081-1/+1
| |\ | | | | | | | | | into gingerbread
| | * Update a comment about when setOrientationHint() should be calledJames Dong2010-11-081-1/+1
| | | | | | | | | | | | Change-Id: I389089390a552ee7a86823c050048dcec0a0eb2a
| * | Support extracting thumbnail from rotated video tracksJames Dong2010-11-083-1/+66
| |/ | | | | | | Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
| * Support post-decode video rotation.Andreas Huber2010-11-058-89/+228
| | | | | | | | Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
| * Merge "Rotation support" into gingerbreadJames Dong2010-11-053-19/+84
| |\
| | * Rotation supportJames Dong2010-11-053-19/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We only support 0, 90, 180, and 270 degree clockwise rotation - Some players are known to ignore composition matrix in the MP4 file, although this is part of the MP4 file standard. Both QT and YT are supporting the rotation Change-Id: I1b7f66a801e9d9c49d889c9b06dd6173fa7e76c4
| * | Add a new public API to support recording rotated videosJames Dong2010-11-051-0/+25
| |/ | | | | | | | | | | | | o changed a comment about the rotation orientation from counter-clockwise to clockwise. Change-Id: I16ad73ce1a55cc627d9a516e23d1325753b3037e
| * Revert "Support rotation in media recorder"James Dong2010-11-033-39/+0
| | | | | | | | This reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.
| * Support rotation in media recorderJames Dong2010-11-033-0/+39
| | | | | | | | | | | | o needs to be tested with camera hal and camcorder application Change-Id: Ie343185c8ad3ec55da8850efbdcf19cf98993232
| * DO NOT MERGEJames Dong2010-11-021-3/+29
| | | | | | | | | | | | | | | | Fix premature release of recording frames when physical address or metadata is stored in input video buffers - bug 3158459 Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
| * Merge "Add the mediaplayer release in the test validation. This is to ensure ↵Yu Shan Emily Lau2010-10-271-0/+1
| |\ | | | | | | | | | the media player release properly." into gingerbread
| | * Add the mediaplayer release in the test validation. This is to ensure the ↵Yu Shan Emily Lau2010-10-261-0/+1
| | | | | | | | | | | | | | | | | | media player release properly. Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
| * | Fix off-by-two and other bugs in the visualization code.Marco Nelissen2010-10-271-9/+12
| | | | | | | | | | | | | | | | | | b/3137511 Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
| * | Assume that all of the decoded vorbis audio data is valid unless the source ↵Andreas Huber2010-10-261-6/+14
| | | | | | | | | | | | | | | | | | indicates otherwise. Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
| * | Fix issue 3126094.Eric Laurent2010-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | android_media_Visualizer.cpp: Delete local reference to jArray in captureCallback() in the case of waveform capture. Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
| * | Turn the media time adjustment in file writer back onJames Dong2010-10-211-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | o This was turned off to unblock the tests on some device o The adjustment duration is increased to suppress fluctuations observed on some device bug - 3058745 Change-Id: Iaeeb1c1c52783f5c679305645c995e57b4b2a573
| * | File writer size estimation improvementJames Dong2010-10-191-18/+38
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | o Do not count the reserved space for moov if the meta data size is small o Do not count the extra 1KB disturbing small file estimation. o Reduce the default minimum reserved space from 4 KB to 3 KB. o Estimate the moov size based on both duration AND file size limit is set and set it to the smaller estimated value. low risk change bug - 3111983 Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
| * If we encounter video stream EOS while seeking we may still need to seek audio.Andreas Huber2010-10-192-18/+37
| | | | | | | | | | Change-Id: Ie260942247b6810ca94e86328a3725d75b12181d related-to-bug: 3108724
| * An attempt to unregister a handler that's no longer registered should not ↵Andreas Huber2010-10-181-3/+8
| | | | | | | | | | | | | | | | | | | | cause an assertion. There are edge cases in which a handler attempts to unregister itself while on another thread a message fails to be delivered to that very handler and causes automatic unregistration. In this case the handler's good cleanup intentions are thwarted by the CHECK. Change-Id: I4e41b5e7b619159ecce4856c15cccca031a28b5b related-to-bug: 3101247 QA-impact: no(!!!) risk
| * Merge "For thumbnail extraction make sure we instantiate a decoder that ↵Andreas Huber2010-10-182-2/+46
| |\ | | | | | | | | | allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread
| | * For thumbnail extraction make sure we instantiate a decoder that allows ↵Andreas Huber2010-10-182-2/+46
| | | | | | | | | | | | | | | | | | | | | access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder. related-to-bug: 3106534 Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
| * | If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. ↵Andreas Huber2010-10-181-0/+8
| |/ | | | | | | | | | | This is valid for video content according to the specs. Change-Id: I686320d9d4cd826f43c0813c6ba1dc4949d1115f
| * Include the framework copy of the OpenMAX headers instead of referencing ↵Andreas Huber2010-10-1516-17/+20
| | | | | | | | | | | | | | external/opencore. Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6 related-to-bug: 3101573
| * Make sure we cache the sampleTable again if using the caching datasource.Andreas Huber2010-10-151-1/+3
| | | | | | | | | | | | | | QA-impact: This fixes http streaming again which I broke about 2 days ago. The previously observed symptoms were stuttering playback of http streams (think YouTube) after a certain playback position. Change-Id: I14050e3522ecd62c90d29310efdf508fdd2e87b5 related-to-bug: 3098873
| * Fix issue 3098850Eric Laurent2010-10-141-0/+1
| | | | | | | | | | | | | | | | Media framework test permissions were not updated when commit 14beea487c065ca902bfd7089399eb71a805e302 added MODIFY_AUDIO_SETTINGS permission check for global effects. Change-Id: I2a97be74f33d62fbb749642b1e7a26ddf92378f2
| * Metadata.cpp and Metadata.java had drifted out of sync. This change remedies ↵Andreas Huber2010-10-131-1/+1
| | | | | | | | | | | | | | that. Change-Id: I48175666857ab0fb1519777bdb6f7f0b6b5cc599 related-to-bug: 3073955
| * Merge "Attempt to derive the avg. bitrate of the entire stream from ↵Andreas Huber2010-10-132-9/+50
| |\ | | | | | | | | | metadata." into gingerbread
| | * Attempt to derive the avg. bitrate of the entire stream from metadata.Andreas Huber2010-10-132-9/+50
| | | | | | | | | | | | | | | related-to-bug: 3093224 Change-Id: I4726b023373e04468cc12fd64f7fe6ee923add95
| * | Some webcams output rtp streams but never send any rtcp data in violation ofAndreas Huber2010-10-133-4/+62
| |/ | | | | | | | | | | | | the specs. Attempt to use fake timestamps to be able to play these... Change-Id: Ia7a926616fb764e972955df4acdb59d85cdd93df related-to-bug: 3087310
| * Merge "Support for writing to MPEG2 transport stream files." into gingerbreadAndreas Huber2010-10-135-21/+123
| |\
| | * Support for writing to MPEG2 transport stream files.Andreas Huber2010-10-125-21/+123
| | | | | | | | | | | | Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
| * | HTTP Live content that are tagged as complete are now seekable.Andreas Huber2010-10-1214-33/+297
| |/ | | | | | | | | Change-Id: I9d0d2f009f883e5baf3e9de8c5c0aa05760e4bde related-to-bug: 2368598
| * Just in case we're behind a NAT router/firewall, attempt to poke holes into ↵Andreas Huber2010-10-111-0/+153
| | | | | | | | | | | | | | it for future incoming RTP/RTCP packets to pass through. Change-Id: Idd47968d4027f357222f19f15eecfd70fdec3282 related-to-bug: 3073813
| * RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek ↵Andreas Huber2010-10-085-11/+87
| | | | | | | | | | | | | | is complete until it actually is. Ignore seek requests on live streams. Change-Id: Ie61230cd60dd6c682baf72529100369ad6291189 related-to-bug: 3073955
| * Refactor some more h.264 utility code out into avc_utils. Work around a ↵Andreas Huber2010-10-086-153/+207
| | | | | | | | | | | | hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR. Change-Id: I61936601e55df7e4c23a8c13087579a4f85bd6e6
| * Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very ↵Andreas Huber2010-10-085-5/+16
| |\ | | | | | | | | | expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
| | * Disable 10secs forward/backward seeking for rtsp as seek is a very expensive ↵Andreas Huber2010-10-085-5/+16
| | | | | | | | | | | | | | | | | | | | | operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality. Change-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2 related-to-bug: 3073955
| * | Merge "Respect the cropping rectangle when extracting the video dimensions ↵Andreas Huber2010-10-081-1/+38
| |\ \ | | | | | | | | | | | | from the sequence parameter set of H.264 streams." into gingerbread
| | * | Respect the cropping rectangle when extracting the video dimensions from the ↵Andreas Huber2010-10-081-1/+38
| | |/ | | | | | | | | | | | | | | | sequence parameter set of H.264 streams. Change-Id: Id7f21d5ab8533b4e17ceaa8619a39c27f0306150
| * | Merge "Name the writer threads" into gingerbreadJames Dong2010-10-082-2/+11
| |\ \
| | * | Name the writer threadsJames Dong2010-10-072-2/+11
| | | | | | | | | | | | | | | | Change-Id: I51461c3800ac5850e21ff398e80eb20b562264b3
| * | | Merge "Disable the access unit timeout temporarily while a seek operation is ↵Andreas Huber2010-10-081-6/+29
| |\ \ \ | | | | | | | | | | | | | | | in progress." into gingerbread
| | * | | Disable the access unit timeout temporarily while a seek operation is in ↵Andreas Huber2010-10-081-6/+29
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | progress. Change-Id: I116cb76342aae4168f34ebae49ecb2301702a0ea related-to-bug: 3073955
| * | | Merge "Added getter for session Id to AudioSink" into gingerbreadEric Laurent2010-10-084-1/+14
| |\ \ \ | | |/ / | |/| |
| | * | Added getter for session Id to AudioSinkEric Laurent2010-10-074-1/+14
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a method to expose the audio session id at AudioSink interface so that the AudioPlayer in stagefright can retrieve it. Also: - Fixed audio effect send level not being initialized in mediaplayer. - Fixed compilation error when LOGV is enabled in mediaplayer JNI Change-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb
| * | Increase scratch buffers sizes in mp3 software decoder, this integrates a PV ↵Andreas Huber2010-10-073-4/+4
| |/ | | | | | | | | | | | | master/opensource patch. Change-Id: I5a637f1b380e44c94040ec507843d58a1f5a9b61 related-to-bug: 3065605
| * Work to support switching transport streams mid-stream and signalling ↵Andreas Huber2010-10-0714-110/+459
| | | | | | | | | | | | | | discontinuities to the decoder. Change-Id: I7150e5e7342e1117c524856b204aadcb763e06ed related-to-bug: 2368598