summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Remove obsolete audioflinger referenceGlenn Kasten2013-01-181-3/+1
| | | | Change-Id: I9ae754c908f3b0102c3828c71d6f542851a74341
* Bug fix: set 'und' as default metadata language info for srt.Insun Kang2013-01-171-4/+3
| | | | | | | | | | | | | o Previously, it leaves language code empty and it is inconsistent with other code which gives 'und'. As a result, selected SRT track returned empty language info. With this fix, it returns 'und'. Bug: 7227230 TESTED=runtest -d cts-media -c android.media.cts.MediaPlayerTest -m testGetTrackInfo Change-Id: I225848f029637dd782c376e0d770dddd5c849550
* Fix AudioRecordGlenn Kasten2013-01-101-2/+2
| | | | | Bug: 7965744 Change-Id: Ic024e7fb32f7459b8093c2cf6cd5752aade21ddb
* Fix bug in AudioRecord() constructorGlenn Kasten2013-01-041-1/+1
| | | | | | | It was calling set() with wrong parameter list. This goes back to commit be916aa1267e2e6b1c148f51d11bcbbc79cb864c from 2010. Change-Id: I2f6917765baf58260bf35e89a2cc59c199734ff6
* am cd2d2631: am b54cedab: Merge "Use default values when MPEG4 audio config ↵James Dong2012-12-281-3/+10
|\ | | | | | | | | | | | | parsing fails." * commit 'cd2d263116576dc9770d31bb792e7cf2d6840b53': Use default values when MPEG4 audio config parsing fails.
| * am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."James Dong2012-12-211-3/+10
| |\ | | | | | | | | | | | | * commit 'b54cedabdf0261211241e2f3af09c75cffd911ed': Use default values when MPEG4 audio config parsing fails.
| | * Merge "Use default values when MPEG4 audio config parsing fails."James Dong2012-12-201-3/+10
| | |\
| | | * Use default values when MPEG4 audio config parsing fails.Erik Rydgren2012-11-191-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4 audio packets may be multiplexed using the so called LATM (Low Overhead Audio Transport Multiplex) scheme. LATM parsing was recently introduced in Stagefright and it has caused issues in cases when the LATM config element cannot be parsed correctly. The main problem occurrs when the AudioSpecificConfig part of the config element contains more information than what is expected, causing the frameLengthType parameter to get the wrong value. This fix introduces default values of some config parameters that are used in case config parsing fails. Change-Id: I3cb35df76826f95ca0831dc08c2a1e7c6c2c586d
* | | | Merge "Start isolating control block accesses in a proxy"Glenn Kasten2012-12-213-55/+103
|\ \ \ \
| * | | | Start isolating control block accesses in a proxyGlenn Kasten2012-12-123-55/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The proxy object will eventually be the only code that understands the details of the control block. This should make it easier to change the control block in the future. Initial set of control block fields that are isolated: - sample rate - send level - volume Prepare for streaming/static separation by adding a union to the control block for the new fields. Fix bug in handling of max sample rate on a track. It was only checking at re-configuration, not at each mix. Simplify OutputTrack::obtainBuffer. Change-Id: I2249f9d04f73a911a922ad1d7f6197292c74cd92
* | | | | Merge "Remove unnecessary parameter"Glenn Kasten2012-12-2111-40/+28
|\ \ \ \ \
| * | | | | Remove unnecessary parameterGlenn Kasten2012-12-1811-40/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just get the parameter on server side Change-Id: I433a63104dbb257e0d862be2ab61847cb36d1c15
* | | | | | Merge "Properly release any MediaBuffer references associated with the"Andreas Huber2012-12-202-19/+42
|\ \ \ \ \ \
| * | | | | | Properly release any MediaBuffer references associated with theAndreas Huber2012-12-202-19/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encoder input buffers on shutdown. This worked fine before for an orderly shutdown but didn't release all references in case of error. Change-Id: I0ea3eb26da76fbeb33cadf58d237b0c68a86ac4a related-to-bug: 7893090
* | | | | | | Merge "Ensure proper EOS behavior"Marco Nelissen2012-12-202-9/+9
|\ \ \ \ \ \ \
| * | | | | | | Ensure proper EOS behaviorMarco Nelissen2012-12-202-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a buffer is tagged with EOS but has data in it, decode that data instead of ignoring it. Change-Id: Ie41c8485c3ad7fe7d9c64f0752c2e7601d91d602
* | | | | | | | am 68c3de89: am df9cce64: Merge "Allow multichannel FLAC files"Glenn Kasten2012-12-201-17/+44
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | * commit '68c3de899f822acf3c735c681d206e852ad3821f': Allow multichannel FLAC files
| * | | | | | am df9cce64: Merge "Allow multichannel FLAC files"Glenn Kasten2012-12-201-17/+44
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'df9cce649d9ac1f4446f613c54191e7c4d646f07': Allow multichannel FLAC files
| | * | | | | Merge "Allow multichannel FLAC files"Glenn Kasten2012-12-201-17/+44
| | |\ \ \ \ \
| | | * | | | | Allow multichannel FLAC filesPatrik2 Carlsson2012-11-161-17/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FLACExtractor had artificial limits which did not allow multichannel audio, 88.2 or 96 kHz samplerate, these were removed since it is up to the audio subsystem to handle. Change-Id: Iadc20cdf4724814b5c980827a528a1e1b4bd6a82
* | | | | | | | Merge "Fix bug with discarded AudioRecord::read count"Glenn Kasten2012-12-201-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug with discarded AudioRecord::read countGlenn Kasten2012-12-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formerly, if an AudioRecord::read() got a timeout on obtainBuffer() after already successfully transferring some data, then it returned zero. This had the effect of discarding a partial transfer, which resulted in a gap in the audio data delivered to the app. Now if a timeout occurs after a partial transfer, it returns that partial transfer count so that no data is lost. Change-Id: I0d9c2f4e495a400b56ef916a06613ba26537ca97
* | | | | | | | | Merge "Fix memory leakage from MPEG4Writer."James Dong2012-12-181-18/+72
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix memory leakage from MPEG4Writer.James Dong2012-12-181-18/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o The in-memory cache, mMoovBoxBuffer, holding the content for Moov box may not be freed. o Added comment describing how the in-memory cache works o Moved the memory release to a single place to make the code more robust o Avoided allocating the in-memory cache if the file is not intended to be streamable o related-to-bug: 7664029 Change-Id: If04fc6b12daeaaa86710dfb4b4b9c175da6421df
* | | | | | | | | | Merge "Rename ISurfaceTexture and SurfaceTexture"Andy McFadden2012-12-1833-85/+85
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Rename ISurfaceTexture and SurfaceTextureAndy McFadden2012-12-1833-85/+85
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C++ class names don't match what the classes do, so rename ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to GLConsumer. Bug 7736700 Change-Id: I64520a55f8c09fe6215382ea361c539a9940cba5
* | | | | | | | | Merge "Report buffer size even when using hardware buffers"Marco Nelissen2012-12-181-5/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Report buffer size even when using hardware buffersMarco Nelissen2012-12-181-5/+4
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it so that the buffers dequeued from a MediaCodec show a non-zero size when there's actually data in them, which allows the caller to distinguish between a valid frame and an empty buffer. Change-Id: I891b2301501e26f0b4e8cf2e24c169e501a6d026
* | | | | | | | | Make codecs reconfigurableMarco Nelissen2012-12-188-0/+27
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3dd46cb4401493becbf6152f4dcd5a8f1e9a0b44
* | | | | | | | am 9435b498: am f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per ↵Glenn Kasten2012-12-171-2/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | sample wav" * commit '9435b498123f3e22532391c30eb42c336bf743ec': Fix bug in WAVExtractor for 24-bit per sample wav
| * | | | | | am f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sample wav"Glenn Kasten2012-12-171-2/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit 'f38259cfe5566914a49f5b0f8b11aa6a951d667a': Fix bug in WAVExtractor for 24-bit per sample wav
| | * | | | | Merge "Fix bug in WAVExtractor for 24-bit per sample wav"Glenn Kasten2012-12-171-2/+4
| | |\ \ \ \ \
| | | * | | | | Fix bug in WAVExtractor for 24-bit per sample wavcong.zhou2012-11-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support stereo/multichannel 24-bit format kMaxFrameSize is fixed to 32768. When converting 24-bit to 16-bit, number of samlpes is maxBytesToRead /3. In this case, if the maxBytesToRead is not multiple of 3, pcm data is messed when converting. Bug:7630939 Change-Id: I0ea1b53eb1272a8d83b63815fc0a05b73cef75f1
| * | | | | | | am 0cd75629: Merge "Match new paths and organization in external/libvpx"Jean-Baptiste Queru2012-12-143-5/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0cd75629a8f7a6bd47b2abc6dd8d9f66e70d76a4': Match new paths and organization in external/libvpx
| | * | | | | | Merge "Match new paths and organization in external/libvpx"Jean-Baptiste Queru2012-12-143-5/+5
| | |\ \ \ \ \ \
| | | * | | | | | Match new paths and organization in external/libvpxJohann2012-12-123-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See I2c0a87b0fc049e855e21f455b806287b578091de Change-Id: Iec8566bce0a4763a9a17b4a46f15aa39b5bcd141
* | | | | | | | | am 34d2f109: am 409542cd: Merge "FileSource: FILE is not closed"Marco Nelissen2012-12-141-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34d2f10908526cf3011d6c167a5817522b5a24d7': FileSource: FILE is not closed
| * | | | | | | | am 409542cd: Merge "FileSource: FILE is not closed"Marco Nelissen2012-12-141-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '409542cdaf72d8983043f2746d9d916ee1566a80': FileSource: FILE is not closed
| | * | | | | | | FileSource: FILE is not closedYou Kim2012-12-141-0/+4
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add destructor to call fclose. Change-Id: I765c56236f8df58af998439492b0b955ab57606f
* | | | | | | | SurfaceMediaSource: wait on fence from acquired buffersGreg Hackmann2012-12-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ab93a4adeec536648258c70a7d943503d9b10f4 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | | | Merge "Signal that IDR frames are sync frames"Marco Nelissen2012-12-133-0/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Signal that IDR frames are sync framesMarco Nelissen2012-12-133-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf77edc0572cae38935fd9d94367adbfcb370985
* | | | | | | | | Merge "Match new paths and organization in external/libvpx"Ying Wang2012-12-123-5/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Match new paths and organization in external/libvpxJohann2012-10-293-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See I739f99d48b8d7e6354c416ef2ca79c954826307f Change-Id: I42b51e2845a696a6e211dde00951afc8f571336f
* | | | | | | | | Increase buffer size for videoMarco Nelissen2012-12-121-2/+2
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I055e1336954387f7b48aa58d893a3a5fae036ece
* | | | | | | | Fix timestamps after seekMarco Nelissen2012-12-121-3/+3
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure buffers are correctly timestamped after a seek. Change-Id: I7d76689138e4f95c0ceb9fb7a4c4d42c48568212
* | | | | | | am 49c5737f: am 03425d9c: Merge "Fix bad checks that causes crash when ↵Andreas Huber2012-12-062-3/+28
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | streaming H.263 content." * commit '49c5737fe4d9d82ea1cc71d7ca73edfc7477a401': Fix bad checks that causes crash when streaming H.263 content.
| * | | | | | am 03425d9c: Merge "Fix bad checks that causes crash when streaming H.263 ↵Andreas Huber2012-12-062-3/+28
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content." * commit '03425d9cf7f22cf400c13cda60d3e91f0fd48d6e': Fix bad checks that causes crash when streaming H.263 content.
| | * | | | | Merge "Fix bad checks that causes crash when streaming H.263 content."Andreas Huber2012-12-052-3/+28
| | |\ \ \ \ \
| | | * | | | | Fix bad checks that causes crash when streaming H.263 content.Roger1 Jonsson2012-12-032-3/+28
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove checks that causes crash for rtsp streamed h.263 content with certain values in the RTP payload header: Remove zero check for the five reserved bits in the payload header. According to RFC 4629 these bits MUST be ignored by receivers. Remove zero-check for the VRC (Video Redundancy Coding) bit, skip packet instead. Remove zero-check for the PLEN bits (extra picture header), skip packet instead. Remove zero-check for the PEBIT bits (extra picture header), skip packet instead. Remove corresponding zero check for the four resreved bits in the AMR payload header. According to RFC 4867 these bits MUST be ignored by receivers. Change-Id: I7fc21d69a19d23da24f9267623c338d415ef1387
generated by cgit v1.1 at 2024-06-09 03:33:56 +0000