OSDN Git Service

android-x86/frameworks-av.git
10 years agoam 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists...
Adam Lesinski [Mon, 9 Jun 2014 21:12:44 +0000 (21:12 +0000)]
am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev

* commit '940f8be3619cecda66dad33f995904795df88c2d':
  Implement a NoOp DrmManagerClientImpl when no DRM service exists

10 years agoMerge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp...
Adam Lesinski [Fri, 6 Jun 2014 21:13:00 +0000 (21:13 +0000)]
Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev

10 years agoImplement a NoOp DrmManagerClientImpl when no DRM service exists
Adam Lesinski [Wed, 4 Jun 2014 22:14:03 +0000 (15:14 -0700)]
Implement a NoOp DrmManagerClientImpl when no DRM service exists

Change-Id: Ib06f429102a51c540c8132f3397130328279e03a

10 years agoam 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
Lajos Molnar [Thu, 5 Jun 2014 14:39:59 +0000 (14:39 +0000)]
am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor

* commit '17a6dd60f5f8a28af1db451bcbf44805648c844a':
  DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor

10 years agoam 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"
Narayan Kamath [Tue, 3 Jun 2014 08:56:40 +0000 (08:56 +0000)]
am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"

* commit '05eaf105a2a1445c2c13801ee4533ded47f1df1b':
  Mp3decoder: Remove unused arm assembly files

10 years agoMerge "Mp3decoder: Remove unused arm assembly files"
Narayan Kamath [Tue, 3 Jun 2014 08:35:10 +0000 (08:35 +0000)]
Merge "Mp3decoder: Remove unused arm assembly files"

10 years agoam 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 21:51:00 +0000 (21:51 +0000)]
am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"

* commit '6ed77c130d80fe607ec91ada4cf5718d512b4ad5':
  libcpustats: Turn on -Werror

10 years agoam 2d0e8d8f: Merge "libcpustats: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 21:47:19 +0000 (21:47 +0000)]
am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"

* commit '2d0e8d8f75369b491362f2ea3a6efd5159df404c':
  libcpustats: Turn on -Werror

10 years agoMerge "libcpustats: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 21:42:54 +0000 (21:42 +0000)]
Merge "libcpustats: Turn on -Werror"

10 years agolibcpustats: Turn on -Werror
Mark Salyzyn [Fri, 30 May 2014 20:30:18 +0000 (13:30 -0700)]
libcpustats: Turn on -Werror

- Switch to static_assert from deprecated utils/Debug.h
- Turn on C++11 standard
- Turn on -Werror

Change-Id: I4f1c08bbcaf1ad3a97502cde756a2f42bcece789

10 years agoDO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
Lajos Molnar [Thu, 29 May 2014 14:34:59 +0000 (07:34 -0700)]
DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor

Bug: 15320804
Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e

10 years agoam 215f7b91: am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 23:13:25 +0000 (23:13 +0000)]
am 215f7b91: am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit '215f7b91ed831e6d37909ead1119dcde13d50895':
  Move to dalvik.vm.lib.2 to force default to libart

10 years agoam df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 22:31:41 +0000 (22:31 +0000)]
am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit 'df9b1ff3726e263c8533add096435520ca4b7d61':
  Move to dalvik.vm.lib.2 to force default to libart

10 years agoMerge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 22:28:37 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"

10 years agoMove to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart

Bug: 14298175

(cherry picked from commit 483f59ab9fb4b2d8ab212f77a50eed0528beca58)

Change-Id: I387af6e4721840f98063f26854c02e6da26b9974

10 years agoMp3decoder: Remove unused arm assembly files
Ashok Bhat [Fri, 23 May 2014 09:54:24 +0000 (10:54 +0100)]
Mp3decoder: Remove unused arm assembly files

The unused ARM assembly files were written for
legacy proprietary ARM compilers. They are not
needed when gcc or clang compiler is used.

Change-Id: I8dfe9ad458efbb34922094e943ad334cc34f59a3
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
10 years agoam 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."
Elliott Hughes [Thu, 22 May 2014 22:50:51 +0000 (22:50 +0000)]
am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."

