summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-28Merge "Set u.ext_data to null after it has been freed"HEADmasterAndreas Huber
2013-06-28Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'."Glenn Kasten
2013-06-28Set u.ext_data to null after it has been freedChrister Fletcher
SEGV_MAPPER crash could happen in MetaData::typed_data::freeStorage. The faulty address could be both random pointers and deadbaad. It seems like free could be called more than once on u.ext_data. Set u.ext_data to null after it has been freed as there already is a null check before trying to free it. Change-Id: I710c49f9c231bd8852159914c0b2add58a685f0e
2013-06-27Fix compilation warning: incorrect format specifier for type 'ssize_t'.Scott Fan
warning: format '%ld' expects argument of type 'long int', but argument 7 has type 'ssize_t {aka int}' [-Wformat] Change-Id: I823835a26320a3abb82f8dff9fbe82e5132e7556 Signed-off-by: Scott Fan <fancp2007@gmail.com>
2013-06-25Merge "libstagefright: fix the duration "00:00" for some httplive link"Jean-Baptiste Queru
2013-06-20Merge "Prevent AudioCommands being freed before read"Glenn Kasten
2013-06-20Prevent AudioCommands being freed before readChrister Fletcher
When AudioCommandThread::threadLoop process AudioCommands it was possible for it to delete a command where the posting thread still hadn't read that status from it. If a second command signaled the thread loop to continue after it had inserted a new command while the thread loop was actually waiting for the first command to report that it had read the status the thread loop would continue and delete the first command. Changed the wait condition when waiting for the calling thread to read status to use command->mCond instead of mWaitWorkCV. This way it's guaranteed that the signal to continue comes from the correct thread. Change-Id: Ia69b48cb4fdfaf8b4c83b56a197fb9f2058a92d1
2013-06-14Merge "Fix typo."Glenn Kasten
2013-06-07Merge "Noise will be heard if audio sample rate not matched with audio track"Glenn Kasten
2013-06-07Noise will be heard if audio sample rate not matched with audio trackMing Zhou
When audio sample rate which set to audio track is not the same with the actual pcm data, noise will be heard. Fix the bug when write 8 bit pcm samples. Change-Id: Idcb0d7b0e9aaa250dd22b758c8337e23d1706049 Signed-off-by: Ming Zhou <b42586@freescale.com> Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
2013-06-06Fix typo.Masaki Muranaka
Change-Id: Ia72ed2bef54751dc2d6c3379a58de95a0e9ebfdd
2013-05-14Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"Elliott Hughes
2013-05-14Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONICGlenn Kasten
(cherry-pick of da1a325bc0a1421f4233e62704da4fab8b0acf7b.) Bug: 8895727 Change-Id: I29d5dcf8519600fdd2910345449c66a5c1284646
2013-04-24Merge "Fix overflow of rand in ARTPConnection"tools_r22Andreas Huber
2013-04-24Merge "fix a race condition of MediaPlayerServce::Client::mClient"Andreas Huber
2013-04-24Fix overflow of rand in ARTPConnectionYajun Zeng
without this fix, (rand()*1000)/RAND_MAX is mainly 0. Change-Id: I48ae940a7b6974b197d81732774c9dcea107bcf1 Signed-off-by: Yajun Zeng <beanz@marvell.com>
2013-04-22Merge "Fixed the wrong timestamps issue about camera recording"Marco Nelissen
2013-04-22Fixed the wrong timestamps issue about camera recordingJun Tian
On emulator, the camera video recording crashes randomly. It's caused by wrong timestamp when encoding the video frame. The element of the vector is erased before accessing it. Therefore, when reading the timestamp from the element, the memory of the element has been changed. Change-Id: I9750417fbb9dc4697ccae1e78e286b23925d3764 Signed-off-by: Panfeng Chang <panfengx.chang@intel.com> Signed-off-by: Jun Tian <jun.j.tian@intel.com>
2013-03-15Merge "Fix for crash if no content in DESCRIBE response"Andreas Huber
2013-03-15Merge "Prevent invalid frame durations"Glenn Kasten
2013-03-12Prevent invalid frame durationsOla Andersson
Prevent frame duration from being negative when exporting movie studio project Change-Id: I459fb243650c777c2b59d1094acc88c3a944bd81
2013-03-12Fix for crash if no content in DESCRIBE responseXuefei Chen
If DESCRIBE response is received with status 200 but no content, MyHandler will still set content data for session description parsing. This will cause NULL Pointer crash. This fix checks whether DESCRIBE response has content before parsing session description. Change-Id: I114ae6fd54ce804e61718f62618ca9008425a433
2013-03-01Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen
2013-02-28Avoid invalid memory access when using extractMetadata()Sangkyu Lee
BpMediaMetadataRetriever::extractMetadata() returns a string which is returned by readCString() function of the reply parcel object. However, the parcel object is destroyed at the end of the extractMetadata() function, and so the returned pointer is invalid. This patch fixes this problem by storing the metadata string value. Change-Id: I2a2ccba78246175b2845a237679d6cebe881e83b Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
2013-02-27Merge "SoftAMR: Signal the right frame format"Andreas Huber
2013-02-27Merge "SoftVorbis: Set the right encoding in the port definition"Andreas Huber
2013-02-27Merge "MPEG4Writer: Write a zero-length compressor string"Andreas Huber
2013-02-17SoftAMR: Signal the right frame formatMartin Storsjo
The correct enum for the format used is OMX_AUDIO_AMRFrameFormatFSF, which is the same as is used in amrnb/enc/SoftAMRNBEncoder.cpp, amrwbenc/SoftAMRWBEncoder.cpp and in OMXCodec and ACodec. The OMX_AUDIO_AMRFrameFormatConformance enum refers to an odd file format only used for conformance tests, not used in the wild. Change-Id: Idc395fc1d4969e33453522d6ec6526876438c526
2013-01-31SoftVorbis: Set the right encoding in the port definitionMartin Storsjo
Previously, it set the encoding type to AAC, which is just a typo. Change-Id: I2dcae1f579e9feb0b35b6f5d334028c534275042
2013-01-31MPEG4Writer: Write a zero-length compressor stringMartin Storsjo
The first byte is the number of bytes in the string to display, the rest is the actual string (see ISO/IEC 14496-12:2008 page 29, compressorname in VisualSampleEntry) to display. Currently, all 31 space characters are displayed in certain players (such as Apple QuickTime Player) instead of the plain codec name (e.g. "H.264"). By writing the string length properly, the actual content of the remaining 31 bytes is ignored instead of displayed. Change-Id: I7f93a8966d74a4e86abc46c3dcb70f71780d9cd6
2013-01-30am 9b7e8fc7: Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT ↵Eino-Ville Talvala
MERGE # Via Igor Murashkin * commit '9b7e8fc7c564b24a1c099dddae4e9c1126bd7c4e': Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE
2013-01-30am abeee0ec: Camera2: fix metadata symbols: DO NOT MERGEIgor Murashkin
# Via Igor Murashkin * commit 'abeee0ec92b5c77147036bf346de9309092a5ca1': Camera2: fix metadata symbols: DO NOT MERGE
2013-01-30Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGEEino-Ville Talvala
- JPEG quality tag is now a uint8_t, not an int. Update parameter code accordingly. - Fix new warnings about narrowing conversions. Bug: 7944244 Change-Id: Ie081c57c9e9323148614b170b132ffb98c0a0b9f
2013-01-30Camera2: fix metadata symbols: DO NOT MERGEIgor Murashkin
Change-Id: I59e457824782de26b7b489cd92eb33d48e6ee2d9
2012-12-21am 12834fe2: Merge "libvideoeditor: fix code bugs when enabling all-level ↵James Dong
debugging macros" * commit '12834fe289e8173e94f31603fa6d313abe56ad70': libvideoeditor: fix code bugs when enabling all-level debugging macros
2012-12-21Merge "libvideoeditor: fix code bugs when enabling all-level debugging macros"jb-mr1-dev-plus-aospJames Dong
2012-12-21am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."James Dong
* commit 'b54cedabdf0261211241e2f3af09c75cffd911ed': Use default values when MPEG4 audio config parsing fails.
2012-12-20Merge "Use default values when MPEG4 audio config parsing fails."James Dong
2012-12-20am 2a55b596: Merge "libvideoeditor: fix cannot show some thumbnails in ↵James Dong
storyboard or no frame display in PreviewRenderer surface after importing video" * commit '2a55b5964c6ae167cc1bc57eca5ca7a1c4aa452c': libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video
2012-12-20Merge "libvideoeditor: fix cannot show some thumbnails in storyboard or no ↵James Dong
frame display in PreviewRenderer surface after importing video"
2012-12-20am df9cce64: Merge "Allow multichannel FLAC files"Glenn Kasten
* commit 'df9cce649d9ac1f4446f613c54191e7c4d646f07': Allow multichannel FLAC files
2012-12-20Merge "Allow multichannel FLAC files"Glenn Kasten
2012-12-17am f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sample wav"Glenn Kasten
* commit 'f38259cfe5566914a49f5b0f8b11aa6a951d667a': Fix bug in WAVExtractor for 24-bit per sample wav
2012-12-17Merge "Fix bug in WAVExtractor for 24-bit per sample wav"Glenn Kasten
2012-12-14am 0cd75629: Merge "Match new paths and organization in external/libvpx"Jean-Baptiste Queru
* commit '0cd75629a8f7a6bd47b2abc6dd8d9f66e70d76a4': Match new paths and organization in external/libvpx
2012-12-14am 409542cd: Merge "FileSource: FILE is not closed"Marco Nelissen
* commit '409542cdaf72d8983043f2746d9d916ee1566a80': FileSource: FILE is not closed
2012-12-14Merge "Match new paths and organization in external/libvpx"Jean-Baptiste Queru
2012-12-14Merge "FileSource: FILE is not closed"Marco Nelissen
2012-12-14FileSource: FILE is not closedYou Kim
Add destructor to call fclose. Change-Id: I765c56236f8df58af998439492b0b955ab57606f
2012-12-12Match new paths and organization in external/libvpxJohann
See I2c0a87b0fc049e855e21f455b806287b578091de Change-Id: Iec8566bce0a4763a9a17b4a46f15aa39b5bcd141