summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "MPEG2PSExtractor: check number of bits left before skipping" into mnc-devRobert Shih2015-04-301-0/+4
|\
| * MPEG2PSExtractor: check number of bits left before skippingRobert Shih2015-04-291-0/+4
| | | | | | | | | | Bug: 18752034 Change-Id: Ie185ebac8324b4fd6dbb68d7cc53124dfe97cbc2
* | Merge "AudioSystem callback for dynamic policy mix activity" into mnc-devJean-Michel Trivi2015-04-302-5/+21
|\ \
| * | AudioSystem callback for dynamic policy mix activityJean-Michel Trivi2015-04-292-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add method to AudioPolicyServiceClient for dynamic policy mix activity notification. Propagate notification to a dedicated callback. Bug 20226914 Change-Id: I37928ed38e15ea2b8fed022cccadeca8c4d6c876
* | | Merge "libstagefright: add xml parsing for measured-frame-rate and ↵Ronghua Wu2015-04-301-2/+4
|\ \ \ | | | | | | | | | | | | measured-blocks-per-second." into mnc-dev
| * | | libstagefright: add xml parsing for measured-frame-rate and ↵Ronghua Wu2015-04-291-2/+4
| |/ / | | | | | | | | | | | | | | | | | | measured-blocks-per-second. Bug: 20507129 Change-Id: I4623d2bd93670283d6c82c9bf9acfd00e214c4f0
* | | Merge "Don't use the bitrate of the xing header" into mnc-devMarco Nelissen2015-04-301-23/+35
|\ \ \
| * | | Don't use the bitrate of the xing headerMarco Nelissen2015-04-291-23/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the one for the mp3 frame that follows instead. Bug: 19622311 Bug: https://code.google.com/p/android/issues/detail?id=158627 Change-Id: I7f1ad702cad06aa29100a66f9796ca920aaa0592
* | | | Merge "NdkMediaCodec: Return NULL if the MediaCodec cannot be created" into ↵Andy Hung2015-04-301-9/+17
|\ \ \ \ | | | | | | | | | | | | | | | mnc-dev
| * | | | NdkMediaCodec: Return NULL if the MediaCodec cannot be createdAndy Hung2015-04-291-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20566134 Change-Id: Idb09bc47a02aed03e97aa81f303ed95ebaa2f5ba
* | | | | Merge "stagefright: make BufferQueueProducer not re-allocate buffer when ↵Wei Jia2015-04-301-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | trying to dequeue a buffer on devices not supporting meta data buffer mode." into mnc-dev
| * | | | | stagefright: make BufferQueueProducer not re-allocate buffer when trying to ↵Wei Jia2015-04-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dequeue a buffer on devices not supporting meta data buffer mode. Bug: 19666434 Change-Id: Id676486d6d4543af7c4da9553134082ab67a9699
* | | | | | Merge "Omx: Return an error if no IOMX is available" into mnc-devAndy Hung2015-04-304-4/+21
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Omx: Return an error if no IOMX is availableAndy Hung2015-04-294-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously caused fatal crash. Bug: 20566134 Change-Id: I9761d043422954615dbe81b301401765146a7283
* | | | | | Merge "DO NOT MERGE: Prevent crash at erroneous MPEG2TS bitstream" into mnc-devJinsuk Kim2015-04-295-125/+320
|\ \ \ \ \ \
| * | | | | | DO NOT MERGE: Prevent crash at erroneous MPEG2TS bitstreamJinsuk Kim2015-04-295-125/+320
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used new RCHECK_ macros for drop-in replacements for CHECK_ to avoid crashing at bit errors encountered while parsing MPEG2 transport packets. Also removed CHECK_ macros in PSI table processing as errors would have been already filtered out by CRC check. Bug: 20274977 Change-Id: I5ca810df3c4295142610bbd1d586d7529bb9f303 (cherry picked from commit e84ab89a2cdae1d1828225f88d895882d716f90e)
* | | | | | Merge "stagefright: convert kKeyFrameRate between msg and meta" into mnc-devChong Zhang2015-04-291-0/+10
|\ \ \ \ \ \
| * | | | | | stagefright: convert kKeyFrameRate between msg and metaChong Zhang2015-04-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20431757 Change-Id: I2d00e9914550ba3e62bc5ac8604ba44bcbb6026a
* | | | | | | Fix build.Dianne Hackborn2015-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic8ae065dd912cb5ff130e8d78c98fd6bed4e11cc
* | | | | | | Merge "Respect the record audio app op - media" into mnc-devSvet Ganov2015-04-2920-45/+87
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Respect the record audio app op - mediaSvet Ganov2015-04-2920-45/+87
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Change-Id: I3a97977b6e9a09355e2008f780d22d480fb7308b
* | | | | | MatroskaExtractor: skip track when codec id is NULL in addTracksRobert Shih2015-04-281-4/+6
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a more thorough version of commit ea9ac8bf7f6a7ae1424c6cade64b004caa7c3681 in that it applies to both video and audio. Bug: 17702053 Bug: 18872598 Change-Id: Idcea77bb7133ea0d02da8c484b4a0791db42740e
* | | | | Check allocationMarco Nelissen2015-04-281-3/+9
|/ / / / | | | | | | | | | | | | | | | | Bug: 20222446 Change-Id: I2f366a907886cd65e12a6f260a2ec77af6fb7b41
* | | | Explicit routing in AudioRecordPaul McLean2015-04-283-7/+30
| |_|/ |/| | | | | | | | Change-Id: I9cc5d54883a3e5c75d553fabb619fc8e49f4f9e5
* | | Merge "HDCP: buffer over flow check" into mnc-devChong Zhang2015-04-281-2/+24
|\ \ \ | |_|/ |/| |
| * | HDCP: buffer over flow checkChong Zhang2015-04-271-2/+24
| | | | | | | | | | | | | | | bug: 20222489 Change-Id: I3a64a5999d68ea243d187f12ec7717b7f26d93a3
* | | Merge "DO NOT MERGE libmediaplayerservice: set priority and operating rate ↵Ronghua Wu2015-04-278-0/+62
|\ \ \ | | | | | | | | | | | | for the codec used by nuplayer." into mnc-dev
| * | | DO NOT MERGE libmediaplayerservice: set priority and operating rate for the ↵Ronghua Wu2015-04-278-0/+62
| | |/ | |/| | | | | | | | | | | | | | | | | | | codec used by nuplayer. Bug: 20481562 Change-Id: I9806414962352fbcda726f8274f1cd348c961de0 (cherry picked from commit f19f5d716b39a5d9dc1abdcd5a16a7aaf1b1ab8b)
* | | DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.Ronghua Wu2015-04-272-7/+18
|/ / | | | | | | | | | | Bug: 20559813 Change-Id: If231cb44337ca7dc74c39fc3cd73e2b6f3cb85b8 (cherry picked from commit d4c1f6b4ecfef7323422359fc38bd1edb1abf205)
* | Merge "Lock drm plugin API calls globally, not per MediaDrm instance"Jeff Tinker2015-04-252-1/+2
|\ \
| * | Lock drm plugin API calls globally, not per MediaDrm instanceJeff Tinker2015-04-222-1/+2
| | | | | | | | | | | | | | | | | | Change-Id: I062c662a440a1becccd248c3b8ddf711c51e53cc related-to-bug: 18394494 related-to-bug: 19664283
* | | MatroskaExtractor: skip track when codec id is NULL in addTracksRobert Shih2015-04-241-1/+4
| | | | | | | | | | | | | | | Bug: 18872598 Change-Id: I0cdb2ffae202fc06b068c57dafae7523981b6000
* | | Merge "mediaresourcemanager: add dumpsys support."Ronghua Wu2015-04-242-0/+35
|\ \ \ | |_|/ |/| |
| * | mediaresourcemanager: add dumpsys support.Ronghua Wu2015-04-232-0/+35
| | | | | | | | | | | | | | | Bug: 20233206 Change-Id: Ic253985e408b05b488e87cd5c50c0d619ac568ef
* | | Merge "MediaCodec: ignore error when linkToDeath to batterystats"Chong Zhang2015-04-241-8/+5
|\ \ \
| * | | MediaCodec: ignore error when linkToDeath to batterystatsChong Zhang2015-04-241-8/+5
| | |/ | |/| | | | | | | | | | bug: 20071299 Change-Id: I932b40e46312db467fe88f8ff6cea028b63785cd
* | | Merge "HLS: make disconnect faster to prevent ANR"Chong Zhang2015-04-248-330/+510
|\ \ \
| * | | HLS: make disconnect faster to prevent ANRChong Zhang2015-04-238-330/+510
| |/ / | | | | | | | | | | | | | | | | | | disconnect HTTP connection when we absolutely won't resume bug: 19890444 Change-Id: Idee36b48741f6f8eb1d65bca32156e9e18349c67
* | | Merge "Copy sei offset/size during ABuffer/MediaBuffer conversion"Robert Shih2015-04-242-0/+13
|\ \ \
| * | | Copy sei offset/size during ABuffer/MediaBuffer conversionRobert Shih2015-04-232-0/+13
| | | | | | | | | | | | | | | | | | | | Bug: 20537676 Change-Id: I0bd11527ccd022c39d94b7877df81de4da1b14a6
* | | | MediaSync: allow users to query play time for pending audio frames.Wei Jia2015-04-231-0/+36
| |_|/ |/| | | | | | | | | | | Bug: 19666434 Change-Id: I5cfd3e1a9b4f56aaa6482facd55a22ed1e7ed3e6
* | | Merge "MediaSync: fix the optimization code path to reduce messages posted ↵Wei Jia2015-04-231-13/+29
|\ \ \ | |/ / |/| | | | | to drain video."
| * | MediaSync: fix the optimization code path to reduce messages posted to drain ↵Wei Jia2015-04-221-13/+29
| | | | | | | | | | | | | | | | | | | | | video. Bug: 19666434 Change-Id: I195a896033855ab3bfa43791b3c99f66776b007a
* | | Merge "libmediaplayerservice: set priority and operating rate for the codec ↵Ronghua Wu2015-04-221-0/+6
|\ \ \ | |_|/ |/| | | | | used by recorder."
| * | libmediaplayerservice: set priority and operating rate for the codec used by ↵Ronghua Wu2015-04-221-0/+6
| | | | | | | | | | | | | | | | | | | | | recorder. Bug: 20481562 Change-Id: Ibff54395e00809500d98e3759f9677f8168c98ae
* | | Merge "Use AudioPlaybackRate to hold TimestretchBufferProvider parameters"Ricardo Garcia2015-04-222-30/+35
|\ \ \
| * | | Use AudioPlaybackRate to hold TimestretchBufferProvider parametersRicardo Garcia2015-04-222-30/+35
| | |/ | |/| | | | | | | | | | | | | | | | | | | Use this struct to handle the parameters for TimestretchBufferProvider all across the system. Add stretch mode and fallback mode to TimestretchBuffer Provider. Change-Id: I19099924a7003c62e48bb6ead56c785cb129fba2
* | | Merge "audio policy: fix AudioTrack output device selection"Eric Laurent2015-04-221-3/+2
|\ \ \
| * | | audio policy: fix AudioTrack output device selectionEric Laurent2015-04-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have AudioTrack::setOutputDevice() set CBLK_INVALID flag instead of calling restoreTrack_l(). This allows restoreTrack_l() to be called in a safe context. Allow device change while the AudioTrack is active by forcing a new device selection in startOutput() if the output route for this session was changed. Remove some warnings. Change-Id: I2d921a63c9bfa0e122233645e2d6d39f95f5f17d
* | | | AnotherPacketSource: make getBufferedDurationUs more discontinuity-awareRobert Shih2015-04-213-105/+102
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The new getBufferedDurationUs implementation obsoletes the purpose of getEstimatedDurationUs; remove getEstimatedDurationUs and its associated member variables. Finally replace calls to getEstimatedDurationUs with getBufferedDurationUs. Change-Id: I38f20df8e177ffbfe299b203d99076fc98dcd274
generated by cgit v1.1 at 2024-07-03 15:28:04 +0000