* commit '5b756bfdaa27c8b606720544bf507213cf47376d':
  Move frameworks/av off <sys/atomics.h>.

10 years agoam 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."
Elliott Hughes [Thu, 22 May 2014 22:42:46 +0000 (22:42 +0000)]
am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."

* commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0':
  Move frameworks/av off <sys/atomics.h>.

10 years agoMerge "Move frameworks/av off <sys/atomics.h>."
Elliott Hughes [Thu, 22 May 2014 21:30:25 +0000 (21:30 +0000)]
Merge "Move frameworks/av off <sys/atomics.h>."

10 years agoMove frameworks/av off <sys/atomics.h>.
Elliott Hughes [Thu, 22 May 2014 21:20:39 +0000 (14:20 -0700)]
Move frameworks/av off <sys/atomics.h>.

Bug: 14903517
Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb

10 years agoam c10b874c: am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."
Calin Juravle [Thu, 22 May 2014 13:44:20 +0000 (13:44 +0000)]
am c10b874c: am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."

* commit 'c10b874c4d0d6208fb93a7aa0dc8af4418faad45':
  Move frameworks/av from fdprintf to POSIX dprintf.

10 years agoam d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."
Calin Juravle [Thu, 22 May 2014 13:40:35 +0000 (13:40 +0000)]
am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."

* commit 'd551633916d3677da4dda10aba6837bdc6803ee0':
  Move frameworks/av from fdprintf to POSIX dprintf.

10 years agoMerge "Move frameworks/av from fdprintf to POSIX dprintf."
Calin Juravle [Thu, 22 May 2014 13:36:22 +0000 (13:36 +0000)]
Merge "Move frameworks/av from fdprintf to POSIX dprintf."

10 years agoMove frameworks/av from fdprintf to POSIX dprintf.
Elliott Hughes [Thu, 22 May 2014 08:22:06 +0000 (01:22 -0700)]
Move frameworks/av from fdprintf to POSIX dprintf.

Bug: 11156955
Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb

10 years agoam 9a59d411: am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."
Elliott Hughes [Thu, 22 May 2014 01:53:48 +0000 (01:53 +0000)]
am 9a59d411: am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."

* commit '9a59d411cbe68d6027c541854c6d7c1348e4ee3d':
  Restore accidentally-removed NULL timeout.

10 years agoam 85e6e87c: Merge "Restore accidentally-removed NULL timeout."
Elliott Hughes [Thu, 22 May 2014 01:49:44 +0000 (01:49 +0000)]
am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."

* commit '85e6e87c41bba51729cee8958a5c30157c8dc674':
  Restore accidentally-removed NULL timeout.

10 years agoMerge "Restore accidentally-removed NULL timeout."
Elliott Hughes [Thu, 22 May 2014 01:45:47 +0000 (01:45 +0000)]
Merge "Restore accidentally-removed NULL timeout."

10 years agoRestore accidentally-removed NULL timeout.
Elliott Hughes [Thu, 22 May 2014 01:44:27 +0000 (18:44 -0700)]
Restore accidentally-removed NULL timeout.

Change-Id: I933c80fea50950243f109acf8d6350013aaa811f

10 years agoam ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."
Elliott Hughes [Thu, 22 May 2014 01:32:20 +0000 (01:32 +0000)]
am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."

* commit 'ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e':
  Move frameworks/av off private API.

10 years agoam 3b6da6bf: Merge "Move frameworks/av off private API."
Elliott Hughes [Thu, 22 May 2014 01:28:18 +0000 (01:28 +0000)]
am 3b6da6bf: Merge "Move frameworks/av off private API."

* commit '3b6da6bfb50a1c0324fb4c87326d3a477944d5fe':
  Move frameworks/av off private API.

10 years agoMerge "Move frameworks/av off private API."
Elliott Hughes [Thu, 22 May 2014 01:23:41 +0000 (01:23 +0000)]
Merge "Move frameworks/av off private API."

10 years agoMove frameworks/av off private API.
Elliott Hughes [Thu, 22 May 2014 00:55:51 +0000 (17:55 -0700)]
Move frameworks/av off private API.

Bug: 11156955
Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea

