summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Implement Surface input to MediaCodec.Andy McFadden2013-03-0411-20/+1083
| | | | | | | | | Also, renamed a CHECK_INTERFACE macro that was clashing with the Binder version. Bug 7991062 Change-Id: If5e6ed0a06d9f67975497676e4b05abe3aa3d6c0
* am c0048178: Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen2013-03-011-1/+16
|\ | | | | | | | | * commit 'c0048178a1d312e7e05557ba99becd6a89b9e97a': Avoid invalid memory access when using extractMetadata()
| * Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen2013-03-011-1/+16
| |\
| | * Avoid invalid memory access when using extractMetadata()Sangkyu Lee2013-02-281-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BpMediaMetadataRetriever::extractMetadata() returns a string which is returned by readCString() function of the reply parcel object. However, the parcel object is destroyed at the end of the extractMetadata() function, and so the returned pointer is invalid. This patch fixes this problem by storing the metadata string value. Change-Id: I2a2ccba78246175b2845a237679d6cebe881e83b Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
* | | am ceb83b8d: Merge "SoftAMR: Signal the right frame format"Andreas Huber2013-02-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'ceb83b8d8919dc778402bf610c073987d4f9f89b': SoftAMR: Signal the right frame format
| * | Merge "SoftAMR: Signal the right frame format"Andreas Huber2013-02-271-1/+1
| |\ \
| | * | SoftAMR: Signal the right frame formatMartin Storsjo2013-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct enum for the format used is OMX_AUDIO_AMRFrameFormatFSF, which is the same as is used in amrnb/enc/SoftAMRNBEncoder.cpp, amrwbenc/SoftAMRWBEncoder.cpp and in OMXCodec and ACodec. The OMX_AUDIO_AMRFrameFormatConformance enum refers to an odd file format only used for conformance tests, not used in the wild. Change-Id: Idc395fc1d4969e33453522d6ec6526876438c526
* | | | am ccf51ec4: Merge "SoftVorbis: Set the right encoding in the port definition"Andreas Huber2013-02-271-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ccf51ec41652a7e2db8cbee37bca91a95908d5ff': SoftVorbis: Set the right encoding in the port definition
| * | | Merge "SoftVorbis: Set the right encoding in the port definition"Andreas Huber2013-02-271-1/+1
| |\ \ \
| | * | | SoftVorbis: Set the right encoding in the port definitionMartin Storsjo2013-01-311-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | Previously, it set the encoding type to AAC, which is just a typo. Change-Id: I2dcae1f579e9feb0b35b6f5d334028c534275042
* | | | Merge "camera_client: refactor Camera/ProCamera commonalities into ↵Igor Murashkin2013-02-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | BasicCamera" into jb-mr2-dev
| * \ \ \ am ceb388d6: CameraService and Stagefright: Support AppOpsEino-Ville Talvala2013-02-268-13/+91
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ceb388d6c03c38b96dc41c0ea4804b749aa077c4': CameraService and Stagefright: Support AppOps
| * | | | | Handles duplicated NAL start code to fix crash on HLS streams.Insun Kang2013-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some youtube live streams are encoded having duplicated NAL start code, for instance, 00 00 01 00 00 00 01 .... In previous code, zero NAL size causes crash by CHECK_GT(nalsize, 0) macro. With this patch, duplicated NAL start code will be just ignored. TESTED=Played problematic Youtube Live streams. Change-Id: I1d76f111a34bd29cb09b037eb1b0626fe5f5b140
* | | | | | am 801726ef: Merge "MPEG4Writer: Write a zero-length compressor string"Andreas Huber2013-02-271-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | * commit '801726efb2dcc6ea19e9f55c7c43fe41f0c6643e': MPEG4Writer: Write a zero-length compressor string
| * | | | Merge "MPEG4Writer: Write a zero-length compressor string"Andreas Huber2013-02-271-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | MPEG4Writer: Write a zero-length compressor stringMartin Storsjo2013-01-311-1/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first byte is the number of bytes in the string to display, the rest is the actual string (see ISO/IEC 14496-12:2008 page 29, compressorname in VisualSampleEntry) to display. Currently, all 31 space characters are displayed in certain players (such as Apple QuickTime Player) instead of the plain codec name (e.g. "H.264"). By writing the string length properly, the actual content of the remaining 31 bytes is ignored instead of displayed. Change-Id: I7f93a8966d74a4e86abc46c3dcb70f71780d9cd6
* | | | CameraService and Stagefright: Support AppOpsEino-Ville Talvala2013-02-258-13/+91
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera: - Signal to AppOpsService when camera usage starts and stops - Listen to permissions revocations and act on them - Currently just kill camera connection when permissions lost Stagefright: - Pass on client name, UID to camera as needed Bug: 8181262 Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
* | | Permit conditional registry of mediaserver extensionsGlenn Kasten2013-02-204-0/+57
| | | | | | | | | | | | Change-Id: I94dc0d038e702dfe1779a50a1de0fae9bad15057
* | | Merge "Refactoring: Rename SurfaceTextureClient to Surface"Mathias Agopian2013-02-1510-22/+23
|\ \ \
| * | | Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-1510-22/+23
| | | | | | | | | | | | | | | | Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
* | | | Remove FragmentedMP4ExtractorMarco Nelissen2013-02-155-544/+1
|/ / / | | | | | | | | | | | | | | | MPEG4Extractor now supports fragmented mp4 files. Change-Id: I5659a51f4e5e4407a12535e69238fe3abffda7dc
* | | Add support for fragmented mp4 to MPEG4ExtractorMarco Nelissen2013-02-153-29/+897
| | | | | | | | | | | | | | | | | | | | | This makes FragmentedMP4Extractor obsolete. It will be removed in a separate change. Change-Id: Ida74c07ccf84983e20a1320ee24ffc7a5c083859
* | | Merge "Add OMX.google.vpx.encoder"James Dong2013-02-131-0/+1
|\ \ \
| * | | Add OMX.google.vpx.encoderJames Dong2013-02-121-0/+1
| | | | | | | | | | | | | | | | Change-Id: I843e6e542533884a94e105e1cb56f16f0440af61
* | | | Adds VPX encoding support for stagefright.Kunter Gultekin2013-02-125-0/+1102
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only following encoder settings are available - target bitrate - rate control (constant / variable) - frame rate - token partitioning - error resilience - reconstruction & loop filters Only following color formats are recognized - YUV420Planar - YUV420SemiPlanar - AndroidOpaque Following settings are not configurable by the client - encoding deadline is realtime - the algorithm interface for encoder is vp8 - fractional bits of frame rate is discarded - timebase is fixed to 1/1000000 Requires libvpx to be built with encoder support enabled. Requires openmax 1.1.2 extension headers. Relevant tests exist in cts repo. Change-Id: I650f1aca83e7dc93f79d7e6cba7ac24f26e66d40 Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
* | | Add the native MediaMuxer support.ztenghui2013-02-123-0/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | MediaAdapter: a helper class to convert the push model to pull model. MediaMuxer: the real muxer. bug:7991013 Change-Id: If3b79551bc6332bc81f5c2740885e579a5c4abf9
* | | Add support for querying if a stream is active remotelyJean-Michel Trivi2013-02-112-1/+30
| | | | | | | | | | | | | | | | | | Bug 7485803 Change-Id: I0744374f130fd2dd0714102354cffed2fa915361
* | | Revert "Adds VPX encoding support for stagefright."James Dong2013-02-085-1102/+0
| | | | | | | | | | | | | | | | | | | | | This lib was not part of the build, but it is built anyway for userdebug image (not for eng though). let me revert it for now... This reverts commit 6c6bb9873f55853fe74d8f45ad3ae116636d8be7.
* | | Merge "Adds VPX encoding support for stagefright."James Dong2013-02-095-0/+1102
|\ \ \
| * | | Adds VPX encoding support for stagefright.Kunter Gultekin2013-02-075-0/+1102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only following encoder settings are available - target bitrate - rate control (constant / variable) - frame rate - token partitioning - error resilience - reconstruction & loop filters Only following color formats are recognized - YUV420Planar - YUV420SemiPlanar - AndroidOpaque Following settings are not configurable by the client - encoding deadline is realtime - the algorithm interface for encoder is vp8 - fractional bits of frame rate is discarded - timebase is fixed to 1/1000000 Requires libvpx to be built with encoder support enabled. Requires openmax 1.1.2 extension headers. Relevant tests exist in cts repo. Change-Id: If759edb8db36acbd24dcb53d159a54e942766020 Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
* | | | Merge "MTP: Write initial data to correct file offset in SendPartialObject"Mike Lockwoood2013-02-081-1/+1
|\ \ \ \
| * | | | MTP: Write initial data to correct file offset in SendPartialObjectMike Lockwoood2013-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I84288aeda3e65e6e6487f11d32a72910cd16cff2
* | | | | Merge "Allow for dynamic reconfiguration of the video bitrate used"Andreas Huber2013-02-074-0/+95
|\ \ \ \ \
| * | | | | Allow for dynamic reconfiguration of the video bitrate usedAndreas Huber2013-02-074-0/+95
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | to encode video while running as a wfd source. Change-Id: I44f7b2350c88fc5807047c61bfe594ef8fa79275
* | | | | A few more patches to fix wfd tcp unicast transport.Andreas Huber2013-02-073-2/+17
|/ / / / | | | | | | | | | | | | Change-Id: Ie2f1b1e56c487ac4c3ef19d9e79022a35084e042
* | | | Avoid rebuffering after RTSP pauseRoger Jönsson2013-02-061-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If pausing an RTSP stream, an RTSP Pause request is sent and then if the stream is immediately resumed again, an RTSP Play request will be sent to the server. But the new data after the pause will not be buffered until Sender Reports have arrived again on both channels. Meanwhile the player will resume playback and continue consuming the already existing buffer. This means that there is a risk that the buffer is emptied while waiting for sender reports. This commit simply adds a delay before the RTSP pause request is sent, allowing some additional RTSP buffering that might be needed when the stream is resumed again. Also, if the stream is resumed again before the RTSP pause request is sent, there is no need for any RTSP pause request, hence it is omitted. Change-Id: I928c8bfb5e99a6a146dcda4e51e528973ecbe065
* | | | EOS fixes for RTSP streamsjoakim johansson2013-02-061-2/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix takes care of several near end of stream use cases: seek, pause and fake timestamps. Change-Id: I5f5fa881b1f619dfd5e1afd2af957082345c59eb
* | | | RTSP: Parse session level control attribute from SDPMåns Zigher2013-02-061-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a=control: is present at session-level in the SDP response, RFC2326:C.1.1 defines the URL to be used for aggregate commands. This includes PLAY and PAUSE but not TEARDOWN. Change-Id: Iaa1dc2271d00df39dc83477a99fda6fbeb73c5b4
* | | | Enable pause/resume for RTSP streamingRoger Jönsson2013-02-065-4/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a stream is paused, RTSP Pause is also sent to the server. Otherwise the buffering might continue until the memory runs out. When the stream is resumed, RTSP Play will be sent in order to resume the buffering. Change-Id: I5dc1761140827c532451638c3fd3f34271e5b9ab
* | | | RTSP buffering improvementsRoger Jönsson2013-02-068-13/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added buffering start and end notifications for RTSP. MEDIA_INFO_BUFFERING_START is sent when buffering is started and MEDIA_INFO_BUFFERING_END is sent when the buffer has filled up. This patch also adds RTSP end of stream handling. EOS is signalled when BYE is received OR when detecting end of stream even if no actual EOS is received. Change-Id: I5cccb6845060ae6afd66d9f735b89da81476cd13
* | | | HLS now properly publishes its "seekable" flags after connectionAndreas Huber2013-02-065-28/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | has successfully completed and a sufficient amount of data fetched, and only then signals that preparation is completed. Change-Id: I7684a14238b826909f518f2af506966e522dfcfc
* | | | RTSP now properly publishes its "seekable" flags after connectionAndreas Huber2013-02-056-14/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | has successfully completed and only then signals that preparation is complete. Change-Id: I1a60f718e673fe1462c69369c40eafbed6a14326
* | | | Merge "Support for a "preparation" state that can take care of lengthy"Andreas Huber2013-02-0515-119/+406
|\ \ \ \
| * | | | Support for a "preparation" state that can take care of lengthyAndreas Huber2013-02-0515-119/+406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operations in NuPlayer and its sources. Sources also can publish their flags now and the mediaplayer UI will be able to pick up on these. Change-Id: I4f2b7e5d105dcb4b6c9132cd0e8799efa0c6a14b
* | | | | Fix a typo in MediaPlayerFactory that would prevent us fromAndreas Huber2013-02-051-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | opting in to nuplayer for general media playback. Change-Id: I050f5178aadbb0b8bf422861ef885745c0b9006a
* | | | Detect live streamsRoger Jönsson2013-02-051-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The information is used to decide on visibility of pause button and to handle the duration clock correctly. Change-Id: I286ac992fd171c7fc313e429326d38b6fc80e3fb
* | | | Merge "Added HTTP support for SDP files."Andreas Huber2013-02-058-7/+362
|\ \ \ \
| * | | | Added HTTP support for SDP files.Oscar Rydhé2013-02-058-7/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for playing SDP files from http links. Previously, SDP files only worked when started from rtsp links (rtsp://a.b.c/abc.sdp), but they are just as common in http links. patch provided by "Oscar Rydhé <oscar.rydhe@sonyericsson.com>" Change-Id: Ic73af3a9a002009dbe8b04c267a4621bf7fe2f46
* | | | | Merge "Groundwork to support bidirectional, asynchronous communication"Andreas Huber2013-02-0513-19/+75
|\ \ \ \ \ | |/ / / /
| * | | | Groundwork to support bidirectional, asynchronous communicationAndreas Huber2013-02-0513-19/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between NuPlayer and its sources. Change-Id: I1989022d806206b926555add3aa5c1fcf37aa78d