summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
* Merge fb474872 from gingerbread-plus-aospJean-Baptiste Queru2010-10-181-1/+1
|\ | | | | | | Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
| * Include the framework copy of the OpenMAX headers instead of referencing ↵Andreas Huber2010-10-151-1/+1
| | | | | | | | | | | | | | external/opencore. Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6 related-to-bug: 3101573
* | resolved conflicts for merge of a127c07c to masterKenny Root2010-10-142-0/+57
|\ \ | |/ | | | | Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
| * Support for writing to MPEG2 transport stream files.Andreas Huber2010-10-122-0/+51
| | | | | | | | Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
* | am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for ↵Andreas Huber2010-10-101-0/+4
|\ \ | |/ | | | | | | | | | | | | | | rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7' * commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7': Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
| * Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very ↵Andreas Huber2010-10-081-0/+4
| |\ | | | | | | | | | 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-081-0/+4
| | | | | | | | | | | | | | | | | | | | | operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality. Change-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2 related-to-bug: 3073955
* | | am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" ↵Eric Laurent2010-10-102-0/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '4f21e517d09b9d793d20d64547df330fba705b3c' * commit '4f21e517d09b9d793d20d64547df330fba705b3c': Added getter for session Id to AudioSink
| * | Added getter for session Id to AudioSinkEric Laurent2010-10-072-0/+12
| |/ | | | | | | | | | | | | | | | | | | | | 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
* | Move Camera specific logic out from StagefrightRecorder to CameraSourceJames Dong2010-10-082-172/+13
| | | | | | | | | | | | | | o updated comments and streamlined the logic in checkVideoSize() and checkFrameRate() as suggested Change-Id: I49d04ac7998d4a215997aa63555dfb6e814e38d3
* | Use setVideoSize API in StagefrightRecorderJames Dong2010-10-042-2/+72
| | | | | | | | Change-Id: Ia7ddf5e8d2b931453d2cb801169906191349ca07
* | am 7dff9dfd: am 269dea1c: Merge "Fix media.player dumpsys to output ↵Dave Sparks2010-09-281-2/+4
|\ \ | |/ | | | | | | | | | | | | | | open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that w Merge commit '7dff9dfd6176fad1318a27f16318561453a429f0' * commit '7dff9dfd6176fad1318a27f16318561453a429f0': Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
| * Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.Dave Sparks2010-09-271-2/+4
| | | | | | | | | | | | | | | | | | The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on the SD card. This fix changes the filter for the SD card, and adds the directory for data files as well. Change-Id: I61b67c3d11d93dbd530e8b3566000e79bc037137
* | Implemented frequent read returns for quick stop in time lapse.Nipun Kwatra2010-09-172-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the frame capture interval is large, read will block for a long time. Due to the way the mediaRecorder framework works, a stop() call from mediaRecorder waits until the read returns, causing a long wait for stop() to return. To avoid this, we return a copy of the last read frame with the same time stamp if a frame is not available quickly. This keeps the read() call from blocking too long. This method is triggered when startQuickReadReturns() is called on CameraSourceTimeLapse. In the still camera case, also using waitRelative on Condition instaed of sleeping, so that we can wake it up. Also for the idle check instead of sleeping, we now wait on a condition variable, which is woken up when the last takePicture callback gets called. Change-Id: Ia74386e175536aee0f44ae2f8b114c353d3d72f5
* | Checks for auxiliary video recording.Nipun Kwatra2010-09-141-2/+10
| | | | | | | | | | | | | | | | - Check that time lapse mode is on when using auxiliary video recording. - Check that auxiliary video size is strictly less than the main video size. Change-Id: Ic49d25e6ac30f6f885ce4f5fb38dbe0cc7bc1be1
* | Moving decision to use still camera to CameraSourceTimeLapseNipun Kwatra2010-09-032-25/+4
| | | | | | | | | | | | | | | | | | | | | | | | CameraSourceTimeLapse now decides whether to use still or video camera automatically. It checks if the passed in size is a valid preview size and if it is, then uses the video camera else uses the still camera. Removed from StagefrightRecorder the support to set parameter useStillCameraForTimeLapse. Change-Id: I71f5b0fc7080ca524792381efe918d22e41a7f36
* | Support for auxiliary video parameters.Nipun Kwatra2010-09-012-13/+90
| | | | | | | | | | | | | | | | Added support for passing width, height and video bitrate for the auxiliary video. Also setting encoder level depending on the video size and bitrate. Change-Id: I4a90046853f67287c3e7e6babc75b4827f0c3e73
* | Added setAuxiliaryOutputFile to MediaRecorder and JNINipun Kwatra2010-08-312-0/+12
| | | | | | | | | | | | | | added setAuxiliaryOutputFile to allow setting of an auxiliary output file. Also added the JNI support. Change-Id: I8c3335192bd6f7fcbfdfc8552cfd0848f2ad2a5d
* | Adding support for parallel recording sessions.Nipun Kwatra2010-08-312-35/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added setOutputFileAuxiliary to pass the auxiliary file descriptor. The java interface through JNI will be checked in next. - renamed setupCameraSource to setupCamera as the function just sets the camera. - Added setupCameraSource which sets up the camera source. This functionality was in setupVideoEncoder before. - setupVideoEncoder now takes in a cameraSource instead of creating it on it own. - Refactored startMPEG4Recording() to use setupMPEG4Recording, setupMPEG4MetaData. - setupMPEG4Recording() takes in file descriptor, bitrates to setup a mpeg4 writer. This function can be called multiple times to setup multiple writers. - Added setupMPEG4MetaData() for setting up the meta data for mpeg4 writer. startMPEG4Recording() now calls setupMPEG4Recording, setupMPEG4MetaData for each recording session. Change-Id: I07f5334a1ff8e12a36f58e94129fcfa6add2208b
* | am 9aa05ec2: am 681c5ff2: Merge "Reverse the default setting of ↵Andreas Huber2010-08-302-4/+4
|\ \ | |/ | | | | | | | | | | | | | | media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread Merge commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12' * commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12': Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
| * Reverse the default setting of media.stagefright.enable-{rtsp,record} in ↵Andreas Huber2010-08-302-4/+4
| | | | | | | | | | | | | | preparation for building without opencore. Change-Id: I1ca6bd8faba0185f9694f9dc04d2b3e6a7ab5ac3 related-to-bug: 2370115
* | am 28a92120: am 3f51fa78: Runtime dump support for MediaWriterJames Dong2010-08-241-2/+10
|\ \ | |/ | | | | | | | | | | Merge commit '28a92120a702289533a9c9d004bd60f83b2fd98b' * commit '28a92120a702289533a9c9d004bd60f83b2fd98b': Runtime dump support for MediaWriter
| * Runtime dump support for MediaWriterJames Dong2010-08-231-2/+10
| | | | | | | | Change-Id: I10b2c474de612ee4cef4b7c9eae2ee1dd8c2e895
* | am 701b710c: am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero ↵Nipun Kwatra2010-08-241-1/+5
|\ \ | |/ | | | | | | | | | | | | | | time input as per API of setMaxDuration." into gingerbread Merge commit '701b710c194181765616520f6d89d450b4b6c1f5' * commit '701b710c194181765616520f6d89d450b4b6c1f5': setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
| * setParamMaxFileDurationUs should allow zero time input as per API of ↵Nipun Kwatra2010-08-201-1/+5
| | | | | | | | | | | | | | | | | | | | setMaxDuration. according to MediaRecorder::setMaxDuration documentation we should disable duration limit when zero or negative time is passed. Currently setParamMaxFileDurationUs was treating zero/negative as an error case. Fixed that. Change-Id: I468c3bcc74cb5a34ee3e172cef5147550d6be096
* | Change the framework to use the new camera preview path.Jamie Gennis2010-08-234-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | This change makes the camera HAL interface take an ANativeWindow interface from which all the camera preview buffers will be allocated. The framework code running in application processes now passes a Surface object rather than an ISurface to the camera server via Binder when setting the preview surface. The camera server then forwards that Surface object (which implements the ANativeWindow interface) to the camera HAL, which uses it to communicate with SurfaceFlinger to allocate the camera preview buffers. Change-Id: Ie438f721559cd7de5e4f848a26d96360dda07b5f
* | Merge "Squashed commit of the following:"Andreas Huber2010-08-236-7/+28
|\ \
| * | Squashed commit of the following:Andreas Huber2010-08-236-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 35cc68814a9537c31fde146e171e7b0bbdfe211e Author: Andreas Huber <andih@google.com> Date: Mon Aug 16 08:48:42 2010 -0700 Only enable support for yuv to yuv conversion on passion, where it's available, use the slower yuv->rgb565 path everywhere else. commit d8ac5a8814103e60d11d2acf61997fc31a1dc58d Author: Andreas Huber <andih@google.com> Date: Fri Aug 13 13:56:44 2010 -0700 The software renderer takes over all rendering, converting from yuv to yuv if possible and rgb565 otherwise. commit 684972074b74318bdcb826ed9b5b0864d2d2e273 Author: Andreas Huber <andih@google.com> Date: Fri Aug 13 09:34:35 2010 -0700 A first shot at supporting the new rendering APIs. Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd
* | | am c8d2fa70: am cbd038fe: Merge "Make MediaWriter stop and pause return ↵James Dong2010-08-211-2/+3
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | errors if necessary" into gingerbread Merge commit 'c8d2fa704abebdbf0bd8aac185216dc068950217' * commit 'c8d2fa704abebdbf0bd8aac185216dc068950217': Make MediaWriter stop and pause return errors if necessary
| * Make MediaWriter stop and pause return errors if necessaryJames Dong2010-08-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | o Make the API consistent with SF framework, which the MediaSource provides a return status for stop o Also, helps to convey errors that occurred right when a premature stop() is called, leading to a potentially mal-formed output file. Change-Id: I52a932345f38570fdf8ea04d67d73dd94ccd30ef
* | am f54da15b: am eff30e3d: Change the default time scale for audio/video ↵James Dong2010-08-161-6/+12
|\ \ | |/ | | | | | | | | | | | | | | track during recording and reduce rounding errors in calculating the sample duration Merge commit 'f54da15b7c3fa55268451c485544e831832fdf15' * commit 'f54da15b7c3fa55268451c485544e831832fdf15': Change the default time scale for audio/video track during recording
| * Change the default time scale for audio/video track during recordingJames Dong2010-08-161-6/+12
| | | | | | | | | | | | | | | | | | | | | | and reduce rounding errors in calculating the sample duration - Default time scale for tracks other than audio is set to 90000. - Audio track by default uses the audio sampling rate as the time scale. - Default movie time scale remains to be 1000. - The default time scale values will be overwritten by a user-supplied value if exits. Change-Id: I81b40ed0626ea45e9fd24a89e21a2c5a4a2c3415
* | am 0386d04b: am 581581fe: Merge "Fix all fd leaks in authoring engine" into ↵James Dong2010-08-121-5/+5
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit '0386d04b19619b03b6bce830010e11d31d3f8a5c' * commit '0386d04b19619b03b6bce830010e11d31d3f8a5c': Fix all fd leaks in authoring engine
| * Fix all fd leaks in authoring engineJames Dong2010-08-111-5/+5
| | | | | | | | Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
* | When using still camera for time lapse capture, don't set preview.Nipun Kwatra2010-08-051-6/+7
| | | | | | | | | | | | | | | | Since HD resolution may not be supported by the video camera, don't set preivew using the HD size. The app should have set the preview already, just use that. Change-Id: I2f8e89bf2c7440f7bc8db7e4a228f4c8250d92b4
* | am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 ↵Andreas Huber2010-08-053-5/+54
|\ \ | |/ | | | | | | | | | | | | | | assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread Merge commit '1f513d8821670a33d6361ea521b6756163a3f9bf' * commit '1f513d8821670a33d6361ea521b6756163a3f9bf': Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
| * Support for Gtalk video, includes AMR/H.263 assembler and packetization ↵Andreas Huber2010-08-043-5/+54
| | | | | | | | | | | | support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation. Change-Id: I95b8dd487061add9bade15749e563b01cd99d9a6
* | am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value ↵James Dong2010-08-041-1/+7
|\ \ | |/ | | | | | | | | | | | | | | when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread Merge commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb' * commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb': Replace CHECK with a failure return value when mCamera->setParameters() fails
| * Replace CHECK with a failure return value when mCamera->setParameters() failsJames Dong2010-08-031-1/+7
| | | | | | | | | | | | | | | | if the camera is locked by someone else. bug - 2827892 Change-Id: I217d4a00f04ebd57b557d3faef28787c14f23ea0
* | Allowing useStillCameraForTimeLapse to be set through MediaRecorder.javaNipun Kwatra2010-08-022-1/+22
| | | | | | | | | | | | | | | | | | | | This will allow apps to make the decision of whether to use still image mode or video mode for time lapse capture. - setTimeLapseParameters now takes in a useStillCameraForTimeLapse parameter. - Added support in StagefrightRecorder for passing through this parameter. Change-Id: Iafbcb76f9a7903118ea5eb822c81008619630f03
* | am e915b0ef: am d973a533: Merge "Lower the lower bound for max file duration ↵James Dong2010-07-301-1/+1
|\ \ | |/ | | | | | | | | | | | | | | check" into gingerbread Merge commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c' * commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c': Lower the lower bound for max file duration check
| * Merge "Lower the lower bound for max file duration check" into gingerbreadJames Dong2010-07-301-1/+1
| |\
| | * Lower the lower bound for max file duration checkJames Dong2010-07-301-1/+1
| | | | | | | | | | | | | | | | | | - This fixed a CTS test where 200 ms is being used Change-Id: Ib598b7b94be54e98a96703c58c5f244bc379cf7d
| * | resolved conflicts for merge of 27eecb70 to gingerbreadJean-Baptiste Queru2010-07-302-2/+2
| |\ \ | | |/ | |/| | | | Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
| | * fix inaccurate copyrightsJean-Baptiste Queru2010-07-292-2/+2
| | | | | | | | | | | | Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
* | | am 0c51c98f: am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-292-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf' * commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf': fix inaccurate copyrights
| * \ \ am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-292-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp * commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625': fix inaccurate copyrights
| | * | fix inaccurate copyrightsJean-Baptiste Queru2010-07-292-2/+2
| | | | | | | | | | | | | | | | Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
* | | | am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default - ↵James Dong2010-07-281-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | default interleave duration is set to 1 second" into gingerbread Merge commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b' * commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b': Interleave the audio and video by default
| * | | Interleave the audio and video by defaultJames Dong2010-07-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - default interleave duration is set to 1 second This can dramatically reduce the memory usage by the MP4 file writer. Change-Id: Ia3ff202cabfcd2d3f183065d31e4596617c2dded
generated by cgit v1.1 at 2024-09-09 07:46:17 +0000