10 years agoam acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3."
Elliott Hughes [Thu, 22 May 2014 00:41:52 +0000 (00:41 +0000)]
am acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3."

* commit 'acbd9492996348bf4565fbaa5a14772f0f4ace38':
  Move frameworks/av off __futex_syscall3.

10 years agoam d084206d: Merge "Move frameworks/av off __futex_syscall3."
Elliott Hughes [Thu, 22 May 2014 00:39:10 +0000 (00:39 +0000)]
am d084206d: Merge "Move frameworks/av off __futex_syscall3."

* commit 'd084206d5a4a5364211af46e4201311933e83bfc':
  Move frameworks/av off __futex_syscall3.

10 years agoMerge "Move frameworks/av off __futex_syscall3."
Elliott Hughes [Thu, 22 May 2014 00:35:48 +0000 (00:35 +0000)]
Merge "Move frameworks/av off __futex_syscall3."

10 years agoMove frameworks/av off __futex_syscall3.
Elliott Hughes [Thu, 22 May 2014 00:31:18 +0000 (17:31 -0700)]
Move frameworks/av off __futex_syscall3.

Bug: 11156955
Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512

10 years agoam 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread...
Eric Laurent [Mon, 19 May 2014 15:32:11 +0000 (15:32 +0000)]
am 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"

* commit '4c9bde7a3e636d3ecccd7905d142dbbb80e977a0':
  Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode

10 years agoam ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when...
Eric Laurent [Mon, 19 May 2014 15:28:51 +0000 (15:28 +0000)]
am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"

* commit 'ce473c32705e2d1c5fcc817198101e1220b3c8f7':
  Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode

10 years agoMerge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL...
Eric Laurent [Mon, 19 May 2014 15:26:37 +0000 (15:26 +0000)]
Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"

10 years agoam 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibal...
Andreas Huber [Fri, 16 May 2014 15:18:01 +0000 (15:18 +0000)]
am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"

* commit '1b8b8793c0e86865df456c3d26f969b1498041db':
  libstagefright foundation: fix uninitialized varibale warning

10 years agoam 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"
Andreas Huber [Fri, 16 May 2014 15:14:38 +0000 (15:14 +0000)]
am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"

* commit '3059e27d0e18a427f3c19889aac86ea31ec0d5d1':
  libstagefright foundation: fix uninitialized varibale warning

10 years agoMerge "libstagefright foundation: fix uninitialized varibale warning"
Andreas Huber [Fri, 16 May 2014 15:11:28 +0000 (15:11 +0000)]
Merge "libstagefright foundation: fix uninitialized varibale warning"

10 years agolibstagefright foundation: fix uninitialized varibale warning
Amit Pundir [Thu, 15 May 2014 07:12:04 +0000 (12:42 +0530)]
libstagefright foundation: fix uninitialized varibale warning

gcc-4.9 reports warning for this uninitialized variable
and -Werror make this warning fatal.

Change-Id: I6901362246d53deeded78fa38ad656b167705346
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
10 years agoam e32106fd: screenrecord: Add raw frames output format
Benoit Goby [Wed, 14 May 2014 22:04:12 +0000 (22:04 +0000)]
am e32106fd: screenrecord: Add raw frames output format

* commit 'e32106fd5175afdf939ae397aece9caf378a4912':
  screenrecord: Add raw frames output format

10 years agoCodec Offload: Add NULL check as mCallbackThread is NULL
Uday Gupta [Tue, 13 May 2014 18:19:17 +0000 (11:19 -0700)]
Codec Offload: Add NULL check as mCallbackThread is NULL
when offloaded HAL is running BLOCKING mode

b/14897952

Change-Id: I159a33e1181c1a62d80ab4bd3337a35dafaad884
Signed-off-by: Uday Gupta <guptau@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
10 years agoscreenrecord: Add raw frames output format
Benoit Goby [Mon, 12 May 2014 22:59:50 +0000 (15:59 -0700)]
screenrecord: Add raw frames output format

This works like the frames output format but without a header so that
the output can be piped directly to mplayer:

