Merge commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22'
* commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22':
RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
Merge commit 'e0c8545a2369881fe09582337a9de3db2db1a951'
* commit 'e0c8545a2369881fe09582337a9de3db2db1a951':
Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7'
* commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7':
Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
Merge commit '5dcf588a81a59142985736d8bb0430586f68ec08'
* commit '5dcf588a81a59142985736d8bb0430586f68ec08':
Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
Merge commit '14ea1048e7e8a4b40836b5601bc86b91663525cb'
* commit '14ea1048e7e8a4b40836b5601bc86b91663525cb':
Disable the access unit timeout temporarily while a seek operation is in progress.
Merge commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43'
* commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43':
Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
Merge commit '45bd1159fa34b51ba077e0cde760d171ca092552'
* commit '45bd1159fa34b51ba077e0cde760d171ca092552':
On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
Part III: Move startRecording() call earlier, asking camera hal
to allocate video buffers before CameraSource.start() is called.
Change-Id: I3f1d7d5636ca2644fe52af61f297d48c6b1ce89d
o updated comments and streamlined the logic in
checkVideoSize() and checkFrameRate() as suggested
Change-Id: I49d04ac7998d4a215997aa63555dfb6e814e38d3
Merge commit 'beffefa24f398b610d58dd583d9f5613dc529c28' into gingerbread-plus-aosp
* commit 'beffefa24f398b610d58dd583d9f5613dc529c28':
RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
Merge commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10' into gingerbread-plus-aosp
* commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10':
Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp
* commit 'f72dd0190ee64914161d361be1213eda8cab7b90':
Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
Merge commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c' into gingerbread-plus-aosp
* commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c':
Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
Merge commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f' into gingerbread-plus-aosp
* commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f':
Name the writer threads
Merge commit 'c5912acc04226a8f9377d1aad50de8d3f883854c' into gingerbread-plus-aosp
* commit 'c5912acc04226a8f9377d1aad50de8d3f883854c':
Disable the access unit timeout temporarily while a seek operation is in progress.
Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp
* commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5':
Added getter for session Id to AudioSink
Added a method to expose the audio session id at AudioSink interface
so that the AudioPlayer in stagefright can retrieve it.
Also:
- Fixed audio effect send level not being initialized in mediaplayer.
- Fixed compilation error when LOGV is enabled in mediaplayer JNI
Change-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb
Merge commit '949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp
* commit '949f7d9066e09768e570686a5695aaba4a1dafd0':
Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
Merge commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp
* commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2':
On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
Merge commit '56ee1080f004110bff622e5b60c243d9cabfe120'
* commit '56ee1080f004110bff622e5b60c243d9cabfe120':
Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.