summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 52bea277: Merge "If we encounter video stream EOS while seeking we may sti...Andreas Huber2010-10-192-18/+37
|\
| * If we encounter video stream EOS while seeking we may still need to seek audio.Andreas Huber2010-10-192-18/+37
* | am d68cda47: An attempt to unregister a handler that\'s no longer registered ...Andreas Huber2010-10-181-3/+8
|\ \ | |/
| * An attempt to unregister a handler that's no longer registered should not cau...Andreas Huber2010-10-181-3/+8
* | am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decod...Andreas Huber2010-10-182-2/+46
|\ \ | |/
| * Merge "For thumbnail extraction make sure we instantiate a decoder that allow...Andreas Huber2010-10-182-2/+46
| |\
| | * For thumbnail extraction make sure we instantiate a decoder that allows acces...Andreas Huber2010-10-182-2/+46
* | | am 02ec432e: Merge "If the PES packet size exceeds 16-bit range, use a packet...Andreas Huber2010-10-181-0/+8
|\ \ \ | |/ /
| * | If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. ...Andreas Huber2010-10-181-0/+8
| |/
* | am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead...Andreas Huber2010-10-1516-17/+20
|\ \ | |/
| * Include the framework copy of the OpenMAX headers instead of referencing exte...Andreas Huber2010-10-1516-17/+20
* | 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 ae0bb04a: Merge "Fix issue 3098850" into gingerbreadEric Laurent2010-10-141-0/+1
|\ \ | |/
| * Fix issue 3098850Eric Laurent2010-10-141-0/+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 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 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
| |/
* | am 312644cd: Merge "Support for writing to MPEG2 transport stream files." int...Andreas Huber2010-10-135-21/+123
|\ \ | |/
| * Merge "Support for writing to MPEG2 transport stream files." into gingerbreadAndreas Huber2010-10-135-21/+123
| |\
| | * Support for writing to MPEG2 transport stream files.Andreas Huber2010-10-125-21/+123
* | | 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
| |/
* | 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
* | 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 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 f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek ...Andreas Huber2010-10-085-5/+16
|\ \ | |/
| * Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very exp...Andreas Huber2010-10-085-5/+16
| |\
| | * Disable 10secs forward/backward seeking for rtsp as seek is a very expensive ...Andreas Huber2010-10-085-5/+16
* | | 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 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 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
| | | |/ | | |/|
* | | | am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbreadEric Laurent2010-10-084-1/+14
|\ \ \ \ | |/ / /
| * | | Merge "Added getter for session Id to AudioSink" into gingerbreadEric Laurent2010-10-084-1/+14
| |\ \ \ | | |/ / | |/| |
| | * | Added getter for session Id to AudioSinkEric Laurent2010-10-074-1/+14
| | |/
* | | am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, t...Andreas Huber2010-10-083-4/+4
|\ \ \ | |/ /
| * | Increase scratch buffers sizes in mp3 software decoder, this integrates a PV ...Andreas Huber2010-10-073-4/+4
| |/