merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:00 +0000 (01:17 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:00 +0000 (01:17 +0900)
commita1e3577f73ef4561effe4b163882d5418d5790d2
treeb21a8c1efe8e61a2cb6a68677395f6ffe4588f2b
parenta58fd639b49a989fdb60e570a6a2346c19096a47
merge with master
119 files changed:
CMakeLists.txt
inc/FMedia.h [changed mode: 0644->0755]
inc/FMediaAudioEqualizer.h
inc/FMediaAudioFrame.h [new file with mode: 0755]
inc/FMediaAudioIn.h
inc/FMediaAudioManagerTypes.h
inc/FMediaAudioOut.h
inc/FMediaAudioRecorder.h
inc/FMediaAudioRecorderTypes.h
inc/FMediaAudioRouteInfo.h
inc/FMediaAudioRouteManager.h
inc/FMediaAudioSessionManager.h [deleted file]
inc/FMediaAudioTypes.h
inc/FMediaCamera.h
inc/FMediaCameraTypes.h
inc/FMediaCapabilityTypes.h
inc/FMediaIAudioInEventListener.h
inc/FMediaIAudioOutEventListener.h
inc/FMediaIAudioRecorderEventListener.h
inc/FMediaIAudioRouteEventListener.h
inc/FMediaIAudioSessionEventListener.h [deleted file]
inc/FMediaIAudioStreamFilter.h [new file with mode: 0755]
inc/FMediaICameraEventListener.h
inc/FMediaIPlayerEventListener.h
inc/FMediaIPlayerProgressiveDownloadListener.h
inc/FMediaIPlayerVideoEventListener.h
inc/FMediaITonePlayerEventListener.h
inc/FMediaIVideoStreamFilter.h [new file with mode: 0755]
inc/FMediaMediaStreamInfo.h
inc/FMediaOpenal.h
inc/FMediaPlayer.h [changed mode: 0644->0755]
inc/FMediaPlayerTypes.h
inc/FMediaTone.h
inc/FMediaTonePlayer.h [changed mode: 0644->0755]
inc/FMediaToneTypes.h
inc/FMediaVideoFrame.h [new file with mode: 0755]
inc/FMediaVideoFrameExtractor.h
inc/FMediaVideoRecorder.h
inc/FMediaVideoRecorderTypes.h
inc/FMediaVoipAudioSessionManager.h [deleted file]
packaging/osp-media.spec
src/FMediaAudioDecoder.cpp
src/FMediaAudioFrame.cpp [new file with mode: 0755]
src/FMediaAudioRecorder.cpp
src/FMediaAudioSessionManager.cpp [deleted file]
src/FMediaCamera.cpp
src/FMediaCapability.cpp [changed mode: 0644->0755]
src/FMediaVideoFrame.cpp [new file with mode: 0755]
src/FMediaVideoFrameExtractor.cpp
src/FMediaVideoRecorder.cpp
src/FMediaVoipAudioSessionManager.cpp [deleted file]
src/FMedia_AacDecoder.cpp
src/FMedia_AacDecoder.h
src/FMedia_AacEncoder.cpp
src/FMedia_AlawDecoder.cpp [deleted file]
src/FMedia_AmrDecoder.cpp
src/FMedia_AmrDecoder.h
src/FMedia_AudioFrameImpl.cpp [new file with mode: 0755]
src/FMedia_AudioFrameImpl.h [new file with mode: 0755]
src/FMedia_AudioInImpl.cpp
src/FMedia_AudioInImpl.h
src/FMedia_AudioManagerConvert.cpp
src/FMedia_AudioManagerConvert.h
src/FMedia_AudioOutImpl.cpp
src/FMedia_AudioRecorderImpl.cpp
src/FMedia_AudioRecorderImpl.h
src/FMedia_AudioRouteManagerImpl.cpp
src/FMedia_AudioSessionEvent.cpp [deleted file]
src/FMedia_AudioSessionEvent.h [deleted file]
src/FMedia_AudioSessionEventArg.cpp [deleted file]
src/FMedia_AudioSessionEventArg.h [deleted file]
src/FMedia_AudioSessionManagerImpl.cpp [deleted file]
src/FMedia_AudioStreamCoordinator.cpp [new file with mode: 0755]
src/FMedia_AudioStreamCoordinator.h [new file with mode: 0755]
src/FMedia_CamPtrUtil.h
src/FMedia_CameraCapability.cpp
src/FMedia_CameraCapability.h
src/FMedia_CameraImpl.cpp
src/FMedia_CameraImpl.h
src/FMedia_CameraManager.cpp
src/FMedia_CameraPreProcessUtil.cpp [deleted file]
src/FMedia_CameraTypes.h
src/FMedia_CameraUtil.cpp
src/FMedia_CameraUtil.h
src/FMedia_CapabilityImpl.cpp
src/FMedia_CapabilityTypes.h
src/FMedia_G711Decoder.cpp [new file with mode: 0755]
src/FMedia_G711Decoder.h [moved from src/FMedia_AlawDecoder.h with 81% similarity, mode: 0755]
src/FMedia_H263Decoder.cpp
src/FMedia_H263Decoder.h
src/FMedia_H263Encoder.cpp
src/FMedia_H264Decoder.cpp
src/FMedia_H264Decoder.h
src/FMedia_ISessionManagerListener.h [deleted file]
src/FMedia_Mp3Decoder.cpp
src/FMedia_Mpeg4Decoder.cpp
src/FMedia_Mpeg4Decoder.h
src/FMedia_Mpeg4Encoder.cpp
src/FMedia_PlayerImpl.cpp
src/FMedia_RecorderSession.cpp
src/FMedia_RecorderUtil.cpp
src/FMedia_RecorderUtil.h
src/FMedia_TonePlayerImpl.cpp
src/FMedia_TonePlayerImpl.h
src/FMedia_UlawDecoder.cpp [deleted file]
src/FMedia_UlawDecoder.h [deleted file]
src/FMedia_VideoFrameExtractorImpl.cpp
src/FMedia_VideoFrameExtractorImpl.h
src/FMedia_VideoFrameImpl.cpp [new file with mode: 0755]
src/FMedia_VideoFrameImpl.h [new file with mode: 0755]
src/FMedia_VideoRecorderImpl.cpp
src/FMedia_VideoRecorderImpl.h
src/FMedia_VideoStreamCoordinator.cpp [new file with mode: 0755]
src/FMedia_VideoStreamCoordinator.h [new file with mode: 0755]
src/FMedia_VoipAudioSessionManagerImpl.cpp [deleted file]
src/inc/FMedia_AudioSessionManagerImpl.h [deleted file]
src/inc/FMedia_CameraPreProcessUtil.h [deleted file]
src/inc/FMedia_PlayerImpl.h
src/inc/FMedia_VoipAudioSessionManagerImpl.h [deleted file]