summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Collapse)AuthorAgeFilesLines
* Allow OMXCodec to specify an output color format for OMX decoder componentJames Dong2012-09-101-1/+1
| | | | | | | | The output color format is specified via the meta argument in OMXCodec::Create() o related-to-bug: 7122195 Change-Id: Id3247686b893af25cc190685201e53ad34b0399c
* Merge "Fragmented mp4 extractor" into jb-mr1-devMarco Nelissen2012-09-051-0/+2
|\
| * Fragmented mp4 extractorMarco Nelissen2012-09-051-0/+2
| | | | | | | | | | | | | | Still experimental. Set property "media.stagefright.use-fragmp4" to true to enable. Change-Id: I210b9c5b5164b5c5eefc31309845ee881ac7db8e
* | Implement remote display service stubs.Jeff Brown2012-09-053-0/+154
|/ | | | Change-Id: I582ed000026bba6d116db8304e15a3c52f8a9a01
* Configure the SurfaceMediaSource to emit the same number of buffersAndreas Huber2012-09-041-0/+3
| | | | | | | as the video encoder allocates for its input. Do this before connecting the bufferqueue through surface flinger. Change-Id: Ibc81db1359afe2d88fdb75b23fadae65c8a6f7cc
* Merge "Added an additional virtual method IStreamSource::flags()." into ↵Andreas Huber2012-08-311-0/+6
|\ | | | | | | jb-mr1-dev
| * Added an additional virtual method IStreamSource::flags().Andreas Huber2012-08-311-0/+6
| | | | | | | | Change-Id: I89e62d84328e12f08c8f73cbfd53cfb42569de97
* | Update audio commentsGlenn Kasten2012-08-301-1/+1
|/ | | | Change-Id: Ie7504d0ddb252f7e4d4f99ed0b44cfc7b1049816
* Merge "Only run the wifi display RTSP server on demand, and only on the wifi ↵Andreas Huber2012-08-301-1/+5
|\ | | | | | | direct" into jb-mr1-dev
| * Only run the wifi display RTSP server on demand, and only on the wifi directAndreas Huber2012-08-301-1/+5
| | | | | | | | | | | | interface. Change-Id: I7d3c44cb79cd40e73499f2d7ccf35c69b628e6d7
* | Merge "Move libnbaio out of AudioFlinger" into jb-mr1-devGlenn Kasten2012-08-3014-0/+1100
|\ \ | |/ |/|
| * Move libnbaio out of AudioFlingerGlenn Kasten2012-08-3014-0/+1100
| | | | | | | | | | | | | | | | | | | | libnbaio is now a separate shared library from AudioFlinger, rather than a static library used only by AudioFlinger. AudioBufferProvider interface is now also independent of AudioFlinger, moved to include/media/ Change-Id: I9bb62ffbc38d42a38b0af76e66da5e9ab1e0e21b
* | Prepare for transmitting audio through AudioSource.Andreas Huber2012-08-301-5/+14
| | | | | | | | | | | | | | | | AudioSource can now be configured to output buffers timestamped based on looper time (absolute) instead of based on systemTime() relative to start time. Change-Id: I8eca42648eb50033ac4aafbe5daac64a98a40690
* | Merge "Initial checkin of support for acting as a wifi display source" into ↵Andreas Huber2012-08-292-0/+13
|\ \ | | | | | | | | | jb-mr1-dev
| * | Initial checkin of support for acting as a wifi display sourceAndreas Huber2012-08-292-0/+13
| |/ | | | | | | Change-Id: I08f17efa0c7d007e17408feb7d4fbef0a19f531a
* | Preliminary support for HDCP as a binder service for wifi display support.Andreas Huber2012-08-291-0/+78
|/ | | | Change-Id: Ie0de1c086c629a668d1c7863992eef56fb94157c
* Merge "Fixed a native crash due to unexpected state at destroy time when ↵James Dong2012-08-271-0/+2
|\ | | | | | | encoder component's source fails to start" into jb-mr1-dev
| * Fixed a native crash due to unexpected state at destroy time when encoder ↵James Dong2012-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | component's source fails to start o Encoder component initializes to be in the state of EXECUTING before its source gets started, because we wanted to be able to configure the source to use the advertised number of input buffers. However, if the source fails to start, then the encoder ends up in the state of EXECUTING when OMXCodec object gets destroyed. As a result, the assertion on the expected state in OMXCodec's constructor fails. The fix is to stop the video encoder component right way when its source fails to start so to bring the state of the encoder component back to the expected state. o related-to-bug: 7045494 Change-Id: I6d4a221eb809d7137f53e58098a04816998f7a25
* | SurfaceMediaSource: a few fixes / cleanupsJamie Gennis2012-08-261-6/+3
| | | | | | | | | | | | | | | | - Remove the setting of mStopped to true in onBuffersReleased - Cleaned up a few function call logs - Removed the 'reset' method. Change-Id: I56bab1d5cb2f3e6d59d54698c2e045d796d1849f
* | Allow directly setting a DataSource for NuMediaExtractorMarco Nelissen2012-08-241-0/+2
|/ | | | | | | | This adds NuMediaExtractor::setDataSource(const sp<DataSource> &source), which some new code under frameworks/av will use to let applications provide a custom data source for extractors. Change-Id: I8fb743441d04b4eadbda3c2d76858c3d60e2a3b2
* Merge "Revert "Swap the order of creating IAudioTrack and thread"" into ↵Glenn Kasten2012-08-201-1/+1
|\ | | | | | | jb-mr1-dev
| * Revert "Swap the order of creating IAudioTrack and thread"Glenn Kasten2012-08-071-1/+1
| | | | | | | | | | | | | | This reverts commit 5d464eb0b8cffb994a754ff108795e858a882414. It caused the wrong thread ID -1 to be passed to IAudioFlinger::createTrack(). Change-Id: Ic221d2bb4af572d3d2d752af19238c52f6728e3a
* | Move the AAH RTP code out of framework and into vendor.John Grossman2012-08-131-3/+0
| | | | | | | | | | | | | | | | | | | | Relocate the AAH RTP code from framework/av into vendor/google_devices/phantasm. This change is the deletion, there will be a separate CL which re-introduces on the vendor side of things. Change-Id: Ibe7e6d4b633a3886b87a615691a2692f2382af6c Signed-off-by: John Grossman <johngro@google.com>
* | Add the ability to dynamicaly register MediaPlayer types.John Grossman2012-08-132-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Add the ability to dynamically register low level MediaPlayer factories which will be probed at setDataSource time to determine the proper MediaPlayerBase to instantiate. This change is in preparation for moving libaah_rtp out of frameworks/base and into phantasm platform directory. Change-Id: Icf8904db3ab9e3c85df6e780d5546d9988cb9076 Signed-off-by: John Grossman <johngro@google.com>
* | am 3ca352c4: am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT ↵Jean-Baptiste Queru2012-08-101-0/+3
|\ \ | | | | | | | | | | | | | | | | | | and PMT" * commit '3ca352c4cd01f6df3b691f835efc68a5771e724e': MPEG2TSWriter: Write a proper CRC in PAT and PMT
| * \ 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 31a593b9: am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity ↵Jean-Baptiste Queru2012-08-101-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | counters for PAT and PMT" * commit '31a593b901eeb924ae5214962c628397dd0197f2': MPEG2TSWriter: Write proper continuity counters for PAT and PMT
| * | | | 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 51af4af2: am e28df5b9: Merge "Store correct time stamps in recorded mp4 ↵Jean-Baptiste Queru2012-08-081-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | files" * commit '51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4': Store correct time stamps in recorded mp4 files
| * | | | 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
* | | | Make sure codec names and corresponding quirks are returned together.Andreas Huber2012-08-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously they were returned in separate vectors and only one of them was sorted if software codecs were preferred, leaving the quirks no longer matching the codec name at the same index. Change-Id: Id3f1e6f9f7f8c9cc4b6ebfb86a203b4d59de8604 related-to-bug: 6737884
* | | | Remove obsolete hack for TI specific codeJames Dong2012-08-061-5/+2
| |_|/ |/| | | | | | | | | | | | | | o related-to-bug: 6566886 Change-Id: I39aad214cbf7b748a95a9d22db50cd8f421931e6
* | | Merge "experimental support for fragmented mp4 playback in nuplayer" into ↵Marco Nelissen2012-08-031-1/+5
|\ \ \ | | | | | | | | | | | | jb-mr1-dev
| * | | experimental support for fragmented mp4 playback in nuplayerAndreas Huber2012-08-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | cherry picked from change 170999 Change-Id: I407775f0290154ad4961134839a15c9f296424c0
* | | | Dynamically configure the number of video buffers used by camera source, if ↵James Dong2012-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported o related-to-bug: 6920805 Change-Id: I413bb50954cc84e32ed40bcb713842dc7b58e2b6
* | | | Allocate buffers before calling start on its source in OMXCodec::start() for ↵James Dong2012-08-021-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encoder case o This makes it possible to configure the source to use the same number of input buffers as requested by the video encoder, before the source starts. As a result, hardcoded number of video buffers for camera source, for instance, can be avoided. o related-to-bug: 6920805 Change-Id: I13d2c308dce34967768cd407f02988e92ef10a89
* | | Unifying TimedTextDriver's resume() and start().Insun Kang2012-08-021-1/+1
| | | | | | | | | | | | | | | | | | (cherry picked from gtv bb23a2b7e06c59f56e353fd4a2a66a9b8179d425) Change-Id: If5f14549fa315c34e32d6fed7c1ea09deabceb63
* | | Adds resume() functionInsun Kang2012-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | o Revived resume() function to fix pause/resume bug. (Bug: 6663740) o Mannually cherry-picked from GTV change. (commit: ad1197226d1c6745959f0e469f510ca06f99489f) Change-Id: I77ac90085fb1f1d2e7eb706642978a4fa4d28b49
* | | Allows MediaMetadataRetriever to retrieve video rotation angleJames Dong2012-07-311-0/+1
| | | | | | | | | | | | | | | | | | o related-to-bug: 6872687 Change-Id: I34e74b0756f8269edefdf3a25d8806c76fd1e2f8
* | | Swap the order of creating IAudioTrack and threadGlenn Kasten2012-07-271-1/+1
| | | | | | | | | | | | | | | | | | Simplifies the error recovery in case IAudioTrack fails. Change-Id: I6aee41a2ac747a5689fb4836b04174e6107bf32f
* | | Clean up start() parametersGlenn Kasten2012-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Document where int is used instead of AudioSystem::sync_event_t (probably because of a header file dependency). TrackBase::start() and RecordTrack::start() don't need default parameters. Change-Id: I82f4a4d078be900f3aa4bd926697e32f5ed68ec8
* | | effect_descriptor_t const correctnessGlenn Kasten2012-07-252-4/+4
| | | | | | | | | | | | Change-Id: Iad008f20d35a18acf500f773900164552fd0c19e
* | | Added a callback to signal when the rendering of the video frame just occurredJames Dong2012-07-201-0/+2
| | | | | | | | | | | | | | | Change-Id: Ifbd78606ffc33483aecebf02cb18e0e52af9624d related-to-bug: 6851811
* | | AudioRecord lockingGlenn Kasten2012-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race conditions for EVENT_MARKER and EVENT_NEW_POS callbacks. Marker and new position update fields are protected by lock. getSampleRate() doesn't need a lock because it reads from shared memory control block. Enforce that the parameter passed with EVENT_MARKER and EVENT_NEW_POS cannot not be changed by the callback handler, and will not change during the call by another thread. Session ID should never change; log if it does. Change-Id: Ia2c63cf1a71b10bb06c37981bd76437f83fffa91
* | | Use audio_channel_mask_t for channel maskGlenn Kasten2012-07-171-7/+7
| | | | | | | | | | | | Change-Id: I1c1896da48983aa9f1462a4b471f910498816f60
generated by cgit v1.1 at 2024-06-30 08:29:29 +0000