OSDN Git Service
The Android Automerger [Mon, 4 Feb 2013 15:10:31 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Andreas Huber [Fri, 1 Feb 2013 16:35:11 +0000 (16:35 +0000)]
Merge "Fix typo and reduce allocation overhead of RTP retransmission requests."
The Android Automerger [Fri, 1 Feb 2013 15:10:24 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
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
The Android Automerger [Thu, 31 Jan 2013 15:10:27 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
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
The Android Automerger [Wed, 30 Jan 2013 15:10:31 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
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>
The Android Automerger [Mon, 28 Jan 2013 15:10:14 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
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
The Android Automerger [Fri, 25 Jan 2013 15:10:12 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
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
The Android Automerger [Wed, 23 Jan 2013 15:10:19 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Glenn Kasten [Fri, 18 Jan 2013 23:17:05 +0000 (15:17 -0800)]
Remove obsolete audioflinger reference
Change-Id: I9ae754c908f3b0102c3828c71d6f542851a74341
The Android Automerger [Fri, 18 Jan 2013 15:10:26 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
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 [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"
Marco Nelissen [Fri, 14 Dec 2012 20:05:02 +0000 (12:05 -0800)]
Merge "FileSource: FILE is not closed"
You Kim [Fri, 14 Dec 2012 13:22:36 +0000 (22:22 +0900)]
FileSource: FILE is not closed
Add destructor to call fclose.
Change-Id: I765c56236f8df58af998439492b0b955ab57606f
Marco Nelissen [Thu, 13 Dec 2012 19:23:09 +0000 (11:23 -0800)]
Merge "Signal that IDR frames are sync frames"
Marco Nelissen [Thu, 13 Dec 2012 19:10:05 +0000 (11:10 -0800)]
Signal that IDR frames are sync frames
Change-Id: Iaf77edc0572cae38935fd9d94367adbfcb370985
Johann [Mon, 29 Oct 2012 23:48:23 +0000 (16:48 -0700)]
Match new paths and organization in external/libvpx
See I2c0a87b0fc049e855e21f455b806287b578091de
Change-Id: Iec8566bce0a4763a9a17b4a46f15aa39b5bcd141
Ying Wang [Wed, 12 Dec 2012 22:57:16 +0000 (14:57 -0800)]
Merge "Match new paths and organization in external/libvpx"
Marco Nelissen [Wed, 12 Dec 2012 22:04:22 +0000 (14:04 -0800)]
Merge "Increase buffer size for video"
Marco Nelissen [Wed, 12 Dec 2012 19:49:23 +0000 (11:49 -0800)]
Increase buffer size for video
Change-Id: I055e1336954387f7b48aa58d893a3a5fae036ece
Glenn Kasten [Tue, 4 Dec 2012 20:22:46 +0000 (12:22 -0800)]
Start isolating control block accesses in a proxy
The proxy object will eventually be the only code that understands the
details of the control block. This should make it easier to change the
control block in the future.
Initial set of control block fields that are isolated:
- sample rate
- send level
- volume
Prepare for streaming/static separation by adding a union to the control
block for the new fields.
Fix bug in handling of max sample rate on a track. It was only checking
at re-configuration, not at each mix.
Simplify OutputTrack::obtainBuffer.
Change-Id: I2249f9d04f73a911a922ad1d7f6197292c74cd92
Jamie Gennis [Wed, 12 Dec 2012 20:15:23 +0000 (12:15 -0800)]
stop using a deprecated SurfaceTextureClient ctor"
Jamie Gennis [Wed, 12 Dec 2012 20:09:09 +0000 (12:09 -0800)]
Merge "Revert "stop using a deprecated SurfaceTextureClient ctor""
Jamie Gennis [Wed, 12 Dec 2012 20:08:51 +0000 (12:08 -0800)]
Revert "stop using a deprecated SurfaceTextureClient ctor"
This reverts commit
aef79b0676d8f0ee8ef637ec8be5ba73225b038d
Change-Id: I5f6cf4d6d5dc895a9426f212dfc8a25b4bf2d23a
Glenn Kasten [Wed, 12 Dec 2012 19:48:29 +0000 (11:48 -0800)]
Merge "Prepare for track invalidation to be done by proxy"
Jamie Gennis [Wed, 12 Dec 2012 18:58:38 +0000 (10:58 -0800)]
Merge "stop using a deprecated SurfaceTextureClient ctor"
Marco Nelissen [Wed, 12 Dec 2012 18:00:30 +0000 (10:00 -0800)]
Merge "Fix timestamps after seek"
Glenn Kasten [Tue, 4 Dec 2012 20:12:34 +0000 (12:12 -0800)]
Prepare for track invalidation to be done by proxy
Don't rely on control block to determine whether track has been marked
invalid. Instead, use a local flag that can't be corrupted by client.
Change-Id: I783dafe828f93c1c3d2d0e5a08105ea536436efb