commit c99e2e46256b11cae0a424e3341e1c04a3ee2076
author Chong Zhang <chz@google.com> Wed Oct 22 20:47:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 22 20:47:38 2014 +0000
tree c9150aae583ee04a6120fd37f9784eb3abd78157
parent 42aae0c4e722d08828d7316eaa86bb920ea474f2
parent c3ddddbd4ec1fe2c570a25925db6b396fb83badf

am c3ddddbd: Merge "release camera without holding CameraSource mutex" into lmp-dev automerge: 168799c

* commit 'c3ddddbd4ec1fe2c570a25925db6b396fb83badf':
  release camera without holding CameraSource mutex
  move audio sink open/close to NuPlayerRenderer
  Fix freed memory references
  audio policy: move intializations to onFirstRef()
  Fix VideoFrame class layout for 64/32 bit
  NuPlayer: wait for renderer flush before decoder shutdown
  Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp
  send available codec buffer count with codec notification
  mediarecorder: set level if setting default profile
  stagefright: move math templates into AUtils.h
  NuPlayer: Fix flush mode decoder error handling
  Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"
  GenericSource: support disconnect before NuCachedSource2 is created
  mediaplayer: make frame-accurate avsync configurable