3080 Commits

Author SHA1 Message Date
Gil Dobjanschi
53f89e1230 Added the video editor to the media items and audio track constructors.
Change-Id: I5db229d28c28e17b487257a9c4ed8c5fb7570a8d
2010-10-06 09:54:34 -07:00
Gil Dobjanschi
572eab6f17 Merge "Adjust start time and duration for overlays and effects." 2010-10-06 09:46:09 -07:00
James Dong
b74ccaad18 Merge "Use setVideoSize API in StagefrightRecorder" 2010-10-05 19:01:10 -07:00
Gil Dobjanschi
e5867ef3f0 Adjust start time and duration for overlays and effects.
Change-Id: Ia5030d15a7c98f37307a0e78821052f05fec9fe6
2010-10-05 17:25:23 -07:00
James Dong
73fe79da09 am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db'

* commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
  Resilent media time stamp adjustment
2010-10-05 15:17:29 -07:00
Andreas Huber
56ee1080f0 am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Merge commit '17bc4f65324a823598e7671256c815bf32ddcc95' into gingerbread-plus-aosp

* commit '17bc4f65324a823598e7671256c815bf32ddcc95':
  Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
2010-10-05 14:13:16 -07:00
Andreas Huber
c743f4506f Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
Change-Id: Id574a0203efcb5e565f1b0fe77869fc33b9a9d56
2010-10-05 13:53:39 -07:00
Jeff Brown
f358cecb9c am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.
Merge commit '79a3981e3885b9144bb3d458682141eed7365939' into gingerbread-plus-aosp

* commit '79a3981e3885b9144bb3d458682141eed7365939':
  Fix Looper leaks in MediaRecorderStressTest.
2010-10-04 21:05:02 -07:00
Jeff Brown
79a3981e38 Fix Looper leaks in MediaRecorderStressTest.
The test was failing periodically due to too many files being open.
This change attempts to resolve the problem on the theory that
signaling pipe file descriptors are being leaked due to the large
number of Looper instances created during the test run.

However, it's still possible there are other leaks elsewhere.

Change-Id: I71f9f12d21605c47c9217c72c51e6c768142ce10
2010-10-04 21:01:29 -07:00
Gil Dobjanschi
61f9184547 Added mute APIs for MediaVideoItem and AudioTrack
Change-Id: I2e4e8b213a5d19f895d9e3431b7d4f1acad70762
2010-10-04 19:02:28 -07:00
James Dong
a86a6c4e32 am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Merge commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54' into gingerbread-plus-aosp

* commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54':
  Fixed an issue where the reserved free space in the file writer was larger than intended
2010-10-04 18:39:52 -07:00
Gil Dobjanschi
3398abafca Save AudioTrack to XML
Change-Id: Ie9afe8c620e21e160b56c36f489870db0a3987cc
2010-10-04 17:20:43 -07:00
James Dong
6a9e39ac55 Fixed an issue where the reserved free space in the file writer was larger than intended
The problem was that even though user does not explicitly request the max file size
limit via MediaRecorder.setMaxFileSize(), the file writer sets an implicit file
size limit if 32-bit file offset is used on user's behalf. The reserved free space
is estimated based on the file size, if the file size limit is set by the user.

The fix is to add an extra bool to tell the difference between an
explit requested file size and an implicit file limit and use that
to set the estimated moov box size accordingly.

Change-Id: I731aca6c7833aa764ed7b905edb77721577471b3
2010-10-04 16:54:59 -07:00
Gil Dobjanschi
e799720dd4 Merge "Added audio track playback API" 2010-10-04 15:49:26 -07:00
James Dong
6a02ba0100 am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
Merge commit 'b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp

* commit 'b99f0c7eae365f788a21944fef28de580c7f5f92':
  Resilent media time stamp adjustment
2010-10-04 15:48:59 -07:00
James Dong
b99f0c7eae Merge "Resilent media time stamp adjustment" into gingerbread 2010-10-04 15:35:40 -07:00
James Dong
acee8e7131 Resilent media time stamp adjustment
Change-Id: I13ab87c05f26bb11a3cc9bf8559f98e6ea0752db
2010-10-04 15:11:19 -07:00
Gil Dobjanschi
52ac301ee1 Added audio track playback API
Change-Id: I9884ab5d3a7d8d8310f4b4426e50b0496cbbd295
2010-10-04 13:56:39 -07:00
James Dong
8a9f8bfe16 Use setVideoSize API in StagefrightRecorder
Change-Id: Ia7ddf5e8d2b931453d2cb801169906191349ca07
2010-10-04 13:14:22 -07:00
Andreas Huber
3d29e8c846 am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread
Merge commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c'

* commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
2010-10-04 11:51:55 -07:00
Andreas Huber
dfd03fe993 am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread
Merge commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a' into gingerbread-plus-aosp

* commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
2010-10-04 11:47:52 -07:00
Andreas Huber
05f6787b88 Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
Change-Id: I29143e357fb6ea7b860636100e010f2ea7436798
related-to-bug: 3037389
2010-10-04 11:36:39 -07:00
Andreas Huber
d84d9f4064 am bb506dab: am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread
Merge commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80'

* commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80':
  Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
2010-10-04 11:26:16 -07:00
Andreas Huber
bb506dab1f am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread
Merge commit '7fa693740756123fa9d05e62fb47aae5d703c71d' into gingerbread-plus-aosp

* commit '7fa693740756123fa9d05e62fb47aae5d703c71d':
  Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
2010-10-04 11:22:22 -07:00
Andreas Huber
1913c1aeab Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
Change-Id: Iaf5880bb3376f9cbf22aefe198878eaf6f3f08c7
related-to-bug: 3037389
2010-10-04 11:09:31 -07:00
James Dong
8f8fd3525b am 2bf74b8f: am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread
Merge commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2'

* commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2':
  Turn off media time adjustment by default
2010-10-01 17:35:40 -07:00
James Dong
2bf74b8f0a am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread
Merge commit '6c609b6a60e533a93c6d0088222bd8da209b9953' into gingerbread-plus-aosp

* commit '6c609b6a60e533a93c6d0088222bd8da209b9953':
  Turn off media time adjustment by default
2010-10-01 17:32:16 -07:00
James Dong
6c609b6a60 Merge "Turn off media time adjustment by default" into gingerbread 2010-10-01 17:27:51 -07:00
James Dong
9160e4aa2a Turn off media time adjustment by default
Change-Id: I1f8021d605d0fd896e0639607a84e3f7c459612e
2010-10-01 17:14:23 -07:00
Andreas Huber
2a21e73acc am 57853559: am e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread
Merge commit '57853559c31154db9c202d653065c592169c5027'

* commit '57853559c31154db9c202d653065c592169c5027':
  Start playing live streams from the start, no the middle...
2010-10-01 11:40:18 -07:00
Andreas Huber
57853559c3 am e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread
Merge commit 'e619a9da44e4c00f9034917aef67f86da0bc207f' into gingerbread-plus-aosp

* commit 'e619a9da44e4c00f9034917aef67f86da0bc207f':
  Start playing live streams from the start, no the middle...
2010-10-01 11:37:44 -07:00
Andreas Huber
e619a9da44 Merge "Start playing live streams from the start, no the middle..." into gingerbread 2010-10-01 11:35:17 -07:00
Andreas Huber
aafe912e83 am d6d5cfb9: am 469b8033: Merge "Remove development-only code." into gingerbread
Merge commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16'

* commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16':
  Remove development-only code.
2010-10-01 11:29:26 -07:00
Andreas Huber
a424f7c628 Start playing live streams from the start, no the middle...
Change-Id: Ie01ba1250b51155cb1fb32fc3340189a16c01476
related-to-bug: 2368598
2010-10-01 11:28:44 -07:00
Andreas Huber
d6d5cfb914 am 469b8033: Merge "Remove development-only code." into gingerbread
Merge commit '469b80336368bef3742e97c15e9017c1f2d404ae' into gingerbread-plus-aosp

* commit '469b80336368bef3742e97c15e9017c1f2d404ae':
  Remove development-only code.
