OSDN Git Service
Andreas Huber [Thu, 7 Feb 2013 18:56:14 +0000 (10:56 -0800)]
Allow for dynamic reconfiguration of the video bitrate used
to encode video while running as a wfd source.
Change-Id: I44f7b2350c88fc5807047c61bfe594ef8fa79275
Roger Jönsson [Wed, 23 Jan 2013 17:18:08 +0000 (18:18 +0100)]
Avoid rebuffering after RTSP pause
If pausing an RTSP stream, an RTSP Pause request is sent and then
if the stream is immediately resumed again, an RTSP Play request
will be sent to the server.
But the new data after the pause will not be buffered until
Sender Reports have arrived again on both channels.
Meanwhile the player will resume playback and continue consuming
the already existing buffer.
This means that there is a risk that the buffer is emptied while
waiting for sender reports.
This commit simply adds a delay before the RTSP pause request is
sent, allowing some additional RTSP buffering that might be needed
when the stream is resumed again.
Also, if the stream is resumed again before the RTSP pause request
is sent, there is no need for any RTSP pause request, hence it is
omitted.
Change-Id: I928c8bfb5e99a6a146dcda4e51e528973ecbe065
joakim johansson [Wed, 23 Jan 2013 16:18:56 +0000 (17:18 +0100)]
EOS fixes for RTSP streams
The fix takes care of several near end of stream use cases:
seek, pause and fake timestamps.
Change-Id: I5f5fa881b1f619dfd5e1afd2af957082345c59eb
Måns Zigher [Wed, 23 Jan 2013 13:48:57 +0000 (14:48 +0100)]
RTSP: Parse session level control attribute from SDP
If a=control: is present at session-level in the SDP response,
RFC2326:C.1.1 defines the URL to be used for aggregate commands.
This includes PLAY and PAUSE but not TEARDOWN.
Change-Id: Iaa1dc2271d00df39dc83477a99fda6fbeb73c5b4
Roger Jönsson [Mon, 21 Jan 2013 16:15:45 +0000 (17:15 +0100)]
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
Roger Jönsson [Mon, 21 Jan 2013 15:26:41 +0000 (16:26 +0100)]
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
Andreas Huber [Wed, 6 Feb 2013 18:44:39 +0000 (10:44 -0800)]
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
Andreas Huber [Tue, 5 Feb 2013 22:47:13 +0000 (14:47 -0800)]
RTSP now properly publishes its "seekable" flags after connection
has successfully completed and only then signals that preparation is
complete.
Change-Id: I1a60f718e673fe1462c69369c40eafbed6a14326
Andreas Huber [Tue, 5 Feb 2013 22:46:45 +0000 (22:46 +0000)]
Merge "Support for a "preparation" state that can take care of lengthy"
Andreas Huber [Tue, 5 Feb 2013 21:59:56 +0000 (13:59 -0800)]
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
Andreas Huber [Tue, 5 Feb 2013 21:16:39 +0000 (13:16 -0800)]
Fix a typo in MediaPlayerFactory that would prevent us from
opting in to nuplayer for general media playback.
Change-Id: I050f5178aadbb0b8bf422861ef885745c0b9006a
Roger Jönsson [Thu, 17 Jan 2013 12:22:31 +0000 (13:22 +0100)]
Detect live streams
The information is used to decide on visibility of pause button and
to handle the duration clock correctly.
Change-Id: I286ac992fd171c7fc313e429326d38b6fc80e3fb
Andreas Huber [Tue, 5 Feb 2013 18:29:37 +0000 (18:29 +0000)]
Merge "Added HTTP support for SDP files."
Oscar Rydhé [Mon, 20 Feb 2012 09:15:48 +0000 (10:15 +0100)]
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
Andreas Huber [Tue, 5 Feb 2013 18:26:03 +0000 (18:26 +0000)]
Merge "Groundwork to support bidirectional, asynchronous communication"
Andreas Huber [Tue, 5 Feb 2013 18:14:26 +0000 (10:14 -0800)]
Groundwork to support bidirectional, asynchronous communication
between NuPlayer and its sources.
Change-Id: I1989022d806206b926555add3aa5c1fcf37aa78d
Andreas Huber [Tue, 5 Feb 2013 17:55:48 +0000 (17:55 +0000)]
Merge "Revive the code to support TCP interleaved transport"
Marco Nelissen [Tue, 5 Feb 2013 17:39:04 +0000 (17:39 +0000)]
Merge "Return error code if setting scaling mode fails"
Marco Nelissen [Tue, 5 Feb 2013 17:03:22 +0000 (09:03 -0800)]
Return error code if setting scaling mode fails
The return code from native_window_set_scaling_mode() was ignored.
Looking at the code review comments that introduced this code, it
seems like the intention was to return the error code in that case.
Change-Id: I9592cc378f0a0b960d37178aa0525fc17e8734ba
James Dong [Mon, 4 Feb 2013 18:18:48 +0000 (18:18 +0000)]
Merge "Remove a few unused header includes from PlaybackSession.cpp"
Eric Laurent [Mon, 4 Feb 2013 17:05:30 +0000 (17:05 +0000)]
Merge "AudioFlinger: fix RecordThread initial device"
Glenn Kasten [Mon, 4 Feb 2013 16:15:34 +0000 (08:15 -0800)]
Fix crash when destroying a DuplicatingThread
Bug:
8121343
Change-Id: I9b1fc56c753e465e8a08916022e52db6c3a36906
Eric Laurent [Sat, 2 Feb 2013 01:57:04 +0000 (17:57 -0800)]
AudioFlinger: fix RecordThread initial device
A regression was introduced when the audio device enums where
modified for a 32 bit representation: the device passed when
constructing a RecordThread was still the concatenation of input
device and output device bit fields on one 32 bit value which
is not possible anymore.
The fix consists in modifying the RecordThread constructor to accept
separate values for input and output devices.
Change-Id: I81fb5f4718428b54251e65d74b86e198ce15193e
James Dong [Wed, 30 Jan 2013 21:31:59 +0000 (13:31 -0800)]
Remove a few unused header includes from PlaybackSession.cpp
Change-Id: Id3147e2f2d5d75ccc172e67802639cd43ed68870
Andreas Huber [Fri, 1 Feb 2013 19:43:44 +0000 (11:43 -0800)]
Revive the code to support TCP interleaved transport
Also support non-interleaved transport now, but the sink gets to decide
what mode it wants to run in, _not_ the source.
Change-Id: I3b6057f86871084e4decf930bb4a7a2d7517b0f2
Andreas Huber [Fri, 1 Feb 2013 16:35:11 +0000 (16:35 +0000)]
Merge "Fix typo and reduce allocation overhead of RTP retransmission requests."
Glenn Kasten [Fri, 18 Jan 2013 23:09:48 +0000 (15:09 -0800)]
AudioFlinger uses media.log service for logging
Change-Id: Ia0f8204334f6b233f644d897762a18c95d936b4b
Glenn Kasten [Fri, 1 Feb 2013 00:39:48 +0000 (00:39 +0000)]
Merge "Add media.log service based on NBLog"
Andreas Huber [Thu, 31 Jan 2013 23:25:07 +0000 (15:25 -0800)]
Fix typo and reduce allocation overhead of RTP retransmission requests.
Change-Id: I402a195da5dfeceadb4d073888ee7702c5532dc8
Eino-Ville Talvala [Thu, 31 Jan 2013 02:59:49 +0000 (18:59 -0800)]
am
c3afe559: (-s ours) am
9b7e8fc7: Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE
# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit '
c3afe5591a5c3a1aaf1cdcdeded75f6cff931569':
Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE
Igor Murashkin [Thu, 31 Jan 2013 02:59:48 +0000 (18:59 -0800)]
am
253f6830: (-s ours) am
abeee0ec: Camera2: fix metadata symbols: DO NOT MERGE
# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit '
253f683018caa803499f4e612d53846f76072e89':
Camera2: fix metadata symbols: DO NOT MERGE
Eino-Ville Talvala [Thu, 31 Jan 2013 02:57:21 +0000 (18:57 -0800)]
am
9b7e8fc7: Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE
# Via Igor Murashkin
* commit '
9b7e8fc7c564b24a1c099dddae4e9c1126bd7c4e':
Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE
Igor Murashkin [Thu, 31 Jan 2013 02:57:20 +0000 (18:57 -0800)]
am
abeee0ec: Camera2: fix metadata symbols: DO NOT MERGE
# Via Igor Murashkin
* commit '
abeee0ec92b5c77147036bf346de9309092a5ca1':
Camera2: fix metadata symbols: DO NOT MERGE
Eino-Ville Talvala [Fri, 4 Jan 2013 20:05:56 +0000 (12:05 -0800)]
Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE
- JPEG quality tag is now a uint8_t, not an int. Update parameter code
accordingly.
- Fix new warnings about narrowing conversions.
Bug:
7944244
Change-Id: Ie081c57c9e9323148614b170b132ffb98c0a0b9f
Igor Murashkin [Wed, 28 Nov 2012 00:25:46 +0000 (16:25 -0800)]
Camera2: fix metadata symbols: DO NOT MERGE
Change-Id: I59e457824782de26b7b489cd92eb33d48e6ee2d9
Andreas Huber [Wed, 30 Jan 2013 21:33:23 +0000 (21:33 +0000)]
Merge "Actually display something on screen when instantiating a wfd sink via"
Andreas Huber [Wed, 30 Jan 2013 19:35:39 +0000 (11:35 -0800)]
Actually display something on screen when instantiating a wfd sink via
the wfd commandline tool.
Change-Id: I26466efb95a5837a14d77d6581e0777038d31d95
Andreas Huber [Wed, 30 Jan 2013 18:41:25 +0000 (10:41 -0800)]
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
Andreas Huber [Tue, 29 Jan 2013 18:32:23 +0000 (18:32 +0000)]
Merge "Squashed commit of the following:"
Marco Nelissen [Tue, 29 Jan 2013 18:30:54 +0000 (18:30 +0000)]
Merge "ACodec Fix."
Andreas Huber [Tue, 29 Jan 2013 17:22:16 +0000 (09:22 -0800)]
Squashed commit of the following:
commit
f2c38e5cf8cee3b597c744c9d6a9c0969ac8599a
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 28 16:33:07 2013 -0800
Proper support for video format selection/negotiation.
Change-Id: I7db86cef939d63b8064be1c74de9ad78e85d45d9
commit
488023b7bad086692ffe942114fa3cc0e59a16c0
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 28 11:21:23 2013 -0800
Sink now notifies clients once it is disconnected.
Change-Id: I2f0a458ef1ec30dda1272ad5a013fee4ee70edc9
commit
783932e40dd904aa531c263ad51280d9ca814dcb
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 18 15:03:40 2012 -0800
Alternative DirectRenderer implementation.
Change-Id: I307beb913d7a61cb938bcb02696cc2e82d2b8b07
commit
1935cc9a87824aea71fc8ebe2162f62ec634ce5a
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 18 10:24:27 2012 -0800
Experimenting with wifi sink timing.
Change-Id: I059bae9762cf11777666988a8b4ab2012b5807be
commit
a859ee1eadd6a1d6a080667917e8b102c3770d61
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 15 11:16:30 2012 -0800
wfd sink update.
Change-Id: I026dfc580be92aa40dbbe7c1bc061fadf3b08be8
Change-Id: I191d3d7015869ca99254d813d074328fb5b2f479
James Dong [Tue, 29 Jan 2013 18:19:50 +0000 (18:19 +0000)]
Merge "Remove unnecessary lib dependencies in the FL makefile"
Glenn Kasten [Tue, 29 Jan 2013 15:53:47 +0000 (15:53 +0000)]
Merge "Add non-blocking event logger NBLog"
Henrik B Andersson [Sun, 15 Jul 2012 14:46:29 +0000 (07:46 -0700)]
Remove unnecessary lib dependencies in the FL makefile
Change-Id: Ia1e81a91b4b8dc1bf3558a4aa06e90a955c6fbe6
SeungBeom Kim [Wed, 16 Jan 2013 06:34:00 +0000 (15:34 +0900)]
ACodec Fix.
Bug:
7961269
Change-Id: Ie12530f89dd96dbce82e873de0c2310490390c34
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Hung Nguyen [Tue, 5 Jun 2012 11:19:53 +0000 (13:19 +0200)]
Fixed bugs where the content of buffer holding keys was cleared using a wrong size in forward lock
Modified by James Dong <jdong@google.com>
Change-Id: Iaacfc79b2b26bdee7046d8555e3b4e0bc224c3c5
Glenn Kasten [Fri, 18 Jan 2013 23:31:41 +0000 (15:31 -0800)]
Add media.log service based on NBLog
Change-Id: Ie45093df6ac9a739d05c8d408fab52a9a8a27e7f
Glenn Kasten [Mon, 14 Jan 2013 22:53:13 +0000 (14:53 -0800)]
Add non-blocking event logger NBLog
Change-Id: I6c136cf3d7f46a8af84c69ecfc199dab394c10dc
Hung Nguyen [Tue, 5 Jun 2012 11:19:53 +0000 (13:19 +0200)]
Fixed memory leakage in the DRM framework
Change-Id: Ib1276bec6cafb4e94f8f13b52e50e4987765eec4
Henrik B Andersson [Fri, 26 Oct 2012 13:15:15 +0000 (15:15 +0200)]
Fix for not ending up in an eternal loop in DrmManager.
In the original code a random number is used to get try
to find an empty slot in the list of free DRM id's.
When you reached the limit of 0xfff id's you ended up
in an eternal loop causing ANRs.
Updated by James Dong <jdong@google.com>.
Change-Id: I70176cc3f770223c4a8060f9739fe2bc03a703d9
Glenn Kasten [Fri, 18 Jan 2013 23:17:05 +0000 (15:17 -0800)]
Remove obsolete audioflinger reference
Change-Id: I9ae754c908f3b0102c3828c71d6f542851a74341
Eric Laurent [Fri, 18 Jan 2013 02:08:52 +0000 (02:08 +0000)]
Merge "AudioFlinger: fix build with debug log enabled"
Eric Laurent [Fri, 18 Jan 2013 01:36:00 +0000 (17:36 -0800)]
AudioFlinger: fix build with debug log enabled
Change-Id: Id397155ec884c41cb84b35462ea09a97a04d3ed2
Insun Kang [Tue, 25 Sep 2012 11:22:25 +0000 (20:22 +0900)]
Bug fix: set 'und' as default metadata language info for srt.
o Previously, it leaves language code empty and it is inconsistent with
other code which gives 'und'. As a result, selected SRT track returned
empty language info. With this fix, it returns 'und'.
Bug:
7227230
TESTED=runtest -d cts-media -c android.media.cts.MediaPlayerTest -m
testGetTrackInfo
Change-Id: I225848f029637dd782c376e0d770dddd5c849550
Glenn Kasten [Thu, 10 Jan 2013 22:26:24 +0000 (14:26 -0800)]
Fix AudioRecord
Bug:
7965744
Change-Id: Ic024e7fb32f7459b8093c2cf6cd5752aade21ddb
Glenn Kasten [Wed, 9 Jan 2013 15:31:45 +0000 (07:31 -0800)]
Merge "Fix build warnings"
Eino-Ville Talvala [Wed, 9 Jan 2013 01:14:41 +0000 (17:14 -0800)]
Merge "Camera2: Fix JPEG quality metadata type, new warnings."
Glenn Kasten [Wed, 9 Jan 2013 00:45:38 +0000 (16:45 -0800)]
Fix build warnings
Change-Id: I79f4d7052a4c0a9fde144063f44a9c8c9dd575d5
Eino-Ville Talvala [Fri, 4 Jan 2013 20:05:56 +0000 (12:05 -0800)]
Camera2: Fix JPEG quality metadata type, new warnings.
- JPEG quality tag is now a uint8_t, not an int. Update parameter code
accordingly.
- Fix new warnings about narrowing conversions.
Bug:
7944244
Change-Id: Ie081c57c9e9323148614b170b132ffb98c0a0b9f
Glenn Kasten [Sat, 5 Jan 2013 00:57:33 +0000 (16:57 -0800)]
Fix bug in AudioRecord() constructor
It was calling set() with wrong parameter list.
This goes back to commit
be916aa1267e2e6b1c148f51d11bcbbc79cb864c from 2010.
Change-Id: I2f6917765baf58260bf35e89a2cc59c199734ff6
James Dong [Fri, 28 Dec 2012 17:47:37 +0000 (09:47 -0800)]
am
3e55b3e4: am
12834fe2: Merge "libvideoeditor: fix code bugs when enabling all-level debugging macros"
* commit '
3e55b3e4cdebd47a2e5b5df99107954fb4b1ab64':
libvideoeditor: fix code bugs when enabling all-level debugging macros
James Dong [Fri, 28 Dec 2012 17:46:54 +0000 (09:46 -0800)]
am
cd2d2631: am
b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."
* commit '
cd2d263116576dc9770d31bb792e7cf2d6840b53':
Use default values when MPEG4 audio config parsing fails.
Glenn Kasten [Fri, 21 Dec 2012 23:04:30 +0000 (15:04 -0800)]
Merge "Start isolating control block accesses in a proxy"
James Dong [Fri, 21 Dec 2012 22:42:34 +0000 (14:42 -0800)]
am
12834fe2: Merge "libvideoeditor: fix code bugs when enabling all-level debugging macros"
* commit '
12834fe289e8173e94f31603fa6d313abe56ad70':
libvideoeditor: fix code bugs when enabling all-level debugging macros
James Dong [Fri, 21 Dec 2012 22:09:14 +0000 (14:09 -0800)]
Merge "libvideoeditor: fix code bugs when enabling all-level debugging macros"
James Dong [Fri, 21 Dec 2012 18:05:52 +0000 (10:05 -0800)]
am
b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."
* commit '
b54cedabdf0261211241e2f3af09c75cffd911ed':
Use default values when MPEG4 audio config parsing fails.
Glenn Kasten [Fri, 21 Dec 2012 16:09:10 +0000 (08:09 -0800)]
Merge "Remove unnecessary parameter"
James Dong [Fri, 21 Dec 2012 02:25:12 +0000 (18:25 -0800)]
Merge "Use default values when MPEG4 audio config parsing fails."
James Dong [Thu, 20 Dec 2012 22:10:26 +0000 (14:10 -0800)]
am
9c891ca3: am
2a55b596: Merge "libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video"
* commit '
9c891ca36a7f2acecd70d41ff39a2025048bb0b1':
libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video
James Dong [Thu, 20 Dec 2012 22:08:05 +0000 (14:08 -0800)]
am
2a55b596: Merge "libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video"
* commit '
2a55b5964c6ae167cc1bc57eca5ca7a1c4aa452c':
libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video
Andreas Huber [Thu, 20 Dec 2012 21:58:31 +0000 (13:58 -0800)]
Merge "Properly release any MediaBuffer references associated with the"
Andreas Huber [Thu, 20 Dec 2012 21:49:34 +0000 (13:49 -0800)]
Properly release any MediaBuffer references associated with the
encoder input buffers on shutdown. This worked fine before for an orderly
shutdown but didn't release all references in case of error.
Change-Id: I0ea3eb26da76fbeb33cadf58d237b0c68a86ac4a
related-to-bug:
7893090
James Dong [Thu, 20 Dec 2012 21:15:28 +0000 (13:15 -0800)]
Merge "libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video"
Marco Nelissen [Thu, 20 Dec 2012 21:07:07 +0000 (13:07 -0800)]
Merge "Ensure proper EOS behavior"
Marco Nelissen [Thu, 20 Dec 2012 19:19:49 +0000 (11:19 -0800)]
Ensure proper EOS behavior
If a buffer is tagged with EOS but has data in it, decode that data
instead of ignoring it.
Change-Id: Ie41c8485c3ad7fe7d9c64f0752c2e7601d91d602
Glenn Kasten [Thu, 20 Dec 2012 19:07:09 +0000 (11:07 -0800)]
am
68c3de89: am
df9cce64: Merge "Allow multichannel FLAC files"
* commit '
68c3de899f822acf3c735c681d206e852ad3821f':
Allow multichannel FLAC files
Glenn Kasten [Thu, 20 Dec 2012 19:03:48 +0000 (11:03 -0800)]
am
df9cce64: Merge "Allow multichannel FLAC files"
* commit '
df9cce649d9ac1f4446f613c54191e7c4d646f07':
Allow multichannel FLAC files
Glenn Kasten [Thu, 20 Dec 2012 16:58:04 +0000 (08:58 -0800)]
Merge "Fix bug with discarded AudioRecord::read count"
Glenn Kasten [Thu, 20 Dec 2012 16:32:43 +0000 (08:32 -0800)]
Merge "Fix build warnings"
Glenn Kasten [Thu, 20 Dec 2012 15:39:48 +0000 (07:39 -0800)]
Merge "Add warning about following the design rules"
Glenn Kasten [Thu, 20 Dec 2012 15:30:41 +0000 (07:30 -0800)]
Merge "Allow multichannel FLAC files"
Glenn Kasten [Fri, 3 Feb 2012 19:06:53 +0000 (11:06 -0800)]
Remove unnecessary parameter
Just get the parameter on server side
Change-Id: I433a63104dbb257e0d862be2ab61847cb36d1c15
James Dong [Tue, 18 Dec 2012 23:21:28 +0000 (15:21 -0800)]
Merge "Fix memory leakage from MPEG4Writer."
Andy McFadden [Tue, 18 Dec 2012 23:21:20 +0000 (15:21 -0800)]
Merge "Rename ISurfaceTexture and SurfaceTexture"
Marco Nelissen [Tue, 18 Dec 2012 23:17:33 +0000 (15:17 -0800)]
Merge "Report buffer size even when using hardware buffers"
Marco Nelissen [Tue, 18 Dec 2012 00:35:08 +0000 (16:35 -0800)]
Make codecs reconfigurable
Change-Id: I3dd46cb4401493becbf6152f4dcd5a8f1e9a0b44
Marco Nelissen [Tue, 18 Dec 2012 20:28:27 +0000 (12:28 -0800)]
Report buffer size even when using hardware buffers
This makes it so that the buffers dequeued from a MediaCodec show
a non-zero size when there's actually data in them, which allows
the caller to distinguish between a valid frame and an empty buffer.
Change-Id: I891b2301501e26f0b4e8cf2e24c169e501a6d026
Andy McFadden [Tue, 18 Dec 2012 17:46:54 +0000 (09:46 -0800)]
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
James Dong [Fri, 14 Dec 2012 02:58:38 +0000 (18:58 -0800)]
Fix memory leakage from MPEG4Writer.
o The in-memory cache, mMoovBoxBuffer, holding the content for Moov box may not be freed.
o Added comment describing how the in-memory cache works
o Moved the memory release to a single place to make the code more robust
o Avoided allocating the in-memory cache if the file is not intended to be streamable
o related-to-bug:
7664029
Change-Id: If04fc6b12daeaaa86710dfb4b4b9c175da6421df
Glenn Kasten [Mon, 17 Dec 2012 19:44:20 +0000 (11:44 -0800)]
Fix bug with discarded AudioRecord::read count
Formerly, if an AudioRecord::read() got a timeout on obtainBuffer()
after already successfully transferring some data, then it returned zero.
This had the effect of discarding a partial transfer, which resulted in
a gap in the audio data delivered to the app. Now if a timeout occurs
after a partial transfer, it returns that partial transfer count so that
no data is lost.
Change-Id: I0d9c2f4e495a400b56ef916a06613ba26537ca97
Glenn Kasten [Mon, 17 Dec 2012 21:20:30 +0000 (13:20 -0800)]
am
9435b498: am
f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sample wav"
* commit '
9435b498123f3e22532391c30eb42c336bf743ec':
Fix bug in WAVExtractor for 24-bit per sample wav
Glenn Kasten [Mon, 17 Dec 2012 21:18:08 +0000 (13:18 -0800)]
am
f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sample wav"
* commit '
f38259cfe5566914a49f5b0f8b11aa6a951d667a':
Fix bug in WAVExtractor for 24-bit per sample wav
Glenn Kasten [Fri, 14 Dec 2012 15:13:28 +0000 (07:13 -0800)]
Fix build warnings
Change-Id: I9e3cfa0c6b3467fe763ce55f759d179f02c5deea
Glenn Kasten [Mon, 17 Dec 2012 20:29:06 +0000 (12:29 -0800)]
Merge "Fix bug in WAVExtractor for 24-bit per sample wav"
Jean-Baptiste Queru [Sat, 15 Dec 2012 00:49:02 +0000 (16:49 -0800)]
am
442e29ef: am
0cd75629: Merge "Match new paths and organization in external/libvpx"
* commit '
442e29ef408f2cd32610988b52be6e06e11e4de2':
Match new paths and organization in external/libvpx
Marco Nelissen [Sat, 15 Dec 2012 00:49:01 +0000 (16:49 -0800)]
am
34d2f109: am
409542cd: Merge "FileSource: FILE is not closed"
* commit '
34d2f10908526cf3011d6c167a5817522b5a24d7':
FileSource: FILE is not closed
Jean-Baptiste Queru [Fri, 14 Dec 2012 23:25:22 +0000 (15:25 -0800)]
am
0cd75629: Merge "Match new paths and organization in external/libvpx"
* commit '
0cd75629a8f7a6bd47b2abc6dd8d9f66e70d76a4':
Match new paths and organization in external/libvpx
Marco Nelissen [Fri, 14 Dec 2012 23:25:21 +0000 (15:25 -0800)]
am
409542cd: Merge "FileSource: FILE is not closed"
* commit '
409542cdaf72d8983043f2746d9d916ee1566a80':
FileSource: FILE is not closed
Greg Hackmann [Fri, 14 Dec 2012 21:49:48 +0000 (13:49 -0800)]
SurfaceMediaSource: wait on fence from acquired buffers
Change-Id: I4ab93a4adeec536648258c70a7d943503d9b10f4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Jean-Baptiste Queru [Fri, 14 Dec 2012 20:48:41 +0000 (12:48 -0800)]
Merge "Match new paths and organization in external/libvpx"