adb shell screenrecord --output-format=raw-frames - | mplayer -demuxer
rawvideo -rawvideo w=320:h=240:format=rgb24 -

Change-Id: Ib5ed508fdca3a5d63e973c5189b3677c2d92b43f

10 years agoam 21bde57f: Add frame dump output
Andy McFadden [Mon, 12 May 2014 23:18:30 +0000 (23:18 +0000)]
am 21bde57f: Add frame dump output

* commit '21bde57f0099fed5cca78d9357571dc015a63227':
  Add frame dump output

10 years agoam 2d11a203: Provide raw H.264 output from screenrecord
Andy McFadden [Mon, 12 May 2014 23:18:29 +0000 (23:18 +0000)]
am 2d11a203: Provide raw H.264 output from screenrecord

* commit '2d11a2031b99db9b503a7ad7efd1f18606af4012':
  Provide raw H.264 output from screenrecord

10 years agoAdd frame dump output
Andy McFadden [Wed, 26 Feb 2014 02:29:06 +0000 (18:29 -0800)]
Add frame dump output

This adds the ability to dump frames as RGB data with a minimal
frame header.  Only recommended for devices with small displays.
Enable with "--output-format=frames".

The "--raw" option is now selected with "--output-format=h264".

Change-Id: I18d3d4a87cd056d7acf0658985a90dc5895dbfb6

10 years agoProvide raw H.264 output from screenrecord
Andy McFadden [Fri, 20 Dec 2013 21:40:34 +0000 (13:40 -0800)]
Provide raw H.264 output from screenrecord

This adds an experimental (undocumented) "--raw" flag.  If set, we
output an H.264 byte stream rather than a .mp4 file.

If the filename is "-", we send the output to stdout.  If stdout is a
tty, we reconfigure it to avoid CRLF line termination over adb.

Change-Id: I5193f6193c9c1a59f92eefad0ed399f24afbf6de

10 years agoam c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before reading it"
Eino-Ville Talvala [Mon, 12 May 2014 17:36:42 +0000 (17:36 +0000)]
am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before reading it"

* commit 'c36fbcdf37ec02314e7b8134bb0de5f624fa70fd':
  camera: check Intent entry count before reading it

10 years agoam f02f06c4: Merge "camera: check Intent entry count before reading it"
Eino-Ville Talvala [Mon, 12 May 2014 17:31:29 +0000 (17:31 +0000)]
am f02f06c4: Merge "camera: check Intent entry count before reading it"

* commit 'f02f06c422a58ddaca49d14f21a196eaa435d07b':
  camera: check Intent entry count before reading it

10 years agoMerge "camera: check Intent entry count before reading it"
Eino-Ville Talvala [Mon, 12 May 2014 17:27:54 +0000 (17:27 +0000)]
Merge "camera: check Intent entry count before reading it"

10 years agocamera: check Intent entry count before reading it
Yuvraj Pasi [Tue, 15 Apr 2014 13:33:26 +0000 (19:03 +0530)]
camera: check Intent entry count before reading it

In case when find() returns empty entry, blindly
reading the entry will cause segfault

Change-Id: Ib5be7fd855c409ba3b45f0d43e15237367172817

10 years agoam 02483465: am 1d2909b3: Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Thu, 8 May 2014 08:55:36 +0000 (08:55 +0000)]
am 02483465: am 1d2909b3: Merge "Remove unused LOCAL_LDLIBS."

* commit '02483465e294571a6a92fce4f38c933e77bf5e67':
  Remove unused LOCAL_LDLIBS.

10 years agoam 1d2909b3: Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Thu, 8 May 2014 07:27:53 +0000 (07:27 +0000)]
am 1d2909b3: Merge "Remove unused LOCAL_LDLIBS."

* commit '1d2909b38f76d9d866e61cf505b88518d3a52acf':
  Remove unused LOCAL_LDLIBS.

10 years agoMerge "Remove unused LOCAL_LDLIBS."
Ying Wang [Thu, 8 May 2014 07:25:00 +0000 (07:25 +0000)]
Merge "Remove unused LOCAL_LDLIBS."

