summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove unnecessary parameter"Glenn Kasten2012-12-2111-40/+28
|\
| * Remove unnecessary parameterGlenn Kasten2012-12-1811-40/+28
* | 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
* | | Merge "Ensure proper EOS behavior"Marco Nelissen2012-12-202-9/+9
|\ \ \
| * | | Ensure proper EOS behaviorMarco Nelissen2012-12-202-9/+9
* | | | am 68c3de89: am df9cce64: Merge "Allow multichannel FLAC files"Glenn Kasten2012-12-201-17/+44
|\ \ \ \ | |_|/ / |/| | |
| * | | am df9cce64: Merge "Allow multichannel FLAC files"Glenn Kasten2012-12-201-17/+44
| |\ \ \
| | * \ \ Merge "Allow multichannel FLAC files"Glenn Kasten2012-12-201-17/+44
| | |\ \ \
| | | * | | Allow multichannel FLAC filesPatrik2 Carlsson2012-11-161-17/+44
* | | | | | 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
* | | | | | | Merge "Fix memory leakage from MPEG4Writer."James Dong2012-12-181-18/+72
|\ \ \ \ \ \ \
| * | | | | | | Fix memory leakage from MPEG4Writer.James Dong2012-12-181-18/+72
* | | | | | | | Merge "Rename ISurfaceTexture and SurfaceTexture"Andy McFadden2012-12-1833-85/+85
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Rename ISurfaceTexture and SurfaceTextureAndy McFadden2012-12-1833-85/+85
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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
| |/ / / / / /
* | | | | | | Make codecs reconfigurableMarco Nelissen2012-12-188-0/+27
|/ / / / / /
* | | | | | am 9435b498: am f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sampl...Glenn Kasten2012-12-171-2/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sample wav"Glenn Kasten2012-12-171-2/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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
| * | | | | am 0cd75629: Merge "Match new paths and organization in external/libvpx"Jean-Baptiste Queru2012-12-143-5/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
* | | | | | | am 34d2f109: am 409542cd: Merge "FileSource: FILE is not closed"Marco Nelissen2012-12-141-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 409542cd: Merge "FileSource: FILE is not closed"Marco Nelissen2012-12-141-0/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | FileSource: FILE is not closedYou Kim2012-12-141-0/+4
| | |/ / / /
* | | | | | SurfaceMediaSource: wait on fence from acquired buffersGreg Hackmann2012-12-141-0/+4
* | | | | | 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
* | | | | | | 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
* | | | | | | Increase buffer size for videoMarco Nelissen2012-12-121-2/+2
* | | | | | | Fix timestamps after seekMarco Nelissen2012-12-121-3/+3
| |_|_|_|/ / |/| | | | |
* | | | | | am 49c5737f: am 03425d9c: Merge "Fix bad checks that causes crash when stream...Andreas Huber2012-12-062-3/+28
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 03425d9c: Merge "Fix bad checks that causes crash when streaming H.263 con...Andreas Huber2012-12-062-3/+28
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | 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
| | | | |/ / | | | |/| |
* | | | | | Merge "setVideoSurfaceTexture is now synchronous and applied dynamically"Andreas Huber2012-12-054-12/+97
|\ \ \ \ \ \
| * | | | | | setVideoSurfaceTexture is now synchronous and applied dynamicallyAndreas Huber2012-12-034-12/+97
* | | | | | | Respect sample aspect ratio in NuPlayer.Andreas Huber2012-12-055-19/+131
* | | | | | | Split off the current control block to separate fileGlenn Kasten2012-12-033-176/+197
* | | | | | | Emphasize distinction between streaming and staticGlenn Kasten2012-12-031-9/+15
* | | | | | | flush() comments and checksGlenn Kasten2012-12-031-9/+10
* | | | | | | AudioTrack::mute() is unused so remove itGlenn Kasten2012-12-032-23/+3
* | | | | | | Merge "AudioTrack inline short const methods"Glenn Kasten2012-12-031-47/+0
|\ \ \ \ \ \ \
| * | | | | | | AudioTrack inline short const methodsGlenn Kasten2012-11-301-47/+0
* | | | | | | | am cd8d39e0: am f00d40c7: Merge "Memory leak solved in MPEG4Extractor::parseC...Andreas Huber2012-12-031-6/+3
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |