summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge fb474872 from gingerbread-plus-aospJean-Baptiste Queru2010-10-1815-16/+19
|\
| * am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead...Andreas Huber2010-10-1515-16/+19
| |\
| | * Include the framework copy of the OpenMAX headers instead of referencing exte...Andreas Huber2010-10-1515-16/+19
* | | am cb90947b: am e1f3976b: Merge "Make sure we cache the sampleTable again if ...Andreas Huber2010-10-161-1/+3
|\ \ \ | |/ /
| * | am e1f3976b: Merge "Make sure we cache the sampleTable again if using the cac...Andreas Huber2010-10-151-1/+3
| |\ \ | | |/
| | * Make sure we cache the sampleTable again if using the caching datasource.Andreas Huber2010-10-151-1/+3
* | | am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted o...Andreas Huber2010-10-151-1/+1
|\ \ \ | |/ /
| * | am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. T...Andreas Huber2010-10-131-1/+1
| |\ \ | | |/
| | * Metadata.cpp and Metadata.java had drifted out of sync. This change remedies ...Andreas Huber2010-10-131-1/+1
* | | am bb5d7c21: am 5f423917: Merge "Attempt to derive the avg. bitrate of the en...Andreas Huber2010-10-152-9/+50
|\ \ \ | |/ /
| * | am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream f...Andreas Huber2010-10-132-9/+50
| |\ \ | | |/
| | * Merge "Attempt to derive the avg. bitrate of the entire stream from metadata....Andreas Huber2010-10-132-9/+50
| | |\
| | | * Attempt to derive the avg. bitrate of the entire stream from metadata.Andreas Huber2010-10-132-9/+50
* | | | am 8e4f3c76: am 646e0d5a: Merge "Some webcams output rtp streams but never se...Andreas Huber2010-10-153-4/+62
|\ \ \ \ | |/ / /
| * | | am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp d...Andreas Huber2010-10-133-4/+62
| |\ \ \ | | |/ /
| | * | Some webcams output rtp streams but never send any rtcp data in violation ofAndreas Huber2010-10-133-4/+62
| | |/
* | | resolved conflicts for merge of a127c07c to masterKenny Root2010-10-144-21/+126
|\ \ \ | |/ /
| * | am 312644cd: Merge "Support for writing to MPEG2 transport stream files." int...Andreas Huber2010-10-134-21/+120
| |\ \ | | |/
| | * Merge "Support for writing to MPEG2 transport stream files." into gingerbreadAndreas Huber2010-10-134-21/+120
| | |\
| | | * Support for writing to MPEG2 transport stream files.Andreas Huber2010-10-124-21/+120
* | | | am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as complet...Andreas Huber2010-10-1414-33/+297
|\ \ \ \ | |/ / /
| * | | am 165c6579: Merge "HTTP Live content that are tagged as complete are now see...Andreas Huber2010-10-1314-33/+297
| |\ \ \ | | |/ /
| | * | HTTP Live content that are tagged as complete are now seekable.Andreas Huber2010-10-1214-33/+297
| | |/
* | | Remove hard-coded color format for Nvidia's video encoderJames Dong2010-10-131-4/+0
* | | am 5b0d0630: am 1010da2e: Merge "Just in case we\'re behind a NAT router/fire...Andreas Huber2010-10-121-0/+153
|\ \ \ | |/ /
| * | am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt...Andreas Huber2010-10-111-0/+153
| |\ \ | | |/
| | * Just in case we're behind a NAT router/firewall, attempt to poke holes into i...Andreas Huber2010-10-111-0/+153
* | | MTP: Include size of 12 byte header in packet size for GetObject data packetMike Lockwood2010-10-111-1/+3
* | | am cac43e8a: am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlaye...Andreas Huber2010-10-105-11/+87
|\ \ \ | |/ /
| * | am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not noti...Andreas Huber2010-10-085-11/+87
| |\ \ | | |/
| | * RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek i...Andreas Huber2010-10-085-11/+87
* | | am e0c8545a: am 0fd4e216: Merge "Refactor some more h.264 utility code out in...Andreas Huber2010-10-106-153/+207
|\ \ \ | |/ /
| * | am 0fd4e216: Merge "Refactor some more h.264 utility code out into avc_utils....Andreas Huber2010-10-086-153/+207
| |\ \ | | |/
| | * Refactor some more h.264 utility code out into avc_utils. Work around a hardw...Andreas Huber2010-10-086-153/+207
* | | am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for ...Andreas Huber2010-10-104-4/+14
|\ \ \ | |/ /
| * | am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek ...Andreas Huber2010-10-084-4/+14
| |\ \ | | |/
| | * Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very exp...Andreas Huber2010-10-084-4/+14
| | |\
| | | * Disable 10secs forward/backward seeking for rtsp as seek is a very expensive ...Andreas Huber2010-10-084-4/+14
* | | | am 5dcf588a: am b9bf5457: Merge "Respect the cropping rectangle when extracti...Andreas Huber2010-10-101-1/+38
|\ \ \ \ | |/ / /
| * | | am b9bf5457: Merge "Respect the cropping rectangle when extracting the video ...Andreas Huber2010-10-081-1/+38
| |\ \ \ | | |/ /
| | * | Merge "Respect the cropping rectangle when extracting the video dimensions fr...Andreas Huber2010-10-081-1/+38
| | |\ \
| | | * | Respect the cropping rectangle when extracting the video dimensions from the ...Andreas Huber2010-10-081-1/+38
| | | |/
* | | | am d31fc239: am 6dcdfdb4: Merge "Name the writer threads" into gingerbreadJames Dong2010-10-102-2/+11
|\ \ \ \ | |/ / /
| * | | am 6dcdfdb4: Merge "Name the writer threads" into gingerbreadJames Dong2010-10-082-2/+11
| |\ \ \ | | |/ /
| | * | Merge "Name the writer threads" into gingerbreadJames Dong2010-10-082-2/+11
| | |\ \
| | | * | Name the writer threadsJames Dong2010-10-072-2/+11
* | | | | am 14ea1048: am c5912acc: Merge "Disable the access unit timeout temporarily ...Andreas Huber2010-10-101-6/+29
|\ \ \ \ \ | |/ / / /
| * | | | am c5912acc: Merge "Disable the access unit timeout temporarily while a seek ...Andreas Huber2010-10-081-6/+29
| |\ \ \ \ | | |/ / /
| | * | | Merge "Disable the access unit timeout temporarily while a seek operation is ...Andreas Huber2010-10-081-6/+29
| | |\ \ \
| | | * | | Disable the access unit timeout temporarily while a seek operation is in prog...Andreas Huber2010-10-081-6/+29
| | | | |/ | | | |/|