10 years agoRemove unused LOCAL_LDLIBS.
Ying Wang [Thu, 8 May 2014 07:23:11 +0000 (00:23 -0700)]
Remove unused LOCAL_LDLIBS.

Change-Id: I14865bee99fbcc5188b64fbd22bb49a1947ec6ff

10 years agoam f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCom...
Eric Laurent [Tue, 6 May 2014 15:30:49 +0000 (15:30 +0000)]
am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()"

* commit 'f655acf15e587dbf5d7120e9f2bf4b5bcb89941c':
  Fix memory leak when filtering commands in insertCommand_l()

10 years agoam 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()"
Eric Laurent [Tue, 6 May 2014 15:28:39 +0000 (15:28 +0000)]
am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()"

* commit '8fb04d474ed9e0d1302ae223ee76fafbe5fb41a3':
  Fix memory leak when filtering commands in insertCommand_l()

10 years agoMerge "Fix memory leak when filtering commands in insertCommand_l()"
Eric Laurent [Tue, 6 May 2014 15:25:45 +0000 (15:25 +0000)]
Merge "Fix memory leak when filtering commands in insertCommand_l()"

10 years agoam bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"
Lajos Molnar [Fri, 2 May 2014 18:04:22 +0000 (18:04 +0000)]
am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"

* commit 'bc4bf532b7581ecb1c8734a63742183c3ecb02c5':
  AwesomePlayer: use PTS for queueBuffer

10 years agoam b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"
Lajos Molnar [Fri, 2 May 2014 18:01:21 +0000 (18:01 +0000)]
am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"

* commit 'b231408849158baea8dddc0edf7e97fcfc2e3240':
  AwesomePlayer: use PTS for queueBuffer

10 years agoam 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"
Lajos Molnar [Fri, 2 May 2014 18:00:44 +0000 (18:00 +0000)]
am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"

* commit '5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5':
  Smooth out AwesomePlayer

10 years agoam b52675e9: Merge "Smooth out AwesomePlayer"
Lajos Molnar [Fri, 2 May 2014 17:57:56 +0000 (17:57 +0000)]
am b52675e9: Merge "Smooth out AwesomePlayer"

* commit 'b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb':
  Smooth out AwesomePlayer

10 years agoMerge "AwesomePlayer: use PTS for queueBuffer"
Lajos Molnar [Fri, 2 May 2014 17:56:37 +0000 (17:56 +0000)]
Merge "AwesomePlayer: use PTS for queueBuffer"

10 years agoMerge "Smooth out AwesomePlayer"
Lajos Molnar [Fri, 2 May 2014 17:53:58 +0000 (17:53 +0000)]
Merge "Smooth out AwesomePlayer"

10 years agoam 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video event...
Lajos Molnar [Fri, 2 May 2014 17:18:02 +0000 (17:18 +0000)]
am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"

* commit '6e76fda36a87e154397de816fa091b721a4c11bd':
  AwesomePlayer: improve scheduling of video event to hit PTS

10 years agoam 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLine...
Lajos Molnar [Fri, 2 May 2014 17:18:01 +0000 (17:18 +0000)]
am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"

* commit '075c8f6e174e824b6bc95809cc25f1430e9d4e62':
  stagefright: add ClockEstimator API and WindowedLinearFitEstimator

10 years agoam f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"
Lajos Molnar [Fri, 2 May 2014 17:14:18 +0000 (17:14 +0000)]
am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"

* commit 'f9782266802b02fc06a9c532f40128496aefb3e0':
  AwesomePlayer: improve scheduling of video event to hit PTS

10 years agoam a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
Lajos Molnar [Fri, 2 May 2014 17:14:17 +0000 (17:14 +0000)]
am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"

* commit 'a69d6f529239950a8bdf5e4253ea13bb029375cb':
  stagefright: add ClockEstimator API and WindowedLinearFitEstimator

10 years agoMerge "AwesomePlayer: improve scheduling of video event to hit PTS"
Lajos Molnar [Fri, 2 May 2014 17:11:14 +0000 (17:11 +0000)]
Merge "AwesomePlayer: improve scheduling of video event to hit PTS"

10 years agoMerge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
Lajos Molnar [Fri, 2 May 2014 17:10:57 +0000 (17:10 +0000)]
Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"

