summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix bug 4211099 channel constants and 7.1 mask"Jean-Michel Trivi2011-07-251-1/+27
|\
| * Fix bug 4211099 channel constants and 7.1 maskJean-Michel Trivi2011-07-241-1/+27
* | Merge "Add support for creating a Surface from a a SurfaceTexture."Ted Bonkenburg2011-07-251-4/+25
|\ \
| * | Add support for creating a Surface from a a SurfaceTexture.Ted Bonkenburg2011-07-221-4/+25
* | | Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out i...James Dong2011-07-241-10/+23
|\ \ \ | |_|/ |/| |
| * | Do not wait forever for output buffers in OMXCodec.cpp and error out in case ...James Dong2011-07-151-10/+23
* | | Merge "QueryCodecs() signature change"Jean-Michel Trivi2011-07-241-0/+7
|\ \ \
| * | | QueryCodecs() signature changeJean-Michel Trivi2011-07-221-0/+7
* | | | Merge "Do not change the number of bytes while converting 8-bit samples to 16...Gloria Wang2011-07-241-1/+3
|\ \ \ \
| * | | | Do not change the number of bytes while converting 8-bit samples to 16-bit,Gloria Wang2011-07-221-1/+3
* | | | | Merge "Deprecate two methods in MediaRecorder.java class"James Dong2011-07-222-104/+8
|\ \ \ \ \
| * | | | | Deprecate two methods in MediaRecorder.java classJames Dong2011-07-222-104/+8
* | | | | | Merge "Connect MediaRecorder Native to SurfaceMediaSource"Pannag Sanketi2011-07-228-72/+248
|\ \ \ \ \ \
| * | | | | | Connect MediaRecorder Native to SurfaceMediaSourcePannag Sanketi2011-07-228-72/+248
* | | | | | | SurfaceTexture: add the abandon method.Jamie Gennis2011-07-221-6/+7
* | | | | | | SurfaceMediaSource: remove getAllocator methodJamie Gennis2011-07-221-6/+0
|/ / / / / /
* | | | | | Merge "Renaming SurfaceEncoder to SurfaceMediaSource"Pannag Sanketi2011-07-224-78/+76
|\ \ \ \ \ \
| * | | | | | Renaming SurfaceEncoder to SurfaceMediaSourcePannag Sanketi2011-07-214-78/+76
* | | | | | | Merge "Adding SurfaceEncoder for encoding FilterFrames"Pannag Sanketi2011-07-226-0/+1306
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Adding SurfaceEncoder for encoding FilterFramesPannag Sanketi2011-07-216-0/+1306
| |/ / / / /
* | | | | | Merge "Retry datasource fetches a few times before giving up (NuCachedSource2)."Andreas Huber2011-07-224-10/+93
|\ \ \ \ \ \
| * | | | | | Retry datasource fetches a few times before giving up (NuCachedSource2).Andreas Huber2011-07-224-10/+93
| |/ / / / /
* | | | | | Merge "Log setVideoSurface() and setVideoSurfaceTexture() failures."James Dong2011-07-221-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Log setVideoSurface() and setVideoSurfaceTexture() failures.James Dong2011-07-211-0/+2
* | | | | | Merge "fix for issue 4142219 Don't hard code platform-specific limitations-j...Hong Teng2011-07-2111-88/+332
|\ \ \ \ \ \
| * | | | | | fix for issue 4142219Hong Teng2011-07-2011-88/+332
| | |_|/ / / | |/| | | |
* | | | | | Merge "AudioRecord JAVA: expose audio session Id"Eric Laurent2011-07-201-3/+21
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | AudioRecord JAVA: expose audio session IdEric Laurent2011-07-181-3/+21
* | | | | | Merge "Untangle MediaScanner error handling. Bug: 5056917"Jeff Brown2011-07-204-148/+178
|\ \ \ \ \ \
| * | | | | | Untangle MediaScanner error handling.Jeff Brown2011-07-204-148/+178
* | | | | | | Merge "Audio framework: support for audio pre processing"Eric Laurent2011-07-208-30/+114
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Audio framework: support for audio pre processingEric Laurent2011-07-188-30/+114
* | | | | | | Merge "Let the media recording framework release the Camera object when it is...James Dong2011-07-201-15/+35
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Let the media recording framework release the Camera object when it is the ownerJames Dong2011-07-201-15/+35
| | |_|_|/ / | |/| | | |
* | | | | | Merge "MediaScanner: Do separate bulk inserts for different media types"Mike Lockwood2011-07-201-26/+49
|\ \ \ \ \ \
| * | | | | | MediaScanner: Do separate bulk inserts for different media typesMike Lockwood2011-07-201-26/+49
| | |_|_|/ / | |/| | | |
* | | | | | Merge "Fix issue 5012047: silent mode mutes music"Eric Laurent2011-07-201-9/+16
|\ \ \ \ \ \
| * | | | | | Fix issue 5012047: silent mode mutes musicEric Laurent2011-07-191-9/+16
* | | | | | | Merge "MediaPlayer: add a disconnect from ANativeWindow"Jamie Gennis2011-07-201-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | MediaPlayer: add a disconnect from ANativeWindowJamie Gennis2011-07-191-0/+2
* | | | | | | Merge "Content found in the wild violated the MPEG4 systems specs"Andreas Huber2011-07-201-1/+19
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Content found in the wild violated the MPEG4 systems specsAndreas Huber2011-07-191-1/+19
| | |_|/ / / | |/| | | |
* | | | | | Merge "Fix issue 4499450: Unknown Ringer Mode"Eric Laurent2011-07-192-0/+27
|\ \ \ \ \ \
| * | | | | | Fix issue 4499450: Unknown Ringer ModeEric Laurent2011-07-192-0/+27
| | |_|/ / / | |/| | | |
* | | | | | Merge "More HLS fixes"Andreas Huber2011-07-192-10/+30
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | More HLS fixesAndreas Huber2011-07-192-10/+30
| | |/ / / | |/| | |
* | | | | use SurfaceTexture new scaling mode in SFMathias Agopian2011-07-193-0/+19
| |/ / / |/| | |
* | | | Merge "Remove PV AVC decoder"James Dong2011-07-1919-11185/+0
|\ \ \ \
| * | | | Remove PV AVC decoderJames Dong2011-07-1919-11185/+0
| |/ / /
* | | | Return the play stayed locked.Narayan Kamath2011-07-191-1/+3
|/ / /