OSDN Git Service
Andreas Huber [Thu, 8 Dec 2011 21:35:23 +0000 (13:35 -0800)]
am
68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1
* commit '
68f592a8210af27df4339089bbee47fb602cae6a':
Don't perform RTSP seeks right away but queue them for 200ms
Andreas Huber [Thu, 8 Dec 2011 21:35:16 +0000 (13:35 -0800)]
am
0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
* commit '
0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
Andreas Huber [Thu, 8 Dec 2011 21:33:16 +0000 (13:33 -0800)]
Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:04:50 +0000 (13:04 -0800)]
Don't perform RTSP seeks right away but queue them for 200ms
and only execute the last one.
Change-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000
related-to-bug:
5732960
Andreas Huber [Thu, 8 Dec 2011 20:27:47 +0000 (12:27 -0800)]
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
if we don't receive npt time mapping from the rtsp server (i.e. live stream)
Change-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c
related-to-bug:
5660357
Jeff Tinker [Thu, 8 Dec 2011 08:16:15 +0000 (00:16 -0800)]
am
a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit '
a693a4b5553584a01b8b6b3640dc0393d2d88f28':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Jeff Tinker [Thu, 8 Dec 2011 08:13:43 +0000 (00:13 -0800)]
Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
Jeff Tinker [Thu, 8 Dec 2011 04:23:20 +0000 (20:23 -0800)]
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.
Change-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60
related-to-bug:
5725548
Dave Burke [Wed, 7 Dec 2011 22:07:49 +0000 (14:07 -0800)]
am
54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
* commit '
54a53841a9ff48ba4cd004469ae4ff77caed900a':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Dave Burke [Wed, 7 Dec 2011 22:05:41 +0000 (14:05 -0800)]
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
Andreas Huber [Wed, 7 Dec 2011 20:50:47 +0000 (12:50 -0800)]
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59
related-to-bug:
5666532
The Android Open Source Project [Wed, 7 Dec 2011 19:03:56 +0000 (11:03 -0800)]
am
3de8d36b: Reconcile with ics-mr0-release
* commit '
3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
Andreas Huber [Wed, 7 Dec 2011 19:03:00 +0000 (11:03 -0800)]
am
791a3183: Merge "Merge commit \'
babb7200\' into manualmerge" into ics-mr1
* commit '
791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
DO NOT MERGE: Remove the AVI extractor.
James Dong [Wed, 7 Dec 2011 19:02:31 +0000 (11:02 -0800)]
am
6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
* commit '
6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
Andreas Huber [Wed, 7 Dec 2011 19:02:29 +0000 (11:02 -0800)]
am
05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit '
05d630691127c022befd071b2bede87c707112a9':
DO NOT MERGE: Remove the AVI extractor.
The Android Open Source Project [Wed, 7 Dec 2011 15:24:54 +0000 (07:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
Andreas Huber [Tue, 6 Dec 2011 23:03:10 +0000 (15:03 -0800)]
Merge commit '
babb7200' into manualmerge
Andreas Huber [Tue, 6 Dec 2011 18:59:48 +0000 (10:59 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
John Grossman [Tue, 6 Dec 2011 22:05:05 +0000 (14:05 -0800)]
Tungsten: Improve RX player error handling.
First, clear an issue which was causing an assert to fire. Basically,
once a decoder pump had entered the error state and was shutdown, it
was not clearing its status, and when a substream attempt to recycle
the pump, startup was failing an assert (no thread had been created,
meaning that the system was not initialized, yet status indicated an
error). This was a small one-liner in aah_decoder_pump.cpp.
Second, try to become a little nuanced about how we handle errors in
the decoder pump. A comment in the code pretty much says it all, but
the summary is that we don't want to completely abort playback because
a single chunk of ES failed to decode, but if nothing is decoding and
we are making no progress at all, we probably need to put the
MediaPlayer instance into the fatal Error state and signal the app
level so that further action can be taken (automatic recovery attempts
followed by bug reports and signalling the user if those fail).
This is to address the fallout of http://b/issue?id=
5498460, where
something at the OMX decoder level becomes unhappy about not being
able to obtain an output buffer which eventually unwinds to this
assert which results in a dead mediaserver. After this change, the
mediaserver will no longer crash, and may even recover (depending on
whether or not the OMX unhappiness is transient or not), but the
primary issue (unhappy OMX) is probably still around. It is quite
difficult to reproduce, I will probably need to open a different bug
to track that issue.
Change-Id: I5b65b818378a5ae9c915e91b7db7129f0bda6837
Signed-off-by: John Grossman <johngro@google.com>
James Dong [Tue, 6 Dec 2011 20:52:52 +0000 (12:52 -0800)]
Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 18:01:27 +0000 (10:01 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
Andreas Huber [Tue, 6 Dec 2011 18:59:48 +0000 (10:59 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
John Grossman [Tue, 6 Dec 2011 18:04:38 +0000 (10:04 -0800)]
Merge "AudioFlinger: Make StandbyTime configurable." into ics-aah
John Grossman [Mon, 5 Dec 2011 22:35:26 +0000 (14:35 -0800)]
AudioFlinger: Make StandbyTime configurable.
Make the standby time for AudioFlinger configurable using a system
property. Default AudioFlinger behavior is to go into standby
(allowing the audio outputs to underflow) after there has been nothing
to mix and AudioFlinger has just been pumping out silence for the
configured standby time (which defaulted to 3 seconds).
Now, by setting the "ro.audio.flinger_standbytime_ms" property in
their platform init.rc, platforms can override this default and
control the standby time. If the property is missing or malformed,
the old default value of 3 seconds will be used instead.
Change-Id: Ic9fa8b5f5bccee493bc72c65e408d3fd8ddd1059
Signed-off-by: John Grossman <johngro@google.com>
Eric Laurent [Tue, 6 Dec 2011 01:22:46 +0000 (17:22 -0800)]
am
7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '
7b6aff23735a9ef8759c5ecb4427784413e9b85b':
audioflinger: fix audio skipping over A2DP
Eric Laurent [Tue, 6 Dec 2011 01:20:53 +0000 (17:20 -0800)]
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
James Dong [Mon, 5 Dec 2011 20:41:06 +0000 (12:41 -0800)]
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
The current logic does not check the I-frame at zeroeth position and therefore
for the files with only 1 I-Frame at zeroeth postion does not play.
Originally authored by Braganza Sam Robertsh <sam.braganza@samsung.com>
Do not merge to master branch since we made some improvement to SampleTable.cpp in the master branch.
Change-Id: I068184dec71986f14a586f769c2af1f52b4bcf94
related-to-bug:
5711942
Andreas Huber [Mon, 5 Dec 2011 20:02:53 +0000 (12:02 -0800)]
am
f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
* commit '
f2e1249846a17c69d728189a8dc67f37261f0a59':
Properly identify how much metadata we need to cache in order to instantiate
Andreas Huber [Mon, 5 Dec 2011 19:34:43 +0000 (11:34 -0800)]
Properly identify how much metadata we need to cache in order to instantiate
the extractor without blocking (and therefore be able to abort).
Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3
related-to-bug:
5666532
Eric Laurent [Mon, 5 Dec 2011 17:47:19 +0000 (09:47 -0800)]
audioflinger: fix audio skipping over A2DP
The maximum sleep time allowed in the mixer thread when audio tracks
are enabled but not ready for mixing is derived from the latency
reported by the output stream.
This does not work for A2DP where the latency also reflects encoding, decoding
and transfer time.
Modified activeSleepTimeUs() to take A2DP case into account.
Issue
5682206.
Change-Id: I3784ac01fb6f836b5a6ce6f764fb15347586de35
Mike Lockwood [Fri, 2 Dec 2011 21:22:28 +0000 (13:22 -0800)]
am
1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '
1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Mike Lockwood [Fri, 2 Dec 2011 21:22:26 +0000 (13:22 -0800)]
am
7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
* commit '
7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
Mike Lockwood [Thu, 1 Dec 2011 21:58:41 +0000 (16:58 -0500)]
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Bug:
5527220
Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c
Signed-off-by: Mike Lockwood <lockwood@google.com>
Mike Lockwood [Thu, 1 Dec 2011 23:36:06 +0000 (18:36 -0500)]
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
This could happen sometimes if other operations increased the size of the
data packet buffer to > 16K
Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800
Signed-off-by: Mike Lockwood <lockwood@google.com>
Andreas Huber [Thu, 1 Dec 2011 18:19:52 +0000 (10:19 -0800)]
am
2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
* commit '
2c2ed7bef931f43dc0701ab723beb0cbed2cb630':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
Andreas Huber [Thu, 1 Dec 2011 18:02:37 +0000 (10:02 -0800)]
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab
related-to-bug:
5696324
Jamie Gennis [Wed, 30 Nov 2011 01:26:59 +0000 (17:26 -0800)]
am
6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit '
6f1dd757cb158d17c76baeb170f7db2271802ef8':
SurfaceMediaSource: use the vid enc usage bit
Jamie Gennis [Wed, 30 Nov 2011 01:25:09 +0000 (17:25 -0800)]
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:30:46 +0000 (14:30 -0800)]
am
564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1
* commit '
564fee36667e2699c59a29102136220dc2f65862':
Make sure we can properly shutdown even if
Andreas Huber [Tue, 29 Nov 2011 22:30:45 +0000 (14:30 -0800)]
am
d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
* commit '
d12dc28460f622ab29e83fa688ad83a8263e9417':
If an error occurs that prevents us from reallocating buffers during a format change
Andreas Huber [Tue, 29 Nov 2011 22:30:43 +0000 (14:30 -0800)]
am
351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
* commit '
351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
Updated (internal) API for IStreamSource to signal discontinuities
Andreas Huber [Tue, 29 Nov 2011 22:30:40 +0000 (14:30 -0800)]
am
405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
* commit '
405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
Andreas Huber [Tue, 29 Nov 2011 22:09:10 +0000 (14:09 -0800)]
Merge "Make sure we can properly shutdown even if" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:09:03 +0000 (14:09 -0800)]
Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:45 +0000 (14:08 -0800)]
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 19:57:35 +0000 (11:57 -0800)]
Updated (internal) API for IStreamSource to signal discontinuities
Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96
related-to-bug:
5553055
Andreas Huber [Mon, 28 Nov 2011 20:36:11 +0000 (12:36 -0800)]
Finer granularity discontinuity support.
No clients can signal a format change on either audio or video track (or both)
and a time discontinuity (timestamps changed) independantly.
Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f
related-to-bug:
5553055
Andreas Huber [Tue, 29 Nov 2011 00:27:35 +0000 (16:27 -0800)]
Make sure we can properly shutdown even if
a) one of the two decoders has a pending discontinuity
b) the renderer holds on to all output buffers for that decoder
c) the renderer is paused
if all three conditions are met the decoder won't ask for more input data
and therefore never see the discontinuity.
To avoid this we briefly resume the renderer just before shutting down.
Change-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a
related-to-bug:
5655016
Andreas Huber [Mon, 28 Nov 2011 18:54:12 +0000 (10:54 -0800)]
If an error occurs that prevents us from reallocating buffers during a format change
we need to transition to executing state anyway to be able to properly flush/shutdown
in the future.
Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f
related-to-bug:
5655016
Eric Laurent [Wed, 23 Nov 2011 20:32:30 +0000 (12:32 -0800)]
am
20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '
20398fac99ff78cb3ec3dd122930e45d409e0524':
audioflinger: reduce sleep time to avoid underrun
Eric Laurent [Wed, 23 Nov 2011 02:50:29 +0000 (18:50 -0800)]
audioflinger: reduce sleep time to avoid underrun
Progressively reduce the sleep time applied in MixerThread::threadLoop()
in case of consecutive application underruns to avoid starving the audio HAL.
As the default sleep time is longer than the duration of an audio buffer
we ended up writing less data than needed by the audio HAL if
the condition persisted.
Issue
5553055.
Change-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5
Andreas Huber [Tue, 22 Nov 2011 16:41:26 +0000 (08:41 -0800)]
am
cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit '
cb6fbc89c25298643ab342b4a228e772b0e56978':
Report a runtime error instead of asserting on malformed avc configuration data.
Andreas Huber [Tue, 22 Nov 2011 16:39:11 +0000 (08:39 -0800)]
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
James Dong [Tue, 22 Nov 2011 04:30:14 +0000 (20:30 -0800)]
am
02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
* commit '
02740dc49df86fc94c872454aa9db98737d5e8c8':
Fix log spamming during time lapse video recording
Jamie Gennis [Tue, 22 Nov 2011 00:51:47 +0000 (16:51 -0800)]
SurfaceMediaSource: use the vid enc usage bit
This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when
allocating its GraphicBuffers rather than the HW_TEXTURE bit.
Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
James Dong [Sun, 20 Nov 2011 17:45:44 +0000 (09:45 -0800)]
Fix log spamming during time lapse video recording
Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f
related-to-bug:
5626569
Marco Nelissen [Fri, 18 Nov 2011 23:10:38 +0000 (15:10 -0800)]
am
7ff7821a: am
d4b22ab4: status_t != bool
* commit '
7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 23:07:21 +0000 (15:07 -0800)]
am
d4b22ab4: status_t != bool
* commit '
d4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 21:10:56 +0000 (13:10 -0800)]
status_t != bool
b/
5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
Andreas Huber [Fri, 18 Nov 2011 20:22:59 +0000 (12:22 -0800)]
Report a runtime error instead of asserting on malformed avc configuration data.
Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845
related-to-bug:
5641069
Andreas Huber [Thu, 17 Nov 2011 17:07:48 +0000 (09:07 -0800)]
am
c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
* commit '
c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
Andreas Huber [Thu, 17 Nov 2011 17:05:17 +0000 (09:05 -0800)]
Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
Andreas Huber [Wed, 16 Nov 2011 18:46:05 +0000 (10:46 -0800)]
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
or they are lost for good.
Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62
related-to-bug:
5544907
The Android Open Source Project [Wed, 16 Nov 2011 17:34:33 +0000 (09:34 -0800)]
The Android Open Source Project [Wed, 16 Nov 2011 17:27:57 +0000 (09:27 -0800)]
No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
The Android Open Source Project [Wed, 16 Nov 2011 16:55:42 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
Hong Teng [Tue, 15 Nov 2011 17:45:24 +0000 (09:45 -0800)]
am
481ffa50: Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
* commit '
481ffa505bb1d8f5089ea98e3b5960d409b6819c':
Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Hong Teng [Tue, 15 Nov 2011 17:42:37 +0000 (09:42 -0800)]
Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
Hong Teng [Thu, 10 Nov 2011 22:54:26 +0000 (14:54 -0800)]
Fix for issue
5309336
-add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
Eric Laurent [Mon, 14 Nov 2011 16:40:13 +0000 (08:40 -0800)]
am
030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '
030bb99814157b6424c0bf290bd2ede217b5ba77':
audioflinger: fix noise when skipping to next song
Eric Laurent [Mon, 14 Nov 2011 16:38:05 +0000 (08:38 -0800)]
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
Eric Laurent [Fri, 11 Nov 2011 23:42:52 +0000 (15:42 -0800)]
audioflinger: fix noise when skipping to next song
When audio effects are enabled, a noise can be heard at the
beginning of the new song when skipping to next song in music app.
This is because some effects (especially virtualizer) have a tail.
This tail was not played when previous song was stopped because effects were
not processed when no tracks were present on a given session. This is to
reduce CPU load when effects are enabled but no audio is playing.
The tail was then rendered when the new song was started.
Added a delay before stopping effect process after all tracks have been removed from a session.
Issue
5584880.
Change-Id: I815e0f7441f9302e8dfe413dc269a94e4cc6fd95
Andreas Huber [Fri, 11 Nov 2011 19:50:37 +0000 (11:50 -0800)]
am
23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
* commit '
23217182743521063655c6fb1b1580d3558cfbe7':
Didn't mean to check this in...
Eric Laurent [Fri, 11 Nov 2011 19:50:28 +0000 (11:50 -0800)]
am
1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1
* commit '
1f8c621279ddb163ee3d63bf32d79955679db0c5':
visualizer: reset buffer if playback is idle
Andreas Huber [Fri, 11 Nov 2011 19:50:23 +0000 (11:50 -0800)]
am
cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1
* commit '
cd556b82fd12dceb49e9d6543f80212721b220ec':
Instead of asserting, signal a runtime error if the session doesn't contain
Andreas Huber [Fri, 11 Nov 2011 19:50:21 +0000 (11:50 -0800)]
am
5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '
5d42075e450a49af2bb37ca3a9610921df7607f2':
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
Andreas Huber [Fri, 11 Nov 2011 19:50:20 +0000 (11:50 -0800)]
am
d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
* commit '
d9f25bc941746f268ab978e6b2af7b7c4ec2ea89':
Disconnect on socket error on the RTSP control connection.
James Dong [Fri, 11 Nov 2011 19:50:14 +0000 (11:50 -0800)]
am
08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
* commit '
08e42967b9e459b7beb22e859f1f1eba0546741b':
Add support for retrieving location information in mp4/3gpp files
Andreas Huber [Fri, 11 Nov 2011 18:46:02 +0000 (10:46 -0800)]
Merge "Didn't mean to check this in..." into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 18:17:00 +0000 (10:17 -0800)]
Didn't mean to check this in...
Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
Eric Laurent [Fri, 11 Nov 2011 16:17:22 +0000 (08:17 -0800)]
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:25 +0000 (07:39 -0800)]
Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:18 +0000 (07:39 -0800)]
Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:11 +0000 (07:39 -0800)]
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 22:48:20 +0000 (14:48 -0800)]
Disconnect on socket error on the RTSP control connection.
Change-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b
Andreas Huber [Wed, 9 Nov 2011 22:26:43 +0000 (14:26 -0800)]
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
return failure
Change-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79
related-to-bug:
5593654
Andreas Huber [Thu, 10 Nov 2011 20:40:30 +0000 (12:40 -0800)]
Instead of asserting, signal a runtime error if the session doesn't contain
any playable tracks at all.
Change-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6
James Dong [Wed, 9 Nov 2011 08:48:56 +0000 (00:48 -0800)]
Add support for retrieving location information in mp4/3gpp files
Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug:
5560253
Eric Laurent [Thu, 10 Nov 2011 18:02:18 +0000 (10:02 -0800)]
visualizer: reset buffer if playback is idle
Visualizer capture buffer must be reset if audio framework has stopped
calling process for a given period of time to get read of residual
data from previous captures.
Issue
5571920.
Change-Id: I6e73f971bb812cdbb2979a3b5e763abab07634eb
Andreas Huber [Thu, 10 Nov 2011 16:52:19 +0000 (16:52 +0000)]
am
2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1
* commit '
2375d16378e6f8b7694c5a2cd9e0622e382e6049':
Send RTSP control connection keep-alive requests
Andreas Huber [Thu, 10 Nov 2011 16:52:17 +0000 (16:52 +0000)]
am
b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1
* commit '
b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
Don't believe the PV decoder's lies...
Andreas Huber [Thu, 10 Nov 2011 16:49:12 +0000 (16:49 +0000)]
am
7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1
* commit '
7c063cf9679a2ecdda5e1639cfdca3e1084019f9':
There's no point in trying to continue to decode after an error was signalled.
Andreas Huber [Thu, 10 Nov 2011 16:48:44 +0000 (08:48 -0800)]
Merge "Send RTSP control connection keep-alive requests" into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 16:48:34 +0000 (08:48 -0800)]
Merge "Don't believe the PV decoder's lies..." into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 16:47:25 +0000 (08:47 -0800)]
Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1
Glenn Kasten [Wed, 9 Nov 2011 19:00:05 +0000 (19:00 +0000)]
am
f2c2b1c4: am
19998120: Merge "Bug
5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '
f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':
Bug
5478024 drop after decode if can't drop before
Eric Laurent [Wed, 9 Nov 2011 18:59:51 +0000 (18:59 +0000)]
am
2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1
* commit '
2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
Fix regression for SoundPool playback
Andreas Huber [Wed, 9 Nov 2011 18:26:06 +0000 (10:26 -0800)]
There's no point in trying to continue to decode after an error was signalled.
Change-Id: I2a2410cac9444eadd85be5d104799703171f1a24
related-to-bug:
5588658
Andreas Huber [Wed, 9 Nov 2011 18:03:07 +0000 (10:03 -0800)]
Don't believe the PV decoder's lies...
Change-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27
Glenn Kasten [Wed, 9 Nov 2011 16:41:19 +0000 (16:41 +0000)]
am
19998120: Merge "Bug
5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '
19998120f53caceb620f138c6eea182f1e693660':
Bug
5478024 drop after decode if can't drop before