summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Added profile and level translation in SW video encoders"James Dong2010-10-292-5/+188
|\ \ \ \
| * | | | Added profile and level translation in SW video encodersJames Dong2010-10-272-5/+188
| | | | | | | | | | | | | | | | | | | | Change-Id: I6b9c33c7e4b497f3dc61b2a0dcf4e65727f9bcdd
* | | | | Upgrade to the latest version of libwebm to fix YouTube webm playback.Andreas Huber2010-10-283-3533/+5067
|/ / / / | | | | | | | | | | | | | | | | Change-Id: I6a0f5e1aa07d3af428c314d36f69b119fa8d2d3a related-to-bug: 3141937
* | | | Better support for MP4A-LATM RTP disassembly. This used to fail if ↵Andreas Huber2010-10-274-20/+382
| | | | | | | | | | | | | | | | | | | | | | | | mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries. Change-Id: I20e3b86f52b7f0f41663ffe8bc1f4db92280e884
* | | | am cd08ada7: am 67c7a4ae: Merge "Fix off-by-two and other bugs in the ↵Marco Nelissen2010-10-271-9/+12
|\ \ \ \ | |/ / / | | | | | | | | visualization code. b/3137511" into gingerbread
| * | | am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. ↵Marco Nelissen2010-10-271-9/+12
| |\ \ \ | | | |/ | | |/| | | | | b/3137511" into gingerbread
| | * | Fix off-by-two and other bugs in the visualization code.Marco Nelissen2010-10-271-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | b/3137511 Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
* | | | Merge "Remove annoying warning during mpeg4 extraction."Andreas Huber2010-10-271-1/+1
|\ \ \ \
| * | | | Remove annoying warning during mpeg4 extraction.Andreas Huber2010-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iffadeefb43bab6da1299b0a0582d6c6990156c32 related-to-bug: 3093774
* | | | | Merge "FileSource may fail to open a file in which case subsequent code ↵Andreas Huber2010-10-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | dereferences a NULL pointer. This fixes this recently introduced problem."
| * | | | | FileSource may fail to open a file in which case subsequent code ↵Andreas Huber2010-10-271-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | dereferences a NULL pointer. This fixes this recently introduced problem. Change-Id: I60dd9532b694a1b488743b71f43e107c778d6683
* | | | | Fix for simulator build breakKristian Monsen2010-10-271-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | strrchr returns a const char* in c++ if you give in a const char* Change-Id: I15ac2ae9e1d41d7737193146c526fcbddccae27c
* | | | am e1e82745: am 2088e371: Merge "Assume that all of the decoded vorbis audio ↵Andreas Huber2010-10-261-6/+14
|\ \ \ \ | |/ / / | | | | | | | | data is valid unless the source indicates otherwise." into gingerbread
| * | | am 2088e371: Merge "Assume that all of the decoded vorbis audio data is ↵Andreas Huber2010-10-261-6/+14
| |\ \ \ | | |/ / | | | | | | | | valid unless the source indicates otherwise." into gingerbread
| | * | 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
* | | | Do not create drm directory here. Fix for bug 3134576.Gloria Wang2010-10-261-16/+1
| | | | | | | | | | | | | | | | Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
* | | | Merge "Add two creation flags to OMXCodec::Create()"James Dong2010-10-262-1/+15
|\ \ \ \
| * | | | Add two creation flags to OMXCodec::Create()James Dong2010-10-252-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o This allows to force to use software codecs or hardware codecs o If request cannot be fullfilled, Create() returns NULL. Change-Id: I02b56a9229abb56d49703fe80ac18571d33f3748
* | | | | A temporary fix for "Waiting for service drm.drmManager".Gloria Wang2010-10-261-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: I554c9bbec8c63c3c8dbc5b5374614c1101f6d1d9
* | | | Merge "Remove OMX.PV.* components from OMXCodec.cpp"James Dong2010-10-251-30/+6
|\ \ \ \
| * | | | Remove OMX.PV.* components from OMXCodec.cppJames Dong2010-10-251-30/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie43c00a4d589e9cca6e9505a5dabd4e0d8af321a
* | | | | Merge "Don't change the video recording frame rate if it is not requested."James Dong2010-10-252-3/+35
|\ \ \ \ \
| * | | | | Don't change the video recording frame rate if it is not requested.James Dong2010-10-252-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o set the default video frame rate to the current frame rate being used o add check on whether the requested frame rate is supported o fix an issue where the hardware video encoder setting was bypassed o increases the max frame rate from 30 t0 120 frames per second the actual frame rate will be clipped if the requested frame rate is too high when recording starts by checking the hardware encoder capabilities Change-Id: I1b47671d74da0ebcb9601bdca390d430cc048fbc
* | | | | | resolved conflicts for merge of 965f960e to masterGloria Wang2010-10-2515-41/+830
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
| * | | | | resolved conflicts for merge of 9084631d to gingerbread-plus-aospGloria Wang2010-10-2515-41/+830
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
| | * | | | DRM framework support:Gloria Wang2010-10-2515-41/+826
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
* | | | | | Merge "We don't have access to the md5 implementation on the simulator, ↵Andreas Huber2010-10-251-0/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | let's disable digest authentication in rtsp for simulator targets."
| * | | | | We don't have access to the md5 implementation on the simulator, let's ↵Andreas Huber2010-10-251-0/+10
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | disable digest authentication in rtsp for simulator targets. Change-Id: I02a9b4af929601c899f04cee9864d0dd0716de62
* | | | | am b877a54a: (-s ours) am 89821204: Merge "Remove the FLIP_H/ROT_90 ↵Wu-cheng Li2010-10-250-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | workaround from CameraService.do not merge" into gingerbread Merge commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5' * commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5': Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
| * | | am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from ↵Wu-cheng Li2010-10-252-11/+5
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | CameraService.do not merge" into gingerbread Merge commit '89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp * commit '89821204379816f6bee6902c4f132c014700c3b0': Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
| | * | Remove the FLIP_H/ROT_90 workaround from CameraService.do not mergeWu-cheng Li2010-10-252-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | Now overlay does flip before rotation. bug:3114236 Change-Id: I1780e56154566435a0ceeb2f101de7ed0a0613cb
* | | | Mirror the camera preview if the camera is front-facing.Wu-cheng Li2010-10-253-27/+50
| | | | | | | | | | | | | | | | | | | | bug:3095272 Change-Id: Ib1c1d1edc06a33e9d4d2dcb42bc1dd2c25b1310c
* | | | Ignore b04e3940 from gingerbread-plus-aosp - already in masterJean-Baptiste Queru2010-10-240-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Iad2179aa6cf6214ba32239774846bad676f6b976
| * | | Fixes for simulator build on lucidMike Lockwood2010-10-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | strchr and strrchr now return const char* instead of char* Change-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358
* | | | Merge "OMX extension to support storing meta data in video input buffers ↵James Dong2010-10-227-0/+97
|\ \ \ \ | | | | | | | | | | | | | | | during recording"
| * | | | OMX extension to support storing meta data in video input buffers during ↵James Dong2010-10-217-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recording bug - 3042125 Change-Id: I7543809fa4ff61d48da35eec6c2bd5eaa7e8cead
* | | | | am 6123e0f7: am 1bd8a8c8: Merge "Turn the media time adjustment in file ↵James Dong2010-10-211-2/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | writer back on" into gingerbread Merge commit '6123e0f7c91ffc7534da99b4668879dacf662227' * commit '6123e0f7c91ffc7534da99b4668879dacf662227': Turn the media time adjustment in file writer back on
| * | | | am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" ↵James Dong2010-10-211-2/+5
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp * commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410': Turn the media time adjustment in file writer back on
| | * | | Merge "Turn the media time adjustment in file writer back on" into gingerbreadJames Dong2010-10-211-2/+5
| | |\ \ \
| | | * | | 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
* | | | | | am 46beb433: (-s ours) am 0c636055: Merge "Mirror the preview for ↵Mathias Agopian2010-10-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | front-facing cameras. do not merge" into gingerbread Merge commit '46beb43357e32507189203db4626d0df954abe62' * commit '46beb43357e32507189203db4626d0df954abe62': Mirror the preview for front-facing cameras. do not merge
| * | | | | am 0c636055: Merge "Mirror the preview for front-facing cameras. do not ↵Mathias Agopian2010-10-213-19/+55
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge" into gingerbread Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp * commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4': Mirror the preview for front-facing cameras. do not merge
| | * | | | Merge "Mirror the preview for front-facing cameras. do not merge" into ↵Mathias Agopian2010-10-213-19/+55
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | gingerbread
| | | * | | Mirror the preview for front-facing cameras. do not mergeWu-cheng Li2010-10-203-19/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V or FLIP_H first. The formula should be changed after overlay is fixed. bug:3059865 Change-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6
* | | | | | am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" ↵James Dong2010-10-212-18/+39
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99' * commit '8ad6335d2c22900de5b46460473495b5bcea9f99': File writer size estimation improvement
| * | | | am fa7a87fb: Merge "File writer size estimation improvement" into gingerbreadJames Dong2010-10-202-18/+39
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp * commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26': File writer size estimation improvement
| | * | | File writer size estimation improvementJames Dong2010-10-192-18/+39
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Fix a copy & paste logging error.Jamie Gennis2010-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change corrects the name of a variable used in a logging macro, allowing AwesomePlayer.cpp to build with verbose logging enabled. Change-Id: Ie23fe0fb17f08ac43348cee3209bfe68088e856e
* | | | Merge "Fix the non-ANW video decode path."Jamie Gennis2010-10-201-2/+4
|\ \ \ \
| * | | | Fix the non-ANW video decode path.Jamie Gennis2010-10-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BufferInfo::mOwnedByNativeWindow field was not being initialized in the non-ANativeWindow video decode path. Change-Id: If2f6249902a08690f6c62ef30791b9979050c0e5
generated by cgit v1.1 at 2024-09-16 18:28:37 +0000