summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "fix for issue 4142219 Don't hard code platform-specific limitations ↵Hong Teng2011-07-2111-268/+248
|\ \ | | | | | | | | | engine part."
| * | fix for issue 4142219Hong Teng2011-07-2011-268/+248
| |/ | | | | | | | | | | | | Don't hard code platform-specific limitations engine part. Change-Id: Ibc8a539e5bbac738f60ef935670a333b7017e20e
* | Merge "Fix for issue 4988956 No audio can be heard during preview"Rajneesh Chowdury2011-07-202-35/+72
|\ \ | |/ |/|
| * Fix for issue 4988956 No audio can be heard during previewRajneesh Chowdury2011-07-202-35/+72
| | | | | | | | Change-Id: I61fc9086f2c00259e4f54535a5938b161d95b144
* | call the new setScaling method in the appropriate placesMathias Agopian2011-07-191-16/+20
| | | | | | | | Change-Id: Iabd738b195d326b6bdf04fdfee75e1dd9d411cbd
* | Merge "Use the ANativeWindow APIs instead of the Surface APIs"Mathias Agopian2011-07-141-6/+6
|\ \
| * | Use the ANativeWindow APIs instead of the Surface APIsMathias Agopian2011-07-141-6/+6
| | | | | | | | | | | | | | | | | | | | | Surface inherits from ANativeWindow, the APIs on the later are the only public APIs. Change-Id: Ibddebfe535e026d872cc13287a102660c004385f
* | | Remove redundant include, now that NuHTTPDataSource.h is no more.Andreas Huber2011-07-131-1/+0
|/ / | | | | | | Change-Id: I7bed503ba341b5ea3b7a3cac7aa2a1f349c8ed03
* | Merge "Remove the simulator target from all makefiles. Bug: 5010576"Jeff Brown2011-07-126-24/+6
|\ \
| * | Remove the simulator target from all makefiles.Jeff Brown2011-07-116-24/+6
| | | | | | | | | | | | | | | | | | Bug: 5010576 Change-Id: Ida75833739d363061c2e688a6c7f7d7b3f3edd1e
* | | Fix 4973565: implement getFormat() like ↵Chih-Chung Chang2011-07-121-11/+14
|/ / | | | | | | | | | | Ie534e2660b0de2c3ac697b4e1f61e3aaf2c4cffe. Change-Id: I9c684fa971d5ef3f975017cbaaf06ba789a6c41f
* | Fix of issue 4973565 Cannot export movie.Rajneesh Chowdury2011-07-076-127/+472
|/ | | | | | Also fixes 4441452 Native Crash after applying transition Change-Id: Ic48c44bc2c5d07e57edb8f63393cea424d3275f4
* Merge "add private copy constructor and assignment operator to four media ↵James Dong2011-07-014-70/+53
|\ | | | | | | source classes"
| * add private copy constructor and assignment operator to four media source ↵James Dong2011-06-304-70/+53
| | | | | | | | | | | | | | | | classes o this patch addresses the encoder and decoder sources for audio and video Change-Id: I918784ca22138267c270836c91312540eedebc7f
* | Remove curtain effects (they are unused).Chih-Chung Chang2011-06-309-631/+0
| | | | | | | | Change-Id: I8e1ccad3e9ddf4c272e85e7ca04582b4863c242d
* | Make line-ending consistent (unix style).Chih-Chung Chang2011-06-3023-8603/+8603
|/ | | | Change-Id: Id837b042952ff5d97907591f337b2222cff2c8a9
* Simplified regulBitRate() method and fixed a copy and paste error in stop() ↵James Dong2011-06-281-21/+5
| | | | | | method Change-Id: I589aea9471130e690594f91598853a1f08dca081
* Merge "Fix for issue 4905998 OMXCodec::drainInputBuffer, findInt64(kKeyTime, ↵Rajneesh Chowdury2011-06-274-0/+6
|\ | | | | | | &lastBufferTimeUs) fails"
| * Fix for issue 4905998 OMXCodec::drainInputBuffer, findInt64(kKeyTime, ↵Rajneesh Chowdury2011-06-274-0/+6
| | | | | | | | | | | | &lastBufferTimeUs) fails Change-Id: I353bd9e8aa1eceb9c14040a9953777967500fb1d
* | Fix for issue 4949999 getFormat() returns NULLRajneesh Chowdury2011-06-271-10/+16
|/ | | | Change-Id: Ie534e2660b0de2c3ac697b4e1f61e3aaf2c4cffe
* Fix copy and paste errors for mime type strings in the 3GP readerJames Dong2011-06-271-5/+5
| | | | Change-Id: Ia91b06f4dba9e4265260b28aabeeffeceff6d157
* Fix for: 4676350 Do not use dual copyright declaration for video editor codeThomas Le Guevel2011-06-23177-177/+0
| | | | Change-Id: I2856be051fa3b3ddfe67e096e45fb0b34beb92be
* Revert "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-014-7/+6
| | | This reverts commit dd51bdc4cf4b7c9f09e7dc4116651c6681d5287c
* Use AudioTrack::event_type not int in callbackGlenn Kasten2011-06-014-6/+7
| | | | Change-Id: I09ff321f9457c0a9ee58e59bee38ed53799e494b
* Reconcile with honeycomb-releaseThe Android Open Source Project2011-05-200-0/+0
|\ | | | | | | Change-Id: Ibbe91b2c58ef41c449cb4b125b4b6e4034a71ed5
| * Adapt to changes in AwesomePlayer for Honeycomb branch - DO NOT MERGERajneesh Chowdury2011-03-012-41/+107
| | | | | | | | | | | | Bug - 3497783 Change-Id: I26eee1538d1f2f86476b115c9e7df85fadd796dd
| * DO NOT MERGE: Hack this copy of our internal sources to match changes to ↵Andreas Huber2011-02-281-7/+7
| | | | | | | | | | | | support A/V sync. Change-Id: Iae0c63e936b2042473def8839f663605e68b6066
* | update for new audio.h header locationDima Zavin2011-05-112-2/+2
| | | | | | | | | | Change-Id: I593b91a84a603d8c7f51a83232cced5af4980baf Signed-off-by: Dima Zavin <dima@android.com>
* | Merge "Fix for issue 4035003 Support for 64 bit datatype a. ↵Thomas Le Guevel2011-05-0617-671/+72
|\ \ | | | | | | | | | M4OSA_64BITS_SUPPORTED removed b. M4OSA_64BITS_NOT_SUPPORTED removed c. M4OSA_UInt64 removed d. M4OSA_Int64 removed e. M4OSA_INT32_FROM_INT32 removed f. M4OSA_TIME_FROM_INT32_UINT32 removed g. clean-up all macro in M4OSA_Time.h, M4OSA_Types.h and osal/inc/M4OSA_FileCommon.h"
| * | Fix for issue 4035003 Support for 64 bit datatypehongteng2011-05-0517-671/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a. M4OSA_64BITS_SUPPORTED removed b. M4OSA_64BITS_NOT_SUPPORTED removed c. M4OSA_UInt64 removed d. M4OSA_Int64 removed e. M4OSA_INT32_FROM_INT32 removed f. M4OSA_TIME_FROM_INT32_UINT32 removed g. clean-up all macro in M4OSA_Time.h, M4OSA_Types.h and osal/inc/M4OSA_FileCommon.h Change-Id: I2b1751962945dcc668e995d05a57b66cd268642f
* | | Clean up background audio processing codeJames Dong2011-05-032-169/+135
|/ / | | | | | | Change-Id: I6184e71cb0ccfdb1fc5f250bd7ecd4555efad482
* | Merge "android_native_buffer_t --> ANativeWindowBuffer"Iliyan Malchev2011-05-032-2/+2
|\ \
| * | android_native_buffer_t --> ANativeWindowBufferIliyan Malchev2011-05-032-2/+2
| | | | | | | | | | | | | | | Change-Id: Id43b27ed2d1b85488b731948d018da0c0fd0c50d Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | Clean up VideoEditorSRCJames Dong2011-05-032-52/+22
|/ / | | | | | | | | | | | | | | o removed unused member variables o removed pre-processor for FROYO, since we only made video editor available after HC. o cleaned up the header includes Change-Id: I101775cc384310d661a65485113ac1bc1f6cdf17
* | Cleaned up dummy audio and video sourcesJames Dong2011-05-033-12/+2
| | | | | | | | | | | | | | o remove unused member variables o replace a full loop with a memset Change-Id: Ib482525a321c2a17dd188fba47b642c63ab811c3
* | Fix a typo in filename "M4ChannelCoverter.c"James Dong2011-05-022-1/+1
| | | | | | | | Change-Id: If7e3afa8ac10fc34e920a199fd31526ced0a2534
* | Separate preview player from AwesomePlayer and also video editor audio ↵James Dong2011-05-019-18/+2851
| | | | | | | | | | | | player from AudioPlayer Change-Id: I436ac541df3e34ad16be95a50c96d7af67fa15e4
* | Add setParameter/getParameter to MediaPlayer APIGloria Wang2011-04-292-0/+12
| | | | | | | | | | | | for bug 1982947 Change-Id: Ic32704367bdcf2ade3f035a164927e95c69af7fa
* | libvideoeditor: convert to use new audio.hDima Zavin2011-04-272-7/+11
| | | | | | | | | | Change-Id: I39726f6f6cd5aabbd91629f329876660b3d3cec2 Signed-off-by: Dima Zavin <dima@android.com>
* | Fix for issue 3385135 "source code cleanup" engine parthongteng2011-04-2241-14008/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed below unused functions a. M4PTO3GPP_RegisterExternalVideoEncoder b. M4VSS3GPP_editRegisterExternalVideoDecoder c. M4VSS3GPP_editRegisterExternalVideoEncoder d. M4VSS3GPP_extractPictureRegisterExternalVideoDecoder e. M4VSS3GPP_editRegisterExternalCodec f. M4VSS3GPP_editSubscribeExternalCodecs g. M4VSS3GPP_intSubscribeExternalCodecs h. M4VSS3GPP_intClipRegisterExternalVideoDecoder i. M4xVSS_RegisterExternalVideoDecoder j. M4xVSS_RegisterExternalVideoEncoder k. M4MCS_registerExternalVideoDecoder l. M4MCS_registerExternalVideoEncoder m. M4MCS_registerExternalAudioDecoder n. M4MCS_registerExternalAudioEncoder o. M4DECODER_EXTERNAL_getInterface - Also remove small code associated with these functions and Remove below unsused src + header files a. M4CLOCK.h b. M4MDP_API.h c. M4VD_EXTERNAL_Internal.h d. M4VD_HW_API.h e. M4VE_API.h f. M4_Logo.h g. M4VD_EXTERNAL_Interface.c h. LV_Types.h i. M4OSA_FileAccess.h j. M4OSA_FileCache.h k. M4OSA_FileExtra.h l. M4OSA_FileReaderRam.h m. M4OSA_FileWriterRam.h n. M4OSA_String.h o. M4OSA_String_priv.h p. M4OSA_FileCache.c q. M4OSA_FileExtra.c r. M4OSA_FileReader_RAM.c s. M4OSA_FileWriter_RAM.c t. M4OSA_String.c u. M4OSA_String_priv.c Change-Id: I7271cbe92168e665a8e5b7afe7c7fe1c331eaa1e
* | Fix for issue 3385135 "source code cleanup" engine parthongteng2011-04-2227-2312/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove commented code - remove code under #if 0 - remove macro FILE_LOWER_CASE as it is not used - remove macro #if 1 - remove TIMESCALE_BUG macro, and all code under this macro as it is not used - remove following unused functions: * M4MCS_getExifInfo * M4MCS_registerAudioEncoderExtended * M4MCS_registerVideoDecoderExtended * M4MCS_registerAudioDecoderExtended * M4MCS_registerVideoEncoderExtended Change-Id: I8e2916d956af6d381ae1962fedc61a8b48f60ce2
* | Fix for issue 4133431 "Remove OSAL layer" in engine partShyam Pallapothu2011-04-2154-847/+872
| | | | | | | | Change-Id: I98f98691048a5afc6f691b0cc3cec92e458e8f44
* | Fix for issue 4133431 "Remove OSAL layer" in engine partShyam Pallapothu2011-04-2035-699/+572
| | | | | | | | Change-Id: I9e2e142bcdf3153c529b790e368caea4fdb65ac8
* | Fix for issue 4133431 "Remove OSAL layer" in engine partDheeraj Sharma2011-04-1211-1256/+116
| | | | | | | | Change-Id: I79efc956aa0d23fb333d12c8947b48455b7524d1
* | Merge "remove unused references to ISurface"Mathias Agopian2011-04-066-34/+2
|\ \
| * | remove unused references to ISurfaceMathias Agopian2011-04-056-34/+2
| | | | | | | | | | | | Change-Id: Ia11c5f46f38c0b00ca63d19d3484bf4024cdb75d
* | | Bring videoeditor copies of internal code in sync with recent changes to the ↵Andreas Huber2011-04-041-4/+18
|/ / | | | | | | | | | | | | originals Change-Id: Ie534360f9f1f7757c57cffabb0fa4b4903422ecb related-to-bug: 4193552
* | replace libsurfaceflinger_client by libguiMathias Agopian2011-03-252-2/+2
| | | | | | | | Change-Id: I50b43cd8a75b8a013ad5f778708dfbc09c1d76d6
* | am 2d449791: Fix for the issue: TestPreviewWithTransition fails (4133108)Raghavender Palla2011-03-225-7/+44
|\ \ | | | | | | | | | | | | * commit '2d44979102ca85d5c4ee68d0388ee2fe37c4ec1a': Fix for the issue: TestPreviewWithTransition fails (4133108)
| * | Fix for the issue: TestPreviewWithTransition fails (4133108)Raghavender Palla2011-03-215-7/+44
| | | | | | | | | | | | Change-Id: I53eb798f4f86e83f8a4668c7256241367c1ccbe4