2010-10-01 11:25:57 -07:00
Andreas Huber
1981bd034a am 14401bf7: am d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit '14401bf7bca34c692f248406c78bd8b49783217a'

* commit '14401bf7bca34c692f248406c78bd8b49783217a':
  Squashed commit of the following:
2010-10-01 11:21:16 -07:00
Andreas Huber
21d28a2a13 Remove development-only code.
Change-Id: Ic2ca0efb631eb779ca157fb01b02aa19a1222c06
related-to-bug: 2368598
2010-10-01 11:19:26 -07:00
Andreas Huber
14401bf7bc am d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit 'd1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp

* commit 'd1398db35cb2e4d918fc631dda35cacb8540b187':
  Squashed commit of the following:
2010-10-01 11:03:47 -07:00
Andreas Huber
b72c7e36a2 Squashed commit of the following:
commit 46744c7697f29aec71aed8de3c95ce035c284d97
Author: Andreas Huber <andih@google.com>
Date:   Thu Sep 30 16:44:57 2010 -0700

    better separation of access units

    Change-Id: I5a9e2138aed341f0bcf22cfe368a15ca5ea5a73c

commit d34952ac0feb1ae722ff65824d7353335502219b
Author: Andreas Huber <andih@google.com>
Date:   Thu Sep 30 15:35:01 2010 -0700

    Support for ES packets that do not start on PES packet boundaries.

    Change-Id: I2cf012833948eddfb20b16a1901206cf22ce71e4
    related-to-bug: 2368598

Change-Id: Ib9329bd6bb7149b5a6e2483788a96b1b158952fc
2010-10-01 10:51:41 -07:00
Eric Laurent
785c416ecf am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
Merge commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9'

* commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9':
  Issue 3032913: improve AudioTrack recovery time
2010-09-30 19:47:21 -07:00
Eric Laurent
de12c3cf56 am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
Merge commit '220ab8877b234e6807b7f6d9028ba55d23220301' into gingerbread-plus-aosp

* commit '220ab8877b234e6807b7f6d9028ba55d23220301':
  Issue 3032913: improve AudioTrack recovery time
2010-09-30 17:47:07 -07:00
Eric Laurent
4712baab81 Issue 3032913: improve AudioTrack recovery time
This issue showed that when an AudioTrack underruns during a too long period
of time and is therefore disabled by audioflinger mixer, it takes an additional
delay of up to 3 seconds to recover.
This fix adds a simple mechanism to recover immediately when the client application
is ready to write data again in the AudioTrack buffer

Also throttle warnings on record overflows

Change-Id: I8b2c71578dd134b9e60a15ee4d91b70f3799cb3d
2010-09-30 17:21:23 -07:00
Gil Dobjanschi
048449ebfa Added ability to instantiate various implementations of the VideoEditor
Change-Id: I5b09afafff1c009bada4f49a5568286fe3cd9aef
2010-09-29 16:58:21 -07:00
Chia-chi Yeh
f46731ddde am 10b15c08: am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
Merge commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de'

* commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de':
  AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
2010-09-28 21:55:35 -07:00
Chia-chi Yeh
10b15c08bb am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp

* commit 'd6877fa4971710150de20453bf4ba54dca863429':
  AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
2010-09-28 21:13:54 -07:00
Chia-chi Yeh
d6877fa497 Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread 2010-09-28 21:11:27 -07:00
Chia-chi Yeh
081833d791 AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
This allows gsmamr_enc.h and gsmamr_dec.h to be included in the same
file without conflict definition.

Change-Id: I1c8dac235c122735ba14a1af2fda48c0f8d9f87b
2010-09-29 12:00:18 +08:00
Jaikumar Ganesh
82aa7f017d Update code for new BT APIs.
Change-Id: Idf806cba8160e6075e33e26ee9936663b850e96c
2010-09-28 20:02:58 -07:00
Gil Dobjanschi
e63f20b5fe Merge "Save overlays to XML" 2010-09-28 18:00:55 -07:00
Gil Dobjanschi
5665fd6ac2 Save overlays to XML
Change-Id: I549c40b55a85022136dbd4899cc0d2d4da6e33de
2010-09-28 17:54:09 -07:00