• Home
  • History
  • Annotate
  • only in /frameworks/av/media/libmediaplayerservice/
History log of /frameworks/av/media/libmediaplayerservice/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
247a92eec4b0a8e4a9fd31b2755e96928b2895d0 09-Jun-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: set mPaused to false in onStart()." into nyc-dev
fe8fe7dc0316289e7f03690bcbe2332b395ba331 08-Jun-2016 Wei Jia <wjia@google.com> NuPlayer: set mPaused to false in onStart().

Bug: 29209515
Change-Id: I96c506feccd7105a63421a7b9444385d4fa6e7d8
uplayer/NuPlayer.cpp
8a092d306e3fb228628506ffd73d9d9f0387f271 03-Jun-2016 Wei Jia <wjia@google.com> NuPlayer: fix behavior of setPlaybackParams.

setPlaybackParams with zero speed is equivalent to pause().
setPlaybackParams with non-zero speed should start playback when player has
been prepared.
Bug: 29032949

Change-Id: Ib7738da653208f4fe5a8f1d7cf98b8479b3dc798
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
aaa28debcb0d2475d065a467281d1cc77c7c4aca 28-May-2016 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: ignore fractional audio frame." into nyc-dev
03cee24b8d54e5b5a94957b9fb7049738ff68765 27-May-2016 Wei Jia <wjia@google.com> NuPlayerRenderer: ignore fractional audio frame.

Bug: 27488269
Change-Id: I3f0e38f972e9d28b6edd8a4286b334021be81371
uplayer/NuPlayerRenderer.cpp
01f69476f61484a504f15123debe332dd39fd47f 26-May-2016 Wei Jia <wjia@google.com> Merge "RTSPSource: pause internally when buffering starts." into nyc-dev
c9ff2009a0a010eeaba80d76493fbf33fcb561c8 25-May-2016 Wei Jia <wjia@google.com> RTSPSource: pause internally when buffering starts.

Bug: 28915794
Change-Id: I1a04bdfe306fdf0f82fefbe9eb2855184991c1c8
uplayer/NuPlayer.cpp
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
f3d9908a888203e7e70b8c2d43ee741a95e154ed 24-May-2016 Andy Hung <hunga@google.com> Merge "Add memory heap checks for mediaserver and audioserver" into nyc-dev
b2379ba0a32638bae2ea0460644f68cf5a0967ce 24-May-2016 Eric Laurent <elaurent@google.com> Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check

Make sure we use the correct PID and UID when checking
android.permission.CAPTURE_AUDIO_OUTPUT permission from audio
policy service.

Bug: 28772898
Change-Id: I8f0c45bf7a5728b4364a451eefb6c025892ae9a5
tagefrightRecorder.cpp
07b745e166ee62030960ccea37e117caadf71c32 24-May-2016 Andy Hung <hunga@google.com> Add memory heap checks for mediaserver and audioserver

Memory heap check updated and restored to mediaserver,
added as new option to audioserver.

Requires properties to be set (example for audioserver):

$ adb shell setprop libc.debug.malloc.program audioserver
$ adb shell setprop libc.debug.malloc.options backtrace=8
$ adb shell pkill audioserver

...

and to dump:

$ adb shell dumpsys media.audio_flinger -m

Bug: 28909124
Bug: 27500825
Change-Id: Ifa8c2c02b022daf1a799ee4a1d75282a3c921763
ediaPlayerService.cpp
4ecb8af13a00dd6331a3e957af5c3230f537e923 24-May-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: remove the condition on sending BUFFERING_START event." into nyc-dev
bfe8207b2fa54a84ccbdb19fefe3a2836a2707c4 20-May-2016 Wei Jia <wjia@google.com> NuPlayer: remove the condition on sending BUFFERING_START event.

Since RTSPSource::pause() has become no op, it's safe to always send BUFFERING events.
Bug: 28915794
Bug: 25727912
Bug: 27292698

Change-Id: Ia61bce13ee7ef84734ab5063a3311f0bb38e6f72
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
46f80165c595d81dda68f8f3fea27f4fb04937dd 20-May-2016 Lajos Molnar <lajos@google.com> stagefright: fix issues with bitrate handling

- parse btrt mp4 box
- write max and avg. bitrates into avcc
- fix the use of "bit-rate" vs. the correct "bitrate"
- document ESDS better
- fix some spacing

Bug: 28671284
Change-Id: I94961a095c6d162af38b7999cc946f899a1b1b09
uplayer/NuPlayerRenderer.cpp
d4c4d2248bdfd06dc7b23dd2d81541d3941f8bf9 18-May-2016 Robert Shih <robertshih@google.com> Merge "Re-enable source re-scan for StreamingSource" into nyc-dev
78d4d1e46c546a29ec86b98f4bfce71424c42213 17-May-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: reduce calls to getFormat()." into nyc-dev
c33457231aa8d92734302217f36b24610e9121f1 16-May-2016 Andy Hung <hunga@google.com> Merge "MediaPlayer/MediaRecorder: Do not notify client of audioserver death" into nyc-dev
0bfa3eee31c9f99ec65158f810e65e12bae5ebf1 14-May-2016 Andy Hung <hunga@google.com> MediaPlayer/MediaRecorder: Do not notify client of audioserver death

Handled internally within NuPlayer and MediaRecorder.

Bug: 28768023
Change-Id: I26d94332a4668bf7a8ad54a7b25e6f0a3a6fe48d
ediaPlayerService.cpp
ediaPlayerService.h
ediaRecorderClient.cpp
ediaRecorderClient.h
41cd463de0e5d7fd5d1ac2b537226ab209529760 13-May-2016 Wei Jia <wjia@google.com> NuPlayer: reduce calls to getFormat().

Bug: 28545177
Change-Id: Ia4a2725f0ac353adfcd8f23654175467e86b78f3
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
51f03edcb36dcca327e9d5aa2410654e8a1b2809 14-May-2016 Wei Jia <wjia@google.com> Merge "IMediaSource: add readMultiple API to speed up inter-process reading." into nyc-dev
1f1fc459ddb67d1162f2dbb10d14e57f42841da2 12-May-2016 Wei Jia <wjia@google.com> IMediaSource: add readMultiple API to speed up inter-process reading.

GenericSource: use readMultiple for audio track.
Bug: 28545177
Bug: 22775369
Change-Id: If26b80e75eba4212105d51140c4bfce85ec664f8
uplayer/GenericSource.cpp
093024bfa271988655327e0fb761b581afa8bc11 12-May-2016 Robert Shih <robertshih@google.com> Re-enable source re-scan for StreamingSource

Bug: 28666655
Change-Id: I6d142e33958460144cda7370fdf3dd06d28ea3e1
uplayer/StreamingSource.cpp
uplayer/StreamingSource.h
e93cc03da360a1a0d2ad937c745ce8c8e8be81c2 05-May-2016 Eric Laurent <elaurent@google.com> audioflinger: various offload playback fixes

Revert underrun sleep time optimization added for
offload by commit 51716185 which can cause music to pause for a few
seconds in some corner cases.

Allow underruns in STOPPING_1 state to avoid dropping last buffer
received by the AudioTrack callback after stop() is called by the
client.

Allow interruption of thread loop sleep if a command is pending to
speed up track start sequence.

Do not wait for a full AudioTrack buffer before writing to audio HAL
when resuming playback or transitioning to next track.

Also moved log level for underruns in AudioSink from I to D to reduce
spam on user builds.

Bug: 28545177
Bug: 27682362
Bug: 28347796

Change-Id: I05b651b7878a2d2eedcac43cd669e32add171d40
ediaPlayerService.cpp
3e328782f1e1061d08ea0c45b855cc418a2d9ea6 09-May-2016 Lajos Molnar <lajos@google.com> stagefright: untangle metadata-mode handling

- specify requested metadata mode from producers to OMX
- (pass requested metadata in IOMX::storeMetadataInBuffers)
- use correct logic for native handle source
- use native handle source for encoded meta buffers

Bug: 22775369
Change-Id: I58b03acd3e9a5367d5010d7f87b7af5cae23362c
ndroid.mk
tagefrightRecorder.cpp
tagefrightRecorder.h
375a9c03550cc1bdca9e2cca862d6e549530bac6 05-May-2016 Marco Nelissen <marcone@google.com> Merge "Report other servers' deaths in OnErrorListener too" into nyc-dev
26583ffe69a7601ad29e00094fe66ce795356fab 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12 am: 5f527d44d7 am: c83479de24 am: 26ef0c4385
am: 1863e62d0f

* commit '1863e62d0f49b01b7d066e2d7c47fef249fffd9d':
Clear unused pointer field when sending across binder

Change-Id: I6b890a1e3964ba6623344414a5a897cc19a84e88
26ef0c43859fd505456fe4aa7bf7e6fabb91a237 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12 am: 5f527d44d7
am: c83479de24

* commit 'c83479de2497e93311932c03e5cd414a1088e6a2':
Clear unused pointer field when sending across binder

Change-Id: Iedb6c73113b84f521f8616116326e1933dcc44e9
c83479de2497e93311932c03e5cd414a1088e6a2 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12
am: 5f527d44d7

* commit '5f527d44d7155103ffd3b1780008dd1441511016':
Clear unused pointer field when sending across binder

Change-Id: I543a1c93d6d82736dab9ce7de0208deeae1a4667
5f527d44d7155103ffd3b1780008dd1441511016 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b
am: 7c3e69cd12

* commit '7c3e69cd12e2e631ab97ce10b71def69b3490d9d':
Clear unused pointer field when sending across binder

Change-Id: If5f841e873f937669e3e23f77bbfb43f109c563d
7c3e69cd12e2e631ab97ce10b71def69b3490d9d 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0
am: d2c61d049b

* commit 'd2c61d049b52158c506a2c61727078fccb92b898':
Clear unused pointer field when sending across binder

Change-Id: I5e41f418c9fcdea8bc05c150772a0b87cef101bd
38f24823d0bb4b15db9ceac264e01401a653619c 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa
am: ef1fcffc98

* commit 'ef1fcffc9808df37f4031ddbf247492c8609559a':
Clear unused pointer field when sending across binder

Change-Id: I77dcc292f32549bd62869b710d3842853a7528fa
ef1fcffc9808df37f4031ddbf247492c8609559a 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2
am: 2d4cf313fa

* commit '2d4cf313fa141d11cfae7c31797da114598d8ed7':
Clear unused pointer field when sending across binder

Change-Id: I0d1569e886ff40a43423cdbf83ed5d04e35f2d07
2d4cf313fa141d11cfae7c31797da114598d8ed7 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e
am: 4b817b51e2

* commit '4b817b51e2998719037f362c7b70ee71c76abeb8':
Clear unused pointer field when sending across binder

Change-Id: I6d09ecb88cf32f2c720dd0ec66964ec94ad210da
e663be8d475ec6035a1a4257b208549b4375fa08 02-May-2016 Marco Nelissen <marcone@google.com> Clear unused pointer field when sending across binder

Bug: 28377502
Change-Id: Iad5ebfb0a9ef89f09755bb332579dbd3534f9c98
etadataRetrieverClient.cpp
6dc3a3e2292454f94c015da45f1ebfc6a493e736 30-Apr-2016 Marco Nelissen <marcone@google.com> Report other servers' deaths in OnErrorListener too

otherwise applications will be unaware of those processes dying.

Bug: 22775369
Change-Id: I48577f787a97ee7627ae8e7f32e2f21ace243ed0
ediaPlayerService.cpp
ediaPlayerService.h
ediaRecorderClient.cpp
ediaRecorderClient.h
40601964e1f8966d90c31b0c389dfab6a515bd50 27-Apr-2016 Jeff Tinker <jtinker@google.com> Merge "Remove MediaDrm stack from mediaserver" into nyc-dev
3003807fcfa96c9cbfea18d643f47108aa116cd5 25-Apr-2016 Jeff Tinker <jtinker@google.com> Remove MediaDrm stack from mediaserver

Part of media security hardening

MediaDrm was temporarily allowed to
run in either mediaserver or mediadrmserver
while all nexus devices were implementing
support for the native_handle representation
of secure buffers. Now that all nexus
devices support native_handle, the MediaDrm
stack can be removed from mediaserver.

b/22990512

Change-Id: Ie5d83bfeb4c4a824e1d0edb4c9452c782d6fd386
ndroid.mk
rypto.cpp
rypto.h
rm.cpp
rm.h
rmSessionClientInterface.h
rmSessionManager.cpp
rmSessionManager.h
ediaPlayerService.cpp
ediaPlayerService.h
haredLibrary.cpp
haredLibrary.h
ests/Android.mk
ests/DrmSessionManager_test.cpp
64cc92884966864b7a08e0eac74be108edf883da 27-Apr-2016 Wei Jia <wjia@google.com> Merge "GenericSource: reduce logging." into nyc-dev
4d71c0224e48d87c81363ad061d58deaf991a323 27-Apr-2016 Wei Jia <wjia@google.com> GenericSource: reduce logging.

Bug: 28408463
Change-Id: I48eb7e7f6c5d786c4dc37c2abfc6733fe926cf9d
uplayer/GenericSource.cpp
8986b4d50c8d46de2a8950cb23fcc4138df67191 23-Apr-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: ignore stale message for teardown." into nyc-dev
8456ddd1e4c3daa8f32ea1cbb94c70275e5a22f5 22-Apr-2016 Wei Jia <wjia@google.com> NuPlayer: ignore stale message for teardown.

Bug: 28121584
Change-Id: I9df088b4d99ebae38c06a1138f3d66b31bf67529
uplayer/NuPlayer.cpp
21afe805580c1fdf394415648fba8e1c482def60 21-Apr-2016 Andy Hung <hunga@google.com> NuPlayerRenderer: Ensure cancelAudioOffloadPauseTimeout cancels timeout

Bug: 28121584
Change-Id: Ic8887851544f769e0cd0717d97075931ab73df3f
uplayer/NuPlayerRenderer.cpp
5cc32c5ee9caa11a3c9cd205c42463ead28ec87e 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "media: clear pause state at stop()" into nyc-dev
2cfa562090dfce35e43cb787e5c1692475bb12a1 16-Apr-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: guard mSource when it's accessed on external looper." into nyc-dev
c45a4b26d188a7e4287f672565792479bcf67b9d 16-Apr-2016 Wei Jia <wjia@google.com> NuPlayer: guard mSource when it's accessed on external looper.

Bug: 25121900
Change-Id: Ibc0a114acef91269c83d9494818bdb30589dcfc9
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
e6cab24fa5857eaf48c957988f153b47a52d1b45 14-Apr-2016 Wonsik Kim <wonsik@google.com> media: clear pause state at stop()

Bug: 28151768
Change-Id: I37e0b4562398008d6a1176bf3570cb6170997390
tagefrightRecorder.cpp
535412965145a1df2ec1770331e8477e52cd37b5 14-Apr-2016 Andy Hung <hunga@google.com> Add memory leak detection to mediaserver

Bug: 28169802
Change-Id: I05e12ef3b12c5f0322ddf5ecc10d95205b0e44d6
ndroid.mk
ediaPlayerService.cpp
0c4a97e6e1470b2d8b8810792af8d66689020c51 13-Apr-2016 Andy Hung <hunga@google.com> Merge "NuPlayer: Reserve buffer for 8x max speed" into nyc-dev
f2c87b3f88d987d2af6322e9763eb8224a2bae48 08-Apr-2016 Andy Hung <hunga@google.com> NuPlayer: Notify if drain message time is unexpectedly long

Bug: 27940058
Change-Id: Id8897c30e21b6b9de545a710e7766ffceb491455
ediaPlayerService.cpp
ediaPlayerService.h
uplayer/NuPlayerRenderer.cpp
ff874dc957f9ea70d87f4d627bf903e1fc86d58b 12-Apr-2016 Andy Hung <hunga@google.com> NuPlayer: Reserve buffer for 8x max speed

Affects Photos with Bluetooth and 240x recording.

Bug: 26986060
Change-Id: I228223221f9811e05c274d64cd42ac104db04c36
ediaPlayerService.cpp
uplayer/NuPlayerRenderer.cpp
8a049c2f127f95715375d5ede39b2363b3a68329 09-Apr-2016 Andy Hung <hunga@google.com> Merge "MediaPlayerService: Remove 64 bit compilation warnings" into nyc-dev
f0003e3d02cf52e50ad65d4cd3c79dcb9fe4c569 09-Apr-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: fetch position from track" into nyc-dev
2f6e73db45995636e5405fb2e1063a55550ba10f 08-Apr-2016 Andy Hung <hunga@google.com> NuPlayer: fetch position from track

Bug: 27940058
Change-Id: Ibe730dffca4b3e2649a07f1f7583b471e13bdbed
ediaPlayerService.cpp
ediaPlayerService.h
3b9912bcd428fcaeead1faf9297aee11b7fd1888 08-Apr-2016 Robert Shih <robertshih@google.com> GenericSource: gracefully handle missing timestamp

Bug: 23474771
Change-Id: I1a1c03162fb08fa43607905ff2c6d4d594675001
uplayer/GenericSource.cpp
833b47505c513cb5c8f22aa922a7ea20d153b319 05-Apr-2016 Andy Hung <hunga@google.com> MediaPlayerService: Remove 64 bit compilation warnings

Bug: 16890215
Change-Id: I83d27d8c0c51bd868737bc2a1d6e046702d2a91c
ediaPlayerService.cpp
ediaRecorderClient.cpp
etadataRetrieverClient.cpp
tagefrightRecorder.cpp
1cf582cfc8e1082a0c37c25655a052c7a9185fe4 05-Apr-2016 Wei Jia <wjia@google.com> Merge "GenericSource: send video input data to decoder in paused state." into nyc-dev
ff486640ca9794a4c328bb1b7ccf4ab5d36d1331 05-Apr-2016 Wei Jia <wjia@google.com> GenericSource: send video input data to decoder in paused state.

Bug: 27926143
Change-Id: If2dc21d2dcb6e8e6d4da5456999899d4dbe5d52b
uplayer/GenericSource.cpp
e13f8a603867280de9b02ce4839202a182556416 30-Mar-2016 Andy Hung <hunga@google.com> NuPlayer: Play out remaining audio data when recycling isn't possible

Don't flush it immediately.

Bug: 26530291
Change-Id: I0427633402fa251ec62e2b70e47a0a7b451d3ea2
ediaPlayerService.cpp
a05f1e3a8eb80a0a9f19456aea357d6d8e405794 26-Mar-2016 Wei Jia <wjia@google.com> NuPlayer: allow audio tear down to restart with non-offload mode.

Bug: 27673375
Change-Id: Iab3ac908bb850e6333fab0cf83894913c1df9005
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
3e1715dd62ce6472d19ed6b1b6baf16239b12c5e 23-Mar-2016 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: log pause." into nyc-dev
03a5653c8f25c0e90f362e252be48f95703b18fe 23-Mar-2016 Wei Jia <wjia@google.com> NuPlayerDriver: log pause.

Change-Id: I85776d5d2a0b6dc9c5fd18fc19afc211f3b44b7a
uplayer/NuPlayerDriver.cpp
f4044e892d3939fb99ee545a5e8e8e2999f476b2 22-Mar-2016 Robert Shih <robertshih@google.com> Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da am: 9ef3f17 am: 8278e43 am: 093cd05 am: 05cb2d8 am: 5042d77 am: 6d1599d am: 297a8d2
am: 539826f

* commit '539826f278dadc8041467713790ffe5b54572d6e':
NuPlayerStreamListener: NULL and bounds check before memcpy
297a8d26d401fe02281a691e81f1f23d7c567f40 22-Mar-2016 Robert Shih <robertshih@google.com> Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da am: 9ef3f17 am: 8278e43 am: 093cd05 am: 05cb2d8 am: 5042d77
am: 6d1599d

* commit '6d1599db3c2438287922e58ccae42f10904c2948':
NuPlayerStreamListener: NULL and bounds check before memcpy
6d1599db3c2438287922e58ccae42f10904c2948 22-Mar-2016 Robert Shih <robertshih@google.com> Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da am: 9ef3f17 am: 8278e43 am: 093cd05 am: 05cb2d8
am: 5042d77

* commit '5042d77680112a7dc8f72190d2dc320a13d93500':
NuPlayerStreamListener: NULL and bounds check before memcpy
5042d77680112a7dc8f72190d2dc320a13d93500 22-Mar-2016 Robert Shih <robertshih@google.com> Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da am: 9ef3f17 am: 8278e43 am: 093cd05
am: 05cb2d8

* commit '05cb2d88206227dca9f77d4aaaa47699fb6c70d2':
NuPlayerStreamListener: NULL and bounds check before memcpy
05cb2d88206227dca9f77d4aaaa47699fb6c70d2 22-Mar-2016 Robert Shih <robertshih@google.com> Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da am: 9ef3f17 am: 8278e43
am: 093cd05

* commit '093cd05cb8c505975c678c0ecb1042f798e6416a':
NuPlayerStreamListener: NULL and bounds check before memcpy
8278e439fb12da29b0144d1830d886dc0629a3ce 22-Mar-2016 Robert Shih <robertshih@google.com> Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da
am: 9ef3f17

* commit '9ef3f1714381dd903bd4a1f978c8fb0cc8e15c81':
NuPlayerStreamListener: NULL and bounds check before memcpy
9ef3f1714381dd903bd4a1f978c8fb0cc8e15c81 22-Mar-2016 Robert Shih <robertshih@google.com> Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5
am: 6ee73da

* commit '6ee73dabbf1774517d5d4afcefad4e9f71c6df9b':
NuPlayerStreamListener: NULL and bounds check before memcpy
6ee73dabbf1774517d5d4afcefad4e9f71c6df9b 22-Mar-2016 Robert Shih <robertshih@google.com> Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev
am: 4fa31b5

* commit '4fa31b5d858e11df241d6518cb06eea5b0adb3d6':
NuPlayerStreamListener: NULL and bounds check before memcpy
13632850977b072e39df87bc6205f9475480c351 22-Mar-2016 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: no delayed seek." into nyc-dev
88b3147ea116911285cdbbea422e67e1c69b355e 18-Mar-2016 Robert Shih <robertshih@google.com> NuPlayerStreamListener: NULL and bounds check before memcpy

Bug: 27533704
Change-Id: I992a7709b92b1cbc3114c97bec48a3fc5b22ba6e
uplayer/NuPlayerStreamListener.cpp
7f7052f5e45f8eb1df80a6978e0095d9e9c9eded 18-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "media: adjust time offset in case of time lapse" into nyc-dev
9f5c692300e02f9f1b4e08b238a76f1428c854d3 17-Mar-2016 Wonsik Kim <wonsik@google.com> media: adjust time offset in case of time lapse

Bug: 27636840
Change-Id: I7be87042b450e0e7e4d9e74072a2acdf4af1a4dd
tagefrightRecorder.cpp
d848eb48c121c119e8ba7583efc75415fe102570 08-Mar-2016 Glenn Kasten <gkasten@google.com> Use audio_session_t consistently

Bug: 27562099
Change-Id: I328d8226191386b163f2ace41233607294c50dcd
ediaPlayerService.cpp
ediaPlayerService.h
419187cec0ff4660a84524b1980c2a6b6f987272 29-Oct-2015 Wei Jia <wjia@google.com> NuPlayerDriver: no delayed seek.

Bug: 25302052
Change-Id: Icbfd38b6ca26fdefd1b87ea4dcd4e9c576d9bb3f
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
b77d03b62cb743d0faf74b54aa466b4d220b5e61 03-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: connect color aspects and surface dataspace

1. Keep configuration format as video decoder and encoder will need
it to reset their default color aspects on mode/size change.

2. Separate color aspect handling for decoder and encoder as they
are quite different. Update decoder and encoder color aspect setting
to latest policy.

3. propagate dataspace to GraphicBufferSource, MediaCodecSource,
CameraSource and SoftwareRenderer

Bug: 25684127
Change-Id: Ie9a7528af36ed44605a7ce3e69b5794ef16b1c66
tagefrightRecorder.cpp
d56db1d2bee182d1851097a9c712712fc094d117 18-Dec-2015 Eino-Ville Talvala <etalvala@google.com> Camera: Switch camera2 to auto-gen C++ binder interfaces

- Move camera service AIDL files to frameworks/av
- Build C++ interface stubs with AIDL tools
- Add necessary native-side parcelables and update existing ones
- Remove manually-written stubs, rearrange remaining manual stubs
- Adjust implementations to work with auto-generated stubs
- Adjust method signatures for auto-gen differences
- Add rich error messages using binder::Status

Bug: 25091611
Change-Id: I6f69f34b9d1a3f8d1fb7db87357363f8fa8483ff
ndroid.mk
ediaRecorderClient.cpp
ediaRecorderClient.h
tagefrightRecorder.cpp
tagefrightRecorder.h
f013dc41d9ac1e295c91594e6f2ebc1455af5f41 25-Feb-2016 Robert Shih <robertshih@google.com> Merge "Miscellaneous RTSP improvements" into nyc-dev
5031b2f3ac5223587e48fc8463bec24cb62495ba 25-Feb-2016 Wei Jia <wjia@google.com> NuPlayer: allow restartAudio in non-offload mode.

Bug: 27349327
Bug: 27059518
Change-Id: Ia41de9dbe8949ca04f6f3cd11f5b01cea2f53a74
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
641e0c718da1c58e5b89379f60465c4e564ebb73 22-Feb-2016 Robert Shih <robertshih@google.com> Miscellaneous RTSP improvements

1. Server side management based on buffer monitoring
2. Notify prepared after more buffering
3. Drop stale access units after seek

Bug: 27292698
Change-Id: Ic41686bb3514eb1d4c206bb155d45f34b6350810
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
809aeb1f725beed877887fe1c5ca3430d811b328 24-Feb-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: switch to non-offload mode when playback rate is not 1.f" into nyc-dev
bf70feb38dc0361989aa6ef869cdd4f6ce3f7108 20-Feb-2016 Wei Jia <wjia@google.com> NuPlayer: switch to non-offload mode when playback rate is not 1.f

Bug: 27059518
Change-Id: Ib53786fe5ba2271bd4c1563c3ee5403617589066
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
d11c43a12917e017d715db88c13e4e7550eb9151 28-Jan-2016 Ronghua Wu <ronghuawu@google.com> mediaresourcemanager: verify the input calling pid

Bug: 26830615
Change-Id: I2e9c579b3bdd86a90b08fa161206d32527390bb5
ests/DrmSessionManager_test.cpp
262c39e35bf88e09dab3e0ae9f7df84db64273bb 18-Feb-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: always send BUFFERING_END to client." into nyc-dev
d2f35de429c67a156299f662b0783fbcead13cb6 18-Feb-2016 Wei Jia <wjia@google.com> NuPlayerRenderer: return correct pending audio duration for virtual audio sink.

Bug: 27222912
Change-Id: Ia900f8ac66fcdad538f847233fe680f6bf47ea2f
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
3bed45a4923eaf615fdc322da7b0b8faf7475a63 17-Feb-2016 Wei Jia <wjia@google.com> NuPlayer: always send BUFFERING_END to client.

Bug: 25727912
Change-Id: I8c0d87ae2611769e275ed8f0d82a8928961657e8
uplayer/NuPlayer.cpp
9ac86b3cae9a1e14b12bf97223ddde96142aae43 24-Jan-2016 Jeff Tinker <jtinker@google.com> stagefright: ICrypto: enable passing secure buffers in native_handle

Previously secure buffers were passed as opaque
void * values, which no longer works since
mediadrmserver is now a separate process from
mediaserver.

Bug: 22990512
Change-Id: I5c458ba19e78e20d1bd5a5899df0bce16f71bfd8
rypto.cpp
rypto.h
528c8403ad2ede53054a706a20c00b710fa08166 12-Jan-2016 Andy Hung <hunga@google.com> NuPlayerRenderer: Reduce calls into AudioTrack::getTimestamp

Bug: 26513187
Change-Id: I2e1792fedd81f95272485b0122f1dfe04113f1ac
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
818382eed20cae448416c4ff78d36874016ab30b 11-Feb-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: set mPausedByClient correctly when calling setPlaybackSettings()." into nyc-dev
4ad74b2b4507c8b2714b7b7584578d2d43ae2633 06-Feb-2016 Wei Jia <wjia@google.com> RTSP: increase mCheckGeneration when mCheckPending is set to false.

This will ensure there is only one 'chek' message.
Also delay notification of seek done till kWhatSeekDone, instead of
kWhatSeekPaused. This allows back-to-back multiple seeks.

Bug: 25727912
Change-Id: If873bfaf1c37790e520f1f659ab26148b0c8cd1c
uplayer/RTSPSource.cpp
351ce871cee5da00340cf448e8d73b9e22cea078 10-Feb-2016 Wei Jia <wjia@google.com> NuPlayer: set mPausedByClient correctly when calling setPlaybackSettings().

Also reset mPendingBufferingFlag when seeking.

Bug: 25727912
Change-Id: I1b6ec51b22f981c1701ac7eab572f95e6874c3a0
uplayer/NuPlayer.cpp
07af6518b7b7eeb730ded9c5fd6fd6fb3a462bc5 10-Feb-2016 Wei Jia <wjia@google.com> NuPlayerRenderer: remove extra quotation mark.

Bug: 26400089
Change-Id: Icbfe373424e03629d6bc7242879618402bbbcb96
uplayer/NuPlayerRenderer.cpp
12b6265f1d4be368957f91104d5210cf604ac4cc 10-Feb-2016 Wei Jia <wjia@google.com> NuPlayerRenderer: use system clock when audio sink is not working.

Bug: 26400089
Change-Id: I8243b95798b54daa3023d1123ef0a8351e7502e2
uplayer/NuPlayerRenderer.cpp
1900e77bac4276f247f80fd06d19316cac598f57 03-Feb-2016 Marco Nelissen <marcone@google.com> Run codecs in a separate process

Encoders and secure decoders still run in the mediaserver, while
all other codecs run in a separate codec process.

Bug: 22775369

Change-Id: Ifbcab8a8f2fe77d2567830ac88f0d982e77f7b00
ediaPlayerService.cpp
e4d40ad91f3516bde106658673b2cb076b5dfcb7 13-Jan-2016 Lajos Molnar <lajos@google.com> stagefright: Remove deprecated AwesomePlayer

Bug: 17108024
Change-Id: Ia721bdfa87b07612ad8e76cbdcda6de2b8ce2a74
ndroid.mk
ediaPlayerFactory.cpp
ediaPlayerService.cpp
tagefrightPlayer.cpp
tagefrightPlayer.h
c71563f778e9b56d33555ea978a3085101a097ef 06-Feb-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: do not send BUFFERING_START to client when paused by client."
71c75e002fce579444a1a6126effe883b963091b 04-Feb-2016 Wei Jia <wjia@google.com> NuPlayer: do not send BUFFERING_START to client when paused by client.

Bug: 25727912
Change-Id: I5f82090352a3d6806f1f8fafbdb2a3bf0be48be7
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
6b0795009b8f53ab771e0074b76381977d016f4b 04-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: move MetadataRetriever off of OMXCodec

Also remove some unneeded OMXCodec includes.

Bug: 17108024
Change-Id: I1e4b32d83216e9c6b1d76a18fb346dc632be4b1d
tagefrightRecorder.cpp
3ba7ed56de35656a1eeb12fff16531085d3f37cb 03-Feb-2016 Wei Jia <wjia@google.com> Merge "Revert "NuPlayer: use kWhatPauseOnBufferingStart instead of kWhatBufferingStart in RTSPSource.""
e67ba383dd585d2c253986a39225e0d6d05755f3 03-Feb-2016 Wei Jia <wjia@google.com> Revert "NuPlayer: use kWhatPauseOnBufferingStart instead of kWhatBufferingStart in RTSPSource."

This reverts commit 2c9a30a341e50f53039e1b7da96dfa91104fdd62.
RTSPSource::pause() will stop receiving data in RTSPSource. This is different from GenericSource::pause().

Change-Id: I2df2bf350731ce0fb1f278942b23ccc6f4f37fb9
uplayer/NuPlayer.cpp
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
254012a040733ec2476171d311005168810d1d01 28-Jan-2016 Marco Nelissen <marcone@google.com> Merge "Revert "Run codecs in a separate process""
260e56c9a17737bf280d776797d6dee411c9b4da 28-Jan-2016 Marco Nelissen <marcone@google.com> Revert "Run codecs in a separate process"

This reverts commit 4f12d94fc26df1d0c7a566792711b8863fd39fe9.

Change-Id: Ic850a950119a45efd3042f40147253b37c328853
ediaPlayerService.cpp
ediaPlayerService.h
feb76cc0340f3eb4c9ae91cbfab4dcea449422f5 28-Jan-2016 Chien-Yu Chen <cychen@google.com> Merge changes from topic 'camera-hardening'

* changes:
camera: Add support to pass native handles across binders
Camera: Fix client permission check
Add cameraserver process
8a3ff465d394b969166f4df8c1bad9d2f1103747 28-Jan-2016 Wonsik Kim <wonsik@google.com> Merge "media: reset total paused duration for MediaRecorder at stop"
26736fd21faada79c4fb91cb6ef91582c113e9eb 27-Jan-2016 Marco Nelissen <marcone@google.com> Merge "Run codecs in a separate process"
148c3d67710ca9353f14e5c37a0a38c88d4f0e53 27-Jan-2016 Wonsik Kim <wonsik@google.com> media: reset total paused duration for MediaRecorder at stop

Bug: 20092236
Change-Id: I05a11a2f9b8a0fbc54900aa6ba00bf49e8a0bafd
tagefrightRecorder.cpp
1e0745544cf6328ba5957748328651c3cfb5b6b6 27-Jan-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: add HEVC support to MediaRecorder"
98a668f6ea51e4d894d2ebb61a0e18287fb14008 18-Dec-2015 Chien-Yu Chen <cychen@google.com> Camera: Fix client permission check

Modify StageFright's CameraSource to forward calling PID as
client PID when connecting to CameraService so CameraService
can check if the client PID has permission to use camera.

Change CameraService to check calling UID is trusted before
using the passed in client PID and client UID to verify permission.

Bug: 24511454
Change-Id: I4906ab73510e2c75714690bed675e3c13aca3ccf
tagefrightRecorder.cpp
tagefrightRecorder.h
4f12d94fc26df1d0c7a566792711b8863fd39fe9 16-Dec-2015 Marco Nelissen <marcone@google.com> Run codecs in a separate process

For now this only runs decoders and Google encoders in the codec process.

Bug: 22775369
Change-Id: Iadd8b6bc2873ddcfaee3e68866642ba74c6949aa
ediaPlayerService.cpp
ediaPlayerService.h
97385561584e96c1c1149cf883e0ad1c75cfbdd0 22-Jan-2016 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: fix misc. getCurrentPosition issue."
62cc8d0d9d8019a84e6ef63c3917d3beb99061c6 21-Jan-2016 Wei Jia <wjia@google.com> NuPlayerDriver: fix misc. getCurrentPosition issue.

Query position from nuplayer if player is at EOS as driver may have
stale position.

Use driver's getPosition instead of player's getPosition if player is
paused by setPlaybackRate. This will preserve sought position.

Change-Id: Ib55f028438fc40359f599969d01b66aef5100c0a
uplayer/NuPlayerDriver.cpp
9aa87d4ef502c9700a31fe46dc6e1d6f99cf4e5e 07-Dec-2015 Wonsik Kim <wonsik@google.com> stagefright: add HEVC support to MediaRecorder

Bug: 22879917
Change-Id: I6c97b051467de44c506a8ff021321e5953a63fc3
tagefrightRecorder.cpp
f2e71d265424820caf64dd8e53c03c6a65f80373 21-Jan-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: use kWhatPauseOnBufferingStart instead of kWhatBufferingStart in RTSPSource."
56097a8ecc31ec308a1caa38f92b69f99324eada 08-Jan-2016 Wei Jia <wjia@google.com> NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.

Bug: 24145279
Change-Id: I6b99ee2dc63063557f4ee2c5856f7c848e969752
uplayer/NuPlayerDecoder.cpp
05b7b2d33816a4bf9592ec82639a7bcf06166157 21-Jan-2016 Jaesung Chung <jaesung@google.com> Merge "Support for CEA-708 closed caption"
4def1cb3283df05929dbf81f9ca68803b519437f 20-Jan-2016 Wei Jia <wjia@google.com> GenericSource: reset mPrepareBuffering to initial value when buffering monitor is stopped.

Bug: 26676177
Change-Id: I4dbd86a624bd0c8fb8dd154752e345168e804d6b
uplayer/GenericSource.cpp
2c9a30a341e50f53039e1b7da96dfa91104fdd62 20-Jan-2016 Wei Jia <wjia@google.com> NuPlayer: use kWhatPauseOnBufferingStart instead of kWhatBufferingStart in RTSPSource.

Bug: 24295007
Change-Id: I75026f7c96b40b0d552d849772760367f9859d1b
uplayer/NuPlayer.cpp
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
14532f2383c3849d0db59a607ed0bd802f57155c 29-Dec-2015 Wei Jia <wjia@google.com> MediaPlayer: overhaul buffering monitor scheme.

GenericSource: buffering monitor runs on a separate looper since readBuffer()
call can be blocked for long time.
When paused, dequeueAccess() returns -EWOULDBLOCK.
For audio offload, take into account cached data in downstream components.
NuPlayerDecoderPassThrough: flush out aggregate buffer when source doesn't have
data available.

Bug: 24295007
Change-Id: I535a438d96ee902c9b4baa7c84ed7e5063a23964
(cherry picked from commit 32ce83cf93e4eb14c9937e4b850e044f9f7fdf2c)
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerSource.h
ce84b2240497cd0923e190ae115e319e4c17d303 14-Jan-2016 Wei Jia <wjia@google.com> RTSPSource: check mHTTPService before dereferencing it.

Change-Id: Id92c5ed86742f9c5cb0a67207b26de61523fd009
uplayer/RTSPSource.cpp
18cb1eca504817b5b144a023ae2792d90e74c9a5 18-Dec-2015 Jeff Tinker <jtinker@google.com> Support AES-CBC sample encryption in MediaDrm

bug:23719082
Change-Id: I3028452f315122b65296881aed1fbf66c3ceeebc
rypto.cpp
rypto.h
2afac0c7c42560ff5b8f133c6074b7e023279d6d 07-Jan-2016 Wei Jia <wjia@google.com> libmedia: check NULL pointer at binder receiver side.

Change-Id: I464da96f3d6081dd8c3cc2fd977e2b96f5d477bb
ediaPlayerService.cpp
00541e293c250ea9e31b6ab2dc134802e34fe843 19-Dec-2015 Robert Shih <robertshih@google.com> NuPlayerRenderer: delay video until audio clock is ready

Bug: 26291187
Change-Id: Ifcfc87033390ed772868976129e233afb099c13b
uplayer/NuPlayerRenderer.cpp
6ca0256a1dcd85e1fa0a535347a9f0ecc57e284d 09-Dec-2015 Jeff Tinker <jtinker@google.com> Remove unused MediaDrm.unprovisionDevice

bug:25726218
Change-Id: I6eb0ceb488c66c191897b3c190f5da1d71880c77
rm.cpp
rm.h
fe2d80d385d71be73ba6ac0f5c98de1b524bf12f 08-Dec-2015 Chong Zhang <chz@google.com> DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c
am: 83487187ab

* commit '83487187ab549d0966791a60a92d49d77e47f071':
DO NOT MERGE nuplayer: do not use cached source for wvm content
3694d7cf40d1645bf05246cf38595eed606bb650 21-Oct-2015 Jaesung Chung <jaesung@google.com> Support for CEA-708 closed caption

Bug: 24314667, Bug: 24889604
Change-Id: Ica8a8405b143921de82ca6075a1f7b1f6f9ff345
uplayer/GenericSource.cpp
uplayer/NuPlayerCCDecoder.cpp
uplayer/NuPlayerCCDecoder.h
91a23ed95cda558a3c31e8ef34f420924f4d6d7d 20-Feb-2015 Chong Zhang <chz@google.com> DO NOT MERGE nuplayer: do not use cached source for wvm content

bug: 18730095, 25563255
Change-Id: Ibd4f54907949daae1d095fa0922050310d16698f
(cherry picked from commit fc6cfd8343ae8919e85ec22efed9df626fe8854b)
uplayer/GenericSource.cpp
728a7aa0819cd583f09a941f26b71886533a244f 04-Dec-2015 Andy Hung <hunga@google.com> Merge "NuPlayerRenderer: Allow immediate pause on next track."
8420073fda0f6f6c68c952e030b0dbc184112e42 03-Dec-2015 Andy Hung <hunga@google.com> NuPlayerRenderer: Allow immediate pause on next track.

Prior code required audio data to have been decoded first.

Bug: 25904185
Change-Id: I52fa65b2ed53d29ddd534c2bf3070626d54bd633
uplayer/NuPlayerRenderer.cpp
3f273d10817ddb2f792ae043de692efcdf1988ae 24-Nov-2015 Wei Jia <wjia@google.com> Uses AudioFlinger to signal battery stats for audio.

Bug: 18177221
Change-Id: I704010c037cb99bb74b98798ee8e494fa8bdc875
ediaPlayerService.cpp
f4284584d6a12c19906d661e55163c0d90f83286 30-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Tuning the number of packets for one read in StreamingSource" am: 9cd5f8115b am: a4afeea0dc
am: 2a9cf2eeef

* commit '2a9cf2eeefa590a26c0af51fa226940560e5bef2':
Tuning the number of packets for one read in StreamingSource
2a9cf2eeefa590a26c0af51fa226940560e5bef2 30-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Tuning the number of packets for one read in StreamingSource" am: 9cd5f8115b
am: a4afeea0dc

* commit 'a4afeea0dccf5d2bf400f53743df196ceee2fcbe':
Tuning the number of packets for one read in StreamingSource
a4afeea0dccf5d2bf400f53743df196ceee2fcbe 30-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Tuning the number of packets for one read in StreamingSource"
am: 9cd5f8115b

* commit '9cd5f8115b9d2414e8ec537ffec3308776c2b587':
Tuning the number of packets for one read in StreamingSource
9cd5f8115b9d2414e8ec537ffec3308776c2b587 30-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Tuning the number of packets for one read in StreamingSource"
dc123cbae198204e8c6c3d4f4f09a95cbc0e9ec5 26-Nov-2015 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: always display the first video frame without delay." am: 80b991393d am: bd060b5932
am: caf17eb5d7

* commit 'caf17eb5d71fb588fd1cc0c040f4d18538170e3d':
NuPlayerRenderer: always display the first video frame without delay.
caf17eb5d71fb588fd1cc0c040f4d18538170e3d 26-Nov-2015 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: always display the first video frame without delay." am: 80b991393d
am: bd060b5932

* commit 'bd060b5932d4c27cb7e11d5b7273de945a125e7d':
NuPlayerRenderer: always display the first video frame without delay.
bd060b5932d4c27cb7e11d5b7273de945a125e7d 26-Nov-2015 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: always display the first video frame without delay."
am: 80b991393d

* commit '80b991393de73161eb0bf8e692c830eb9ab12ca4':
NuPlayerRenderer: always display the first video frame without delay.
80b991393de73161eb0bf8e692c830eb9ab12ca4 26-Nov-2015 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: always display the first video frame without delay."
7897659e2756c0f715b7469421cbbeb4d422eae0 25-Nov-2015 Wei Jia <wjia@google.com> Merge "NuPlayerDecoder: add synchronous call pause() to ensure decoder will not request or send out data." am: f5ac18d2fd am: 674649bcb5
am: 873ca50c7d

* commit '873ca50c7d590b4a04efc1e9c6ffec566e7e4e24':
NuPlayerDecoder: add synchronous call pause() to ensure decoder will not request or send out data.
873ca50c7d590b4a04efc1e9c6ffec566e7e4e24 25-Nov-2015 Wei Jia <wjia@google.com> Merge "NuPlayerDecoder: add synchronous call pause() to ensure decoder will not request or send out data." am: f5ac18d2fd
am: 674649bcb5

* commit '674649bcb5d3e5fd6e527906c7b166f96d35ec16':
NuPlayerDecoder: add synchronous call pause() to ensure decoder will not request or send out data.
674649bcb5d3e5fd6e527906c7b166f96d35ec16 25-Nov-2015 Wei Jia <wjia@google.com> Merge "NuPlayerDecoder: add synchronous call pause() to ensure decoder will not request or send out data."
am: f5ac18d2fd

* commit 'f5ac18d2fd86b1fe6d2f115d64d95117ed7f96f5':
NuPlayerDecoder: add synchronous call pause() to ensure decoder will not request or send out data.
25d696f31bfcbb24459f5d68c2288101bb5f7875 19-Nov-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: always display the first video frame without delay.

Bug: 25357751
Change-Id: Iffd9af2ddf7626155d98caf086fe209600141585
uplayer/NuPlayerRenderer.cpp
3bc667014875aba35102941b3997d242c303aa0d 19-Nov-2015 Wei Jia <wjia@google.com> NuPlayerDecoder: add synchronous call pause() to ensure decoder will not request or send out data.

Bug: 25372978
Change-Id: Id66ab9b9961d5a3b9fb783ae73c27ed1c8054db8
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDecoderBase.cpp
uplayer/NuPlayerDecoderBase.h
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
10a121b2a3ea3334e1e3a2722b2a03833fb9a897 04-Nov-2015 Marco Nelissen <marcone@google.com> GenericSource: use sp<> instead of regular pointer.

Regular pointers have a tendency to go stale.

Bug: 25472775
Change-Id: I85fc152e11d11d2f29ba621e88ea314f56e7dd60
uplayer/GenericSource.cpp
74e0f3a620bd0cdfb153728e99a17a96ca3db0de 03-Nov-2015 Bill Yi <byi@google.com> Merge commit 'f71d2618532e73db5c01e3c00595d7d2ab2cff3e' into HEAD
23cba7d6b11ba47bd0408f84fb935c4d382fff59 30-Oct-2015 Erik Wolsheimer <ewol@google.com> fix deadlock in MediaPlayerService BUG: 25263909 am: 7845a1f079
am: 470b7752e3

* commit '470b7752e38307305365fdaaa005b81db977d708':
fix deadlock in MediaPlayerService BUG: 25263909
470b7752e38307305365fdaaa005b81db977d708 30-Oct-2015 Erik Wolsheimer <ewol@google.com> fix deadlock in MediaPlayerService BUG: 25263909
am: 7845a1f079

* commit '7845a1f0790a1de9e26e99578f6ce3219cf8efc3':
fix deadlock in MediaPlayerService BUG: 25263909
7845a1f0790a1de9e26e99578f6ce3219cf8efc3 30-Oct-2015 Erik Wolsheimer <ewol@google.com> fix deadlock in MediaPlayerService
BUG: 25263909

Change-Id: I3f08c02a851b67ab269e9aef7b2fb17eda09ea5d
ediaPlayerService.cpp
23c2590349009bc010eebe7cfcc12375143cd69e 30-Oct-2015 Ronghua Wu <ronghuawu@google.com> Merge "nuplayer: don\'t resume if player is reseting" am: c5ea4edcd4
am: c24b47c33d

* commit 'c24b47c33d9f250972a570a9ff22920f98d3c732':
nuplayer: don't resume if player is reseting
c24b47c33d9f250972a570a9ff22920f98d3c732 30-Oct-2015 Ronghua Wu <ronghuawu@google.com> Merge "nuplayer: don\'t resume if player is reseting"
am: c5ea4edcd4

* commit 'c5ea4edcd4326eaea78549e3d1ad5e4367e65f06':
nuplayer: don't resume if player is reseting
9a40167c3dc32fccc72abd96f03df6ea5676793b 28-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Extractor service"
b2487f03f12dcafdb801fc0007c8df8412397f44 01-Sep-2015 Marco Nelissen <marcone@google.com> Extractor service

Run extractors in a separate process. Currently all data is copied through a
binder transaction, and WVMExtractor is still run in the mediaserver process.

Change-Id: Ic5dbce87126dd321ad792f4dd540c2ff6b068d13
uplayer/GenericSource.cpp
uplayer/GenericSource.h
7350b057ca864f5dc9e53d48e34710a8e81133f8 02-Oct-2015 Robert Shih <robertshih@google.com> Don't re-scan sources if no new ones will appear

The only scenario we might need to re-scan is when switching between
bitrate variants in HTTPLiveSources.

Bug: 23313819
Change-Id: I892033c8698f985de74801c39ac5b5417ed19e89
uplayer/HTTPLiveSource.cpp
uplayer/NuPlayer.cpp
b75de9d4ba6725104342b5376a1047ff1c9b2765 08-Oct-2015 Ronghua Wu <ronghuawu@google.com> nuplayer: don't resume if player is reseting

Bug: 24712426
Change-Id: I58cca0bde708a5c3b073ed77e18b62fe81d6c017
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
8cf4ced8d25e9b1b56b69b544339acc1550e4038 06-Oct-2015 osamu fujita <osamu.x.fujita@sonymobile.com> Tuning the number of packets for one read in StreamingSource

Read performance in StreamingSource became worse from LMR1 because
the design was changed to asynchronous from synchronous.
As a result, the generation of access unit does not make it
in time for some multiplexed contents, and this causes frame drop.
This patch improves read performance by increasing the number of
packets for one read.

Change-Id: I14955da5a9c5415e35905cc95f1471e0811a4991
uplayer/StreamingSource.cpp
64c2d17111b5aebaee2592d9d17c56301bb3e1bc 08-Oct-2015 Ronghua Wu <ronghuawu@google.com> nuplayer: don't resume if player is reseting

Bug: 24712426
Change-Id: I58cca0bde708a5c3b073ed77e18b62fe81d6c017
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
4a8b99cf5d7754d0cad30ec376d2883efe078feb 26-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Play timed text even after 35.79 minutes" am: 66bee4de48 am: 7b65e85b6f
am: 02e3ed9de2

* commit '02e3ed9de28cc2f38edee12423dc36b3ef348a47':
Play timed text even after 35.79 minutes
02e3ed9de28cc2f38edee12423dc36b3ef348a47 26-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Play timed text even after 35.79 minutes" am: 66bee4de48
am: 7b65e85b6f

* commit '7b65e85b6f4fb063b5156c39e36c5e115e81d935':
Play timed text even after 35.79 minutes
7b65e85b6f4fb063b5156c39e36c5e115e81d935 26-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Play timed text even after 35.79 minutes"
am: 66bee4de48

* commit '66bee4de485d389d719a7dea03d73baa5380eacf':
Play timed text even after 35.79 minutes
24d484bab46ef8f9c95197afa064c941eb5fccba 27-Jan-2015 Patrik2 Carlsson <patrik2.carlsson@sonymobile.com> Play timed text even after 35.79 minutes

int overflow when converting current position in ms to Us

Change-Id: I12882e52ed1ac92644d601efae5c10ec25ae9e63
uplayer/NuPlayer.cpp
fd72a5b9e1b7d36d8afb116b8e08c28ad444c188 23-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 am: 92b6cd8da9 am: 7b5564e251
am: 000321c7ee

* commit '000321c7ee8c2a0e489d41b9a5f8bad93bdd89b2':
GenericSource: reset mDecryptHandle when mDataSource is cleared.
000321c7ee8c2a0e489d41b9a5f8bad93bdd89b2 22-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 am: 92b6cd8da9
am: 7b5564e251

* commit '7b5564e251680275d810b5c34b5d9a3caebff0fb':
GenericSource: reset mDecryptHandle when mDataSource is cleared.
92b6cd8da9052e17710945604cd45098ebfb25e0 22-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838
am: 313358c747

* commit '313358c747b54bbdcbff97636546e0304f6f4947':
GenericSource: reset mDecryptHandle when mDataSource is cleared.
313358c747b54bbdcbff97636546e0304f6f4947 22-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDecryptHandle when mDataSource is cleared.
am: 09c291c838

* commit '09c291c838bc74bb7c10c22f7232abb946cad8ff':
GenericSource: reset mDecryptHandle when mDataSource is cleared.
2f218cfd1f58624de6a90aae32a35eba78e8097b 22-Oct-2015 Wei Jia <wjia@google.com> Merge "GenericSource: reset mDecryptHandle when mDataSource is cleared." into mnc-dr-dev am: f8dc643316 am: 87494c6a68
am: 5357aa663e

* commit '5357aa663ed4467e830925a942021064374c0616':
GenericSource: reset mDecryptHandle when mDataSource is cleared.
5357aa663ed4467e830925a942021064374c0616 22-Oct-2015 Wei Jia <wjia@google.com> Merge "GenericSource: reset mDecryptHandle when mDataSource is cleared." into mnc-dr-dev am: f8dc643316
am: 87494c6a68

* commit '87494c6a687db0ec4e3436a9e73604f3cc9c9142':
GenericSource: reset mDecryptHandle when mDataSource is cleared.
09c291c838bc74bb7c10c22f7232abb946cad8ff 22-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDecryptHandle when mDataSource is cleared.

Bug: 25070434
Change-Id: Ib0eb6a419683a0e686a4f63b82e9300cb1f69484
(cherry picked from commit cdc9cf656a8e43875234cb021fffeb4792d7c74e)
uplayer/GenericSource.cpp
cdc9cf656a8e43875234cb021fffeb4792d7c74e 22-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDecryptHandle when mDataSource is cleared.

Bug: 25070434
Change-Id: Ib0eb6a419683a0e686a4f63b82e9300cb1f69484
uplayer/GenericSource.cpp
213f490215c2946edc2cc3f589219efe283d6548 22-Oct-2015 Wei Jia <wjia@google.com> MediaPlayerService: fix returned value for getPlayedOutDurationUs().

Change-Id: Id38c146cb43543c83b8378752027cc292cdbd17b
ediaPlayerService.cpp
ddb3d77dad1766708fdb18cc48e60a663ee8e2e1 21-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a am: e01ba47052
am: adadada4f0

* commit 'adadada4f00eaf44bbc616be7a7d30010750560e':
GenericSource: reset mDrmManagerClient when mDataSource is cleared.
adadada4f00eaf44bbc616be7a7d30010750560e 21-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a
am: e01ba47052

* commit 'e01ba470525155c1c36e53d242a12a778069a5bc':
GenericSource: reset mDrmManagerClient when mDataSource is cleared.
3fcddfd23adc88116c8fe5ea593626bfce0b75bd 21-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719
am: 69c8e36da7

* commit '69c8e36da7137730f4789a0d27d983b40d1f2917':
GenericSource: reset mDrmManagerClient when mDataSource is cleared.
69c8e36da7137730f4789a0d27d983b40d1f2917 21-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDrmManagerClient when mDataSource is cleared.
am: 224858e719

* commit '224858e719d045c8554856b12c4ab73d2375cf33':
GenericSource: reset mDrmManagerClient when mDataSource is cleared.
d855a738735a3df8863b486f5d3b5e404cef15c1 21-Oct-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: fix merge error.

Change-Id: I9cadabd4b5699a607fd5b22f8bd50f9203542b46
uplayer/NuPlayerRenderer.cpp
c4ac8173f911aeac8d5006b19ba48fb51a865115 21-Oct-2015 Wei Jia <wjia@google.com> AudioSink: move getPlayedOutAudioDurationUs() from NuPlayerRenderer to AudioSink.

Change-Id: Id22e10dc5f1cd7ade0e043ea56ed77497c2e32af
ediaPlayerService.cpp
ediaPlayerService.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
4ecbea3ae1fcefb082dc419cb663909536138ddb 21-Oct-2015 Wei Jia <wjia@google.com> MediaClock: prevent media time from going backwards.

Media Clock is started only when AudioSink has rendered some frames.

Bug: 25074321
Change-Id: Ic09fc666eed019e24f5b6a4b8929021eab87ca41
uplayer/NuPlayerRenderer.cpp
422bf879ed138202f7731d5f279c64af5af7da42 21-Oct-2015 Wei Jia <wjia@google.com> Merge "GenericSource: reset mDrmManagerClient when mDataSource is cleared." into mnc-dr-dev am: 7bfd9afefa am: 023815588c
am: 558f5c28c9

* commit '558f5c28c9a1e70dd9ef7ee2fbd33ef407a53de8':
GenericSource: reset mDrmManagerClient when mDataSource is cleared.
558f5c28c9a1e70dd9ef7ee2fbd33ef407a53de8 21-Oct-2015 Wei Jia <wjia@google.com> Merge "GenericSource: reset mDrmManagerClient when mDataSource is cleared." into mnc-dr-dev am: 7bfd9afefa
am: 023815588c

* commit '023815588cb8063caca1b2a26abdaa1e222f686e':
GenericSource: reset mDrmManagerClient when mDataSource is cleared.
224858e719d045c8554856b12c4ab73d2375cf33 20-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDrmManagerClient when mDataSource is cleared.

Bug: 25070434
Change-Id: Iade3472c496ac42456e42db35e402f7b66416f5b
(cherry picked from commit b41fd0d4929f0a89811bafcc4fd944b128f00ce2)
uplayer/GenericSource.cpp
12a841346158e6edad01e3601014058cfc0ca01d 21-Oct-2015 Andy Hung <hunga@google.com> Nuplayer: Fix playback for video only streams

Bug: 24146140
Change-Id: I58c72c74cfcffa66ea8dc5804bcfc5ba884cbab9
uplayer/NuPlayer.cpp
b41fd0d4929f0a89811bafcc4fd944b128f00ce2 20-Oct-2015 Wei Jia <wjia@google.com> GenericSource: reset mDrmManagerClient when mDataSource is cleared.

Bug: 25070434
Change-Id: Iade3472c496ac42456e42db35e402f7b66416f5b
uplayer/GenericSource.cpp
ec2a354b6d066156c1bd097650b230087f5cffe8 14-Oct-2015 Eric Laurent <elaurent@google.com> am c47396ef: am 2894d702: Merge "NuPlayerDecoder: report error in case of audio sink open error." into mnc-dr-dev

* commit 'c47396ef620e5cee8602bcb46a6d5a4369c9175b':
NuPlayerDecoder: report error in case of audio sink open error.
be99b0d5e29ba76fbb3748381a489edfc89ebdad 14-Oct-2015 Glenn Kasten <gkasten@google.com> am 3bf88c1f: am ce805c2a: Merge "NuPlayerRenderer: do not send rendering started message when paused" into mnc-dr-dev

* commit '3bf88c1f6349886234dafd4907a3d0eccc29184b':
NuPlayerRenderer: do not send rendering started message when paused
216f0177cbfa0d8e911d64fc17ccbb5100ad87b4 21-Aug-2015 Eric Laurent <elaurent@google.com> NuPlayerDecoder: report error in case of audio sink open error.

Bug: 21093153.
Change-Id: I77e03a620b43967991dcee9d6ca01f67c8b7a02e
(cherry picked from commit 15ce09dddf830d6a6ca097c5ec0a7ec7c35b6b3a)
uplayer/NuPlayerDecoder.cpp
a5b4642220b810d8f044171c7c05aed0597a1812 04-Sep-2015 Andy Hung <hunga@google.com> NuPlayerRenderer: do not send rendering started message when paused

Delay until resume.

Bug: 23669269
Change-Id: I0a805812d80b1aad561425442bca0fc05a05752f
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
cd375316692ca158b43a797b737c699bdbeaf149 14-Oct-2015 Wei Jia <wjia@google.com> am 9fd61065: am 106ceacb: NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed.

* commit '9fd61065f878c2813a86f30d7070e027efa09026':
NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed.
95c3a43ae474f327289670c8fc61a0ec003810af 14-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Don't send OnCompletion events when looping" into mnc-dr-dev
106ceacb404fc580984f882a0c17d61aed3aaf7b 08-Oct-2015 Wei Jia <wjia@google.com> NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed.

Bug: 24749881
Change-Id: I0d3a757262446ac702dfebd464d5e59f1a98eba8
(cherry picked from commit 3261f0db54e31e652af9bd3b76a8e85174f5ee87)
uplayer/NuPlayer.cpp
2d57a4c79a1ea94031bd5bcbf09bc4a36e754871 13-Oct-2015 Wei Jia <wjia@google.com> am 984142e0: am 780b766d: Merge "NuPlayerDriver: acquire mLock when needed." into mnc-dr-dev

* commit '984142e07345f5541a9605ac3938796883c10c27':
NuPlayerDriver: acquire mLock when needed.
780b766d823040e2d015529e5529c83a008442cc 13-Oct-2015 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: acquire mLock when needed." into mnc-dr-dev
3f6fe8512006905f584e6a9998e1707350c7a1e5 13-Oct-2015 Wei Jia <wjia@google.com> am 4e1095c6: am 1a825df7: Merge "NuPlayerRenderer: always update MediaClock with max media duration." into cw-e-dev

* commit '4e1095c67f144ac8b90170afae035fea57454d9d':
NuPlayerRenderer: always update MediaClock with max media duration.
842396584c80d352c9aa7ea249399102155df49b 06-Oct-2015 Wei Jia <wjia@google.com> NuPlayerDriver: acquire mLock when needed.

Bug: 24338126
Change-Id: Ic55d1a551c18255423423079b6c2bf045dea6e44
(cherry picked from commit f3631d2921ee0738f87427848e38873370ef9ec0)
uplayer/NuPlayerDriver.cpp
4e1095c67f144ac8b90170afae035fea57454d9d 13-Oct-2015 Wei Jia <wjia@google.com> am 1a825df7: Merge "NuPlayerRenderer: always update MediaClock with max media duration." into cw-e-dev

* commit '1a825df7d657ff70f356965140340e488e121033':
NuPlayerRenderer: always update MediaClock with max media duration.
492ccd6f03f83a72dcde6aa1674cc22fd45fc06e 13-Oct-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: always update MediaClock with max media duration.

Bug: 24345295
Change-Id: I868c9c44ea22de98a083432262e485d0f134203f
(cherry picked from commit d005c5ddb4842369979df7b76f1d0f5f1380fcd9)
uplayer/NuPlayerRenderer.cpp
b345ddc3c728359166375af6f19367f547bbd613 08-Oct-2015 Marco Nelissen <marcone@google.com> Don't send OnCompletion events when looping

AwesomePlayer never did, and neither should NuPlayer.

Bug: 18656047
Change-Id: Ia9abe42cfe6ea643633cec859e9da770092569bb
uplayer/NuPlayerDriver.cpp
d005c5ddb4842369979df7b76f1d0f5f1380fcd9 13-Oct-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: always update MediaClock with max media duration.

Bug: 24345295
Change-Id: I868c9c44ea22de98a083432262e485d0f134203f
uplayer/NuPlayerRenderer.cpp
3809d9ee895ecd3366fa6c4c532c0ac5930d2a6f 09-Oct-2015 Marco Nelissen <marcone@google.com> am a8d731c3: am 185c1347: am 69f26226: Merge "Don\'t send OnCompletion events when looping"

* commit 'a8d731c34e9c414d8ed3517985dfda405ba7e3c1':
Don't send OnCompletion events when looping
185c134768b418dbc6c19c9a0ee75f6dc2a95bb4 09-Oct-2015 Marco Nelissen <marcone@google.com> am 69f26226: Merge "Don\'t send OnCompletion events when looping"

* commit '69f262267cede8b34022deae67336f705bebfcf2':
Don't send OnCompletion events when looping
3261f0db54e31e652af9bd3b76a8e85174f5ee87 08-Oct-2015 Wei Jia <wjia@google.com> NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed.

Bug: 24749881
Change-Id: I0d3a757262446ac702dfebd464d5e59f1a98eba8
uplayer/NuPlayer.cpp
0e4bd4db6072472de7b7fca7c91f8ac854b2d24c 08-Oct-2015 Marco Nelissen <marcone@google.com> Don't send OnCompletion events when looping

AwesomePlayer never did, and neither should NuPlayer.

Bug: 18656047
Change-Id: Ia9abe42cfe6ea643633cec859e9da770092569bb
uplayer/NuPlayerDriver.cpp
d008275796ac4cccf85fefce53cef733a49bc1fa 31-Aug-2015 Wonsik Kim <wonsik@google.com> Implement pause/resume functionality to MediaRecorder

Bug: 20092236
Change-Id: Ia0e92ff246302fd5fdef53c4f961d6645cc26a86
ediaRecorderClient.cpp
ediaRecorderClient.h
tagefrightRecorder.cpp
tagefrightRecorder.h
09878a6d0581f6e49c4ee481ddc798961198dbcd 06-Oct-2015 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: acquire mLock when needed."
f3631d2921ee0738f87427848e38873370ef9ec0 06-Oct-2015 Wei Jia <wjia@google.com> NuPlayerDriver: acquire mLock when needed.

Bug: 24338126
Change-Id: Ic55d1a551c18255423423079b6c2bf045dea6e44
uplayer/NuPlayerDriver.cpp
f7810a759621a8b26751fac5a23d2d0000a75358 23-Sep-2015 Dan Austin <danielaustin@google.com> am 3dab1a3a: am b5213840: am 7cac3edc: Merge "libstagefright : fix the bug of wrong value setting for slice-height"

* commit '3dab1a3a367e18a987611947fccbf7f02870de2f':
libstagefright : fix the bug of wrong value setting for slice-height
3dab1a3a367e18a987611947fccbf7f02870de2f 23-Sep-2015 Dan Austin <danielaustin@google.com> am b5213840: am 7cac3edc: Merge "libstagefright : fix the bug of wrong value setting for slice-height"

* commit 'b5213840103ae1ce3425a6db3d851fce5f767889':
libstagefright : fix the bug of wrong value setting for slice-height
b5213840103ae1ce3425a6db3d851fce5f767889 23-Sep-2015 Dan Austin <danielaustin@google.com> am 7cac3edc: Merge "libstagefright : fix the bug of wrong value setting for slice-height"

* commit '7cac3edc679c9d3f88268c2f5a83cba1333e20e5':
libstagefright : fix the bug of wrong value setting for slice-height
e62ba9cce4631737e38db1b0d8a7a64ee81cc397 23-Sep-2015 xrwu <xellos.1983@gmail.com> libstagefright : fix the bug of wrong value setting for slice-height

Change-Id: I2ad0fa6039fb3b31e7dbfdcf15be4703664da04d
Signed-off-by: xrwu <xellos.1983@gmail.com>
tagefrightRecorder.cpp
83b0fd9997b558f6c2ebf5e6e4db20570cb233b8 16-Sep-2015 Marco Nelissen <marcone@google.com> Optionally print name for fd

Add utility function to get the file name for a file descriptor,
and use it in various places.

Change-Id: I196b557a56d5ef0ef89e2020aab2699eafae61b0
ediaPlayerService.cpp
etadataRetrieverClient.cpp
cfdee882d2633301b5fbd4c52fed3152551c8f00 15-Sep-2015 Andy Hung <hunga@google.com> am 08f59877: am 82b34505: Merge "NuPlayerRenderer: Do not drain audio during teardown" into mnc-dr-dev

* commit '08f59877f2eea42739817f9eee5eeb9759154f55':
NuPlayerRenderer: Do not drain audio during teardown
82b34505323c095c800f6620a09fd58a17016699 15-Sep-2015 Andy Hung <hunga@google.com> Merge "NuPlayerRenderer: Do not drain audio during teardown" into mnc-dr-dev
9436e48eed5e9be6b98ec6eb7df43845fc781a44 15-Sep-2015 Marco Nelissen <marcone@google.com> Fix the fix

AMessage::find* returns a bool, not a status_t

Change-Id: I89a56181f088881de215e8e79843637eb1b7e8ff
uplayer/NuPlayer.cpp
c367ca1762278277fb7a7d1156ce6e193ab524a3 15-Sep-2015 Marco Nelissen <marcone@google.com> Fix a few potential crashes

Change-Id: Ib7bdfc1d5fff928570e4fec3f3d4e175f9656dd3
uplayer/GenericSource.cpp
uplayer/NuPlayer.cpp
5a965bb113c6c57dd381ea4d44272ad2789f6428 15-Sep-2015 Andy Hung <hunga@google.com> Merge "NuPlayerRenderer: Do not drain audio during teardown"
58d315cae745aae2c87eb3e7cac2da5e25a57d4c 12-Sep-2015 Andy Hung <hunga@google.com> NuPlayerRenderer: Do not drain audio during teardown

Bug: 23748678
Change-Id: I8b65786f25f4524e5e2e9476ecc2a4f4ab3aea9e
uplayer/NuPlayerRenderer.cpp
b12ea0bbda453769584efcea69054b41d9b4c4c7 04-Sep-2015 Andy Hung <hunga@google.com> NuPlayerRenderer: do not send rendering started message when paused

Delay until resume.

Bug: 23669269
Change-Id: I0a805812d80b1aad561425442bca0fc05a05752f
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
421977ae5117403dd481424fab48850d31f239e8 14-Sep-2015 Wonsik Kim <wonsik@google.com> am c53328a5: am 67f36a8e: resolved conflicts for 76b704e3 to lmp-mr1-dev

* commit 'c53328a55427224dd42534d2b500728e38a83ca2':
DO NOT MERGE: Protect data source access with mutex during disconnect
67f36a8e6130f5c22ab177b0d29f5705e86daca2 14-Sep-2015 Wonsik Kim <wonsik@google.com> resolved conflicts for 76b704e3 to lmp-mr1-dev

Change-Id: I843f6b4080b06581c52683ab4af5261e974cd7af
463201eea7f2d0785e277c219ae3692816627a81 14-Sep-2015 Andy Hung <hunga@google.com> am 1e207a51: am f5eb7c6f: Merge "NuPlayerRenderer: Do not deliver audio too soon after stop" into mnc-dr-dev

* commit '1e207a51d248631c674f1a63153f4a7101de135f':
NuPlayerRenderer: Do not deliver audio too soon after stop
f5eb7c6fa2f6acb0fb19df9809d409f21e04ca4c 14-Sep-2015 Andy Hung <hunga@google.com> Merge "NuPlayerRenderer: Do not deliver audio too soon after stop" into mnc-dr-dev
76b704e3872a7e17362c398e7b898b0d635e0f2d 12-Sep-2015 Robert Shih <robertshih@google.com> am f3eb8268: DO NOT MERGE: Protect data source access with mutex during disconnect

* commit 'f3eb82683a80341f5ac23057aab733a57963cab2':
DO NOT MERGE: Protect data source access with mutex during disconnect
3f5ff68327b1df21196f18a020aec474a0dd95fe 12-Sep-2015 Andy Hung <hunga@google.com> NuPlayerRenderer: Do not drain audio during teardown

Bug: 23748678
Change-Id: I8b65786f25f4524e5e2e9476ecc2a4f4ab3aea9e
uplayer/NuPlayerRenderer.cpp
b06a77e2968ec5cf5d116f7cd633afc1fe065ae6 09-Sep-2015 Marco Nelissen <marcone@google.com> Merge "Make NuPlayer send global timed text info too"
d64cb2256c3daae1147e25d0ff168f8a71f9edb7 09-Sep-2015 Robert Shih <robertshih@google.com> am 27e0350a: am b946648c: Protect data source access with mutex during disconnect

* commit '27e0350ae57184d5e300f96c8338379f5d3d0fbc':
Protect data source access with mutex during disconnect
27e0350ae57184d5e300f96c8338379f5d3d0fbc 09-Sep-2015 Robert Shih <robertshih@google.com> am b946648c: Protect data source access with mutex during disconnect

* commit 'b946648cc63a4d328318b56215214ead575bc54a':
Protect data source access with mutex during disconnect
f3eb82683a80341f5ac23057aab733a57963cab2 02-Sep-2015 Robert Shih <robertshih@google.com> DO NOT MERGE: Protect data source access with mutex during disconnect

Bug: 23658148
Change-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd
uplayer/GenericSource.cpp
uplayer/GenericSource.h
b946648cc63a4d328318b56215214ead575bc54a 02-Sep-2015 Robert Shih <robertshih@google.com> Protect data source access with mutex during disconnect

Bug: 23658148
Change-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd
uplayer/GenericSource.cpp
uplayer/GenericSource.h
55e2f4ca5bb23ce32fbdd627b0f648c27106b98e 05-Sep-2015 Marco Nelissen <marcone@google.com> Make NuPlayer send global timed text info too

For feature parity with AwesomePlayer. Also add a small hack to
AwesomePlayer to make timed text track selection work again, so
the timed text CTS test can run with both AwesomePlayer and NuPlayer

Change-Id: I1be451c4b3191cae65bc46b3b721a1924b4fadc8
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
b669b18d7fee8f7ba1ff64681b4869ac648f0d8f 04-Sep-2015 Robert Shih <robertshih@google.com> Merge "Protect data source access with mutex during disconnect"
0386c91b8a910a134e5898ffa924c1b6c7560b13 28-Aug-2015 Wei Jia <wjia@google.com> MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

GenericSource: return error when no track exists.

SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor.

Bug: 21657957
Bug: 23705695
Bug: 22802344
Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04
uplayer/GenericSource.cpp
ebc2712d5e8a66f8d6652e7cc7fb14cdbec7f235 02-Sep-2015 Robert Shih <robertshih@google.com> Protect data source access with mutex during disconnect

Bug: 23658148
Change-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd
uplayer/GenericSource.cpp
uplayer/GenericSource.h
360df70a479a4992ea64c0f72dd464c8767620f8 03-Sep-2015 Wei Jia <wjia@google.com> am 4b0d70df: am 084b0de5: Merge "NuPlayerRenderer: avoid divison by zero when sample rate is 0." into mnc-dr-dev

* commit '4b0d70df1f3021c10ae640cb0df7497a19f4f338':
NuPlayerRenderer: avoid divison by zero when sample rate is 0.
1947550866d9edbb2d5aed8394a520803ca8ec43 03-Sep-2015 Ronghua Wu <ronghuawu@google.com> am 1e9f2979: am cfb252cd: Merge "nuplayer: let non-offload AudioSink to handle the reconnect when there\'s video." into mnc-dr-dev

* commit '1e9f29799a593f829e476ee3fb09956440dfd8a0':
nuplayer: let non-offload AudioSink to handle the reconnect when there's video.
4b0d70df1f3021c10ae640cb0df7497a19f4f338 03-Sep-2015 Wei Jia <wjia@google.com> am 084b0de5: Merge "NuPlayerRenderer: avoid divison by zero when sample rate is 0." into mnc-dr-dev

* commit '084b0de52d58db518aa8b6b2d9c42031e75ad32a':
NuPlayerRenderer: avoid divison by zero when sample rate is 0.
1e9f29799a593f829e476ee3fb09956440dfd8a0 03-Sep-2015 Ronghua Wu <ronghuawu@google.com> am cfb252cd: Merge "nuplayer: let non-offload AudioSink to handle the reconnect when there\'s video." into mnc-dr-dev

* commit 'cfb252cdb748429789f918c4268fcca1331f6cec':
nuplayer: let non-offload AudioSink to handle the reconnect when there's video.
4d7ac854c5a45d0e3af3d0af78b5a8c9807cbec6 01-Sep-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: avoid divison by zero when sample rate is 0.

Also close AudioSink when failing to set playback rate.

Bug: 23624664
Change-Id: I5bf8bcca4a21c26fb52821db597d61f7f1273d5c
uplayer/NuPlayerRenderer.cpp
7665f5886093e1aee07a5266b8c384e5d1186f34 02-Sep-2015 Ronghua Wu <ronghuawu@google.com> nuplayer: let non-offload AudioSink to handle the reconnect when there's video.

Bug: 23707144
Change-Id: Ie0e2db8dc91a78f82fb935d165aa11abe73697a3
uplayer/NuPlayerRenderer.cpp
7d05308b16a688436331de2e94d89e46d05d8d1d 28-Aug-2015 Andy Hung <hunga@google.com> NuPlayerRenderer: Do not deliver audio too soon after stop

For non-offloaded audio, do not deliver audio data too soon after stop
when in paused mode. Otherwise the audio MixerThread will keep the
track playing, instead of inactivating the track.

Bug: 23167401
Change-Id: If376148c742fde2d20dc5d23bf0b894fe378e71a
(cherry picked from commit b03dcb34cd44d77e5fe1559e72323e03c59931db)
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
b7b23d3cf474e4a34e3609cbe96337cdb71d4cf0 01-Sep-2015 Andy Hung <hunga@google.com> Merge "NuPlayerRenderer: Do not deliver audio too soon after stop"
7c8d0e0a896eb736ca4cec7fb796704a3c14ab66 28-Aug-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: discard delayed audio EOS notification when renderer being flushed.

Bug: 23226641
Change-Id: I21fc7b8fd66ceefe70b110987e472f035198d1ae
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
b03dcb34cd44d77e5fe1559e72323e03c59931db 28-Aug-2015 Andy Hung <hunga@google.com> NuPlayerRenderer: Do not deliver audio too soon after stop

For non-offloaded audio, do not deliver audio data too soon after stop
when in paused mode. Otherwise the audio MixerThread will keep the
track playing, instead of inactivating the track.

Bug: 23167401
Change-Id: If376148c742fde2d20dc5d23bf0b894fe378e71a
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
03753ecd014ca07846e43f547570be1244af6d34 28-Aug-2015 Wei Jia <wjia@google.com> am a3610be1: am 08723d86: am 5d76e54d: Merge "NuPlayer: do not create audio decoder if the player is still in shutdown process." into mnc-dev

* commit 'a3610be12d03da21dcb5e6ed36b98db9d0e4d692':
NuPlayer: do not create audio decoder if the player is still in shutdown process.
a3610be12d03da21dcb5e6ed36b98db9d0e4d692 28-Aug-2015 Wei Jia <wjia@google.com> am 08723d86: am 5d76e54d: Merge "NuPlayer: do not create audio decoder if the player is still in shutdown process." into mnc-dev

* commit '08723d86e9921a3eacca77c79c50839d40ee4f33':
NuPlayer: do not create audio decoder if the player is still in shutdown process.
08723d86e9921a3eacca77c79c50839d40ee4f33 28-Aug-2015 Wei Jia <wjia@google.com> am 5d76e54d: Merge "NuPlayer: do not create audio decoder if the player is still in shutdown process." into mnc-dev

* commit '5d76e54d2f3b02b52be035e37681fde0caf15eaa':
NuPlayer: do not create audio decoder if the player is still in shutdown process.
59e8aba76f09319ede3d173db66739461a7f8d54 28-Aug-2015 Eric Laurent <elaurent@google.com> am fcce691b: am 945d3ba7: Merge "AudioSink: Fix for gapless offload playback" into mnc-dr-dev

* commit 'fcce691b9741fd8b7860645c99db4158d1cbbd92':
AudioSink: Fix for gapless offload playback
fcce691b9741fd8b7860645c99db4158d1cbbd92 28-Aug-2015 Eric Laurent <elaurent@google.com> am 945d3ba7: Merge "AudioSink: Fix for gapless offload playback" into mnc-dr-dev

* commit '945d3ba77cd13061e034301b35ce308b0d926353':
AudioSink: Fix for gapless offload playback
566da808857c2c26e191ce18aba5abe97746fe1a 27-Aug-2015 Wei Jia <wjia@google.com> NuPlayer: do not create audio decoder if the player is still in shutdown process.

Bug: 23350795
Change-Id: I46b02cf31d7d4447806910a9ecd8c3bda05f2f5b
uplayer/NuPlayer.cpp
f3c2b3df8bf616ad593e2c0101b04a718f291827 06-Aug-2015 Wei Jia <wjia@google.com> NuPlayerDriver: log more info for existing lines.

Change-Id: Ibab966e564aa5d5b84841e8769c0ebe46caa2d9c
uplayer/NuPlayerDriver.cpp
2e17eef829f1870d9bde963a356dfb11f120a6b5 12-Aug-2015 Preetam Singh Ranawat <apranawat@codeaurora.org> AudioSink: Fix for gapless offload playback

Gapless mode is not working for offload playback due to mismatch
in flags of current track and next track to be played.

AUDIO_OUTPUT_FLAG_DIRECT is added in AudioTrack flags for current track
which does not match exactly with requested flags for next track.
Because of this mismatch, reuse of the AudioTrack is not allowed.

To fix this, update audio sink flags with requested flags and use
track flags only to setPlaybackRate if AUDIO_OUTPUT_FLAG_DIRECT flag
is not set.

Bug: 23221273

authored-by: Preetam Singh Ranawat <apranawat@codeaurora.org>

Change-Id: I52761ccd854b66a7bc218e83c9b44598771c46f7
ediaPlayerService.cpp
15ce09dddf830d6a6ca097c5ec0a7ec7c35b6b3a 21-Aug-2015 Eric Laurent <elaurent@google.com> NuPlayerDecoder: report error in case of audio sink open error.

Bug: 21093153.
Change-Id: I77e03a620b43967991dcee9d6ca01f67c8b7a02e
uplayer/NuPlayerDecoder.cpp
2b355c2063fa89a50c5fd463c00a47633dfee56b 18-Aug-2015 Eric Laurent <elaurent@google.com> am 6ee9b57b: am dd6a1764: am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev

* commit '6ee9b57b06a40e2490911cd390e8528eda0b21c5':
NuPlayerRenderer: handle error when resuming an offloaded track
6ee9b57b06a40e2490911cd390e8528eda0b21c5 18-Aug-2015 Eric Laurent <elaurent@google.com> am dd6a1764: am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev

* commit 'dd6a17649106fd48b0e69703d339bbc5a1ae9a0b':
NuPlayerRenderer: handle error when resuming an offloaded track
7a64655ba604993a6724b4a8ab09ed743bc40ec8 18-Aug-2015 Eric Laurent <elaurent@google.com> am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev

* commit 'c08872f977fc52c015cc17438dd3bd7981dfc0dc':
NuPlayerRenderer: handle error when resuming an offloaded track
dd6a17649106fd48b0e69703d339bbc5a1ae9a0b 18-Aug-2015 Eric Laurent <elaurent@google.com> am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev

* commit 'c08872f977fc52c015cc17438dd3bd7981dfc0dc':
NuPlayerRenderer: handle error when resuming an offloaded track
3f37eb27745f9581292fb2f214773f6fcafb21f1 14-Aug-2015 Robert Shih <robertshih@google.com> am 11787971: am f33a302f: Merge "RTSPSource::pause mHandler NULL check" into mnc-dr-dev

* commit '117879713fbe181e8fa251ff7637a4599bce844c':
RTSPSource::pause mHandler NULL check
117879713fbe181e8fa251ff7637a4599bce844c 14-Aug-2015 Robert Shih <robertshih@google.com> am f33a302f: Merge "RTSPSource::pause mHandler NULL check" into mnc-dr-dev

* commit 'f33a302f112f19503e842cacfea1492ae81796b0':
RTSPSource::pause mHandler NULL check
f33a302f112f19503e842cacfea1492ae81796b0 14-Aug-2015 Robert Shih <robertshih@google.com> Merge "RTSPSource::pause mHandler NULL check" into mnc-dr-dev
6d3cd2e22c73e5b554a2c4e34d51616f8737e571 13-Aug-2015 Robert Shih <robertshih@google.com> RTSPSource::pause mHandler NULL check

Bug: 23151568
Change-Id: I2dba3e7388b1b84b8b762dbc82c8e5330a158d97
uplayer/RTSPSource.cpp
6beba4feba12a7b947f0fac01248e07be362b58e 13-Aug-2015 Elliott Hughes <enh@google.com> am f9e3617a: resolved conflicts for merge of ab3df6d8 to mnc-dr-dev-plus-aosp

* commit 'f9e3617a4cc035446329be45f8b078dd917c7388':
frameworks/av doesn't need to support the long-dead simulator.
f9e3617a4cc035446329be45f8b078dd917c7388 13-Aug-2015 Elliott Hughes <enh@google.com> resolved conflicts for merge of ab3df6d8 to mnc-dr-dev-plus-aosp

Change-Id: I2f6ef2d43275739d24ad8b79270f18e374d88e55
08fd70bff164361f613e8115fab78b9127d117b3 13-Aug-2015 Elliott Hughes <enh@google.com> resolved conflicts for merge of ab3df6d8 to mnc-dev-plus-aosp

Change-Id: Ib1399fd4f7b02ef064a0c29ad3056296bed4e267
ab3df6d8a0ddda175dcafc6b3007f399b8f3a8bb 13-Aug-2015 Elliott Hughes <enh@google.com> am f4716c59: Merge "frameworks/av doesn\'t need to support the long-dead simulator."

* commit 'f4716c59aa5eda29920ba718e8872c9ba20b4d28':
frameworks/av doesn't need to support the long-dead simulator.
308f3927dee3861586c17df267265ae0c86d79f7 12-Aug-2015 Elliott Hughes <enh@google.com> frameworks/av doesn't need to support the long-dead simulator.

Change-Id: I43678ee1da57e7f42670f6042b2acc14db50d750
rm.cpp
ediaPlayerService.cpp
ediaRecorderClient.cpp
97c9f4fd7bc31e2968d816402659ba1c64f10b42 12-Aug-2015 Eric Laurent <elaurent@google.com> NuPlayerRenderer: handle error when resuming an offloaded track

Make sure that an offloaded audio track is torn down if
start() returns an error in onResume().
This makes sure that a track invalidated due to a potential
audio path change while paused is re created on the correct
output.

Bug: 22256441.
Change-Id: I6c7bfec6e7322415daffc0451bab46d0c558522a
uplayer/NuPlayerRenderer.cpp
4fd29c293f30d54c8740ac097b9d159781228c3e 11-Aug-2015 Wei Jia <wjia@google.com> am 4d9e6d1b: am a3474637: am 9195d57f: Merge "NuPlayer: set video surface directly when NuPlayer has not started yet." into mnc-dev

* commit '4d9e6d1b8455ecd174a85257950ee9d787ac9fa6':
NuPlayer: set video surface directly when NuPlayer has not started yet.
4d9e6d1b8455ecd174a85257950ee9d787ac9fa6 11-Aug-2015 Wei Jia <wjia@google.com> am a3474637: am 9195d57f: Merge "NuPlayer: set video surface directly when NuPlayer has not started yet." into mnc-dev

* commit 'a3474637353226e0649016e1a0ec0e5ca4660918':
NuPlayer: set video surface directly when NuPlayer has not started yet.
71a1f3c9d1f7d643ae20b1f7a35210813b3fe694 11-Aug-2015 Wei Jia <wjia@google.com> am 9195d57f: Merge "NuPlayer: set video surface directly when NuPlayer has not started yet." into mnc-dev

* commit '9195d57f3e6cf5339531944469293e1188a7947f':
NuPlayer: set video surface directly when NuPlayer has not started yet.
6b7d2ed40c4e7f7bac824c44795e2cd83459844c 11-Aug-2015 Wei Jia <wjia@google.com> NuPlayer: set video surface directly when NuPlayer has not started yet.

Bug: 22119956
Change-Id: Ie174f4fc495ab8418993ff7887aaa6ae721c6008
uplayer/NuPlayer.cpp
e3afbff71f399ea8ae7832e37edd151d9f9204c6 06-Aug-2015 Robert Shih <robertshih@google.com> am 79355de9: am 27b71aa7: Merge "NuPlayer:seek handling on kWhatAudioTearDown" into mnc-dev

* commit '79355de939e57dcb7eab8e923bb388691c50c58e':
NuPlayer:seek handling on kWhatAudioTearDown
79355de939e57dcb7eab8e923bb388691c50c58e 06-Aug-2015 Robert Shih <robertshih@google.com> am 27b71aa7: Merge "NuPlayer:seek handling on kWhatAudioTearDown" into mnc-dev

* commit '27b71aa74b6ddfb45a5508dcaa90c5065a12500b':
NuPlayer:seek handling on kWhatAudioTearDown
e5b7292d1db8c4cd01f9515e7018d97424684650 05-Aug-2015 Robert Shih <robertshih@google.com> am 27b71aa7: Merge "NuPlayer:seek handling on kWhatAudioTearDown" into mnc-dev

* commit '27b71aa74b6ddfb45a5508dcaa90c5065a12500b':
NuPlayer:seek handling on kWhatAudioTearDown
27b71aa74b6ddfb45a5508dcaa90c5065a12500b 05-Aug-2015 Robert Shih <robertshih@google.com> Merge "NuPlayer:seek handling on kWhatAudioTearDown" into mnc-dev
1a5c859016e743779e4db25855390b3ce523cd48 05-Aug-2015 Robert Shih <robertshih@google.com> NuPlayer:seek handling on kWhatAudioTearDown

Restart from previous seek time on kWhatAudioTearDown if mRenderer
didn't supply a useful positionUs.

Bug: 22662968
Change-Id: Ic21957f676ba25fb92694f71093bed60b630390b
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerRenderer.cpp
8f4c4c964fd247747789daa0166d814b5425c45f 30-Jul-2015 Lajos Molnar <lajos@google.com> am 014e6f52: am c20cf8b5: Merge "stagefright: disable automatic experiments" into mnc-dev

* commit '014e6f52719d05acc988ad5623b5228e7b374ca7':
stagefright: disable automatic experiments
014e6f52719d05acc988ad5623b5228e7b374ca7 30-Jul-2015 Lajos Molnar <lajos@google.com> am c20cf8b5: Merge "stagefright: disable automatic experiments" into mnc-dev

* commit 'c20cf8b58b75ab6d5775af14e1b0773b3e580334':
stagefright: disable automatic experiments
5798be0b1c5d8b909c1f91c3fd1bb28b5ac4ffeb 30-Jul-2015 Lajos Molnar <lajos@google.com> am c20cf8b5: Merge "stagefright: disable automatic experiments" into mnc-dev

* commit 'c20cf8b58b75ab6d5775af14e1b0773b3e580334':
stagefright: disable automatic experiments
2995dc7afc23e42478969bf567aa3435f4d3b54d 25-Jul-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: allow video to update media clock when audio reaches EOS.

Bug: 22769545

Change-Id: I417f00a16bd7859a09eeb44d57ea426cc35dc4a4
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
7c3c275b4d0100eec36f7b66637a7aace7971466 29-Jul-2015 Lajos Molnar <lajos@google.com> stagefright: disable automatic experiments

allow manually-enabled experiments only in eng and userdebug builds

Bug: 20894667
Change-Id: Ie6c93e9482a84ed3aaf6aa0abd909f14cfea4e9b
uplayer/Android.mk
98e7ece3fcea7d95620049a69df08140f59ba3b8 24-Jul-2015 Shivaprasad Hongal <shongal@codeaurora.org> nuplayer: Fix incorrect audio resume time during seek

GenericSource uses the timestamp of last video buffer
read in readBuffer() to seek audio, due to which audio
starts at a later position leading to frame drops.

Add change to use the first video sample timestamp
to seek audio

Bug: 22770523

CRs-Fixed: 780094
Author: Xavier Varricatt <xvarrica@codeaurora.org>
Change-Id: I5f2061e67994a3a0330b527bd3164ee04ed04005
uplayer/GenericSource.cpp
1628b3760f0cae69046b61b37fb9bb238ec62f79 25-Jul-2015 Robert Shih <robertshih@google.com> am 6134ad6f: Merge "NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio" into mnc-dev

* commit '6134ad6fdeab91e54a1abc8f00eafc956e42fb3d':
NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio
c88c56046d055c949c48e381cf6ea505ff85da24 25-Jul-2015 Robert Shih <robertshih@google.com> am 6134ad6f: Merge "NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio" into mnc-dev

* commit '6134ad6fdeab91e54a1abc8f00eafc956e42fb3d':
NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio
6134ad6fdeab91e54a1abc8f00eafc956e42fb3d 25-Jul-2015 Robert Shih <robertshih@google.com> Merge "NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio" into mnc-dev
f18cce444091d40386fce32ebfdf6b130d07b131 24-Jul-2015 Jeff Tinker <jtinker@google.com> am ef4cd0a4: am d3831760: DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance

* commit 'ef4cd0a439d30b6b6fdfc5ad78a842422e091331':
DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance
9a89ceebd3a76d20ddfdbb127066b7d66fc48b96 24-Jul-2015 Ricardo Garcia <rago@google.com> am 31df62ab: Merge "MediaPlayerService: prevent audio_attributes_t race conditions" into mnc-dev

* commit '31df62abf1b1bd45b217f6de7f6ffb503a885b95':
MediaPlayerService: prevent audio_attributes_t race conditions
70f055f12f9321a32c2d11d7fddf2a93eecf9627 24-Jul-2015 Ricardo Garcia <rago@google.com> am 31df62ab: Merge "MediaPlayerService: prevent audio_attributes_t race conditions" into mnc-dev

* commit '31df62abf1b1bd45b217f6de7f6ffb503a885b95':
MediaPlayerService: prevent audio_attributes_t race conditions
e1d701902765c710398133025cfeee3ea8b6d280 24-Jul-2015 Robert Shih <robertshih@google.com> NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio

Bug: 22662910
Change-Id: I8fb4a9fce801295a4b251e27965aef048d217da6
uplayer/NuPlayer.cpp
uplayer/NuPlayerRenderer.cpp
2650e9661ea1608dfb6b58bc640a66cdbbb6ae58 23-Jul-2015 Jean-Michel Trivi <jmtrivi@google.com> MediaPlayerService: prevent audio_attributes_t race conditions

Access to audio attributes fields in Client and AudioOutput
was not always locked.
Audio attributes field in AudioOutput cannot share the same pointer
as Client because it can be indepently accessed. Save the
attributes inside AudioOutput instead.

Bug 22672670

Change-Id: Ib1002b57b45cea44ff5e6eb115d581dc3beec006
ediaPlayerService.cpp
ediaPlayerService.h
66f1d3f01eb4d745e4abd3b96eca961e200efc3f 23-Jul-2015 Ronghua Wu <ronghuawu@google.com> am f87d8341: Merge "libmediaplayerservice: propagate caller pid to MediaCodec." into mnc-dev

* commit 'f87d8341df3445fb4931a39deec2ec1d00c30918':
libmediaplayerservice: propagate caller pid to MediaCodec.
d383176062362947455866af831d7db6ab085361 23-Apr-2015 Jeff Tinker <jtinker@google.com> DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance

Bug: 22414321

Change-Id: I062c662a440a1becccd248c3b8ddf711c51e53cc
related-to-bug: 18394494
related-to-bug: 19664283
(cherry picked from commit 2fb561a6fe9bca79c50a81e90fc4bb4eb18af0be)
rm.cpp
rm.h
df7dacfcf4f7b2feeb96f6af3542064714f1a33c 22-Jul-2015 Ronghua Wu <ronghuawu@google.com> am f87d8341: Merge "libmediaplayerservice: propagate caller pid to MediaCodec." into mnc-dev

* commit 'f87d8341df3445fb4931a39deec2ec1d00c30918':
libmediaplayerservice: propagate caller pid to MediaCodec.
68845c14ebf2c7282800b1abffde38d8e9a57aab 21-Jul-2015 Ronghua Wu <ronghuawu@google.com> libmediaplayerservice: propagate caller pid to MediaCodec.

Bug: 22630317
Change-Id: I0337d74f4ef04bf96f2de83f33d98d0d7da47c12
ediaPlayerFactory.cpp
ediaPlayerFactory.h
ediaPlayerService.cpp
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
2d94132330acf97581c38faa6e9f6ea3710879ef 18-Jul-2015 Chong Zhang <chz@google.com> am dd761ece: Merge "MediaRecorder: enable audio for slow motion recording" into mnc-dev

* commit 'dd761ecee86cc24ac8774bf1f004ea29b1e0d3f7':
MediaRecorder: enable audio for slow motion recording
0966f665cb30eaf50d9e329f0222359019b1b4fb 17-Jul-2015 Chong Zhang <chz@google.com> am dd761ece: Merge "MediaRecorder: enable audio for slow motion recording" into mnc-dev

* commit 'dd761ecee86cc24ac8774bf1f004ea29b1e0d3f7':
MediaRecorder: enable audio for slow motion recording
dd761ecee86cc24ac8774bf1f004ea29b1e0d3f7 17-Jul-2015 Chong Zhang <chz@google.com> Merge "MediaRecorder: enable audio for slow motion recording" into mnc-dev
46d26dd29195450db15704e84d65740628a821fb 16-Jul-2015 Chong Zhang <chz@google.com> MediaRecorder: enable audio for slow motion recording

bug:22460747

Change-Id: I23f773ecf7b86928a8eacd25a481636e645affbe
tagefrightRecorder.cpp
tagefrightRecorder.h
489aaa45dd1be0f5261001e583088815f5706932 17-Jul-2015 Robert Shih <robertshih@google.com> am 9febc8a6: Merge "RTSP: clear data/eos status before returning from seek" into mnc-dev

* commit '9febc8a664d25eaa699134682aa455ab4d7f62a2':
RTSP: clear data/eos status before returning from seek
fbfdd2c4ba0bed13b989c6d3850b754def91f4db 17-Jul-2015 Robert Shih <robertshih@google.com> am 9febc8a6: Merge "RTSP: clear data/eos status before returning from seek" into mnc-dev

* commit '9febc8a664d25eaa699134682aa455ab4d7f62a2':
RTSP: clear data/eos status before returning from seek
9febc8a664d25eaa699134682aa455ab4d7f62a2 17-Jul-2015 Robert Shih <robertshih@google.com> Merge "RTSP: clear data/eos status before returning from seek" into mnc-dev
63f393dbc64cc7a9ae17bfa5760f5f25a03563c7 17-Jul-2015 Lajos Molnar <lajos@google.com> am a3725d7b: stagefright: MediaSync: use VideoFrameScheduler

* commit 'a3725d7b0cb79ddb49f81cba00a0164d8e645acd':
stagefright: MediaSync: use VideoFrameScheduler
7ca9677e1bd30303126f70d79ae1e819a1e341a7 17-Jul-2015 Lajos Molnar <lajos@google.com> am a3725d7b: stagefright: MediaSync: use VideoFrameScheduler

* commit 'a3725d7b0cb79ddb49f81cba00a0164d8e645acd':
stagefright: MediaSync: use VideoFrameScheduler
a3725d7b0cb79ddb49f81cba00a0164d8e645acd 02-Jul-2015 Lajos Molnar <lajos@google.com> stagefright: MediaSync: use VideoFrameScheduler

Move VideoFrameScheduler to libstagefright as part of this change.

Bug: 22234976
Change-Id: Ib23fb52399cb700a1dcf789e8486b94a3edf9d95
ndroid.mk
ideoFrameScheduler.cpp
ideoFrameScheduler.h
uplayer/NuPlayerRenderer.cpp
8d237a5ce1e3c1dbc1d538f47e68cff2cc52d799 14-Jul-2015 Robert Shih <robertshih@google.com> RTSP: clear data/eos status before returning from seek

The original RTSP seek implementation involves pausing and restarting
a session. This change clears data/eos status after an rtsp session
is paused for a seek, and delays the seek to return after data/eos
status are cleared.

Bug: 22207372
Change-Id: I1bdf65653f90436f7ee5d7fe85eeadc1598a0d56
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
83582fafce2122286124710c3a9c749b4825a033 16-Jul-2015 Eric Laurent <elaurent@google.com> am a8dc93ef: Merge "mediaplayer: fix audio attributes override by stream type" into mnc-dev

* commit 'a8dc93efc9be8d5e37c7473601fb8654804188c1':
mediaplayer: fix audio attributes override by stream type
6c848ad95214545dd76c7f4c894bce89449bbfbd 16-Jul-2015 Eric Laurent <elaurent@google.com> am a8dc93ef: Merge "mediaplayer: fix audio attributes override by stream type" into mnc-dev

* commit 'a8dc93efc9be8d5e37c7473601fb8654804188c1':
mediaplayer: fix audio attributes override by stream type
a8dc93efc9be8d5e37c7473601fb8654804188c1 16-Jul-2015 Eric Laurent <elaurent@google.com> Merge "mediaplayer: fix audio attributes override by stream type" into mnc-dev
4356269be6d2b62bbb945364e8fc4beb99e1aada 16-Jul-2015 Eric Laurent <elaurent@google.com> mediaplayer: fix audio attributes override by stream type

Make sure that when audio attributes are set, the stream type
is always derived from them.

Bug: 22481669.
Change-Id: Ia10c7017eb27e7753faf97a42dd4f44e15f2c986
ediaPlayerService.cpp
ediaPlayerService.h
bd109a892da5d41fcd2b3c6331348870e2a6792a 16-Jul-2015 Wei Jia <wjia@google.com> am 6712ae1e: Merge "NuPlayer: fix handling of teardown event during flushing or shutting down." into mnc-dev

* commit '6712ae1e1cd4e68c6f43ea3396c30a3633d8bd8c':
NuPlayer: fix handling of teardown event during flushing or shutting down.
96600df5f83e31c4be3bcb3425e30f2820701c12 16-Jul-2015 Wei Jia <wjia@google.com> am 6712ae1e: Merge "NuPlayer: fix handling of teardown event during flushing or shutting down." into mnc-dev

* commit '6712ae1e1cd4e68c6f43ea3396c30a3633d8bd8c':
NuPlayer: fix handling of teardown event during flushing or shutting down.
6712ae1e1cd4e68c6f43ea3396c30a3633d8bd8c 15-Jul-2015 Wei Jia <wjia@google.com> Merge "NuPlayer: fix handling of teardown event during flushing or shutting down." into mnc-dev
da4252f86b1b730827053f015acec43b9c61fd37 15-Jul-2015 Wei Jia <wjia@google.com> NuPlayer: fix handling of teardown event during flushing or shutting down.

Bug: 22481669
Change-Id: I9114c16c081fd7907508e9c776607d653ae18612
uplayer/NuPlayer.cpp
c8f54dcf238c2194d2d1c131aa55ebe0795ae1cb 15-Jul-2015 Chong Zhang <chz@google.com> am 1bc88814: Merge "NuPlayer: pull more video buffers in advance in GenericSource" into mnc-dev

* commit '1bc88814f530bf67e425cfb8cea0f2b8dce3c03f':
NuPlayer: pull more video buffers in advance in GenericSource
d45203ca27d76c8f7bbccfb8d4a752c25f882d1b 15-Jul-2015 Chong Zhang <chz@google.com> am 1bc88814: Merge "NuPlayer: pull more video buffers in advance in GenericSource" into mnc-dev

* commit '1bc88814f530bf67e425cfb8cea0f2b8dce3c03f':
NuPlayer: pull more video buffers in advance in GenericSource
1bc88814f530bf67e425cfb8cea0f2b8dce3c03f 15-Jul-2015 Chong Zhang <chz@google.com> Merge "NuPlayer: pull more video buffers in advance in GenericSource" into mnc-dev
fcf044a9c5624395d24eb6181e67163ce169458b 15-Jul-2015 Chong Zhang <chz@google.com> NuPlayer: pull more video buffers in advance in GenericSource

pull 4 video buffers at a time, and start pulling when we're down
to 1 buffers to avoid starving the decoder.

bug: 22320866
Change-Id: I10914dc092f3830ecb6296e2d9ebf9064ff7a5dc
uplayer/GenericSource.cpp
d34c08b2ea4c94c3c081597c90c9828097de47bd 14-Jul-2015 Wei Jia <wjia@google.com> am 495151d3: Merge "NuPlayer: determine audio mode before instantiating audio decoder." into mnc-dev

* commit '495151d3f4c5f92f1d162efb32b636521c105df5':
NuPlayer: determine audio mode before instantiating audio decoder.
a99358378fe4a7899cc207dac726e2670fc10aa5 14-Jul-2015 Wei Jia <wjia@google.com> am 495151d3: Merge "NuPlayer: determine audio mode before instantiating audio decoder." into mnc-dev

* commit '495151d3f4c5f92f1d162efb32b636521c105df5':
NuPlayer: determine audio mode before instantiating audio decoder.
495151d3f4c5f92f1d162efb32b636521c105df5 14-Jul-2015 Wei Jia <wjia@google.com> Merge "NuPlayer: determine audio mode before instantiating audio decoder." into mnc-dev
e4d18c7f84186b935ac569d5919059c455edd390 14-Jul-2015 Wei Jia <wjia@google.com> NuPlayer: determine audio mode before instantiating audio decoder.

Bug: 22460159
Change-Id: I334c6dc5e1163a462155d251eaa985ff5e3858e6
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
305f17c3d5b3aec679b4bd09a4987957e653b65b 14-Jul-2015 Lajos Molnar <lajos@google.com> am a7c2db72: Merge "nuplayer: use codec->setSurface when possible to avoid seeking" into mnc-dev

* commit 'a7c2db7226b23dfe6ad0c7c1cccc073dab2f97bd':
nuplayer: use codec->setSurface when possible to avoid seeking
bc6d8cf534e5c916859f8a26f830164adc910a16 14-Jul-2015 Wei Jia <wjia@google.com> am db350735: Merge "NuPlayerRenderer: clear first audio anchor time only when audio is flushed." into mnc-dev

* commit 'db350735e14c13c4fc1094768bfbbad4dab8ef2c':
NuPlayerRenderer: clear first audio anchor time only when audio is flushed.
07d7d02ab8c137241ba8ab1e7ee63540f9ac7303 14-Jul-2015 Wei Jia <wjia@google.com> am 9ad9e747: Merge "NuPlayer: seek to current position when changing video surface and audio decoder exists." into mnc-dev

* commit '9ad9e7471629f7b9061569a50555a1722047f38d':
NuPlayer: seek to current position when changing video surface and audio decoder exists.
59322ac64a9589c3600d0d4e163900211c857138 14-Jul-2015 Lajos Molnar <lajos@google.com> am a7c2db72: Merge "nuplayer: use codec->setSurface when possible to avoid seeking" into mnc-dev

* commit 'a7c2db7226b23dfe6ad0c7c1cccc073dab2f97bd':
nuplayer: use codec->setSurface when possible to avoid seeking
ae9f3e919977a5e48471dc3f17692debc6befa48 14-Jul-2015 Wei Jia <wjia@google.com> am db350735: Merge "NuPlayerRenderer: clear first audio anchor time only when audio is flushed." into mnc-dev

* commit 'db350735e14c13c4fc1094768bfbbad4dab8ef2c':
NuPlayerRenderer: clear first audio anchor time only when audio is flushed.
a7c2db7226b23dfe6ad0c7c1cccc073dab2f97bd 14-Jul-2015 Lajos Molnar <lajos@google.com> Merge "nuplayer: use codec->setSurface when possible to avoid seeking" into mnc-dev
db350735e14c13c4fc1094768bfbbad4dab8ef2c 14-Jul-2015 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: clear first audio anchor time only when audio is flushed." into mnc-dev
a81c6229638a4db56752dd77a6610e0f0971e877 11-Jul-2015 Lajos Molnar <lajos@google.com> nuplayer: use codec->setSurface when possible to avoid seeking

Bug: 22414719
Change-Id: I0442e12af960f86a0fc090b4a469c62ba638a1a0
uplayer/Android.mk
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDecoderBase.h
3b0cd26dbb0ce37d220db9ff0fa8172a7ef1c5cb 13-Jul-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: clear first audio anchor time only when audio is flushed.

Bug: 22228075

Change-Id: I5914d7cfd2fb9c7ca5279964b530a404b20c8764
uplayer/NuPlayerRenderer.cpp
68b733d40c586c17eaacdf816b83d1e58dcec8ca 13-Jul-2015 Wei Jia <wjia@google.com> am 9ad9e747: Merge "NuPlayer: seek to current position when changing video surface and audio decoder exists." into mnc-dev

* commit '9ad9e7471629f7b9061569a50555a1722047f38d':
NuPlayer: seek to current position when changing video surface and audio decoder exists.
9ad9e7471629f7b9061569a50555a1722047f38d 11-Jul-2015 Wei Jia <wjia@google.com> Merge "NuPlayer: seek to current position when changing video surface and audio decoder exists." into mnc-dev
c6e58419e00e6d04882a885101510e667d9c043a 11-Jul-2015 Wei Jia <wjia@google.com> NuPlayer: seek to current position when changing video surface and audio decoder exists.

Bug: 22228075
Change-Id: I8b233319f48d2d0a49b44063cd895dc94949a489
uplayer/NuPlayer.cpp
cda7cf7f6fda88525b6827cebf6372473b3fc876 10-Jul-2015 Andy Hung <hunga@google.com> am b6b19ca7: Merge "libmediaplayerservice: Serialize access to AudioOutput" into mnc-dev

* commit 'b6b19ca71e41276190fcd97351a0d19fae75bd34':
libmediaplayerservice: Serialize access to AudioOutput
df5e9051df843f0aac2a8e5b69c4862be8c1ef8a 10-Jul-2015 Andy Hung <hunga@google.com> am b6b19ca7: Merge "libmediaplayerservice: Serialize access to AudioOutput" into mnc-dev

* commit 'b6b19ca71e41276190fcd97351a0d19fae75bd34':
libmediaplayerservice: Serialize access to AudioOutput
d1c74340c9346e2bfd061e20fba9bf34c22d77db 08-Jul-2015 Andy Hung <hunga@google.com> libmediaplayerservice: Serialize access to AudioOutput

NuPlayerRenderer may open and close the AudioOutput while
MediaPlayerService::Client accesses it.

Bug: 20069455
Bug: 22295200
Change-Id: Ic37987c1de1919cf890b2e69778e6df71e7ee7c5
ediaPlayerService.cpp
ediaPlayerService.h
b32d85f196546b8406a616d5d7ddd7093113553b 08-Jul-2015 Robert Shih <robertshih@google.com> am 065f6572: Merge "NuPlayer: disable pre-start preview for audio only sources" into mnc-dev

* commit '065f6572752dca646b7d60df8e80b6d4ac159281':
NuPlayer: disable pre-start preview for audio only sources
b6f1b9291f3bd4b464b925c5d303f9170174a18d 07-Jul-2015 Robert Shih <robertshih@google.com> am 065f6572: Merge "NuPlayer: disable pre-start preview for audio only sources" into mnc-dev

* commit '065f6572752dca646b7d60df8e80b6d4ac159281':
NuPlayer: disable pre-start preview for audio only sources
0c61a0d78f5f093f47826d770111cd455a19beb4 07-Jul-2015 Robert Shih <robertshih@google.com> NuPlayer: disable pre-start preview for audio only sources

Bug: 22117876
Change-Id: I0e00ff8f081d80946cbd19028f1f786c1b8268f3
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
e7616724e7054a013bc013dc62008b9d98dc2b5f 13-Jun-2015 Marco Nelissen <marcone@google.com> am 2b63384b: Merge "Serialize calls to getFrameAtTime in the mediaserver" into mnc-dev

* commit '2b63384b6d338f2c3320818a698c3f9d6221fe5d':
Serialize calls to getFrameAtTime in the mediaserver
2b63384b6d338f2c3320818a698c3f9d6221fe5d 13-Jun-2015 Marco Nelissen <marcone@google.com> Merge "Serialize calls to getFrameAtTime in the mediaserver" into mnc-dev
6155085b781a81af66d42d907c9f4d1063999594 13-Jun-2015 Marco Nelissen <marcone@google.com> Serialize calls to getFrameAtTime in the mediaserver

to avoid running out of memory.

Bug: 21277449
Change-Id: I7210806a24958f38d86aadab0310fc263e4c0edf
etadataRetrieverClient.cpp
etadataRetrieverClient.h
ea85d2b28a2585974aac5cebcd992fedc0d2815c 12-Jun-2015 Chong Zhang <chz@google.com> am 9d66d7f7: Merge "stagefright: post audio EOS in NuPlayerRenderer if getPosition fails" into mnc-dev

* commit '9d66d7f78284268272fefcb92697002169c62717':
stagefright: post audio EOS in NuPlayerRenderer if getPosition fails
9d66d7f78284268272fefcb92697002169c62717 12-Jun-2015 Chong Zhang <chz@google.com> Merge "stagefright: post audio EOS in NuPlayerRenderer if getPosition fails" into mnc-dev
9da0ce44f228408d73a4dea0be972c785095dccc 12-Jun-2015 Chong Zhang <chz@google.com> stagefright: post audio EOS in NuPlayerRenderer if getPosition fails

bug: 20071480
Change-Id: I81f2a1fea0daa694a61be7f4a6d70d6847e9f183
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
f1abf4aee61ef32f9871c0556a7482fadc93992b 12-Jun-2015 Wei Jia <wjia@google.com> am 051602a0: Merge "NuPlayerDriver: add more logging." into mnc-dev

* commit '051602a0f3cf4e7cf68dcd5cb69cec82d9230384':
NuPlayerDriver: add more logging.
67c2c94aa9d387bb7dc47514d62deeb66d486210 11-Jun-2015 Wei Jia <wjia@google.com> NuPlayerDriver: add more logging.

Change-Id: Ib80a42b4e46b4e2bea02d9a002228a058d1fa211
uplayer/NuPlayerDriver.cpp
57bc51fe33433c19c275d3dbcc264c9454b989b3 11-Jun-2015 Praveen Chavan <pchavan@codeaurora.org> am 3a20d29f: NuPlayer: print player stats at the end of playback

* commit '3a20d29ff09ca2568cb904415625cc44db37edb0':
NuPlayer: print player stats at the end of playback
96866297a038a744e16c11aa49e3e409842af7e7 11-Jun-2015 Praveen Chavan <pchavan@codeaurora.org> am e1e5d7a3: NuPlayer: Enhance dumpsys statistics

* commit 'e1e5d7a3d3d4d6d644e6c731f977422e004140d5':
NuPlayer: Enhance dumpsys statistics
c69680b436039c37905875d92a95f5ab59765cf0 11-Jun-2015 Lajos Molnar <lajos@google.com> am 7d3dc897: Merge "mediaplayer: remove use-awesomeplayer developer option" into mnc-dev

* commit '7d3dc897db90961bf0b841e3ac4169ce8eff1df1':
mediaplayer: remove use-awesomeplayer developer option
3a20d29ff09ca2568cb904415625cc44db37edb0 21-May-2015 Praveen Chavan <pchavan@codeaurora.org> NuPlayer: print player stats at the end of playback

Print stats at the end of playback if the shell
property persist.debug.sf.stats is set

Change-Id: Ie4250bf86b12af75c16f108ca09ad02b3e44fd29
uplayer/NuPlayerDriver.cpp
e1e5d7a3d3d4d6d644e6c731f977422e004140d5 20-May-2015 Praveen Chavan <pchavan@codeaurora.org> NuPlayer: Enhance dumpsys statistics

Account for dropped output-frames (rather than input-frames)
in percentage dropped frames.
Print mime and component name for each active track

Change-Id: I3491d336c696d8ed0fd1503b80afe1df47c787c8
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDecoderBase.cpp
uplayer/NuPlayerDecoderBase.h
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
uplayer/NuPlayerDriver.cpp
94ca93468ab0860b1d6f75e33d8419fdba067a06 11-Jun-2015 Wei Jia <wjia@google.com> am 4599da7f: Merge "NuPlayerRenderer: discard pending kWhatDrainAudioQueue message when AudioSink is opened in callback mode." into mnc-dev

* commit '4599da7f4ca67a323aa64d84c1b79e3ce6ab9f41':
NuPlayerRenderer: discard pending kWhatDrainAudioQueue message when AudioSink is opened in callback mode.
701d342f785e407c8e6bcb046658f84ac56d989a 10-Jun-2015 Lajos Molnar <lajos@google.com> mediaplayer: remove use-awesomeplayer developer option

Bug: 17108024
Change-Id: Id6429eb58226fe955f091f661fcb2f21a5f6ce5e
ediaPlayerFactory.cpp
3ab25457385dceb07205fc8ead86d7fb9e307588 10-Jun-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: discard pending kWhatDrainAudioQueue message when AudioSink is opened in callback mode.

Bug: 21723010
Change-Id: Iddab8c1cbdf87714aa53315feba064fe101d8f98
uplayer/NuPlayerRenderer.cpp
12e1a79c04f4a1b9935a85b99a89f8bcc9b672a4 09-Jun-2015 Wei Jia <wjia@google.com> am 416d4a8a: Merge "NuPlayerRenderer: change log from ALOGW to ALOGV when audio sink reports WOULD_BLOCK on writing." into mnc-dev

* commit '416d4a8ad177a48bcb25aa3a32c4bdfaf6227014':
NuPlayerRenderer: change log from ALOGW to ALOGV when audio sink reports WOULD_BLOCK on writing.
416d4a8ad177a48bcb25aa3a32c4bdfaf6227014 09-Jun-2015 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: change log from ALOGW to ALOGV when audio sink reports WOULD_BLOCK on writing." into mnc-dev
c9811dc703a38add41ee3960c1d7242ed154434f 09-Jun-2015 Wei Jia <wjia@google.com> am f49b5150: Merge "AudioSink: use flags granted by AudioTrack, instead of the requested flags." into mnc-dev

* commit 'f49b5150f87c98c389a334c3af5a9a586d40ee8f':
AudioSink: use flags granted by AudioTrack, instead of the requested flags.
df809479696725faf5d3424b11fa8a07bd94cb5e 09-Jun-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: change log from ALOGW to ALOGV when audio sink reports WOULD_BLOCK on writing.

Bug: 21726662
Change-Id: I4aa63df7f21e06473594dda30a935e0f1cb745ac
uplayer/NuPlayerRenderer.cpp
f49b5150f87c98c389a334c3af5a9a586d40ee8f 09-Jun-2015 Wei Jia <wjia@google.com> Merge "AudioSink: use flags granted by AudioTrack, instead of the requested flags." into mnc-dev
0162d00a38cdb5f4eba5dfe8cd272f69ddbc8c21 09-Jun-2015 Wei Jia <wjia@google.com> AudioSink: use flags granted by AudioTrack, instead of the requested flags.

Do not call AudioTrack::setPlaybackRate when DIRECT flag is set.

Bug: 17459982
Change-Id: Ib8fb07be72558234519590bcc3bb88c4f6edfa37
ediaPlayerService.cpp
5661f63ad3a09de0de410a1658e7a9f3e563b193 08-Jun-2015 Eino-Ville Talvala <etalvala@google.com> am d46a6b9f: Camera1 API: Support SW encoders for new camera HALs

* commit 'd46a6b9fd8b2a4f9098757384711e2cd03a91651':
Camera1 API: Support SW encoders for new camera HALs
d46a6b9fd8b2a4f9098757384711e2cd03a91651 15-May-2015 Eino-Ville Talvala <etalvala@google.com> Camera1 API: Support SW encoders for new camera HALs

- Support new set video format/dataspace command in camera service
- HALv3: Select gralloc usage flags based on format
- HALv1: Pass format command directly to HAL layer
- Use format/dataspace command in CameraSource
- Switch all API1 recording to use metadata mode
- Switch all >= HALv2 API1 recording to use kMetadataBufferTypeANWBuffer

Bug: 13222807
Change-Id: I2e609b92c65792611bb1dab09e0c41c363ebbc42
tagefrightRecorder.cpp
tagefrightRecorder.h
feddaedad0cb0262b5521aa1d4629b1e877b6637 05-Jun-2015 Andy Hung <hunga@google.com> am 13dcb4fe: Merge "NuPlayer: Allow audio drain to fill buffer when paused" into mnc-dev

* commit '13dcb4fea2e1d9698cc5baa5a35b520153593eda':
NuPlayer: Allow audio drain to fill buffer when paused
c4d1fd619a4912358b2cd6fd128479bd342fcf4c 05-Jun-2015 Andy Hung <hunga@google.com> am b7e8d852: Merge "NuPlayer: Allow audio callback to fill buffer when paused" into mnc-dev

* commit 'b7e8d8522c5eb2e0a9c04b2f499f930eabba8309':
NuPlayer: Allow audio callback to fill buffer when paused
cac0692823ef387b4f11eaa4bc82a4b2ab418308 05-Jun-2015 Andy Hung <hunga@google.com> am c9e54ee0: Merge "NuPlayer: Add audio deep buffer configuration" into mnc-dev

* commit 'c9e54ee0420bdb0226bc077c3952cdd4953773de':
NuPlayer: Add audio deep buffer configuration
979d0d7a73b085920345028e28714be81d83e9c5 05-Jun-2015 Andy Hung <hunga@google.com> am bc186651: Merge "NuPlayer: Add audio sink buffer configuration" into mnc-dev

* commit 'bc186651b6ff4bef5ebe0087c0e34bc8e89b14a3':
NuPlayer: Add audio sink buffer configuration
005e9d0300fc326a076ec17b7fa6dd4f51568f55 01-Jun-2015 Andy Hung <hunga@google.com> NuPlayer: Allow audio drain to fill buffer when paused

If a pause lasts more than a few seconds, the audio device
enters standby. When the audio device comes out of standby,
it typically requests a large amount of data to fill its buffers
(especially severe for deep buffer PCM mode).

To avoid a glitch, continue to fill the buffer (until no more data
can be written) when paused.

Also, we do not start the audio sink if we are paused to avoid
audio playback in video preview mode.

Bug: 19062223
Bug: 21198655
Change-Id: Ifb3f181d5e810283381b65f2af16a4c71df0b04f
uplayer/NuPlayerRenderer.cpp
85e48142f726770d3b65caa1f29d8b98f8d5db6b 01-Jun-2015 Andy Hung <hunga@google.com> NuPlayer: Allow audio callback to fill buffer when paused

If a pause lasts more than a few seconds, the audio device
enters standby. When the audio device comes out of standby,
it typically requests a large amount of data to fill its buffers
(especially severe for deep buffer PCM mode).

To avoid a glitch, continue to service the audio callback
when paused.

Also, we do not start the audio sink if we are paused to avoid
audio playback in video preview mode.

Bug: 19062223
Bug: 21198655
Change-Id: I987337a87e6c875aeb381df8ad37c7139c42dc72
uplayer/NuPlayerRenderer.cpp
288da02b1f074f9f3c191f1838f135d4633b3d34 01-Jun-2015 Andy Hung <hunga@google.com> NuPlayer: Add audio deep buffer configuration

Disabled for video streams now.
Enabled by property media.stagefright.audio.deep 1

Bug: 21198655
Change-Id: I03f3b43091f950637d46779e2e74c1321b2cd268
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerRenderer.cpp
179652ee2a508361df1aa18e99000373886f0816 01-Jun-2015 Andy Hung <hunga@google.com> NuPlayer: Add audio sink buffer configuration

Property media.stagefright.audio.sink (in milliseconds)
Also change the default buffer size for PCM playback to 500 ms.

Bug: 21198655
Change-Id: I5781288f59bf08fbecd9263a26c919570b58be0f
ediaPlayerService.cpp
ediaPlayerService.h
uplayer/NuPlayerRenderer.cpp
ff96dd688f50b7ed3f4ab8fb04fb4a61e596130b 03-Jun-2015 Andy Hung <hunga@google.com> am 4170eeec: Merge "MediaPlayerService: Reset the bytes written in AudioSink stop and flush" into mnc-dev

* commit '4170eeec0a2dc2a9543b7e4674a43b3d2faac61d':
MediaPlayerService: Reset the bytes written in AudioSink stop and flush
c394dace3c6128ca719aceea9f132a1cb905bf2e 03-Jun-2015 Andy Hung <hunga@google.com> am d726a189: Merge "NuPlayer: Add audio callback mode for PCM audio." into mnc-dev

* commit 'd726a189a8a3f822106da21fcb8c8665fd48d272':
NuPlayer: Add audio callback mode for PCM audio.
91e1a4e9ffed810f94690c16f6771f302f9dcf95 03-Jun-2015 Andy Hung <hunga@google.com> am 6f04a0c9: Merge "MediaPlayerService: Remove unnecessary zero writes to AudioSink" into mnc-dev

* commit '6f04a0c9bf531372ba885a82e592a0eeb27b9484':
MediaPlayerService: Remove unnecessary zero writes to AudioSink
4170eeec0a2dc2a9543b7e4674a43b3d2faac61d 03-Jun-2015 Andy Hung <hunga@google.com> Merge "MediaPlayerService: Reset the bytes written in AudioSink stop and flush" into mnc-dev
da17c04fa1c81ff8ffa8160df06fa5031a7884f4 02-Jun-2015 Andy Hung <hunga@google.com> MediaPlayerService: Reset the bytes written in AudioSink stop and flush

When playing in non-offloaded mode with gapless playback it is
necessary to reset AudioSink's bytes written on stop and flush
(e.g. seeking) so the frames written can be correctly retrieved
for the subsequent song in NuPlayer::Renderer::onAudioSinkChanged().

Without this change, seeks performed during playback will cause
a time position offset of the subsequent song in Play Music.

Bug: 21198655
Change-Id: I0fb6cc94b5a0ff106dc8a71571ed85d75fb00660
ediaPlayerService.cpp
d726a189a8a3f822106da21fcb8c8665fd48d272 03-Jun-2015 Andy Hung <hunga@google.com> Merge "NuPlayer: Add audio callback mode for PCM audio." into mnc-dev
a0b397133bfce8a62198dfac9a2b970c8b20bcc5 01-Jun-2015 Andy Hung <hunga@google.com> NuPlayer: Add audio callback mode for PCM audio.

Disabled for now. Enabled by property media.stagefright.audio.cbk 1

Bug: 21198655
Change-Id: I8f117b089fe019009f1615908d33720a93e1b21e
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
719b46bdbafa226aed3163ed8e76a2cc4dff386b 01-Jun-2015 Andy Hung <hunga@google.com> MediaPlayerService: Remove unnecessary zero writes to AudioSink

Causes glitches in PCM playback for NuPlayer callback mode.

Not sure the original intention of this with AwesomePlayer, as zeroes
are only placed under EOS condition for AudioSink targets, not AudioTrack
targets. Does not seem useful anymore as AwesomePlayer appears to
call stop() which should send the remaining track data out.

Bug: 21198655
Change-Id: Iab80dd7bc6e2e341f92406c5d8f8085e9d877bcd
ediaPlayerService.cpp
1bf65efd28fffbbc600177c11799a8d7c3cb2477 02-Jun-2015 Ruben Brunk <rubenbrunk@google.com> am cb18ec05: Merge "Track camera and flashlight usage in battery stats." into mnc-dev

* commit 'cb18ec05b7097a63262b81afe1e866105d400f4a':
Track camera and flashlight usage in battery stats.
cb18ec05b7097a63262b81afe1e866105d400f4a 02-Jun-2015 Ruben Brunk <rubenbrunk@google.com> Merge "Track camera and flashlight usage in battery stats." into mnc-dev
99e69716215cd0665379bc90d708f2ea8689831d 27-May-2015 Ruben Brunk <rubenbrunk@google.com> Track camera and flashlight usage in battery stats.

Bug: 15986092

Change-Id: I9dc6828332e4091fd93bf2d82839e8e3862a2fc2
ndroid.mk
ediaPlayerService.cpp
4612b1f4df00f1985d28131fbf52afc2146ded54 01-Jun-2015 Glenn Kasten <gkasten@google.com> am 90869ff4: Merge "Explicit log for AudioTrack::EVENT_UNDERRUN" into mnc-dev

* commit '90869ff493a3e8d1aa39c146530be03dc2a7dd84':
Explicit log for AudioTrack::EVENT_UNDERRUN
421743b3f8d14b700f2e1be256e010756fa85af8 01-Jun-2015 Glenn Kasten <gkasten@google.com> Explicit log for AudioTrack::EVENT_UNDERRUN

Prompted by this bug, but not a fix for the bug

Bug: 21352202
Change-Id: I350d9d8660a367470450c9f54d7c541d4896ebda
ediaPlayerService.cpp
279795ceacea01dd05cd7c19783f3f68cb7a8e9f 01-Jun-2015 Glenn Kasten <gkasten@google.com> am db431db5: Merge "Deprecations are warnings not errors" into mnc-dev

* commit 'db431db53fbbb9024b6e72c528e2d195d63ad544':
Deprecations are warnings not errors
db431db53fbbb9024b6e72c528e2d195d63ad544 29-May-2015 Glenn Kasten <gkasten@google.com> Merge "Deprecations are warnings not errors" into mnc-dev
f6b3e7db0b18a7d187d026dd729ae12fd521005e 18-May-2015 Glenn Kasten <gkasten@google.com> Deprecations are warnings not errors

Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
ndroid.mk
50ca83ce52f6febc63c4d7b2502d0f79b7730be4 27-May-2015 Ronghua Wu <ronghuawu@google.com> am 0a62c194: Merge "libmediaplayerservice: get isStreaming info from source." into mnc-dev

* commit '0a62c1948cede8f99eaed1ba55f4880380a4f3ee':
libmediaplayerservice: get isStreaming info from source.
94ae227263a28b3551913cefc1773c51a78783ca 27-May-2015 Marco Nelissen <marcone@google.com> am 96de55f3: Merge "GenericSource should report -1 instead of 0 for unknown duration" into mnc-dev

* commit '96de55f3e47d41c9ff6356e4e710a5733eda5aa3':
GenericSource should report -1 instead of 0 for unknown duration
0a62c1948cede8f99eaed1ba55f4880380a4f3ee 27-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "libmediaplayerservice: get isStreaming info from source." into mnc-dev
02fc5e3f8af41052dcb961f85e34fe109d38a3bb 27-May-2015 Marco Nelissen <marcone@google.com> GenericSource should report -1 instead of 0 for unknown duration

If the underlying source never reported a duration, GenericSource
would report a duration of 0. The right value to return is -1.

Bug: 21391417
Change-Id: Ie53045f819727b0ac79ed6719991724c069d7650
uplayer/GenericSource.cpp
02cb98d726b97d8e6dbb9c6c60d32a3cedc7f82d 27-May-2015 Ronghua Wu <ronghuawu@google.com> libmediaplayerservice: get isStreaming info from source.

Bug: 19061436
Change-Id: I0fc0d6207b0d3297d64aadab3e81448e3f3fa1de
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayerSource.h
475ed1d6c842abdb773fa8e39290375ceda39b62 22-May-2015 Ronghua Wu <ronghuawu@google.com> am 0a7989f5: Merge "libmediaplayerservice: try to open audio sink in offload mode in error." into mnc-dev

* commit '0a7989f5691f161fff97dd550eb602e44a6e6185':
libmediaplayerservice: try to open audio sink in offload mode in error.
0a7989f5691f161fff97dd550eb602e44a6e6185 22-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "libmediaplayerservice: try to open audio sink in offload mode in error." into mnc-dev
faeb0f291330134dc4468359a36e099aae508449 21-May-2015 Ronghua Wu <ronghuawu@google.com> libmediaplayerservice: try to open audio sink in offload mode in error.

Bug: 19061432
Bug: 21370108
Change-Id: Iaa757555ef37fd1ac87b6e2d5a9969bb58cc5ebc
ediaPlayerService.cpp
ediaPlayerService.h
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
3d4f25e4b293d2100946e407d1a3af080311eab4 22-May-2015 Wei Jia <wjia@google.com> am 8c46bb67: Merge "mediaplayer: display one frame when seek is called before start." into mnc-dev

* commit '8c46bb672b308583375852642a4b7a43560f5128':
mediaplayer: display one frame when seek is called before start.
1061c9c29cfdeb3b2a307a4ee4cda2cd197b48e6 20-May-2015 Wei Jia <wjia@google.com> mediaplayer: display one frame when seek is called before start.

Bug: 18608164
Change-Id: I83252421278aeeb1c1611138994bfdaf86d7a363
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
105f53a64a1444e2538710d7f81dd00818ad3d92 20-May-2015 Wei Jia <wjia@google.com> am 856f37a8: Merge "mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buffer from MediaCodec." into mnc-dev

* commit '856f37a8b62bb3732d4a92b0278672819720b3f1':
mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buffer from MediaCodec.
e079afab12e2571eb493a7222520bc844058e2e7 20-May-2015 Ronghua Wu <ronghuawu@google.com> am 5a8422a0: Merge "libmediaplayerservice: queue discontinuity when seek to eos." into mnc-dev

* commit '5a8422a0bb54ad74bab9bf1b2d38cd2d4f0843b8':
libmediaplayerservice: queue discontinuity when seek to eos.
856f37a8b62bb3732d4a92b0278672819720b3f1 20-May-2015 Wei Jia <wjia@google.com> Merge "mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buffer from MediaCodec." into mnc-dev
5a8422a0bb54ad74bab9bf1b2d38cd2d4f0843b8 19-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "libmediaplayerservice: queue discontinuity when seek to eos." into mnc-dev
8f291bc99e92015ebb959654a73c87e98bd46958 19-May-2015 Ronghua Wu <ronghuawu@google.com> libmediaplayerservice: queue discontinuity when seek to eos.

Bug: 19063416
Change-Id: I23d1a3788006a0d68effa01fe9ee1d92fe06739c
uplayer/GenericSource.cpp
uplayer/GenericSource.h
3d4d897cf6a933dd02e8d83e674a4ecfe2ea578b 19-May-2015 Glenn Kasten <gkasten@google.com> am d45d75d7: Merge "Clear mAudioRecord and mAudioTrack on set() failure" into mnc-dev

* commit 'd45d75d7c19811c5afe9b115c7282f9aa4e1ee4d':
Clear mAudioRecord and mAudioTrack on set() failure
3e98ecd18c906dc3ac2ff1a890f0b3163447272d 18-May-2015 Glenn Kasten <gkasten@google.com> Clear mAudioRecord and mAudioTrack on set() failure

Bug: 20818955
Bug: 20890069
Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
ediaPlayerService.cpp
6301a5e94de3659b4e6e4910394861830f8ebfb7 13-May-2015 Wei Jia <wjia@google.com> mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buffer from MediaCodec.

MediaCodec could send out message of input buffer available right before it hits an error and clears its buffers.

Bug: 14433407
Change-Id: I32494f4cb2a8537fac12449fd68a74c021f5c9e1
uplayer/NuPlayerDecoder.cpp
4577fa26056135f9e3e68b6ebfa4895290c375e8 16-May-2015 Wei Jia <wjia@google.com> am 4a95e694: Merge "mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek." into mnc-dev

* commit '4a95e69406aa2e9896d865962d6d947ebbdac6fc':
mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek.
4a95e69406aa2e9896d865962d6d947ebbdac6fc 16-May-2015 Wei Jia <wjia@google.com> Merge "mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek." into mnc-dev
2984080a97d6d43f640029b58930a28e58b8754a 16-May-2015 Wei Jia <wjia@google.com> mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek.

Change-Id: I5ee4c3ba968a2ac52266cda0425d1a709e5c0fb2
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
5a74d96cded854e91dd959257a153a26fb46c0bd 15-May-2015 Robert Shih <robertshih@google.com> am 89cf8946: Merge "HTTPLiveSource: fix non timed id3 track selection" into mnc-dev

* commit '89cf8946e8d61ce32b83fdc2bb3274a562bf76cf':
HTTPLiveSource: fix non timed id3 track selection
89cf8946e8d61ce32b83fdc2bb3274a562bf76cf 15-May-2015 Robert Shih <robertshih@google.com> Merge "HTTPLiveSource: fix non timed id3 track selection" into mnc-dev
055404ea1309d4cbc5d313332b026f86bd6f0da1 15-May-2015 Robert Shih <robertshih@google.com> HTTPLiveSource: fix non timed id3 track selection

Non timed id3 track selection generates INVALID_OPERATION when performed
on the last track.

The buggy logic reads:

if (not last track) {
// non-timed-id3 related work
} else if (has timed id3) {
// timed id3 related work
} // last track but non timed id3 not handled

It should read:

if (has no timed id3 || not last track) {
// non-timed-id3 track related work
} else {
// timed id3 related work
}

Bug: 21195284
Change-Id: I2ddb5d8e2a1ecba4cc071c7ee14c6697fe8e220d
uplayer/HTTPLiveSource.cpp
f2b90f170a3afad1ab5f8fbdf20c23284189c213 13-May-2015 Chong Zhang <chz@google.com> am 55c3bd0c: Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into mnc-dev

* commit '55c3bd0cacfb6e1601cd03fdba814be544a34326':
stagefright: rename usePersistentInputSurface to setInputSurface
55c3bd0cacfb6e1601cd03fdba814be544a34326 13-May-2015 Chong Zhang <chz@google.com> Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into mnc-dev
2cd93d22fcdacc54a89befd4d914c2e1469f3085 13-May-2015 Ronghua Wu <ronghuawu@google.com> am 2e69a987: Merge "libmediaplayerservice: unlock before trying to reclaim drm session." into mnc-dev

* commit '2e69a987ea5a6430c9804e1b59faa0e6ca45a43e':
libmediaplayerservice: unlock before trying to reclaim drm session.
2e69a987ea5a6430c9804e1b59faa0e6ca45a43e 13-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "libmediaplayerservice: unlock before trying to reclaim drm session." into mnc-dev
f35f6be32fb9e3ea040bb190b5414c7a5b988a6c 13-May-2015 Ronghua Wu <ronghuawu@google.com> libmediaplayerservice: unlock before trying to reclaim drm session.

Bug: 21086224
Change-Id: Icebd8eab70570e818ff7f5fc3a32e1801c3b92d2
rm.cpp
8f469e18c307cb9dc0d16ed9225972aa8be4516f 13-May-2015 Chong Zhang <chz@google.com> stagefright: rename usePersistentInputSurface to setInputSurface

and clear persistent surface pointer when MediaRecorder is reset

bug: 21045118
bug: 21045402
Change-Id: Ifd0d6deeb969f2252123929541b30b518cecbf9a
ediaRecorderClient.cpp
ediaRecorderClient.h
tagefrightRecorder.cpp
tagefrightRecorder.h
c2aa946614ddc4fde336a6f1357d8a7ee8207206 13-May-2015 Wei Jia <wjia@google.com> am 757f6446: Merge "mediaplayer: get/set PlaybackRate only when AudioSink has been opened." into mnc-dev

* commit '757f6446f5492320f6b72016aa501c9c861a5092':
mediaplayer: get/set PlaybackRate only when AudioSink has been opened.
27ea08e3811dc8057685258af52a7d40474eba16 12-May-2015 Wei Jia <wjia@google.com> mediaplayer: get/set PlaybackRate only when AudioSink has been opened.

Change-Id: I676567fc029b9f82d039990e629374bd48168cec
uplayer/NuPlayerRenderer.cpp
fb22fbb8d28e1be91d0f158943af91571a227ac8 08-May-2015 Chong Zhang <chz@google.com> am e5e9a0df: Merge "nuplayer: fixes for subtitle pause/resume" into mnc-dev

* commit 'e5e9a0df67ae23d16bf48e4a8fd652684434a3b6':
nuplayer: fixes for subtitle pause/resume
e5e9a0df67ae23d16bf48e4a8fd652684434a3b6 08-May-2015 Chong Zhang <chz@google.com> Merge "nuplayer: fixes for subtitle pause/resume" into mnc-dev
8a048338d9291b2db1b3a325fff58cb1aa69f04d 07-May-2015 Chong Zhang <chz@google.com> nuplayer: fixes for subtitle pause/resume

- pause after the current block when select track
- ignore metadata timestamps as they're too sparse
- use smaller range when searching for next segment to prevent
resumeUntil from downloading too much data

bug: 20500732
Change-Id: Ibda57a39ec86efd96a8dd0db95adeb92d076697a
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
c4647373e7b2d4242c753ce041283a6f3518e5f9 06-May-2015 Robert Shih <robertshih@google.com> am 7b4df6a3: Merge "NuPlayer: parcel placeholder mime in track info if not provided by source" into mnc-dev

* commit '7b4df6a3c4016d3f4f481af46d4e0d19fa48ad06':
NuPlayer: parcel placeholder mime in track info if not provided by source
2e3a425dc1bf7baada752926f94e0ce8a7512ec4 06-May-2015 Robert Shih <robertshih@google.com> NuPlayer: parcel placeholder mime in track info if not provided by source

Bug: 20853994
Change-Id: Iaf30e84ec78297099e6888070e7e779237b2d69f
uplayer/NuPlayer.cpp
ccf370c1366d7f10d806818ff40870b804af2cd5 05-May-2015 Ronghua Wu <ronghuawu@google.com> am c8a70d34: nuplayer: get playback frame rate from video track meta instead of file meta.

* commit 'c8a70d340f0ce610dfb8bd44d833708269484e99':
nuplayer: get playback frame rate from video track meta instead of file meta.
c8a70d340f0ce610dfb8bd44d833708269484e99 30-Apr-2015 Ronghua Wu <ronghuawu@google.com> nuplayer: get playback frame rate from video track meta instead of file meta.

Bug: 20481562
Change-Id: Ifb4b89cce5bc810f3f411c27ba61c996a488a1c0
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
b7e16c36e19859e1f702581f30c42e85e52010fa 02-May-2015 Chong Zhang <chz@google.com> am e2a2dfcb: MediaRecorder: implement persistent input surface APIs

* commit 'e2a2dfcbf0c9d6bb7139263ecf0d8e53b4ca1049':
MediaRecorder: implement persistent input surface APIs
e2a2dfcbf0c9d6bb7139263ecf0d8e53b4ca1049 01-May-2015 Chong Zhang <chz@google.com> MediaRecorder: implement persistent input surface APIs

Bug: 19127604
Bug: 19489395

Change-Id: I7dd8015a8fe029f9867fcdb52322629c77eff50b
ediaRecorderClient.cpp
ediaRecorderClient.h
tagefrightRecorder.cpp
tagefrightRecorder.h
c37096a2e6dd342b5013a3a4fc4c11b504ff187f 02-May-2015 Wei Jia <wjia@google.com> am 0247f0db: Merge "mediaplayer: flush audio sink when renderer is flushed." into mnc-dev

* commit '0247f0db93a828f0754a6d2d278cb08c6609cf26':
mediaplayer: flush audio sink when renderer is flushed.
0247f0db93a828f0754a6d2d278cb08c6609cf26 02-May-2015 Wei Jia <wjia@google.com> Merge "mediaplayer: flush audio sink when renderer is flushed." into mnc-dev
9e7ed3315298b42db485963b182a572e9ab42f9f 02-May-2015 Wei Jia <wjia@google.com> mediaplayer: flush audio sink when renderer is flushed.

Bug: 17488729
Change-Id: Ie56018367cb6aec1749ca148e94173e6c5864b27
uplayer/NuPlayerRenderer.cpp
ab4bc7a6caead4954550a3dc330ed6de3c9bcd4a 01-May-2015 Lajos Molnar <lajos@google.com> am 1de1e25c: stagefright: remove NativeWindowWrapper

* commit '1de1e25cba872bd4c077c2e394f8ca9c70b65856':
stagefright: remove NativeWindowWrapper
1de1e25cba872bd4c077c2e394f8ca9c70b65856 01-May-2015 Lajos Molnar <lajos@google.com> stagefright: remove NativeWindowWrapper

Now that Surface and SurfaceTextureClient are the same and Surface,
it does not add value.

Bug: 19489395
Change-Id: I016ecd1cf5cc51ce6244b6fa34ecd75f84e3db01
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
c65c622597ba6aecd66a5d1ec9b53c62a12d837e 01-May-2015 Robert Shih <robertshih@google.com> am 94ce2185: Merge "GenericSource: reply mime information for *all* track types" into mnc-dev

* commit '94ce218596a88cc6d37098cce4e17e68f7405603':
GenericSource: reply mime information for *all* track types
94ce218596a88cc6d37098cce4e17e68f7405603 01-May-2015 Robert Shih <robertshih@google.com> Merge "GenericSource: reply mime information for *all* track types" into mnc-dev
0ab2c4ce6f669722c055f1f4d35d6a79d21ba7c7 01-May-2015 Lajos Molnar <lajos@google.com> am 3a474aa6: stagefright: support setting/getting playback/sync config in MediaSync

* commit '3a474aa67fc31505740526dd249d96204c08bf79':
stagefright: support setting/getting playback/sync config in MediaSync
3a474aa67fc31505740526dd249d96204c08bf79 25-Apr-2015 Lajos Molnar <lajos@google.com> stagefright: support setting/getting playback/sync config in MediaSync

Bug: 18249558
Bug: 19666434
Bug: 20057497
Change-Id: I5868b17423d7c20cfaf4a399f3eb67bfba440605
ediaPlayerService.cpp
ediaPlayerService.h
tagefrightPlayer.cpp
tagefrightPlayer.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
755106eb9cff51dc4eda45d8cefc4306df308845 30-Apr-2015 Robert Shih <robertshih@google.com> GenericSource: reply mime information for *all* track types

Bug: 20729923
Change-Id: I65a8aedf089cfa4756fc9de433949c1b4bd416ce
uplayer/GenericSource.cpp
uplayer/NuPlayer.cpp
7cc31f737508b7fd3205b9d8f971bffb71498740 29-Apr-2015 Svet Ganov <svetoslavganov@google.com> am afc750aa: Merge "Respect the record audio app op - media" into mnc-dev

* commit 'afc750aa3ac536067180f9714e34f626f8c981b3':
Respect the record audio app op - media
be71aa29a3c86d2e01cd17839d2a72ab09a1bce5 28-Apr-2015 Svet Ganov <svetoslavganov@google.com> Respect the record audio app op - media

Change-Id: I3a97977b6e9a09355e2008f780d22d480fb7308b
ediaPlayerService.cpp
ediaPlayerService.h
ediaRecorderClient.cpp
ediaRecorderClient.h
emoteDisplay.cpp
emoteDisplay.h
tagefrightRecorder.cpp
tagefrightRecorder.h
c0a7e49606b051399341b15856770230061972f5 28-Apr-2015 Ronghua Wu <ronghuawu@google.com> am 4275065e: Merge "DO NOT MERGE libmediaplayerservice: set priority and operating rate for the codec used by nuplayer." into mnc-dev

* commit '4275065e89b121fd2f9bd4e0440577348d5ce663':
DO NOT MERGE libmediaplayerservice: set priority and operating rate for the codec used by nuplayer.
9c3e9c4ffd385abf12823cd3ffe0ee0bc688af76 28-Apr-2015 Marco Nelissen <marcone@google.com> am 31c81e9e: am b8111f83: Merge "Fix potential double close in IMediaMetadataRetriever::setDataSource"

* commit '31c81e9e4a468a448b387d5c905b4ac5c6a014fc':
Fix potential double close in IMediaMetadataRetriever::setDataSource
31c81e9e4a468a448b387d5c905b4ac5c6a014fc 28-Apr-2015 Marco Nelissen <marcone@google.com> am b8111f83: Merge "Fix potential double close in IMediaMetadataRetriever::setDataSource"

* commit 'b8111f8314553504c5872ec2705bfaefa93cf3a9':
Fix potential double close in IMediaMetadataRetriever::setDataSource
8db8813d39e3c8b5fbd580dfc3062830744afd63 22-Apr-2015 Ronghua Wu <ronghuawu@google.com> DO NOT MERGE libmediaplayerservice: set priority and operating rate for the codec used by nuplayer.

Bug: 20481562
Change-Id: I9806414962352fbcda726f8274f1cd348c961de0
(cherry picked from commit f19f5d716b39a5d9dc1abdcd5a16a7aaf1b1ab8b)
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDecoderBase.cpp
uplayer/NuPlayerDecoderBase.h
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
fdec2c1b19e36bb0b9fb7f4f7561ad63e904a560 25-Apr-2015 Jeff Tinker <jtinker@google.com> Merge "Lock drm plugin API calls globally, not per MediaDrm instance"
bb6635d0aa35d6d31ec7de7c0d957720983fdc55 24-Apr-2015 Chong Zhang <chz@google.com> Merge "HLS: make disconnect faster to prevent ANR"
5abbd3dcbb0bb32a3d4b90dddbcf90458967eb6f 21-Apr-2015 Chong Zhang <chz@google.com> HLS: make disconnect faster to prevent ANR

disconnect HTTP connection when we absolutely won't resume

bug: 19890444
Change-Id: Idee36b48741f6f8eb1d65bca32156e9e18349c67
uplayer/NuPlayerDecoder.cpp
f8bd851cc652501239a8e3759b21890dfa2afdea 24-Apr-2015 Robert Shih <robertshih@google.com> Copy sei offset/size during ABuffer/MediaBuffer conversion

Bug: 20537676
Change-Id: I0bd11527ccd022c39d94b7877df81de4da1b14a6
uplayer/GenericSource.cpp
2fb561a6fe9bca79c50a81e90fc4bb4eb18af0be 23-Apr-2015 Jeff Tinker <jtinker@google.com> Lock drm plugin API calls globally, not per MediaDrm instance

Change-Id: I062c662a440a1becccd248c3b8ddf711c51e53cc
related-to-bug: 18394494
related-to-bug: 19664283
rm.cpp
rm.h
38ad9c7d19a0699065b078a0e8dd7ece3d055bf7 23-Apr-2015 Ronghua Wu <ronghuawu@google.com> Merge "libmediaplayerservice: set priority and operating rate for the codec used by recorder."
fdbc1b3a885f1e8a59b1788e48e24ea4c66acbc8 22-Apr-2015 Ronghua Wu <ronghuawu@google.com> libmediaplayerservice: set priority and operating rate for the codec used by recorder.

Bug: 20481562
Change-Id: Ibff54395e00809500d98e3759f9677f8168c98ae
tagefrightRecorder.cpp
c9c3804a2caf3c0f96e7a8985f82db7ceef490df 21-Apr-2015 Chong Zhang <chz@google.com> Merge "HLS: remove no more than 10% of bandwidth history at a time"
81636761bead03f13b4ed9320a7f25ce1354f1ae 21-Apr-2015 Chong Zhang <chz@google.com> HLS: remove no more than 10% of bandwidth history at a time

- fix a 'possible video time jump' after seek, don't update
renderer anchor time for 0-sized audio buffers

- fix another 'possible video time jump' caused by some states
not reset in mStreams

- bandwidth estimator changes to not remove more than 10%
of total transfer duration at a time to avoid jumping up
too quickly

bug: 20267388
related-to-bug: 19864613
related-to-bug: 20138395

Change-Id: I8812332cd1e26bf562acfaf086fd679a3549debc
uplayer/NuPlayerRenderer.cpp
55203e2e29428c2c7bd830d731f5e6ed890d9a10 21-Apr-2015 Taiju Tsuiki <tzik@google.com> Fix potential double close in IMediaMetadataRetriever::setDataSource

IMediaMetadataRetriever::setDataSource(fd, offset, length) takes the ownership
of |fd| on the direct invocation, and doesn't take the ownership on invocation
from Binder. This is inconsintent to other similar methods like
IMediaPlayer::setDataSource, and causes potential double close of |fd|.

This CL changes the caller and implementations to leave the ownership to make
them consistent.
Also, fixes a double close in IMediaPlayerService::setDataSource in an error
case.

Change-Id: Id551a1e725c4392b0fe6b7293871212eb101c0a5
ediaPlayerService.cpp
etadataRetrieverClient.cpp
tagefrightPlayer.cpp
5fde15db465775d5c607cf069752e2e075f8fc6d 21-Apr-2015 Ying Wang <wangying@google.com> Fix mips build.

Change-Id: I49aa83e38e90ebd20793885de9420de96062aa37
ediaPlayerService.cpp
etadataRetrieverClient.cpp
dfe5c4217d440740b47567e05c73018b44d183cd 18-Apr-2015 Chong Zhang <chz@google.com> Merge "NuPlayer: queue a deferred scan sources when flushing during scan"
6d339f1f764bbd32e3381dae7bfa7c6c575bb493 18-Apr-2015 Lajos Molnar <lajos@google.com> libmediaplayerservice: fix warnings, make warnings errors, use clang

Change-Id: I1b2f6b65c5abbc366068a60b8909104f31b94228
ndroid.mk
rypto.cpp
rm.cpp
rm.h
ediaPlayerService.cpp
ediaPlayerService.h
ediaRecorderClient.cpp
ediaRecorderClient.h
etadataRetrieverClient.cpp
etadataRetrieverClient.h
emoteDisplay.h
tagefrightRecorder.cpp
tagefrightRecorder.h
ideoFrameScheduler.h
uplayer/Android.mk
uplayer/GenericSource.cpp
uplayer/NuPlayer.cpp
uplayer/NuPlayerCCDecoder.cpp
uplayer/NuPlayerRenderer.cpp
ests/Android.mk
ests/DrmSessionManager_test.cpp
3b032b3865fd93173aadca0591eeea32853206f9 18-Apr-2015 Chong Zhang <chz@google.com> NuPlayer: queue a deferred scan sources when flushing during scan

also refactor code to move scheduleRequestBuffers to decoder base.

bug: 20267388
Change-Id: I48f16adc6b4d4008f8fcda8b3b01c595ad199f8b
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDecoderBase.cpp
uplayer/NuPlayerDecoderBase.h
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
ee4e1b1a63758941460ae79a064249d3a5189443 17-Apr-2015 Lajos Molnar <lajos@google.com> stagefright: warnings be gone, some are now errors, use clang

Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
uplayer/GenericSource.h
uplayer/NuPlayer.h
uplayer/NuPlayerDecoderBase.h
uplayer/NuPlayerSource.h
2170233c49e50f3986cdc4f726016d6003cb5b8e 17-Apr-2015 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: Maintain the timeStamp after seek"
d3c28f66a48dd450f5f6d8a3ba92a40132bc45de 11-Apr-2015 Haynes Mathew George <hgeorge@codeaurora.org> NuPlayerDriver: Maintain the timeStamp after seek

While offload playback is going on, if user pause
and seeks to new position before offload tear-down,
on resume playback starts from old time-stamp.

Once tear-down happens NuPlayer loses updated time-stamp
so while resuming it resumes playback with stale time-stamp.
Make sure the updated time-stamp is maintained in
NuPlayerDriver which is used while starting the playback
after resume.

authored-by: Sharad Sangle <assangle@codeaurora.org>
Change-Id: Ie125cf0fab1b0a237e67e43b0e5b4a704483ef99
uplayer/NuPlayerDriver.cpp
0852843d304006e3ab333081fddda13b07193de8 08-Apr-2015 Robert Shih <robertshih@google.com> stagefright: initial timed id3 support in hls

Change-Id: I00a8a786b3f4b74742c34770edd94e937abe20a8
uplayer/Android.mk
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
c224ec53a17994fa97ab2f29304647c9f195c51c 16-Apr-2015 Chris Watkins <watk@google.com> Merge "Unhide the android.media.[Media]DataSource interface."
99f31604136d66ae10e20669fb6b5716f342bde0 20-Mar-2015 Chris Watkins <watk@google.com> Unhide the android.media.[Media]DataSource interface.

This allows apps to implement MediaDataSource, which is modeled on
stagefright's DataSource, to supply media data to the framework. This
was already implemented for MediaExtractor, but it was renamed from
DataSource.

MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new
overload: #setDataSource(android.media.MediaDataSource)

Only NuPlayer supports this new data source.

The change introduces:
* IDataSource: The binder interface for DataSource.
* JMediaDataSource: The native counterpart to the java interface. It
implements IDataSource.
* CallbackDataSource: A stagefright DataSource that wraps an
IDataSource.

Change-Id: Ib3c944b49cc8a792c8eb9c85e5015c07f298ebc1
ediaPlayerFactory.cpp
ediaPlayerFactory.h
ediaPlayerService.cpp
ediaPlayerService.h
etadataRetrieverClient.cpp
etadataRetrieverClient.h
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
43cc944ecdc1634dccd92a1aad559f0caa13b53c 15-Apr-2015 Chong Zhang <chz@google.com> fix NuPlayerDecoder discontinuity handling with async mode

bug: 20234224

Change-Id: I317b52b089f1e1432255100ef5f36322a231a399
uplayer/NuPlayerDecoder.cpp
7bef0e14010d2527ac4f8abe26e13fe24c918ed1 13-Apr-2015 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: adjust delay of posting drain audio message based on playback rate."
d9c2e9c81a6f75c4dd6818a3d5075a875d25a2d4 11-Apr-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: adjust delay of posting drain audio message based on playback rate.

Bug: 19196501
Change-Id: I2a98e877ed946e899af0974a0c2397c4146ce349
uplayer/NuPlayerRenderer.cpp
e6109e2f10b43c2cc2561c6fd6633b5f988bd7a9 11-Apr-2015 Lajos Molnar <lajos@google.com> mediaplayer: support async mode for widevine legacy mode

Bug: 14679336
Change-Id: Id224eb8c31ec148ca9a144758cc56ddbf5465f5c
uplayer/NuPlayerDecoder.cpp
421f47ca9c2dcc78584b2bb609c3755483b55155 25-Mar-2015 Marco Nelissen <marcone@google.com> mediaplayer: use async mode in NuPlayer

Bug: 14679336
Change-Id: I5e471a6e13be82a375afc2718599f27cd0255bf5
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
1849570240443d1f75775c205fa658f7070849c6 10-Apr-2015 Jeff Tinker <jtinker@google.com> Add a method to associate MediaDrm session with MediaCrypto

Previously, to associate a MediaDrm session with MediaCrypto,
the MediaDrm sessionId was passed as initData to the MediaCrypto
constructor. This is not ideal for two reasons: it's pretty
obscure and you can't change the association without tearing
down the MediaCodec/MediaCrypto and starting all over. Use
cases like key rotation require being able to update the
MediaDrm session post-construction. This CL addresses both of
these issues.

bug: 19570317
Change-Id: Ieb32d04d61742fc1dee2105dd904690d44c46c7b
rypto.cpp
rypto.h
2fb25c873e1a7f346bd8c7c072a85ca6a74b0e95 01-Apr-2015 Jeff Tinker <jtinker@google.com> Add expiration update and keys change events

In support of unprefixed EME

bug: 19771612
bug: 19771431
Change-Id: Ib19d4c8db25f5b09f9a30ebd4992b668cad9bfc4
rm.cpp
rm.h
c481b5012a5f6cf72e5e93b36f1ed4c9169916f2 07-Apr-2015 Jeff Tinker <jtinker@google.com> Pass crypto source data using a shared buffer

MediaCodec was using a binder transaction buffer
to pass encryption source data for protected content.
On some 4K content, the max binder transaction buffer
size was being exceeded. This change uses a shared
buffer for the encryption source data instead of a
binder transaction buffer, which avoids the problem and
may be more efficient.

bug: 20027687
Change-Id: I36a24ebf600d7e1064b78e48b167fdc29b2c65e9
rypto.cpp
rypto.h
ddd1c72b7d4e407fed59a4f0f45408f1fe9a0cd8 07-Apr-2015 Lajos Molnar <lajos@google.com> Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source"
0a15431888e843c81888760052e7446bbd386030 20-Feb-2015 Chong Zhang <chz@google.com> nuplayer: do not use cached source for wvm content -- DO NOT MERGE

bug: 18730095
Change-Id: Ibd4f54907949daae1d095fa0922050310d16698f
uplayer/GenericSource.cpp
7ada1b9343744ee8ffb74068970faf9af7ce22fc 31-Mar-2015 Lajos Molnar <lajos@google.com> DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source

Bug: 19984798
Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
30f4dfafc6ae73bb2e40deedc9904b8740ab995b 03-Apr-2015 Ronghua Wu <ronghuawu@google.com> Merge "nuplayer: Has video hint for offload"
8b63533e6aaff121378878998925c57dbe9a9e16 31-Mar-2015 Haynes Mathew George <hgeorge@codeaurora.org> nuplayer: Has video hint for offload

Send a hint indicating whether the clip being played has a video stream
from NuPlayer to NuPlayerDecoderPassThrough. This hint is used to open the audio
sink with the correct offload config. Currently, NuPlayerDecoderPassthrough
always calls openAudioSink with hasVideo set to false causing an unnecessary
recreation of AudioTrack.

Change-Id: I7bc6c73818b65f9237a6e606721b7d48e1d807b9
CRs-Fixed: 811510
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoderPassThrough.cpp
fcd3e94c075e964670d946f6ec5d82d059bf9e09 31-Mar-2015 Lajos Molnar <lajos@google.com> mediaplayer: ensure secure decoders are instantiated before starting source

Bug: 19984798
Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
6bedacad9a67bb8eca5b3073ad41bb002207e623 01-Apr-2015 Lajos Molnar <lajos@google.com> am d513b7da: am 31878abb: am 68fca636: mediaplayer: ensure secure decoders are instantiated before starting source

* commit 'd513b7da73be6013daa321e1f8c2e488dec65dcd':
mediaplayer: ensure secure decoders are instantiated before starting source
68fca636ac961c181ee71a49f151c71b564258d0 31-Mar-2015 Lajos Molnar <lajos@google.com> mediaplayer: ensure secure decoders are instantiated before starting source

Bug: 19984798
Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
9bb23ff63e17b91a8480b142975067e8b6ab69ec 27-Mar-2015 Chong Zhang <chz@google.com> Merge "HLS: faster switching and pause/resume on low buffer"
7c8708046117e03c0d38006bdd9685139df3ac6b 18-Mar-2015 Chong Zhang <chz@google.com> HLS: faster switching and pause/resume on low buffer

- when upswitching, discard excessive buffering on low
bandwidth variant, switch to new variant earlier

- when downswitching, report newly found IDR positions
continuously, and switch as soon as new fetcher passes
playback position. This allows us to skip time-consuming
resumeUntil() of old fetcher most of the time

- implement pause/resume on low buffering, and notify
buffering percentage

- buffering parameter tuning, separate pause/resume/ready
buffer level and up/down switch buffer level, boost up
fetcher buffering significantly

bug: 19567254

Change-Id: I750dfcc6f861d78d16a71f501beb86d8129cb048
uplayer/HTTPLiveSource.cpp
91e5e043d766e39b0840f2ca2e658e2fe58987e7 26-Mar-2015 Marco Nelissen <marcone@google.com> Fix seek issue

The removed code was original added to fix a deadlock, but is no longer needed.

Bug: http://b/19947213
Change-Id: I4dd9d6fdf5eb6c0fb654953569dc87b820579f84
uplayer/NuPlayerDriver.cpp
ec648447b7dcab701c436a54bd38a1abd8037be1 24-Mar-2015 Jeff Tinker <jtinker@google.com> Merge "Report key request message type for unprefixed EME"
b588cf22b2e44f20921550412d443fba55b1343e 19-Mar-2015 Wei Jia <wjia@google.com> Merge "mediaplayer: check existence of AudioTrack before trying to access it."
230b188b2c2ed74aa017cb93f847e9a558feba95 19-Mar-2015 Wei Jia <wjia@google.com> mediaplayer: check existence of AudioTrack before trying to access it.

Bug: 19828971
Change-Id: Ib7fdb8bf36e33ef95d21fa5342cd1647fd81ff24
uplayer/NuPlayerRenderer.cpp
d072c909d87f8150433860f6de4c11df6e09e2f9 16-Mar-2015 Jeff Tinker <jtinker@google.com> Report key request message type for unprefixed EME

bug: 19771299
Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
rm.cpp
rm.h
14bcacaed718a506f59e8f3af66e9e0137789da6 16-Mar-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: add ProcessInfo to get process priority.

Bug: 19620911
Change-Id: I240b814b8925b1d6266e6f998a7debd654a2145a
rmSessionManager.cpp
rocessInfoInterface.h
ests/DrmSessionManager_test.cpp
c84eb736fd051c37e1d7e8585d14612713388a58 12-Mar-2015 Chong Zhang <chz@google.com> Merge "nuplayer: remove prefill cache code"
3cb7e0dcc2e915280cb9a5121def8b5277d8a6e6 12-Mar-2015 Chong Zhang <chz@google.com> Merge "NuPlayer: play out pending frames on discontinuity"
c287cad65bd0c7a79e43f4decc5e04593027a7c8 20-Feb-2015 Chong Zhang <chz@google.com> nuplayer: remove prefill cache code

it's only needed if we post Reset to GenericSource's looper, but
we now do reset outside NuPlayer or GenericSource's looper.

also don't allow buffering percentage to go backward unless
there's seek or pause.

Change-Id: I1a39df4bc0a685f76d8558c368db1bac92b490c2
uplayer/GenericSource.cpp
uplayer/GenericSource.h
88b456640085fa0e92d66e42ddaf24449c8c4fdb 11-Mar-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "libmediaplayerservice: fix deadlock in dump()"
330c8e3ff98e4cb78dad28bbacdb127da3e265ac 22-Dec-2014 Ravi Kumar Alamanda <ralama@codeaurora.org> libmediaplayerservice: fix deadlock in dump()

Issue: Calling dump function while the media clients
(sessions) are created and destroyed will result in a deadlock.

Description: MediaPlayerService::dump() takes Mutex while calling
client::dump() and right after that the strong reference to client
is cleared. If there are no references to client object at this moment
(which is the case if multiple audio sessions are created and destroyed)
then the client destructor gets called which tries to take
the same Mutex resulting in a deadlock.

Fix: Take a strong reference to client objects and release them only
after releasing the Mutex.

Bug: 18700631

Author: Sidipotu Ashok<sashok@codeaurora.org>

Change-Id: I82c89771de352d2f0d914eb0a3b9fc7bfb6116b0
ediaPlayerService.cpp
366d92e0b2732406fff4153f6d3d0f7de50a425b 11-Mar-2015 Wei Jia <wjia@google.com> Merge "mediaplayer: update mAnchorNumFramesWritten when anchor time is updated."
8edb3f85f58e8738582e8f9abbc018c85100b712 11-Mar-2015 Wei Jia <wjia@google.com> mediaplayer: update mAnchorNumFramesWritten when anchor time is updated.

This will fix the max duration for anchor time.

Bug: 19196501
Change-Id: I9b8e0775105e31d47d919afaf49ca1e3d608a2f6
uplayer/NuPlayerRenderer.cpp
66704af4d82c2b6303609b29402641f861fdcb19 04-Mar-2015 Chong Zhang <chz@google.com> NuPlayer: play out pending frames on discontinuity

bug: 19567254

Change-Id: Iff689e1eea54283095068d68bcdff4c2674af554
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDecoderBase.cpp
uplayer/NuPlayerDecoderBase.h
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
3f27436a9346f043f52265da1e6a74cde2bffd4d 05-Mar-2015 Lajos Molnar <lajos@google.com> stagefright: don't use ALooperRoster mutex for reply handling

Change replyID-s from uint32_t to an object
Move reply handling into the loopers (to reuse a common mutex)

Bug: 19607784
Change-Id: Iaa035b846c424c5687ed17ce1079b325e86c54be
uplayer/GenericSource.cpp
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoderBase.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
1c2a7a6391a5465cb5b059bb004fbbc884ce1a29 10-Mar-2015 Wei Jia <wjia@google.com> Merge "mediaplayer: move MediaClock from NuPlayer to libstagefright."
5833b6aad2c46ba516bdc8262f4fc4667e8018ed 10-Mar-2015 Wei Jia <wjia@google.com> mediaplayer: move MediaClock from NuPlayer to libstagefright.

Bug: 19666434
Change-Id: I86865e594226419bbbbee217098f96434e43afbe
uplayer/Android.mk
uplayer/MediaClock.cpp
uplayer/MediaClock.h
uplayer/NuPlayerRenderer.cpp
d4164c3a1a209fd470c2f3aac09c1ce2dc319c8b 09-Mar-2015 Ronghua Wu <ronghuawu@google.com> Merge "drm: use DrmSessionManager for session resource managing."
3f451360585af081c5123a7aec3b8cebbf934f84 09-Mar-2015 Ronghua Wu <ronghuawu@google.com> Merge "drm: fix clang warning"
1db71be52d989364e62971e997bea78703bf9f97 09-Mar-2015 Ronghua Wu <ronghuawu@google.com> drm: fix clang warning

Bug: 19265536
Change-Id: Ic22368d1bed5d4226f6be4011a377b57787ac322
ests/DrmSessionManager_test.cpp
b9a23184272a75f1585e8dd64eeccc3a3e621d5f 09-Mar-2015 Warren Rehman <wrehman@google.com> Merge "Defensively check for batterystats service instead of blocking to get it."
5c3da20ddde6d17c3ab3cff7f7ca19f4f484f812 22-Feb-2015 Ronghua Wu <ronghuawu@google.com> drm: use DrmSessionManager for session resource managing.

Bug: 19265536
Change-Id: Ie35184f99c51e7bd94d7c826ffb8e89040a81905
rm.cpp
rm.h
rmSessionManager.cpp
rmSessionManager.h
rocessInfoInterface.h
ests/DrmSessionManager_test.cpp
c4fb3345f114b47c8893ab0482ad850f99f65b7c 06-Mar-2015 Ronghua Wu <ronghuawu@google.com> libmediaplayerservice: fix make file for 64bit build.

Bug: 19265536
Change-Id: I5fa9ca39909b8ae2d6c2da8ac9fd3c4f9863b1f3
ests/Android.mk
2129895bac582be50d3fe067bd5cf5a088863b3a 06-Mar-2015 Ronghua Wu <ronghuawu@google.com> Merge "Add DRM session manager."
10305cc672dcb39b7cc7dc03eeafffb2fea150ec 22-Feb-2015 Ronghua Wu <ronghuawu@google.com> Add DRM session manager.

Bug: 19265536
Change-Id: Ia9f2c94c64ed6c1fe99d54de81d71c8973994865
ndroid.mk
rmSessionClientInterface.h
rmSessionManager.cpp
rmSessionManager.h
rocessInfoInterface.h
ests/Android.mk
ests/DrmSessionManager_test.cpp
1d15ab58bf8239069ef343de6cb21aabf3ef7d78 05-Mar-2015 Lajos Molnar <lajos@google.com> media: switch to new AMessage handling

Bug: 19607784
Change-Id: I94cddcb81f671422ad4982a23dc4acfe57a9f1aa
uplayer/GenericSource.cpp
uplayer/HTTPLiveSource.cpp
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoderBase.cpp
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerStreamListener.cpp
uplayer/NuPlayerStreamListener.h
uplayer/RTSPSource.cpp
uplayer/StreamingSource.cpp
c10e7f121d346b433c32d1c0d791c4b547cbe60e 06-Mar-2015 Robert Shih <robertshih@google.com> Merge "Revert "Fix NuPlayer::Decoder input buffer loss upon seamless format change""
ed849b8266824d4c5df15466e5c02e1471192461 05-Mar-2015 Warren Rehman <wrehman@google.com> Defensively check for batterystats service instead of blocking to get it.

bug: 19189826
Change-Id: I656e863eb68edf22812eb380ec6cd4105f4000aa

On branch checkbattstats
Changes to be committed:
modified: MediaPlayerService.cpp
ediaPlayerService.cpp
c8206ffa7d2361dd89c09166ff85ca6396babe28 04-Mar-2015 Wei Jia <wjia@google.com> mediaplayer: call setPlaybackRate after Renderer has looper set up.

Bug: 19196501
Change-Id: Iaac34a4a9e095799eb60e7d7a9bc228f0c7212b6
uplayer/NuPlayer.cpp
62ca0231787d5fe23ee95c482d15b8434add2427 04-Mar-2015 Robert Shih <robertshih@google.com> Revert "Fix NuPlayer::Decoder input buffer loss upon seamless format change"

This reverts commit c5eef08195a6f81c2ae8fe7d4c346f12b15944e5.

Change-Id: I49d817ed367aaa29a93e22135e9adf1e2ad253f1
uplayer/NuPlayerDecoder.cpp
e8c9a8f78a9f9213060e5d54a15cde364df3e0d0 04-Mar-2015 Robert Shih <robertshih@google.com> Merge "Fix NuPlayer::Decoder input buffer loss upon seamless format change"
7d3f4df0a77e052a7d37de9268aff8c2ed0909cc 04-Mar-2015 Wei Jia <wjia@google.com> mediaplayer: use non-blocking mode for AudioSink::write().

This cherry picks https://googleplex-android-review.git.corp.google.com/#/c/643541/ to master.

Bug: 19448263
Change-Id: I43dea830212de79c2b080185b6c6b36078f517d2
ediaPlayerService.cpp
ediaPlayerService.h
uplayer/NuPlayerRenderer.cpp
212765f2d5ee6e533f3d032d6609125faa95bf48 26-Feb-2015 Wei Jia <wjia@google.com> Merge "mediaplayer: support dynamic playback rate"
9816016afb2a13c6a866cd047d57020566a8b9a9 05-Feb-2015 Wei Jia <wjia@google.com> mediaplayer: support dynamic playback rate

Bug: 19196501

Change-Id: I856b1507d5fa2cedfb645706d2435683a7d3e050
ediaPlayerService.cpp
ediaPlayerService.h
uplayer/MediaClock.cpp
uplayer/MediaClock.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
9ee53a49860e91c2b012883eef09d669a7829e06 21-Feb-2015 Chong Zhang <chz@google.com> MediaRecorder: pass capture fps in float

bug: 19460202

Change-Id: Ic8f2dc02dfd482c4b2065b16e28721fc6e3cf696
tagefrightRecorder.cpp
tagefrightRecorder.h
96faa25f4aea2c792523ae920da91f919f5ea392 23-Feb-2015 Chong Zhang <chz@google.com> Merge "MPEG4Writer: add capture fps in meta data"
e76dba7af9589d9ed7b116eec3a74168a8352925 19-Feb-2015 Chong Zhang <chz@google.com> MPEG4Writer: add capture fps in meta data

bug: 19460202

Change-Id: I3a6ea3a5149d124ca9a2487a300dcc2db4405d0f
tagefrightRecorder.cpp
fc6cfd8343ae8919e85ec22efed9df626fe8854b 20-Feb-2015 Chong Zhang <chz@google.com> nuplayer: do not use cached source for wvm content

bug: 18730095
Change-Id: Ibd4f54907949daae1d095fa0922050310d16698f
uplayer/GenericSource.cpp
c5eef08195a6f81c2ae8fe7d4c346f12b15944e5 21-Feb-2015 Robert Shih <robertshih@google.com> Fix NuPlayer::Decoder input buffer loss upon seamless format change

Bug: 19462710
Change-Id: I30f2ab76785a524e95b404b8b18ddc862e9c414e
uplayer/NuPlayerDecoder.cpp
1f9b6745d7c88dac2bfd19d583c3d98b361f67b3 19-Feb-2015 Bill Yi <byi@google.com> Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEAD
1fb8290c1f99e1db96b681e6eaae0193ea81674e 19-Feb-2015 Marco Nelissen <marcone@google.com> am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"

* commit 'a7c1df10d39a8056ca755ccd77b06816c6de3225':
Add dumpsys info
a7c1df10d39a8056ca755ccd77b06816c6de3225 18-Feb-2015 Marco Nelissen <marcone@google.com> am a963dacc: am 64753517: Merge "Add dumpsys info"

* commit 'a963dacc1b44ec80742c86ce75611eb9cfa936ea':
Add dumpsys info
a963dacc1b44ec80742c86ce75611eb9cfa936ea 18-Feb-2015 Marco Nelissen <marcone@google.com> am 64753517: Merge "Add dumpsys info"

* commit '64753517e8ee315654441512a1f59b28fe5c1bc1':
Add dumpsys info
f09611f2f33752afc28141e1bbaa897651c05d6f 13-Feb-2015 Marco Nelissen <marcone@google.com> Add dumpsys info

Print a list of looper-handler pairs and the number of messages
they've processed, and optionally break those stats out by
message type.

Change-Id: I68ce4a7003152d5c9b5cb3f42e6f3949b471aa6e
ediaPlayerService.cpp
e2cce8139fb5a205170d4e878cc9fea5493755d1 12-Feb-2015 Chong Zhang <chz@google.com> Merge "process all SEI messages for CC extraction"
78acc89eae9789366b6384707861f4563addf2d3 07-Feb-2015 Chong Zhang <chz@google.com> process all SEI messages for CC extraction

bug: 19297083
Change-Id: I5b89e35cc2bd5fb2f332872941e7978f15a6f403
uplayer/NuPlayerCCDecoder.cpp
uplayer/NuPlayerCCDecoder.h
49c9a53d098091791b0e6e2d97ce6bf0d562d17e 11-Feb-2015 Lajos Molnar <lajos@google.com> resolved conflicts for merge of 157defdd to master

Change-Id: I14fd8063fa052f16868b8053a211190092131317
157defdde7013062bbd04f7e873b6856adce14ca 10-Feb-2015 Lajos Molnar <lajos@google.com> am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-dev

* commit '4fc5d758d6722bedf341e5d93a0ba5698c658c29':
nuplayer: acquire wakelock during offload pause timeout
c9f122d8f32ba6928ac9087448025fa3bed1553d 03-Feb-2015 Zhijun He <zhijunhe@google.com> StageFrightRecorder: update setVideoFrameRate sanity check

Allow high speed recording fps to be up to 1000fps

Change-Id: I975d11b8a9abbd50ce6982fb46f4a4a3a035e475
tagefrightRecorder.cpp
tagefrightRecorder.h
35d5af131c9d4962e935082f204ccd6a2130861c 28-Jan-2015 Weiyin Jiang <wjiang@codeaurora.org> nuplayer: acquire wakelock during offload pause timeout

Hold a wakelock while paused in audio offload mode, until audio
teardown event is received, or pause is canceled.

Since ARM cores are sleeping, the delayed AMessage will not be
received, and the audio output driver will not be closed.
This blocks XO shutdown.

Bug: 19297092
Change-Id: I3d11fef633e3f2783f4aa31e71285e2fa09d234c
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
abc4872bb8af6699c8c5fc285a538bf492c51748 06-Feb-2015 Chong Zhang <chz@google.com> am 78a0d1ac: am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-dev

* commit '78a0d1acd4cb7103bba349f8a23fd1814bed483b':
reuse CCDecoder on video discontinuity
78a0d1acd4cb7103bba349f8a23fd1814bed483b 06-Feb-2015 Chong Zhang <chz@google.com> am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-dev

* commit '04d2804a212c2625425cb23b2b778ab4f3683769':
reuse CCDecoder on video discontinuity
13cfe85ae9f4daab1d0bfcd248fc2576585e259a 05-Feb-2015 Chong Zhang <chz@google.com> Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-dev
b96efd3cd7ff49e85049a1515b8bb3b7514dce0b 05-Feb-2015 Wei Jia <wjia@google.com> Merge "mediaplayer: Add MediaClock component and use it in NuPlayerRenderer."
341ab6eebb6a992ec7bdf095420cf82bcab1c6b3 04-Feb-2015 Chong Zhang <chz@google.com> reuse CCDecoder on video discontinuity

bug: 19266084
Change-Id: I06ef57b09b048a85f77be4dee27599c4f60aacc9
uplayer/NuPlayer.cpp
c9fcfb923bb891d980238d47f33fdf488f758dc2 04-Feb-2015 Chong Zhang <chz@google.com> am 07840f75: am 3a7ed550: am efbb6195: NuPlayer: pause playback when buffering is low

* commit '07840f7544de883fe5c00cbd18bc6458a20e2691':
NuPlayer: pause playback when buffering is low
07840f7544de883fe5c00cbd18bc6458a20e2691 04-Feb-2015 Chong Zhang <chz@google.com> am 3a7ed550: am efbb6195: NuPlayer: pause playback when buffering is low

* commit '3a7ed550579b5ecd99439c44ce13a48b3f0639ae':
NuPlayer: pause playback when buffering is low
7b15cb33847e6282ea8352c98894683b796127f3 04-Feb-2015 Wei Jia <wjia@google.com> mediaplayer: Add MediaClock component and use it in NuPlayerRenderer.

Also fix some racing conditions, remove unused code in NuPlayerRenderer.

This obsoletes https://googleplex-android-review.git.corp.google.com/#/c/609880/.

Bug: 19196501
Change-Id: I0eebeb573ce7229dd8bacecd0e1c5d6f5634a72f
uplayer/Android.mk
uplayer/MediaClock.cpp
uplayer/MediaClock.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
efbb61950db36a5eb789be83f077246172507c67 31-Jan-2015 Chong Zhang <chz@google.com> NuPlayer: pause playback when buffering is low

also fix buffering percentage report (should be the buffered position)

bug: 18730095
Change-Id: I11e7ca4ba9e772a1ae76861ca1ff1725b62f65ae
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
d7dbf4179aa87a018d4a8a4cd0958a5ed5d7fe5f 02-Feb-2015 Robert Shih <robertshih@google.com> am 82bbd248: am c37a6e6b: am 7a434265: Merge "Wrong format used in seamless check" into lmp-mr1-dev

* commit '82bbd248d0578e5da04aa95d9906006275c330b5':
Wrong format used in seamless check
82bbd248d0578e5da04aa95d9906006275c330b5 02-Feb-2015 Robert Shih <robertshih@google.com> am c37a6e6b: am 7a434265: Merge "Wrong format used in seamless check" into lmp-mr1-dev

* commit 'c37a6e6bbe038cf94d11abdb6f8003e7476e11af':
Wrong format used in seamless check
7a4342651cc6539fc9a8775ce1e322a47adeda78 31-Jan-2015 Robert Shih <robertshih@google.com> Merge "Wrong format used in seamless check" into lmp-mr1-dev
7abbd4c954e26fb69235831e11090ad61cec7b94 30-Jan-2015 joakim johansson <joakim.c.johansson@sonymobile.com> Wrong format used in seamless check

The targetFormat that is sent to supportsSeamlessFormatChange
function corresponds to the data in mInputFormat but the format
provided is the output format, so the check will always return
false.

Use the input format instead.

Bug: 18821145
Change-Id: Iea3cbd59e423da5f2f813e98505b40dc341061b8
uplayer/NuPlayerDecoder.cpp
2ac21a5d35591acc7f7ff4f85fda146ebeaa2551 28-Jan-2015 Wei Jia <wjia@google.com> am 5fcd4d19: am 0bd5274e: am 231406d5: NuPlayerRenderer: return current real time as render time for video frame when paused.

* commit '5fcd4d19e95d5237fef46b1dec8b6f649ea64b84':
NuPlayerRenderer: return current real time as render time for video frame when paused.
5fcd4d19e95d5237fef46b1dec8b6f649ea64b84 28-Jan-2015 Wei Jia <wjia@google.com> am 0bd5274e: am 231406d5: NuPlayerRenderer: return current real time as render time for video frame when paused.

* commit '0bd5274ef93eae389cd7da89e163b1a5b67a47e1':
NuPlayerRenderer: return current real time as render time for video frame when paused.
980b106908cb8e105bb8849749722c5088e2f6eb 28-Jan-2015 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 9391844d to master

Change-Id: I348a71d1b3e3238bc3871a69454edc8247d03111
231406d597cca1c9c009f870fbb62e46b8475186 27-Jan-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: return current real time as render time for video frame when paused.

This allows video to display immediately during seeking in paused state.
Also fix some racing condition.

Bug: 19153026
Change-Id: I0d7a8981ca3c121f5dbc430c2c6d8b7522edc24a
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
9391844deb3f6a442745cea62f78aca2cea19e50 27-Jan-2015 Marco Nelissen <marcone@google.com> resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aosp

Change-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72
b955b7224382b488a4d8d5663c92118feb8deb1e 27-Jan-2015 Marco Nelissen <marcone@google.com> am 47deb15e: Merge "Remove MediaPlayerService::decode()"

* commit '47deb15e99cbf60e558027e074b7415c95637943':
Remove MediaPlayerService::decode()
b7848f1c442bc8c71020957948d1b003a62a25b7 04-Dec-2014 Marco Nelissen <marcone@google.com> Remove MediaPlayerService::decode()

and make SoundPool use MediaCodec for decoding files to PCM.

Bug: 18239054
Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
ediaPlayerService.cpp
ediaPlayerService.h
uplayer/NuPlayerDriver.cpp
50870c983127f2c9e0a3c04a46ea7c24ad2271cf 16-Jan-2015 Chong Zhang <chz@google.com> am 4beddcf5: am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not available" into lmp-mr1-dev

* commit '4beddcf5130bd24847c1e87696f864df41d42cae':
do not use paused postition if it's not available
4beddcf5130bd24847c1e87696f864df41d42cae 16-Jan-2015 Chong Zhang <chz@google.com> am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not available" into lmp-mr1-dev

* commit '9e308de9214e55dd0d102484ea44b117ec050540':
do not use paused postition if it's not available
4d4ea7f7ca04cfe70ecf6f35658389f52ae6d3c1 16-Jan-2015 Chong Zhang <chz@google.com> Merge "do not use paused postition if it's not available" into lmp-mr1-dev
cec7febc48ff76b293ace0cc12a6288f13f72293 15-Jan-2015 Chong Zhang <chz@google.com> do not use paused postition if it's not available

bug: 18896133
bug: 18996505
Change-Id: I1e24fabe3fe8f2275b1ccc0df100cb2c4ba2264b
uplayer/NuPlayerRenderer.cpp
5f3194c9efeadc200c89d9e2b00a19f1afeac55d 14-Jan-2015 Wei Jia <wjia@google.com> MidiFile: report correct state during transient period when start() is called first time.

Bug: 18905421
Bug: 18994222
Change-Id: Iee47043e60740fab9e62aa28db4cbcec4f339c22
idiFile.cpp
17c933cc07be9656aee8afc82dc866a67b3fd78e 14-Jan-2015 Marco Nelissen <marcone@google.com> am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"

* commit 'cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f':
Replace MidiFile player with a Midi extractor
cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f 14-Jan-2015 Marco Nelissen <marcone@google.com> am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"

* commit '724b9ea51db0c191cc3184319719a38b5a1f6502':
Replace MidiFile player with a Midi extractor
8840754c5bc44c7e11ed5e9acc15e9569f5814c5 08-Jan-2015 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aosp

Change-Id: Ic9841f0a66930f57a5ebea527c6a841d7c49cccf
0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7 08-Jan-2015 Marco Nelissen <marcone@google.com> Replace MidiFile player with a Midi extractor

This gets rids of a bunch of special midi handling and replaces it
with an extractor that works with NuPlayer and MediaMetadataRetriever.

Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
ndroid.mk
ediaPlayerFactory.cpp
ediaPlayerService.cpp
etadataRetrieverClient.cpp
idiFile.cpp
idiFile.h
idiMetadataRetriever.cpp
idiMetadataRetriever.h
2702d5a073dce89fa3d97c304264b719b187c9fe 08-Jan-2015 Marco Nelissen <marcone@google.com> am c52af00b: Merge "Use callbacks for Midi I/O"

* commit 'c52af00beda4477d0fd00c3071e6ffd9c465430b':
Use callbacks for Midi I/O
bc11e713063f3f96f98256abc81c0d8ee1ddb312 08-Jan-2015 Marco Nelissen <marcone@google.com> Use callbacks for Midi I/O

Instead of having the Sonivox engine directly open the file and
use stdio to read from it, use caller-provided callbacks.

Change-Id: Ie55129109060a4a7862fee3177f994401e00b6c1
ediaPlayerFactory.cpp
idiFile.cpp
idiFile.h
32479c9f7a004d2c1daeac015684529b0158f8a4 08-Jan-2015 Chong Zhang <chz@google.com> am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to disable capture" into lmp-mr1-dev

* commit '7993d6b343f2723872dac085756743630371454d':
mark any copyrighted content as protected to disable capture
7993d6b343f2723872dac085756743630371454d 08-Jan-2015 Chong Zhang <chz@google.com> am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to disable capture" into lmp-mr1-dev

* commit 'e03447548d1c56fa9875cac7d500f1012a6b5c26':
mark any copyrighted content as protected to disable capture
1713460104b86f6be3a5d9993d9ace864d889b2d 08-Jan-2015 Chong Zhang <chz@google.com> mark any copyrighted content as protected to disable capture

bug: 18916274
Change-Id: I23f096b51433bf18a10dc5fe6dc6b75c3881c340
uplayer/GenericSource.cpp
uplayer/NuPlayer.cpp
uplayer/NuPlayerSource.h
64cbdee08a18b25448a5fb0b058d3b83d5630d7f 29-Dec-2014 Andy Hung <hunga@google.com> am 545d5c41: am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate AudioTrack if not needed" into lmp-mr1-dev

* commit '545d5c41f04ec591bd0f034434b6d65ffd4c4c9c':
NuPlayer: Do not recreate AudioTrack if not needed
545d5c41f04ec591bd0f034434b6d65ffd4c4c9c 29-Dec-2014 Andy Hung <hunga@google.com> am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate AudioTrack if not needed" into lmp-mr1-dev

* commit '69bdf92f3e20147a08194da45e3c61ac7f16d280':
NuPlayer: Do not recreate AudioTrack if not needed
0d19abb440c7e62e944efbeadf02299990f9a589 23-Dec-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Do not recreate AudioTrack if not needed" into lmp-mr1-dev
54bf12b85e666417957231dc06db200c6f140253 22-Dec-2014 Marco Nelissen <marcone@google.com> am af318e28: am 0b87c0d9: am bd08223c: Merge "Fix double close."

* commit 'af318e2882e0b8b1a594f079eb3d10b2daa3ff7e':
Fix double close.
af318e2882e0b8b1a594f079eb3d10b2daa3ff7e 22-Dec-2014 Marco Nelissen <marcone@google.com> am 0b87c0d9: am bd08223c: Merge "Fix double close."

* commit '0b87c0d9e074384d05e6563c1b1cf5dbd5246436':
Fix double close.
0b87c0d9e074384d05e6563c1b1cf5dbd5246436 22-Dec-2014 Marco Nelissen <marcone@google.com> am bd08223c: Merge "Fix double close."

* commit 'bd08223c450a7a2e8e8d79e6be148ed1ac64caa3':
Fix double close.
bd08223c450a7a2e8e8d79e6be148ed1ac64caa3 22-Dec-2014 Marco Nelissen <marcone@google.com> Merge "Fix double close."
8f26056ce83bc50da4751be20b8defc08f55294e 22-Dec-2014 Marco Nelissen <marcone@google.com> Merge "Replace MidiFile player with a Midi extractor"
f0e83644637bd05852c244df481f21a0d435ff66 20-Dec-2014 Andy Hung <hunga@google.com> NuPlayer: Do not recreate AudioTrack if not needed

On output format change from the decoder, check if a new audio
track is really needed. This prevents excessive track
creation/destruction during seeks.

Bug: 18817027
Change-Id: I4290dcb90cb35bc1303b025e162f6b813d49a05b
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
8e883a15d950c461f258104d7fe5c3c81c1db0de 19-Dec-2014 Wei Jia <wjia@google.com> am bae511e3: am 4af263bd: am ad019236: Merge "NuPlayer: reports paused position in paused state." into lmp-mr1-dev

* commit 'bae511e3b982355fbc75ae2ba13bb88feab9fe8c':
NuPlayer: reports paused position in paused state.
bae511e3b982355fbc75ae2ba13bb88feab9fe8c 19-Dec-2014 Wei Jia <wjia@google.com> am 4af263bd: am ad019236: Merge "NuPlayer: reports paused position in paused state." into lmp-mr1-dev

* commit '4af263bd15a8177f1e28a53a2765277022d7372e':
NuPlayer: reports paused position in paused state.
ad019236b9bc4a030c2740fd9cfdd0670b118d5c 19-Dec-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: reports paused position in paused state." into lmp-mr1-dev
68586a6c3d8ce45c054bb7e7c3c38f70f3e167fd 19-Dec-2014 Andy Hung <hunga@google.com> am 01a7aaf2: am 823ee706: am d4b056da: Merge "NuPlayer: Fix failure to stop audio playback" into lmp-mr1-dev

* commit '01a7aaf2cec81edbdc2bb62a5a46594312cce078':
NuPlayer: Fix failure to stop audio playback
01a7aaf2cec81edbdc2bb62a5a46594312cce078 19-Dec-2014 Andy Hung <hunga@google.com> am 823ee706: am d4b056da: Merge "NuPlayer: Fix failure to stop audio playback" into lmp-mr1-dev

* commit '823ee7067a7d525a88d4ba55780e98975cfed6fc':
NuPlayer: Fix failure to stop audio playback
d4cdba18ba7d0057ae54ec7efa5871b1a9d8beca 18-Dec-2014 Wei Jia <wjia@google.com> NuPlayer: reports paused position in paused state.

Bug: 18733773
Change-Id: I993a4bf108913ab98a0294d7dcf7605349f7029b
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
3491232a7c0d953fa021f6a81baee64c44f364f3 19-Dec-2014 Andy Hung <hunga@google.com> NuPlayer: Fix failure to stop audio playback

Don't stop audio sink if gapless - it's not necessary and has
a side effect of resetting the AudioTrack frames written
without resetting the AudioSink frames written.

Bug: 18787619
Change-Id: I71063b9e3aad9a6dfd7d46ea614e107c815e4c57
uplayer/NuPlayerRenderer.cpp
faf4efc6a41e88adf85f76f48f020a6d681f5ff1 17-Dec-2014 Marco Nelissen <marcone@google.com> Replace MidiFile player with a Midi extractor

This gets rids of a bunch of special midi handling and replaces it
with an extractor that works with NuPlayer and MediaMetadataRetriever.

Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
ndroid.mk
ediaPlayerFactory.cpp
ediaPlayerService.cpp
etadataRetrieverClient.cpp
idiFile.cpp
idiFile.h
idiMetadataRetriever.cpp
idiMetadataRetriever.h
f06060f9544c71ebdc1e0b1b8d73f6cb275e6311 07-Nov-2014 Ronghua Wu <ronghuawu@google.com> DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from timeout teardown.

Also always recheck if a new stream can do offload.

Bug: 18154425
Change-Id: I121877834bd963eeeba91a2b951fd30d5dc36a8b
uplayer/NuPlayer.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
8b67ce7210caa4f119a687e9b0946b339db08265 19-Nov-2014 Ronghua Wu <ronghuawu@google.com> DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed.

Also rememeber the pause time in NuPlayerDriver.

Bug: 18436336
Change-Id: If09f680a0d0f9137bd55c5f94201eb3aa783278a
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerRenderer.cpp
cb57f34c3933e68e65f37f494b797f00063082a2 16-Dec-2014 Marco Nelissen <marcone@google.com> Merge "Use callbacks for Midi I/O"
08b9e2d113213c37506a416bc95a36789bcab4ca 16-Dec-2014 Marco Nelissen <marcone@google.com> Use callbacks for Midi I/O

Instead of having the Sonivox engine directly open the file and
use stdio to read from it, use caller-provided callbacks.

Change-Id: I4d775c8458c48c591a15794c4517e006dcf034e1
ediaPlayerFactory.cpp
idiFile.cpp
idiFile.h
abb627e4e971e134e1618d9fb602f23696717c6a 15-Dec-2014 Jeff Tinker <jtinker@google.com> am d1f0f143: am 42818cca: am 9f932418: Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-dev

* commit 'd1f0f143fecd65c0987691fd33ee3975708479ec':
Fix for apps that forget to use widevine:// urls
d1f0f143fecd65c0987691fd33ee3975708479ec 15-Dec-2014 Jeff Tinker <jtinker@google.com> am 42818cca: am 9f932418: Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-dev

* commit '42818cca55fa4e4faca5b5686c7930070c2bf434':
Fix for apps that forget to use widevine:// urls
f1596a66a32072d8cdf7b5e877bdaea7033b761b 15-Dec-2014 Wei Jia <wjia@google.com> am dc039672: am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable." into lmp-mr1-dev

* commit 'dc039672b8fad7746200ecc36304d0e85db4f367':
NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable.
9f932418856844c6b8242d4c921654d0cc6af754 15-Dec-2014 Jeff Tinker <jtinker@google.com> Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-dev
dc039672b8fad7746200ecc36304d0e85db4f367 15-Dec-2014 Wei Jia <wjia@google.com> am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable." into lmp-mr1-dev

* commit 'a0b3a0a46dc42eafe620ffd053604515bbd9ca9a':
NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable.
6e430fbd927b9cc043639eb728ddc921392a60e8 15-Dec-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable." into lmp-mr1-dev
661a5270303392bbf22eaa459961e6ab7b26b529 13-Dec-2014 Jeff Tinker <jtinker@google.com> Fix for apps that forget to use widevine:// urls

bug: 18554455

Change-Id: I8ff08e7270c65c375205169eb068f361f2a4a727
uplayer/GenericSource.cpp
895651b07fec30b0f9b0d2499599a179d95c9be4 11-Dec-2014 Wei Jia <wjia@google.com> NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable.

LiveSession: return -1 for duration when it's not available.

Bug: 18599325
Change-Id: Iecd040f48750806f98d1799e2aaab2f90c6f3887
uplayer/NuPlayer.cpp
9ae34ec4f2a78d98643cf8428cd8eafdc48e6245 11-Dec-2014 Lajos Molnar <lajos@google.com> am b6ac4d49: am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before setDataSource

* commit 'b6ac4d49e468e155aa1591f3c400e1c06442e7b1':
mediaplayer: allow setVideoSurface before setDataSource
b6ac4d49e468e155aa1591f3c400e1c06442e7b1 11-Dec-2014 Lajos Molnar <lajos@google.com> am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before setDataSource

* commit '2253b3c50ee4b89349553f42edf676ce8579e680':
mediaplayer: allow setVideoSurface before setDataSource
f484952edd94c1b7ee82d7b108edc1ce08671cc4 11-Dec-2014 Lajos Molnar <lajos@google.com> mediaplayer: allow setVideoSurface before setDataSource

Bug: 18709604
Change-Id: I41e4734faed48b5583feb29896cd5783b8cd7e33
uplayer/NuPlayer.cpp
e62e2637458931d20623b76d0080a56c2f316334 10-Dec-2014 Marco Nelissen <marcone@google.com> am a2bc118c: am 2a0f484e: am a04c05ab: Merge "Truncate file before recording into it."

* commit 'a2bc118cfe860f9c108ba089b021d3b003185c56':
Truncate file before recording into it.
a2bc118cfe860f9c108ba089b021d3b003185c56 10-Dec-2014 Marco Nelissen <marcone@google.com> am 2a0f484e: am a04c05ab: Merge "Truncate file before recording into it."

* commit '2a0f484e7d95490274e77cd4adc01592cfdf6e3a':
Truncate file before recording into it.
a04c05ab9c0cdca30952a687f9f5bd909c28b86a 10-Dec-2014 Marco Nelissen <marcone@google.com> Merge "Truncate file before recording into it."
69113e8ccc30fbdb8733ca2070bd3491b21e656d 10-Dec-2014 Marco Nelissen <marcone@google.com> Truncate file before recording into it.

Recording into an existing file of non-zero length could leave old
data in the file after the recording ends. Best case that wastes
space, worst case it results in a file that's considered corrupt
on playback.

Change-Id: I2c77a107603b2b36790958360ff0856c2b28d677
tagefrightRecorder.cpp
c6ac859f5a82ea8642bc6351a45508a15f224f32 08-Dec-2014 Marco Nelissen <marcone@google.com> Remove filename based writer constructors

MediaPlayerService can't open files (it needs an already opened
file descriptor), so these were just wasting space.

Change-Id: I323044a6c1814a7bff952ed71b5c7792df2abf03
ediaRecorderClient.cpp
ediaRecorderClient.h
tagefrightRecorder.cpp
tagefrightRecorder.h
8593c3b74b059861fdaa6ca6a913597849fe9ae1 10-Dec-2014 Lajos Molnar <lajos@google.com> am 33cc5c91: am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"

* commit '33cc5c91e4bb9152ed122afacf7423e085420ac8':
Fix build with clang in C++11 mode
dd6d93e245d53519465e6c050c57e5f0ea179e27 10-Dec-2014 Lajos Molnar <lajos@google.com> am 3ca2794e: am 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for legacy DRM

* commit '3ca2794ed49b683ea2a8239b2eea301483ec196b':
mediaplayerservice: add support for legacy DRM
230e8b2b843666c2803d6b3ea3a5276381b1ecfb 10-Dec-2014 Wei Jia <wjia@google.com> am 1ed99f0c: am 2b02f140: am 80c57d57: Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev

* commit '1ed99f0c1b9d7c4fbf2a59b3aeeb4901cc536e5c':
NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition.
a7da121b3dc0097fa92dd29350efea3cf915dfae 10-Dec-2014 Chong Zhang <chz@google.com> am e4fe1b62: am 876c21b1: am a147c17a: Merge "fixes for non-secure widevine playback" into lmp-mr1-dev

* commit 'e4fe1b62b37eefe8b88aeeea896d2b3851d32480':
fixes for non-secure widevine playback
33cc5c91e4bb9152ed122afacf7423e085420ac8 09-Dec-2014 Lajos Molnar <lajos@google.com> am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"

* commit 'f143b60856d275a9dcda1f3084c768655b242022':
Fix build with clang in C++11 mode
33edcf10489f783a5659ff89ceaca02828496053 09-Dec-2014 Andy Hung <hunga@google.com> am 5f480891: am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-dev

* commit '5f480891e5818f111f431ae69b4c1354e302242a':
Fix NuPlayer assertion on failure to create AudioTrack
c962ac8a8ae14764bbf8e99cc227746c9656b179 09-Dec-2014 Chong Zhang <chz@google.com> am 3202a2dc: am 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource and StreamingSource" into lmp-mr1-dev

* commit '3202a2dc337a3f4eb5410781e35f1ca0a1428615':
fix threading in RTSPSource and StreamingSource
3ca2794ed49b683ea2a8239b2eea301483ec196b 08-Dec-2014 Lajos Molnar <lajos@google.com> am 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for legacy DRM

* commit '0b672c8bc2d96db90c97cf3673e2d3650c96d945':
mediaplayerservice: add support for legacy DRM
1ed99f0c1b9d7c4fbf2a59b3aeeb4901cc536e5c 08-Dec-2014 Wei Jia <wjia@google.com> am 2b02f140: am 80c57d57: Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev

* commit '2b02f140d6a54ec2a704449463eb2c1ba760ddfb':
NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition.
e4fe1b62b37eefe8b88aeeea896d2b3851d32480 08-Dec-2014 Chong Zhang <chz@google.com> am 876c21b1: am a147c17a: Merge "fixes for non-secure widevine playback" into lmp-mr1-dev

* commit '876c21b1c10c953fac6acefdfb2cb8658cb462db':
fixes for non-secure widevine playback
5f480891e5818f111f431ae69b4c1354e302242a 08-Dec-2014 Andy Hung <hunga@google.com> am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-dev

* commit '4c56f8e0329cbdd0f3406bde96fc6f0bba65664d':
Fix NuPlayer assertion on failure to create AudioTrack
3202a2dc337a3f4eb5410781e35f1ca0a1428615 08-Dec-2014 Chong Zhang <chz@google.com> am 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource and StreamingSource" into lmp-mr1-dev

* commit '7cc9a1c59af8a583d33971c0d12e32dc66f742a5':
fix threading in RTSPSource and StreamingSource
ca7b4bc40604ae4f06718cb34945fdab278987ae 06-Dec-2014 Lajos Molnar <lajos@google.com> mediaplayerservice: add support for legacy DRM

Legacy DRM uses AwesomePlayer for widevine content.

Bug: 18006370
Change-Id: I1de9e33de51b60352a9c79c2dcedec330160abe4
ediaPlayerFactory.cpp
80c57d570238f9f213ccfe818e285090daeafd63 06-Dec-2014 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev
474d7c778b63aa33dcf25a92e23a52c1c47f0ac1 05-Dec-2014 Wei Jia <wjia@google.com> NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition.

NuPlayerDecoder: Notify resume is done when EOS is reached.

GenericSource: add code to signal pre-roll for seek so that it will seek to the requested position,
not only I-frame. This code is disabled temporarily till we have a full solution to handle both
single seek and continous seek gracefully.

Bug: 18625723
Change-Id: I99a54d4d549e0d805e3abcc227fbf96c16405af0
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerRenderer.cpp
42e8153cf7271b572e4a94ade332b68521977f36 01-Dec-2014 Chong Zhang <chz@google.com> fixes for non-secure widevine playback

- separate secure decoding from widevine

- use non-blocking mode when reading from widevine source

- schedule buffer read when packet source is empty

bug: 18536934
Change-Id: I65a8e5e819975ca6900ed8e887a442940f2d5d38
uplayer/GenericSource.cpp
uplayer/GenericSource.h
b65842dd9447a7925046b2285b2aa8459dc63ed3 05-Dec-2014 Andy Hung <hunga@google.com> Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-dev
73cdb2fd391a8f7f939f8a9104a8ae2b2838bae5 04-Dec-2014 Wei Jia <wjia@google.com> am c7883e6a: am b783a705: am ab05b4cc: StreamingSource: check mTSParser before dereferencing it.

* commit 'c7883e6a5381bbc96029f2dc9f949d6b2f8b3558':
StreamingSource: check mTSParser before dereferencing it.
180d1b96ee2312f1056a58e26884a89d25ab62c8 03-Dec-2014 Chong Zhang <chz@google.com> fix threading in RTSPSource and StreamingSource

Bug: 18532335

Change-Id: I9c34401a928dc0ddbd0923aa5f127dc628efbb92
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
uplayer/StreamingSource.cpp
uplayer/StreamingSource.h
202bce11a7f66f27e6dbb6d154ddc123aa62513d 03-Dec-2014 Andy Hung <hunga@google.com> Fix NuPlayer assertion on failure to create AudioTrack

Under heavy media load or monkey/stress testing, more than
32 AudioTracks may be created or memory resources may be scarce.
Remove the assertion on failure to create AudioTrack
and signal MEDIA_ERROR.

Bug: 17319843
Change-Id: I5d4e200b5f50d800046851a33e035cdc6ff10075
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDecoderBase.cpp
uplayer/NuPlayerDecoderBase.h
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
c7883e6a5381bbc96029f2dc9f949d6b2f8b3558 03-Dec-2014 Wei Jia <wjia@google.com> am b783a705: am ab05b4cc: StreamingSource: check mTSParser before dereferencing it.

* commit 'b783a70593c85493a2578dd8fbd7935f1bf00420':
StreamingSource: check mTSParser before dereferencing it.
ab05b4ccb8ea59079d7f773aa0e090029c479bad 02-Dec-2014 Wei Jia <wjia@google.com> StreamingSource: check mTSParser before dereferencing it.

Bug: 18532335
Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
uplayer/StreamingSource.cpp
a0f1d394aefb2e7c60ba90ea02a3e6c552c96a7c 02-Dec-2014 Ronghua Wu <ronghuawu@google.com> am 48662b3a: am 779d4164: am f1828910: nuplayer: clear pending audio access unit on flush.

* commit '48662b3a0e88c85dc1ff401427892c695f1937b5':
nuplayer: clear pending audio access unit on flush.
48662b3a0e88c85dc1ff401427892c695f1937b5 02-Dec-2014 Ronghua Wu <ronghuawu@google.com> am 779d4164: am f1828910: nuplayer: clear pending audio access unit on flush.

* commit '779d41640615177524ecc8ce5cef4113de0c8ca2':
nuplayer: clear pending audio access unit on flush.
126f3d00be30e6ebdbfc8b877650d21ad2392bf7 02-Dec-2014 Chong Zhang <chz@google.com> am 6c5db47a: am 3253bef3: am d8731629: Merge "notify seek complete upon first video output frame" into lmp-mr1-dev

* commit '6c5db47a612c52533066dde2d867454689ea30ff':
notify seek complete upon first video output frame
6c5db47a612c52533066dde2d867454689ea30ff 02-Dec-2014 Chong Zhang <chz@google.com> am 3253bef3: am d8731629: Merge "notify seek complete upon first video output frame" into lmp-mr1-dev

* commit '3253bef38cd6653768e7858f95d8baf371d58bf0':
notify seek complete upon first video output frame
f1828910d48bbd22e1392e6ab0ce31298d1f115c 02-Dec-2014 Ronghua Wu <ronghuawu@google.com> nuplayer: clear pending audio access unit on flush.

Also add flag to avoid reading on flush.

Bug: 18540219
Change-Id: I2fc351c32c87db9a8c8c2aad12ee2bd56a0370ab
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
f8d717772f6d185cb07720cd5091df9b7d612e0b 27-Nov-2014 Chong Zhang <chz@google.com> notify seek complete upon first video output frame

Bug: 18541814
Change-Id: Ie4e0976885f26eb253460eab371cb181ea85f2db
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDecoderBase.cpp
uplayer/NuPlayerDecoderBase.h
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
2d0ac425564ff9882ebaac5267d1a04d4af67d00 27-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Fix build with clang in C++11 mode

This removes the deprecated register keyword in many places, fixes one
instance of passing '\0' where a char* is expected, and 2 switch type
narrowing issues.

Change-Id: Ie265ac26ff6a61267ad6406dfe237226d97ca9ac
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
estPlayerStub.cpp
aede81e85e777fbd32d09ca1051043e33e96a10f 21-Nov-2014 Chong Zhang <chz@google.com> am e9e6a930: am 3a8d7d10: Merge "tunnel NuPlayer source and decoder input" into lmp-mr1-dev
automerge: 9353571

* commit '93535715c6d2cac06d5dc6f8e3d8f15a19c21e60':
tunnel NuPlayer source and decoder input
8518168a1bdb81e56f4324a72224a724337a5844 21-Nov-2014 Ronghua Wu <ronghuawu@google.com> am f108dc85: am 7966142a: Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-dev automerge: 2a424d6

* commit 'f108dc85443936ca219567cc3a8556daa4a20fb3':
NuPlayer: invalid anchor time when render is flushed.
93535715c6d2cac06d5dc6f8e3d8f15a19c21e60 21-Nov-2014 Chong Zhang <chz@google.com> am e9e6a930: am 3a8d7d10: Merge "tunnel NuPlayer source and decoder input" into lmp-mr1-dev

* commit 'e9e6a9306c42e0902d31f32dffc75135ff9dca49':
tunnel NuPlayer source and decoder input
f108dc85443936ca219567cc3a8556daa4a20fb3 21-Nov-2014 Ronghua Wu <ronghuawu@google.com> am 7966142a: Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-dev
automerge: 2a424d6

* commit '2a424d6fdccc6152ae855025996beef39f20c6df':
NuPlayer: invalid anchor time when render is flushed.
30e0138abb68adb246e610ac5e7d8c5807dacc4a 21-Nov-2014 Ronghua Wu <ronghuawu@google.com> am 2a424d6f: am 7966142a: Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-dev

* commit '2a424d6fdccc6152ae855025996beef39f20c6df':
NuPlayer: invalid anchor time when render is flushed.
3a8d7d1064a665a8a348710c7d27b31642f7f624 21-Nov-2014 Chong Zhang <chz@google.com> Merge "tunnel NuPlayer source and decoder input" into lmp-mr1-dev
7137ec7e005a5a6e3c0edb91cfacf16a31f4bf6a 13-Nov-2014 Chong Zhang <chz@google.com> tunnel NuPlayer source and decoder input

Bug: 18342383

Change-Id: Ieff1cd3bad2b39d46f127ddd5d5139b919992461
uplayer/Android.mk
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerCCDecoder.cpp
uplayer/NuPlayerCCDecoder.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDecoderBase.cpp
uplayer/NuPlayerDecoderBase.h
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
ff7b8bc1fe8a1f8b45e1bea675848efca3306177 21-Nov-2014 Chong Zhang <chz@google.com> am 9111465a: am ec9459c6: Merge "close fd if data source is reset without prepare" into lmp-mr1-dev
automerge: 0cd651d

* commit '0cd651d18eeee52be945b0379b667473549bbf63':
close fd if data source is reset without prepare
b4a909c0fee79b53b87634a06c5902dd1e6a8bc4 21-Nov-2014 Marco Nelissen <marcone@google.com> am 9dad026b: am 574aed90: Merge "When aggregating buffers, make sure we don\'t lose data" into lmp-mr1-dev
automerge: 7ac1df3

* commit '7ac1df382ad86f0bc7af2c92843978ad8990eee1':
When aggregating buffers, make sure we don't lose data
0cd651d18eeee52be945b0379b667473549bbf63 21-Nov-2014 Chong Zhang <chz@google.com> am 9111465a: am ec9459c6: Merge "close fd if data source is reset without prepare" into lmp-mr1-dev

* commit '9111465a5f4a0bed8747da594070f35010644979':
close fd if data source is reset without prepare
7ac1df382ad86f0bc7af2c92843978ad8990eee1 21-Nov-2014 Marco Nelissen <marcone@google.com> am 9dad026b: am 574aed90: Merge "When aggregating buffers, make sure we don\'t lose data" into lmp-mr1-dev

* commit '9dad026b7c69add31e1cab48774223236efe801e':
When aggregating buffers, make sure we don't lose data
fb4dac55d0d3943e09680e779ba77310eedf011b 20-Nov-2014 Lajos Molnar <lajos@google.com> am 75cfc881: am 8ed5afa3: Merge "mediaplayer: request auto-frc for high quality avsync" into lmp-mr1-dev automerge: 225f4f6

* commit '75cfc881e25a9d7647701526484b5885dc43c574':
mediaplayer: request auto-frc for high quality avsync
75cfc881e25a9d7647701526484b5885dc43c574 20-Nov-2014 Lajos Molnar <lajos@google.com> am 8ed5afa3: Merge "mediaplayer: request auto-frc for high quality avsync" into lmp-mr1-dev
automerge: 225f4f6

* commit '225f4f6d458331c26e2015a593079c45942520e3':
mediaplayer: request auto-frc for high quality avsync
7966142a096c1d5d7386a42eaccc9aed5b4344b3 20-Nov-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-dev
ec9459c63d1c2969505ffdc4a100646fd07223bd 20-Nov-2014 Chong Zhang <chz@google.com> Merge "close fd if data source is reset without prepare" into lmp-mr1-dev
574aed902443d41581684dc8bc5ddd2e067f4cdf 20-Nov-2014 Marco Nelissen <marcone@google.com> Merge "When aggregating buffers, make sure we don't lose data" into lmp-mr1-dev
a6bf21f2a7cdd33c78464019dc1105ef01248b51 20-Nov-2014 Chong Zhang <chz@google.com> close fd if data source is reset without prepare

bug: 18434887
Change-Id: I70dff721710b7299d1ca1f8520278f82d355141d
uplayer/GenericSource.cpp
d9fd6317913c74e1c955eb31978c41e70d5810bc 06-Nov-2014 Lajos Molnar <lajos@google.com> mediaplayer: request auto-frc for high quality avsync

Bug: 17383204
Change-Id: I7209305b4ff3c2386019d7a09d6a0536e9f21522
uplayer/NuPlayer.cpp
6c41e622512a99581afcbdbd6ad284237923c942 19-Nov-2014 Marco Nelissen <marcone@google.com> When aggregating buffers, make sure we don't lose data

Bug: 18277034
Change-Id: Ia8c35791eea88545a873cad339eb6b5fc25d1d97
uplayer/NuPlayer.cpp
3da436dee876ba1059033a7fb1369993e13bd2e8 19-Nov-2014 Ronghua Wu <ronghuawu@google.com> am 16f9d58f: am 0c999060: am 18899808: Merge "NuPlayer: open audio sink in offload mode when resuming from timeout teardown." into lmp-mr1-dev

* commit '16f9d58f1ea91a8c37bd5f56564697a2527b619e':
NuPlayer: open audio sink in offload mode when resuming from timeout teardown.
16f9d58f1ea91a8c37bd5f56564697a2527b619e 19-Nov-2014 Ronghua Wu <ronghuawu@google.com> am 0c999060: am 18899808: Merge "NuPlayer: open audio sink in offload mode when resuming from timeout teardown." into lmp-mr1-dev

* commit '0c999060549796ccd13aefc00ece993500d8931f':
NuPlayer: open audio sink in offload mode when resuming from timeout teardown.
18899808001ddaea13fa4c5277502c96351f69a5 19-Nov-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: open audio sink in offload mode when resuming from timeout teardown." into lmp-mr1-dev
f83408b41bbd796b7923d719e7e3799ddc7acaff 19-Nov-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: invalid anchor time when render is flushed.

Also rememeber the pause time in NuPlayerDriver.

Bug: 18436336
Change-Id: If09f680a0d0f9137bd55c5f94201eb3aa783278a
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerRenderer.cpp
0951ed3cd4fd322453d5c9619e5089c9b620a7ae 19-Nov-2014 Marco Nelissen <marcone@google.com> am dae9df0a: am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-dev

* commit 'dae9df0a67acae245a81a8a1404b14044eb5f5b4':
Don't autoloop notifications
642025caee4b7917ca261ef65168c602d1e20630 19-Nov-2014 Robert Shih <robertshih@google.com> am fab5ad93: am 2f65ada8: am 993d57ec: Merge "NuPlayer: pass media time to selectTrack for responsiveness" into lmp-mr1-dev

* commit 'fab5ad9331de20b82b02aac4bc73cccf7054fd38':
NuPlayer: pass media time to selectTrack for responsiveness
dae9df0a67acae245a81a8a1404b14044eb5f5b4 19-Nov-2014 Marco Nelissen <marcone@google.com> am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-dev

* commit 'db95b7dbba21fc0b1112f9c362d4d942dddefba0':
Don't autoloop notifications
fab5ad9331de20b82b02aac4bc73cccf7054fd38 19-Nov-2014 Robert Shih <robertshih@google.com> am 2f65ada8: am 993d57ec: Merge "NuPlayer: pass media time to selectTrack for responsiveness" into lmp-mr1-dev

* commit '2f65ada84cced6704e8fcdb03835fe218d917fcb':
NuPlayer: pass media time to selectTrack for responsiveness
ba0790bf10da74caacb214ea8155d172bae4d0c5 19-Nov-2014 Marco Nelissen <marcone@google.com> Merge "Don't autoloop notifications" into lmp-mr1-dev
6ffb1fd67eb8f00f130a6db914ba42a8432aec70 30-Oct-2014 Robert Shih <robertshih@google.com> NuPlayer: pass media time to selectTrack for responsiveness

Bug: 18020001
Change-Id: Id50f8473992f39d8c0aa86a1fabb2601093d2572
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerSource.h
a10fd23bb9fcf16e778c639ea5638e2917dacd89 07-Nov-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: open audio sink in offload mode when resuming from timeout teardown.

Also always recheck if a new stream can do offload.

Bug: 18154425
Change-Id: I121877834bd963eeeba91a2b951fd30d5dc36a8b
uplayer/NuPlayer.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
6c3c11102c350cc86b5a55b8274bb8a4f9dd3632 18-Nov-2014 Jeff Tinker <jtinker@google.com> am e6dce194: am efd33e8d: am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-dev

* commit 'e6dce194ad3a13e302641250ef175c4263b7a448':
Fix missing mutex lock in Drm::binderDied
44ce5407e8b582a37431464322d92c6bc3cc732a 18-Nov-2014 Andy Hung <hunga@google.com> am 932ab10f: am 1c764234: am 88ec9e99: Merge "Fix race condition in signaling completion for decode." into lmp-mr1-dev

* commit '932ab10f1a466c2e6d655c05edf3d8cfecea850a':
Fix race condition in signaling completion for decode.
c1d3818b2f63731e38083b3d2dea62a3b295f200 18-Nov-2014 Robert Shih <robertshih@google.com> am ef2af979: am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-dev

* commit 'ef2af979309dd4f85c449614dfeb829e72ff718d':
NuPlayer HTTPLiveSource: impl getSelectedTrack
707eadef2ad1388bafdb2d003a4169208fa99811 18-Nov-2014 Marco Nelissen <marcone@google.com> Don't autoloop notifications

Some apps think it's cool to use ringtones as notification sounds, but
ringtones often loop, which is not appropriate for notifications.

Bug: 15929273
Change-Id: I77c4277801cb2561743f8c676ef76ab4d1668b08
uplayer/NuPlayerDriver.cpp
e6dce194ad3a13e302641250ef175c4263b7a448 18-Nov-2014 Jeff Tinker <jtinker@google.com> am efd33e8d: am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-dev

* commit 'efd33e8da29243b6bddf3f787034960b0717de90':
Fix missing mutex lock in Drm::binderDied
35b0f7095fac4f2cc112edd4b0298a9cb1ee394f 18-Nov-2014 Jeff Tinker <jtinker@google.com> Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-dev
932ab10f1a466c2e6d655c05edf3d8cfecea850a 18-Nov-2014 Andy Hung <hunga@google.com> am 1c764234: am 88ec9e99: Merge "Fix race condition in signaling completion for decode." into lmp-mr1-dev

* commit '1c764234f30941ab18ef2ba55299e2ce036c34b6':
Fix race condition in signaling completion for decode.
ef2af979309dd4f85c449614dfeb829e72ff718d 18-Nov-2014 Robert Shih <robertshih@google.com> am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-dev

* commit '811a92f68dbcab0f88b4be72099d783d3a44c9f6':
NuPlayer HTTPLiveSource: impl getSelectedTrack
88ec9e992af75f9783794df5d7be31c3b018ad09 18-Nov-2014 Andy Hung <hunga@google.com> Merge "Fix race condition in signaling completion for decode." into lmp-mr1-dev
39b109a1df23e7610b031b466e9ecf510b3c077f 18-Nov-2014 Robert Shih <robertshih@google.com> Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-dev
b51457f8d915e0ed8edf66d1d2c263ab4a792be8 17-Nov-2014 Andy Hung <hunga@google.com> Fix race condition in signaling completion for decode.

Bug: 18048775
Change-Id: I2207eb2cf30cf205d9bf414edbb1d3e709185f67
ediaPlayerService.cpp
1c39c28ed6537cab06d681f8f3c0a4d17bb0543d 17-Nov-2014 Chih-hung Hsieh <chh@google.com> am 8c5ee61a: am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"

* commit '8c5ee61a057e3b87e8f0800b284642bf3b107fd0':
Fix struct vs. class mismatches
8c5ee61a057e3b87e8f0800b284642bf3b107fd0 17-Nov-2014 Chih-hung Hsieh <chh@google.com> am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"

* commit 'd86450b93ab3960ccd68aed14563aaa76b43ce9b':
Fix struct vs. class mismatches
86a58cabe322b746ab0eb17f0cade34ed68ba60e 17-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Fix struct vs. class mismatches

Fix something being declared a struct and forward-declared a class and
vice versa.

gcc doesn't care, clang complains about the mismatch.

Change-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
77e79a509d19ab50b1867fe3903b5a8fae450591 17-Nov-2014 Marco Nelissen <marcone@google.com> resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp

Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
f888020c6e2735624f2b2a30e72aca24e17b8b4d 14-Nov-2014 Marco Nelissen <marcone@google.com> Update calls to IInterface::asBinder()

to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a

Conflicts:
media/libmedia/IAudioFlinger.cpp
media/libmedia/IMediaPlayer.cpp
media/libstagefright/CameraSource.cpp
rm.cpp
ediaPlayerService.cpp
4dbc8cc68a2674110ac1dce9e475ac30b1baa7c5 16-Nov-2014 Jeff Tinker <jtinker@google.com> Fix missing mutex lock in Drm::binderDied

bug: 18194977
Change-Id: Ie6107a34237577c3b9cc6507d507f5c51f49fcf6
rm.cpp
060ef2a4f42820c77ded1de99c6e1f5edb0033a0 15-Nov-2014 Wei Jia <wjia@google.com> am 1ea52d5f: am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into lmp-mr1-dev automerge: b915eeb

* commit '1ea52d5ff0465f9353fcf14ed64246c1b9bf4439':
NuPlayer: tunnel decoder with renderer for data buffer passing.
c6cfd70f24a11b946859485ce398a189c301a4e2 12-Nov-2014 Wei Jia <wjia@google.com> NuPlayer: tunnel decoder with renderer for data buffer passing.

Bug: 18342383

Change-Id: I182928007814c146c01a86196c4fda1d46e74ea4
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
06b46062d2f8bc82ca3061a23d197734ae51918b 14-Nov-2014 Marco Nelissen <marcone@google.com> Update calls to IInterface::asBinder()

to use the new static version.

Change-Id: I89a5988a0ac694ffc04d88cf939e8455bf925d4c
rm.cpp
ediaPlayerService.cpp
9b58c14a4988cf56b9b9a85da60e3c7297e6ef31 14-Nov-2014 Lajos Molnar <lajos@google.com> am 39740c2a: am 85a5b99f: am 6641004b: Merge "Revert "mediaplayer: make frame-accurate avsync configurable"" into lmp-mr1-dev

* commit '39740c2abbf66d33d3e7a276cd3a295054e3a275':
Revert "mediaplayer: make frame-accurate avsync configurable"
6641004be544a394f3fca81f7213dd6e0668ff98 13-Nov-2014 Lajos Molnar <lajos@google.com> Merge "Revert "mediaplayer: make frame-accurate avsync configurable"" into lmp-mr1-dev
6e100e42872aa039900959760cfd046eb358d607 13-Nov-2014 Marco Nelissen <marcone@google.com> am cea67364: am 233ef496: Merge "Fix looping sound playback" into lmp-mr1-dev automerge: 538596f

* commit 'cea67364cee2c8e2e9baae86276cdeb0e13c8c0d':
Fix looping sound playback
368e33700ed16acc8e99657fb84edd5d2806b34f 11-Nov-2014 Marco Nelissen <marcone@google.com> Fix looping sound playback

The renderer stops the audio sink at the end in order to play out
the last little bit of audio. When the sound is looping, the sink
needs to be restarted.

Bug: 18326137
Change-Id: I3bc3629597fc43cce33bdf5691d29cc4c2285926
uplayer/NuPlayerDriver.cpp
ee8b6abd8c201589fc260cbef48b1755109b1ac0 11-Nov-2014 Marco Nelissen <marcone@google.com> am aa97f709: am 48cb6d7c: Merge "Fix short sound playback" into lmp-mr1-dev automerge: 667b46d

* commit 'aa97f7093c8bb99ad5f86294fef7a070be0e206f':
Fix short sound playback
be695c80b8b5c3aae66ad7a2a56f523fc766ff4d 11-Nov-2014 Robert Shih <robertshih@google.com> am 63f2701a: am 21efaad1: Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs" into lmp-mr1-dev automerge: c93fbdb

* commit '63f2701a38a3a2ea43d5ac8f909d095b49a89590':
GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs
48cb6d7c840e695769405b0d33fd2b85479ec717 10-Nov-2014 Marco Nelissen <marcone@google.com> Merge "Fix short sound playback" into lmp-mr1-dev
21efaad13f13e390f585cea4371d399997f8d1a6 10-Nov-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs" into lmp-mr1-dev
374753585c2cc72977709b218314f8f4f5bc7889 10-Nov-2014 Robert Shih <robertshih@google.com> am 1dda4012: am 53fea876: Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-dev automerge: 2dc28b6

* commit '1dda4012b814e0874c178a79b2d478c9a45bac1f':
HTTPLiveSource: NULL check in getFormat
5c67ddcf987b1f07c9abc1d051a0c051e7c73ff7 05-Nov-2014 Robert Shih <robertshih@google.com> GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs

Bug: 18296874
Change-Id: I9608523b4cc37e6cf8b91fb1407035aac087796b
uplayer/GenericSource.cpp
uplayer/GenericSource.h
2dc28b69258d4772aaf40902b939153239e7fe7f 10-Nov-2014 Robert Shih <robertshih@google.com> Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-dev
1098d87e56f726184ae9c8fe903ea4743669f35b 06-Nov-2014 Robert Shih <robertshih@google.com> HTTPLiveSource: NULL check in getFormat

Bug: 18297916
Change-Id: I14c5de8d28202ee1b68e369d33e01bd26dbe968d
uplayer/HTTPLiveSource.cpp
e17afa888040eb5fbd31249305efd88ee03bb5bc 08-Nov-2014 Lajos Molnar <lajos@google.com> Revert "mediaplayer: make frame-accurate avsync configurable"

Reenable PTS scheduling for all playback.

This reverts commit 274084f7bfd3f6bdf5a55cf16ceefed345aa0060.

Bug: 18111837
Change-Id: Ia734ad304c1f85d2ac302261866be82b8f2a30d4
uplayer/NuPlayerRenderer.cpp
33f45b51654999a8b9d29c8f9471794730b85393 07-Nov-2014 Wei Jia <wjia@google.com> am 6200e7f4: am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek." into lmp-mr1-dev automerge: e86c6d5

* commit '6200e7f43d977ad6698f018ee55e2f423ff8a87c':
AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.
e86c6d59dfa8aea8f321287cbb1f122623e5417a 07-Nov-2014 Wei Jia <wjia@google.com> Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek." into lmp-mr1-dev
89bf2525c5b57f17260de5b00c5f3f78ac4b881e 30-Jul-2014 Robert Shih <robertshih@google.com> NuPlayer HTTPLiveSource: impl getSelectedTrack

Bug: 17514665
Change-Id: I81c62553f2c5acb4d2436a9d8f04c10fdbe315d0
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
fef808d42a9c94b0b5ef3c3d5fb0a090edbc42da 01-Nov-2014 Wei Jia <wjia@google.com> AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.

This will remove the unnecessary flush for seek.

Bug: 17511837
Change-Id: I4b7acfc71a410372f5c630afb94b6a95d09d8974
uplayer/GenericSource.cpp
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/RTSPSource.cpp
uplayer/StreamingSource.cpp
944f3112a6d3fca7c70602e9696508101385e57c 06-Nov-2014 Jeff Tinker <jtinker@google.com> am 6e0da022: am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev

* commit '6e0da0226503ddea118d43962a76fa2fa56bad1e':
Pass resolution to Crypto plugin on format change
3db4166958f30d64ef57e7768420b4af6d226d4a 06-Nov-2014 Jeff Tinker <jtinker@google.com> am a4dd2e19: am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into lmp-mr1-dev

* commit 'a4dd2e19f917f25b3eee36f499b126dc115e5446':
Add missing secure stop methods
1cf9ad1abb599ce4057189e0db154cf00b4913f8 06-Nov-2014 Jeff Tinker <jtinker@google.com> Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev
19a3f69d9d5398db62ee7b15f2c13052d7ee9f07 06-Nov-2014 Jeff Tinker <jtinker@google.com> Merge "Add missing secure stop methods" into lmp-mr1-dev
15ce5f35187659ad757ee2ea6f70dcef5010c2c2 05-Nov-2014 Marco Nelissen <marcone@google.com> Fix short sound playback

AudioTrack needs to be stopped, not paused, at the end of the file,
since otherwise the last bit of queued up audio will not be played.

Bug: 18188921
Change-Id: I038aad74a105e163963929c7002b55f377de1442
uplayer/NuPlayerRenderer.cpp
2514d080c8a54ff603a45d7e336de668fe7329db 03-Nov-2014 Jeff Tinker <jtinker@google.com> Pass resolution to Crypto plugin on format change

Change-Id: I56cd557ce3525fe625db8c312d2557d3c8b51101
related-to-bug: 16034599
rypto.cpp
rypto.h
3c1285e8f86bd497e14c14fb6df7b42072ef52bd 31-Oct-2014 Jeff Tinker <jtinker@google.com> Add missing secure stop methods

b/18053197
b/18076411

Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
rm.cpp
rm.h
53f3053c3bd106d6ddf9b6d800ad1ee843f82f32 31-Oct-2014 Eric Laurent <elaurent@google.com> am f6a22ab1: am b2147445: am 7011ee31: Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-dev

* commit 'f6a22ab15c6d4f3bbb49a30a896dd73553fccc83':
NuPlayer: reduce offload pause teardown timeout.
545e123c54789f8dcb9f5fa77fd5aa0b7a172f10 31-Oct-2014 Wei Jia <wjia@google.com> am 0307c3ce: am 97d84d7f: am cde2b722: Merge "NuPlayer: merge start() and resume()." into lmp-mr1-dev

* commit '0307c3ce5be18d83093e0e45b8cbd90caf30c4fc':
NuPlayer: merge start() and resume().
9df2742a0dc6eb1e4aea2905487722dc60d537cf 30-Oct-2014 Eric Laurent <elaurent@google.com> am ff05cbdb: am 0d277600: am eac3f36c: Merge "fix deep buffer logic in NuPlayer." into lmp-mr1-dev

* commit 'ff05cbdb4939c2140726b6b7ce8907a9c90716e8':
fix deep buffer logic in NuPlayer.
7011ee31d65917a9e15b271942e863f06eee2da1 30-Oct-2014 Eric Laurent <elaurent@google.com> Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-dev
a5d316fd802cfc92954527f27e6f32206a896113 29-Oct-2014 Eric Laurent <elaurent@google.com> NuPlayer: reduce offload pause teardown timeout.

Waiting 60 seconds to teardown an offloaded path when paused
is not needed and causes unecessary battery drain.
10 seconds is enough to avaoid teardown when it would be
problematic (seek, pause for notifications, buffering...).

Bug: 13505340.
Change-Id: Ibcaa609b59e86ba2bc49539620bd77504d534c0c
uplayer/NuPlayerRenderer.cpp
cde2b72229fd6e06ee301238fd2943cdc1c40686 29-Oct-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: merge start() and resume()." into lmp-mr1-dev
9421174a2f002fef31b330fb04e00105a905dca4 29-Oct-2014 Wei Jia <wjia@google.com> NuPlayer: merge start() and resume().

NuPlayerDriver: allow seekTo called in STOPPED_AND_PREPARED state.

Bug: 18127606
Change-Id: I92ff9f7e0a176c434202762d30966d8c4643d1ef
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
d88c3cafb439367f2a245b625e0a74bcd785f099 28-Oct-2014 Eric Laurent <elaurent@google.com> fix deep buffer logic in NuPlayer.

Deep buffer output should be requested when there is
no video track, not when there is one.

Also make sure that the deep buffer flag is restored after
a failure to offload audio decoding.

Bug: 18114624.
Change-Id: If3c04c784bc20d77926993ee475fbf961aeba7ae
uplayer/NuPlayer.cpp
uplayer/NuPlayerRenderer.cpp
121ee5cf0c51008172658fe3d728613cf942c5af 28-Oct-2014 Chong Zhang <chz@google.com> am eb9ee3c0: do not hold mNotifyLock when calling MediaPlayer::notify automerge: df2592b automerge: ff41266

* commit 'eb9ee3c08f3e397a726395f8658a087fb659e780':
do not hold mNotifyLock when calling MediaPlayer::notify
df2592beab557663a471da2ac33ca463f7eee722 25-Oct-2014 Chong Zhang <chz@google.com> do not hold mNotifyLock when calling MediaPlayer::notify

Bug:18120688
Change-Id: Ia66dcfc3fd2d67d1ceba9808d21e0120cc8691d6
ediaPlayerService.cpp
516717bcdd4d02a0455927466fca4e8cee4a658b 24-Oct-2014 Hochi Huang <hochi.huang@mediatek.com> am 1c060d62: am 0f8f4e68: [FM] Fix FM App record fail Buganizer ID: 17975676 automerge: 8bfa96c automerge: f3c6152

* commit '1c060d625e2b66381b0e22b8b52773daa020ee26':
[FM] Fix FM App record fail Buganizer ID: 17975676
0f8f4e681b867dd611d2d916453337cb0770d4da 22-Oct-2014 Hochi Huang <hochi.huang@mediatek.com> [FM] Fix FM App record fail Buganizer ID: 17975676

Review: https://partner-android-review.git.corp.google.com/#/c/185234

Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>

Change-Id: I872ce744d23049e251a46aebc4019be5b25e3612
tagefrightRecorder.cpp
58f06b5e4fba042c3f94f5ef25b44b829cc3b02e 23-Oct-2014 Lajos Molnar <lajos@google.com> am a968c6e3: am 3c8631e2: am a4ee6d5f: am 6e52a61a: am f5926713: mediaplayer: don\'t report position past last queued position

* commit 'a968c6e34d028ac81a7997685c3ebfd576ae192e':
mediaplayer: don't report position past last queued position
575c2823cc0de91e8e4e9d91e53962a4ec45dd3b 22-Oct-2014 Lajos Molnar <lajos@google.com> am 171fa160: am 9bbccd13: am d5923409: mediaplayer: limit scheduling video frames into the future automerge: 28cd743
automerge: 3c29422

* commit '3c29422347281a721d46517e7c581b03e2347e90':
mediaplayer: limit scheduling video frames into the future
ec8f834893598ccd800c30fd215ad8d148da9706 22-Oct-2014 Ronghua Wu <ronghuawu@google.com> am 41c4d1a2: am da686693: am eecb7805: NuPlayer: set anchor time for each audio buffer. automerge: 1dbf21b
automerge: 29bd4d1

* commit '29bd4d1f1e273a5ecf00142dcde3711d7447c6e5':
NuPlayer: set anchor time for each audio buffer.
f592671336be0a061799033e47ceeacb648ed3bf 21-Oct-2014 Lajos Molnar <lajos@google.com> mediaplayer: don't report position past last queued position

also reanchor offloaded audio track correctly

Bug: 17653702
Change-Id: If05394d3b119be8d80b7764847496246d34a2133
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
d5923409bbcbb22954a92c2b497ef4492d7cb6a5 21-Oct-2014 Lajos Molnar <lajos@google.com> mediaplayer: limit scheduling video frames into the future

This addresses when video timestamps jumps before an audio timestamp,
but still works on slideshow video clips (<=1fps).

This, however, will not skip time-changes on video-only live video
streams, as we cannot distinguish live slideshow video clips from
non-slideshow ones.

Bug: 18032127
Change-Id: I959a714edfe1c8cf3b84704c693dcd1b3e5b7855
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
eecb7805bbbb712925d4372c505f8c7f5c4fb5ed 20-Oct-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: set anchor time for each audio buffer.

And use anchor time to compute current position

Bug: 17999949
Bug: 18008307
Bug: 18032127
Change-Id: Ie493c9a1d45d7b788aef65d863f710da6326fcc1
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
da363eddb713785d924de1c9650e0d4f30b08e82 17-Oct-2014 Chong Zhang <chz@google.com> am 69e61ed4: am f4f34037: am 95b6e531: am 0ebf65be: Merge "move audio sink open/close to NuPlayerRenderer" into lmp-dev
automerge: 4412a4e

* commit '4412a4ee7c6f6d0347d71badb3091ab7b1767b85':
move audio sink open/close to NuPlayerRenderer
3b9eb1f8629c6264d924ab7043f80d824cdd39e2 16-Oct-2014 Chong Zhang <chz@google.com> move audio sink open/close to NuPlayerRenderer

Bug: 17675112
Change-Id: I7eb3d02380658f848baedafe2aea287586ccf016
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
f26ab6051b4d1550101aabe4d7680ada6d439850 15-Oct-2014 Lajos Molnar <lajos@google.com> am f4e2e282: am cd559cc6: am c3340b80: am 1375ac6d: Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-dev

* commit 'f4e2e282b7a695e2dec16961748ea2469a220ad3':
NuPlayer: query current position from NuPlayerRenderer.
d0c8913702815fb0e86c4e183e6dbb4bab1016c2 14-Oct-2014 Wei Jia <wjia@google.com> am e2a11aea: am 45b94402: am 2fa84b0b: am e760de61: Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev

* commit 'e2a11aea42e3fca474e737717dd471baa2c22861':
NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.
1375ac6d029b74ac392db411907b3c0ea57f08a7 14-Oct-2014 Lajos Molnar <lajos@google.com> Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-dev
a73d9e0b3d171d2bfcd9eb07df9d6d36ae74df57 09-Oct-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: query current position from NuPlayerRenderer.

Bug: 17653702
Change-Id: Ie0b1f92420b071a0cfcd389f5e7917a54d332541
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
e760de61d9a662b1fbfda96ac34aaa246c2711bb 13-Oct-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev
dab70a065a8e972d272ed948e77cf2cd0f1525e1 12-Oct-2014 Wei Jia <wjia@google.com> NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.

Bug: 17596535
Change-Id: Ib43f91f9b0d0a52112aa1fa8352adac15aaf80f8
uplayer/NuPlayerDriver.cpp
87a4b9255e5eed5927a7981c4616798ae70e67ff 11-Oct-2014 Wei Jia <wjia@google.com> am ac56dfe5: am d7635618: am 9e9196fe: am 185a295d: Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." into lmp-dev

* commit 'ac56dfe5198fea5680bc94c8fcc290358b5dc092':
NuPlayerRenderer: adjust anchor time correctly for video only case.
185a295d4518878d5e2bca7b7c3e51df44492df1 10-Oct-2014 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." into lmp-dev
49966fff32b27f8821ebe280f25688b3c4f5f73f 09-Oct-2014 Wei Jia <wjia@google.com> NuPlayerRenderer: adjust anchor time correctly for video only case.

Bug: 17922171
Change-Id: I4c7e9e7f5ab96d3675d012ae30f78ef945394103
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
573a6e86363e26bf3f4f47de35f3da9217d2bbbc 07-Oct-2014 Andy Hung <hunga@google.com> am 9da6c242: am 595a5c70: am 73d0a798: Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-dev

* commit '9da6c242c6979a52bccb60776b993b2282461b0c':
NuPlayer: wait for renderer flush before decoder shutdown
73d0a798747c8d022e8a9c8cf4e284ac97508b1e 07-Oct-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-dev
2ac9dae6e80929a3c86b9886f106e35faa64019a 07-Oct-2014 Chong Zhang <chz@google.com> am 0fe4c176: am 1318a608: am e48b90d6: Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." into lmp-dev

* commit '0fe4c176fbf52af74f6b0ea0d422621193618d01':
StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.
e48b90d634f9e6190a788e6225927d418b11d162 06-Oct-2014 Chong Zhang <chz@google.com> Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." into lmp-dev
bc78bd02f0b823b18e3a4f8b8f862780b51994c0 06-Oct-2014 Praveen Chavan <pchavan@codeaurora.org> StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.

Meta-data mode for input is preferred (rather required) for recording
with camera v1. This capability is queried and enabled per codec; enable
it for VP8 hardware encoder.

Bug: 17664960

Change-Id: I4735c61670ebe0a555002cc25ef3ed823ab02f1f
tagefrightRecorder.cpp
8d121d41f5355b78b687f44e8d4aae4de2aa0359 03-Oct-2014 Andy Hung <hunga@google.com> NuPlayer: wait for renderer flush before decoder shutdown

Bug: 17679341
Change-Id: Ie3883686891e7ee6fb45ceb01af1eb60b559d3a0
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
d6bdf2f11355b70e8f000e9a4b869b27702e75e8 06-Oct-2014 Ronghua Wu <ronghuawu@google.com> am 5769ed50: am 658937e7: am c4da004d: Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-dev

* commit '5769ed50bfcb88e2613a8616a5f4cf9f99ea2ecf':
NuPlayer: add audioDecoderStillNeeded.
71608d7cbeb0f6124b90eb8d4768a107d2455cb1 04-Oct-2014 Ronghua Wu <ronghuawu@google.com> am e38441d3: am acc8918e: am af1a4dc9: Merge "NuPlayer: don\'t restart AudioSink when torn down due to pause timeout." into lmp-dev

* commit 'e38441d377ae9bdd5a00cbc2351c95cc8d5efdfb':
NuPlayer: don't restart AudioSink when torn down due to pause timeout.
d7988b1a7b32e39e671f7d4e2b2d8027a1f99639 04-Oct-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: add audioDecoderStillNeeded.

Bug: 17752358
Change-Id: Ia3b3ee4df65e5564afd0723943d2d747f3a604af
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
af1a4dc989d6707116eaefab300ad55124aace66 03-Oct-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: don't restart AudioSink when torn down due to pause timeout." into lmp-dev
0852917279f79a94907e9906d0533ae409a30f6a 03-Oct-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: don't restart AudioSink when torn down due to pause timeout.

Bug: 17752358
Change-Id: I232d105480139bfc0b991bcd8e001930e577cf30
uplayer/NuPlayer.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
36a7f5b2971f9125e908388113d5e52ddcb8822c 03-Oct-2014 Chong Zhang <chz@google.com> am 9b68037c: am f0d98899: am aaa527fb: Merge "send available codec buffer count with codec notification" into lmp-dev

* commit '9b68037c1f3fcf2a390dd796fb31b1d873fe4bea':
send available codec buffer count with codec notification
aaa527fbd790d30353d15608e54b5b94625b7b6d 03-Oct-2014 Chong Zhang <chz@google.com> Merge "send available codec buffer count with codec notification" into lmp-dev
07ea94c589ea6d6ee3aeb1e9ef9d4100217738c8 03-Oct-2014 Lajos Molnar <lajos@google.com> am 9236887a: am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if setting default profile" into lmp-dev

* commit '9236887ac5dfa526d1a90dd5e0a3c3095f443e70':
mediarecorder: set level if setting default profile
fac0deda3513858fc2c70bc1ff3e1df93fab6708 03-Oct-2014 Wei Jia <wjia@google.com> am f893459f: am 86c541dc: am 6eff943c: Merge "NuPlayerDecoder: postpone input message processing when it\'s not dequeued." into lmp-dev

* commit 'f893459ff569c240bd525b1a2176da4192501eaa':
NuPlayerDecoder: postpone input message processing when it's not dequeued.
fc93499e83403d5959693efa040cb29fd6825abb 03-Oct-2014 Lajos Molnar <lajos@google.com> Merge "mediarecorder: set level if setting default profile" into lmp-dev
e1f2739b0a53e98a0d8dc124250f99c17515b90e 03-Oct-2014 Lajos Molnar <lajos@google.com> am f973c881: resolved conflicts for merge of 55fc6a77 to lmp-mr1-dev-plus-aosp

* commit 'f973c881e3f3c1cbb91e4eb0e65f57bb23ed5758':
stagefright: move math templates into AUtils.h
6eff943c133903fcd9bdb7bb1812d7b383b090f8 03-Oct-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDecoder: postpone input message processing when it's not dequeued." into lmp-dev
8b76b592be5bc162fb5a6d7e8c47812544b6b345 03-Oct-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: move math templates into AUtils.h" into lmp-dev
e47d44486f0a9f9b828b01d0fbaf84f5573f0aa2 30-Sep-2014 Chong Zhang <chz@google.com> send available codec buffer count with codec notification

Bug: 14679336
Change-Id: Id927c96a9a14dd6ecd72540f0037d5841aa32154
uplayer/NuPlayerDecoder.cpp
2245fc625910e47d1ba3c339e205c21ab58a47ad 03-Oct-2014 Wei Jia <wjia@google.com> NuPlayerDecoder: postpone input message processing when it's not dequeued.

Bug: 17622642
Change-Id: I67608121bf70d6acb152e4aa64892b11bf167e8c
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
a147b4f91143d9f2fb608e22f9fca14bbd029573 02-Oct-2014 Lajos Molnar <lajos@google.com> mediarecorder: set level if setting default profile

Bug: 17676461
Change-Id: If01ccd09935945d330de0842be95c3544951b6b9
tagefrightRecorder.cpp
6820103771b5af4bda1ed7dab29dcf49421afc2e 02-Oct-2014 Andy Hung <hunga@google.com> am d7bdfd7d: am cfe3ba6b: am d8b03abf: Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-dev

* commit 'd7bdfd7d33789965988079e3a03ec1233f1f5896':
NuPlayer: Fix flush mode decoder error handling
d8b03abf1d003e2940a19f0071ea2892689dd10e 02-Oct-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-dev
f75baebba3a35780df156d1378e18c38097f7c6c 02-Oct-2014 Robert Shih <robertshih@google.com> am b76c2702: am 8359c43a: am 3af67d03: Merge "GenericSource: support disconnect before NuCachedSource2 is created" into lmp-dev

* commit 'b76c2702fcae662b7ac0523d4735ef90c0f6dbba': (32 commits)
GenericSource: support disconnect before NuCachedSource2 is created
Camera1 shim: If there's no flash, the keys need to be null.
NuCachedSource2: more fixes for source read hang
NuPlayer: change assert to conditional check.
Camera2Client: log an error when autoFocus is called in wrong state
NuPlayer: use generation to filter out stale message from renderer.
MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
AudioEffect acquires session
Add support for ANDROID_LOOP to NuPlayer
StagefrightRecorder: default to codec and fps from camcorder low profile
AudioPolicyManager: Use "safe" speaker for notifications if available
mediaplayer: release MediaBuffer in stale input buffers
NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress.
Revert "Fix AAC timestamps for multiple aac frames per input buffer"
fix failure in MediaCodecTest#testException
mediaplayer: limit number of outstanding buffer requests
NuPlayer: make previous decoders obsolete when reset is done.
NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.
NuPlayer: check mSource before deferencing it.
Move stale handler cleanup to constructor
...
c416becd966945fca5fa7fb45ac51f84d1d8cd20 02-Oct-2014 Lajos Molnar <lajos@google.com> stagefright: move math templates into AUtils.h

add unit test for math templates

Bug: 17676461
Change-Id: Ie964c5fcfcca1ec53b4538f8e577392e8fbb4319
ideoFrameScheduler.cpp
2abde2c118a94f843a7450818c925d3f0b673cd3 30-Sep-2014 Andy Hung <hunga@google.com> NuPlayer: Fix flush mode decoder error handling

Explicitly handle each flush mode upon decoder error.
Do not clear out affected decoder immediately.
Alter logcat messages for better diagnostics.

Bug: 17638878
Bug: 17679341
Change-Id: I219796c04d65d7c4dd61c0d4f99f9f580241a68b
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerRenderer.cpp
2a0110017acd604261e098c5683783bd33319566 02-Oct-2014 Lajos Molnar <lajos@google.com> am 87129bcf: am 41b9ef26: Merge "mediaplayer: make frame-accurate avsync configurable" into lmp-dev

* commit '87129bcf0aff6b8dd37a871fece451d49bb8f889':
mediaplayer: make frame-accurate avsync configurable
3af67d03bbc30c368821caf8b74ae7fb91ee7db7 01-Oct-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: support disconnect before NuCachedSource2 is created" into lmp-dev
360d6d0924f99b82ebacb5cfb6f7bca95e11b4ee 29-Sep-2014 Robert Shih <robertshih@google.com> GenericSource: support disconnect before NuCachedSource2 is created

Bug: 17672488
Change-Id: I96776c9679fdcfbe9a442c86447c59802b1465ac
uplayer/GenericSource.cpp
uplayer/GenericSource.h
274084f7bfd3f6bdf5a55cf16ceefed345aa0060 30-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: make frame-accurate avsync configurable

disable by default

Bug: 17686015
Change-Id: I3961b1bc9c6d48afc8c5f7f5270528ea6341bc60
uplayer/NuPlayerRenderer.cpp
92001302180afe70564e692e29cf6a878c14b88e 26-Sep-2014 Wei Jia <wjia@google.com> am 18e10cb1: am 0ed72488: Merge "NuPlayer: use format obtained from source to tell if video exists." into lmp-dev

* commit '18e10cb19395ba8758d484cb962c9f38e30adba4':
NuPlayer: use format obtained from source to tell if video exists.
36f389888e4b2905f0b457f451187fd8d3ed5153 26-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: use format obtained from source to tell if video exists.

Bug: 17374216
Change-Id: I2d5f90d72b70684475d67ff8f41b803c2880840b
uplayer/NuPlayer.cpp
8a836ce76a7328df6dc274f65935b176060989f3 25-Sep-2014 Andy Hung <hunga@google.com> am 3529b78d: am c0d17e34: Merge "NuPlayer: Fix decoder error handling" into lmp-dev

* commit '3529b78d2b430aac5b8f1e48bd37c0201fb1d0f7':
NuPlayer: Fix decoder error handling
9dd5b87c7400e6c0ace12d185bd3b1443aece69b 25-Sep-2014 Lajos Molnar <lajos@google.com> am 376a8353: am 9a70c2c4: Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-dev

* commit '376a8353901533268d21a0e2041c75cd9f2f04da':
Fix Widevine classic playback errors with NuPlayer
8761bbc7269947e9628519c8848dffd3181f0140 25-Sep-2014 Lajos Molnar <lajos@google.com> am 6210ce1c: am 207fc297: Merge "mediaplayer: handle bad input in VideoFrameScheduler" into lmp-dev

* commit '6210ce1c6c753d9c232d18a886b2b89ab138f3bc':
mediaplayer: handle bad input in VideoFrameScheduler
7a90ca027632c8e5220ca24c75856ccd96bba1d3 25-Sep-2014 Wei Jia <wjia@google.com> am 3709974f: am 50373731: Merge "NuPlayerDecoder: release MediaBuffers when decoder is deleted." into lmp-dev

* commit '3709974f26e9661d512ae995123f2b22db51dc66':
NuPlayerDecoder: release MediaBuffers when decoder is deleted.
c0d17e349901c3ccf6d15b7dcdf7fa30139c9750 25-Sep-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Fix decoder error handling" into lmp-dev
9a70c2c490afe35383c2226061af5a2f4e5b2109 25-Sep-2014 Lajos Molnar <lajos@google.com> Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-dev
cf31f1eecf46d599428e115dfee8dd47b76c83fc 23-Sep-2014 Andy Hung <hunga@google.com> NuPlayer: Fix decoder error handling

Upon error, release MediaCodec after flushing data.
Report errors when they occur with ALOGE.
Fix onInputBufferFilled mInputBufferIsDequeued check.

Bug: 17423087
Bug: 17622642
Change-Id: I316601a19d5ec95cf8e14f5bc0418a05ec423041
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
5d6fb5e41f57a71bd5b2902dc8334825de7bdcc0 24-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: handle bad input in VideoFrameScheduler

Bug: 17626098
Change-Id: I2ae22ed43b35ff532a47818b118dd328ce2abf63
ideoFrameScheduler.cpp
ideoFrameScheduler.h
4923cee4fb3b29538d8f46bceeea7d5128242a71 24-Sep-2014 Wei Jia <wjia@google.com> NuPlayerDecoder: release MediaBuffers when decoder is deleted.

Bug: 17454455
Change-Id: Ic984c74826f87f5f3c27756a7e7d52295a529bed
uplayer/NuPlayerDecoder.cpp
a28785aa9ce323494a6971a38ce1d4d29bf710e4 24-Sep-2014 Jeff Tinker <jtinker@google.com> Fix Widevine classic playback errors with NuPlayer

bug: 17589961
Change-Id: If16c61b90cf92caa89eecd66aabef5813fd7619b
uplayer/GenericSource.cpp
00c0b12f9d4cc04d42cf6254c121fc6b86862946 24-Sep-2014 Wei Jia <wjia@google.com> am d996c469: am fc55783d: Merge "NuPlayer will notify SeekComplete only when requested so." into lmp-dev

* commit 'd996c4698bda072866d77bac9e9a7685a2c9349b':
NuPlayer will notify SeekComplete only when requested so.
47c04624a80c812dbbdf2c7eab3572aeaf536cd8 24-Sep-2014 Wei Jia <wjia@google.com> am c090e902: am 7e9f7f7a: NuPlayer: change assert to conditional check.

* commit 'c090e90241bcf0475f48f930e0f592e8716b8d15':
NuPlayer: change assert to conditional check.
fc55783d0886d5dbaa234f85a4313796d9ef1df4 24-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayer will notify SeekComplete only when requested so." into lmp-dev
58aae5d54f04aef42c315a717ea0bf8f26a0a62f 23-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 817c28d7: am 3cdd6b8c: Merge "NuPlayer: add pause timeout event for offload audio." into lmp-dev

* commit '817c28d71d0d68a6eb25057bd04e555dc0b85cc4':
NuPlayer: add pause timeout event for offload audio.
d4aa7e7d429267fd38950370850db7eb534adeea 23-Sep-2014 Wei Jia <wjia@google.com> am 888451fb: am ad5447f6: Merge "NuPlayer: use generation to filter out stale message from renderer." into lmp-dev

* commit '888451fbabf574a09b33a01db821a0a2d4a00add':
NuPlayer: use generation to filter out stale message from renderer.
7e9f7f7a9fb6c5d93fc9163e32936f3ea284caad 23-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: change assert to conditional check.

Bug: 17491050
Change-Id: I657866c5342c227d57617eb89955897171eb5976
uplayer/NuPlayer.cpp
3cdd6b8c82f2c71054bdd767782fc78f501f8e62 23-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: add pause timeout event for offload audio." into lmp-dev
e427abf1ea252ff305fc33aacdd2e83cf34891b5 23-Sep-2014 Wei Jia <wjia@google.com> NuPlayer will notify SeekComplete only when requested so.

Bug: 17596535
Change-Id: I6b744fdcf80f11d521d26c7c8b45f7de70aa0dc3
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
d93ebc8aa9433678b36285f8d43dcbc00a8dd534 23-Sep-2014 Wei Jia <wjia@google.com> am 0973af24: am 0079b331: Merge "MediaBuffer: ABuffer will release MediaBuffer when it\'s destructed." into lmp-dev

* commit '0973af247786ff1be980390cc274364fca6b2d6e':
MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
f5b1db11734358d979a23a1ac4903872186ef60b 09-Sep-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: add pause timeout event for offload audio.

Bug: 17375249
Change-Id: Ie59c6b372e9ad2aace3d1e27b9896d79de35d722
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
57568df014f8629ebc5ca8bce9da796dd187401b 22-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: use generation to filter out stale message from renderer.

Clean up generation number for decoders.

Bug: 17507846
Change-Id: Ibd2cfe11f89f404882d66c384b5198dc641f5e71
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
0079b331227fc1555d7c5305f33917a570d44890 22-Sep-2014 Wei Jia <wjia@google.com> Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." into lmp-dev
a8459e3566393c5ed3c07a989e30d19a32554610 20-Sep-2014 Lajos Molnar <lajos@google.com> am ee919f19: am 8d6ae6d9: Merge "mediaplayer: smooth out videoplayback based on framerate" into lmp-dev

* commit 'ee919f191c059594d2ac4f4468db518c29ec87b6':
mediaplayer: smooth out videoplayback based on framerate
4868c8b53f2750ffbdad46da24e4be2385245728 20-Sep-2014 Marco Nelissen <marcone@google.com> am 54c4dbda: am 3bde6b1c: Merge "Make prepare properly report failure again" into lmp-dev

* commit '54c4dbda0c9590b669266a76e8397ed5ad9a7aea':
Make prepare properly report failure again
96e92b58b7e9647b4c7c2f54b62a1b357ab06b66 19-Sep-2014 Wei Jia <wjia@google.com> MediaBuffer: ABuffer will release MediaBuffer when it's destructed.

Bug: 17454455
Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
uplayer/GenericSource.cpp
uplayer/NuPlayerDecoder.cpp
c851b5de495169d7e9528644c2592746021bd968 18-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: smooth out videoplayback based on framerate

Bug: 14659809
Change-Id: I73f6c7224c51ac06487475f9ed395379111ad71f
ideoFrameScheduler.cpp
ideoFrameScheduler.h
uplayer/NuPlayer.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
3bde6b1c3387c51479f39846533ead246a920990 20-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Make prepare properly report failure again" into lmp-dev
69a247de81ef98a83c686c82f4605d7bbd1faa3a 20-Sep-2014 Lajos Molnar <lajos@google.com> am c3813abf: am dc43dfa1: mediaplayer: schedule video frames in VSYNC valleys

* commit 'c3813abf89d8a02fcaed8a13ec62dc7a3f1df2b7':
mediaplayer: schedule video frames in VSYNC valleys
705d3290102875409e334e2a80e64221714aa37c 20-Sep-2014 Marco Nelissen <marcone@google.com> Make prepare properly report failure again

Bug: 17583084
Bug: 17548451
Change-Id: I759d28eaafb520c206d54740c2c0a857b534d23c
uplayer/GenericSource.cpp
dc43dfa1294470a4413c37e863ef3b621da8681f 08-May-2014 Lajos Molnar <lajos@google.com> mediaplayer: schedule video frames in VSYNC valleys

Bug: 14659809
Change-Id: Ic340ac61ad4778b493625c79c2cb4f747ff54ede
ndroid.mk
ideoFrameScheduler.cpp
ideoFrameScheduler.h
uplayer/Android.mk
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
86b18bdb4bf258e69c8b436835d2431abf3ee649 19-Sep-2014 Phil Burk <philburk@google.com> am 5248af43: am c0651e85: Merge "mediaplayer: fix buffer aggregation when video has offloaded audio" into lmp-dev

* commit '5248af4357442289f8acc39dd7b8f574b2263d69':
mediaplayer: fix buffer aggregation when video has offloaded audio
c0651e858ae4ef4c9a2df2e4506b4093b6666ae9 19-Sep-2014 Phil Burk <philburk@google.com> Merge "mediaplayer: fix buffer aggregation when video has offloaded audio" into lmp-dev
939314d3a743efee67456302803a1457b2db1663 18-Sep-2014 Andy Hung <hunga@google.com> am a9612acf: am 21a1d72b: Merge "NuPlayer: update timestamp handling" into lmp-dev

* commit 'a9612acf7fd699536ce026297c1b34d877bdbe16':
NuPlayer: update timestamp handling
598af9e9506cf9db5135ff7faf2d0e6fc7daab60 18-Sep-2014 Lajos Molnar <lajos@google.com> am 0601bea8: am 83266677: Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-dev

* commit '0601bea8a43ea47f0a83a9bdf72de373576dbb8c':
NuPlayer: use getTimestamp instead of getPosition
21a1d72bb42710d149532653490154f89330b9dd 18-Sep-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: update timestamp handling" into lmp-dev
832666776a681ec3a30ee8fc7d5da9039646147d 18-Sep-2014 Lajos Molnar <lajos@google.com> Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-dev
09e0c3646362d29c78bc26c8b23b7a753c412e6c 13-Sep-2014 Andy Hung <hunga@google.com> NuPlayer: update timestamp handling

Use getTimestamp WOULD_BLOCK error return code to clean up
initial playback/start timestamp handling.

Account for pause time and seeks.
Only send notification from driver when the media time changes.

Bug: 14659809
Bug: 17428188
Change-Id: I051bb5e2dd4fd5990474f8fb635615ad8d18eb2c
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
33b51b07ca90cc3b48e86598f7e82f93e440fe02 18-Sep-2014 Phil Burk <philburk@google.com> mediaplayer: fix buffer aggregation when video has offloaded audio

Change conditional test so we don't accidentally do buffer aggregation
on video buffers.

Bug: 17553847
Change-Id: I746452b2e62db664315732a38f982ce7faf26212
Signed-off-by: Phil Burk <philburk@google.com>
uplayer/NuPlayer.cpp
06ad1528e6dd4c866c085d3cad9235d2752eb3ed 28-Aug-2014 Lajos Molnar <lajos@google.com> NuPlayer: use getTimestamp instead of getPosition

Bug: 14659809
Bug: 16985287
Change-Id: I59ec72fbd40a9b8d28fe548ddad082c03000c045
ediaPlayerService.cpp
ediaPlayerService.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
fb74cf332eaa01e23c45d2d5566e963d177d69ae 18-Sep-2014 Marco Nelissen <marcone@google.com> am d2fc5dac: am 866e028b: Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-dev

* commit 'd2fc5dac3c0a15f012b1e72d80c795d5f425616a':
Add support for ANDROID_LOOP to NuPlayer
866e028bbe30b1ba0b9d8903c88bbe8525b81a37 18-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-dev
79e245f71d67a0d08e1492b1f3c6a95f13f963f1 17-Sep-2014 Lajos Molnar <lajos@google.com> am 3b05be3a: am 3a6a0f9d: Merge "mediaplayer: reset flags when pre-reading multiple buffers" into lmp-dev

* commit '3b05be3a3f500ce10b4b0eba5e6c171742c0d975':
mediaplayer: reset flags when pre-reading multiple buffers
f0b72b509ab1147a2a0925aced970dd68fd7fa4f 17-Sep-2014 Marco Nelissen <marcone@google.com> Add support for ANDROID_LOOP to NuPlayer

Bug: 17518139
Change-Id: I9355ddd4c998d967013dd8bd32d670a9a83dea31
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
uplayer/NuPlayerSource.h
317a49a4c4bf02944d1e01941c6b9f86179044bb 17-Sep-2014 Marco Nelissen <marcone@google.com> mediaplayer: reset flags when pre-reading multiple buffers

Bug: 17521470
Change-Id: I15ee9b1d3dd4ad29f4961a642f7fadafd9fe5b24
uplayer/GenericSource.cpp
90ef510b7aa32e60cd49d9bf99d628918db8f69f 17-Sep-2014 Robert Shih <robertshih@google.com> resolved conflicts for merge of a7efc1af to master

Change-Id: I8b26b71845dc96e770060ae58dae60001f8f589e
919b93473ebbba036f3934e92039f038c7f91a54 17-Sep-2014 Robert Shih <robertshih@google.com> Merge "NuPlayerDriver: restart after eos pause" into lmp-dev
6e9f6b498d758848fd934f8217c386dd74ef3833 17-Sep-2014 Robert Shih <robertshih@google.com> NuPlayerDriver: restart after eos pause

Bug: 17512187
Change-Id: I204ce83790bf98bc7ffebcb76d5df1e56a6a3f66
uplayer/NuPlayerDriver.cpp
3ac198d4444bc83e8410224b09a25607019f0f1a 17-Sep-2014 Chong Zhang <chz@google.com> am c67ae7b1: am fbbeeeb8: Merge "Disconnect HTTP-based data source upon reset" into lmp-dev

* commit 'c67ae7b1e2864fe6ed35c72e4561d46c284ccd60':
Disconnect HTTP-based data source upon reset
fbbeeeb87c55c3eca94a709f9f8986190f6472a1 17-Sep-2014 Chong Zhang <chz@google.com> Merge "Disconnect HTTP-based data source upon reset" into lmp-dev
f294f02549595e12bdf5d2e5229d413d7a89b90e 16-Sep-2014 Robert Shih <robertshih@google.com> am 03e8a5ff: am da23ab9b: GenericSource: fix selectTrack parameter

* commit '03e8a5ff5327530f6f5fa7ae03d34ca1bb3443cf':
GenericSource: fix selectTrack parameter
da23ab9b0dfa780175651daf057a02b0aa106dc8 16-Sep-2014 Robert Shih <robertshih@google.com> GenericSource: fix selectTrack parameter

Bug: 17512187
Change-Id: I19a0915fb0fb1b1ae036bf5df85b9c9e7657a7ea
uplayer/GenericSource.cpp
48296b792a8d68358de74141fa80bd5bd84d0307 14-Sep-2014 Chong Zhang <chz@google.com> Disconnect HTTP-based data source upon reset

Bug: 17425250

Change-Id: Ieb4c93fd9848489f9dbf35a36474376924fd8eb9
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayerSource.h
0c9e842546aaba6b0c8f49e492ee3f932949409d 16-Sep-2014 Lajos Molnar <lajos@google.com> am fcf9e4c6: am 73721170: Merge "mediaplayer: handle surface dis/connection errors" into lmp-dev

* commit 'fcf9e4c6a7aa1b21f710de307c5743d8d55f9953':
mediaplayer: handle surface dis/connection errors
20ac005f3747d2301959f92cd53eb1815e331fa8 16-Sep-2014 Phil Burk <philburk@google.com> am 507b57a9: am c7b29572: Merge "mediaplayer: optimize buffer queue management" into lmp-dev

* commit '507b57a934de2e2c30c5fad7a0c50cc6eec777ca':
mediaplayer: optimize buffer queue management
73721170e1a3c9751ef00fd53b6b5eec5f2c5c81 16-Sep-2014 Lajos Molnar <lajos@google.com> Merge "mediaplayer: handle surface dis/connection errors" into lmp-dev
c7b29572d22dff51b5432a7d211875d528406da6 15-Sep-2014 Phil Burk <philburk@google.com> Merge "mediaplayer: optimize buffer queue management" into lmp-dev
14986f6cca08b9ab0407cc2d31f92bfb02b5cb8c 15-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: handle surface dis/connection errors

Bug: 17408008
Change-Id: I752d5372086772b79b1300a2d3fabbc4985954a8
uplayer/NuPlayerDecoder.cpp
c5cc2e21602182c7ab4df1d7eba40f18037c1818 10-Sep-2014 Phil Burk <philburk@google.com> mediaplayer: optimize buffer queue management

Various changes for power consumption including:
Restrict the number of messages in flight.
Buffer more frames in the GenericSource so reads occur in a burst.

Bug: 15094301
Change-Id: I783481fd91f3fdd445b95e88ab82178f649f1a38
Signed-off-by: Phil Burk <philburk@google.com>
uplayer/GenericSource.cpp
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
53f5b2af7541857624002a4356b0fcf1cbf65227 12-Sep-2014 Robert Shih <robertshih@google.com> am 44122ffc: am ae6fe431: Merge "GenericSource: move track packet init from start to prepare" into lmp-dev

* commit '44122ffcf1fe24dfec960d9dea4257734496660b':
GenericSource: move track packet init from start to prepare
5be8217f44dc53177f2235bc18d3e89b61d3ea80 12-Sep-2014 Chong Zhang <chz@google.com> am 975e77b1: am 6851cdc2: Merge "StagefrightRecorder: default to codec and fps from camcorder low profile" into lmp-dev

* commit '975e77b1f53569c7e74120afb3e9f5ec712f56ec':
StagefrightRecorder: default to codec and fps from camcorder low profile
b5bd91cfcbf8fe951a59150692d42f4017fdafa9 12-Sep-2014 Lajos Molnar <lajos@google.com> am 2313848c: am 84f5278a: avoid kWhatReadBuffer message spam in GenericSource

* commit '2313848c95b7c25e3ac33f01ef3e604d9a65e5a4':
avoid kWhatReadBuffer message spam in GenericSource
ae6fe431d150d561fa27d060f38b5dd7c42820bb 12-Sep-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: move track packet init from start to prepare" into lmp-dev
6851cdc292aa68e3ac38c01fca3036cf06489ca9 12-Sep-2014 Chong Zhang <chz@google.com> Merge "StagefrightRecorder: default to codec and fps from camcorder low profile" into lmp-dev
af52c1a1ccab588ae4ed94521f202ed9474eccec 12-Sep-2014 Robert Shih <robertshih@google.com> GenericSource: move track packet init from start to prepare

Bug: 17244704
Change-Id: I15eba0e4d2a178cc0ba46bbc17be0e6d95e76935
uplayer/GenericSource.cpp
84f5278a36f2816cc38f64307b4a1ad8a6818507 11-Sep-2014 Lajos Molnar <lajos@google.com> avoid kWhatReadBuffer message spam in GenericSource

When playig WVM video, an extra readBuffer is posted for each
dequeueAccessUnit, resulting in an unbounded number of messages.

Bug: 17472979
Change-Id: Ice92ccf2454bf7a70856a4a8b535cefffc9e61ac
uplayer/GenericSource.cpp
uplayer/GenericSource.h
54ef1bae010f12dfe6a40ff4452695b1b11ff449 09-Sep-2014 Chong Zhang <chz@google.com> StagefrightRecorder: default to codec and fps from camcorder low profile

Bug: 16870964
Change-Id: I18425af630d3f041a3bcf77fbae3f07856fe8af2
tagefrightRecorder.cpp
tagefrightRecorder.h
e4ce3eb0d4785679994b38d54aa7ec01d208be72 11-Sep-2014 Lajos Molnar <lajos@google.com> am ebea445f: am b9b87fe9: mediaplayer: release MediaBuffer in stale input buffers

* commit 'ebea445f9344dbbe2ad560e340fb0ee3b9151650':
mediaplayer: release MediaBuffer in stale input buffers
2c6b6000404d939be92193209dbd147ccd70d2e1 11-Sep-2014 Wei Jia <wjia@google.com> resolved conflicts for merge of 42db212e to master

Change-Id: I1d8fe79a591b0e2a9e279f6c2c70d9e13c72924b
d51c19cdca101fdc8464d3adae9c88f0be9a8a75 11-Sep-2014 Lajos Molnar <lajos@google.com> am 55e9e267: am b606de81: Merge "mediaplayer: limit number of outstanding buffer requests" into lmp-dev

* commit '55e9e26779b2e08b460da1af2a420767655bde12':
mediaplayer: limit number of outstanding buffer requests
b9b87fe9d9f3d91c05300a22920d7227a3f8eb83 10-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: release MediaBuffer in stale input buffers

Bug: 17454455
Change-Id: If63a6e42f96851d6c10fdec11360f0dabae9bf50
uplayer/NuPlayerDecoder.cpp
e4c8b32f1123aa639f46d234203ad5c5e7926628 10-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress." into lmp-dev
71079fc29d93fb49d6022397b6d4168b7fba6e9b 10-Sep-2014 Wei Jia <wjia@google.com> NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress.

Bug: 17453240
Change-Id: If243e2232779681fc84dc767feaed00f23d8fdb1
uplayer/NuPlayerDriver.cpp
178e506350ef41609daaf307f598ef0bc4f82c71 10-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: limit number of outstanding buffer requests

Bug: 14679336
Change-Id: I94a20ada30a9a25065329a85fc884d32d154d029
uplayer/NuPlayerDecoderPassThrough.cpp
dc854df7937347a719e8f67f2c3f800fab3c42cd 10-Sep-2014 Wei Jia <wjia@google.com> am 59424ee1: am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete when reset is done." into lmp-dev

* commit '59424ee18cc68d5802bae05e15fd6f41f3f1113f':
NuPlayer: make previous decoders obsolete when reset is done.
b44c9e249eded8c7e36dd52ec6a6256538372ef9 10-Sep-2014 Phil Burk <philburk@google.com> am ba8711db: am 47a13d45: Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-dev

* commit 'ba8711db379fe243667a0387e2e86a49e17bee68':
[media][nuplayer] Remove debug message EWOULDBLOCK
f4cdb7f6724d0d4e3c74c8f2d02e7850b15d294a 10-Sep-2014 Rachad <rachad@google.com> am cce5397d: am 95861b33: Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning." into lmp-dev

* commit 'cce5397d6896fcc30211c9aa2061d8c7d07d1a19':
NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.
2c22b1225cdbb0d39c02d6f80244525f855c6179 10-Sep-2014 Wei Jia <wjia@google.com> am 807ec0cb: am 2adbeda4: Merge "NuPlayer: check mSource before deferencing it." into lmp-dev

* commit '807ec0cb8cf4c6bd1ce4a48e3643db78ccf81534':
NuPlayer: check mSource before deferencing it.
8716e3f386f37abd3d759404ca8b3deaf46afde8 10-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: make previous decoders obsolete when reset is done." into lmp-dev
47a13d45ae3f05ddb778124484a17d4754c82b7a 10-Sep-2014 Phil Burk <philburk@google.com> Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-dev
cbe165a6f68c90bbdd2b1593387d4072bd80b924 09-Sep-2014 Phil Burk <philburk@google.com> [media][nuplayer] Remove debug message EWOULDBLOCK

A debug message that was silent during testing is now spewing messages.
It was removed.

Bug: 17438882
Change-Id: I9c61409cac77c7bc1fd1088815823207094606f2
Signed-off-by: Phil Burk <philburk@google.com>
uplayer/NuPlayer.cpp
1008e1c9eb9ec7aeefffa4d9907f890a8eab7668 09-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: make previous decoders obsolete when reset is done.

Bug: 17428608
Change-Id: I724174d65f8e00bfecb51e6f690ae709ed2cf442
uplayer/NuPlayer.cpp
95861b33c7dcfa450f5e10568c0767b07bc50729 09-Sep-2014 Rachad <rachad@google.com> Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning." into lmp-dev
8592dbbdf5339890db2b14f83bcd6da2ffb023d2 09-Sep-2014 Rachad <rachad@google.com> NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.

Bug: 17436451

Change-Id: I7e9e0c48bbdd8ab65c5f4a587699a28435bd03f4
uplayer/NuPlayerRenderer.cpp
2adbeda4f46f88ddb17519d39cc13e183741e071 09-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: check mSource before deferencing it." into lmp-dev
f702d0415be7d5cb8c1801953b74adc1065c015e 09-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: check mSource before deferencing it.

Bug: 17428608
Change-Id: I7b264d1288ed3c495434aedeeeef2fbfc3ca2f16
uplayer/NuPlayer.cpp
5e0ae5750d1359487c5915ec224727ef58c673ae 09-Sep-2014 Phil Burk <philburk@google.com> am 7976568a: am 1a9ac031: Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-dev

* commit '7976568a93fdb618d877086c7b8c4efc52ad34ff':
[audio][nuplayer] Aggregate buffers to reduce power.
1a9ac031e9de8b3be1ec2c8d6d00f92bd3d59ea8 09-Sep-2014 Phil Burk <philburk@google.com> Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-dev
9f5264958557c45e942eabab8b32db2544d6c498 04-Sep-2014 Phil Burk <philburk@google.com> [audio][nuplayer] Aggregate buffers to reduce power.

Combine audio data from multiple buffers into one.
This reduces churn between threads and saves battery power.

Only use buffer aggregation when offloading the decoder.
Pend buffer if it won't fit in the bigger buffer.

Bug: 15094301
Change-Id: Iad3dac90b5d6b0fa43432b0e6776652ee2eafaa1
Signed-off-by: Phil Burk <philburk@google.com>
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
aec8b9ac793cdecb4ec3d9e38c63d71b2167be23 08-Sep-2014 Wei Jia <wjia@google.com> am e2b2e5fb: am 43cbe059: Merge "NuPlayerDriver: put player in paused state when reaching EOS." into lmp-dev

* commit 'e2b2e5fb735a2cdd93e44982539470fbec2ab36b':
NuPlayerDriver: put player in paused state when reaching EOS.
43cbe059b21185855465063d3767c2364f446f44 08-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: put player in paused state when reaching EOS." into lmp-dev
693f83c2d739380c108707887fd2cd9542e0eea6 08-Sep-2014 Andy Hung <hunga@google.com> am 03e09ef5: am 835ae86b: Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" into lmp-dev

* commit '03e09ef566cefa5626a4873f0a39e2b433062171':
Revert "Revert "disable AwesomePlayer for Ogg vorbis""
835ae86b49da5e15a501cb12c25458f8b63e38be 08-Sep-2014 Andy Hung <hunga@google.com> Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" into lmp-dev
00f703e001e5663760fe21defb05fe22ee5a932a 06-Sep-2014 Robert Shih <robertshih@google.com> am 5b7e6f7a: am f17882b3: Merge "GenericSource: refactor track selection for dedicated looper" into lmp-dev

* commit '5b7e6f7afb7370d74212e3ccfe5f4b95c513b72e':
GenericSource: refactor track selection for dedicated looper
429ffde9abdea2b8b5792c04b333085207c1eb79 06-Sep-2014 Andy Hung <hunga@google.com> am 031f0a36: am ade312d5: Merge "NuPlayer: Restrict seek on video texture changes" into lmp-dev

* commit '031f0a3633b2c11074da55478038b84dbe250403':
NuPlayer: Restrict seek on video texture changes
f17882b310426d243f8cd541f1774c03ccdd4957 06-Sep-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: refactor track selection for dedicated looper" into lmp-dev
4ec6746804ad8172c8b1c4eb3e6deb19a0920734 05-Sep-2014 Wei Jia <wjia@google.com> NuPlayerDriver: put player in paused state when reaching EOS.

Bug: 17352759
Change-Id: I19b183e0a86b712524f79ec7c35e32b5a5b47bc6
uplayer/NuPlayerDriver.cpp
11170105650d62cc79e0d8d6d62a03b1928d9506 06-Sep-2014 Andy Hung <hunga@google.com> am 6a857f52: am 767fc12e: Merge "NuPlayer: Discard seeks when source and decoders are NULL" into lmp-dev

* commit '6a857f5263a82eae4f48eb15f62febf10b971cf9':
NuPlayer: Discard seeks when source and decoders are NULL
ade312d5c933cff798c3febefabc47b00390ee4a 05-Sep-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Restrict seek on video texture changes" into lmp-dev
a7bb4be9c79a8ea06b270304a657b9aa2034039c 05-Sep-2014 Chong Zhang <chz@google.com> am 627728f2: am 3ec9c3d2: Merge "Split CEA-608 Closed caption into 4 tracks CC1~CC4" into lmp-dev

* commit '627728f2bb2baf708dfa0159cee77c29c17412cd':
Split CEA-608 Closed caption into 4 tracks CC1~CC4
767fc12e58422eef14aa40a5e7ffefd0b3949b82 05-Sep-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Discard seeks when source and decoders are NULL" into lmp-dev
3ec9c3d2d813149b9f049afc5ea48f1276645f3a 05-Sep-2014 Chong Zhang <chz@google.com> Merge "Split CEA-608 Closed caption into 4 tracks CC1~CC4" into lmp-dev
7353585789513466d5887986620e8734a325b3eb 05-Sep-2014 Andy Hung <hunga@google.com> NuPlayer: Restrict seek on video texture changes

MediaPlayer::setVideoSurfaceTexture() should generate seek to refresh
display only if player is started and has video.

Bug: 17379148
Bug: 17404923
Change-Id: I5f55dc40943e4419d08be6fdab964b8a2c5ee519
uplayer/NuPlayer.cpp
25dc053bd80856b4fb07bf702531f6b94debd00d 05-Sep-2014 Eric Laurent <elaurent@google.com> am 8572502f: am f2c0ff43: Merge "Fix to parse audio_source_t member of audio_attributes_t" into lmp-dev

* commit '8572502f1f88394831027ba2ddebef43b2862294':
Fix to parse audio_source_t member of audio_attributes_t
f2c0ff43e5c6f83775990fd539dad49c14c6037c 05-Sep-2014 Eric Laurent <elaurent@google.com> Merge "Fix to parse audio_source_t member of audio_attributes_t" into lmp-dev
4f418f9705d6c247b645cbcf255a3f56e665d216 05-Sep-2014 Hyejin Kim <hyejin.kim@lge.com> Fix to parse audio_source_t member of audio_attributes_t

When unmarshalling audio_attributes_t typed data,
it didn't parse the audio_source_t member between content_type and flags.

Bug: 16906307

Change-Id: Ia0d8df9b5c31441d34dc82678bceccd8ce31423d
ediaPlayerService.cpp
adf34bf9b7925f990259b1b6f4c69b8668f76ead 04-Sep-2014 Andy Hung <hunga@google.com> NuPlayer: Discard seeks when source and decoders are NULL

Problem occurs when loop mode asynchronously seeks to the
start of the source after a MediaPlayer::reset().

Bug: 17379148
Change-Id: I50bfe65a753afffb1d478db54c76067a9c61a0ae
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
b86e68f834b7040518b99d1d0245d5f2e5cb9c86 01-Aug-2014 Chong Zhang <chz@google.com> Split CEA-608 Closed caption into 4 tracks CC1~CC4

Bug: 16463078

Change-Id: Ib3073090934232016e535fbb8fa56cdf9d7ab6eb
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
17f6dd64cd749f4e38e12b672b551047f4cbe9b4 21-Aug-2014 Robert Shih <robertshih@google.com> GenericSource: refactor track selection for dedicated looper

- move getFormatMeta, getSelectedTrack, selectTrack, and seekTo to
dedicated looper
- start & dequeueAccessUnit posts readBuffer requests instead of reading
directly
- call internal doGetFormatMeta in onPrepareAsync

Bug: 16892748
Change-Id: I5d5e34381f1dfceca655c52a201627b53454ad22
uplayer/GenericSource.cpp
uplayer/GenericSource.h
459884dd62a5a23876cf60d125bfa835fb71f0c0 04-Sep-2014 Wei Jia <wjia@google.com> am 6e2ced09: am d3db0bfa: Merge "NuPlayer: add seek operation when change video texture surface." into lmp-dev

* commit '6e2ced090d64e0ddeb274035dc4ffaf6b01153b0':
NuPlayer: add seek operation when change video texture surface.
48f36a07d1faa1b8ec0af5d12d3c18fbfcb9eb65 04-Sep-2014 Andy Hung <hunga@google.com> Revert "Revert "disable AwesomePlayer for Ogg vorbis""

This reverts commit da65048e8e6f65ed9b3f23cda3f4554025c76fc4.

Deadlock audio issues for NuPlayer have been resolved.

Change-Id: I1853d367dc771a9396a9b2d48ff34e50c78c112c
ediaPlayerFactory.cpp
ediaPlayerFactory.h
d3db0bfafc98305f867502c06de3ce415c97d3fb 03-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: add seek operation when change video texture surface." into lmp-dev
c08f60b17967cf99bb03105081fb9064b5f34545 03-Sep-2014 Chong Zhang <chz@google.com> am 85b41b0f: am 453d633b: Merge "render one video frame after flush even when we\'re paused" into lmp-dev

* commit '85b41b0f1fd9b683e3075cac53d522e664ee2ac7':
render one video frame after flush even when we're paused
ac428aa54d2489705091dd38372bbaade281a92e 03-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: add seek operation when change video texture surface.

Bug: 17278770

Change-Id: I9fd5207e1eccb91e64644d2d1da4183d4bf7ac2c
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
453d633ba6351c8efc2103383ca178a0674bd373 03-Sep-2014 Chong Zhang <chz@google.com> Merge "render one video frame after flush even when we're paused" into lmp-dev
fbe8bef8bcf7aed97f0332908a817b0e6d91b9ba 30-Aug-2014 Chong Zhang <chz@google.com> render one video frame after flush even when we're paused

allows the video to get some update when user seeks while paused.

Bug: 17140448

Change-Id: I064806bfd566585eeb4150a508422c9775e08f99
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
575af1dab104287e65528a76dcf5ff07bc989114 02-Sep-2014 Wei Jia <wjia@google.com> am 18e24608: am e7494680: Merge "NuPlayerRenderer: stop feeding AudioSink when paused." into lmp-dev

* commit '18e24608d92a204191101a374ded26498caf02d9':
NuPlayerRenderer: stop feeding AudioSink when paused.
f423f73edeeccdf09713779de5a0b055ad31d0c3 02-Sep-2014 Ronghua Wu <ronghuawu@google.com> am d4fece27: am 64a385d5: Merge "GenericSource: set DRM playback status." into lmp-dev

* commit 'd4fece27b2fa8c84ae4f0fcfba5050028ef55d57':
GenericSource: set DRM playback status.
d299f92796f30d249f08f8bf3bcfe289bc9d3627 02-Sep-2014 Wei Jia <wjia@google.com> am f910a3df: am c9d62de7: Merge "MediaCodec: set state to UNINITIALIZED when receiving fatal error." into lmp-dev

* commit 'f910a3dfeb3fb58c297a37757e28150462fe1e9e':
MediaCodec: set state to UNINITIALIZED when receiving fatal error.
e7494680914c384dc6e93ae85f4337b06b300468 02-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: stop feeding AudioSink when paused." into lmp-dev
64a385d5d8e42ac96c88fb025212b4023690db39 30-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "GenericSource: set DRM playback status." into lmp-dev
c22c695660ed9edaba0d4cd7c0ab3a794216fe80 29-Aug-2014 Wei Jia <wjia@google.com> MediaCodec: set state to UNINITIALIZED when receiving fatal error.

NuPlayerDecoder: release MediaCodec when handling an error.

Bug: 16661923
Change-Id: I1b6fd7ee5cc1136b3f289135e5360cd3d98f9799
uplayer/NuPlayerDecoder.cpp
73ddd210ea572375198cac1d4960df793745fb4b 30-Aug-2014 Wei Jia <wjia@google.com> NuPlayerRenderer: stop feeding AudioSink when paused.

NuPlayerDriver: current position is updated only in running state.

Bug: 17141882
Change-Id: Ia88551cc29ef8f0e7ef0600a214feb5633389b6e
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerRenderer.cpp
802768790c131f8237364906fd13981a6bb91193 29-Aug-2014 Ronghua Wu <ronghuawu@google.com> GenericSource: set DRM playback status.

Bug: 17307158
Change-Id: I36b801a9b67831b618930cf1241756bb9644b4fd
ndroid.mk
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayerSource.h
aae539bb3a23e06a818bf30710a3da538f0405fa 28-Aug-2014 Ronghua Wu <ronghuawu@google.com> am 1b6d6789: am d362ea17: Merge "AudioPlayback: delay the post of EOS based on pending playout." into lmp-dev

* commit '1b6d6789f862a0b37b5f7f323cbb39995ff29e4e':
AudioPlayback: delay the post of EOS based on pending playout.
d362ea179c25dd1998e2edee7994e549d00e7eec 27-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "AudioPlayback: delay the post of EOS based on pending playout." into lmp-dev
5095d7091874cb9e9c95ecc4fe762076ed05e624 27-Aug-2014 Ronghua Wu <ronghuawu@google.com> AudioPlayback: delay the post of EOS based on pending playout.

Bug: 16840522
Change-Id: Icdc8888f5a8a77e2e5ebeb8a6934c7d79bd9e71a
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
f65fdaa45b550518b374b6f303b60edf597c0f0f 27-Aug-2014 Wei Jia <wjia@google.com> am 429b4f7f: am 5bc5b4fb: Merge "NuPlayer: set controlledByApp to true when creating Surface." into lmp-dev

* commit '429b4f7f425c68e785dea5fa93914bf687cbcaa6':
NuPlayer: set controlledByApp to true when creating Surface.
5bc5b4fbf16a0331a4f2f1d16585932087ee41c1 27-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: set controlledByApp to true when creating Surface." into lmp-dev
3ff4f4cda252dfd2e11d00c9daf9b902cab24ae2 27-Aug-2014 Marco Nelissen <marcone@google.com> am faf71460: am 355286ee: Merge "Fix SoundPool lockup" into lmp-dev

* commit 'faf7146006ea8b44a745f4f61d3c9de14e88e2b4':
Fix SoundPool lockup
355286ee1e5057c66158fcea785bf1881e069101 27-Aug-2014 Marco Nelissen <marcone@google.com> Merge "Fix SoundPool lockup" into lmp-dev
9c03a40367c149526c31ddf14a518ba2036195a5 27-Aug-2014 Wei Jia <wjia@google.com> NuPlayer: set controlledByApp to true when creating Surface.

This fixes hang when trying to dequeue buffer from native window
followed by a flush.

Bug: 16303659
Bug: 17250931
Change-Id: Ib87ae558b020f5ce82b4192ec63339c93a72a2e9
uplayer/NuPlayer.cpp
2a79c3274e11b91675a509e16cb3b157df141fac 26-Aug-2014 Marco Nelissen <marcone@google.com> Fix SoundPool lockup

NuPlayerDriver needs to update its internal state before calling
its listener, so that when the listener calls back into NuPlayerDriver,
NuPlayerDriver has the right state.

Bug: 14057920
Change-Id: I224882c427f5e3c9d4bf96c5d68075e235062401
uplayer/NuPlayerDriver.cpp
16681c8f4afa5f18649ed934c9d84198516a1054 26-Aug-2014 Chong Zhang <chz@google.com> am ab4ff31a: am 5bbffc05: Merge "do string compare with mime immediately after we get the value" into lmp-dev

* commit 'ab4ff31a0ef2650f7d09f5f18ae1df580f5eefd0':
do string compare with mime immediately after we get the value
5bbffc05432b6a81280872a9c3ed9cac7bec53df 26-Aug-2014 Chong Zhang <chz@google.com> Merge "do string compare with mime immediately after we get the value" into lmp-dev
afc0a87cc92a474bb14fb2a4093c74d04e4efd1b 26-Aug-2014 Chong Zhang <chz@google.com> do string compare with mime immediately after we get the value

Bug: 17210803
Change-Id: I4d20dd4b95d18251c18a371bd8f89b1320b38879
uplayer/GenericSource.cpp
a565b4493292be6cebfce121edbecc4c3554b42e 26-Aug-2014 Rachad Alao <rachad@google.com> am 042eac90: am d42173a4: Merge "Revert "disable AwesomePlayer for Ogg vorbis"" into lmp-dev

* commit '042eac90a5a0e8e4ccaa851bd4f96b237d4ec59f':
Revert "disable AwesomePlayer for Ogg vorbis"
d42173a44721af1a600b9c8599bc736394fcc724 25-Aug-2014 Rachad Alao <rachad@google.com> Merge "Revert "disable AwesomePlayer for Ogg vorbis"" into lmp-dev
da65048e8e6f65ed9b3f23cda3f4554025c76fc4 25-Aug-2014 Rachad Alao <rachad@google.com> Revert "disable AwesomePlayer for Ogg vorbis"

Temporarily revert commit 9b48f5d780757ffb81709df3633d06b62edaf39f as a workaround for b/17173673

Bug: 17173673
Change-Id: Iec52289e77485a58ce28cc515d6a5b8e7b2d328a
ediaPlayerFactory.cpp
ediaPlayerFactory.h
7ef2a21a57ce4dd3bdd14c87210481460ebe363e 25-Aug-2014 Lajos Molnar <lajos@google.com> am 3650440a: am 8dad3f60: Merge "NuPlayer: remember and resubmit CSDs after flush" into lmp-dev

* commit '3650440a962e6636dcc284fbd8fd3c127939b344':
NuPlayer: remember and resubmit CSDs after flush
5b85cf56f1c0ce4f41431aec929f3405a9c8abd4 25-Aug-2014 Chong Zhang <chz@google.com> am 008cee91: am 052efa49: Merge "wait for flush to finish before returning setSurface" into lmp-dev

* commit '008cee913577839d2377ff79bf4f26655c3a2c7d':
wait for flush to finish before returning setSurface
87603c0dd1f4e62e52feffa8d6e960ad21f68893 21-Aug-2014 Lajos Molnar <lajos@google.com> NuPlayer: remember and resubmit CSDs after flush

Bug: 17118001
Change-Id: I09bbefd4c05de0db1c593e8d6d38859358a20ebb
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
052efa490b595d17d1452ec019979996fe470a05 23-Aug-2014 Chong Zhang <chz@google.com> Merge "wait for flush to finish before returning setSurface" into lmp-dev
61cdd163e99eda4c8313bf754c1c557f8291aa8d 23-Aug-2014 Chong Zhang <chz@google.com> am 44945f04: am 43febe72: Merge "add buffering update to GenericSource" into lmp-dev

* commit '44945f04a5f6bbbb79447446a9d12d37d474ab6f':
add buffering update to GenericSource
43febe72dadc751acff410842e091d4099919fad 23-Aug-2014 Chong Zhang <chz@google.com> Merge "add buffering update to GenericSource" into lmp-dev
13d6faa02087ce3bb0d4a02b8495f1822f211433 23-Aug-2014 Chong Zhang <chz@google.com> wait for flush to finish before returning setSurface

Bug: 17187598
Change-Id: I091219e57158a4532044ca49342b57277d6ecb15
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
7737d01ec40690184cd8f658db34e1aa35e0b9e6 23-Aug-2014 Wei Jia <wjia@google.com> am c3c107ca: am d1de9bb3: Merge "ACodec: handle errors related to native window." into lmp-dev

* commit 'c3c107cae90e635e4d0928133d513c12f4dbe79d':
ACodec: handle errors related to native window.
d1de9bb33a2f645fb9dc54e7fc69ca45304850a5 22-Aug-2014 Wei Jia <wjia@google.com> Merge "ACodec: handle errors related to native window." into lmp-dev
763219aa25e9e4c5de7e1fa9497cccf8508c54dc 22-Aug-2014 Wei Jia <wjia@google.com> am 3672da6f: am 7992a5d0: Merge "NuPlayerDriver: fix current position for stop and pause." into lmp-dev

* commit '3672da6f03db75f7d7c86dd1e994e7758ba82670':
NuPlayerDriver: fix current position for stop and pause.
ed61c214ce7c930f2d593801c5702fddbb499e49 22-Aug-2014 Chong Zhang <chz@google.com> am e6198959: am b534f461: Merge "move cache prefill to GenericSource\'s message handler" into lmp-dev

* commit 'e61989593b2afec539f7d699e5b4c0bfdbca27d8':
move cache prefill to GenericSource's message handler
3fb9f68dea5d991288f0ea8037742b50c7df5767 20-Aug-2014 Wei Jia <wjia@google.com> ACodec: handle errors related to native window.

Bug: 17068327
Bug: 13133027
Change-Id: I9875e524222a10d1be26be5a84b9633b4aaeb210
uplayer/NuPlayerDecoder.cpp
7992a5d0f6d995d46bf649dbac45e0e8267f1397 22-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: fix current position for stop and pause." into lmp-dev
b534f461f6056c84c3ae87e27430f4b934fd3eb1 22-Aug-2014 Chong Zhang <chz@google.com> Merge "move cache prefill to GenericSource's message handler" into lmp-dev
2a3cc9a64330dd36e466fe5e1b634146f2d641c1 22-Aug-2014 Chong Zhang <chz@google.com> add buffering update to GenericSource

Bug: 17182378

Change-Id: Ib86f3f522d7ea635489edd2b512adb7f4b27e381
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayerSource.h
0560195a71ee26e8546075e56c49ff535fcf1767 21-Aug-2014 Wei Jia <wjia@google.com> NuPlayerDriver: fix current position for stop and pause.

When start() is called after EOS, it means restarting from the beginning of the stream.
Fix racing conditon on accessing some members.
Report seekTo position before any notifyPosition is called.

Bug: 17031731
Bug: 17178928
Change-Id: I008b827288cf28d39e2a943373fe1e5d7d6c2595
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
d354d8d1b09503c0166c1f3e626cda72a3eeb83c 20-Aug-2014 Chong Zhang <chz@google.com> move cache prefill to GenericSource's message handler

This allows prepareAsync to be terminated by reset promptly.

It also makes it easier to do buffer update as GenericSource
can access the cache status now.

Bug: 16892748
Bug: 17182378

Change-Id: Ia55c04a810fd805041cb2025f6739afa5120b5ed
uplayer/GenericSource.cpp
uplayer/GenericSource.h
192b0ed174298d84412fc8a47bc8b46a1bd8cc66 22-Aug-2014 Andy Hung <hunga@google.com> am 19d99c52: am ef8ae4cb: Merge "Fix SoundPool and MediaPlayerService buffer overflow" into lmp-dev

* commit '19d99c521fb810aff292d9e40aa5caa415624986':
Fix SoundPool and MediaPlayerService buffer overflow
ef8ae4cbec0c9f49a24625d4316ec9bfde4e75c3 22-Aug-2014 Andy Hung <hunga@google.com> Merge "Fix SoundPool and MediaPlayerService buffer overflow" into lmp-dev
a31335a4ec96ba351f25f3b26fa79a78c2723a13 21-Aug-2014 Andy Hung <hunga@google.com> Fix SoundPool and MediaPlayerService buffer overflow

Overflow occurs when SoundPool sample tracks cannot
fit in the MediaPlayerService AudioCache buffer.

Unnecessary decoding occurred with AwesomePlayer and
an assert failure occurred with NuPlayer. NuPlayerRenderer
is also tweaked to handle the latter case.

Bug: 17122639
Change-Id: I4d25d3e2c0c62e36a91da6bf969edabddc2ebbb0
ediaPlayerService.cpp
ediaPlayerService.h
uplayer/NuPlayerRenderer.cpp
996ad595c0f8ce8ab43eb22e3e7ad0f0b44a4ea9 21-Aug-2014 Wei Jia <wjia@google.com> am 5bf363ae: am 01047680: Merge "NuPlayerDriver: include lapsed time when reporting current position." into lmp-dev

* commit '5bf363ae3c4782ed5ad0bdb8a0b41a8ad23ac210':
NuPlayerDriver: include lapsed time when reporting current position.
5aacfcbf76deb83336cc2374f9d5b051e7ce32c1 21-Aug-2014 Chong Zhang <chz@google.com> am 5218daea: am c10b4689: Merge "disable AwesomePlayer for Ogg vorbis" into lmp-dev

* commit '5218daeaccff146bd6c40c6b8b7dd37c527e9168':
disable AwesomePlayer for Ogg vorbis
use dedicated looper for GenericSource
Camera API1: Ignore the video size change during recording
6b647f5591bb61bf7309f72dfbff050589ab69e8 21-Aug-2014 Marco Nelissen <marcone@google.com> am 472ff73c: am e0b5cf7e: Merge "Fix typo in comment" into lmp-dev

* commit '472ff73c795b5046d702f1ec555cbc377f94210f':
Fix typo in comment
6e819a6e82f25656263b39976a74b5fd3e9ced98 21-Aug-2014 Marco Nelissen <marcone@google.com> am 56b350ea: am 111333ea: Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev

* commit '56b350eaac38fdccb08dd3d7d8b12c6a2a83ac25':
handle error during flush in MediaPlayer.reset()
e2084024664a49d8b55ea144f788eada4142a37a 21-Aug-2014 Marco Nelissen <marcone@google.com> am d05795e5: am 4deb606b: Merge "Fix NuPlayer deadlock" into lmp-dev

* commit 'd05795e583a668c97be55359215fdd51297e3273':
Fix NuPlayer deadlock
01047680ac57712303e259f485efd9cb97e9a99a 21-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: include lapsed time when reporting current position." into lmp-dev
15506a6582fb86567c6887c4c426d44be02d12af 21-Aug-2014 Wei Jia <wjia@google.com> NuPlayerDriver: include lapsed time when reporting current position.

Bug: 17031731
Change-Id: I01962ee9194bdaa9e8ed1a51abbf365733be3c85
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
9b48f5d780757ffb81709df3633d06b62edaf39f 20-Aug-2014 Chong Zhang <chz@google.com> disable AwesomePlayer for Ogg vorbis

Bug: 17108024

Change-Id: I0a970e6476d0f739e65d2200d0f5220dee8d36ef
ediaPlayerFactory.cpp
ediaPlayerFactory.h
951af33dcbe02abf6d145f7bda20edf3d8e7dfb4 20-Aug-2014 Robert Shih <robertshih@google.com> am 62e31181: am bb137ef8: Merge "StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder" into lmp-dev

* commit '62e31181ec120e2755faf80e721d56ee7e0ae3de':
StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder
e0b5cf7eae5ae16699864eeb8ae36975caa7a26c 20-Aug-2014 Marco Nelissen <marcone@google.com> Merge "Fix typo in comment" into lmp-dev
44d3281b6529370efb72fe2fb126ee3a468d53e2 20-Aug-2014 Marco Nelissen <marcone@google.com> Fix typo in comment

Bug: 14057920
Change-Id: I51c4d47b9e175ef789ed3c51d59c9eda77edc1e0
uplayer/NuPlayerDriver.cpp
c10b4689be0d3a0f4ff38c544a6c86c984665d26 21-Aug-2014 Chong Zhang <chz@google.com> Merge "disable AwesomePlayer for Ogg vorbis" into lmp-dev
8008fb50e8e4617092dd3c18aa3833ec3f3015df 20-Aug-2014 Wei Jia <wjia@google.com> am 054e6686: am 5596d7c4: Merge "Allow audio and video flushed separately." into lmp-dev

* commit '054e66865142b0a8b3bdbc7e8eaabd3ddca51fc0':
Allow audio and video flushed separately.
586bc79ca9cc11199cfc0581c4275ee62af55b21 20-Aug-2014 Wei Jia <wjia@google.com> am d3df0ccb: am 3ef1e656: Merge "NuPlayerRenderer: allow flush() to be called multiple times." into lmp-dev

* commit 'd3df0ccb4d75cecb952baaf7c8842e57d9c7e1e7':
NuPlayerRenderer: allow flush() to be called multiple times.
3ef1e656086e6aed75b508715e59951f028841a1 20-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: allow flush() to be called multiple times." into lmp-dev
d0a5a14aefc8a7918d9717080e1bdeaaf6b40b55 19-Aug-2014 Wei Jia <wjia@google.com> am de244f21: am 2a1bcb83: Merge "NuPlayer: use generation to detect stale requests from old decoders." into lmp-dev

* commit 'de244f21b11e7718a070cc96ab2af756d447cee4':
NuPlayer: use generation to detect stale requests from old decoders.
c89ce3c72c10786985b4156f6d4fcfd478d6d7c6 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> am 33610e35: am 5a5a2325: Merge "NuPlayer: disable deep audio buffer in offload mode." into lmp-dev

* commit '33610e353ff518c958a96686807326e5e0983913':
NuPlayer: disable deep audio buffer in offload mode.
0e58fd504fbc9c7b56dd86984b104f9c754989cf 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> am 1533fb3a: am 1593dc57: Merge "NuPlayerRenderer: only query audio sink for position for the first entry." into lmp-dev

* commit '1533fb3acf1b682b7ec4753480e0bc184636f1cb':
NuPlayerRenderer: only query audio sink for position for the first entry.
c8dfbc6216905946f7a52f0b11f05cf88e807dc3 19-Aug-2014 Lajos Molnar <lajos@google.com> am c2a02f95: am af11287b: Merge "NuPlayer: add support for proper stop" into lmp-dev

* commit 'c2a02f95083537b81320cde5671587bc2daeb0d8':
NuPlayer: add support for proper stop
28a8a9ff2a2bfd5edbdbbadde50c6d804335ffdc 18-Aug-2014 Wei Jia <wjia@google.com> NuPlayerRenderer: allow flush() to be called multiple times.

Also fix racing condition on accessing some members.

Bug: 16982307
Bug: 13133027
Change-Id: I0d4a605146e24ad7396a07369d501593cad73f41
uplayer/NuPlayerRenderer.cpp
2a1bcb8347ad4778a49bb340c3ed28ba27caa7d7 19-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: use generation to detect stale requests from old decoders." into lmp-dev
88703c34fb4a9db1ff51495879f9775474c8ce89 06-Aug-2014 Wei Jia <wjia@google.com> NuPlayer: use generation to detect stale requests from old decoders.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 13133027
Change-Id: I3e66b25b2302c0eb795361629b03bf2e96ed34e4
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
111333eaab12448f45927464c8aeacbbf9a578a1 20-Aug-2014 Marco Nelissen <marcone@google.com> Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev
9e2b7918eb5621b24bd54c922f630da45339de77 19-Aug-2014 Marco Nelissen <marcone@google.com> handle error during flush in MediaPlayer.reset()

If there was an error during the flush phase of a reset, then the
reset would never complete. We now make sure the MediaCodec moves
to the right state in this case, and that NuPlayer cleans up and
resumes the rest of the reset after a failed flush.

Bug: 16955082
Change-Id: Ied61136871a9fcdffcc80647fa2bba64a926ac2a
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
4deb606bca47f971f1ca05e44b934c5328cfb6b7 20-Aug-2014 Marco Nelissen <marcone@google.com> Merge "Fix NuPlayer deadlock" into lmp-dev
eb645a0d1820b227af287a5309f017afadbab4e3 20-Aug-2014 Marco Nelissen <marcone@google.com> Fix NuPlayer deadlock

Mutexes can't be locked recursively. This would cause a seek in the prepared
state to deadlock

Bug: 14057920
Change-Id: Ifb5e25f24450b7e5f71611a8ee2bdba45dba70a7
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
bb137ef84e6308fb4f977ebf757cf3559e9cce71 20-Aug-2014 Robert Shih <robertshih@google.com> Merge "StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder" into lmp-dev
76dc9c5052741bf0910a23a20c9df6018c4979d8 20-Aug-2014 Robert Shih <robertshih@google.com> StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder

Bug: 16329805
Change-Id: Ibc80cdeb1958f739dd67b65e57f6b7cc551a9db3
tagefrightRecorder.cpp
5596d7c4ad388d1757398181b3a1453d731a1b41 20-Aug-2014 Wei Jia <wjia@google.com> Merge "Allow audio and video flushed separately." into lmp-dev
53904f372b9c4a5ea7f839012b52b3d564e41207 29-Jul-2014 Wei Jia <wjia@google.com> Allow audio and video flushed separately.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 13133027
Change-Id: I956a9f55513970115119c7639a5e33b39e6d2f55
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
af11287b39b6420c8a05a5c8c9b72f7e4ddc82f7 19-Aug-2014 Lajos Molnar <lajos@google.com> Merge "NuPlayer: add support for proper stop" into lmp-dev
cd122ca7f73113f4b6e54cb6ad3ad6bb65d97e44 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> am 76ee3797: am a7ee3549: Merge "stagefright: Do not add silence data for compress offload" into lmp-dev

* commit '76ee37977803198626cafb3b8f0572fc99626d61':
stagefright: Do not add silence data for compress offload
5a5a23255ad83ef378f924ead4e90e756773e278 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: disable deep audio buffer in offload mode." into lmp-dev
1ffb5381ca40884868299a2ac8a1424b68a1a43e 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: disable deep audio buffer in offload mode.

Bug: 17035257
Change-Id: I56ca28d4c4774c1c0103d19126cf0b8f859964b7
uplayer/NuPlayer.cpp
1593dc575cf4a83be9f4d04b24ecc402ee4e2519 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayerRenderer: only query audio sink for position for the first entry." into lmp-dev
3e5efb37308aa1f54c2a72cd8a7a73d2d7921a90 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> NuPlayerRenderer: only query audio sink for position for the first entry.

Bug: 17035257
Change-Id: I472ec4610e1174c59986f42d72fe55f90e93731e
uplayer/NuPlayerRenderer.cpp
f2575571d88cd42508407e98957a19a875dcf926 13-Aug-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> stagefright: Do not add silence data for compress offload

Bug: 16683770
Bug: 17035257
Change-Id: I7aef543c47214cc2854d143167b02f1603cf8bea
ediaPlayerService.cpp
a7ee3549823af3dc4b22284f1a2fe4fbf31cf30b 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: Do not add silence data for compress offload" into lmp-dev
f96eba77cc9b638c53e248c6184713ad9144e970 15-Aug-2014 Chong Zhang <chz@google.com> am 28928517: am 426c719a: Merge "use dedicated looper for GenericSource" into lmp-dev

* commit '28928517f84ac4259a65f0ea783c9769ab554718':
use dedicated looper for GenericSource
426c719a5f3b4d88480eb35a7b0b373f672ea3cb 15-Aug-2014 Chong Zhang <chz@google.com> Merge "use dedicated looper for GenericSource" into lmp-dev
378a3567ea5d062248ee4373db69af6e1fdf53f4 15-Aug-2014 Andy Hung <hunga@google.com> am 639942e1: am c2319720: Merge "nuplayer: create AudioSink early to verify offload is possible" into lmp-dev

* commit '639942e11ac9f2ce33ff418647e33a70951b8d7c':
nuplayer: create AudioSink early to verify offload is possible
282a7e31681840253a4cb6fab3f6725d35798699 15-Aug-2014 Andy Hung <hunga@google.com> nuplayer: create AudioSink early to verify offload is possible

Offload audio playback is not guaranteed even if AudioSystem says it
is allowed. Create AudioSink early to verify offload is really possible.
Move AudioSink open / close into functions.

Bug: 16732303
Bug: 16978805
Change-Id: Ie1c73a96656863c1281bed3280a84b86d3cbadf5
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
1228d6b175de8b21787cbe0c6c4bb5642f4d555e 13-Aug-2014 Chong Zhang <chz@google.com> use dedicated looper for GenericSource

- handle setVideoSurface in deferred action, and return
to client immediately

- handle GenericSource's prepareAsync on its own looper,
instead of sharing looper with NuPlayer

- let HTTPLiveSource share looper with LiveSession, instead
of NuPlayer

- remove reflector in RTSPSource

Bug: 16892748
Change-Id: I1aed557320052012065f5a90adbcb03c238da988
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/HTTPLiveSource.cpp
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
eac30f709d871a56ba54593279992969d5f8bc21 13-Aug-2014 Chong Zhang <chz@google.com> am 8e57a02f: am 44a5a202: Merge "cache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough" into lmp-dev

* commit '8e57a02fe1047ab0ae2450b9197cf2cbbb6b691b':
cache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough
de01afbbc55ac9c5c23ec66154603f34217aed2c 13-Aug-2014 Chong Zhang <chz@google.com> cache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough

Bug: 16892521
Change-Id: I0e2da4134a37e632f9f2c29d1d27d8fded7a7863
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
7314207ab49519bbecbe333bba491becb33ca443 12-Aug-2014 Chong Zhang <chz@google.com> am 30d28dab: am dbdaa08c: Merge "propogate heartbeat error code to app" into lmp-dev

* commit '30d28dab4cf3f31baecb6d4b7857cd19b6170f8c':
propogate heartbeat error code to app
dbdaa08cbed61b9ba4afc43f0ce0230346a1ca2f 12-Aug-2014 Chong Zhang <chz@google.com> Merge "propogate heartbeat error code to app" into lmp-dev
f4c0a94ab32541611f5ed6d407fc25b394c1988b 12-Aug-2014 Chong Zhang <chz@google.com> propogate heartbeat error code to app

Bug: 16885604
Change-Id: Ib6c60f0ef8cf72aa1aac67a75121142bff304018
uplayer/NuPlayer.cpp
09062bfafa335d15f5b52c29778e60482dfb3f33 09-Aug-2014 Robert Shih <robertshih@google.com> am f2bd67bc: am f7999047: Merge "NuPlayer: getSelectedTrack" into lmp-dev

* commit 'f2bd67bcc34f7963df9c9f2a8ce8ee1ae35de8e0':
NuPlayer: getSelectedTrack
4b75b86785d674b98dade17cd197b912d87cd279 16-Aug-2013 Lajos Molnar <lajos@google.com> NuPlayer: add support for proper stop

MediaPlayer.stop() should move to the Stopped state which is
semantically identical to the Initialized state.

Bug: 13138230
Change-Id: I5d7b4a22533f545c24a18e2cd9f7cb2685d42c84
Signed-off-by: Lajos Molnar <lajos@google.com>
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
7c4f0d757bfeedaab4b7ef4ccf5b0a72ec8f4306 10-Jul-2014 Robert Shih <robertshih@google.com> NuPlayer: getSelectedTrack

Change-Id: If5251f89b881e7f268e11a06cd3685d794c958b6
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerSource.h
d392471d4b433bb1aae1bc3c55c780cc1982f2b9 09-Aug-2014 Chong Zhang <chz@google.com> am 46f2c0a4: am a912c194: Merge "some clean up of video size change notification" into lmp-dev

* commit '46f2c0a40dd7e8f5ac6349c75889da7146a9cafc':
some clean up of video size change notification
delay data source creation for GenericSource prepare time
Revert "NuPlayer: don't feed decoder input data during flushing."
some fixes for crash when extractor creation fails
Revert GenericSource track selection changes
GenericSource: start/stop tracks correctly on selection
CameraService: Clean up availability listeners and HAL error codes
StagefrightRecorder: check for WEBM format instead of MP4
stagefright: handle seeking to before first cue-point.
ced1c2f8f6c422063092f5cc5c675ccdebb2dc10 09-Aug-2014 Chong Zhang <chz@google.com> some clean up of video size change notification

need to consider rotation when notifying video size change after
initial prepare, in addition to after an output format change.

Bug: 16870964
Change-Id: Icd1c9e901ac932e720ce95b8a983c0edcf251c35
uplayer/GenericSource.cpp
uplayer/HTTPLiveSource.cpp
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/StreamingSource.cpp
a912c194ded6c9ece78c492c68c3763f284bb5d5 09-Aug-2014 Chong Zhang <chz@google.com> Merge "some clean up of video size change notification" into lmp-dev
a19f33e4e50cda5d5953fa0cc662502262ac9dfd 08-Aug-2014 Chong Zhang <chz@google.com> delay data source creation for GenericSource prepare time

Bug: 16708180

Change-Id: I9d578ef5e2edaed50279d28d3831c68556468f39
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
b189a5b37cd1768f996096122b9541d9fa29ec43 07-Aug-2014 Wei Jia <wjia@google.com> Revert "NuPlayer: don't feed decoder input data during flushing."

The previous patch results in MediaBuffer leakage.

This reverts commit 69a85b792c31033a99c8858e3b1a3c2ea68b6278.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 16849601
Change-Id: Ib1892b7603a97e12b7ee228fd5a4009700cdc988
uplayer/NuPlayer.cpp
0afbc2c3a7769b31cbd1de931b65c4ab95fdf5a5 08-Aug-2014 Chong Zhang <chz@google.com> Merge "delay data source creation for GenericSource prepare time" into lmp-dev
1381d4b5c0385aec3741073e5998773b064c1fb0 08-Aug-2014 Lajos Molnar <lajos@google.com> media/playerservice: add getCodecList() to MediaPlayerService

Bug: 11990470
Change-Id: I8fa45946fd9b76f9b975fc59062819c57e6881ef
ediaPlayerService.cpp
ediaPlayerService.h
bf9b95d712a24b654761cb9fea0d94d383cfc661 08-Aug-2014 Chong Zhang <chz@google.com> delay data source creation for GenericSource prepare time

Bug: 16708180

Change-Id: I9d578ef5e2edaed50279d28d3831c68556468f39
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
5cce893dbe2e21363a44ad2b75924cd0761547cf 08-Aug-2014 Chong Zhang <chz@google.com> am 8ccfce0d: am 0afbc2c3: Merge "delay data source creation for GenericSource prepare time" into lmp-dev

* commit '8ccfce0de1a3a9ffd1771d120ab891d58d84fa61':
delay data source creation for GenericSource prepare time
26ddfc950b696f7a62e7442c9db9b2bcc5728ba0 08-Aug-2014 Lajos Molnar <lajos@google.com> am 21f75434: am 1381d4b5: media/playerservice: add getCodecList() to MediaPlayerService

* commit '21f75434a456c3b747c4b6a3f9801ee890f3eb46':
media/playerservice: add getCodecList() to MediaPlayerService
c03102b2f9edb79b02bc5ab87bb89817516526ad 07-Aug-2014 Wei Jia <wjia@google.com> am 9fdc1f14: am c80863e9: Merge "Revert "NuPlayer: don\'t feed decoder input data during flushing." " into lmp-dev

* commit '9fdc1f14ad1e3c5bf2e58ace056e85d11fca76b4':
Revert "NuPlayer: don't feed decoder input data during flushing."
c80863e922cb94122b783ef31ce18cf58471f546 07-Aug-2014 Wei Jia <wjia@google.com> Merge "Revert "NuPlayer: don't feed decoder input data during flushing." " into lmp-dev
5e78d66badd543bc9587eed74128bca47df40d70 07-Aug-2014 Wei Jia <wjia@google.com> Revert "NuPlayer: don't feed decoder input data during flushing."

The previous patch results in MediaBuffer leakage.

This reverts commit 69a85b792c31033a99c8858e3b1a3c2ea68b6278.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 16849601
Change-Id: Ib1892b7603a97e12b7ee228fd5a4009700cdc988
uplayer/NuPlayer.cpp
5d166509fa0cdf0e4b3037d7e05005a5390aedd3 07-Aug-2014 Robert Shih <robertshih@google.com> am 71fb0565: am 0893eaf7: Merge "httplive: timestamp reporting, track selection" into lmp-dev

* commit '71fb05656ad2c786c9f98df91d70ed010ba088d1':
httplive: timestamp reporting, track selection
a72b7ec42c02fd1e5a8f367e8faa1d0d633ded93 07-Aug-2014 Chong Zhang <chz@google.com> am 25d9b3df: am 29e09664: Merge "some fixes for crash when extractor creation fails" into lmp-dev

* commit '25d9b3df27fb96c616447723d7c4dca8770cebfb':
some fixes for crash when extractor creation fails
3de157dd8f9cd45bf9b0406268f5830887105ae1 06-Aug-2014 Chong Zhang <chz@google.com> some fixes for crash when extractor creation fails

- prefetch data for sniffing

- notify error instead of crashing if extractor is NULL

Bug: 16818302

Change-Id: I56ff4996d99ac2811d19d141f7ff7acdd7c1da17
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayer.cpp
ad543b4db6822057388376079c226901eaae5952 06-Aug-2014 Wei Jia <wjia@google.com> am df024a6a: am e4671134: Merge "NuPlayer: don\'t feed decoder input data during flushing." into lmp-dev

* commit 'df024a6a3944e672666f7aa87db2cccb00098af9':
NuPlayer: don't feed decoder input data during flushing.
0893eaf7d21e3a50b81324673eaa91a6b77a39c2 07-Aug-2014 Robert Shih <robertshih@google.com> Merge "httplive: timestamp reporting, track selection" into lmp-dev
72554a21e3f8ffd3389dccba308c3a89496a1652 06-Aug-2014 Chong Zhang <chz@google.com> am 96b7af16: am b15486f9: Merge "set secure flag for secure file playback" into lmp-dev

* commit '96b7af16048a78153e9674db0e749c58c621ccc1':
set secure flag for secure file playback
309aa8bf5e4cd66fe988adf2654cac3fadc2a1c3 30-Jul-2014 Robert Shih <robertshih@google.com> httplive: timestamp reporting, track selection

Bug: 15153976
Bug: 15763638
Bug: 16351654
Change-Id: I4462276d4b7342647286a0ca4be11692ce52ff6d
uplayer/GenericSource.cpp
69a85b792c31033a99c8858e3b1a3c2ea68b6278 05-Aug-2014 Wei Jia <wjia@google.com> NuPlayer: don't feed decoder input data during flushing.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Change-Id: I7c258b986ae711357bd7e636b79853f8f3959d32
uplayer/NuPlayer.cpp
c88fe1b40caab1b335669e1e373127f84148f622 05-Aug-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> am dd49ca9c: am ccad786f: stagefright: Pass audio aac subformats in offloadinfo

* commit 'dd49ca9c117b75afe70f78b6d458eaece2952bf7':
stagefright: Pass audio aac subformats in offloadinfo
ccad786f3497f223cbc5af981b08b460433ee622 02-Aug-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> stagefright: Pass audio aac subformats in offloadinfo

Pass audio aac sub formats in offloadinfo according
to aac profile. Audio HAL can take decision about offload
using DSP capabilities

Change-Id: Ice277e8b6561b7a7db92c474f23f8041ebb35e8c
uplayer/NuPlayer.cpp
e46711343b43786c049a007369a72c1c78e6c5db 05-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: don't feed decoder input data during flushing." into lmp-dev
b15486f973f80063ae2d436f7d71667b592c6fc9 05-Aug-2014 Chong Zhang <chz@google.com> Merge "set secure flag for secure file playback" into lmp-dev
7e892180f3992c088dc0d44f0b0e54ace4dabe3c 05-Aug-2014 Chong Zhang <chz@google.com> set secure flag for secure file playback

Bug: 16786456
Change-Id: I06f18b0e9c3f65e3e127369baa1f9ea8c9307762
uplayer/GenericSource.cpp
uplayer/NuPlayer.cpp
d965874dae835700edcddaed4bb7781636af459a 04-Aug-2014 Jeff Tinker <jtinker@google.com> am e2209ffe: am b63d63b8: Merge "Allow device to be unprovisioned" into lmp-dev

* commit 'e2209ffea3f23bf711b732c6b3aa33320f2d2cc0':
Allow device to be unprovisioned
eb1c5c147ab7b2977bf3128393b7b4711df7388a 01-Aug-2014 Lajos Molnar <lajos@google.com> am e6d334f4: am 25644c50: Merge "GenericSource: timed text support" into lmp-dev

* commit 'e6d334f4a32ec4caed3630e6c20c0dedeb3c063d':
GenericSource: timed text support
18def1b8b8cdc91695ebb75bb392a84bb1b9c9be 01-Aug-2014 Lajos Molnar <lajos@google.com> resolved conflicts for merge of e1009a0f to master
16513e84b7ee558f57bb8a79b35a3e8614548a5d 01-Aug-2014 Robert Shih <robertshih@google.com> am f4ba6193: am a2981013: NuPlayer: fix av discontinuity race

* commit 'f4ba6193ed0e363b5f1b588d8bc65575b6a0e3e2':
NuPlayer: fix av discontinuity race
1c650b8df21a6a5ae8a0177036a8b422e0c45403 01-Aug-2014 Robert Shih <robertshih@google.com> am 37ae54ee: am 3423bbdb: GenericSource: support track (de)selection

* commit '37ae54ee81f460e11c3e8fe81e74ec91d85b04d1':
GenericSource: support track (de)selection
68b15554f6dca3b056eac517fe5fa2fd4ee80a33 30-Apr-2014 Jeff Tinker <jtinker@google.com> Allow device to be unprovisioned

bug: 12247651
Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
rm.cpp
rm.h
25644c502ed8ec13bcf496613e65ec8edb1af4a7 31-Jul-2014 Lajos Molnar <lajos@google.com> Merge "GenericSource: timed text support" into lmp-dev
a2e14302d4b5ca5443611d0c05218b9da4cc64a6 31-Jul-2014 Lajos Molnar <lajos@google.com> mediaplayer: add looping support to NuPlayer

Bug: 16641557
Change-Id: I433158e6e585b4714cfd6d89562ecd0587a07ae2
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
a298101317e5472f6b6a12e6ddeafdc4064bd5b2 31-Jul-2014 Robert Shih <robertshih@google.com> NuPlayer: fix av discontinuity race

Assumption:
NuPlayer must see both (a/v) discontinuities before resuming.

Example issue:
Suppose we're changing the video track, so the video source queues a
DISCONTINUITY_FORMATCHANGE, and the audio source queues a DISCONTINUITY_NONE.
Consider this sequence of events without this change:
1. audio discontinuity seen by player
2. mFlushingAudio = FLUSHED
3. video discontinuity seen by player
4. mFlushingAudio != NONE so no performScanSources is queued
5. video decoding shuts down without being restarted

Bug: 15153976
Change-Id: I659550d9c0f883828103142abead857f576f25b1
uplayer/NuPlayer.cpp
3423bbdb05f843a64356fa24e8657f03ecbb7d65 17-Jul-2014 Robert Shih <robertshih@google.com> GenericSource: support track (de)selection

Bug: 15153976

Change-Id: Idfce856b4ca5fa7853da857757490798bc3ffe1e
uplayer/GenericSource.cpp
uplayer/GenericSource.h
e26940f11c3f2040bced09f06a8f374b50c985fb 31-Jul-2014 Lajos Molnar <lajos@google.com> GenericSource: timed text support

Bug: 16385674
Change-Id: Ib322cc13488dcadf2409921272cd469304b0af37
uplayer/GenericSource.cpp
uplayer/GenericSource.h
63c0ce7ab7bd99d51414dcb4f765bc6faabf367d 31-Jul-2014 Lajos Molnar <lajos@google.com> mediaplayerservice: initialize mIsWidevine

Bug: 16641557
Change-Id: I77aad6e710117a16093726bf3b36360904fbe148
uplayer/GenericSource.cpp
7b65b717e39667f26f73bcd83b30ad2ca0714159 31-Jul-2014 Lajos Molnar <lajos@google.com> am 110688f7: am 63c0ce7a: mediaplayerservice: initialize mIsWidevine

* commit '110688f7b5d59f3d8e6424068fb772918dcdfae9':
mediaplayerservice: initialize mIsWidevine
c5d03c0e6bfd7aacd07056ab62d67b0c37e45855 31-Jul-2014 Chong Zhang <chz@google.com> am da7e4c3a: am b382340f: Merge "handle rotation in NuPlayer" into lmp-dev

* commit 'da7e4c3ac27aa613855152a1c860ae54eed7e0be':
handle rotation in NuPlayer
26a0dca6971ef807a613fcb47bb6a5017ee80c95 30-Jul-2014 Wei Jia <wjia@google.com> am 9a45cc3f: am cb48eacb: Revert GenericSource track selection changes

* commit '9a45cc3f38bb6e3de1c76a27509af154adec1a3c':
Revert GenericSource track selection changes
cb48eacb6f8857c7857bb28d6a13d4a0d417f2bd 30-Jul-2014 Wei Jia <wjia@google.com> Revert GenericSource track selection changes

This reverts commit bace25b0fbcd5101d2db288b0c70c4a239f0e815.
This reverts commit eb1735e343a93830df259ae8882160bb0d79dcb5.
This reverts commit 05312bc7478feec11d9ae88e951c0857a7a3f28d.

Bug: 16660839
uplayer/GenericSource.cpp
uplayer/GenericSource.h
6779a7837e6b08e39fb538d72ce96a1e5b3decec 29-Jul-2014 Robert Shih <robertshih@google.com> am 42a095b7: am 0ec1f33e: Merge "GenericSource: start/stop tracks correctly on selection" into lmp-dev

* commit '42a095b7d475579aca6afc03b90c6fefb8281328':
GenericSource: start/stop tracks correctly on selection
f62447dd53ab2e8fdef527e539e8bc40f156d4f8 28-Jul-2014 Robert Shih <robertshih@google.com> am ce617e55: am ef9c5ade: Merge "GenericSource: timed text support" into lmp-dev

* commit 'ce617e55be26947eef4ba3b5a55d70f0e239d3ca':
GenericSource: timed text support
bace25b0fbcd5101d2db288b0c70c4a239f0e815 25-Jul-2014 Robert Shih <robertshih@google.com> GenericSource: start/stop tracks correctly on selection

Change-Id: I10343151f930a4ab778a6d2574ab5165af2013ba
uplayer/GenericSource.cpp
57f89f48822014d7b52a39c071edeffea5a9ef08 28-Jul-2014 Lajos Molnar <lajos@google.com> am ee392909: am f5bdd770: mediaplayer: make nuplayer the default player

* commit 'ee3929092a9a498d91838a289ffcb14109ad4f9b':
mediaplayer: make nuplayer the default player
f5bdd770d509373cc4174a55d0b81b223ecc4d81 28-Jul-2014 Lajos Molnar <lajos@google.com> mediaplayer: make nuplayer the default player

Bug: 11784824
Change-Id: I60d215d0348adcd589da5bd479d5921dcf076ee4
ediaPlayerFactory.cpp
a0f4a46a06a3ef2a29713e83fe4ed23893e9797b 26-Jul-2014 Robert Shih <robertshih@google.com> am 5f88db42: am ec3c71ed: Merge "NuPlayer: timed text support" into lmp-dev

* commit '5f88db42f251a1d45002619d4c410215a863f6cd':
NuPlayer: timed text support
b382340f33ac2dc26fe825ceb3ef98bac8af974c 31-Jul-2014 Chong Zhang <chz@google.com> Merge "handle rotation in NuPlayer" into lmp-dev
e9e63bcf6c36351f1129b0bdc5e93f17f0f9f0b4 31-Jul-2014 Chong Zhang <chz@google.com> handle rotation in NuPlayer

Bug: 16653284
Change-Id: I54165041da5a13498d627eee1b3ec59ef3c923b0
uplayer/NuPlayer.cpp
ef9c5ade2308f9eb6f222db3c4796e196f0ab76c 28-Jul-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: timed text support" into lmp-dev
eb1735e343a93830df259ae8882160bb0d79dcb5 24-Jul-2014 Robert Shih <robertshih@google.com> GenericSource: timed text support

Bug: 16385674
Change-Id: I954cc463b55af4b93c6a6e714115db4fda729dc8
uplayer/GenericSource.cpp
uplayer/GenericSource.h
ec3c71ed320e5e2252a84aa8b35ac4b9a6f92712 26-Jul-2014 Robert Shih <robertshih@google.com> Merge "NuPlayer: timed text support" into lmp-dev
d3b0bbb8a37f90fba84eb4e95c58aa0fec6c51e7 24-Jul-2014 Robert Shih <robertshih@google.com> NuPlayer: timed text support

Bug: 16385674
Change-Id: Ifa9fbc17a1276aa774d57b82cdce500876a0b543
uplayer/Android.mk
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
33701bdc9c18b5f6443e2e7aae925f41c65cbfdd 25-Jul-2014 Chong Zhang <chz@google.com> am 8204c659: am 435e0402: Merge "reset battery stats when media player service is started" into lmp-dev

* commit '8204c6595119d4494e1ad83ba3c146a1679b5fba':
reset battery stats when media player service is started
0ca57aa27cbcd631c9ff23292f53d24b60157ddd 25-Jul-2014 Robert Shih <robertshih@google.com> am a8ab984d: am f591b865: Merge "StagefrightRecorder: check for WEBM format instead of MP4" into lmp-dev

* commit 'a8ab984d8a5f805e31d61db7c6800a17aeedc101':
StagefrightRecorder: check for WEBM format instead of MP4
5a8dc51674914aea686ff039a372fa8473c7b806 25-Jul-2014 Wei Jia <wjia@google.com> am 19164015: am 81e50d0c: Reset the value for Vector of pointers.

* commit '1916401537e727b1227bc6679657675682b6c855':
Reset the value for Vector of pointers.
f591b865552dce57c5b4347974a1ac93c676459e 25-Jul-2014 Robert Shih <robertshih@google.com> Merge "StagefrightRecorder: check for WEBM format instead of MP4" into lmp-dev
68e97e7388bc9efa03e56c999645002cc3f38df5 24-Jul-2014 Robert Shih <robertshih@google.com> StagefrightRecorder: check for WEBM format instead of MP4

Bug: 16544665
Change-Id: Idc45bd4cafc65a11132d10fdf21f8439e186f35f
tagefrightRecorder.cpp
81e50d0c782cc18eab4ef40ecd6c7f36df50fea5 24-Jul-2014 Wei Jia <wjia@google.com> Reset the value for Vector of pointers.

Bug: 16467066
Change-Id: I3674e07779a59f4d4fa639d066ed1988df89b3f5
uplayer/NuPlayerDecoder.cpp
435e040267c4dd08b4e32b0e7b579902709aa9d6 25-Jul-2014 Chong Zhang <chz@google.com> Merge "reset battery stats when media player service is started" into lmp-dev
0b30fd4ccf5218b15f770e778703d69cd3432446 23-Jul-2014 Chong Zhang <chz@google.com> reset battery stats when media player service is started

Bug: 12979595
Change-Id: Ia800de3e65ed4dec8334c6fde566edab12d23c42
ediaPlayerService.cpp
3d46806856583fa11e9ab9622c695adf1f2ff4ed 23-Jul-2014 Robert Shih <robertshih@google.com> am 79932687: am 4c9a0e3e: Merge "GenericSource: support track (de)selection" into lmp-dev

* commit '799326870c4ee4f31e943e2d0cc1472148bada51':
GenericSource: support track (de)selection
d14742451caf91cfe557a9a93eaa7de5c0edcc0e 23-Jul-2014 Robert Shih <robertshih@google.com> am a0fa844d: am f6f4c0d7: Merge "StagefrightRecorder: webm (video only) support" into lmp-dev

* commit 'a0fa844d7affcf8b5cdee6167f7217110fe548e2':
StagefrightRecorder: webm (video only) support
91fb3e81cbe2d626e3f65bfe5a65b80f6cf3baac 23-Jul-2014 Wei Jia <wjia@google.com> am 78be88ee: am 3a2956d1: Fall back to s/w decoding when audio offloading fails.

* commit '78be88ee353a6ca0cb53845b3bd862ce70665eab':
Fall back to s/w decoding when audio offloading fails.
05312bc7478feec11d9ae88e951c0857a7a3f28d 17-Jul-2014 Robert Shih <robertshih@google.com> GenericSource: support track (de)selection

Bug: 15153976
Change-Id: I522b1f9f0ffedf4edbea03a6654a6dbc0262860a
uplayer/GenericSource.cpp
uplayer/GenericSource.h
3a2956d148d81194e297408179e84a47a309ef48 23-Jul-2014 Wei Jia <wjia@google.com> Fall back to s/w decoding when audio offloading fails.

Change-Id: Icde3d65c964b2a13fb1c6636adcce52ae048a3fb
uplayer/NuPlayer.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
4c9a0e3e30e97a31fcd7e41cb77d15427cb9c50b 23-Jul-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: support track (de)selection" into lmp-dev
603952113ee27cfe8e883896aa536f6a47f481bd 22-Jul-2014 Lajos Molnar <lajos@google.com> Merge "Fix deadlock in NuPlayer"
f6f4c0d7c5e2d33b38f080896466e56e2d0a97d4 23-Jul-2014 Robert Shih <robertshih@google.com> Merge "StagefrightRecorder: webm (video only) support" into lmp-dev
114819633470ebd5b346c13c2a82a0025d2d39c0 10-Jul-2014 Robert Shih <robertshih@google.com> StagefrightRecorder: webm (video only) support

Bug: 16329805
Change-Id: I8a0ecd100fca397add97a1416125bcc6aeb86364
ndroid.mk
tagefrightRecorder.cpp
tagefrightRecorder.h
095248375e29adde961ec2a44989ecb3a6dda6a2 17-Jul-2014 Lajos Molnar <lajos@google.com> nuplayer: support widevine sources

- handle widevine:// scheme
- add separate looper for renderer (as it can block initial buffer
handling if all buffers are used)
- initiate secure codecs before source is started
- don't read secure buffers
- share ACodec's input buffers with Widevine source

on the decoder side

- keep track of mediabuffers released by widevine source
- keep track of dequeued input buffers (for safety)
- release mediabuffer when buffer is subsequently dequeued. (This
was hardcoded into OMXCodec to do this when buffer-empties message
was handled, but MediaCodec does not support such functionality.)

Bug: 15699665
Change-Id: I4a369443294e45c644be8b0257010e52db1d7c9b
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerRenderer.cpp
cc227036b05f7c2f960a89c567a61f9decefe742 18-Jul-2014 Lajos Molnar <lajos@google.com> nuplayer: add widevine support to GenericSource

Bug: 15699665
Change-Id: Ided823bd0b1118bbabb288cf62d6389518f820a9
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/NuPlayerSource.h
dd235727a1b4e283deeb581559f99c2c8889da07 12-Jun-2014 Robert Shih <robertshih@google.com> GenericSource: implement getTrackCount/getTrackInfo

Bug: 15153976
Change-Id: I0204c4188d485cda026497469c7cde24f7bd5c95
uplayer/GenericSource.cpp
uplayer/GenericSource.h
bc2fb720bbd0acd122bacc67e844e982d068f6f9 09-Jul-2014 Wei Jia <wjia@google.com> Add support of audio offloading for NuPlayer.

Change-Id: Ic83973339fb46a83b48382e6097925f45d200867
uplayer/Android.mk
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerDecoderPassThrough.cpp
uplayer/NuPlayerDecoderPassThrough.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
uplayer/NuPlayerSource.h
c6993231c56da1924ba8d67eb150fa953ba54a1b 03-Jul-2014 Marco Nelissen <marcone@google.com> Fix deadlock in NuPlayer

also fix start/resume at EOF.

b/15323063

Change-Id: I798882bab0c5f9a18b47dddc041054a5679be383
uplayer/NuPlayerDriver.cpp
ba5e39b994b44cc458708eedd26c2d50404c9a46 09-Jul-2014 Chong Zhang <chz@google.com> Merge "HLS: do not discard packets when queuing explicit discontinuity"
718cee5f3ba7c0a055fbeced90f26296f8acb117 08-Jul-2014 Chong Zhang <chz@google.com> Merge "handle emulation_prevention_three_bytes for AVC"
862f8455eaacc1ffb5d8911f0bc7ecc3cf7ec46c 27-Jun-2014 Chong Zhang <chz@google.com> handle emulation_prevention_three_bytes for AVC

bug: 15917805
Change-Id: I824fe7eea807f8faba6b149c31890b7a5df87825
uplayer/NuPlayerDecoder.cpp
d9d7fa0873796ac661c44a7fcd6ad5ff697ff01f 24-Jun-2014 Jean-Michel Trivi <jmtrivi@google.com> Support for audio attributes on audio output of media player

Change-Id: Iae4995c98e64add1ab9e6c8ae6501515032755f5
ediaPlayerService.cpp
ediaPlayerService.h
632740c58119a132ce19f6d498e39c5c3773971a 26-Jun-2014 Chong Zhang <chz@google.com> HLS: do not discard packets when queuing explicit discontinuity

in case of explicit discontinuity (#EXT-X-DISCONTINUITY tag in the
playlist), do not discard packets that's already queued.

(when seeking, the old fetcher will be discarded so this won't affect
seeking case.)

Bug: 15020526
Change-Id: I5d3fc489df35e3bc44acb1ee7851571cb99cb56b
uplayer/GenericSource.cpp
uplayer/RTSPSource.cpp
840797f674f7c38d5215d0bcf0f4547c4e9a6957 24-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 76e4e02d: am 940c688d: Merge "libmediaplayerservice: unused argument warning messages"

* commit '76e4e02d6b6c1da140b8cbe48fc58035d2b7d311':
libmediaplayerservice: unused argument warning messages
76e4e02d6b6c1da140b8cbe48fc58035d2b7d311 24-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 940c688d: Merge "libmediaplayerservice: unused argument warning messages"

* commit '940c688d76828ffd83929c661e75b5197903d30f':
libmediaplayerservice: unused argument warning messages
247d9ebdbe7f165644f308745eee061fcbb77771 23-Jun-2014 Mark Salyzyn <salyzyn@google.com> libmediaplayerservice: unused argument warning messages

Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
ediaPlayerFactory.cpp
ediaPlayerFactory.h
etadataRetrieverClient.cpp
idiFile.h
215ebcddf7216d15fde34f9a32d27f280d1b19d3 23-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Parse trex and mehd boxes"
c1f4b2b73fe9432cb75ce1dd368475a2867e70ed 17-Jun-2014 Marco Nelissen <marcone@google.com> Parse trex and mehd boxes

Also get duration from mvhd if available, use that in addition to track
durations to determine total length of file, clear track header
struct so we don't read uninitialized garbage from it, and take
composition time offset into account for proper ordering when B frames
are used.

b/15669839

Change-Id: Ibf3e35b5c7299bac11d0e78a391545fc325dd2d0
uplayer/GenericSource.cpp
77342f72fdf96603938a95fcbb9888ec90e71e68 19-Jun-2014 Mark Salyzyn <salyzyn@google.com> libmediaplayerservice: 64-bit compile warnings

Change-Id: I333e52dc377becc774f3fa971c230ecb55ea8d7b
ediaPlayerService.cpp
etadataRetrieverClient.cpp
idiFile.cpp
3ea91c9593c2c792f96682f436b587c278fe228c 16-Jun-2014 Chong Zhang <chz@google.com> Merge "support for CEA-608 closed caption"
a7fa1d9530b6870f2c7850e3025d7db963661803 11-Jun-2014 Chong Zhang <chz@google.com> support for CEA-608 closed caption

Bug: 15470448

Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
404fced9bfa8fa423ee210a271ca051ffd1bec13 11-Jun-2014 Chong Zhang <chz@google.com> refactor getTrackInfo()

(this is in preparation for supporting other cc source)

- split into two methods: getTrackCount() and getTrackInfo()

- move track info parcelling to NuPlayer

- parcel in the mime type of the subtitle format

Bug: 15470448
Change-Id: If00724d8c3a2b2319cb9c5f29d3fe76347bfe947
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
bdb8ef09f119c3fa8cc751babd483e942ad17749 16-Jun-2014 Chong Zhang <chz@google.com> Merge "refactor getTrackInfo()"
7903bb2b3065d58cc75637900922b434f50024d9 12-Jun-2014 Elliott Hughes <enh@google.com> am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."

* commit '2a8270e6944fb3addfcba87f6885aaad196b8b88':
Offer a type-safe album art interface.
2a8270e6944fb3addfcba87f6885aaad196b8b88 12-Jun-2014 Elliott Hughes <enh@google.com> am c323737d: Merge "Offer a type-safe album art interface."

* commit 'c323737dd46d724b4c1ec230b283f26ae2a22b4f':
Offer a type-safe album art interface.
c323737dd46d724b4c1ec230b283f26ae2a22b4f 12-Jun-2014 Elliott Hughes <enh@google.com> Merge "Offer a type-safe album art interface."
f3e80dddd7376aa9deeb27de25e1d50030a2ad98 11-Jun-2014 Elliott Hughes <enh@google.com> Offer a type-safe album art interface.

Bug: 15514223
Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
etadataRetrieverClient.cpp
ca44dc79b5a163030ab0963f80aa771871de092d 11-Jun-2014 Christopher Ferris <cferris@google.com> am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."

* commit '8d6d8f546c1d6c55b79b454c720c03a80c738444':
Add libcrypto for users of libstagefright.
7dc5bfcf42cfb59025f615f494e29ff9e55990cc 11-Jun-2014 Christopher Ferris <cferris@google.com> Add libcrypto for users of libstagefright.

libstagefright_rtsp uses some MD5 functions that used to be in bionic,
but it was removed recently. As an initial fix, I statically linked in
libcrypto_static to the libstagefright_rtsp library. However, I think
it's better to modify the single user of this library to link against
the shared libcrypto library.

Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
ndroid.mk
b9e55c4f17a91f070f78fb9fd72c08e461526e9e 11-Jun-2014 Christopher Ferris <cferris@google.com> am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."

* commit 'ca44dc79b5a163030ab0963f80aa771871de092d':
Add libcrypto for users of libstagefright.
ef0cf50343f8a6d74894f96f5ecb5eec4c5f1bc6 11-Jun-2014 Chong Zhang <chz@google.com> Log an error when audio/video encoder failed to create

Change-Id: I493981cddeb9452c533e2917d8c440897d5e6b49
related-to-bug: 15106730
tagefrightRecorder.cpp
1cfe8ce28eafd5ff758adbb73bfb257503d7704b 05-Jun-2014 Chong Zhang <chz@google.com> check camera permission for video source other than SURFACE

Bug: 15448704
Change-Id: I5f5417037b877a6da3a46700ebb5a80ea59aac36
ediaRecorderClient.cpp
704e72658b1082264a26a83c50046da34f07d1a1 05-Jun-2014 Wei Jia <wjia@google.com> Added paused state to NuPlayerDecoder

This prevents decoder from requesting new buffer until the decoder
is resumed, and prevents processing a potential DISCONTINUITY while
the player is still flushing.

Bug: 13133027

Change-Id: I2f9fa9f00c8583aa6908809cb7c31ddde07cfaf0
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
dd114d19f65d8a5cdfddbaf6d3ef8119c6169b28 29-May-2014 Marco Nelissen <marcone@google.com> Fix some NuPlayer issues.

Fixes OnSeekCompleted callback and calling getDuration immediately
after prepare().

Change-Id: Ie58c509005cded278a0e50c87240b0a2d920b7d7
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
14ead787204a1bfc13e92067691efaefd624fcae 20-May-2014 Andy Hung <hunga@google.com> Fix OGG recognition for 64 bit

Change-Id: I4cef86ca05e06f508929d109a52e375169c33bf9
ediaPlayerFactory.cpp
5225ba0632e9dcf6fab562e4632ae8d6d4312959 16-May-2014 Bao Haojun <baohaojun@gmail.com> Fix double close.

This patch will fix the double close issue in SoundPool::doLoad():

status = MediaPlayer::decode(mFd, mOffset, mLength, &sampleRate, &numChannels, &format,
mHeap, &mSize);
ALOGV("close(%d)", mFd);
::close(mFd);
mFd = -1;

In MediaPlayerService::decode() which is called directly by
MediaPlayer::decode(), the fd will be closed, and after it return, the
mFd will be closed again.

When the system is idle, the second close will fail with EBADFD, but if
the system is busy, the mFd will be reused with another open/socket/pipe
system call, and the second close will cause errors.

Change-Id: If709515392cd490fea569658202524c51f8df785
Signed-off-by: Bao Haojun <baohaojun@gmail.com>
Signed-off-by: Wang Liang <wangliang@smartisan.cn>
ediaPlayerService.cpp
1a7be1ec9c769203e6c8e26378de0ab8e2ad493d 29-Apr-2014 Bill Yi <byi@google.com> Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD
dd01ce9c28e37d4556606f481faeec032a1fe04e 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 52a861d2: Merge "warnings be gone."

* commit '52a861d2825544fe2eb90f8e5f6351d02ff95536':
warnings be gone.
d411b4ca2945cd8974a3a78199fce94646950128 11-Apr-2014 Andreas Huber <andih@google.com> warnings be gone.

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)

Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts
or errors downstream to a minimum.

Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
tagefrightPlayer.cpp
uplayer/HTTPLiveSource.cpp
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerSource.h
638986a78c94081cded0cd87dc9d3b31965092a4 03-Apr-2014 Jeff Tinker <jtinker@google.com> am d009aa2b: am 81e0bd44: Add signature|system permission to MediaDrm signer APIs

* commit 'd009aa2bac4a4c8ca2e0c1203148194e237cc5d0':
Add signature|system permission to MediaDrm signer APIs
d009aa2bac4a4c8ca2e0c1203148194e237cc5d0 03-Apr-2014 Jeff Tinker <jtinker@google.com> am 81e0bd44: Add signature|system permission to MediaDrm signer APIs

* commit '81e0bd44a10e90778ab5b0a3babd4fc52cadedd8':
Add signature|system permission to MediaDrm signer APIs
81e0bd44a10e90778ab5b0a3babd4fc52cadedd8 03-Apr-2014 Jeff Tinker <jtinker@google.com> Add signature|system permission to MediaDrm signer APIs

Change-Id: If970e5ff8dcab2e67af2f3376dcd14dca82f2394
related-to-bug: 12702350
rm.cpp
99021c47f45ee8bf3317cff7d08226e76c8d8227 02-Apr-2014 Jeff Tinker <jtinker@google.com> am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrm

* commit 'f356a123bf966150965a1af1cb9bd6ff2ca020de':
Support CAST V2 Authentication in MediaDrm
f356a123bf966150965a1af1cb9bd6ff2ca020de 02-Apr-2014 Jeff Tinker <jtinker@google.com> am 68d9d71a: Support CAST V2 Authentication in MediaDrm

* commit '68d9d71a792deed75d32fe13febc07c9c12c8449':
Support CAST V2 Authentication in MediaDrm
68d9d71a792deed75d32fe13febc07c9c12c8449 04-Mar-2014 Jeff Tinker <jtinker@google.com> Support CAST V2 Authentication in MediaDrm

Java API version

Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.

Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861
related-to-bug: 12702350
rm.cpp
rm.h
b47558f87ee9bd4fce11a2d5bc213bd1aa9031a8 28-Mar-2014 Lajos Molnar <lajos@google.com> mediaplayer: add temporary developer settings to use NuPlayer as default

Bug: 11784824
Change-Id: Ic98f5fd15ee283d7f581bdc3331d000198ecc9e8
ediaPlayerFactory.cpp
adad3d7d935da176ff24941b4ae9edf7340e9b96 21-Feb-2014 Glenn Kasten <gkasten@google.com> Use LOG_ALWAYS_FATAL instead of LOG_FATAL

LOG_FATAL is compiled out in most builds, so the
assertion checks were not being performed.

Change-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35
ediaPlayerService.cpp
758799cef41fc5495f59eeb6249d02ce9154cde8 14-Mar-2014 Glenn Kasten <gkasten@google.com> resolved conflicts for merge of 3c780188 to master

Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
236104afb2300b7d969b1dc786f14b5f912df1cf 14-Mar-2014 Glenn Kasten <gkasten@android.com> am 089affb6: Merge "mediaserver and associated services are 32-bit only"

* commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9':
mediaserver and associated services are 32-bit only
3c7801882bbb6d5f3cc641525a54cb8a6c4aca34 14-Mar-2014 Glenn Kasten <gkasten@android.com> am 089affb6: Merge "mediaserver and associated services are 32-bit only"

* commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9':
mediaserver and associated services are 32-bit only
af783aa91f7a279153fb8bab8d0d6b9f737996e9 03-Mar-2014 Glenn Kasten <gkasten@android.com> mediaserver and associated services are 32-bit only

also 32-bit only command-line apps

Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
ndroid.mk
1cd139824b2e6832f239cd27d8962d3239053c02 18-Jan-2014 Lajos Molnar <lajos@google.com> NuPlayer: use MediaCodec instead of ACodec

Bug: 11785204
Change-Id: I1455bfc683469c7a69e565b179aceacbc5c459f5
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
259f1624cf7b93ba831af10a616267487601c27f 22-Feb-2014 Lajos Molnar <lajos@google.com> Revert "NuPlayer: Use a software renderer when using software codecs"

Remove software renderer support from NuPlayer because it is included
in MediaCodec.

Change-Id: I06e001df76df2e18ea8169620ff33aeec57e5ca2
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
3eee65fa79e382b065ff5299bdc81f3a5b85be9a 07-Mar-2014 Lajos Molnar <lajos@google.com> 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.
31a98ad0da98227f3c76469e7a8a267c9539b6e8 07-Mar-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aosp

Change-Id: Ibcb60d0d3bbc8beb54440951ffe8a14b946ccc85
8d1caa026caef3673799481c5fba454306f831e9 07-Mar-2014 Lajos Molnar <lajos@google.com> 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.
0523da8f16557a85395da86ab76be6d8cb771da0 24-Jan-2014 Robert Shih <robertshih@google.com> NuPlayer side support for seamless format switch.

Avoid reinstantiating decoder if seamless format switch is supported.

Bug: 11854054
Change-Id: I2c2be08d6da90cc835ec747d04a76db2313dfc7c
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
d0115d8c4db2f337030dea706bc0a434c4a03ed6 27-Jul-2013 Eric Laurent <elaurent@google.com> update offloaded audio track sampling rate

AudioPlayer must read the sampling rate from offloaded audio sinks
whenever a new time position is computed as the decoder can update
the sampling rate on the fly.

Bug: 12823955.

Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
ediaPlayerService.cpp
ediaPlayerService.h
bce50bfc3846ab008bafa75c5d3f29fd7b5395f7 28-Feb-2014 Glenn Kasten <gkasten@google.com> Fix type of AudioTrack/AudioRecord parameter frameCount

It's size_t consistently

Change-Id: I29638ef59ac773218025f2403a3508a307b487e0
ediaPlayerService.cpp
e27e2d9bcabc1a367cb56b4599665c931a1d22ec 27-Feb-2014 Derek Sollenberger <djsollen@google.com> Fix includes to no longer pull in Skia includes directories.

bug:13225538
Change-Id: I4fccc414923f7e62cd46d691c67cb44b9692c225
ndroid.mk
1a5690652f3f6ee40f15c2f9f6c4b6badf4dbcf5 26-Feb-2014 Chong Zhang <chz@google.com> initialize encoder at start() time for camera source

Bug: 13156212
Change-Id: I845ef51f662f04c50179dbfb128204922a424e1d
tagefrightRecorder.cpp
tagefrightRecorder.h
9e2c298daec57edcf3d4d740673ebb94819f84c1 24-Feb-2014 Robert Shih <robertshih@google.com> Merge "NuPlayer side support for seamless format switch."
6d0a94ead4f6e62b8ca9b2b1d775ffcd0a7a7aab 24-Jan-2014 Robert Shih <robertshih@google.com> NuPlayer side support for seamless format switch.

Avoid reinstantiating decoder if seamless format switch is supported.

Change-Id: I2c2be08d6da90cc835ec747d04a76db2313dfc7c
uplayer/NuPlayer.cpp
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
dc6ac201032d0f6ad0c8149ae2f009ec38693025 22-Feb-2014 Chong Zhang <chz@google.com> Merge "support for time lapse/slow motion when using SURFACE source"
2c9c8cba8562cc3a27532e4cd348912cc78d8d98 11-Feb-2014 Chong Zhang <chz@google.com> support for time lapse/slow motion when using SURFACE source

Bug: 13032650
Change-Id: Iecbadf9f29c8c49353416fc467fb3acdde279595
tagefrightRecorder.cpp
c940c38242e8e0265db25a646ad63263934f2bb9 13-Feb-2014 Marco Nelissen <marcone@google.com> Merge "Track pid for each session"
240abcc4bf661a10ffca24859945796acc76ac6e 13-Feb-2014 Andreas Huber <andih@google.com> Remove unused FragmentedMP4Parser and friends. The functionality has been

subsumed into MP4Extractor.

Change-Id: Ic1b6445660adfb985c604f1ca6f0c86585f8de04
uplayer/Android.mk
uplayer/NuPlayer.cpp
uplayer/mp4/MP4Source.cpp
uplayer/mp4/MP4Source.h
ccb067b1d8424ba610cbd3de83368bd55b532b5b 11-Feb-2014 Andreas Huber <andih@google.com> fix the build by fixing more warnings.

Change-Id: Ied0ec39eb83b101582702d1e30c21643ccf6353e
tagefrightRecorder.cpp
d457c970c8d08519cd77280a90b61ae1e342cfe3 11-Feb-2014 Marco Nelissen <marcone@google.com> Track pid for each session

so they can be properly freed.

Change-Id: I6f389035bc29e74e7c367c1c6d0252b180f666b3
ediaPlayerService.cpp
ediaPlayerService.h
84333e0475bc911adc16417f4ca327c975cf6c36 08-Feb-2014 Andreas Huber <andih@google.com> warnings be gone.

Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
tagefrightPlayer.cpp
uplayer/HTTPLiveSource.cpp
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerSource.h
1d6fa7af1288b550faabe4ec2cf98684236723db 11-Feb-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 566be7c3 to master

Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
377b2ec9a2885f9b6405b07ba900a9e3f4349c38 03-Feb-2014 Kévin PETIT <kevin.petit@arm.com> Make frameworks/av 64-bit compatible

Contains the necessary changes to make frameworks/av build and work
on a 64-bit machine.

Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
ediaPlayerService.cpp
tagefrightRecorder.cpp
uplayer/NuPlayerDriver.cpp
8497416c40bae877bc67b0ef30bb41a73af54711 10-Feb-2014 Colin Cross <ccross@android.com> am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"

* commit '429f2bf7527daf872a1bbdafca8ad28635b84644':
frameworks/av: fix errors inside ALOGV
80520381d0bdf3451bd17c9ddef73d3fe71c58c2 01-Feb-2014 Glenn Kasten <gkasten@google.com> Fix warnings about unused parameters

Change-Id: I27dc108e2c1f7ffd414bb7ff3d4c349651da6c26
ediaPlayerService.h
94dcc94b16cc6c2a7aa02df2d0d6b8743d738d78 07-Feb-2014 Colin Cross <ccross@android.com> frameworks/av: fix errors inside ALOGV

Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I9602a4a485dffa3caad732c2a19ec0e41a0ac65b
uplayer/mp4/MP4Source.cpp
7ca6e73bed1d2e1a928104feb6e9ae92953bfff5 06-Feb-2014 Chong Zhang <chz@google.com> Merge "Change StagefrightRecorder to use MediaCodec"
72cecca17d735db6532c45f0a7e10c47ee6f065a 26-Dec-2013 Chong Zhang <chz@google.com> Change StagefrightRecorder to use MediaCodec

Bug: 12305192
Change-Id: I72d7cb571be5bd348b58ad650f3269d24c15d350
tagefrightRecorder.cpp
tagefrightRecorder.h
81e68448f3361eaf8618930471fdc3c21bdf5cbc 05-Feb-2014 Andreas Huber <andih@google.com> Remove no longer needed http proxy handling code, it's obsolete now

since we started to use java's HTTPConnection instead of the native
implementation. Also remove other remnants of the previous http implementation,
such as accounting for the http user's uid.

Change-Id: I60bfd31381ea40d2220db587ec5c433093b60034
ediaPlayerService.cpp
ediaPlayerService.h
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/RTSPSource.cpp
1b86fe063badb5f28c467ade39be0f4008688947 29-Jan-2014 Andreas Huber <andih@google.com> FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code

Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
ediaPlayerService.cpp
ediaPlayerService.h
etadataRetrieverClient.cpp
etadataRetrieverClient.h
idiFile.cpp
idiFile.h
idiMetadataRetriever.cpp
idiMetadataRetriever.h
tagefrightPlayer.cpp
tagefrightPlayer.h
estPlayerStub.cpp
estPlayerStub.h
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
8b567a219c3c7673d0b17e2a4da7e9ac4e984c3c 17-Jan-2014 Marco Nelissen <marcone@google.com> am fea77cb3: am fd0daeb3: am 4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print"

* commit 'fea77cb3c22dcb691f44b939c626ae3070212b73':
Fix compile error in NuPlayerRenderer debug print
d6074f08cc37843e8c599b2ab4b16d87c3bc67eb 15-Oct-2013 Oscar Rydhé <oscar.rydhe@sonymobile.com> Fix compile error in NuPlayerRenderer debug print

When activating verbose log prints in NuPlayerRenderer the build
fails because a variable have changed but the log print hasn't been
updated.

Change-Id: I3089b087d296c37dfe6379d7e75d5892912fef96
uplayer/NuPlayerRenderer.cpp
5e49afd05566820517747b9a8071c99ec0918328 27-Jul-2013 Eric Laurent <elaurent@google.com> update offloaded audio track sampling rate

AudioPlayer must read the sampling rate from offloaded audio sinks
whenever a new time position is computed as the decoder can update
the sampling rate on the fly.

Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
ediaPlayerService.cpp
ediaPlayerService.h
e2d617f5ba7fb90f27b03e2593666b2c927e4dc9 05-Dec-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEAD
84acd489b93e04bea7aab06d8abb024eef2576fd 03-Dec-2013 Marco Nelissen <marcone@google.com> am 7ecfe4ec: am 92630351: Merge "NuPlayer: Use a software renderer when using software codecs"

* commit '7ecfe4ec3f6842377f840513850ad31933bcea30':
NuPlayer: Use a software renderer when using software codecs
7ecfe4ec3f6842377f840513850ad31933bcea30 28-Nov-2013 Marco Nelissen <marcone@google.com> am 92630351: Merge "NuPlayer: Use a software renderer when using software codecs"

* commit '92630351d265a61faae2dfe006a8bb330283aa7b':
NuPlayer: Use a software renderer when using software codecs
92630351d265a61faae2dfe006a8bb330283aa7b 28-Nov-2013 Marco Nelissen <marcone@google.com> Merge "NuPlayer: Use a software renderer when using software codecs"
6f59db12a64f4496866952a251122ccb77a36c6b 27-Jul-2013 Eric Laurent <elaurent@google.com> update offloaded audio track sampling rate

AudioPlayer must read the sampling rate from offloaded audio sinks
whenever a new time position is computed as the decoder can update
the sampling rate on the fly.

Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
ediaPlayerService.cpp
ediaPlayerService.h
b4213a1252c23115f3fac77101adb33a9c6b9423 15-Nov-2013 Eric Laurent <elaurent@google.com> am 576e89b5: am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-dev

* commit '576e89b523d7705545032edc67d98d9ab1dedbd2':
AwesomePlayer: correct stream type for offload
22612345ae97648d5b6db43cc1aa30aad77f7bba 15-Nov-2013 Eric Laurent <elaurent@google.com> AwesomePlayer: correct stream type for offload

canOffloadStream() function in stagefright utils forces the
stream type to AUDIO_STREAM_MUSIC when querying the audio policy
manager if a particular track is offloadable or not.
This causes MP3 ringtones to be offloaded which is not a validated use case.

The fix consists in using the actual stream type read from the AudioSink.

Bug: 11410937.
Change-Id: I44b8e033a8e785a79cdc291b142f80b5580bdc4d
ediaPlayerService.h
b5099903c059dc913e0e592969c10d15fac0c14c 15-Nov-2013 Robert Shih <robertshih@google.com> Merge "Fixed StagefrightRecorder::setupVideoEncoder to use the clipped bitrate value mVideoBitRate; removed unused arguments after refactoring."
4db37cedd4db8230f3ec6191d8d7ba2b0036886e 12-Nov-2013 Robert Shih <robertshih@google.com> Fixed StagefrightRecorder::setupVideoEncoder to use the clipped bitrate value
mVideoBitRate; removed unused arguments after refactoring.

Bug: 11074303
Change-Id: Ieb5dd7dc67e5bc16b6e580ba11b157e4365f3cd6
tagefrightRecorder.cpp
tagefrightRecorder.h
41e7ae8f7f1ec93f8473142d1f3bfe07b22c5c51 12-Nov-2013 Lajos Molnar <lajos@google.com> am cc5aeced: am e100b813: Merge "StageFrightRecorder: do not use meta-data mode for software encoders" into klp-dev

* commit 'cc5aeced30609326c7495eca1286163af3933fe1':
StageFrightRecorder: do not use meta-data mode for software encoders
e100b813c4d833b48b48b74100ad0b9a82c46954 11-Nov-2013 Lajos Molnar <lajos@google.com> Merge "StageFrightRecorder: do not use meta-data mode for software encoders" into klp-dev
36bbb12410d4119cf3871ae9453a898c80d94800 05-Nov-2013 Marco Nelissen <marcone@google.com> am 92168885: am f8a1169d: Merge "Notify current video size if available" into klp-dev

* commit '921688852b72bfa921913b8afe18c0d749c6797d':
Notify current video size if available
3e518fd5d679abb83b654e473ea0fa5f7f16235f 01-Nov-2013 Marco Nelissen <marcone@google.com> Notify current video size if available

b/11248101

Change-Id: I0fa3b5592efcf400c86692002267da6825e331ad
uplayer/HTTPLiveSource.cpp
9c7f845780d62ea09469a8dac7117cc01adfea5c 30-Oct-2013 Lajos Molnar <lajos@google.com> StageFrightRecorder: do not use meta-data mode for software encoders

Camera HAL v1 uses vendor-specific camera-source meta-data mode, but
software encoders use generic gralloc-source mode, so they are not
compatible.

Change-Id: I0d1bab8eada26dcb70c97b1eec83f06d1f331239
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11446505
tagefrightRecorder.cpp
tagefrightRecorder.h
9cae217050aa1347d4ac5053c305754879e3f97f 14-Jan-2013 Marco Nelissen <marcone@google.com> Assign blame for playback wakelocks.

Set a work source for the playback wakelock, so that playback is
counted against the requesting app instead of the media server.

Cherrypicked from master.

b/9464621

Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
ediaPlayerService.cpp
ediaPlayerService.h
462fd2fa9eef642b0574aa7409de0bde3fec8d43 14-Jan-2013 Marco Nelissen <marcone@google.com> Assign blame for playback wakelocks.

Set a work source for the playback wakelock, so that playback is
counted against the requesting app instead of the media server.

Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
ediaPlayerService.cpp
ediaPlayerService.h
da38df5f080eb62a06b22c5bada4357cf756255e 25-Sep-2013 Martin Storsjo <martin@martin.st> NuPlayer: Use a software renderer when using software codecs

This mimics what is done in AwesomePlayer and MediaCodec -
ideally this logic perhaps should be moved into ACodec to
avoid having to replicate it in every caller.

This makes HLS and RTSP playback work in the emulator.

Change-Id: I18027dc3e469889baaae3e1c4afb559de7d0f7d3
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
c666b8f16310fc826471c0fb6ee3f7e4d3a2d067 24-Sep-2013 Eric Laurent <elaurent@google.com> am 8ee02943: am 1c7f35d1: Merge "soundpool: allocate shared memory heap by client" into klp-dev

* commit '8ee02943b61e0a7dd78e5596720261b185a223d5':
soundpool: allocate shared memory heap by client
3d00aa6de95fb46e36f2bab4e3facdf0b96acf06 24-Sep-2013 Eric Laurent <elaurent@google.com> soundpool: allocate shared memory heap by client

Current SoundPool implementation allocates the shared memory heap
containing decoded PCM samples in mediaserver process.
When mediaserver process crashes, the shared memory heaps allocated by
AudioCache cannot be mapped anymore in the new instance of mediaserver.
This causes a silent failure to end playback of new sounds because
AudioFlinger believes the new AudioTracks are opened in streaming mode
and not static mode: it sees a NULL shared memory pointer when the track
is created.

The fix consists in allocating the memory heap in the client process. Thus
the heap is not lost when mediaserver restarts. The global memory usage is
the same as this is shared memory.

Also added a way to detect that a shared memory is passed when the track is
created but cannot be mapped on mediaserver side.

Also fix a crash in SoundPool when ALOGV is enabled.

Bug: 10894793.
Change-Id: Ice6c66ec3b2a409d75dc903a508b6c6fbfb2e8a7
ediaPlayerService.cpp
ediaPlayerService.h
b5c682905d2735785bab6d7a27c131afbfe7650b 17-Sep-2013 Marco Nelissen <marcone@google.com> am 83774965: am bc910e5c: Merge "Fix hang" into klp-dev

* commit '83774965fefc5d0315ec41641bdd99cf0a657462':
Fix hang
bc910e5c8d05f24531bd6b11379cf41cc73415ed 17-Sep-2013 Marco Nelissen <marcone@google.com> Merge "Fix hang" into klp-dev
ee08f7e36eeba80e005f9bdaebce635860a8f005 16-Sep-2013 Marco Nelissen <marcone@google.com> Fix hang

Specify that the surface is controlled by the app, to avoid a hang.
b/10531761

Change-Id: Idccc2c73aa3d368d8e7fbdc071ce36e2382efea4
ediaPlayerService.cpp
5ee1f4fe66d15e8554352829771bf27913ea0b14 16-Sep-2013 Chong Zhang <chz@google.com> am fcb7a247: am a5652e9c: Merge "Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags" into klp-dev

* commit 'fcb7a2472bcb3c7985888acdb9905ba4e21c6bfe':
Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags
4b7069dac546ad21cf62ca6132d50ea41857d08e 11-Sep-2013 Chong Zhang <chz@google.com> Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags

Also update seek flag in NuPlayerDriver, otherwise MediaPlayer will
get wrong flags.

Bug: 10676387

Change-Id: Ice30f27a9a04e37b4718d26228a407fea8d9e4fc
uplayer/NuPlayer.cpp
uplayer/RTSPSource.cpp
a664d6b45777efb8f8b7c8a391d785f6152fa8db 08-Sep-2013 Chong Zhang <chz@google.com> HDCP: use getCaps() to query HDCP caps

Bug: 10609422
Change-Id: I8bfbd761b58d5b333db38f5e3cea806abb04443c
DCP.cpp
ec3acca4a75fc4adc076b56751124f507b419622 03-Sep-2013 Chong Zhang <chz@google.com> wifi-display: do not use HDCP's encryptNative method if its unsupported

Bug: 10609422
Change-Id: I005f1d04a4191b1503b5f3e895a98b8d6560c402
DCP.cpp
DCP.h
ee7e77d55d510725a314d8ed36dc730c21af6173 29-Aug-2013 Jeff Tinker <jtinker@google.com> fix MediaDrm.isCryptoSchemeSupported(uuid)

1. Don't expect plugins to support an empty mimeType in isContentTypeSupported
2. Move the cts test mock drm plugin to the cts tree so it is always used

b/10528466

Change-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1
rm.cpp
2484040e0f413989e4edbe26ba3bf71122382af6 23-Aug-2013 Chong Zhang <chz@google.com> Merge "MediaPlayer: add listener for raw track data" into klp-dev
62c1a46eec047eb5fbc4b90432ec1ce65b76fb75 23-Aug-2013 Jeff Tinker <jtinker@google.com> Merge "Add ability to test supported content types to MediaDrm" into klp-dev
9cf69e0fc110f17c28e988ed0f9bf91abfaf710d 21-Aug-2013 Jeff Tinker <jtinker@google.com> Add ability to test supported content types to MediaDrm

bug: 10244066
Change-Id: I317f05b146db962c271893f6208890a5a6c396f1
rm.cpp
rm.h
dcb89b3b505522efde173c105a851c412f947178 06-Aug-2013 Chong Zhang <chz@google.com> MediaPlayer: add listener for raw track data

Bug: 10326117

Change-Id: I2c0bdf8adc67b11f8dc633423bee66897548f181
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
uplayer/NuPlayerSource.h
cbaffcffee6418d678806e63097c19fe26d48fe0 15-Aug-2013 Lajos Molnar <lajos@google.com> Add MEDIA_STARTED/PAUSED/STOPPED events to media players

This is needed for the MediaTimeProvider java interface, so it does not
continually poll for current media time.

Note: NuPlayer and AwesomePlayer do not correctly handle stop (pause
instead), so for those we will signal PAUSED.

Signed-off-by: Lajos Molnar <lajos@google.com>
Change-Id: I3c61e1bda475f131323f475c18a42e3ec66c9ae1
Bug: 10326117
idiFile.cpp
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
d89532e133b881c7e0dac089333ad7642fc510f1 14-May-2013 Richard Fitzgerald <rf@opensource.wolfsonmicro.com> libmediaplayerservice: offload playback support

Main change is to how recycled tracks are used for gapless
playback. If we are playing offloaded tracks that can't be
recycled we don't open a new offloaded output until we have
closed the previous one. This is because offloaded tracks
are a limited resource so we don't want to spuriously create
unnecessary instances. If the tracks cannot be recycled
this means that the formats are incompatible and so the
hardware most likely will also be unable to use the existing
output channel for the new track. If we already have the
maximum number of hardware offload channels open (which could
be only one) then creation of the next output would fail if
we attempted it while the previous output was still open.

Change-Id: I4f5958074e7ffd2e17108157fee86329506730ea
Signed-off-by: Eric Laurent <elaurent@google.com>
ediaPlayerService.cpp
ediaPlayerService.h
8060060217ff16cd67c8f6a15c649f44c343acf0 18-Jul-2013 Andreas Huber <andih@google.com> ANetworkSession and ParsedMessage are now part of stagefright foundation.

Also fixes some bugs in ParseMessage and adds "WebSocket" mode to
ANetworkSession, something that's opt-in and should not affect existing clients
of the API.

Change-Id: I86d5748e0d818231d85d3590d86c2b41d4f8b1f1
emoteDisplay.cpp
emoteDisplay.h
3a24dfc5b608d86e1989c2a56afa98aaae095541 17-Jul-2013 leozwang@google.com <leozwang@google.com> Merge "Output more detailed error message if loading library fails"
d1eff5718510228503958e8fafa698c9e6a4a230 14-Jul-2013 leozwang@google.com <leozwang@google.com> Output more detailed error message if loading library fails

Bug: 9805979

Change-Id: I77b19d6a65ff9fb72e7428ce79b117628e4c8658
rypto.cpp
haredLibrary.cpp
haredLibrary.h
fb1fdc9d6603aa228362e7349451f6455c9849c2 11-Jul-2013 Glenn Kasten <gkasten@google.com> Add comments

Change-Id: Ifbf3a46a4183c8abc0feee1c588953ab10303cc1
idiFile.cpp
1545d35f871ff3527a716af659ddadebe3253548 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 9f0e0597: am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource"

* commit '9f0e05978e236352fd2a4a7c6dce909755c36ead':
Prevent double disconnects in RTSPSource
9f0e05978e236352fd2a4a7c6dce909755c36ead 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource"

* commit '7266bc80850dc327e9f18c27b81613f959399630':
Prevent double disconnects in RTSPSource
7266bc80850dc327e9f18c27b81613f959399630 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am ca7f1609: Merge "Prevent double disconnects in RTSPSource"

* commit 'ca7f160921a4a1a5da32ebe8fab1067bd8998a1f':
Prevent double disconnects in RTSPSource
69adec56fe13a2154cf9388c6e8725c6b6861b74 07-Jul-2013 Jeff Tinker <jtinker@google.com> am 9a25c012: am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev

* commit '9a25c012915f2209fff1479b246ae8eba38c3eff':
Part of fix for TEE resource leaks when app crashes
9a25c012915f2209fff1479b246ae8eba38c3eff 07-Jul-2013 Jeff Tinker <jtinker@google.com> am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev

* commit 'eced745af7d2d27a8c45e04eb071d4fb30cd3e48':
Part of fix for TEE resource leaks when app crashes
3d3f67f3afa45e6b49d85b20942ee8184a33c1a4 04-Jul-2013 Jeff Tinker <jtinker@google.com> Part of fix for TEE resource leaks when app crashes

bug: 9672606
Change-Id: I98cf65260d5e43d34e3897452f6f26ed2c89294e
rm.cpp
rm.h
1ab85ec401801ef9a9184650d0f5a1639b45eeb9 31-May-2013 Glenn Kasten <gkasten@google.com> Include what is needed

Remove old includes.
Header files only include other header files that they directly need themselves.

Change-Id: Ic471386808d9f42ea19ccbd59cb50a5f83a89dd0
ediaPlayerService.h
0ad03bc59d090a0455f858d2f629834c105f6f37 06-Mar-2013 Fredrik Rosin <fredrik.rosin@sonymobile.com> Prevent double disconnects in RTSPSource

Prevent a null pointer from occuring by checking that we are not
already disconnected before performing a disconnect, in case
multiple disconnects have been issued.

Change-Id: Ib88800cd246086fd57f77d10748d41b1aefe2084
uplayer/RTSPSource.cpp
f761cec9aaca76bb84264f3666764d24a9c243e2 28-Jun-2013 Glenn Kasten <gkasten@android.com> am 903871da: am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."

* commit '903871da7a7c71b8718133e60e2f0835837b5f3f':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
83790fcce4f5cda1e7c89f1cbed452426502f227 28-Jun-2013 Glenn Kasten <gkasten@android.com> am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."

* commit 'bdf33c98912090176183d3e9b9a9217dbbdca6da':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
ad3af3305f024bcbbd55c894a4995e449498e1ba 25-Mar-2013 Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Public API changes for audio offload support.

NOTE: this does _not_ include all private member variables added
to classes as part of offload support. Only public/protected functions
and stubs functions/variables needed to make the changes buildable.

- isOffloadSupported() added to audio policy service
A stub implementation is required to build, this always returns false
- setParameters() added to IAudioTrack
A stub implementation is required to build, this always returns
INVALID_OPERATION

- CBlk flag for stream end

- Change AudioSystem::getRenderPosition() to take an audio_output_t
so caller can specify which output to query

- Add AudioSystem::isOffloadSupported()
This is fully implemented down to the AudioFlinger function
AudioPolicyServer::isOffloadSupported() which is just a stub
that always returns false.

- Add EVENT_STREAM_END to AudioTrack interface.
STREAM_END is used to signal when the hardware has actually finished
playing all the data it was sent.

- Add event type enumeration to media player interface AudioSink callbacks
so that the same callback can be used to handle multiple types of
event. For offloaded tracks we also have to handle STREAM_END and
TEAR_DOWN events

- Pass audio_offload_info_t to various functions used for opening outputs,
tracks and audio players. This passes additional information about the
compressed stream down to the HAL when using offload.
For publicly-available APIs this is an optional parameter (for some of
the internal and low-level APIs around the HAL interface it is mandatory)

- Add getParameters() and setParameters() API to AudioTrack
Currently dummy implementations.

- Change AudioPlayer contructor so that it takes a set of bitflags defining what
options are required. This replaces the original bool which only specified
whether to use deep buffering.

- Changes to StageFright class definition related to handling tearing-down of
an offloaded track when we need to switch back to software decode

- Define new StageFright utility functions used for offloaded tracks
Currently dummy implementations.

- AudioFlinger changes to use extended audio_config_t.
Fills in audio_offload_info_t member if this info is passed in when
opening an output.

- libvideoeditor changes required to add the new event type parameter
to AudioSink callback functions

- libmediaplayerservice changes required to add the new event type parameter
to AudioSink callback functions

Change-Id: I3ab41138aa1083d81fe83b886a9b1021ec7320f1
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
ediaPlayerService.cpp
ediaPlayerService.h
7d409691ed61f96bac6672b59f368cd3cc8ea2d8 28-Apr-2013 Scott Fan <fancp2007@gmail.com> Fix compilation warning: incorrect format specifier for type 'ssize_t'.

warning: format '%ld' expects argument of type 'long int',
but argument 7 has type 'ssize_t {aka int}' [-Wformat]

Change-Id: I823835a26320a3abb82f8dff9fbe82e5132e7556
Signed-off-by: Scott Fan <fancp2007@gmail.com>
ediaPlayerService.cpp
2799d743ee2ae5a25fe869a7f9c052acc029559f 30-May-2013 Glenn Kasten <gkasten@google.com> Use sp<AudioTrack> instead of raw AudioTrack *

This change prepares for the new implementation of AudioTrack client, which
will require clients to use only sp<AudioTrack>, not raw AudioTrack *.
A raw delete will cause a race condition during AudioTrack destruction.

AudioTrack was made a RefBase by commit b68a91a70bc8d0d18e7404e14443d4e4020b3635
on 2011/11/15, when it was needed by OpenSL ES (for the callback protector).
At that time, the only other client that was also converted from
AudioTrack * to sp<AudioTrack> was android.media.AudioTrack JNI in
project frameworks/base (file android_media_AudioTrack.cpp).

Details:
* Use .clear() instead of delete followed by = NULL.
* ALOG %p need .get().
* sp<> don't need to be listed in constructor initializer, if initially 0.
* Use == 0 for sp<> vs == NULL for raw pointers.
* Use if (sp != 0) instead of if (raw).

Change-Id: Ic7cad25795d6e862e112abdc227b6d33afdfce17
ediaPlayerService.cpp
ediaPlayerService.h
7c684c622110af460025eff85082030947278430 03-Jun-2013 Andreas Huber <andih@google.com> am f9bb8358: am b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright.

* commit 'f9bb8358e454be6dc88403171db7e0e182407f17':
Update HTTP proxy configuration for all media playback inside stagefright.
f9bb8358e454be6dc88403171db7e0e182407f17 03-Jun-2013 Andreas Huber <andih@google.com> am b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright.

* commit 'b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1':
Update HTTP proxy configuration for all media playback inside stagefright.
b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1 29-May-2013 Andreas Huber <andih@google.com> Update HTTP proxy configuration for all media playback inside stagefright.

Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b
related-to-bug: 8873723
(cherry picked from commit 2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
ediaPlayerService.cpp
ediaPlayerService.h
14f7672b5d450ed26a06fd3bb3ce045ea78b11b2 15-Jan-2013 Andreas Huber <andih@google.com> New HLS implementation supporting independent stream sources, audio-only streams

and more.

Change-Id: Icfc45a0100243b2f7a14a9e65696be45b67d6495
ndroid.mk
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerSource.h
308bcaa44e578279e61be32b572fdb0b11b1e4c7 04-May-2013 Chong Zhang <chz@google.com> wifi-display: add support for metadata mode on encoder output

pass buffer_handle_t from encoder output to HDCP encryptor input

Bug: 8968123

Change-Id: Iea8007ce568641e213fd2e3cf6947a6f7a95746c
DCP.cpp
DCP.h
d84c79bf628d0f96189429add9c8b0fbb7acace9 26-Apr-2013 Andreas Huber <andih@google.com> am dd309b97: Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev

* commit 'dd309b97f3e30cb8ab30892b4bf6b5d824853a86':
Handle the case where an asynchronous prepare was initiated and then
75f912ca9d8a03c91a421b80d96b81d87ef79d68 26-Apr-2013 Andreas Huber <andih@google.com> am dd309b97: Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev

* commit 'dd309b97f3e30cb8ab30892b4bf6b5d824853a86':
Handle the case where an asynchronous prepare was initiated and then
5a7501304d815552c3bfaee8789821e4884d073b 26-Apr-2013 Andreas Huber <andih@google.com> Handle the case where an asynchronous prepare was initiated and then

the mediaplayer was reset.

Change-Id: Ib241747c5dc002b88a3854569c1f8340b2a8ef41
related-to-bug: 8688986
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
b5f28d4749b898d92fe5e56236b417e37b6fe84f 26-Apr-2013 Andreas Huber <andih@google.com> Handle the case where an asynchronous prepare was initiated and then

the mediaplayer was reset.

Change-Id: Ib241747c5dc002b88a3854569c1f8340b2a8ef41
related-to-bug: 8688986
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
6bc71cac3619b0a5bb70d87abded691f3f929e3b 24-Apr-2013 Andreas Huber <andih@google.com> am 628a8c0e: Merge "fix a race condition of MediaPlayerServce::Client::mClient"

* commit '628a8c0ed91531468f5c615fea8745f63cc812aa':
fix a race condition of MediaPlayerServce::Client::mClient
2c2345cf7e163f532f32597051f579cdb0e36bec 24-Apr-2013 Andreas Huber <andih@google.com> am 628a8c0e: Merge "fix a race condition of MediaPlayerServce::Client::mClient"

* commit '628a8c0ed91531468f5c615fea8745f63cc812aa':
fix a race condition of MediaPlayerServce::Client::mClient
aa47eb2e0560ade9e0d899e72d733bb6764973b6 24-Apr-2013 Andreas Huber <andih@google.com> Merge "fix a race condition of MediaPlayerServce::Client::mClient"
628a8c0ed91531468f5c615fea8745f63cc812aa 24-Apr-2013 Andreas Huber <andih@google.com> Merge "fix a race condition of MediaPlayerServce::Client::mClient"
ca6867fbac7a69c4d7a253917ecf6d4abc18d49c 16-Apr-2013 Andreas Huber <andih@google.com> Fix a typo that would cause us not to shutdown/flush the decoders in

some cases.

related-to-bug: 8630032

Change-Id: I8e94b53b34e137e827e9630c65f3252ea91e4ebd
uplayer/NuPlayer.cpp
da9740e63a835e610519bd235be9137d74b6d409 16-Apr-2013 Andreas Huber <andih@google.com> Fix a typo that would cause us not to shutdown/flush the decoders in

some cases.

related-to-bug: 8630032

Change-Id: I8e94b53b34e137e827e9630c65f3252ea91e4ebd
uplayer/NuPlayer.cpp
602f5bbd7596ec3fe447fde4329d5d4f0b370835 16-Apr-2013 Andreas Huber <andih@google.com> Guard against mLooper == NULL.

Change-Id: I01aa0e47b55d0dffe34525edf9f055a5cb4dc70f
related-to-bug: 8620223
uplayer/RTSPSource.cpp
a68e7b98361692d4120bf99fa5dc18cd93673130 16-Apr-2013 Andreas Huber <andih@google.com> Guard against mLooper == NULL.

Change-Id: I01aa0e47b55d0dffe34525edf9f055a5cb4dc70f
related-to-bug: 8620223
uplayer/RTSPSource.cpp
2070254f241f52cadb69bc2323f56df72704f1ca 11-Apr-2013 Andreas Huber <andih@google.com> Instead of returning an error, return an invalid duration (-1 ms)

if no duration information was available. This prevents us from
entering ERROR state, effectively rendering the player instance useless.

Change-Id: I602d2661ae8b8633360306c0ea9208fb11e2bf17
related-to-bug: 8596285
uplayer/NuPlayerDriver.cpp
d85929f6086e050d7cb33bfe0d29f339ad7279e5 11-Apr-2013 Andreas Huber <andih@google.com> Instead of returning an error, return an invalid duration (-1 ms)

if no duration information was available. This prevents us from
entering ERROR state, effectively rendering the player instance useless.

Change-Id: I602d2661ae8b8633360306c0ea9208fb11e2bf17
related-to-bug: 8596285
uplayer/NuPlayerDriver.cpp
ecba7488c5cceaacef95836b1b476433451e7761 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
ndroid.mk
da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
ndroid.mk
505208dd38ab2f143e6a3ff6a2c262d0fab76b7e 05-Apr-2013 Jeff Tinker <jtinker@google.com> Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
d5ef30b223b627c21b11f2850eeb48426c74220d 05-Apr-2013 Jeff Tinker <jtinker@google.com> Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
0cb126a34fe32f81c830858102471e7be2ce85b1 02-Apr-2013 Jeff Tinker <jtinker@google.com> Implement async event callout from drm plugin to Java app

Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
rm.cpp
rm.h
c0d5f1f8405de861ed6f1725f26cd6601e7103ab 02-Apr-2013 Jeff Tinker <jtinker@google.com> Implement async event callout from drm plugin to Java app

Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
rm.cpp
rm.h
df41f485a9162407b32b7db1cea483f64bbd0c65 03-Apr-2013 Jeff Tinker <jtinker@google.com> Merge "MediaDrm API update" into jb-mr2-dev
a56e15065bc45082d913c8c8e71e60692ce8c8f0 03-Apr-2013 Jeff Tinker <jtinker@google.com> Merge "MediaDrm API update" into jb-mr2-dev
8856c8b8777d0e0de11b2de863a336b001024e29 31-Mar-2013 Jeff Tinker <jtinker@google.com> MediaDrm API update

Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.

Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
rm.cpp
rm.h
4c63a239c404af1e055e5f9939939ab0fd09d98a 31-Mar-2013 Jeff Tinker <jtinker@google.com> MediaDrm API update

Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.

Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
rm.cpp
rm.h
7069bdf24a9e3393479368e83f9009817869c33c 01-Apr-2013 Andreas Huber <andih@google.com> Fix seek in response to OnPrepared() for HLS content

Change-Id: I0e52352845398a4db074e939487f6f6de94bd523
related-to-bug: 8225122
ediaPlayerFactory.cpp
uplayer/NuPlayer.cpp
997594088164cfb33c1cb8c376884346fbf1e7ae 01-Apr-2013 Andreas Huber <andih@google.com> Fix seek in response to OnPrepared() for HLS content

Change-Id: I0e52352845398a4db074e939487f6f6de94bd523
related-to-bug: 8225122
ediaPlayerFactory.cpp
uplayer/NuPlayer.cpp
ad2bb2dd233b7220e29d2dafa3106ad498f3aea3 27-Mar-2013 Marco Nelissen <marcone@google.com> Fix valgrind error.

The constructor calls reset(), which in turn calls stop(), which then
accesses mCaptureTimeLapse before it has been initialized.

Change-Id: Ia94ac740b9bd1a0389c72647a5639dd25320d92c
tagefrightRecorder.cpp
59ca8040a0cfb0324c6be7dded74d02e9f5cf6e8 27-Mar-2013 Marco Nelissen <marcone@google.com> Fix valgrind error.

The constructor calls reset(), which in turn calls stop(), which then
accesses mCaptureTimeLapse before it has been initialized.

Change-Id: Ia94ac740b9bd1a0389c72647a5639dd25320d92c
tagefrightRecorder.cpp
5beac28a34e557251bd4bbd77a6d9303a69d4319 22-Mar-2013 Jeff Tinker <jtinker@google.com> Load crypto plugins from additional shared libraries

Currently crypto plugins are expected to be in libdrmdecrypt.so.
When there are multiple plugins supporting different schemes,
this approach requires source code integration across
vendors which is unmanagable. Also, for integration with
MediaDrm where the crypto keys are obtained from a drm server,
the MediaCrypto plugin needs to interoperate with the MediaDrm
plugin. This change allows {MediaCrypto, MediaDrm} pairs that
are logically related to be implemented in a common shared
library.

Change-Id: I7f6638f29171f91609fc2d944396365568630b56
rypto.cpp
rypto.h
bafb682ec7f51486e751fea954169deb91846063 22-Mar-2013 Jeff Tinker <jtinker@google.com> Load crypto plugins from additional shared libraries

Currently crypto plugins are expected to be in libdrmdecrypt.so.
When there are multiple plugins supporting different schemes,
this approach requires source code integration across
vendors which is unmanagable. Also, for integration with
MediaDrm where the crypto keys are obtained from a drm server,
the MediaCrypto plugin needs to interoperate with the MediaDrm
plugin. This change allows {MediaCrypto, MediaDrm} pairs that
are logically related to be implemented in a common shared
library.

Change-Id: I7f6638f29171f91609fc2d944396365568630b56
rypto.cpp
rypto.h
aab193b107e302e145b5c3d6e6c87f92ac296186 20-Mar-2013 Jeff Tinker <jtinker@google.com> Merge "Implementing MediaDrm APIs" into jb-mr2-dev
de5cdcae51d3afd9b14e818087be14288c0c6b8c 20-Mar-2013 Jeff Tinker <jtinker@google.com> Merge "Implementing MediaDrm APIs" into jb-mr2-dev
8fb6f96e1cc246bc5630e1f5a0eb90f5459331b7 13-Mar-2013 Mathias Agopian <mathias@google.com> Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2-dev
a32fd0e2c7489fa28055595d7c67d857d32566a5 13-Mar-2013 Mathias Agopian <mathias@google.com> Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2-dev
cc82dc6d500023eba6048616301a4b12682458db 08-Feb-2013 Jeff Tinker <jtinker@google.com> Implementing MediaDrm APIs

Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6
ndroid.mk
rm.cpp
rm.h
ediaPlayerService.cpp
ediaPlayerService.h
haredLibrary.cpp
haredLibrary.h
441a78d5e224e0d67f9b52fa9adc795c6944159b 08-Feb-2013 Jeff Tinker <jtinker@google.com> Implementing MediaDrm APIs

Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6
ndroid.mk
rm.cpp
rm.h
ediaPlayerService.cpp
ediaPlayerService.h
haredLibrary.cpp
haredLibrary.h
33da402287605e40e189289b11a08b8f5d515818 13-Mar-2013 Mathias Agopian <mathias@google.com> remove uses of Surface in favor or IGraphicBufferProducer

Change-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57
ediaRecorderClient.cpp
ediaRecorderClient.h
tagefrightRecorder.cpp
tagefrightRecorder.h
99617adda9bc46c43f511f0940bc735c73de61de 13-Mar-2013 Mathias Agopian <mathias@google.com> remove uses of Surface in favor or IGraphicBufferProducer

Change-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57
ediaRecorderClient.cpp
ediaRecorderClient.h
tagefrightRecorder.cpp
tagefrightRecorder.h
9dffd24e00a1b2abd5e2dcc2366c0327ec3701b8 12-Mar-2013 Andreas Huber <andih@google.com> Squashed commit of the following:

commit f4edf442741886cdbe071e2d15f6e6247269f7c5
Author: Andreas Huber <andih@google.com>
Date: Tue Mar 12 09:09:18 2013 -0700

Pass additional flags to the sink, use TCP by default in wolfiecast mode.

Change-Id: I41e11a2375d4199656e45c4f149d8441d0016092

commit 6302602ed280a38287f507159abfb40a1da38c5a
Author: Andreas Huber <andih@google.com>
Date: Tue Mar 12 08:51:58 2013 -0700

tweaks

Change-Id: Ie29e422d7258be522f4bb1f6c5afcf74c937e547

commit a38a860e4979ba563cadbaafa21b084439449d26
Author: Andreas Huber <andih@google.com>
Date: Mon Mar 11 16:57:43 2013 -0700

Report average lateness all the way from NuPlayerRenderer...

Change-Id: I2e7700703ae656515e44b9c25610d26c75778111

commit a7d49b11675ea88be4029dd8451d1649db94571d
Author: Andreas Huber <andih@google.com>
Date: Mon Mar 11 14:54:19 2013 -0700

Make TimeSyncer smarter, enable TunnelRenderer

Change-Id: I27377a60cd8feb01589da456967fddd34532c20e

commit 0f214c8ef68179f7b61512c37040939554013151
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 7 15:57:56 2013 -0800

convert source timestamps to sink timestamps, report lateness.

Change-Id: I051a60fbbceca2f7b508ae3dac6e01e402bae39e

commit 04a4f8e16bad09157b5615a5fa45310438955832
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 7 09:00:28 2013 -0800

Sync time between sink and source.

Change-Id: Ie8b4d75c957aa48310e7c81d1279761b9f821efe

commit aebe20e6184e3636a99082f8ece08e708015cb8d
Author: Andreas Huber <andih@google.com>
Date: Wed Mar 6 09:03:12 2013 -0800

play with back pressure

Change-Id: I51eb69257e6a79e76f5f9c75ff99d8adbd083947

Change-Id: Ifdf57228667fed7fc71c5090a2c3f7cea1037c5c
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
uplayer/NuPlayerSource.h
uplayer/StreamingSource.cpp
uplayer/StreamingSource.h
d5e56231a598b180a1d898bb7dc61b75580e59a4 12-Mar-2013 Andreas Huber <andih@google.com> Squashed commit of the following:

commit f4edf442741886cdbe071e2d15f6e6247269f7c5
Author: Andreas Huber <andih@google.com>
Date: Tue Mar 12 09:09:18 2013 -0700

Pass additional flags to the sink, use TCP by default in wolfiecast mode.

Change-Id: I41e11a2375d4199656e45c4f149d8441d0016092

commit 6302602ed280a38287f507159abfb40a1da38c5a
Author: Andreas Huber <andih@google.com>
Date: Tue Mar 12 08:51:58 2013 -0700

tweaks

Change-Id: Ie29e422d7258be522f4bb1f6c5afcf74c937e547

commit a38a860e4979ba563cadbaafa21b084439449d26
Author: Andreas Huber <andih@google.com>
Date: Mon Mar 11 16:57:43 2013 -0700

Report average lateness all the way from NuPlayerRenderer...

Change-Id: I2e7700703ae656515e44b9c25610d26c75778111

commit a7d49b11675ea88be4029dd8451d1649db94571d
Author: Andreas Huber <andih@google.com>
Date: Mon Mar 11 14:54:19 2013 -0700

Make TimeSyncer smarter, enable TunnelRenderer

Change-Id: I27377a60cd8feb01589da456967fddd34532c20e

commit 0f214c8ef68179f7b61512c37040939554013151
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 7 15:57:56 2013 -0800

convert source timestamps to sink timestamps, report lateness.

Change-Id: I051a60fbbceca2f7b508ae3dac6e01e402bae39e

commit 04a4f8e16bad09157b5615a5fa45310438955832
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 7 09:00:28 2013 -0800

Sync time between sink and source.

Change-Id: Ie8b4d75c957aa48310e7c81d1279761b9f821efe

commit aebe20e6184e3636a99082f8ece08e708015cb8d
Author: Andreas Huber <andih@google.com>
Date: Wed Mar 6 09:03:12 2013 -0800

play with back pressure

Change-Id: I51eb69257e6a79e76f5f9c75ff99d8adbd083947

Change-Id: Ifdf57228667fed7fc71c5090a2c3f7cea1037c5c
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
uplayer/NuPlayerSource.h
uplayer/StreamingSource.cpp
uplayer/StreamingSource.h
48af7e8dd40883d6154e7029d9500072b551b5fa 19-Feb-2013 Eino-Ville Talvala <etalvala@google.com> CameraService and Stagefright: Support AppOps

Camera:
- Signal to AppOpsService when camera usage starts and stops
- Listen to permissions revocations and act on them
- Currently just kill camera connection when permissions lost

Stagefright:
- Pass on client name, UID to camera as needed

Bug: 8181262
Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
ediaRecorderClient.cpp
ediaRecorderClient.h
tagefrightRecorder.cpp
tagefrightRecorder.h
ceb388d6c03c38b96dc41c0ea4804b749aa077c4 19-Feb-2013 Eino-Ville Talvala <etalvala@google.com> CameraService and Stagefright: Support AppOps

Camera:
- Signal to AppOpsService when camera usage starts and stops
- Listen to permissions revocations and act on them
- Currently just kill camera connection when permissions lost

Stagefright:
- Pass on client name, UID to camera as needed

Bug: 8181262
Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
ediaRecorderClient.cpp
ediaRecorderClient.h
tagefrightRecorder.cpp
tagefrightRecorder.h
b1e7cd156ca3e1747374e0d20cdd1ce467210453 15-Feb-2013 Mathias Agopian <mathias@google.com> Refactoring: Rename SurfaceTextureClient to Surface

Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
ediaPlayerService.cpp
uplayer/NuPlayer.cpp
1a2952aee048ca7b1765e2bc09ebe9aeddaeafa3 15-Feb-2013 Mathias Agopian <mathias@google.com> Refactoring: Rename SurfaceTextureClient to Surface

Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
ediaPlayerService.cpp
uplayer/NuPlayer.cpp
46d13e3606b87d71379287672b54b50d0d9aa5cc 21-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> Enable pause/resume for RTSP streaming

When a stream is paused, RTSP Pause is also sent to the server.
Otherwise the buffering might continue until the memory runs out.
When the stream is resumed, RTSP Play will be sent in order to
resume the buffering.

Change-Id: I5dc1761140827c532451638c3fd3f34271e5b9ab
uplayer/NuPlayer.cpp
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
fba60daf77cc74a13ae3bf4b0e9925dd2ee4470c 21-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> Enable pause/resume for RTSP streaming

When a stream is paused, RTSP Pause is also sent to the server.
Otherwise the buffering might continue until the memory runs out.
When the stream is resumed, RTSP Play will be sent in order to
resume the buffering.

Change-Id: I5dc1761140827c532451638c3fd3f34271e5b9ab
uplayer/NuPlayer.cpp
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
cfc3083927df14bf82403b20a45ae303a01c39f5 21-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> RTSP buffering improvements

Added buffering start and end notifications for RTSP.
MEDIA_INFO_BUFFERING_START is sent when buffering is started
and MEDIA_INFO_BUFFERING_END is sent when the buffer has
filled up.

This patch also adds RTSP end of stream handling.
EOS is signalled when BYE is received OR when
detecting end of stream even if no actual EOS is received.

Change-Id: I5cccb6845060ae6afd66d9f735b89da81476cd13
uplayer/NuPlayer.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
b50e83eca302a12f0fced6e7bab1b8617d63deaa 21-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> RTSP buffering improvements

Added buffering start and end notifications for RTSP.
MEDIA_INFO_BUFFERING_START is sent when buffering is started
and MEDIA_INFO_BUFFERING_END is sent when the buffer has
filled up.

This patch also adds RTSP end of stream handling.
EOS is signalled when BYE is received OR when
detecting end of stream even if no actual EOS is received.

Change-Id: I5cccb6845060ae6afd66d9f735b89da81476cd13
uplayer/NuPlayer.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
0c3f0fa983107a8b5a4d6274179d15333fde8d3c 06-Feb-2013 Andreas Huber <andih@google.com> HLS now properly publishes its "seekable" flags after connection

has successfully completed and a sufficient amount of data fetched,
and only then signals that preparation is completed.

Change-Id: I7684a14238b826909f518f2af506966e522dfcfc
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
0df36ec3303c2c6bf9b42c07945ac8bd234153f3 06-Feb-2013 Andreas Huber <andih@google.com> HLS now properly publishes its "seekable" flags after connection

has successfully completed and a sufficient amount of data fetched,
and only then signals that preparation is completed.

Change-Id: I7684a14238b826909f518f2af506966e522dfcfc
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
7f475c34ffc8e35345f2cceee2ef56a50bb5fea6 05-Feb-2013 Andreas Huber <andih@google.com> RTSP now properly publishes its "seekable" flags after connection

has successfully completed and only then signals that preparation is
complete.

Change-Id: I1a60f718e673fe1462c69369c40eafbed6a14326
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
ec0c597cabf169ca646bcea5faac1bd81ed4484d 05-Feb-2013 Andreas Huber <andih@google.com> RTSP now properly publishes its "seekable" flags after connection

has successfully completed and only then signals that preparation is
complete.

Change-Id: I1a60f718e673fe1462c69369c40eafbed6a14326
uplayer/NuPlayer.cpp
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
b81b557d6e89cc2960b74ab343a08b5b44bff1f2 05-Feb-2013 Andreas Huber <andih@google.com> Merge "Support for a "preparation" state that can take care of lengthy"
3c7f8b48fcae6f4b41b66c86008170166e43b428 05-Feb-2013 Andreas Huber <andih@google.com> Merge "Support for a "preparation" state that can take care of lengthy"
57cea553cb19235553463412db5ad04c99835411 05-Feb-2013 Andreas Huber <andih@google.com> Support for a "preparation" state that can take care of lengthy

operations in NuPlayer and its sources. Sources also can publish their
flags now and the mediaplayer UI will be able to pick up on these.

Change-Id: I4f2b7e5d105dcb4b6c9132cd0e8799efa0c6a14b
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
uplayer/StreamingSource.cpp
uplayer/StreamingSource.h
uplayer/mp4/MP4Source.cpp
uplayer/mp4/MP4Source.h
9575c96b6e418914e2ffc6741ecc8d71e3968dbe 05-Feb-2013 Andreas Huber <andih@google.com> Support for a "preparation" state that can take care of lengthy

operations in NuPlayer and its sources. Sources also can publish their
flags now and the mediaplayer UI will be able to pick up on these.

Change-Id: I4f2b7e5d105dcb4b6c9132cd0e8799efa0c6a14b
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
uplayer/StreamingSource.cpp
uplayer/StreamingSource.h
uplayer/mp4/MP4Source.cpp
uplayer/mp4/MP4Source.h
27243b75722c077699a593cb64947f1d763a177f 05-Feb-2013 Andreas Huber <andih@google.com> Fix a typo in MediaPlayerFactory that would prevent us from

opting in to nuplayer for general media playback.

Change-Id: I050f5178aadbb0b8bf422861ef885745c0b9006a
ediaPlayerFactory.cpp
198a893671ce80d951625fe328a92073306660d0 05-Feb-2013 Andreas Huber <andih@google.com> Fix a typo in MediaPlayerFactory that would prevent us from

opting in to nuplayer for general media playback.

Change-Id: I050f5178aadbb0b8bf422861ef885745c0b9006a
ediaPlayerFactory.cpp
81dd60e0340ddcf7f1d5fb80b6c30906fabf201a 20-Feb-2012 Oscar Rydhé <oscar.rydhe@sonyericsson.com> Added HTTP support for SDP files.

Added support for playing SDP files from http links. Previously,
SDP files only worked when started from rtsp links
(rtsp://a.b.c/abc.sdp), but they are just as common in http links.

patch provided by "Oscar Rydhé <oscar.rydhe@sonyericsson.com>"

Change-Id: Ic73af3a9a002009dbe8b04c267a4621bf7fe2f46
ediaPlayerFactory.cpp
uplayer/NuPlayer.cpp
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
7a33b7740412accf6a1cc912686c8d0acfb2a883 20-Feb-2012 Oscar Rydhé <oscar.rydhe@sonyericsson.com> Added HTTP support for SDP files.

Added support for playing SDP files from http links. Previously,
SDP files only worked when started from rtsp links
(rtsp://a.b.c/abc.sdp), but they are just as common in http links.

patch provided by "Oscar Rydhé <oscar.rydhe@sonyericsson.com>"

Change-Id: Ic73af3a9a002009dbe8b04c267a4621bf7fe2f46
ediaPlayerFactory.cpp
uplayer/NuPlayer.cpp
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
5ab368af38fefacc4009e3ab1c1bbd00e62b3bcf 05-Feb-2013 Andreas Huber <andih@google.com> Groundwork to support bidirectional, asynchronous communication

between NuPlayer and its sources.

Change-Id: I1989022d806206b926555add3aa5c1fcf37aa78d
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
uplayer/StreamingSource.cpp
uplayer/StreamingSource.h
uplayer/mp4/MP4Source.cpp
uplayer/mp4/MP4Source.h
b5f25f005bc1d3ae35f45b58c88345e183dc336d 05-Feb-2013 Andreas Huber <andih@google.com> Groundwork to support bidirectional, asynchronous communication

between NuPlayer and its sources.

Change-Id: I1989022d806206b926555add3aa5c1fcf37aa78d
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
uplayer/StreamingSource.cpp
uplayer/StreamingSource.h
uplayer/mp4/MP4Source.cpp
uplayer/mp4/MP4Source.h
279dcd89ab1d2de91dfe95e461412a0f577a6891 30-Jan-2013 Andreas Huber <andih@google.com> Plumbing to reflect minor changes in the HDCP module API that allow for

support of _decryption_ modules in addition to what we already supported.

Change-Id: Ic37b87dc170ba8def3817991d25df798f21e950b
DCP.cpp
DCP.h
ediaPlayerService.cpp
ediaPlayerService.h
a6a88d9c445e261972c2433254e0a996336e78a4 30-Jan-2013 Andreas Huber <andih@google.com> Plumbing to reflect minor changes in the HDCP module API that allow for

support of _decryption_ modules in addition to what we already supported.

Change-Id: Ic37b87dc170ba8def3817991d25df798f21e950b
DCP.cpp
DCP.h
ediaPlayerService.cpp
ediaPlayerService.h
5570227ac334479982a9dd8c1647c00f58f47c18 21-Dec-2012 Glenn Kasten <gkasten@google.com> Merge "Remove unnecessary parameter"
49d24d3fcd01aef0ec1fa4abd9c1b85473f64c0f 21-Dec-2012 Glenn Kasten <gkasten@google.com> Merge "Remove unnecessary parameter"
f37971f624164c3ed185d3f976404a6f60f49b9a 03-Feb-2012 Glenn Kasten <gkasten@google.com> Remove unnecessary parameter

Just get the parameter on server side

Change-Id: I433a63104dbb257e0d862be2ab61847cb36d1c15
ediaPlayerService.cpp
ediaPlayerService.h
8d6cc842e8d525405c68e57fdf3bc5da0b4d7e87 03-Feb-2012 Glenn Kasten <gkasten@google.com> Remove unnecessary parameter

Just get the parameter on server side

Change-Id: I433a63104dbb257e0d862be2ab61847cb36d1c15
ediaPlayerService.cpp
ediaPlayerService.h
484566c410afdfbc4b6bc5aa1732aef37428a5b8 18-Dec-2012 Andy McFadden <fadden@android.com> Rename ISurfaceTexture and SurfaceTexture

The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: I64520a55f8c09fe6215382ea361c539a9940cba5
ediaPlayerService.cpp
ediaPlayerService.h
ediaRecorderClient.cpp
ediaRecorderClient.h
idiFile.h
tagefrightPlayer.cpp
tagefrightPlayer.h
tagefrightRecorder.cpp
tagefrightRecorder.h
estPlayerStub.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
8ba01021b573889802e67e029225a96f0dfa471a 18-Dec-2012 Andy McFadden <fadden@android.com> Rename ISurfaceTexture and SurfaceTexture

The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: I64520a55f8c09fe6215382ea361c539a9940cba5
ediaPlayerService.cpp
ediaPlayerService.h
ediaRecorderClient.cpp
ediaRecorderClient.h
idiFile.h
tagefrightPlayer.cpp
tagefrightPlayer.h
tagefrightRecorder.cpp
tagefrightRecorder.h
estPlayerStub.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
3057c6925f20d944489a0ccea088d889e8388ebf 05-Dec-2012 Andreas Huber <andih@google.com> Merge "setVideoSurfaceTexture is now synchronous and applied dynamically"
1bf2c273d867e898a057472f4381f7d6e19f0441 05-Dec-2012 Andreas Huber <andih@google.com> Merge "setVideoSurfaceTexture is now synchronous and applied dynamically"
e9810fae2ca6620337b75a787786cc0ea52adecd 04-Dec-2012 Andreas Huber <andih@google.com> Respect sample aspect ratio in NuPlayer.

related-to-bug: 7569402
Change-Id: I302de95d83b180bd2dc72ddd0c69a665dbce2527
uplayer/NuPlayer.cpp
516dacfb02d0b0eafe21114330c98ce0e7d90da9 04-Dec-2012 Andreas Huber <andih@google.com> Respect sample aspect ratio in NuPlayer.

related-to-bug: 7569402
Change-Id: I302de95d83b180bd2dc72ddd0c69a665dbce2527
uplayer/NuPlayer.cpp
1a447be0cf1abc7564ae2afe7b4d2240c875de54 03-Dec-2012 Andreas Huber <andih@google.com> setVideoSurfaceTexture is now synchronous and applied dynamically

while playing.

Change-Id: If9f08659a01bdc7dac0999730368e9dfa5e58d36
related-to-bug: 5666482
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
57a339cdb7524f883de3ceb364c0b5606df0c610 03-Dec-2012 Andreas Huber <andih@google.com> setVideoSurfaceTexture is now synchronous and applied dynamically

while playing.

Change-Id: If9f08659a01bdc7dac0999730368e9dfa5e58d36
related-to-bug: 5666482
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
uplayer/NuPlayerDriver.h
457ec421a62995845698ada8d84d6c9de8d222dc 30-Nov-2012 Andreas Huber <andih@google.com> Fix nuplayer seek jankiness by properly flushing decoders before

initiating the seek. Also refactor the nuplayer state machine to make this
a little more maintainable and extensible in the future.

Change-Id: I36a673bdecff732bca7094c8f72bac24f37c01e9
related-to-bug: 7120373
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
a1f8ab0ad670c30e57f3f072df13df66fe4f4910 30-Nov-2012 Andreas Huber <andih@google.com> Fix nuplayer seek jankiness by properly flushing decoders before

initiating the seek. Also refactor the nuplayer state machine to make this
a little more maintainable and extensible in the future.

Change-Id: I36a673bdecff732bca7094c8f72bac24f37c01e9
related-to-bug: 7120373
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
f59ab0eb162cc32df4fc0af8d1a4500c5bce3ecc 29-Nov-2012 Andreas Huber <andih@google.com> am 2f6107ec: am b64def9a: Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev

* commit '2f6107ec8e67eea1f73b9558a5ad34caec52867f':
[wfd] Support a low(er) power state by triggering PAUSE/RESUME.
37a9e8e13bcc9ac614c1b733ec2c66764c29679a 29-Nov-2012 Andreas Huber <andih@google.com> am 2f6107ec: am b64def9a: Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev

* commit '2f6107ec8e67eea1f73b9558a5ad34caec52867f':
[wfd] Support a low(er) power state by triggering PAUSE/RESUME.
bf4950aa265ec7b54777d122b27037461638af0f 16-Nov-2012 Andreas Huber <andih@google.com> [wfd] Support a low(er) power state by triggering PAUSE/RESUME.

Change-Id: Ibe42bfa73816bbfeb7e652d435254d0171b89727
related-to-bug: 7638150
emoteDisplay.cpp
emoteDisplay.h
5131d127a042ee88f903370be88845dc8c9f8578 16-Nov-2012 Andreas Huber <andih@google.com> [wfd] Support a low(er) power state by triggering PAUSE/RESUME.

Change-Id: Ibe42bfa73816bbfeb7e652d435254d0171b89727
related-to-bug: 7638150
emoteDisplay.cpp
emoteDisplay.h
1bfcf04b27bdd5320ab70b74285b855380e83f26 28-Nov-2012 Andreas Huber <andih@google.com> am 7b7f17dc: am b7c8e918: Add support for HLS playlists of type \'event\'.

* commit '7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7':
Add support for HLS playlists of type 'event'.
2546219a54970e0ad53bd218586cdc48d6039b20 28-Nov-2012 Andreas Huber <andih@google.com> am 7b7f17dc: am b7c8e918: Add support for HLS playlists of type \'event\'.

* commit '7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7':
Add support for HLS playlists of type 'event'.
a4c5bc0f18fe272146426ab2eccad6215279c9f3 28-Nov-2012 Andreas Huber <andih@google.com> Add support for HLS playlists of type 'event'.

related-to-bug: 6870049

Squashed commit of the following:

commit eee2f3ba6bb7335f4e285632726db85645669929
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 15:02:01 2012 -0800

Make everything a lot less verbose by default.

Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3

commit 6bbdb837ed5bd88008e45efb8faf595e4051ba26
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:34:46 2012 -0800

HLS now properly signals media time changes at discontinuities including

the start of playback (which may not necessarily be at time 0 if the playlist
is of type 'event' and hasn't completed yet).

Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e

commit 1555589832b1878a144a976a643e1af4d61f877c
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:32:28 2012 -0800

As part of a time discontinuity, clients of IStreamListener can now

signal the corresponding media time after the discontinuity, i.e. the first PTS
timestamp following the discontinuity will be considered equivalent to the
specified media time and media buffers timestamped accordingly.

Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92

commit 5c24c605c073a11c426d025b1e7478fc1ad8365a
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 13:00:56 2012 -0800

NuPlayer sources now expose flags() and can announce

that duration may change (increase) dynamically, in which case duration
will be polled at 1 second intervals and communicated to the upper layers.

Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea

commit ecb71de8e281e61971a2cd73e7161a97540bc357
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 12:57:47 2012 -0800

Stop caching duration in MediaPlayer, duration could increase dynamically.

Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791

commit 544aec5823e6d7a3e97e15b6b23546616bcd343e
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 08:46:28 2012 -0800

An attempt to add support for "event" style HLS playlists.

Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60

Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
uplayer/StreamingSource.cpp
uplayer/StreamingSource.h
uplayer/mp4/MP4Source.cpp
uplayer/mp4/MP4Source.h
b7c8e91880463ff4981e3e53e98e45d68e2fe374 28-Nov-2012 Andreas Huber <andih@google.com> Add support for HLS playlists of type 'event'.

related-to-bug: 6870049

Squashed commit of the following:

commit eee2f3ba6bb7335f4e285632726db85645669929
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 15:02:01 2012 -0800

Make everything a lot less verbose by default.

Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3

commit 6bbdb837ed5bd88008e45efb8faf595e4051ba26
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:34:46 2012 -0800

HLS now properly signals media time changes at discontinuities including

the start of playback (which may not necessarily be at time 0 if the playlist
is of type 'event' and hasn't completed yet).

Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e

commit 1555589832b1878a144a976a643e1af4d61f877c
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:32:28 2012 -0800

As part of a time discontinuity, clients of IStreamListener can now

signal the corresponding media time after the discontinuity, i.e. the first PTS
timestamp following the discontinuity will be considered equivalent to the
specified media time and media buffers timestamped accordingly.

Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92

commit 5c24c605c073a11c426d025b1e7478fc1ad8365a
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 13:00:56 2012 -0800

NuPlayer sources now expose flags() and can announce

that duration may change (increase) dynamically, in which case duration
will be polled at 1 second intervals and communicated to the upper layers.

Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea

commit ecb71de8e281e61971a2cd73e7161a97540bc357
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 12:57:47 2012 -0800

Stop caching duration in MediaPlayer, duration could increase dynamically.

Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791

commit 544aec5823e6d7a3e97e15b6b23546616bcd343e
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 08:46:28 2012 -0800

An attempt to add support for "event" style HLS playlists.

Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60

Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
uplayer/StreamingSource.cpp
uplayer/StreamingSource.h
uplayer/mp4/MP4Source.cpp
uplayer/mp4/MP4Source.h
5834181d3f168acb8ff4bf3eff1fd1186afb0bd4 16-Nov-2012 James Dong <jdong@google.com> Fix a crash when the stop might be called due to some error before start in RTSPSource

o related-to-bug: 7507224

Change-Id: Ic8bfec13097b824ba337a01c9b00c98af2a33f43
uplayer/RTSPSource.cpp
f6f0f0e313f4d4dc7035e842270cd31303bd91e7 16-Nov-2012 James Dong <jdong@google.com> Fix a crash when the stop might be called due to some error before start in RTSPSource

o related-to-bug: 7507224

Change-Id: Ic8bfec13097b824ba337a01c9b00c98af2a33f43
uplayer/RTSPSource.cpp
7da35f231725aa6e0b2ac8714a7d66471368df77 14-Nov-2012 Glenn Kasten <gkasten@google.com> Use size_t for frame counts

Also fix typo: bufferCount should be frameCount.

Change-Id: Ibed539504db75ef99dc21c8ff1bf2987122063a5
ediaPlayerService.cpp
e33054eb968cbf8ccaee1b0ff0301403902deed6 14-Nov-2012 Glenn Kasten <gkasten@google.com> Use size_t for frame counts

Also fix typo: bufferCount should be frameCount.

Change-Id: Ibed539504db75ef99dc21c8ff1bf2987122063a5
ediaPlayerService.cpp
1127d65d536ebbe447ee17ce0926a7ce4a2a3c08 14-Nov-2012 Glenn Kasten <gkasten@google.com> Use uint32_t for sample rate

Change-Id: Ie240b48fb54b08359f69ecd4e5f8bda3d15cbe80
ediaPlayerService.cpp
3b16c766d1ae2cfd8487e8ffb2b23936fc0a8e17 14-Nov-2012 Glenn Kasten <gkasten@google.com> Use uint32_t for sample rate

Change-Id: Ie240b48fb54b08359f69ecd4e5f8bda3d15cbe80
ediaPlayerService.cpp
dcfefde6be8f9f33bbd2b3546f3be946d958d677 05-Nov-2012 beanz <beanz@marvell.com> fix a race condition of MediaPlayerServce::Client::mClient

there will be race condition between mClient.clear in MediaPlayerServce::Client::disconnect method
and c=client->mClient in in MediaPlayerServce::Client::notify method

Change-Id: I767294c4cb864c08e9c0e9f23d6d304a39016205
Signed-off-by: beanz <beanz@marvell.com>
ediaPlayerService.cpp
faa4420344216ccbad15a49aa7c1cd6141532fcb 30-Oct-2012 Glenn Kasten <gkasten@google.com> Remove obsolete references to libmedia_native

Bug: 6654403
Change-Id: I3993d62987cf0dd85db10bf002a5cce53d4f01bd
ndroid.mk
c41590251aa84c078c942d258e838aad814b73a5 30-Oct-2012 Glenn Kasten <gkasten@google.com> Remove obsolete references to libmedia_native

Bug: 6654403
Change-Id: I3993d62987cf0dd85db10bf002a5cce53d4f01bd
ndroid.mk
24a0ab1e9fef276abb830d6e411e41448c766cc7 12-Oct-2012 James Dong <jdong@google.com> am 954f6afe: am b4a55269: Fix some missing checks against missing codecs

* commit '954f6afed22e8a723ddb9a6448c14bce4e008a9c':
Fix some missing checks against missing codecs
cedc58d5c4e8769ac2dac6ddb9605776cbd452d8 12-Oct-2012 James Dong <jdong@google.com> am 954f6afe: am b4a55269: Fix some missing checks against missing codecs

* commit '954f6afed22e8a723ddb9a6448c14bce4e008a9c':
Fix some missing checks against missing codecs
6ebb67493075ecc817207bc0ca0305cde64b5c3b 12-Oct-2012 James Dong <jdong@google.com> Fix some missing checks against missing codecs

o related-to-bug: 6971073

Change-Id: Ia6d926663231f9a9ef31c82c85c70595c4a30ebe
tagefrightRecorder.cpp
b4a55269a5b39c73de2cc1d4013d0631ef18c77d 12-Oct-2012 James Dong <jdong@google.com> Fix some missing checks against missing codecs

o related-to-bug: 6971073

Change-Id: Ia6d926663231f9a9ef31c82c85c70595c4a30ebe
tagefrightRecorder.cpp
3d6354a33fb8524440d0bf8af203e37d52a34663 28-Sep-2012 Andreas Huber <andih@google.com> am d398c272: am ecc8db5e: Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev

* commit 'd398c2724c8a942961d13245a4669db0555080e4':
Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.
10b7722d745fb70a9becdfccac0eeb481f058ff0 28-Sep-2012 Andreas Huber <andih@google.com> am d398c272: am ecc8db5e: Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev

* commit 'd398c2724c8a942961d13245a4669db0555080e4':
Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.
be996645b3118b84edf26fc05cc5e4ff56c163b5 27-Sep-2012 Andreas Huber <andih@google.com> Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.

Change-Id: Ie54ee3edd672ec629360b4ecc5df2f85ecbaa45f
related-to-bug: 7247584
DCP.cpp
DCP.h
ef7d3793fa9bbfb25253626ede9a020ee9280a17 27-Sep-2012 Andreas Huber <andih@google.com> Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.

Change-Id: Ie54ee3edd672ec629360b4ecc5df2f85ecbaa45f
related-to-bug: 7247584
DCP.cpp
DCP.h
9234c190bf5cc94e677f915236dd2ebbfa35aac5 21-Sep-2012 Andreas Huber <andih@google.com> am 32cc2d3a: am 207e1854: Remove legacy code and APIs in wifi display related code.

* commit '32cc2d3a18cad9de4587ff6904b2b7e4d338db06':
Remove legacy code and APIs in wifi display related code.
27974f728512ef47d5d8fe847c75d1f2448180f2 21-Sep-2012 Andreas Huber <andih@google.com> am 32cc2d3a: am 207e1854: Remove legacy code and APIs in wifi display related code.

* commit '32cc2d3a18cad9de4587ff6904b2b7e4d338db06':
Remove legacy code and APIs in wifi display related code.
45d76bb6c8f15335f89c287dbae04cc38f79d0a8 21-Sep-2012 Andreas Huber <andih@google.com> Remove legacy code and APIs in wifi display related code.

Change-Id: Ia010e7a00534f9356b3247369d0ffd65591d91aa
ediaPlayerService.cpp
ediaPlayerService.h
207e18540fefbaf530a4fdf506d266f34ddec84f 21-Sep-2012 Andreas Huber <andih@google.com> Remove legacy code and APIs in wifi display related code.

Change-Id: Ia010e7a00534f9356b3247369d0ffd65591d91aa
ediaPlayerService.cpp
ediaPlayerService.h
ab92759a5c0b19042e8732b4e525341dc17a03c6 20-Sep-2012 Andreas Huber <andih@google.com> am 858882f2: am b88516c4: Merge "HDCP module binderized" into jb-mr1-dev

* commit '858882f2e6bd18d3da1db5cd8731fe3691628fb1':
HDCP module binderized
eec1c6cd2c3074722155731d6edebd9266237641 20-Sep-2012 Andreas Huber <andih@google.com> am 858882f2: am b88516c4: Merge "HDCP module binderized" into jb-mr1-dev

* commit '858882f2e6bd18d3da1db5cd8731fe3691628fb1':
HDCP module binderized
59451f8ced48874427ff1550391c4f3cd2ba2e35 18-Sep-2012 Andreas Huber <andih@google.com> HDCP module binderized

Change-Id: I866768b1e3f3b232f1934a35b65f66befc12f3f6
ndroid.mk
DCP.cpp
DCP.h
ediaPlayerService.cpp
ediaPlayerService.h
efbb781c15abf8e085f5ab8d39710bd58ea0b6e4 18-Sep-2012 Andreas Huber <andih@google.com> HDCP module binderized

Change-Id: I866768b1e3f3b232f1934a35b65f66befc12f3f6
ndroid.mk
DCP.cpp
DCP.h
ediaPlayerService.cpp
ediaPlayerService.h
482989a7c92215953f25293c92b3d0fe2e87cb41 17-Sep-2012 James Dong <jdong@google.com> am 9568b4cd: am 376074ed: Fixed a native crash due to deref of a NULL pointer

* commit '9568b4cdc8d2a7896e9c031f2b6cdf6f18210de1':
Fixed a native crash due to deref of a NULL pointer
be52460cdb8bba3987c4a17308624ffe88408033 17-Sep-2012 James Dong <jdong@google.com> am 9568b4cd: am 376074ed: Fixed a native crash due to deref of a NULL pointer

* commit '9568b4cdc8d2a7896e9c031f2b6cdf6f18210de1':
Fixed a native crash due to deref of a NULL pointer
9f235b58cd6dbee74d091e437d520306977daac9 15-Sep-2012 James Dong <jdong@google.com> Fixed a native crash due to deref of a NULL pointer

We only checked the mNativeWindow against NULL, but did not check the native window object itself against NULL.

o related-to-bug: 7153683

Change-Id: I430d344dc09a2fc337bf51001551627056713773
uplayer/NuPlayer.cpp
376074ed1c3c368aeb336954a07632cd806288e2 15-Sep-2012 James Dong <jdong@google.com> Fixed a native crash due to deref of a NULL pointer

We only checked the mNativeWindow against NULL, but did not check the native window object itself against NULL.

o related-to-bug: 7153683

Change-Id: I430d344dc09a2fc337bf51001551627056713773
uplayer/NuPlayer.cpp
593fecf6c18d060dd659d3995da505a8857b5254 13-Sep-2012 Andreas Huber <andih@google.com> am b030d656: am e891a788: Merge "Various improvements to the wifi display implementation." into jb-mr1-dev

* commit 'b030d65670fa236e09f91f5ef62ac6863d6600d4':
Various improvements to the wifi display implementation.
b7bed0ee59f7c39887b64d8412b8ecfdb6cb35ca 13-Sep-2012 Andreas Huber <andih@google.com> am b030d656: am e891a788: Merge "Various improvements to the wifi display implementation." into jb-mr1-dev

* commit 'b030d65670fa236e09f91f5ef62ac6863d6600d4':
Various improvements to the wifi display implementation.
eb29bae4b8ae270e656b6fcd5216fa86e9f1d8d0 12-Sep-2012 Andreas Huber <andih@google.com> Various improvements to the wifi display implementation.

Using a MediaPuller now, audio and video on their separate threads.
No more flushing the RTP stream on audio tracks, since it wastes too much
of a full size UDP packet.

Change-Id: I53346b4aea739c3142da13bd179428503a3c98b0
emoteDisplay.cpp
e1957358f11031a554c57d4fb46988dd6044acc1 12-Sep-2012 Andreas Huber <andih@google.com> Various improvements to the wifi display implementation.

Using a MediaPuller now, audio and video on their separate threads.
No more flushing the RTP stream on audio tracks, since it wastes too much
of a full size UDP packet.

Change-Id: I53346b4aea739c3142da13bd179428503a3c98b0
emoteDisplay.cpp
c1262ab36337a3b25b8a62b3902b965c3993dd68 11-Sep-2012 Jeff Brown <jeffbrown@google.com> am df00fc2d: am b019250d: Add a permission for controlling wifi display.

* commit 'df00fc2d9ac02cde6df75b76a93929396a1f696b':
Add a permission for controlling wifi display.
30482ff979f543cccd8717a707d1d6b7ec0312c0 11-Sep-2012 Jeff Brown <jeffbrown@google.com> am df00fc2d: am b019250d: Add a permission for controlling wifi display.

* commit 'df00fc2d9ac02cde6df75b76a93929396a1f696b':
Add a permission for controlling wifi display.
aba33d58ef6fe33210cc384b05cadf6ab8bac077 08-Sep-2012 Jeff Brown <jeffbrown@google.com> Add a permission for controlling wifi display.

Change-Id: I321b6c1a0223e0c3d5df04fde7a13ab91c08c7bc
ediaPlayerService.cpp
b019250df516e094b0cb648851f9a132b045378a 08-Sep-2012 Jeff Brown <jeffbrown@google.com> Add a permission for controlling wifi display.

Change-Id: I321b6c1a0223e0c3d5df04fde7a13ab91c08c7bc
ediaPlayerService.cpp
89710de8a149433f8258d779806c294b183edbe7 06-Sep-2012 John Grossman <johngro@google.com> am bdfb0207: am 2e5f22e8: Add a small hook to support gapless in AAH.

* commit 'bdfb020790f92a6ab055be9a5eda4646ed197ff3':
Add a small hook to support gapless in AAH.
2f8ecbd1d2fab208067d9fa025946e42cf16336e 06-Sep-2012 John Grossman <johngro@google.com> am bdfb0207: am 2e5f22e8: Add a small hook to support gapless in AAH.

* commit 'bdfb020790f92a6ab055be9a5eda4646ed197ff3':
Add a small hook to support gapless in AAH.
5f7e55ea443c80ef8b6173efd1c2551e07309b0a 24-Aug-2012 John Grossman <johngro@google.com> Add a small hook to support gapless in AAH.

Change-Id: Ie07eca6b45142bdd83412ee0e38d732a4c355630
ediaPlayerService.cpp
2e5f22e85d177b34e790f832789d03aee438a7db 24-Aug-2012 John Grossman <johngro@google.com> Add a small hook to support gapless in AAH.

Change-Id: Ie07eca6b45142bdd83412ee0e38d732a4c355630
ediaPlayerService.cpp
89592fc7216809d7a9ca34cc2ed25d95a20687c8 06-Sep-2012 Jeff Brown <jeffbrown@google.com> am 3e295bd2: am 49c74da1: Merge "Update remote display API." into jb-mr1-dev

* commit '3e295bd23c7dc4c94960f32465576cee62148d14':
Update remote display API.
b9c760d673dc3f3f3086a84f21d79949876c0345 06-Sep-2012 Jeff Brown <jeffbrown@google.com> am 3e295bd2: am 49c74da1: Merge "Update remote display API." into jb-mr1-dev

* commit '3e295bd23c7dc4c94960f32465576cee62148d14':
Update remote display API.
56cd317a35a18ba5c40b344f0a5bf436546246a1 06-Sep-2012 Jeff Brown <jeffbrown@google.com> Merge "Update remote display API." into jb-mr1-dev
49c74da132fe42dd4d2066131f8f0e2df301c1dd 06-Sep-2012 Jeff Brown <jeffbrown@google.com> Merge "Update remote display API." into jb-mr1-dev
d8b796c43dcdf4ece71352dcaa291114a15ad56e 06-Sep-2012 Marco Nelissen <marcone@google.com> am 2ae8964e: am 74262b57: Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-dev

* commit '2ae8964ecd5f2b9668425394bd651bf2e715b33e':
To support .mxmf which is specified in Android CDD.
61c50eba62b55b3c1df4feb9125a4dd89b8c3d31 06-Sep-2012 Marco Nelissen <marcone@google.com> am 2ae8964e: am 74262b57: Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-dev

* commit '2ae8964ecd5f2b9668425394bd651bf2e715b33e':
To support .mxmf which is specified in Android CDD.
19b247a8531b27cd32df84fc90f87a21e011d7a6 06-Sep-2012 Marco Nelissen <marcone@google.com> Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-dev
74262b573c3d87c323c41d364af12f206ae46642 06-Sep-2012 Marco Nelissen <marcone@google.com> Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-dev
ced24b36bbeed1ddd086a9304a9639c04ffe0962 06-Sep-2012 Jeff Brown <jeffbrown@google.com> Update remote display API.

Renamed disconnect() to dispose() to emphasize the fact that
this method is intended to clean up the IRemoteDisplay
completely, not just temporarily disconnect the current client
(which might be useful someday).

Other minor tweaks.

Change-Id: I1209639eb0cd8af09c724206642d7e52aab48257
ediaPlayerService.cpp
emoteDisplay.cpp
emoteDisplay.h
455d02eca342d8159637af317a5d83219d267812 06-Sep-2012 Jeff Brown <jeffbrown@google.com> Update remote display API.

Renamed disconnect() to dispose() to emphasize the fact that
this method is intended to clean up the IRemoteDisplay
completely, not just temporarily disconnect the current client
(which might be useful someday).

Other minor tweaks.

Change-Id: I1209639eb0cd8af09c724206642d7e52aab48257
ediaPlayerService.cpp
emoteDisplay.cpp
emoteDisplay.h
4f7cd0e6f26fba2a6303a66847fdfaa2bd72fe57 06-Sep-2012 Marco Nelissen <marcone@google.com> am dd1a87b3: am 9c6cb7a8: Merge "Fragmented mp4 extractor" into jb-mr1-dev

* commit 'dd1a87b391679eea06b819b50924fa822599a95e':
Fragmented mp4 extractor
3fd1ce46c2192f18e577d1693ce0eb19701564d1 06-Sep-2012 Marco Nelissen <marcone@google.com> am dd1a87b3: am 9c6cb7a8: Merge "Fragmented mp4 extractor" into jb-mr1-dev

* commit 'dd1a87b391679eea06b819b50924fa822599a95e':
Fragmented mp4 extractor
ccd07716d105125b2eb2f1280b8c3fe9f57e78f3 06-Sep-2012 Marco Nelissen <marcone@google.com> Merge "Fragmented mp4 extractor" into jb-mr1-dev
9c6cb7a896f41cb8ad2f2ad63f8f6edfbb56ed4f 06-Sep-2012 Marco Nelissen <marcone@google.com> Merge "Fragmented mp4 extractor" into jb-mr1-dev
1e9ee018c6fa906c99270616456c32f0bb30c9c0 29-Aug-2012 Marco Nelissen <marcone@google.com> Fragmented mp4 extractor

Still experimental. Set property "media.stagefright.use-fragmp4" to true to
enable.

Change-Id: I210b9c5b5164b5c5eefc31309845ee881ac7db8e
uplayer/mp4/MP4Source.cpp
56997121c5031598fbbba7b7c53980b7fd529c2d 29-Aug-2012 Marco Nelissen <marcone@google.com> Fragmented mp4 extractor

Still experimental. Set property "media.stagefright.use-fragmp4" to true to
enable.

Change-Id: I210b9c5b5164b5c5eefc31309845ee881ac7db8e
uplayer/mp4/MP4Source.cpp
e10a187c1dac8e8d282c93a7ce5a44e9e7f2b4fd 05-Sep-2012 Andreas Huber <andih@google.com> am aae9c084: am 0b73d473: Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.

* commit 'aae9c08476b44192fe3506ae26a8466da8b4251a':
Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.
058fed277451382b42740a28c2399b5de21a2df4 05-Sep-2012 Andreas Huber <andih@google.com> am aae9c084: am 0b73d473: Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.

* commit 'aae9c08476b44192fe3506ae26a8466da8b4251a':
Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.
22ffeeb3a4466fac728f755b26efd5b361418a49 05-Sep-2012 Jeff Brown <jeffbrown@google.com> am 5bf9a8eb: am e1045960: Implement remote display service stubs.

* commit '5bf9a8eb914723cbb5bf4d70b8b48c37a1b6e82a':
Implement remote display service stubs.
318c27c3757be112667c6434ea3e670e7c6d18a5 05-Sep-2012 Jeff Brown <jeffbrown@google.com> am 5bf9a8eb: am e1045960: Implement remote display service stubs.

* commit '5bf9a8eb914723cbb5bf4d70b8b48c37a1b6e82a':
Implement remote display service stubs.
28169b107327b5db58877babf6993f0eb109c58a 05-Sep-2012 Andreas Huber <andih@google.com> Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.

Change-Id: I7602cda0e38073c9f0e63fa4de238ca0d4b4ce8e
ediaPlayerService.cpp
emoteDisplay.cpp
emoteDisplay.h
0b73d4730202fcad53aefc4314a06e7b95f442f0 05-Sep-2012 Andreas Huber <andih@google.com> Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.

Change-Id: I7602cda0e38073c9f0e63fa4de238ca0d4b4ce8e
ediaPlayerService.cpp
emoteDisplay.cpp
emoteDisplay.h
2013a54981d4ffb036dff279b88cc9f08c0ee1c2 05-Sep-2012 Jeff Brown <jeffbrown@google.com> Implement remote display service stubs.

Change-Id: I582ed000026bba6d116db8304e15a3c52f8a9a01
ediaPlayerService.cpp
ediaPlayerService.h
e104596061b219e9bce6d4db49a9d15242f8d2e5 05-Sep-2012 Jeff Brown <jeffbrown@google.com> Implement remote display service stubs.

Change-Id: I582ed000026bba6d116db8304e15a3c52f8a9a01
ediaPlayerService.cpp
ediaPlayerService.h
a6932498a00735c4e438bb9c47478ff166e2d6fd 05-Sep-2012 Dongwon Kang <dwkang@google.com> To support .mxmf which is specified in Android CDD.

Bug: 7082658
Change-Id: I21269d72d1d21627c6adb2e6fbcb078d0eda6020
Tested: checked MediaScanner scans .mxmf and Music app plays .mxmf file.
ediaPlayerFactory.cpp
5c5f8d93667ec36fbcd01ecb113ccae78322c85b 05-Sep-2012 Dongwon Kang <dwkang@google.com> To support .mxmf which is specified in Android CDD.

Bug: 7082658
Change-Id: I21269d72d1d21627c6adb2e6fbcb078d0eda6020
Tested: checked MediaScanner scans .mxmf and Music app plays .mxmf file.
ediaPlayerFactory.cpp
d7a61ad1e9ad1e59b5ef5d8f6e37da400c01d01c 05-Sep-2012 James Dong <jdong@google.com> am 05e73de0: am 0d268a3c: Add setVideoScalingMode support to NuPlayer

* commit '05e73de0664765a144414e73d4fcf4e1caf3c0f3':
Add setVideoScalingMode support to NuPlayer
812ee4e0e4648e36e94e7c56b4ac87cbce5e148b 05-Sep-2012 James Dong <jdong@google.com> am 05e73de0: am 0d268a3c: Add setVideoScalingMode support to NuPlayer

* commit '05e73de0664765a144414e73d4fcf4e1caf3c0f3':
Add setVideoScalingMode support to NuPlayer
53a2d13945f9df97f608b669dbd27ce6a27b9de6 31-Aug-2012 James Dong <jdong@google.com> Add setVideoScalingMode support to NuPlayer

o related-to-bug: 7089195

Change-Id: Ic30d9312673f2d5837c779e023ac64468ecd4951
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
0d268a3cae145afb2720c88ae38fb81550be5584 31-Aug-2012 James Dong <jdong@google.com> Add setVideoScalingMode support to NuPlayer

o related-to-bug: 7089195

Change-Id: Ic30d9312673f2d5837c779e023ac64468ecd4951
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDriver.cpp
09359d4e7b9186eec9ce744257a8d1dcb6cbbf15 04-Sep-2012 Andreas Huber <andih@google.com> am eca95af8: am fbe9d81f: Support for acting as a wifi display sink.

* commit 'eca95af88949ec76533927f39118ac57f4f01911':
Support for acting as a wifi display sink.
ac6d49fa95f3d255b9ca611ec139dce3fef9d907 04-Sep-2012 Andreas Huber <andih@google.com> am eca95af8: am fbe9d81f: Support for acting as a wifi display sink.

* commit 'eca95af88949ec76533927f39118ac57f4f01911':
Support for acting as a wifi display sink.
8a61c22ecc2a38fffe978be210fe3f0a70efb71c 31-Aug-2012 Andreas Huber <andih@google.com> Support for acting as a wifi display sink.

Change-Id: I0beac87025b93c60164daa865c89f16b72197a47
uplayer/NuPlayer.cpp
fbe9d81ff5fbdc5aecdcdd13e4a5d7f019824f96 31-Aug-2012 Andreas Huber <andih@google.com> Support for acting as a wifi display sink.

Change-Id: I0beac87025b93c60164daa865c89f16b72197a47
uplayer/NuPlayer.cpp
23ed3d9cd183c845bed846ecf050aa8cbd6f4c0f 04-Sep-2012 Andreas Huber <andih@google.com> am 76fd1ea5: am 7323115c: Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-dev

* commit '76fd1ea58835094e84d36f2353d1390c24d14bfc':
Improvements to our MPEG2 Transport Stream parser
f5540a1218397e9cc5a381217ffbbc52332cf719 04-Sep-2012 Andreas Huber <andih@google.com> am 76fd1ea5: am 7323115c: Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-dev

* commit '76fd1ea58835094e84d36f2353d1390c24d14bfc':
Improvements to our MPEG2 Transport Stream parser
ebb5047fca788f89188158cc764fbb5ad2321f7a 04-Sep-2012 Andreas Huber <andih@google.com> Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-dev
7323115c6e55f2da73317d7ff6a69b808d74264e 04-Sep-2012 Andreas Huber <andih@google.com> Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-dev
31b7c57a37e1c682591764e04f964112da65c74b 31-Aug-2012 Marco Nelissen <marcone@google.com> am 4adf4c6c: am 31238033: Merge "Move fragmented mp4 parser to libstagefright" into jb-mr1-dev

* commit '4adf4c6cb90c2bdd2aa46179fd718cbc2f1dd067':
Move fragmented mp4 parser to libstagefright
85c4ee8533bcb172ad1805bf3daa9f9c95c831b3 31-Aug-2012 Marco Nelissen <marcone@google.com> am 4adf4c6c: am 31238033: Merge "Move fragmented mp4 parser to libstagefright" into jb-mr1-dev

* commit '4adf4c6cb90c2bdd2aa46179fd718cbc2f1dd067':
Move fragmented mp4 parser to libstagefright
d99d678228fee4baa74d1bae463a59cc0aa13cd5 31-Aug-2012 Marco Nelissen <marcone@google.com> Merge "Move fragmented mp4 parser to libstagefright" into jb-mr1-dev
312380331e28b7e5693a4b1646caf2d19aba1b2a 31-Aug-2012 Marco Nelissen <marcone@google.com> Merge "Move fragmented mp4 parser to libstagefright" into jb-mr1-dev
4ecce5026fe3235e783766dcb9fc2b59405da08f 31-Aug-2012 Marco Nelissen <marcone@google.com> Move fragmented mp4 parser to libstagefright

and rename it from Parser to FragmentedMP4Parser
Change-Id: I986f50d0c5c93648aac675d6160e18623b031541
uplayer/Android.mk
uplayer/mp4/MP4Source.cpp
uplayer/mp4/MP4Source.h
uplayer/mp4/Parser.cpp
uplayer/mp4/Parser.h
uplayer/mp4/TrackFragment.cpp
uplayer/mp4/TrackFragment.h
cb1f88c684140ce0eb407049a78f889bc7d51be1 31-Aug-2012 Marco Nelissen <marcone@google.com> Move fragmented mp4 parser to libstagefright

and rename it from Parser to FragmentedMP4Parser
Change-Id: I986f50d0c5c93648aac675d6160e18623b031541
uplayer/Android.mk
uplayer/mp4/MP4Source.cpp
uplayer/mp4/MP4Source.h
uplayer/mp4/Parser.cpp
uplayer/mp4/Parser.h
uplayer/mp4/TrackFragment.cpp
uplayer/mp4/TrackFragment.h
5205152968957c51b597ddeabe6a5e17b2a84e38 31-Aug-2012 Andreas Huber <andih@google.com> Improvements to our MPEG2 Transport Stream parser

Verifies the continuity counter
Parses and associates PCR time with streams
Allows for a absolute time anchor to be signalled via discontinuity.

Change-Id: I4bc88c78382c9cc6380f28df584cc6c254e0a8f9
uplayer/StreamingSource.cpp
87f2a558dd12043631e12c361abef301bf603140 31-Aug-2012 Andreas Huber <andih@google.com> Improvements to our MPEG2 Transport Stream parser

Verifies the continuity counter
Parses and associates PCR time with streams
Allows for a absolute time anchor to be signalled via discontinuity.

Change-Id: I4bc88c78382c9cc6380f28df584cc6c254e0a8f9
uplayer/StreamingSource.cpp
2444800d00366ce7a2bf69832d03314f6d817ff7 31-Aug-2012 Andreas Huber <andih@google.com> am 8d0189dc: am 61356671: Merge "Add support for mpeg2 transport streams to the RTSP implementation." into jb-mr1-dev

* commit '8d0189dc829dc87a74ff91eb0c067dc291ff59c3':
Add support for mpeg2 transport streams to the RTSP implementation.
9a13e30fc2c2ca2bdcecae6daf5daa0a6b4fec41 31-Aug-2012 Andreas Huber <andih@google.com> am 8d0189dc: am 61356671: Merge "Add support for mpeg2 transport streams to the RTSP implementation." into jb-mr1-dev

* commit '8d0189dc829dc87a74ff91eb0c067dc291ff59c3':
Add support for mpeg2 transport streams to the RTSP implementation.
49694688c82214f5fd9e969e177c9e126a240a26 31-Aug-2012 Andreas Huber <andih@google.com> Add support for mpeg2 transport streams to the RTSP implementation.

Change-Id: I409d7133a53a71e62523b1acc2b03302fcf824a5
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
cfaeeec0900014d97e15829e0fa52f865ee4c786 31-Aug-2012 Andreas Huber <andih@google.com> Add support for mpeg2 transport streams to the RTSP implementation.

Change-Id: I409d7133a53a71e62523b1acc2b03302fcf824a5
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
b26fdd2d8073b3758b68c04c28923071d58e564a 31-Aug-2012 Andreas Huber <andih@google.com> am 27a78751: am 5dcc2c98: Merge "Only run the wifi display RTSP server on demand, and only on the wifi direct" into jb-mr1-dev

* commit '27a787512ff3f9a7ba200bc53f8c688692995748':
Only run the wifi display RTSP server on demand, and only on the wifi direct
002febb34d186248e1a1b4a71fe454141c3f0dfe 31-Aug-2012 Andreas Huber <andih@google.com> am 27a78751: am 5dcc2c98: Merge "Only run the wifi display RTSP server on demand, and only on the wifi direct" into jb-mr1-dev

* commit '27a787512ff3f9a7ba200bc53f8c688692995748':
Only run the wifi display RTSP server on demand, and only on the wifi direct
ab1bd84889273bc21efdabe5ff6f4633eb918a85 30-Aug-2012 Andreas Huber <andih@google.com> Only run the wifi display RTSP server on demand, and only on the wifi direct

interface.

Change-Id: I7d3c44cb79cd40e73499f2d7ccf35c69b628e6d7
ediaPlayerService.cpp
ediaPlayerService.h
emoteDisplay.cpp
emoteDisplay.h
bcf09f8c995221e75c7cd328f25c7cc6d2b5f7c9 30-Aug-2012 Andreas Huber <andih@google.com> Only run the wifi display RTSP server on demand, and only on the wifi direct

interface.

Change-Id: I7d3c44cb79cd40e73499f2d7ccf35c69b628e6d7
ediaPlayerService.cpp
ediaPlayerService.h
emoteDisplay.cpp
emoteDisplay.h
2fee05b1f4b08e611d1441fa9f588e758d43d6f4 30-Aug-2012 Andreas Huber <andih@google.com> am 544b67a0: am d8ee4e56: Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev

* commit '544b67a04b4289aaafa852cbab54abf1f3d6a5bf':
Initial checkin of support for acting as a wifi display source
138dcf919303e0d47b2f5e5ce9e3e8b08eb83c42 30-Aug-2012 Andreas Huber <andih@google.com> am 544b67a0: am d8ee4e56: Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev

* commit '544b67a04b4289aaafa852cbab54abf1f3d6a5bf':
Initial checkin of support for acting as a wifi display source
a2c31a786cfea83f4028c4c5ae00386ae96542e9 30-Aug-2012 Andreas Huber <andih@google.com> Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev
d8ee4e56f92eeb44ddc0997efe280b9f28ad814d 30-Aug-2012 Andreas Huber <andih@google.com> Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev
35213f1420c669f43314cb75eadea450d21a75cb 29-Aug-2012 Andreas Huber <andih@google.com> Initial checkin of support for acting as a wifi display source

Change-Id: I08f17efa0c7d007e17408feb7d4fbef0a19f531a
ndroid.mk
ediaPlayerService.cpp
ediaPlayerService.h
emoteDisplay.cpp
emoteDisplay.h
d7bee3a9d2ad76d073d91f0ee36d5ac5f9df480c 29-Aug-2012 Andreas Huber <andih@google.com> Initial checkin of support for acting as a wifi display source

Change-Id: I08f17efa0c7d007e17408feb7d4fbef0a19f531a
ndroid.mk
ediaPlayerService.cpp
ediaPlayerService.h
emoteDisplay.cpp
emoteDisplay.h
5e3514e12cb94a2047cec1ea508383896787d4cf 29-Aug-2012 Andreas Huber <andih@google.com> am f4500233: am f147b722: Merge "Preliminary support for HDCP as a binder service for wifi display support." into jb-mr1-dev

* commit 'f45002335606a9edb181814fbdf8d0a4e1468a9d':
Preliminary support for HDCP as a binder service for wifi display support.
4872c0ab62561ac90bb7a47880e59b7f2e699a38 29-Aug-2012 Andreas Huber <andih@google.com> am f4500233: am f147b722: Merge "Preliminary support for HDCP as a binder service for wifi display support." into jb-mr1-dev

* commit 'f45002335606a9edb181814fbdf8d0a4e1468a9d':
Preliminary support for HDCP as a binder service for wifi display support.
9bd5a93ed8b4c4b3361c35dd1acdc3f1f49ede33 29-Aug-2012 Andreas Huber <andih@google.com> Preliminary support for HDCP as a binder service for wifi display support.

Change-Id: Ie0de1c086c629a668d1c7863992eef56fb94157c
DCP.cpp
DCP.h
1b19c9d120869c3182373a9b06a1ed98898df882 29-Aug-2012 Andreas Huber <andih@google.com> Preliminary support for HDCP as a binder service for wifi display support.

Change-Id: Ie0de1c086c629a668d1c7863992eef56fb94157c
DCP.cpp
DCP.h
fa5f8f5a98d389c7581ac7236a9b5aa60a4f9694 27-Aug-2012 James Dong <jdong@google.com> am 6d000617: am db7e3856: Merge "Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method" into jb-mr1-dev

* commit '6d000617230e82b9497a88ca0f485e0c16ba4543':
Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method
b8a9825bf0f5c74333b0e4ff5ba7677ac6fd2a25 27-Aug-2012 James Dong <jdong@google.com> Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method

o The mClient could be disconnected before the notify message is sent out. Use
a local reference could help resolve this issue.

o related-to-bug: 6782035

Change-Id: Ia2047bd7f2666100fed83c6e5417a3bf2e20cd2c
ediaPlayerService.cpp
f6520a29781ebf1fa16efc282899fbd0c858a57e 24-Aug-2012 John Grossman <johngro@google.com> am e171593f: am 6de95261: Merge "Add a missing NULL check." into jb-mr1-dev

* commit 'e171593f9afb2b345257cc8e6599f8da9b3437c3':
Add a missing NULL check.
cb0b755efc2cd24703f400729994900bf2117f66 24-Aug-2012 John Grossman <johngro@google.com> Add a missing NULL check.

Don't crash if its time to start the next media player in a media
player chain, but the current player's client has a NULL mAudioOutput,
as is the case when the low level player implements
MediaPlayerHWInterface.

Change-Id: If555da3a46960cbee91ff26e5b1fd05e52c8ef28
ediaPlayerService.cpp
bf4c5d9f3bdb6fd3889afdeb0312d54f6f2e8de3 13-Aug-2012 Andreas Huber <andih@google.com> am 1f3d61f9: am bd828233: Use the correct data offset by remembering the offset of the enclosing \'moof\'

* commit '1f3d61f99c5cbe65a2cd32985445fc9ffa12adca':
Use the correct data offset by remembering the offset of the enclosing 'moof'
bd828233d3eda966bf7145108dde74616abd97fb 13-Aug-2012 Andreas Huber <andih@google.com> Use the correct data offset by remembering the offset of the enclosing 'moof'

container.

Change-Id: I2f0f92dabe31341a6a91d435943e4a65e34884ba
uplayer/mp4/Parser.cpp
uplayer/mp4/Parser.h
4fc9d476db8ba59053deac76dce9f403c34a0f2d 13-Aug-2012 John Grossman <johngro@google.com> am 73247cac: am d58a68a4: Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-dev

* commit '73247cac58b0c295e02b2350722699689ac45189':
Move the AAH RTP code out of framework and into vendor.
Add the ability to dynamicaly register MediaPlayer types.
518cdbe52b60af91a2bd2d3ce2d29feac884ae02 13-Aug-2012 Andreas Huber <andih@google.com> am 6f1ecc98: am 75767ab7: Merge "Signal end of stream if no more fragments are going to be available." into jb-mr1-dev

* commit '6f1ecc9815b8b02c407254de0fb9dbbb575c6fc1':
Signal end of stream if no more fragments are going to be available.
d58a68a4d6915d43d8b9d02ebfe04be62efe2eb1 13-Aug-2012 John Grossman <johngro@google.com> Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-dev

* changes:
Move the AAH RTP code out of framework and into vendor.
Add the ability to dynamicaly register MediaPlayer types.
8ec1f2a4f3c72fe7472f8b8fa227f6b7bbc9279b 06-Aug-2012 John Grossman <johngro@google.com> Move the AAH RTP code out of framework and into vendor.

Relocate the AAH RTP code from framework/av into
vendor/google_devices/phantasm. This change is the deletion, there
will be a separate CL which re-introduces on the vendor side of
things.

Change-Id: Ibe7e6d4b633a3886b87a615691a2692f2382af6c
Signed-off-by: John Grossman <johngro@google.com>
ndroid.mk
ediaPlayerFactory.cpp
44a7e42f0310831e6a846d1b6bb40bf3a399bf6d 22-Jun-2012 John Grossman <johngro@google.com> Add the ability to dynamicaly register MediaPlayer types.

Add the ability to dynamically register low level MediaPlayer
factories which will be probed at setDataSource time to determine the
proper MediaPlayerBase to instantiate.

This change is in preparation for moving libaah_rtp out of
frameworks/base and into phantasm platform directory.

Change-Id: Icf8904db3ab9e3c85df6e780d5546d9988cb9076
Signed-off-by: John Grossman <johngro@google.com>
ndroid.mk
ediaPlayerFactory.cpp
ediaPlayerFactory.h
ediaPlayerService.cpp
ediaPlayerService.h
etadataRetrieverClient.cpp
c7708555ea7511aea684e00a55fb5309281540ce 10-Aug-2012 Andreas Huber <andih@google.com> Signal end of stream if no more fragments are going to be available.

Change-Id: I16696740d3551aa8a5ba904ec757c64b0ecd1307
uplayer/mp4/Parser.cpp
uplayer/mp4/Parser.h
7a06b60f697ba0729ad3a2230529a7b493b9cfb4 09-Aug-2012 Andreas Huber <andih@google.com> am 8f8bffd6: am faa88edb: Merge "Fix static sample table processing, add support for h.263 video." into jb-mr1-dev

* commit '8f8bffd61352915af9d7af6d0279ada039a58d7e':
Fix static sample table processing, add support for h.263 video.
b9787142c5f5f8f47e7e35409f4f2ef7112ab72e 09-Aug-2012 Andreas Huber <andih@google.com> Fix static sample table processing, add support for h.263 video.

Change-Id: I5628d3437b5e6f8836d78557fd07ab87e5a914e3
uplayer/mp4/Parser.cpp
uplayer/mp4/TrackFragment.cpp
uplayer/mp4/TrackFragment.h
1c84cb0bd8bc404afd35618a1c34200abce6aa8e 08-Aug-2012 Marco Nelissen <marcone@google.com> am ef8532b0: am e2229fba: Merge "Handle empty stsc box" into jb-mr1-dev

* commit 'ef8532b0ae4a34f02f824ba0c0f3e8d4db2067e1':
Handle empty stsc box
b7e75cfd64893dde230dfc1c3b281a00ca1b4470 08-Aug-2012 Marco Nelissen <marcone@google.com> Handle empty stsc box

Change-Id: I867e2499fac3045075654aaaecf44327753327fd
uplayer/mp4/TrackFragment.cpp
1ebccf52559ee7249bfe25c1a7c0232f8bc8060f 03-Aug-2012 Marco Nelissen <marcone@google.com> am c9b125a1: am a3b71fa5: Merge "experimental support for fragmented mp4 playback in nuplayer" into jb-mr1-dev

* commit 'c9b125a1be3d1edcb8b7f050334ef3d3a980d3d1':
experimental support for fragmented mp4 playback in nuplayer
840667883fd09d44015716d79bc3ac4d60edc0f0 16-Aug-2011 Andreas Huber <andih@google.com> experimental support for fragmented mp4 playback in nuplayer

cherry picked from change 170999

Change-Id: I407775f0290154ad4961134839a15c9f296424c0
uplayer/Android.mk
uplayer/GenericSource.cpp
uplayer/GenericSource.h
uplayer/HTTPLiveSource.cpp
uplayer/HTTPLiveSource.h
uplayer/NuPlayer.cpp
uplayer/NuPlayer.h
uplayer/NuPlayerDecoder.cpp
uplayer/NuPlayerDecoder.h
uplayer/NuPlayerSource.h
uplayer/RTSPSource.cpp
uplayer/RTSPSource.h
uplayer/StreamingSource.cpp
uplayer/StreamingSource.h
uplayer/mp4/MP4Source.cpp
uplayer/mp4/MP4Source.h
uplayer/mp4/Parser.cpp
uplayer/mp4/Parser.h
uplayer/mp4/TrackFragment.cpp
uplayer/mp4/TrackFragment.h
27b6d228301ba750dd9b3730d1127e4f0ae2209a 21-Jul-2012 James Dong <jdong@google.com> Removed a CHECK_EQ that is not needed.

'what' was just compared against Renderer::kWhatFlushComplete before entering the
if block.

Change-Id: I72c5c156f814621a24439d89e150c4e0d90edcbb
uplayer/NuPlayer.cpp
9fbe94294ce2053d102ff5de89846a0c5015fb58 30-Jul-2012 Ed Heyl <ed@google.com> Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev

Conflicts:
services/audioflinger/AudioFlinger.cpp

Change-Id: If27e4ff35de1e182394cc149e1557a49f0f7c95b
5d246efa220a7c7b22e490576c488b3853c664dd 09-Jul-2012 Haynes Mathew George <hgeorge@codeaurora.org> NuPlayer: Prevents creation of Video Decoder when we use Music Player

- Prevents instantion of Video Decoder when we use applications like
Music Player which do not support Video Playback
- Adds a check to prevent scanning for sources when it is either an
Audio only clip or a video only clip or an AV clip played with a
Music Player.

Change-Id: I74dd9bc53e54fd4f3682536c987289ac252690b0
Signed-off-by: Arvind Thatikonda <arvindt@codeaurora.org>
uplayer/NuPlayer.cpp
bf5bea96f236adb5eef78c2f414ef82b3602a0f7 19-Jul-2012 Eino-Ville Talvala <etalvala@google.com> Codecs: Add MetaDataMode support to software video encoders.

This support is needed to enable efficient video recording with
emulator and camera HAL 2.

- Update SoftAVCEncoder and SoftMPEG4Encoder to support MetaDataMode
extension.
- Allow CameraSource to handle opaque pixel formats, so that
MetaDataMode can be used.
- Remove hardware codec restriction for MetaDataMode

Bug: 6243944
Change-Id: I970eb3d55542a413b6d75a78f76d3a8583155601
tagefrightRecorder.cpp
f57b4ea3e409537b1d5f9aaea93d356b1cebbc6a 20-Jul-2012 James Dong <jdong@google.com> Added a callback in nuplayer via informational event to signal the start of video rendering

Change-Id: Id7b9b82d4e5467ad8701bfbad4dcc5070f3703cf
uplayer/NuPlayer.cpp
uplayer/NuPlayerRenderer.cpp
uplayer/NuPlayerRenderer.h
b46ccde3610d3f1713f7ebf0e9ffe943e44b54d2 18-Jul-2012 Edwin Wong <edwinwong@google.com> Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE

jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36

Change-Id: I4f08b9c8e9682a998db01c509a390e51bae60c2d
related-to-bug: 6732061
rypto.cpp
rypto.h
fa2b8f243eb048fb2b8e5a14356190f69eb31a36 11-Jul-2012 Edwin Wong <edwinwong@google.com> Fixed sample video corrupted in MediaCodec mode.

Change-Id: I50c5660072d40f6e297e58fd026ea04c89d6a70a
related-to-bug: 6732061
rypto.cpp
rypto.h
3d51d5cb53cc630709a0ba78d0e60501a675f2d5 13-Jun-2012 James Dong <jdong@google.com> Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/

Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26
related-to-bug: 6647465
ODULE_LICENSE_APACHE2
OTICE
uplayer/MODULE_LICENSE_APACHE2
uplayer/NOTICE
d791e094da5698c787f8db28ca5d5d490c512cf1 12-Jun-2012 Marco Nelissen <marcone@google.com> Fix gapless for deep buffers

Forward current flags to next output.
b/6645676

Change-Id: I584f7a67472d99cbd6bc38f3fe84763331d115d1
ediaPlayerService.cpp
67295b543c16ed7c77b67f859d598fe7b4571660 11-Jun-2012 Marco Nelissen <marcone@google.com> Fix gapless playback

On some devices the actual framecount per buffer of an AudioTrack
will be different than what was requested, which prevented the
track from being reused. Now we create a new AudioTrack with the
requested parameters, and then compare it to the track we already
have. If they match, we throw away the new track and reuse the
existing one.
b/6644559

Change-Id: Id3e8c4460436f52e59b98ecaeb01c94f02877c1d
ediaPlayerService.cpp
c9d1696d214d2175327067ccc1991bcb36976404 21-May-2012 Andreas Huber <andih@google.com> For an RTSP live stream we won't map rtp time to normal play time,

since we don't have the information necessary.

Change-Id: I3119fcc061c4b6756a69c6139ffdf013d806fee1
related-to-bug: 6528548
uplayer/RTSPSource.cpp
bfd4d0d9fe0033abf3f55b94f30f6a58846a875e 17-May-2012 Andreas Huber <andih@google.com> Buffer at least 2 secs worth of data at startup of after a seek before

resuming starting RTSP pla