OSDN Git Service

am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, .....
authorLajos Molnar <lajos@google.com>
Fri, 7 Mar 2014 18:31:25 +0000 (18:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 18:31:25 +0000 (18:31 +0000)
commit3eee65fa79e382b065ff5299bdc81f3a5b85be9a
tree06ae58990f32e0f8d51a90a22cce7733290156ad
parentc202aed28f3a24a7fbc74f7a65d806ef8deefb0b
parent49ea13379fb15ddb73183ebafa3a377342ef932f
am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev

* commit '49ea13379fb15ddb73183ebafa3a377342ef932f':
  LiveSession: Use the actual, possibly redirected url as base in the M3U
  M3UParser: Skip query strings when looking for the last slash in a URL
  ChromiumHTTPDataSource: Keep track of the redirected URL
  Initial HLS seamless switch implementation.
  NuPlayer side support for seamless format switch.
  LiveSession refactor
  PlaylistFetcher: Add support for block-by-block decryption.
  LiveSession: Add support for block-by-block fetchFile.
media/libmediaplayerservice/nuplayer/NuPlayer.cpp
media/libstagefright/httplive/LiveSession.cpp
media/libstagefright/httplive/M3UParser.cpp