10 years agoam e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bits uncond...
Glenn Kasten [Fri, 2 May 2014 14:51:37 +0000 (14:51 +0000)]
am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally"

* commit 'e580aa4a756d1825c440a4b4309022b1babb6de1':
  When passing a size_t via binder, use 64-bits unconditionally

10 years agoam 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally"
Glenn Kasten [Fri, 2 May 2014 14:48:27 +0000 (14:48 +0000)]
am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally"

* commit '86438382a381eb39ed8da53fbd16cf6730fded6c':
  When passing a size_t via binder, use 64-bits unconditionally

10 years agoMerge "When passing a size_t via binder, use 64-bits unconditionally"
Glenn Kasten [Fri, 2 May 2014 14:45:29 +0000 (14:45 +0000)]
Merge "When passing a size_t via binder, use 64-bits unconditionally"

10 years agoAwesomePlayer: use PTS for queueBuffer
Lajos Molnar [Wed, 30 Apr 2014 17:19:40 +0000 (10:19 -0700)]
AwesomePlayer: use PTS for queueBuffer

Change-Id: I1c14ad4784c799c46cf06a14b0f00c5e4d01f718

10 years agoSmooth out AwesomePlayer
Lajos Molnar [Wed, 30 Apr 2014 18:10:44 +0000 (11:10 -0700)]
Smooth out AwesomePlayer

Use clock estimator to smooth out audio time stamps.

Change-Id: Iec1ff30c011069d06ff8051fc4839d00895463d6

10 years agoAwesomePlayer: improve scheduling of video event to hit PTS
Lajos Molnar [Wed, 30 Apr 2014 18:10:00 +0000 (11:10 -0700)]
AwesomePlayer: improve scheduling of video event to hit PTS

Change-Id: I7b19911acbde9b592b757b952d4ad63cd8efebed

10 years agostagefright: add ClockEstimator API and WindowedLinearFitEstimator
Lajos Molnar [Tue, 22 Apr 2014 23:31:54 +0000 (16:31 -0700)]
stagefright: add ClockEstimator API and WindowedLinearFitEstimator

Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217

10 years agoam 3d9164da: am 236f8ddd: Merge "Add missing include"
Glenn Kasten [Thu, 1 May 2014 22:22:33 +0000 (22:22 +0000)]
am 3d9164da: am 236f8ddd: Merge "Add missing include"

* commit '3d9164da1b3d58701e41c78e06839d61ed1b4ff9':
  Add missing include

10 years agoam 236f8ddd: Merge "Add missing include"
Glenn Kasten [Thu, 1 May 2014 22:20:06 +0000 (22:20 +0000)]
am 236f8ddd: Merge "Add missing include"

* commit '236f8ddd23af92f98f2deae86bf6e6b5c9278857':
  Add missing include

10 years agoMerge "Add missing include"
Glenn Kasten [Thu, 1 May 2014 22:18:34 +0000 (22:18 +0000)]
Merge "Add missing include"

10 years agoam 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"
Lajos Molnar [Thu, 1 May 2014 20:10:08 +0000 (20:10 +0000)]
am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"

* commit '2b0b701f57c5efebe868d0eedce8cfc399007e8a':
  ACodec: add frame render/drop systrace

10 years agoam 0c388650: Merge "ACodec: add frame render/drop systrace"
Lajos Molnar [Thu, 1 May 2014 20:07:50 +0000 (20:07 +0000)]
am 0c388650: Merge "ACodec: add frame render/drop systrace"

* commit '0c388650722ac53571be21ee04ce342c1c9510c2':
  ACodec: add frame render/drop systrace

10 years agoMerge "ACodec: add frame render/drop systrace"
Lajos Molnar [Thu, 1 May 2014 20:04:45 +0000 (20:04 +0000)]
Merge "ACodec: add frame render/drop systrace"

10 years agoam 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"
Glenn Kasten [Thu, 1 May 2014 19:31:31 +0000 (19:31 +0000)]
am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"

* commit '1afedc4d99acd52f99221d71b3a372a0a5497a84':
  Temporary workaround for log spam

