summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 0224bf17: Various improvements of wifi display codeAndreas Huber2012-11-1416-302/+633
|\ | | | | | | | | * commit '0224bf170a3904576bba81593eaab113c5d3a4e7': Various improvements of wifi display code
| * Various improvements of wifi display codeAndreas Huber2012-11-1316-302/+633
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - manually prepend SPS/PPS if encoder doesn't support it - latency improvements - support for "our" method of optional RTP retransmission - improvements to the wfd commandline tool for testing - make it easier to turn on/off suspension of the video pipeline on idle - fixes an issue where an error during encryption would cause a SEGV - add HDCP descriptor if necessary Squashed commit of the following: commit 1115be0ebb3b885b4f1b7dba56761ca013d0ec4a Author: Andreas Huber <andih@google.com> Date: Fri Nov 9 11:32:23 2012 -0800 Better shutdown of wfd -l sessions. Change-Id: Id898a14ae21efd3b065b00a729830063d39195a7 commit 0e7d106dfe4eb6e2640b0b66c65deaba265f7ff0 Author: Andreas Huber <andih@google.com> Date: Thu Nov 8 16:38:55 2012 -0800 No more sending delay, create rtp packets upfront. Change-Id: I809a225f664fdb485c7d9a49a27886601a6a26b2 commit d399e8571b77353d59afb57508dfd2a82c1ef93a Author: Andreas Huber <andih@google.com> Date: Thu Nov 8 14:19:43 2012 -0800 Restore AudioSource buffer size, factor out TimeSeries, make suspending video optional. Change-Id: Ifdfe4d447b901e714abf52856b4641d1d55a5d41 commit f8b649f0b8f917d59f4b8a2e8e6d7db61a684a78 Author: Andreas Huber <andih@google.com> Date: Thu Nov 8 09:34:06 2012 -0800 Pull 480 frames at a time from AudioSource/AudioRecord Change-Id: I1e215abd329faec3da026631122c0f4c800c0ac4 commit 1bc13452eb35eebbba00f5da93fa86535be5db59 Author: Andreas Huber <andih@google.com> Date: Thu Nov 8 08:50:30 2012 -0800 fixed bitrate traffic simulation Change-Id: Ic5efb7cbb0b5d3b4917bc77b8ba73d447249e695 commit 016cdff18e74bdc631a5679e97192645ed095aa2 Author: Andreas Huber <andih@google.com> Date: Wed Nov 7 14:00:03 2012 -0800 resurrected "our" style of retransmission. Change-Id: I34d757aba67428437cb39b8293a9651750ad20d9 commit 384cf1a3c8fb4ec410bdf8fa5722c298e6028f3e Author: Andreas Huber <andih@google.com> Date: Tue Nov 6 09:38:55 2012 -0800 Changes to make wfd work on manta. Change-Id: I7a4e00cf16581fe2146edd1b359af195774090e4 commit 9628f24b22b35f28630d99dda3614babf51bc07e Author: Andreas Huber <andih@google.com> Date: Wed Nov 7 09:15:44 2012 -0800 Patch up rtp timestamps to more accurately measure network jitter. Change-Id: I9502a4615575f97f98a215a13131a89a6ae93c6d commit 7c891a1a24f08bbd50f55be13f7d05f43e807eb8 Author: Andreas Huber <andih@google.com> Date: Tue Nov 6 09:37:24 2012 -0800 Additions to the "wfd" tool to create a local wfd source. Change-Id: I99558653a70fdc703f9d13990b3ce1c4d3ae227a Change-Id: Ia94c63fc390f597014531073485f0cfc53b3418a
* | am 78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \ | |/ | | | | * commit '78b012f5bc05706d1ce412811ccfaa9385dae0ab':
| *-. Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Idf4c25115d89397ba668fc290344b2e7c1ea1993
* | \ \ am 1c6833af: Ignore SIGPIPE during write() to broken pipeGlenn Kasten2012-11-061-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '1c6833afd6cfdbc6c696ed0719ceedc37ec0b534': Ignore SIGPIPE during write() to broken pipe
| * | | Ignore SIGPIPE during write() to broken pipeGlenn Kasten2012-11-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens occasionally when taking a bugreport. Bug: 6447319 Change-Id: Ia6531a4a3658461f8fd3f7106e7996da7cc5933a
* | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-020-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: Icad86b92debd9605c745283aeffc3f459a3549ce
| * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-010-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | am 96076964: Make video encoders\' bitrate mode (constant, variable, ...) ↵Andreas Huber2012-11-013-6/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | configurable * commit '96076964863ee6887f0bed9d0f11f424b48ab9b9': Make video encoders' bitrate mode (constant, variable, ...) configurable
| * | | Make video encoders' bitrate mode (constant, variable, ...) configurableAndreas Huber2012-11-013-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through the desired output format. Configure the video encoder to use constant bitrate mode for WFD. Change-Id: Id7bd619598153c13448a9c5acd69d80f8a01f333 related-to-bug: 7459597
* | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-010-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I0fd73e8e0b948c2d01fdb9f4c6e005ee9cd2ac44
| * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-310-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | am 90a92053: Various tweaks to wfdAndreas Huber2012-10-3114-893/+1597
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '90a92053219ae50ddf4bb54e3d54db2d309e2b8d': Various tweaks to wfd
| * | | Various tweaks to wfdAndreas Huber2012-10-3114-893/+1597
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 7426218 Squashed commit of the following: commit 1553f1a1c66af998674168f7f7a3be23fcb0c794 Author: Andreas Huber <andih@google.com> Date: Tue Oct 30 15:51:27 2012 -0700 Add LPCM, AVC and AVC HRD descriptors as necessary. Change-Id: Ibc836fced0fe37e8a25574c2295e886765b9ea6f commit 4e74db61d2d31ebe239acbdec8f110f88016a4ea Author: Andreas Huber <andih@google.com> Date: Tue Oct 30 15:50:52 2012 -0700 added copyright headers to Sender.{cpp,h} Change-Id: If615ccb8767e32bd83ed1f0f669acc39a72489f6 commit 7144bf8ae68c5cdb8faa6e219547aabbd750f04e Author: Andreas Huber <andih@google.com> Date: Tue Oct 30 15:50:25 2012 -0700 Reenable suspension of the RepeaterSource Change-Id: I765338fcde89c65e4b69be45a5949eba6bcdcf6f commit 812164bcfa0699821d7d8eefcc0dff96b2e2cd08 Author: Andreas Huber <andih@google.com> Date: Tue Oct 30 14:03:50 2012 -0700 Add 2 stuffing bytes to the PES headers for audio tracks. Change-Id: I8b9c634f6a565ab7fa7ecdb610f7d8557e0b139b commit a084a741a63015d47c92d99fcd8b980fe615dc7d Author: Andreas Huber <andih@google.com> Date: Tue Oct 30 13:19:38 2012 -0700 Fix PCM audio packetization in WFD. Change-Id: I99a435f9fe6b4397f24d6c22afae5ae2505ffc14 commit c5cb9369585f701f34bce41534940d5f9b59248f Author: Andreas Huber <andih@google.com> Date: Tue Oct 30 13:19:12 2012 -0700 Support extraction of PCM audio from transport streams. Change-Id: I28a0516756ebcb5587325b6588df013ac871ffb9 commit b0a0512300ae037d6b39c2d04952d34b5fc12b2d Author: Andreas Huber <andih@google.com> Date: Tue Oct 30 08:54:13 2012 -0700 disable suspend of the RepeaterSource Change-Id: Ibf42a98185b0567f817ae582a82e6580f95d3d40 commit 4330e8b7668dc92a6d882b5622c0697cf292d04c Author: Andreas Huber <andih@google.com> Date: Mon Oct 29 14:11:25 2012 -0700 Better handling of datagrams in ANetworkSession reduce unnecessary copy overhead. Change-Id: I2ed8c767274ba07764f03e8d4913041168e5755f commit a44e73c322ba3f2c336f7cc4e1d63d3a74faa75d Author: Andreas Huber <andih@google.com> Date: Mon Oct 29 11:14:47 2012 -0700 Network traffic is now handled on a separate thread. Audio and video are queued to ensure proper A/V interleaving. Scheduled packet sends according to capture timestamps to reduce send-jitter. Change-Id: Ibd6357c1e663086cf87bec0a98f8e54dfdfaa0e5 related-to-bug: 7426218 Change-Id: Ia440129d656c35814abf18df06da50b73d5bb554
* | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-310-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I7cd153e8ccfb7d572a5796ca353ec9777de789d6
| * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-290-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-260-0/+0
| | |\ \
| | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-250-0/+0
| | | |\ \
| | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | | | |\ \
| | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-220-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-200-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-190-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-180-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | | | | | | |\ \
* | | | | | | | | | | | \ \ am 2295ce2c: Increase bitrate now that other issues have been resolved.Dave Burke2012-10-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2295ce2c6fcf07ffaa134440691a8cea5fe35b43': Increase bitrate now that other issues have been resolved.
| * | | | | | | | | | | | | Increase bitrate now that other issues have been resolved.Dave Burke2012-10-261-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7426218 Change-Id: I67dfa1e4b85f326f355ad0ec5b6c699e87b45564
* | | | | | | | | | | | | am e815552c: Disable silence suppression (causes issues with dongles).Dave Burke2012-10-291-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e815552c9cb17be79cb3b7eb6fbdfa9ad81c861b': Disable silence suppression (causes issues with dongles).
| * | | | | | | | | | | | Disable silence suppression (causes issues with dongles).Dave Burke2012-10-261-2/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7426218 Change-Id: Ie1517a8017bae1f9a9b6c224cd3170dfcc5fb941
* | | | | | | | | | | | am b8d6efba: Camera2: Don\'t hold locks while waiting to sync.Eino-Ville Talvala2012-10-241-33/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b8d6efba8b87e6eeb049651cb67f9827198e658e': Camera2: Don't hold locks while waiting to sync.
| * | | | | | | | | | | Camera2: Don't hold locks while waiting to sync.Eino-Ville Talvala2012-10-241-33/+35
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7409877 Change-Id: Ia3a0bc4f0ab4e19fca868ba04a870cf8e8ee7adb
* | | | | | | | | | | am ac1a450a: Merge "Don\'t attempt to seek audio and video separately." into ↵Andreas Huber2012-10-231-9/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'ac1a450a76c2f42f66c876200cb724d1e93ef4c7': Don't attempt to seek audio and video separately.
| * | | | | | | | | | Merge "Don't attempt to seek audio and video separately." into jb-mr1-devAndreas Huber2012-10-231-9/+17
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Don't attempt to seek audio and video separately.Andreas Huber2012-10-231-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The widevine extractor doesn't deal too well with that... Change-Id: Iadfeede4fe0c086af788c5639782854e4fbb98ff related-to-bug: 7262386
* | | | | | | | | | | am 6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-devEino-Ville Talvala2012-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc': Camera2: Increase mode update timeout.
| * | | | | | | | | | Merge "Camera2: Increase mode update timeout." into jb-mr1-devEino-Ville Talvala2012-10-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Camera2: Increase mode update timeout.Eino-Ville Talvala2012-10-231-1/+1
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During camera startup, it might take a few hundred milliseconds before requests start to be dequeued by the HAL. Increase the timeout for synchronizing mode changes and triggers so that triggers near startup don't time out. Bug: 6970465 Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
* | | | | | | | | | am 5f6f5b7d: Merge "stagefright: discard audio at start of capture" into ↵Eric Laurent2012-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1': stagefright: discard audio at start of capture
| * | | | | | | | | Merge "stagefright: discard audio at start of capture" into jb-mr1-devEric Laurent2012-10-231-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | stagefright: discard audio at start of captureEric Laurent2012-10-221-1/+1
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new camcorder start sound is longer than previous one and we must discard more audio when capture starts. Ideally, camcorder should use synchronous record start. Bug 7394330. Change-Id: I219b4e231aba706776dc7ccc4f1c996eaf22f61a
* | | | | | | | | | am c4640c9e: Increase allowed number of VHQ resamplers to 3Glenn Kasten2012-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c4640c9eef850bb1c754bd6b477f1cc8350c6081': Increase allowed number of VHQ resamplers to 3
| * | | | | | | | | Increase allowed number of VHQ resamplers to 3Glenn Kasten2012-10-221-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7378660 Change-Id: I69e33ca2eb4bb9bd38e2c63df62cd1130d68baf6
* | | | | | | | | am e384d75b: Merge "Fix a typo that caused the high quality resampler to ↵Mathias Agopian2012-10-221-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | produce garbage" into jb-mr1-dev * commit 'e384d75b95b9db30d64a18ada93e070cf07de306': Fix a typo that caused the high quality resampler to produce garbage
| * | | | | | | | Merge "Fix a typo that caused the high quality resampler to produce garbage" ↵Mathias Agopian2012-10-221-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| | * | | | | | | | Fix a typo that caused the high quality resampler to produce garbageMathias Agopian2012-10-211-1/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the problem is that if libaudio_resampler is present, it is those coefficients that will always be selected, but the correct meta-data. Bug: 7385994 Change-Id: Ieebeb37b4dfb62a1a051bc29fae2ce056dbc6621
* | | | | | | | | am 0328ec08: WFD use of HDCP is now optional.Andreas Huber2012-10-222-66/+40
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0328ec08dc1e90caa2a9e0c4e107d8ddaa74af20': WFD use of HDCP is now optional.
| * | | | | | | | WFD use of HDCP is now optional.Andreas Huber2012-10-222-66/+40
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the sink supports it we'll use HDCP (and fail if necessary), if it doesn't we won't. If an HDCP session is established we'll tell our observer that the connection is secure, otherwise we don't. Change-Id: I7cbef384f2cf0a6ac65801c581eea227b9ef4c46 related-to-bug: 7368436
* | | | | | | | am c3ed4a1c: Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-devJean-Michel Trivi2012-10-191-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3ed4a1c3ea71681c71de48c206a899e702864bd': AAC DRC reference level for mobile is -16dB
| * | | | | | | Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-devJean-Michel Trivi2012-10-191-1/+1
| |\ \ \ \ \ \ \