OSDN Git Service
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
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 [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
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"
Christer Fletcher [Thu, 13 Sep 2012 08:28:39 +0000 (10:28 +0200)]
Initialize and copy mRotationAngle in VideoFrame
When thumbnails were generated they could be generated at random
angles as the mRotationAngle variable was not initialized to any
value. This variable would have to be explicitly overwritten to not
cause random rotation. Changed the implementation to initialize the
value to 0 (no rotation). mRotationAngle was also missing in the
copy constructor.
Change-Id: I67a5340fdd807c6ab3a3da5eecb09b5b9d5f4666
Simon Wilson [Thu, 29 Nov 2012 23:26:48 +0000 (15:26 -0800)]
Merge "Use ATRACE macros instead of Tracer statics"
Dylan Powers [Thu, 29 Nov 2012 23:23:00 +0000 (15:23 -0800)]
am
2ee204af: am
47c1a5f7: Bug fix for the MediaPlayer::prepare() api.
* commit '
2ee204af3d715b983bc4806fb830feefd401fd4b':
Bug fix for the MediaPlayer::prepare() api.
Dylan Powers [Thu, 29 Nov 2012 23:20:31 +0000 (15:20 -0800)]
am
47c1a5f7: Bug fix for the MediaPlayer::prepare() api.
* commit '
47c1a5f7c13d82aa8834fd4543bd1d713b97808e':
Bug fix for the MediaPlayer::prepare() api.
Simon Wilson [Thu, 29 Nov 2012 23:18:50 +0000 (15:18 -0800)]
Use ATRACE macros instead of Tracer statics
ATRACE_BEGIN and ATRACE_END have replaced the static
Tracer::traceBegin and Tracer::traceEnd functions, so
use them instead.
Fixes compilation errors when tracing is enabled.
Change-Id: I4d1147d2f76afcdf113e9986f0544cb848802b15
Dylan Powers [Wed, 28 Nov 2012 00:06:38 +0000 (16:06 -0800)]
Bug fix for the MediaPlayer::prepare() api.
For an MP3 source, within the prepare command, ID3 tags are checked in search of
gapless playback info. This causes problems for streamed sources. If ID3v2 tags
aren't present, then a check is done for ID3v1 tags. This results in a read
command that asks the cache to jump to the end of the file, and subsequently
make an extra http call to request those bytes. For a streamed source, this
causes the file to not be downloaded automatically when MediaPlayer::prepare()
is called, and causes stuttering and extra buffering time to be needed when
start() is finally called.
The solution is to ignore the ID3v1 tags as the gapless info would never exist
there, and only check for ID3v2 tags.
Cherrypicked from external contribution
ffd6ffc5429c45577fd8e9f8fa90e79bb91b8a84
b/
7638165
Change-Id: I7d1b94cffbfe7c38ca094834dedbc92a58855e20
Glenn Kasten [Thu, 29 Nov 2012 22:32:22 +0000 (14:32 -0800)]
Andreas Huber [Thu, 29 Nov 2012 22:32:21 +0000 (14:32 -0800)]
am
2f6107ec: am
b64def9a: Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev
* commit '
2f6107ec8e67eea1f73b9558a5ad34caec52867f':
[wfd] Support a low(er) power state by triggering PAUSE/RESUME.
Andreas Huber [Thu, 29 Nov 2012 22:32:20 +0000 (14:32 -0800)]
am
5ea87edb: am
e5aed03d: Enable retransmission of UDP packets in case we want to use it
* commit '
5ea87edbc97cd693fb7a9a8e00e712978315693c':
Enable retransmission of UDP packets in case we want to use it
James Dong [Thu, 29 Nov 2012 22:32:19 +0000 (14:32 -0800)]
am
bd4f7b89: am
79c56d3f: Merge "Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display" into jb-mr1.1-dev
* commit '
bd4f7b8931a316ca43fae033d86167c83a8bac07':
Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display
James Dong [Thu, 29 Nov 2012 22:32:18 +0000 (14:32 -0800)]
am
296cb9dd: am
0dbe5a93: Added optional intra macroblock refresh support for encoding
* commit '
296cb9ddd916c43983bfb4ddab9c69ed555d4cc4':
Added optional intra macroblock refresh support for encoding
Glenn Kasten [Thu, 29 Nov 2012 22:28:51 +0000 (14:28 -0800)]
Andreas Huber [Thu, 29 Nov 2012 22:27:59 +0000 (14:27 -0800)]
am
b64def9a: Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev
* commit '
b64def9a555bfbf533a2da41ba0189b9842a76fb':
[wfd] Support a low(er) power state by triggering PAUSE/RESUME.
Andreas Huber [Thu, 29 Nov 2012 22:27:53 +0000 (14:27 -0800)]
am
e5aed03d: Enable retransmission of UDP packets in case we want to use it
* commit '
e5aed03d30ea0ce49728873c5b74f89ba05a9541':
Enable retransmission of UDP packets in case we want to use it
James Dong [Thu, 29 Nov 2012 22:25:49 +0000 (14:25 -0800)]
am
79c56d3f: Merge "Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display" into jb-mr1.1-dev
* commit '
79c56d3f17d3193a0a86eb3c9bfdea90b89ae3f9':
Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display
James Dong [Thu, 29 Nov 2012 22:25:47 +0000 (14:25 -0800)]
am
0dbe5a93: Added optional intra macroblock refresh support for encoding
* commit '
0dbe5a9321b24b6883fbb2fe97cd9d525128b0b5':
Added optional intra macroblock refresh support for encoding
Glenn Kasten [Thu, 29 Nov 2012 22:09:41 +0000 (14:09 -0800)]
Fix log spam
Change-Id: Ie6c982af906dcfd3cdea4b771dfab1f7e47745ca
Andreas Huber [Thu, 29 Nov 2012 22:08:24 +0000 (14:08 -0800)]
Merge "Clear the sticky EOS flags when transitioning to LOADED state"
Andreas Huber [Thu, 29 Nov 2012 21:49:07 +0000 (13:49 -0800)]
Clear the sticky EOS flags when transitioning to LOADED state
instead of transitioning _from_ UNINITIALIZED state. This makes codec instances
reusable.
Change-Id: I8f0c11923978ffee58b553a5ac59c740b0223c54
Marco Nelissen [Thu, 29 Nov 2012 19:35:12 +0000 (11:35 -0800)]
am
ce8dcdf5: am
031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."
* commit '
ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca':
Bug fix for the MediaPlayer::prepare() api.
Marco Nelissen [Thu, 29 Nov 2012 19:33:11 +0000 (11:33 -0800)]
am
031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."
* commit '
031c93df74621dc2149876dc377aedee8930547f':
Bug fix for the MediaPlayer::prepare() api.
Marco Nelissen [Thu, 29 Nov 2012 19:08:16 +0000 (11:08 -0800)]
Merge "Bug fix for the MediaPlayer::prepare() api."
Andreas Huber [Thu, 29 Nov 2012 18:57:06 +0000 (10:57 -0800)]
Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev
Andreas Huber [Thu, 29 Nov 2012 17:54:42 +0000 (09:54 -0800)]
Enable retransmission of UDP packets in case we want to use it
in our upcoming wfd _sink_ implementation.
Change-Id: I4509c30d5a7b992bc841b73d63db902bbcf8f76a
related-to-bug:
7638155
Andreas Huber [Fri, 16 Nov 2012 18:38:11 +0000 (10:38 -0800)]
[wfd] Support a low(er) power state by triggering PAUSE/RESUME.
Change-Id: Ibe42bfa73816bbfeb7e652d435254d0171b89727
related-to-bug:
7638150
Andreas Huber [Thu, 29 Nov 2012 17:49:35 +0000 (09:49 -0800)]
am
37ddc8fc: am
251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"
* commit '
37ddc8fc0f78234b5b3b58886113560cdf98aadf':
Unsolicited server responses cause RTSP streaming to crash
Andreas Huber [Thu, 29 Nov 2012 17:14:30 +0000 (09:14 -0800)]
am
251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"
* commit '
251c04b1f3d048f541832c93347c6604b314e0ea':
Unsolicited server responses cause RTSP streaming to crash
Andreas Huber [Thu, 29 Nov 2012 16:51:21 +0000 (08:51 -0800)]
Merge "Unsolicited server responses cause RTSP streaming to crash"
Lena Magnusson [Fri, 20 Jan 2012 08:39:38 +0000 (09:39 +0100)]
Unsolicited server responses cause RTSP streaming to crash
If the set up of the RTSP stream contains an incorrect or otherwise
problematic URL, some servers will send an unsolicited server response
that contains a negative number in the sequence number (CSeq) field.
This negative value is not returned from the function findPendingRequest(),
so the check in notifyResponseListener() will not work. Instead there will
be a crash when 0 is used as the index to find a matching request/response
pair that doesn’t exist.
The fix is to return the received sequence number also when it is an
unsolicited server-client message.
Change-Id: Iedaba8a63dece7b43bce007069baefbfd10970b8
James Dong [Wed, 28 Nov 2012 23:40:54 +0000 (15:40 -0800)]
Merge "Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display" into jb-mr1.1-dev
James Dong [Fri, 16 Nov 2012 02:31:50 +0000 (18:31 -0800)]
Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display
The time interval between periodic neighboring IDR frames is increased from 1 second to 15 seconds.
o related-to-bug:
7524791
Change-Id: Ic32f37448f952f329549eda5e73637ee3b02f046
James Dong [Thu, 15 Nov 2012 22:00:26 +0000 (14:00 -0800)]
Added optional intra macroblock refresh support for encoding
o related-to-bug:
7524791
Change-Id: I95ac4ee925e2dbeb00b3cfb2e29c611698c5cc9f
Andreas Huber [Wed, 28 Nov 2012 17:44:19 +0000 (09:44 -0800)]
am
7b7f17dc: am
b7c8e918: Add support for HLS playlists of type \'event\'.
* commit '
7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7':
Add support for HLS playlists of type 'event'.
Andreas Huber [Wed, 28 Nov 2012 17:42:18 +0000 (09:42 -0800)]
am
b7c8e918: Add support for HLS playlists of type \'event\'.
* commit '
b7c8e91880463ff4981e3e53e98e45d68e2fe374':
Add support for HLS playlists of type 'event'.
Ben Murdoch [Wed, 28 Nov 2012 13:58:29 +0000 (13:58 +0000)]
Fix master build.
Change-Id: Ia362f74d8cd7df76292473c26c112dffe190c599
Glenn Kasten [Wed, 28 Nov 2012 02:43:32 +0000 (18:43 -0800)]
am
5d7b2778: resolved conflicts for merge of
41829f30 to jb-mr1-dev-plus-aosp
* commit '
5d7b2778d0e9849fa601d722ec2efcee7d032d4f':
New VHQ resampler
Dylan Powers [Wed, 28 Nov 2012 00:06:38 +0000 (16:06 -0800)]
Bug fix for the MediaPlayer::prepare() api.
For an MP3 source, within the prepare command, ID3 tags are checked in search of
gapless playback info. This causes problems for streamed sources. If ID3v2 tags
aren't present, then a check is done for ID3v1 tags. This results in a read
command that asks the cache to jump to the end of the file, and subsequently
make an extra http call to request those bytes. For a streamed source, this
causes the file to not be downloaded automatically when MediaPlayer::prepare()
is called, and causes stuttering and extra buffering time to be needed when
start() is finally called.
The solution is to ignore the ID3v1 tags as the gapless info would never exist
there, and only check for ID3v2 tags.
Change-Id: I7d1b94cffbfe7c38ca094834dedbc92a58855e20