10 years agoam 6eafba6b: Merge "Temporary workaround for log spam"
Glenn Kasten [Thu, 1 May 2014 19:29:25 +0000 (19:29 +0000)]
am 6eafba6b: Merge "Temporary workaround for log spam"

* commit '6eafba6bba3a4949cf3807ea39d5c1e969bebc52':
  Temporary workaround for log spam

10 years agoMerge "Temporary workaround for log spam"
Glenn Kasten [Thu, 1 May 2014 19:27:02 +0000 (19:27 +0000)]
Merge "Temporary workaround for log spam"

10 years agoTemporary workaround for log spam
Glenn Kasten [Thu, 1 May 2014 17:41:11 +0000 (10:41 -0700)]
Temporary workaround for log spam

Bug: 13790505
Change-Id: Icfc403bceaefdede1af65dfd70ba3e8b26abab02

10 years agoam b1d2b51c: am 761636f3: Merge "Do not force all command-line apps to be 32-bit...
Glenn Kasten [Wed, 30 Apr 2014 23:56:24 +0000 (23:56 +0000)]
am b1d2b51c: am 761636f3: Merge "Do not force all command-line apps to be 32-bit only"

* commit 'b1d2b51c4652ecdea907a5a6865d55a9bc52c6a2':
  Do not force all command-line apps to be 32-bit only

10 years agoam 761636f3: Merge "Do not force all command-line apps to be 32-bit only"
Glenn Kasten [Wed, 30 Apr 2014 23:52:49 +0000 (23:52 +0000)]
am 761636f3: Merge "Do not force all command-line apps to be 32-bit only"

* commit '761636f3c2904a9e1fb03991b6896ed7113f8596':
  Do not force all command-line apps to be 32-bit only

10 years agoMerge "Do not force all command-line apps to be 32-bit only"
Glenn Kasten [Wed, 30 Apr 2014 23:50:37 +0000 (23:50 +0000)]
Merge "Do not force all command-line apps to be 32-bit only"

10 years agoACodec: add frame render/drop systrace
Lajos Molnar [Wed, 30 Apr 2014 17:13:57 +0000 (10:13 -0700)]
ACodec: add frame render/drop systrace

Change-Id: I7a33d4a937d039fd454b889ddb12b7ca1c0ff3c2

10 years agoDo not force all command-line apps to be 32-bit only
Glenn Kasten [Wed, 30 Apr 2014 18:09:31 +0000 (11:09 -0700)]
Do not force all command-line apps to be 32-bit only

This is a partial revert of
>Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3

Change-Id: I214e1bd117dd40150ac5f7447f12c72c61f09a2f

10 years agoam b27ce2fb: am 416685d0: Merge "Fix format warnings"
Glenn Kasten [Wed, 30 Apr 2014 19:00:21 +0000 (19:00 +0000)]
am b27ce2fb: am 416685d0: Merge "Fix format warnings"

* commit 'b27ce2fba0049897558f1f3df9039f443ee4bc88':
  Fix format warnings

10 years agoam 416685d0: Merge "Fix format warnings"
Glenn Kasten [Wed, 30 Apr 2014 18:56:54 +0000 (18:56 +0000)]
am 416685d0: Merge "Fix format warnings"

* commit '416685d0cbab40bfc48b0e787206b5d5c2e2ec25':
  Fix format warnings

10 years agoMerge "Fix format warnings"
Glenn Kasten [Wed, 30 Apr 2014 18:54:03 +0000 (18:54 +0000)]
Merge "Fix format warnings"

10 years agoam 1a7be1ec: Merge commit \'91820d46b5f3065c2fded3cdf65d305715b33bb1\' into HEAD
Bill Yi [Wed, 30 Apr 2014 00:59:03 +0000 (00:59 +0000)]
am 1a7be1ec: Merge commit \'91820d46b5f3065c2fded3cdf65d305715b33bb1\' into HEAD

* commit '1a7be1ec9c769203e6c8e26378de0ab8e2ad493d':

10 years agoMerge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD
Bill Yi [Tue, 29 Apr 2014 18:34:16 +0000 (11:34 -0700)]
Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD