summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Add support for common encryptionMarco Nelissen2013-04-084-8/+404
| | | | | | b/7465749 Change-Id: I5403b74a5ae428ad28b382863a09daafc400b137
* Merge "In certain cases where AAC audio frames extended into the next PES ↵Andreas Huber2013-04-051-24/+37
|\ | | | | | | payload" into jb-mr2-dev
| * In certain cases where AAC audio frames extended into the next PES payloadAndreas Huber2013-04-051-24/+37
| | | | | | | | | | | | (inside transport streams) timestamps would be miscalculated. This fixes it. Change-Id: I9d74eeea474d2b89e8a9cdc478ed6085282fb3be
* | Merge "Implement async event callout from drm plugin to Java app" into ↵Jeff Tinker2013-04-055-3/+152
|\ \ | | | | | | | | | jb-mr2-dev
| * | Implement async event callout from drm plugin to Java appJeff Tinker2013-04-035-3/+152
| | | | | | | | | | | | Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
* | | Merge "Make sure resume() and flush() are handled appropriately even if the ↵Marco Nelissen2013-04-041-0/+15
|\ \ \ | |_|/ |/| | | | | codec" into jb-mr2-dev
| * | Make sure resume() and flush() are handled appropriately even if the codecMarco Nelissen2013-04-041-0/+15
| | | | | | | | | | | | | | | | | | | | | is in Loaded->Idle state. b/8347958 Change-Id: Ic14d29502a7effc636251379bb1bbc25739db98e
* | | Merge "Fix previous changes." into jb-mr2-devLajos Molnar2013-04-043-8/+13
|\ \ \
| * | | Fix previous changes.Andreas Huber2013-04-043-8/+13
| | | | | | | | | | | | | | | | Change-Id: I1cd3803b6507156174591c3252f1d89ef2e6140a
* | | | Merge "RTPReceiver can now track packet loss, account for late arrivals" ↵Andreas Huber2013-04-042-65/+215
|\ \ \ \ | |/ / / | | | | | | | | into jb-mr2-dev
| * | | RTPReceiver can now track packet loss, account for late arrivalsAndreas Huber2013-04-042-65/+215
| | | | | | | | | | | | | | | | | | | | | | | | it also uses timers to trigger retransmission and packet loss declaration Change-Id: If1f9324783b3bef950076c2edf321f7c33ff9fea
* | | | Merge "Support "raw" packetization in RTPSender." into jb-mr2-devAndreas Huber2013-04-044-1/+46
|\ \ \ \ | |/ / /
| * | | Support "raw" packetization in RTPSender.Andreas Huber2013-04-044-1/+46
| | | | | | | | | | | | | | | | Change-Id: I14d59573ee0f57eccc104fea0fb46377476d213d
* | | | Merge "New nettest, a simple TCP connection test to measure" into jb-mr2-devAndreas Huber2013-04-042-0/+418
|\ \ \ \ | |/ / /
| * | | New nettest, a simple TCP connection test to measureAndreas Huber2013-04-042-0/+418
| | | | | | | | | | | | | | | | | | | | | | | | latency between two devices exchanging low-bitrate data. Change-Id: Iac138fa70d2a69bbc86c517c953011c80bed071f
* | | | Merge "RTPTest updated to allow for UDP/TCP transport and abstracted" into ↵Andreas Huber2013-04-041-49/+228
|\ \ \ \ | |/ / / | | | | | | | | jb-mr2-dev
| * | | RTPTest updated to allow for UDP/TCP transport and abstractedAndreas Huber2013-04-041-49/+228
| | | | | | | | | | | | | | | | | | | | | | | | where the data is coming from, also added time synchronization. Change-Id: Iecc2201a2bd17be06f16690a28261bef5b4e439c
* | | | Merge "Track max latency in WifiDisplaySink" into jb-mr2-devAndreas Huber2013-04-042-5/+20
|\ \ \ \ | |/ / /
| * | | Track max latency in WifiDisplaySinkAndreas Huber2013-04-042-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also unbreak non-special-mode by choosing a proper time offset based on arrival time of the first access unit even when no time synchronization is present. Change-Id: I133050afc6f70d4639ca45de68a31d5bc3594e96
* | | | Merge "Reduce TimeSyncer frequency to once every 60 secs, added some logs" ↵Andreas Huber2013-04-042-1/+7
|\ \ \ \ | |/ / / | | | | | | | | into jb-mr2-dev
| * | | Reduce TimeSyncer frequency to once every 60 secs, added some logsAndreas Huber2013-04-042-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | to indicate when syncing intervals start and end. Change-Id: I3b2b997d6723ff592af7c31082c6020cc1eca433
* | | | Merge "Removed rtp timestamp patching hack in ANetworkSession, advertise" ↵Andreas Huber2013-04-041-18/+8
|\ \ \ \ | |/ / / | | | | | | | | into jb-mr2-dev
| * | | Removed rtp timestamp patching hack in ANetworkSession, advertiseAndreas Huber2013-04-041-18/+8
| | | | | | | | | | | | | | | | | | | | | | | | differentiated service tags to help prioritize our traffic. Change-Id: Ibe42df64da272f4bb6b978e46a4ea2efdadfcbc7
* | | | Merge "Fix adaptive frame rate handling to be non-adaptive unless specified ↵Andreas Huber2013-04-041-2/+5
|\ \ \ \ | |/ / / | | | | | | | | through" into jb-mr2-dev
| * | | Fix adaptive frame rate handling to be non-adaptive unless specified throughAndreas Huber2013-04-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | adb shell setprop media.wfd.video-framerate adaptive Change-Id: I452576b62ad465680232b40464977e126616df18
* | | | Fix a number of warnings in stagefright code.Andreas Huber2013-04-043-3/+4
|/ / / | | | | | | | | | Change-Id: If3edd00d991851797aeccdfe795a4a405e3a2ea3
* | | Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-023-144/+465
|\ \ \ | | |/ | |/|
| * | MediaDrm API updateJeff Tinker2013-04-013-144/+465
| | | | | | | | | | | | | | | | | | | | | | | | Clarify offline usage of sessions and keys and implement implement CryptoSession to support additional crypto use cases. Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
* | | Merge "Fix seek in response to OnPrepared() for HLS content" into jb-mr2-devAndreas Huber2013-04-013-23/+23
|\ \ \
| * | | Fix seek in response to OnPrepared() for HLS contentAndreas Huber2013-04-013-23/+23
| | | | | | | | | | | | | | | | | | | | Change-Id: I0e52352845398a4db074e939487f6f6de94bd523 related-to-bug: 8225122
* | | | Merge "ToneGenerator: fix overflow in stopTone" into jb-mr2-devEric Laurent2013-04-011-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | ToneGenerator: fix overflow in stopToneEric Laurent2013-03-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix overflow in tone duration calculation introduced in commit 681be039. Bug 6607077 Change-Id: Ie12f13701345c2b2d3be0b3c4d71cbfa2394a29b
* | | | MTP: Implement date created field in GetObjectInfoMike Lockwood2013-04-011-1/+2
| | | | | | | | | | | | | | | | | | | | Bug: 8293874 Change-Id: I6b74fe73362bd4fac34ca8a54e127ae91f82aef9
* | | | Merge "stagefright: matroska: don't crash on parsing error" into jb-mr2-devLajos Molnar2013-04-011-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | stagefright: matroska: don't crash on parsing errorLajos Molnar2013-03-271-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | MatroskaExtractor crashed with an assertion if mkvparser::ParseNext() returned a negative number. Now handle all error values the same way as the EOF. Change-Id: I173c4f878d692a0cbdb915ad1118d0686249d625 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 8433794
* | | Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into ↵Andreas Huber2013-03-281-3/+17
|\ \ \ | | | | | | | | | | | | jb-mr2-dev
| * | | Fix SHUTDOWN after SETUP and before PLAY in wifi display.Andreas Huber2013-03-281-3/+17
| | |/ | |/| | | | | | | | | | Change-Id: Ieb8ce1ac3130254839975a3677162b64156735bc related-to-bug: 8499893
* | | Merge "Make sure resume() and flush() are handled appropriately even if the ↵Andreas Huber2013-03-281-0/+16
|\ \ \ | | | | | | | | | | | | codec" into jb-mr2-dev
| * | | Make sure resume() and flush() are handled appropriately even if the codecAndreas Huber2013-03-281-0/+16
| |/ / | | | | | | | | | | | | | | | | | | is in Idle->Executing state. Change-Id: I16a10791fae0e062a19299732c472cc93e4ed971 related-to-bug: 8347958
* | | Merge "Fix valgrind error in software h264 decoder" into jb-mr2-devMarco Nelissen2013-03-281-4/+2
|\ \ \
| * | | Fix valgrind error in software h264 decoderMarco Nelissen2013-03-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | h264bsdNextMbAddress could read past the end of an allocation, which could conceivably result in a segfault if the allocation was at the very end of a page. Change-Id: Id7a0c5733d66e609f36feb0e15b2d67b9bbc0b4d
* | | | Merge "Fix valgrind error." into jb-mr2-devMarco Nelissen2013-03-281-1/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Fix valgrind error.Marco Nelissen2013-03-271-1/+2
| |/ | | | | | | | | | | | | The constructor calls reset(), which in turn calls stop(), which then accesses mCaptureTimeLapse before it has been initialized. Change-Id: Ia94ac740b9bd1a0389c72647a5639dd25320d92c
* | ToneGenerator: fix truncated tonesEric Laurent2013-03-271-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first DTMF tone after a silent period is truncated. This is because the phone app starts and stops the tone when the user presses and releases the key. This combined to the fact that the tones use the low latency path and that when the output stream exists standby there is a period of several milliseconds during which no audio is mixed until the stream is "warmed up". The result is that much less audio is generated than the actual key press duration. The fix consists in storing the tone start time and making sure that the number of samples generated corresponds at least to the time difference between the tone start and stop commands. Bug 6607077 Change-Id: I070d20dd8600c25a9e5d5a60c1d3313b7917b00d
* | Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-devEric Laurent2013-03-281-5/+10
|\ \ | |/ |/|
| * ToneGenerator: fix stop/destroy concurrencyEric Laurent2013-03-261-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a problem if the stopTone() method is called from two different threads (for instance if the destructor is called while stopTone() is waiting for the audio callback to finish). In this case, the second call to stopTone() will not wait for the condition to be signaled and call clearWaveGens() while the callback can still be active, thus causing a crash. There is a similar problem in case of concurrent calls to startTone() and stopTone(). The fix consists in making sure that stopTone() always waits for call back completion or timeout and exits before calling clearWaveGens() if a concurrent start request is detected. Bug 8163071 Change-Id: I9ddb4390407701dcad5bf83660fd9903f0d72268
* | Merge "Adapt frame rate instead of keeping that constant and tweaking ↵Andreas Huber2013-03-265-29/+88
|\ \ | |/ |/| | | bitrate" into jb-mr2-dev
| * Adapt frame rate instead of keeping that constant and tweaking bitrateAndreas Huber2013-03-265-29/+88
| | | | | | | | Change-Id: I889abbbe1237e1a8fdd7135cdc91a2e9728ff39b
* | ToneGenerator: fix AudioTrack pointer initEric Laurent2013-03-261-1/+1
|/ | | | | | | | | | The pointer to AudioTrack should be initialized before early return from ToneGenerator constructor because it is tested by the destructor. Bug 8140963 Change-Id: I9a7dfb60ba162b75dfaa5630ab7fc9485afd0074
* Identify network servers and clients with a OS version related stringAndreas Huber2013-03-269-56/+42
| | | | | | and put the logic to create that string in one location instead of many... Change-Id: I1f729f2e7376cd3b45eea0e48f7bd10084b41b39
generated by cgit v1.1 at 2025-01-09 21:42:09 +0000