summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Added CTS test for secure stop APIsJeff Tinker2013-04-161-0/+1
| | | | | | bug: 8604418 Change-Id: I173fa1ec904ba11dc4cff0343462b3f4bac0d365
* Merge "Fix AAC decoder reconfiguration" into jb-mr2-devMarco Nelissen2013-04-151-0/+6
|\
| * Fix AAC decoder reconfigurationMarco Nelissen2013-04-151-0/+6
| | | | | | | | | | | | | | | | The recent flush() changed made the codec behave differently after a reconfigure. Now we reset its state properly again. b/8543366 Change-Id: I8807b5ab02249b43fc1cf315d4e8d4ceb3f9b298
* | Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording ↵ztenghui2013-04-152-16/+28
|\ \ | | | | | | | | | mode." into jb-mr2-dev
| * | MediaMuxer prefer not to use the MPEG4Writer in real time recording mode.ztenghui2013-04-152-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | By default, MPEG4Write will keep running in real time recording mode. bug:8598944 Change-Id: Idf7fbd4e0feb7763660a74279ba8817b79098aaf
* | | Merge "Instead of returning an error, return an invalid duration (-1 ms)" ↵Andreas Huber2013-04-152-3/+10
|\ \ \ | |_|/ |/| | | | | into jb-mr2-dev
| * | Instead of returning an error, return an invalid duration (-1 ms)Andreas Huber2013-04-112-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | if no duration information was available. This prevents us from entering ERROR state, effectively rendering the player instance useless. Change-Id: I602d2661ae8b8633360306c0ea9208fb11e2bf17 related-to-bug: 8596285
* | | Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-devJamie Gennis2013-04-121-17/+15
|\ \ \
| * | | OMXNodeInstance: fix OMX_GetExtensionIndex loggingJamie Gennis2013-04-091-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the logging of OMX_GetExtensionIndex errors. Under certain circumstances these errors are not harmful and should not be logged. Bug: 8538872 Change-Id: I19a13d29ca6263454a9a7a8be205e10363725f31
* | | | Merge "Fix MediaCodec.flush()" into jb-mr2-devMarco Nelissen2013-04-123-56/+55
|\ \ \ \
| * | | | Fix MediaCodec.flush()Marco Nelissen2013-04-123-56/+55
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two problems here. One was that the skip/cut buffer wasn't cleared when it should be, and the second was that we were always sending the first buffer of encoded data to the AAC decoder twice. b/8543366 Change-Id: Ic040edabf16cccd1f6ef8c9e5c9cfbacbdd8a089
* | | | Merge "ACodec now signals an error if the mediaserver died while it is in" ↵Andreas Huber2013-04-122-9/+50
|\ \ \ \ | | | | | | | | | | | | | | | into jb-mr2-dev
| * | | | ACodec now signals an error if the mediaserver died while it is inAndreas Huber2013-04-112-9/+50
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | anything other than "uninitialized" state. Change-Id: Id133d897ac65b455b34e5de17ff9c39b47285630 related-to-bug: 8397711
* | | | The framework really doesn't need to know the specifics of the codecAndreas Huber2013-04-112-15/+0
|/ / / | | | | | | | | | | | | | | | | | | color format, so stop trying to enforce a whitelist. Change-Id: I0ceb3bdd5bcc6c1bbd56740b0cd662a2b5820dfe related-to-bug: 8596546
* | | Add liblogYing Wang2013-04-0935-28/+44
|/ / | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* | 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