OSDN Git Service
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
Marco Nelissen [Tue, 11 Dec 2012 23:34:18 +0000 (15:34 -0800)]
Fix timestamps after seek
Ensure buffers are correctly timestamped after a seek.
Change-Id: I7d76689138e4f95c0ceb9fb7a4c4d42c48568212
Jamie Gennis [Wed, 12 Dec 2012 01:03:12 +0000 (17:03 -0800)]
stop using a deprecated SurfaceTextureClient ctor
Change-Id: I792277b0d711da22f6b2abb7f1d837450d6af8e2
Dima Zavin [Tue, 11 Dec 2012 22:42:55 +0000 (14:42 -0800)]
stagefright: recordvideo: add -o flag to specify output filename
Change-Id: I6b464a7b3f7dd918565c6abbd432d779eb286fd5
Signed-off-by: Dima Zavin <dima@android.com>
Glenn Kasten [Tue, 11 Dec 2012 00:08:07 +0000 (16:08 -0800)]
am
76143093: am
f0ff908d: Logging to investigate a crash
* commit '
761430930a7335d714af0f7c1d497feb8f9f0a5a':
Logging to investigate a crash
Glenn Kasten [Mon, 10 Dec 2012 23:34:56 +0000 (15:34 -0800)]
am
f0ff908d: Logging to investigate a crash
* commit '
f0ff908da019a44115109f1b4d1b6864b35a8a29':
Logging to investigate a crash
Glenn Kasten [Fri, 7 Dec 2012 22:13:35 +0000 (14:13 -0800)]
Logging to investigate a crash
Bug:
6490974
Change-Id: Ib926a9258bde4ee05ed42eea662dff68e426a997
Andreas Huber [Thu, 6 Dec 2012 18:42:29 +0000 (10:42 -0800)]
am
49c5737f: am
03425d9c: Merge "Fix bad checks that causes crash when streaming H.263 content."
* commit '
49c5737fe4d9d82ea1cc71d7ca73edfc7477a401':
Fix bad checks that causes crash when streaming H.263 content.
Andreas Huber [Thu, 6 Dec 2012 18:39:00 +0000 (10:39 -0800)]
am
03425d9c: Merge "Fix bad checks that causes crash when streaming H.263 content."
* commit '
03425d9cf7f22cf400c13cda60d3e91f0fd48d6e':
Fix bad checks that causes crash when streaming H.263 content.
Andy McFadden [Thu, 6 Dec 2012 17:22:54 +0000 (09:22 -0800)]
Merge "Add explicit cutils to stagefright"
Andreas Huber [Wed, 5 Dec 2012 18:38:26 +0000 (10:38 -0800)]
Merge "setVideoSurfaceTexture is now synchronous and applied dynamically"
Andreas Huber [Mon, 3 Dec 2012 23:20:40 +0000 (15:20 -0800)]
Respect sample aspect ratio in NuPlayer.
related-to-bug:
7569402
Change-Id: I302de95d83b180bd2dc72ddd0c69a665dbce2527
Andreas Huber [Wed, 5 Dec 2012 16:58:56 +0000 (08:58 -0800)]
Merge "Fix bad checks that causes crash when streaming H.263 content."
Andy McFadden [Wed, 5 Dec 2012 01:16:22 +0000 (17:16 -0800)]
Add explicit cutils to stagefright
Without this, some changes I'm making over in frameworks/native
result in a link-time failure to find android_atomic_dec.
Change-Id: Ieb45a86ef6508816ac51589e249ff89caf7ba309
Igor Murashkin [Wed, 5 Dec 2012 00:54:51 +0000 (16:54 -0800)]
Merge "Camera2: fix metadata symbols"
Alex Ray [Tue, 4 Dec 2012 19:30:11 +0000 (11:30 -0800)]
Merge "audioflinger: define ANDROID_SMP, remove conditional tracing"
Glenn Kasten [Tue, 4 Dec 2012 01:06:56 +0000 (17:06 -0800)]
Split off the current control block to separate file
Prepare for a new implementation of step() etc.
Change-Id: I268421976ba577aa1fb5d7015de5441c05861190
Igor Murashkin [Wed, 28 Nov 2012 00:25:46 +0000 (16:25 -0800)]
Camera2: fix metadata symbols
Change-Id: I59e457824782de26b7b489cd92eb33d48e6ee2d9
Andreas Huber [Mon, 3 Dec 2012 19:18:00 +0000 (11:18 -0800)]
setVideoSurfaceTexture is now synchronous and applied dynamically
while playing.
Change-Id: If9f08659a01bdc7dac0999730368e9dfa5e58d36
related-to-bug:
5666482
Glenn Kasten [Fri, 30 Nov 2012 23:00:36 +0000 (15:00 -0800)]
Emphasize distinction between streaming and static
Update comments and improve error checks to match
Change-Id: I7370d6e59a7ef26dfb284a8b058d5ab2e0a42ccf
Glenn Kasten [Fri, 30 Nov 2012 21:41:12 +0000 (13:41 -0800)]
flush() comments and checks
flush() is only useful for streaming mode.
It is a no-op if track is active or uses a static buffer.
Change-Id: I918ac181ffae3d16a0d67d8a7208f4aec61b5bd6
Glenn Kasten [Thu, 29 Nov 2012 21:38:14 +0000 (13:38 -0800)]
AudioTrack::mute() is unused so remove it
If ever needed again, it could be implemented on client side by forcing
a track volume of 0.
Change-Id: I88a9b4f675b6dca2948549414f9ec2c192d29269
Glenn Kasten [Mon, 3 Dec 2012 17:27:27 +0000 (09:27 -0800)]
Merge "AudioTrack inline short const methods"
Andreas Huber [Mon, 3 Dec 2012 17:19:20 +0000 (09:19 -0800)]
am
cd8d39e0: am
f00d40c7: Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"
* commit '
cd8d39e00fb7896e56318cc192978446e21d46b8':
Memory leak solved in MPEG4Extractor::parseChunk for cover art
Andreas Huber [Mon, 3 Dec 2012 17:17:51 +0000 (09:17 -0800)]
am
f00d40c7: Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"
* commit '
f00d40c716fd4741fa56dd2b59813227658e50f2':
Memory leak solved in MPEG4Extractor::parseChunk for cover art
Glenn Kasten [Mon, 3 Dec 2012 17:15:12 +0000 (09:15 -0800)]
Merge "Remove last bits of IAudioFlinger::channel_count"
Andreas Huber [Mon, 3 Dec 2012 17:00:29 +0000 (09:00 -0800)]
Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"
Roger1 Jonsson [Tue, 21 Dec 2010 08:57:41 +0000 (09:57 +0100)]
Fix bad checks that causes crash when streaming H.263 content.
Remove checks that causes crash for rtsp streamed h.263 content
with certain values in the RTP payload header:
Remove zero check for the five reserved bits in the payload header.
According to RFC 4629 these bits MUST be ignored by receivers.
Remove zero-check for the VRC (Video Redundancy Coding) bit,
skip packet instead.
Remove zero-check for the PLEN bits (extra picture header),
skip packet instead.
Remove zero-check for the PEBIT bits (extra picture header),
skip packet instead.
Remove corresponding zero check for the four resreved bits in the
AMR payload header. According to RFC 4867 these bits MUST be
ignored by receivers.
Change-Id: I7fc21d69a19d23da24f9267623c338d415ef1387
Alex Ray [Sat, 1 Dec 2012 03:42:28 +0000 (19:42 -0800)]
audioflinger: define ANDROID_SMP, remove conditional tracing
With ANDROID_SMP set, tracing functionality is completely inline, and
without the performance hits of external library calls, tracing does
not need to be conditionally compiled.
Change-Id: I4b29a9a52c403f0d2ea137c5b7bc05a518a7ca4b
Glenn Kasten [Thu, 29 Nov 2012 15:32:49 +0000 (07:32 -0800)]
AudioTrack inline short const methods
Change-Id: I142917edb454d510bbe545e94e6eaea30b650fae
Andreas Huber [Fri, 30 Nov 2012 21:38:07 +0000 (13:38 -0800)]
Merge "Fix nuplayer seek jankiness by properly flushing decoders before"
cong.zhou [Wed, 28 Nov 2012 23:52:28 +0000 (15:52 -0800)]
Fix bug in WAVExtractor for 24-bit per sample wav
support stereo/multichannel 24-bit format
kMaxFrameSize is fixed to 32768. When converting 24-bit to 16-bit,
number of samlpes is maxBytesToRead /3.
In this case, if the maxBytesToRead is not multiple of 3,
pcm data is messed when converting.
Bug:
7630939
Change-Id: I0ea1b53eb1272a8d83b63815fc0a05b73cef75f1
Alex Ray [Fri, 30 Nov 2012 19:39:43 +0000 (11:39 -0800)]
Merge "Remove conditional compilation of ATRACE functions"
Andreas Huber [Fri, 30 Nov 2012 18:53:22 +0000 (10:53 -0800)]
Fix nuplayer seek jankiness by properly flushing decoders before
initiating the seek. Also refactor the nuplayer state machine to make this
a little more maintainable and extensible in the future.
Change-Id: I36a673bdecff732bca7094c8f72bac24f37c01e9
related-to-bug:
7120373
Alex Ray [Fri, 30 Nov 2012 19:11:54 +0000 (11:11 -0800)]
Remove conditional compilation of ATRACE functions
Tracing functions are meant to be dynamically controlled via sysprops.
Conditional compilation removes this functionality.
Change-Id: I26bc473d104d0b3c50a228dddfda3fa2428d157a
Glenn Kasten [Fri, 30 Nov 2012 18:52:16 +0000 (10:52 -0800)]
Remove last bits of IAudioFlinger::channel_count
Change-Id: I9e13678e0aa32a86eb27367a4aff4b32b8aec8cc
Andreas Huber [Fri, 30 Nov 2012 16:51:51 +0000 (08:51 -0800)]
am
ba6b1bc3: am
e7550eb2: Merge "Initialize and copy mRotationAngle in VideoFrame"
* commit '
ba6b1bc38e0c355277f69af286469adb5f02e876':
Initialize and copy mRotationAngle in VideoFrame
Andreas Huber [Fri, 30 Nov 2012 16:50:09 +0000 (08:50 -0800)]
am
e7550eb2: Merge "Initialize and copy mRotationAngle in VideoFrame"
* commit '
e7550eb2805d864253f88ea2ced57014d6140e55':
Initialize and copy mRotationAngle in VideoFrame
Andreas Huber [Fri, 30 Nov 2012 16:30:40 +0000 (08:30 -0800)]
Merge "Initialize and copy mRotationAngle in VideoFrame"