summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-136-21/+128
|\ \ | |/
| * Merge "Support for writing to MPEG2 transport stream files." into gingerbreadAndreas Huber2010-10-136-21/+128
| |\
| | * Support for writing to MPEG2 transport stream files.Andreas Huber2010-10-126-21/+128
* | | am 165c6579: Merge "HTTP Live content that are tagged as complete are now see...Andreas Huber2010-10-1315-33/+298
|\ \ \ | |/ /
| * | HTTP Live content that are tagged as complete are now seekable.Andreas Huber2010-10-1215-33/+298
| |/
* | 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-086-7/+19
|\ \ | |/
| * Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very exp...Andreas Huber2010-10-086-7/+19
| |\
| | * Disable 10secs forward/backward seeking for rtsp as seek is a very expensive ...Andreas Huber2010-10-086-7/+19
* | | 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-0/+14
|\ \ \ \ | |/ / /
| * | | Merge "Added getter for session Id to AudioSink" into gingerbreadEric Laurent2010-10-084-0/+14
| |\ \ \ | | |/ / | |/| |
| | * | Added getter for session Id to AudioSinkEric Laurent2010-10-074-0/+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
| |/
* | resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aospGloria Wang2010-10-0727-365/+605
|\ \
| * | Update of DRM framework.Takeshi Aimi2010-10-0427-365/+605
* | | am 949f7d90: Merge "Work to support switching transport streams mid-stream an...Andreas Huber2010-10-0716-112/+463
|\ \ \ | | |/ | |/|
| * | Work to support switching transport streams mid-stream and signalling discont...Andreas Huber2010-10-0716-112/+463
* | | am 02654f01: Merge "On this particular device the hardware video decoder spit...Andreas Huber2010-10-075-17/+56
|\ \ \ | |/ /
| * | On this particular device the hardware video decoder spits out buffers that d...Andreas Huber2010-10-075-17/+56
* | | am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into ginger...Eric Laurent2010-10-051-3/+3
|\ \ \ | |/ /
| * | Merge "Fixed AudioFlinger not always pausing tracks" into gingerbreadEric Laurent2010-10-051-3/+3
| |\ \
| | * | Fixed AudioFlinger not always pausing tracksEric Laurent2010-10-051-3/+3
* | | | am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrac...Andreas Huber2010-10-054-14/+29
|\ \ \ \ | |/ / /
| * | | Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after sub...Andreas Huber2010-10-054-14/+29
| |/ /
* | | am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANati...Mathias Agopian2010-10-041-4/+6
|\ \ \ | |/ /
| * | fix [2835280] Add support for cancelling buffers to ANativeWindowMathias Agopian2010-10-041-4/+6
* | | am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file ...James Dong2010-10-042-2/+15
|\ \ \ | |/ /
| * | Fixed an issue where the reserved free space in the file writer was larger th...James Dong2010-10-042-2/+15