summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* Add QVGA resolution to CamcorderProfileJames Dong2011-09-191-6/+10
| | | | | Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b related-to-bug: 5145483
* If media player has died already, do not dec the old surface texture reference.Gloria Wang2011-09-151-0/+5
| | | | | | | | Otherwise segfault will occur. For bug 5327664. Do not merge. Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
* Cherry-pick from master. Do not merge.Gloria Wang2011-09-151-5/+13
| | | | | | | Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296. Change-Id: Ieab063cee70e072fcc4d861abe0f7979a7bab1ec
* Fix 5278371: OOM in MediaItemThumbnailTestChih-Chung Chang2011-09-091-1/+5
| | | | | | | | | Because we request 400x240 thumbnails. 100 thumbnails needs 38M, which is too much. Change it to 70 now. Also handle the case if the thumbnail callback throws exception. Change-Id: Iac4ee72f308b7c7a6ae860983197601cf89bee8f
* Fix 5156702: rotate thumbnailsChih-Chung Chang2011-09-071-3/+1
| | | | Change-Id: I97b51dadf129172d5b154e9dfd66da254e4559d7
* Require INTERNET permission for network-based content.Dave Burke2011-09-021-0/+2
| | | | | | Bug #1870981 Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
* Fix for 5156702 Rotate video output for thumbnails and exportRajneesh Chowdury2011-08-305-8/+39
| | | | | | | This is part of a multi project submit. This is the Java and Jni changes. Change-Id: I8851f5d865e657b7846bcded38e752f388f95895
* Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)Rajneesh Chowdury2011-08-195-114/+274
| | | | | | Also fixes 5118207 add other video codec support for video editor export. Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
* Merge "Fix 5144356: Native crash while importing music"Chih-Chung Chang2011-08-181-18/+19
|\
| * Fix 5144356: Native crash while importing musicChih-Chung Chang2011-08-181-18/+19
| | | | | | | | | | | | | | 1. Use the correct Get*Field functions according to the field type. 2. When we have exceptions, return. Change-Id: I1878d806e26798a0977ff71a781551088e45f6fb
* | Merge "Fix for 5155561 During export, progress bar jumps from 0 to 50%"Rajneesh Chowdury2011-08-181-25/+49
|\ \ | |/ |/|
| * Fix for 5155561 During export, progress bar jumps from 0 to 50%Rajneesh Chowdury2011-08-171-25/+49
| | | | | | | | Change-Id: I5f5814a1212cd242535ae7cadec8a76f099e78ce
* | Display thumbnails one by one and cache them.Chih-Chung Chang2011-08-163-61/+47
|/ | | | Change-Id: I10808f5bca475aea924817bf532dc5916438563a
* Speed up thumbnail generation.Chih-Chung Chang2011-08-155-53/+28
| | | | | | | | We don't need to have precise position for thumbnails, so we add a tolerance parameter to the decoder. The decoder can return an earlier frame within the tolerance time given. Change-Id: I0a49ed6b03f8c3264606e4143dd5ecf48e9d0f62
* Merge "If release has been called before finalize, do not expect MediaPlayer ↵James Dong2011-08-121-5/+13
|\ | | | | | | still exists"
| * If release has been called before finalize, do not expect MediaPlayer still ↵James Dong2011-08-121-5/+13
| | | | | | | | | | | | | | | | | | | | exists o also, we should releae the surface object when release is called, not wait until finalize is called. related-to-bug: 5157956 Change-Id: I0233ad61d8349c3e3800de68b752b9548ece1742
* | Merge "Fix issue 5144429: CTS test fails for AudioEffects"Eric Laurent2011-08-121-0/+2
|\ \ | |/ |/|
| * Fix issue 5144429: CTS test fails for AudioEffectsEric Laurent2011-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | android_media_AudioEffect_native_setup() was not initializing properly the effect descriptor for audio pre processings. AudioEffect tests should create per processing effects on a valid AudioRecord session. Change-Id: Ia1862ca91c98e272f9374b9225a7d4ce7ef132fc
* | Remove ParcelSurfaceTexture and update MediaPlayerTed Bonkenburg2011-08-111-56/+41
|/ | | | | | | | | This removes the ParcelSurfaceTexture class since that functionality has been folded into Surface.java. The change also updates the MediaPlayer to get rid of setParcelSurfaceTexture() and modifies setTexture() to use the new Surface functionality in order to simplify the code. Change-Id: Iafa75ea3188263928128325d8a726786971b4de4
* To support for switching from a non-null surface/ surface texture toGloria Wang2011-08-091-3/+4
| | | | | | | a null one, and vice versa. Fix for bug 5137445. Change-Id: Ifca2997f8ad27a843abbdaa7e89a56329bc40fde
* Add dependencies for the YV12 color converter change.Chih-Chung Chang2011-07-271-0/+2
| | | | | Bug: 5061733 Change-Id: Id8227a4f634285323c37498604fe080d986bfb09
* Merge "Fixing up Mediarecorder for MFF"Pannag Sanketi2011-07-261-1/+1
|\
| * Fixing up Mediarecorder for MFFPannag Sanketi2011-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | For using the MediaRecorder in MFF (Mobile Filter Framework), getMediaRecorder method in mediarecorder jni was earlier changed to a non static method. Changed it back to a static method. Also, added a new source type to MediaRecorder.VideoSource for recording GRalloc buffers. Change-Id: I031fad45c12b0ac9602d9e451d4767e95a86234d
* | Merge "Add filename and line number in the debug messages."Chih-Chung Chang2011-07-252-15/+47
|\ \ | |/ |/|
| * Add filename and line number in the debug messages.Chih-Chung Chang2011-07-222-15/+47
| | | | | | | | Change-Id: I0e19215cd6f26ccd97bcbff765194adda5faf940
* | Added APIs for audio preprocessingEric Laurent2011-07-251-6/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added APIs to control pre processes applied on captured audio. Those APIs are still hidden until reviewed by API council. Three types of standard pre processes are supported: - Automatic Gain Control (AGC) by AutomaticGainControl class - Acoustic Echo Cancellation (AEC) by AcousticEchoCanceler class - Noise Suppression (NS) by NoiseSuppressor class A method is added to AudioEffect class to query audio pre processings applied by default by the platform on a given AudioRecord session ID. Change-Id: I0b9fceeb8c704dd06319c3b52b85c96fe871d51d
* | Merge "Deprecate two methods in MediaRecorder.java class"James Dong2011-07-221-15/+0
|\ \
| * | Deprecate two methods in MediaRecorder.java classJames Dong2011-07-221-15/+0
| | | | | | | | | | | | Change-Id: I98fbe628fe77867b97c04f44458948ede2f49d22
* | | Connect MediaRecorder Native to SurfaceMediaSourcePannag Sanketi2011-07-221-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Making a connection from MediaRecorder Native layer to the SurfaceMediaSource for the purpose of encoding GL Frames. This will be called from the java side inside the Mobile Filter Framework. The mediarecorder native layer (client), when set the videosource to option VIDEO_SOURCE_FRAMES, asks the StageFrightRecorder on the mediaserver side to create a SurfaceMediaSource object and pass it back as a sp<ISurfaceTexture> object. Using that, the client side will dequeue and queue buffers. Connecting the GL Frames to the obtained sp<ISurfaceTexture> is not part of this CL. Related to bug id: 4529323 Change-Id: I651bec718dd5b935779e7d7a050b841c2d0b0fcd
* | Merge "fix for issue 4142219 Don't hard code platform-specific ↵Hong Teng2011-07-213-16/+55
|\ \ | |/ |/| | | limitations-jni/java part"
| * fix for issue 4142219Hong Teng2011-07-203-16/+55
| | | | | | | | | | | | Don't hard code platform-specific limitations-jni/java part Change-Id: Icde261b1caf29a8cf552884c97f3c9d0b41741a3
* | Untangle MediaScanner error handling.Jeff Brown2011-07-201-24/+33
|/ | | | | | Bug: 5056917 Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
* Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator buildMike Lockwood2011-07-132-55/+1
| | | | | Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Clean up MtpServer initialization and threading:Mike Lockwood2011-07-131-161/+65
| | | | | | | Move thread from native to Java code Remove the stop() method (the thread will exit on its own) Change-Id: Ib897c3630162f82669a4ee8c187e8172da50b29d
* Merge "Remove unnecessary locking from MediaScanner JNI code"Mike Lockwood2011-07-111-7/+0
|\
| * Remove unnecessary locking from MediaScanner JNI codeMike Lockwood2011-07-111-7/+0
| | | | | | | | | | | | | | | | | | | | | | There is nothing in this file that requires a global lock. Furthermore, the lock can cause timeouts in native_finalize if one instance is being garbage collected while another is busy in processDirectory Bug: 5002520 Change-Id: I8717f8edeb932200d9f76b3d98915cfbe18b6ec6 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file systemMike Lockwood2011-07-111-1/+9
|/ | | | | | | Bug: 4561836 Change-Id: I2bffb93b032038f6c220c24c752ccd7ca66c23a0 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Moved and renamed effect API header filesEric Laurent2011-07-071-0/+3
| | | | | | | | Moved specific effect header files to system/media/audio_effects/include/audio_effects and renamed to lower case (effect_xxx.h). Change-Id: Icfc2264bfd013cab0395d7e310ada636b9fe3621
* Remove curtain effect (it's unused).Chih-Chung Chang2011-06-302-3/+0
| | | | Change-Id: I2addf390aaa5aa514238b1f98eea67f27745cbf1
* Add framework support for camcorder zoom.Wu-cheng Li2011-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of ICameraRecordingProxy and ICameraRecordingProxyListener is to allow applications using the camera during recording. Camera service allows only one client at a time. Since camcorder application needs to own the camera to do things like zoom, the media recorder cannot access the camera directly during recording. So ICameraRecordingProxy is a proxy of ICamera, which allows the media recorder to start/stop the recording and release recording frames. ICameraRecordingProxyListener is an interface that allows the recorder to receive video frames during recording. ICameraRecordingProxy startRecording() stopRecording() releaseRecordingFrame() ICameraRecordingProxyListener dataCallbackTimestamp() The camcorder app opens the camera and starts the preview. The app passes ICamera and ICameraRecordingProxy to the media recorder by MediaRecorder::setCamera(). The recorder uses ICamera to setup the camera in MediaRecorder::start(). After setup, the recorder disconnects from camera service. The recorder calls ICameraRecordingProxy::startRecording() and passes a ICameraRecordingProxyListener to the app. The app connects back to camera service and starts the recording. The app owns the camera and can do things like zoom. The media recorder receives the video frames from the listener and releases them by ICameraRecordingProxy::releaseRecordingFrame. The recorder calls ICameraRecordingProxy::stopRecording() to stop the recording. The call sequences are as follows: 1. The app: Camera.unlock(). 2. The app: MediaRecorder.setCamera(). 3. Start recording (1) The app: MediaRecorder.start(). (2) The recorder: ICamera.unlock() and ICamera.disconnect(). (3) The recorder: ICameraRecordingProxy.startRecording(). (4) The app: ICamera.reconnect(). (5) The app: ICamera.startRecording(). 4. During recording (1) The recorder: receive frames from ICameraRecordingProxyListener.dataCallbackTimestamp() (2) The recorder: release frames by ICameraRecordingProxy.releaseRecordingFrame(). 5. Stop recording (1) The app: MediaRecorder.stop() (2) The recorder: ICameraRecordingProxy.stopRecording(). (3) The app: ICamera.stopRecording(). bug:2644213 Change-Id: I15269397defc25cbbcae16abc071c8349c123122
* Fix for kenBurn Effect for PNG image is crashing (4861071 )Shailendra2011-06-221-2/+3
| | | | Change-Id: I4b9905ca862a1f0eac0bed4c7f021e93f79ea592
* MTP: Add support for PTP variant of GetDeviceInfo result.Mike Lockwood2011-06-211-5/+7
| | | | | Change-Id: I09f86fda768b7697665e401adb9516588859bf59 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Remove unneeded #include <sys/resource.h>Glenn Kasten2011-06-151-1/+0
| | | | | | Suggested in code review for previous change. Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
* Support for setting a ParcelSurfaceTexture as the MediaPlayer sink.tedbo2011-06-131-31/+10
| | | | | | | | | This adds support for setting a SurfaceTexture as the MediaPlayer video sink by using a ParcelSurfaceTexture object. The goal is to enable a SurfaceTexture to pass through Binder (via ParcelSurfaceTexture) and then be set on the MediaPlayer. Change-Id: Ife5689ce673eb4bee1c377019db761685217b71d
* MTP: Remove obsolete setPtpMode supportMike Lockwood2011-06-081-22/+0
| | | | | | | PTP mode will be implemented as a separate USB function instead. Change-Id: I9304c1936c70604ab2ed9704c6b95e11b61f5ba2 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Revert "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-012-4/+4
| | | This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
* Use AudioTrack::event_type not int in callbackGlenn Kasten2011-06-012-4/+4
| | | | Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
* resolved conflicts for merge of b107f4de to masterMike Lockwood2011-05-161-2/+9
|\ | | | | | | Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e
| * MTP: Have GetStorageInfo command return correct storage type for removable ↵Mike Lockwood2011-05-161-2/+10
| | | | | | | | | | | | | | storage Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-032-1/+66
| | | | | | | | | | | | | | | | | | This allows the PC to access thumbnails in JPEG files over MTP/PTP Bug: 3219495 Change-Id: Id61f353ba70e896fae9a47338bf7871c0f185d3e Signed-off-by: Mike Lockwood <lockwood@android.com>
generated by cgit v1.1 at 2025-02-13 17:48:26 +0000