2948 Commits

Author SHA1 Message Date
Andreas Huber
72662b1abe am 45bd1159: am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
Merge commit '45bd1159fa34b51ba077e0cde760d171ca092552'

* commit '45bd1159fa34b51ba077e0cde760d171ca092552':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
2010-10-10 11:16:01 -07:00
James Dong
997eaa2c7c 0-memcpy video recording framework
Part III: Move startRecording() call earlier, asking camera hal
to allocate video buffers before CameraSource.start() is called.

Change-Id: I3f1d7d5636ca2644fe52af61f297d48c6b1ce89d
2010-10-09 01:21:20 -07:00
James Dong
0c128b67f0 Move Camera specific logic out from StagefrightRecorder to CameraSource
o updated comments and streamlined the logic in
  checkVideoSize() and checkFrameRate() as suggested

Change-Id: I49d04ac7998d4a215997aa63555dfb6e814e38d3
2010-10-08 18:32:43 -07:00
Gil Dobjanschi
bced934da0 Merge "Hide project media by creating the .nomedia file" 2010-10-08 14:57:05 -07:00
Gil Dobjanschi
ce52d1ff76 Hide project media by creating the .nomedia file
Change-Id: I4ef1f16ceaa211b7f614cb3dfffa5beb4ae3e8de
2010-10-08 14:44:36 -07:00
Mike Lockwood
069ead3adc MTP: Throw a NullPointerException if client is null in MtpCursor constructor
Change-Id: Ia2a19ddcc5cacb54d9fcbe55bce1de1aed515424
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-10-08 15:39:48 -04:00
Mike Lockwood
170bf59c7c Merge "MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty" 2010-10-07 16:15:33 -07:00
Mike Lockwood
6458935331 MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty
BUG: 3063257

Change-Id: I648ff8c4d4026e3d2a97853257865c9b5f712712
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-07 17:43:57 -04:00
Gil Dobjanschi
2409cdb587 Merge "Remove MediaVideoItem and AudioTrack playback APIs." 2010-10-07 14:13:21 -07:00
Andreas Huber
45bd1159fa am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
Merge commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp

* commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
2010-10-07 14:02:01 -07:00
Gil Dobjanschi
b27f2d3126 Remove MediaVideoItem and AudioTrack playback APIs.
Change-Id: If3e5f341af7f581c90f04c91afb3681f9e8d5f82
2010-10-07 13:57:54 -07:00
Andreas Huber
d6e9d7695b Merge "Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback." 2010-10-07 13:57:08 -07:00
Andreas Huber
08478d17a3 Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback.
Change-Id: Iee9cd7b0c326bac96382007b4ea077d4368d7d01
related-to-bug: 3051572
2010-10-07 13:48:34 -07:00
Andreas Huber
a458719bb6 am 56ee1080: 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 '56ee1080f004110bff622e5b60c243d9cabfe120'

* commit '56ee1080f004110bff622e5b60c243d9cabfe120':
  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-07 12:21:33 -07:00
Andreas Huber
1e19416383 On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
Change-Id: I1b8fe68c1766299844fe84ebbff49cb8b3e4cc7c
related-to-bug: 3070094
2010-10-07 09:19:25 -07:00
Jeff Brown
3caf37eb32 am f358cecb: am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.
Merge commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2'

* commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2':
  Fix Looper leaks in MediaRecorderStressTest.
2010-10-06 17:07:49 -07:00
James Dong
8c4a042984 am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Merge commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe'

* commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe':
  Fixed an issue where the reserved free space in the file writer was larger than intended
2010-10-06 16:17:14 -07:00
Gil Dobjanschi
0ca0a12c6b Added VideoEditor reference to protected AudioTrack constructor
Change-Id: Icfac392f8060d424b27105c6ae718e35b2d6c705
2010-10-06 10:53:49 -07:00
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