Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160'
* commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160':
Some webcams output rtp streams but never send any rtcp data in violation of
Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0'
* commit '28b93967d0e702304c7edec854a29d5ab88bfce0':
HTTP Live content that are tagged as complete are now seekable.
Media framework test permissions were not updated when commit
14beea487c065ca902bfd7089399eb71a805e302 added
MODIFY_AUDIO_SETTINGS permission check for global effects.
Change-Id: I2a97be74f33d62fbb749642b1e7a26ddf92378f2
Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp
* commit '90d59d180bd963f00161e6bfaabfda432960cab6':
Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Merge commit '5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp
* commit '5f42391701c0657d520d00f62a4c061b18ba1280':
Attempt to derive the avg. bitrate of the entire stream from metadata.
Merge commit '646e0d5ab342f414f556574f2d078bd6deb22ed3' into gingerbread-plus-aosp
* commit '646e0d5ab342f414f556574f2d078bd6deb22ed3':
Some webcams output rtp streams but never send any rtcp data in violation of
o camera would query the color format if camera source is used
o if camera source is not used, a MetaData can be passed to do the same.
Change-Id: Iff1f802cc4974b286085473e5384bd88e04fa05d
Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp
* commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7':
Support for writing to MPEG2 transport stream files.
Merge commit '165c6579660c22edafb61fee2a0cf39334a2a905' into gingerbread-plus-aosp
* commit '165c6579660c22edafb61fee2a0cf39334a2a905':
HTTP Live content that are tagged as complete are now seekable.
Merge commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5'
* commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5':
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
Fixes file transfer from device to host with libmtp.
Change-Id: Ifb304c1f106e94b2710ee5c11816b83cf5f25478
Signed-off-by: Mike Lockwood <lockwood@google.com>
Merge commit '1010da2e02216b2f94fbe763a82d53201b340217' into gingerbread-plus-aosp
* commit '1010da2e02216b2f94fbe763a82d53201b340217':
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
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.
