summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-101-0/+3
|\ | | | | | | | | * commit '24893fef8e0f816a8a21749fa3eb9eed9173a0fd': MPEG2TSWriter: Write a proper CRC in PAT and PMT
| * Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-101-0/+3
| |\
| | * MPEG2TSWriter: Write a proper CRC in PAT and PMTPaul Fariello2012-07-101-0/+3
| | | | | | | | | | | | Change-Id: I6ec8039b176878da6f02691194d96b0a1e894055
* | | am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT ↵Jean-Baptiste Queru2012-08-101-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | and PMT" * commit '2001d2ac01e36c13c1abda5f73b6404cba2648e1': MPEG2TSWriter: Write proper continuity counters for PAT and PMT
| * | Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"Jean-Baptiste Queru2012-08-101-0/+2
| |\ \ | | |/
| | * MPEG2TSWriter: Write proper continuity counters for PAT and PMTPaul Fariello2012-07-101-0/+2
| | | | | | | | | | | | Change-Id: If94e31e51c563867db6d2376ad771f9751416084
* | | am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"Jean-Baptiste Queru2012-08-081-0/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'e28df5b996af3480b457c7a9908dbb9d52ad8d7c': Store correct time stamps in recorded mp4 files
| * | Store correct time stamps in recorded mp4 filesJohannes Carlsson2012-07-301-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | According to the specification (ISO_IEC_14496-12_2008 page 17, 19 and 21) the time is "in seconds since midnight, Jan. 1, 1904, in UTC time" which is not the same as Unix epoch time. This is already correctly handled in MPEG4Extractor.cpp when reading files. The specification also supports 64 bit timestamps which would make it a bit more future proof, but unfortunately it seems like support for this in players are poor (tested both Windows media player and Quicktime player). Change-Id: I102d728f098b8b0a21013956f017b0c4f2d69112
* | am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into ↵Edwin Wong2012-07-131-1/+1
|\ \ | |/ |/| | | | | | | | | jb-dev * commit '65e8d62a5b243518795cdafa498df4a49baf6940': Fixed sample video corrupted in MediaCodec mode.
| * Fixed sample video corrupted in MediaCodec mode.Edwin Wong2012-07-131-1/+1
| | | | | | | | | | Change-Id: I50c5660072d40f6e297e58fd026ea04c89d6a70a related-to-bug: 6732061
* | am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into ↵Jamie Gennis2012-06-221-12/+6
|\ \ | |/ | | | | | | | | | | jb-dev * commit '33e28dd3c033641f4db9d1b99c7c88d6d08c61f7': SurfaceMediaSource: keep refs to current buffers
| * SurfaceMediaSource: keep refs to current buffersJamie Gennis2012-06-221-12/+6
| | | | | | | | | | | | | | | | | | This change fixes a bug in SurfaceMediaSource where it would not keep a reference to all of the Gralloc buffers that the video encoder is currently using. Bug: 6655597 Change-Id: Ifd99976cc7ae57ed724bbf2bbcff357a39497391
* | am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warnings" into jb-devGlenn Kasten2012-06-141-3/+1
|\ \ | |/ | | | | | | * commit '49dd5cf3469cd755321f8ec10013ad4fcfaf723d': Log track name on obtain/releaseBuffer warnings
| * Log track name on obtain/releaseBuffer warningsGlenn Kasten2012-06-131-3/+1
| | | | | | | | | | | | | | This should help diagnose problems by allowing us to correlate the logs with the dumpsys media.audio_flinger output. Change-Id: I8c7c592b4f87d13b0f29c66ce7a2f301a0f063c9
* | am 28ed2f93: Reduce underruns in screen off, esp. with EQGlenn Kasten2012-06-081-0/+2
|\ \ | |/ | | | | | | * commit '28ed2f93324988767b5658eba7c1fa781a275183': Reduce underruns in screen off, esp. with EQ
| * Reduce underruns in screen off, esp. with EQGlenn Kasten2012-06-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add MonoPipe APIs to specify setpoint. Use screen state to configure pipe setpoint. Fix a long-standing bug where pipe sleep time was excessive, which interacted poorly with governor and low clock frequencies. Now it deducts the elapsed time since last write(), which was significant when there was EQ and low clock frequency. Bug: 6618373 Change-Id: I6f3b0072c2244aeb033ef0795ad164491a164ff5
* | Add a new API on DRM Framework for streamingKei Takahashi2012-05-231-0/+10
|/ | | | | | | | | | | | In case of DRM streaming, decrypt session can start just after receiving the header, and it doesn't need to wait for the entire content. However, current API of DRM framework only accepts file handle or URI. With this new API, DRM session can start without waiting for the entire content. Changes are made by SEMC and Sony. Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
* Tell surface flinger that we want to protect output buffers from beingAndreas Huber2012-05-221-0/+2
| | | | | | | | sent to HDMI (without HDCP) and push a few black frames on IDLE->LOADED similar to OMXCodec's behaviour. Change-Id: Iea6055a115151ca881220a70a31af6ade2c58cb3 related-to-bug: 6537187
* Merge "Stop extrapolating audio time from the anchor if we're paused or ↵Andreas Huber2012-05-171-0/+1
|\ | | | | | | reached eos." into jb-dev
| * Stop extrapolating audio time from the anchor if we're paused or reached eos.Andreas Huber2012-05-151-0/+1
| | | | | | | | | | Change-Id: I55903ba625d9c075a9a6e7bcd5ff95d450b915b2 related-to-bug: 6479613
* | Merge "Speed up stsz box write in MPEG4Writer" into jb-devJames Dong2012-05-151-1/+1
|\ \
| * | Speed up stsz box write in MPEG4WriterJames Dong2012-05-151-1/+1
| |/ | | | | | | | | | | | | | | With this patch, the write time for 30+ minutes recording session is reduced from 10+ seconds down to around 2-3 seconds. related-to-bug: 6435176 Change-Id: I83b705cea42d8de798e7032c770c5c7b033e267e
* | Move CameraParameters header to join rest of camera library.Eino-Ville Talvala2012-05-151-0/+667
|/ | | | | | | | | | CameraParameters was moved over to frameworks/native before frameworks/av was created, since it is referenced by HAL implementations. Move it to frameworks/av to keep it together with its implementation. Bug: 6500863 Change-Id: If1a3b7768bedeb825729c3cdd55e8fcea04b7369
* Fix issues with synchronous record start.Eric Laurent2012-05-141-0/+4
| | | | | | | | | | | | | | | | - Added a timeout in case the trigger event is never fired. - Extend AudioRecord obtainBuffer() timeout in case of synchronous start to avoid spurious warning. - Make sure that the event is triggered if the track is destroyed. - Reject event if the triggering track is in an incompatible state. Also fix a problem when restoring a static AudioTrack after a mediaserver crash. Bug 6449468. Change-Id: Ib36e11111fb88f73caa31dcb0622792737d57a4b
* Smoothen audio "real" time by compensating with system_time()Andreas Huber2012-05-141-0/+1
| | | | | | | for the delay since the last buffer submission to the audio sink. Change-Id: Ib1a8672f96ba8bbef07d23372f1076fbb1f0bdcc related-to-bug: 6479613
* Merge "Remove unused VideoSourceDownSampler class" into jb-devJames Dong2012-05-111-97/+0
|\
| * Remove unused VideoSourceDownSampler classJames Dong2012-05-111-97/+0
| | | | | | | | | | Change-Id: I2faf5962ff4cc366c688ef5bb27f53596f08fe0a related-to-bug: 6484217
* | Increase AAC software decoder's buffer count. Refactor how clientsAndreas Huber2012-05-111-0/+17
|/ | | | | | | of ACodec get notified about codec buffers and buffer ids. Change-Id: I962f873262dae7aa7b43f5f68a6d60268282f91e related-to-bug: 6478823
* Merge "Properly connect/disconnect to/from the native window in MediaCodec." ↵Andreas Huber2012-05-101-0/+3
|\ | | | | | | into jb-dev
| * Properly connect/disconnect to/from the native window in MediaCodec.Andreas Huber2012-05-101-0/+3
| | | | | | | | | | Change-Id: Ib5bf90a3b81fca8ff2346235bc28a2bd0bc7bfb1 related-to-bug: 6472161
* | OMX IL wrapper for FLAC encoderJean-Michel Trivi2012-05-091-0/+3
|/ | | | | | | | | | Add wrapper around libFLAC for FLAC encoding in OpenMAX IL. Declare FLAC encoder in OMX component roles. Bug 5525503 Change-Id: I19bbce41c216870669d09365693f4ea89f8bc0f7
* Submit codec specific data automaticallyAndreas Huber2012-05-081-0/+5
| | | | | | | if it is contained in the format passed to MediaCodec::configure. Change-Id: I8ef6755e8389ec47b44a9c70904ea6c03a00f4f2 related-to-bug: 6364139
* Respect channel mask in ACodec and NuPlayer.Andreas Huber2012-05-032-2/+13
| | | | | | | Refactor conversion from MetaData into AMessage while we're at it. Change-Id: I5479129836ea4316e8de28cf1b472bf19e3ac4ab related-to-bug: 6439076
* Impl for supporting two video scaling modesJames Dong2012-05-011-0/+1
| | | | | | | | | o allows the video scaling mode to change at any time o also remove the scaling mode logic in OMXCodec.cpp o related-to-bug: 5454345 Change-Id: I6f1714eb0c2774591ce650d56c1e779b8afd085f
* Merge "Added support for HE-AAC recording" into jb-devDave Burke2012-04-301-3/+2
|\
| * Added support for HE-AAC recordingDave Burke2012-04-301-3/+2
| | | | | | | | | | | | | | | | | | Fixed bug in decoder related to sample rates / channel counts Made decoder follow Fraunhofer pattern Log if bitrate not available Bug: 6275957 Change-Id: I47a8e29358fa4a88ebc73fe02d46a2bfb96c64fe
* | Fix mono gapless playback for decoders that output stereoMarco Nelissen2012-04-303-3/+9
|/ | | | | | | | | | | | | The old AAC decoder always outputs stereo, even for mono source material, so we need to use the number of channels of the output when calculating the number of bytes to skip, not the number of channels in the source. This makes OMXCodec skip the right amount of data, and prevents NuPlayer from writing half a frame and then asserting when the AudioSink doesn't accept it. Also move use of the SkipCutBuffer from NuPlayer to ACodec, so that it also works when using the new Java APIs, and make SkipCutBuffer derive from RefBase. b/774846 Change-Id: I34df9fea3e6730617eae559afaa556f4085ef0a0
* NuMediaExtractor API to unselect tracks and finer control over seeking.Andreas Huber2012-04-261-2/+11
| | | | | Change-Id: I44d5a2b01d34b771bb0ff48b12829e33314c2374 related-to-bug: 6276111
* Add Fraunhofer AAC encoder with AAC-ELD support.Dave Burke2012-04-255-2/+5
| | | | Change-Id: I6cd499d257d72f50a5b508bed97796a591a51506
* Bump up the max number of items in an AMessage, remove overly stringentAndreas Huber2012-04-251-1/+1
| | | | | | | CHECK() limiting us to just audio/* or video/* tracks. related-to-bug: 6399405 Change-Id: I9bdaf7e709665ecc22da8839c8b16c081dbf4535
* Make sure OMXCodec and ACodec both accept more than 2 channels of audioAndreas Huber2012-04-241-0/+4
| | | | | | and fill in the OMX channel mask properly. Change-Id: I915950a0b252142b9eb3277cf7c6e0d9f5875305
* Use C APIs instead of C++ APIs for policyGlenn Kasten2012-04-232-2/+4
| | | | | | | | | The C++ APIs are going away. Note: we use tid == 0 which is not supported yet by the C APIs, do not submit this until that is added. Change-Id: I0e90789e6c81c69f2544e899c52421ea5d1342be
* Make sure NuMediaExtractor is thread safe.Andreas Huber2012-04-231-0/+3
| | | | Change-Id: If261c4d87d5569a0d7cfd75afe311803a6ce0109
* Merge "Configure policy of mediaserver threads"Glenn Kasten2012-04-225-7/+19
|\
| * Configure policy of mediaserver threadsGlenn Kasten2012-04-225-7/+19
| | | | | | | | Change-Id: Ifd825590ba36996064a458f64453a94b84722cb0
* | Merge "Made AudioRecord a subclasss of RefBase"Eric Laurent2012-04-221-1/+1
|\ \ | |/ |/|
| * Made AudioRecord a subclasss of RefBaseEric Laurent2012-04-201-1/+1
| | | | | | | | | | | | | | | | | | Made AudioRecord a subclass of RefBase to allow using strong references and solve concurrency issues. Issue 6254582. Change-Id: Ic1f3845958f477e8b2d23d3d25bf0f666addcb3b
* | Merge "Add support for deep audio buffers"Eric Laurent2012-04-202-1/+8
|\ \
| * | Add support for deep audio buffersEric Laurent2012-04-202-1/+8
| |/ | | | | | | | | | | | | | | | | | | Allow AudioSink to use deep audio buffering when the source is audio only and its duration is more than a certain threshold. This helps improve battery life but implies higher audio latency. Change-Id: Ie79915b61c370292f05aabda9779356570e03cbb
* | Add the ability to query the amount of cached data to NuMediaExtractor.Andreas Huber2012-04-191-0/+11
|/ | | | | Change-Id: I0966270a2bd36698330beaa03f47d02fc6a40c44 related-to-bug: 6364341