summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 76fd1ea5: am 7323115c: Merge "Improvements to our MPEG2 Transport Stream p...Andreas Huber2012-09-043-23/+189
|\
| * Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-devAndreas Huber2012-09-043-23/+189
| |\
| | * Improvements to our MPEG2 Transport Stream parserAndreas Huber2012-08-313-23/+189
* | | am 4adf4c6c: am 31238033: Merge "Move fragmented mp4 parser to libstagefright...Marco Nelissen2012-08-318-106/+104
|\ \ \ | |/ /
| * | Merge "Move fragmented mp4 parser to libstagefright" into jb-mr1-devMarco Nelissen2012-08-318-106/+104
| |\ \
| | * | Move fragmented mp4 parser to libstagefrightMarco Nelissen2012-08-318-106/+104
* | | | am 3256d42c: am cd89e801: Merge "Added an additional virtual method IStreamSo...Andreas Huber2012-08-311-0/+16
|\ \ \ \ | |/ / /
| * | | Merge "Added an additional virtual method IStreamSource::flags()." into jb-mr...Andreas Huber2012-08-311-0/+16
| |\ \ \
| | * | | Added an additional virtual method IStreamSource::flags().Andreas Huber2012-08-311-0/+16
| | | |/ | | |/|
* | | | am f89f9703: am 892020e4: Merge "Special mode for ESQueue that allows for ear...Andreas Huber2012-08-312-4/+36
|\ \ \ \ | |/ / /
| * | | Merge "Special mode for ESQueue that allows for earlier dequeuing of access u...Andreas Huber2012-08-312-4/+36
| |\ \ \
| | * | | Special mode for ESQueue that allows for earlier dequeuing of access unitsAndreas Huber2012-08-312-4/+36
| | |/ /
* | | | am 8d0189dc: am 61356671: Merge "Add support for mpeg2 transport streams to t...Andreas Huber2012-08-317-5/+254
|\ \ \ \ | |/ / /
| * | | Merge "Add support for mpeg2 transport streams to the RTSP implementation." i...Andreas Huber2012-08-317-5/+254
| |\ \ \ | | |_|/ | |/| |
| | * | Add support for mpeg2 transport streams to the RTSP implementation.Andreas Huber2012-08-317-5/+254
| | |/
* | | am 6443ee88: am 9ed644af: Merge "Documentation on pipes" into jb-mr1-devGlenn Kasten2012-08-311-0/+40
|\ \ \ | |/ /
| * | Merge "Documentation on pipes" into jb-mr1-devGlenn Kasten2012-08-311-0/+40
| |\ \
| | * | Documentation on pipesGlenn Kasten2012-08-301-0/+40
* | | | am 08d8228d: am b3428f7f: Merge "Update audio comments" into jb-mr1-devGlenn Kasten2012-08-311-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Update audio comments" into jb-mr1-devGlenn Kasten2012-08-311-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Update audio commentsGlenn Kasten2012-08-301-1/+1
| | |/
* | | am 357dd4e9: am dc91c885: Merge "Implement the source->sink(!) keep alive the...Andreas Huber2012-08-312-12/+95
|\ \ \ | |/ /
| * | Merge "Implement the source->sink(!) keep alive the wfd specs mandate..." int...Andreas Huber2012-08-312-12/+95
| |\ \
| | * | Implement the source->sink(!) keep alive the wfd specs mandate...Andreas Huber2012-08-302-12/+95
* | | | am 5262df1f: am 64d7b68f: Merge "Don\'t hard code the number of buffers for S...Jamie Gennis2012-08-301-3/+25
|\ \ \ \ | |/ / /
| * | | Merge "Don't hard code the number of buffers for SurfaceMediaSource" into jb-...Jamie Gennis2012-08-301-3/+25
| |\ \ \ | | |_|/ | |/| |
| | * | Don't hard code the number of buffers for SurfaceMediaSourceJames Dong2012-08-301-3/+25
* | | | am 27a78751: am 5dcc2c98: Merge "Only run the wifi display RTSP server on dem...Andreas Huber2012-08-3011-31/+97
|\ \ \ \ | |/ / /
| * | | Merge "Only run the wifi display RTSP server on demand, and only on the wifi ...Andreas Huber2012-08-3011-31/+97
| |\ \ \ | | | |/ | | |/|
| | * | Only run the wifi display RTSP server on demand, and only on the wifi directAndreas Huber2012-08-3011-31/+97
* | | | am c9beb01c: am b9cba9b7: Merge "Move libnbaio out of AudioFlinger" into jb-m...Glenn Kasten2012-08-3013-0/+1351
|\ \ \ \ | |/ / /
| * | | Merge "Move libnbaio out of AudioFlinger" into jb-mr1-devGlenn Kasten2012-08-3013-0/+1351
| |\ \ \
| | * | | Move libnbaio out of AudioFlingerGlenn Kasten2012-08-3013-0/+1351
| | | |/ | | |/|
* | | | am 4449d1cd: am cba53fbd: audio effects: fix bug in sample rate control.Eric Laurent2012-08-301-0/+2
|\ \ \ \ | |/ / /
| * | | audio effects: fix bug in sample rate control.Eric Laurent2012-08-301-0/+2
| | |/ | |/|
* | | am a9e6f9d5: am 86b1961a: Merge "Prepare for transmitting audio through Audio...Andreas Huber2012-08-302-5/+45
|\ \ \ | |/ /
| * | Prepare for transmitting audio through AudioSource.Andreas Huber2012-08-302-5/+45
* | | am 3b30e72d: am 546436a4: Merge "Transmit frames at a higher frame rate for s...Andreas Huber2012-08-302-3/+3
|\ \ \ | |/ /
| * | Transmit frames at a higher frame rate for smoother updates, increaseAndreas Huber2012-08-302-3/+3
* | | am fd7e92e8: am 682d5593: Merge "Optionally log the transport stream transmit...Andreas Huber2012-08-302-1/+28
|\ \ \ | |/ /
| * | Optionally log the transport stream transmitted to the sink.Andreas Huber2012-08-302-1/+28
* | | am d58522bb: am 2f9a4410: Merge "Fix wifi display shutdown deadlock." into jb...Andreas Huber2012-08-291-2/+2
|\ \ \ | |/ /
| * | Merge "Fix wifi display shutdown deadlock." into jb-mr1-devAndreas Huber2012-08-291-2/+2
| |\ \
| | * | Fix wifi display shutdown deadlock.Andreas Huber2012-08-291-2/+2
* | | | am 544b67a0: am d8ee4e56: Merge "Initial checkin of support for acting as a w...Andreas Huber2012-08-2923-38/+4457
|\ \ \ \ | |/ / /
| * | | Merge "Initial checkin of support for acting as a wifi display source" into j...Andreas Huber2012-08-2923-38/+4457
| |\ \ \ | | |/ /
| | * | Initial checkin of support for acting as a wifi display sourceAndreas Huber2012-08-2923-38/+4457
* | | | am f4500233: am f147b722: Merge "Preliminary support for HDCP as a binder ser...Andreas Huber2012-08-294-0/+356
|\ \ \ \ | |/ / /
| * | | Merge "Preliminary support for HDCP as a binder service for wifi display supp...Andreas Huber2012-08-294-0/+356
| |\ \ \ | | |_|/ | |/| |
| | * | Preliminary support for HDCP as a binder service for wifi display support.Andreas Huber2012-08-294-0/+356
| | |/