summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 76fd1ea5: am 7323115c: Merge "Improvements to our MPEG2 Transport Stream ↵Andreas Huber2012-09-043-23/+189
|\ | | | | | | | | | | | | parser" into jb-mr1-dev * commit '76fd1ea58835094e84d36f2353d1390c24d14bfc': Improvements to our MPEG2 Transport Stream parser
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | Verifies the continuity counter Parses and associates PCR time with streams Allows for a absolute time anchor to be signalled via discontinuity. Change-Id: I4bc88c78382c9cc6380f28df584cc6c254e0a8f9
* | | am 4adf4c6c: am 31238033: Merge "Move fragmented mp4 parser to ↵Marco Nelissen2012-08-318-106/+104
|\ \ \ | |/ / | | | | | | | | | | | | | | | libstagefright" into jb-mr1-dev * commit '4adf4c6cb90c2bdd2aa46179fd718cbc2f1dd067': Move fragmented mp4 parser to libstagefright
| * | 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
| | | | | | | | | | | | | | | | | | | | and rename it from Parser to FragmentedMP4Parser Change-Id: I986f50d0c5c93648aac675d6160e18623b031541
* | | | am 3256d42c: am cd89e801: Merge "Added an additional virtual method ↵Andreas Huber2012-08-311-0/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | IStreamSource::flags()." into jb-mr1-dev * commit '3256d42cdd9254baf861b256379140d3c647a85e': Added an additional virtual method IStreamSource::flags().
| * | | Merge "Added an additional virtual method IStreamSource::flags()." into ↵Andreas Huber2012-08-311-0/+16
| |\ \ \ | | | | | | | | | | | | | | | jb-mr1-dev
| | * | | Added an additional virtual method IStreamSource::flags().Andreas Huber2012-08-311-0/+16
| | | |/ | | |/| | | | | | | | | Change-Id: I89e62d84328e12f08c8f73cbfd53cfb42569de97
* | | | am f89f9703: am 892020e4: Merge "Special mode for ESQueue that allows for ↵Andreas Huber2012-08-312-4/+36
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | earlier dequeuing of access units" into jb-mr1-dev * commit 'f89f970332ff0bae5597278b156457759e6bb33d': Special mode for ESQueue that allows for earlier dequeuing of access units
| * | | Merge "Special mode for ESQueue that allows for earlier dequeuing of access ↵Andreas Huber2012-08-312-4/+36
| |\ \ \ | | | | | | | | | | | | | | | units" into jb-mr1-dev
| | * | | Special mode for ESQueue that allows for earlier dequeuing of access unitsAndreas Huber2012-08-312-4/+36
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | if it's know beforehand that each PES packet contains exactly one access unit. Currently this optimization is only supported for H.264 video. Change-Id: I0888027cc7e9850307484b11dba1191cf6bfac83
* | | | am 8d0189dc: am 61356671: Merge "Add support for mpeg2 transport streams to ↵Andreas Huber2012-08-317-5/+254
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | the RTSP implementation." into jb-mr1-dev * commit '8d0189dc829dc87a74ff91eb0c067dc291ff59c3': Add support for mpeg2 transport streams to the RTSP implementation.
| * | | Merge "Add support for mpeg2 transport streams to the RTSP implementation." ↵Andreas Huber2012-08-317-5/+254
| |\ \ \ | | |_|/ | |/| | | | | | into jb-mr1-dev
| | * | Add support for mpeg2 transport streams to the RTSP implementation.Andreas Huber2012-08-317-5/+254
| | |/ | | | | | | | | | Change-Id: I409d7133a53a71e62523b1acc2b03302fcf824a5
* | | am 6443ee88: am 9ed644af: Merge "Documentation on pipes" into jb-mr1-devGlenn Kasten2012-08-311-0/+40
|\ \ \ | |/ / | | | | | | | | | * commit '6443ee88b20247c4f4fabaf77e929a996cd9e454': Documentation on pipes
| * | Merge "Documentation on pipes" into jb-mr1-devGlenn Kasten2012-08-311-0/+40
| |\ \
| | * | Documentation on pipesGlenn Kasten2012-08-301-0/+40
| | | | | | | | | | | | | | | | Change-Id: I3de496c7db026c50dcb6bc577741bb65d08e7c9d
* | | | am 08d8228d: am b3428f7f: Merge "Update audio comments" into jb-mr1-devGlenn Kasten2012-08-311-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '08d8228d508adf26e1e6bdf44401ee3b7fcca22f': Update audio comments
| * | | Merge "Update audio comments" into jb-mr1-devGlenn Kasten2012-08-311-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Update audio commentsGlenn Kasten2012-08-301-1/+1
| | |/ | | | | | | | | | Change-Id: Ie7504d0ddb252f7e4d4f99ed0b44cfc7b1049816
* | | am 357dd4e9: am dc91c885: Merge "Implement the source->sink(!) keep alive ↵Andreas Huber2012-08-312-12/+95
|\ \ \ | |/ / | | | | | | | | | | | | | | | the wfd specs mandate..." into jb-mr1-dev * commit '357dd4e99f5fd5d41e262d38e11a1f7f1e26c632': Implement the source->sink(!) keep alive the wfd specs mandate...
| * | Merge "Implement the source->sink(!) keep alive the wfd specs mandate..." ↵Andreas Huber2012-08-312-12/+95
| |\ \ | | | | | | | | | | | | into jb-mr1-dev
| | * | Implement the source->sink(!) keep alive the wfd specs mandate...Andreas Huber2012-08-302-12/+95
| | | | | | | | | | | | | | | | Change-Id: I388d9911ebd243aa9c13a13ec3683e76898470a6
* | | | am 5262df1f: am 64d7b68f: Merge "Don\'t hard code the number of buffers for ↵Jamie Gennis2012-08-301-3/+25
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | SurfaceMediaSource" into jb-mr1-dev * commit '5262df1fd48ed6c4a350124a6319d664e838a8a6': Don't hard code the number of buffers for SurfaceMediaSource
| * | | Merge "Don't hard code the number of buffers for SurfaceMediaSource" into ↵Jamie Gennis2012-08-301-3/+25
| |\ \ \ | | |_|/ | |/| | | | | | jb-mr1-dev
| | * | Don't hard code the number of buffers for SurfaceMediaSourceJames Dong2012-08-301-3/+25
| | | | | | | | | | | | | | | | Change-Id: I9ce17b3dc82a5d3e4a66569c76ad9745ceedacd6
* | | | am 27a78751: am 5dcc2c98: Merge "Only run the wifi display RTSP server on ↵Andreas Huber2012-08-3011-31/+97
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | demand, and only on the wifi direct" into jb-mr1-dev * commit '27a787512ff3f9a7ba200bc53f8c688692995748': Only run the wifi display RTSP server on demand, and only on the wifi direct
| * | | Merge "Only run the wifi display RTSP server on demand, and only on the wifi ↵Andreas Huber2012-08-3011-31/+97
| |\ \ \ | | | |/ | | |/| | | | | direct" into jb-mr1-dev
| | * | Only run the wifi display RTSP server on demand, and only on the wifi directAndreas Huber2012-08-3011-31/+97
| | | | | | | | | | | | | | | | | | | | | | | | interface. Change-Id: I7d3c44cb79cd40e73499f2d7ccf35c69b628e6d7
* | | | am c9beb01c: am b9cba9b7: Merge "Move libnbaio out of AudioFlinger" into ↵Glenn Kasten2012-08-3013-0/+1351
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'c9beb01c800e6326051aee52a00659288c25c6eb': Move libnbaio out of AudioFlinger
| * | | 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
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libnbaio is now a separate shared library from AudioFlinger, rather than a static library used only by AudioFlinger. AudioBufferProvider interface is now also independent of AudioFlinger, moved to include/media/ Change-Id: I9bb62ffbc38d42a38b0af76e66da5e9ab1e0e21b
* | | | am 4449d1cd: am cba53fbd: audio effects: fix bug in sample rate control.Eric Laurent2012-08-301-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4449d1cd962dd6fb0c25d100d2a08b0bb18f05c8': audio effects: fix bug in sample rate control.
| * | | audio effects: fix bug in sample rate control.Eric Laurent2012-08-301-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | Fix a bug in LVM bundle wrapper preventing audio framework sample rate from being sent to the effect bundle instance. Change-Id: I912027f866d3beac91b977bba869ff96a92d2a62
* | | am a9e6f9d5: am 86b1961a: Merge "Prepare for transmitting audio through ↵Andreas Huber2012-08-302-5/+45
|\ \ \ | |/ / | | | | | | | | | | | | | | | AudioSource." into jb-mr1-dev * commit 'a9e6f9d5542382f66802fb251c1f2562b3174aa0': Prepare for transmitting audio through AudioSource.
| * | Prepare for transmitting audio through AudioSource.Andreas Huber2012-08-302-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | AudioSource can now be configured to output buffers timestamped based on looper time (absolute) instead of based on systemTime() relative to start time. Change-Id: I8eca42648eb50033ac4aafbe5daac64a98a40690
* | | am 3b30e72d: am 546436a4: Merge "Transmit frames at a higher frame rate for ↵Andreas Huber2012-08-302-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | smoother updates, increase" into jb-mr1-dev * commit '3b30e72d5013cd89bff20852e9ff55eb0f5d6ad9': Transmit frames at a higher frame rate for smoother updates, increase
| * | Transmit frames at a higher frame rate for smoother updates, increaseAndreas Huber2012-08-302-3/+3
| | | | | | | | | | | | | | | | | | video bandwidth to 5 Mbit/sec. Change-Id: Ieb9051b0f29d5a20004d1b3befdb745bc67769c7
* | | am fd7e92e8: am 682d5593: Merge "Optionally log the transport stream ↵Andreas Huber2012-08-302-1/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | transmitted to the sink." into jb-mr1-dev * commit 'fd7e92e8643169ac9ff8a2b18dc4ef9f7cf8820b': Optionally log the transport stream transmitted to the sink.
| * | Optionally log the transport stream transmitted to the sink.Andreas Huber2012-08-302-1/+28
| | | | | | | | | | | | Change-Id: I5d392e7997d6beb09ba6eca70d6899747098d2b3
* | | am d58522bb: am 2f9a4410: Merge "Fix wifi display shutdown deadlock." into ↵Andreas Huber2012-08-291-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | jb-mr1-dev * commit 'd58522bbd87cd09c8e7953a992a3b97f6ca7f30f': Fix wifi display shutdown deadlock.
| * | 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
| | | | | | | | | | | | | | | | Change-Id: I77eed39f39c0de6b427c425248ff7d21c051c074
* | | | am 544b67a0: am d8ee4e56: Merge "Initial checkin of support for acting as a ↵Andreas Huber2012-08-2923-38/+4457
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | wifi display source" into jb-mr1-dev * commit '544b67a04b4289aaafa852cbab54abf1f3d6a5bf': Initial checkin of support for acting as a wifi display source
| * | | Merge "Initial checkin of support for acting as a wifi display source" into ↵Andreas Huber2012-08-2923-38/+4457
| |\ \ \ | | |/ / | | | | | | | | jb-mr1-dev
| | * | Initial checkin of support for acting as a wifi display sourceAndreas Huber2012-08-2923-38/+4457
| | | | | | | | | | | | | | | | Change-Id: I08f17efa0c7d007e17408feb7d4fbef0a19f531a
* | | | am f4500233: am f147b722: Merge "Preliminary support for HDCP as a binder ↵Andreas Huber2012-08-294-0/+356
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | service for wifi display support." into jb-mr1-dev * commit 'f45002335606a9edb181814fbdf8d0a4e1468a9d': Preliminary support for HDCP as a binder service for wifi display support.
| * | | Merge "Preliminary support for HDCP as a binder service for wifi display ↵Andreas Huber2012-08-294-0/+356
| |\ \ \ | | |_|/ | |/| | | | | | support." into jb-mr1-dev
| | * | Preliminary support for HDCP as a binder service for wifi display support.Andreas Huber2012-08-294-0/+356
| | |/ | | | | | | | | | Change-Id: Ie0de1c086c629a668d1c7863992eef56fb94157c