summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
...
* | Update commentsGlenn Kasten2012-02-141-1/+1
| | | | | | | | | | | | We no longer put the filename at start of file. Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
* | Follow raw pointer and sp<> conventionsGlenn Kasten2012-02-102-4/+5
| | | | | | | | | | | | | | | | Unconditional delete for raw pointers. Use "if (sp != 0)" not "if (sp.get() != 0)" or "if (sp != NULL)". Use "if (raw != NULL)" not "if (raw)". Change-Id: I531a8da7c37149261ed2f34b862ec4896a4b785b
* | move away from MediaDebug and use ADebug instead for video editor engineJames Dong2012-02-091-0/+1
| | | | | | | | Change-Id: I2c0ad6c64f1bd03bd3dfe2c87792f8089dcbc101
* | The software AMR NB encoder is now an OMX component.Andreas Huber2012-02-011-1/+5
| | | | | | | | Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
* | Don't need to link to libsqlite from media JNI library.Jeff Brown2012-01-191-1/+0
| | | | | | | | | | | | Media JNI library doesn't actually use libsqlite. Change-Id: If8017444d259779d459ef2da83119814e31454c2
* | Use audio_stream_type_t consistentlyGlenn Kasten2012-01-134-7/+7
| | | | | | | | | | | | | | | | | | At native level it was a mixture of audio_stream_type_t, int, uint32_t, and uint8_t. Java is still int. Also fixed a couple of hard-coded -1 instead of AUDIO_STREAM_DEFAULT, and in startToneCommand a hard-coded 0 instead of AUDIO_STREAM_VOICE_CALL. Change-Id: Ia33bfd70edca8c2daec9052984b369cd8eee2a83
* | Merge "Use audio_format_t consistently"Glenn Kasten2012-01-122-4/+4
|\ \
| * | Use audio_format_t consistentlyGlenn Kasten2012-01-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Was int, uint32_t, uint16_t, and uint8_t with 2-bit bitfield. Also replace 0 by AUDIO_FORMAT_DEFAULT and replace 1 by AUDIO_FORMAT_PCM_16_BIT. Change-Id: Ia8804f53f1725669e368857d5bb2044917e17975
* | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0813-174/+174
| | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-065-10/+10
| | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
* | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-042-2/+2
|/ / | | | | | | | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-031-3/+3
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* | Extract out audio DSP code to utility libraryGlenn Kasten2011-12-161-0/+1
| | | | | | | | Change-Id: Ib8ce72028a7ea30e82baa518e381370e820ebbd0
* | am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while ↵Hong Teng2011-12-021-2/+2
|\ \ | |/ | | | | | | | | | | exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, * commit '5126f1d413b4fcb0aff5b364e1e5a41c89ca665c': Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
| * Fixd for 5490443 Native crash while exporting a videoHong Teng2011-12-011-2/+2
| | | | | | | | | | | | | | | | | | | | - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly. Change-Id: I15610b8907fcf8bd35a3c69ad7c07b5175a6e309
* | am f51f1bd9: Verify we actually have valid utf8 metadataMarco Nelissen2011-11-031-1/+63
|\ \ | |/ | | | | | | * commit 'f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca': Verify we actually have valid utf8 metadata
| * Verify we actually have valid utf8 metadataMarco Nelissen2011-11-031-1/+63
| | | | | | | | | | | | | | | | Before calling NewStringUTF, check that the metadata value is actually valid utf-8, and replace the offending characters with "?" if it is not. b/5534491 Change-Id: I43de4307e739ae0b7d4177937ed33aa1dfb90d98
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-2611-232/+232
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* MediaPlayer: properly handle released surfacesJamie Gennis2011-10-141-2/+8
| | | | | Bug: 5396571 Change-Id: I6af87cb04f09f9ae6ea77cd7ba31108a3e93d24a
* Log a warning when a MediaPlayer is finalized without having being released.Marco Nelissen2011-09-281-0/+4
| | | | | | b/5382634 Change-Id: I756d09d16a92ab8ce736c16a24e319a87be6c8de
* 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"