Merge commit 'f54da15b7c3fa55268451c485544e831832fdf15'
* commit 'f54da15b7c3fa55268451c485544e831832fdf15':
Change the default time scale for audio/video track during recording
Merge commit '4fc2c9280c5262c835a4eb78961241de105313c1'
* commit '4fc2c9280c5262c835a4eb78961241de105313c1':
Use audio clock as the reference media clock
Merge commit 'eff30e3d1b005fd0696390d1dd47ec4ff0c52784' into gingerbread-plus-aosp
* commit 'eff30e3d1b005fd0696390d1dd47ec4ff0c52784':
Change the default time scale for audio/video track during recording
and reduce rounding errors in calculating the sample duration
- Default time scale for tracks other than audio is set to 90000.
- Audio track by default uses the audio sampling rate as the time scale.
- Default movie time scale remains to be 1000.
- The default time scale values will be overwritten by a user-supplied value if exits.
Change-Id: I81b40ed0626ea45e9fd24a89e21a2c5a4a2c3415
Merge commit 'b72081966da3842e27f88045cfa5a67cef3d4220' into gingerbread-plus-aosp
* commit 'b72081966da3842e27f88045cfa5a67cef3d4220':
Use audio clock as the reference media clock
o Only do this for realtime applications
o Adjust other track clock based on audio clock
o Assume other track uses wall clock as the media clock
o Use some heuristics to reduce the size of stts box by 2/3.
- also
o Remove one unused key from MetaData.h
Change-Id: Ib9432842627b61795b533508158c25258a527332
Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp
* commit 'e95d192fae5a80ed821c53bfea214a85ea395e90':
Mainly fix two mistakes that I made:
Merge commit '2f02044944d5c526020d4e8cceaae7e77382d56d'
* commit '2f02044944d5c526020d4e8cceaae7e77382d56d':
Support getting codec, width, and height in URL for gtalk playback.
Merge commit '5f96138ba65cecf38d0c752d87ad47d931db8775' into gingerbread-plus-aosp
* commit '5f96138ba65cecf38d0c752d87ad47d931db8775':
Support getting codec, width, and height in URL for gtalk playback.
1. When the ERROR_END_OF_STREAM is returned from read, the input buffer is not initialized
release it would lead to crash
2. The mPrevTimestampUs is not initialized and thus fail in the CHECK(mPrevTimestampUs, timeUs)
Change-Id: Id1e51575fb8b3ca48e80547efd3a3a82dfac773b
Merge commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf'
* commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf':
Add lost preview surface detection in the JNI layer
Merge commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203'
* commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203':
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
Merge commit '8473db025423632d1145d895fe74af0e976efac4'
* commit '8473db025423632d1145d895fe74af0e976efac4':
Don't send late frames to software encoders for encoding
Merge commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9' into gingerbread-plus-aosp
* commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9':
Add lost preview surface detection in the JNI layer
Merge commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4' into gingerbread-plus-aosp
* commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4':
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
Merge commit '66aa0f3d950f7f842327b47592baa920e855925c' into gingerbread-plus-aosp
* commit '66aa0f3d950f7f842327b47592baa920e855925c':
APacketSource is too verbose.
Merge commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad' into gingerbread-plus-aosp
* commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad':
Don't send late frames to software encoders for encoding
Merge commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04'
* commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04':
Fix a crash due to unnecessary check on the codec config data for H263 video track
Merge commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261' into gingerbread-plus-aosp
* commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261':
Handle large audio lost
Merge commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0' into gingerbread-plus-aosp
* commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0':
Fix a crash due to unnecessary check on the codec config data for H263 video track
Merge commit '581581fe1addfac8913c8d4d6c88eed6ded90de4' into gingerbread-plus-aosp
* commit '581581fe1addfac8913c8d4d6c88eed6ded90de4':
Fix all fd leaks in authoring engine
Merge commit '136d8336b6cb18067cd783185dacef34ae785519'
* commit '136d8336b6cb18067cd783185dacef34ae785519':
This code in CameraSource really should hold the lock.
Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp
* commit '90d1d104272954042d5440f248980e4348e97686':
This code in CameraSource really should hold the lock.
Merge commit '1ded9f95636a83298658bfcd840ae8e51127c714'
* commit '1ded9f95636a83298658bfcd840ae8e51127c714':
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Merge commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54' into gingerbread-plus-aosp
* commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54':
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
