summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge fb474872 from gingerbread-plus-aospJean-Baptiste Queru2010-10-1815-16/+19
|\ | | | | | | Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
| * am b04f356d: Merge "Include the framework copy of the OpenMAX headers ↵Andreas Huber2010-10-1515-16/+19
| |\ | | | | | | | | | | | | | | | | | | | | | | | | instead of referencing external/opencore." into gingerbread Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp * commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678': Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
| | * Include the framework copy of the OpenMAX headers instead of referencing ↵Andreas Huber2010-10-1515-16/+19
| | | | | | | | | | | | | | | | | | | | | external/opencore. Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6 related-to-bug: 3101573
* | | am cb90947b: am e1f3976b: Merge "Make sure we cache the sampleTable again if ↵Andreas Huber2010-10-161-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | using the caching datasource." into gingerbread Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611' * commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611': Make sure we cache the sampleTable again if using the caching datasource.
| * | am e1f3976b: Merge "Make sure we cache the sampleTable again if using the ↵Andreas Huber2010-10-151-1/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | caching datasource." into gingerbread Merge commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c' into gingerbread-plus-aosp * commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c': Make sure we cache the sampleTable again if using the caching datasource.
| | * Make sure we cache the sampleTable again if using the caching datasource.Andreas Huber2010-10-151-1/+3
| | | | | | | | | | | | | | | | | | | | | QA-impact: This fixes http streaming again which I broke about 2 days ago. The previously observed symptoms were stuttering playback of http streams (think YouTube) after a certain playback position. Change-Id: I14050e3522ecd62c90d29310efdf508fdd2e87b5 related-to-bug: 3098873
* | | am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted ↵Andreas Huber2010-10-151-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | out of sync. This change remedies that." into gingerbread Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f' * commit '27c7fb1a861776b4fdc2632697e4e25eee83617f': Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
| * | am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. ↵Andreas Huber2010-10-131-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | This change remedies that." into gingerbread Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp * commit '90d59d180bd963f00161e6bfaabfda432960cab6': Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
| | * Metadata.cpp and Metadata.java had drifted out of sync. This change remedies ↵Andreas Huber2010-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | that. Change-Id: I48175666857ab0fb1519777bdb6f7f0b6b5cc599 related-to-bug: 3073955
* | | am bb5d7c21: am 5f423917: Merge "Attempt to derive the avg. bitrate of the ↵Andreas Huber2010-10-152-9/+50
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | entire stream from metadata." into gingerbread Merge commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b' * commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b': Attempt to derive the avg. bitrate of the entire stream from metadata.
| * | am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream ↵Andreas Huber2010-10-132-9/+50
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | from metadata." into gingerbread Merge commit '5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp * commit '5f42391701c0657d520d00f62a4c061b18ba1280': Attempt to derive the avg. bitrate of the entire stream from metadata.
| | * Merge "Attempt to derive the avg. bitrate of the entire stream from ↵Andreas Huber2010-10-132-9/+50
| | |\ | | | | | | | | | | | | metadata." into gingerbread
| | | * Attempt to derive the avg. bitrate of the entire stream from metadata.Andreas Huber2010-10-132-9/+50
| | | | | | | | | | | | | | | | | | | | related-to-bug: 3093224 Change-Id: I4726b023373e04468cc12fd64f7fe6ee923add95
* | | | am 8e4f3c76: am 646e0d5a: Merge "Some webcams output rtp streams but never ↵Andreas Huber2010-10-153-4/+62
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160' * commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160': Some webcams output rtp streams but never send any rtcp data in violation of
| * | | am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp ↵Andreas Huber2010-10-133-4/+62
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread Merge commit '646e0d5ab342f414f556574f2d078bd6deb22ed3' into gingerbread-plus-aosp * commit '646e0d5ab342f414f556574f2d078bd6deb22ed3': Some webcams output rtp streams but never send any rtcp data in violation of
| | * | Some webcams output rtp streams but never send any rtcp data in violation ofAndreas Huber2010-10-133-4/+62
| | |/ | | | | | | | | | | | | | | | | | | the specs. Attempt to use fake timestamps to be able to play these... Change-Id: Ia7a926616fb764e972955df4acdb59d85cdd93df related-to-bug: 3087310
* | | resolved conflicts for merge of a127c07c to masterKenny Root2010-10-144-21/+126
|\ \ \ | |/ / | | | | | | Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
| * | am 312644cd: Merge "Support for writing to MPEG2 transport stream files." ↵Andreas Huber2010-10-134-21/+120
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp * commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7': Support for writing to MPEG2 transport stream files.
| | * 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
| | | | | | | | | | | | | | | | Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
* | | | am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as ↵Andreas Huber2010-10-1414-33/+297
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | complete are now seekable." into gingerbread Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0' * commit '28b93967d0e702304c7edec854a29d5ab88bfce0': HTTP Live content that are tagged as complete are now seekable.
| * | | am 165c6579: Merge "HTTP Live content that are tagged as complete are now ↵Andreas Huber2010-10-1314-33/+297
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | seekable." into gingerbread Merge commit '165c6579660c22edafb61fee2a0cf39334a2a905' into gingerbread-plus-aosp * commit '165c6579660c22edafb61fee2a0cf39334a2a905': HTTP Live content that are tagged as complete are now seekable.
| | * | HTTP Live content that are tagged as complete are now seekable.Andreas Huber2010-10-1214-33/+297
| | |/ | | | | | | | | | | | | Change-Id: I9d0d2f009f883e5baf3e9de8c5c0aa05760e4bde related-to-bug: 2368598
* | | Remove hard-coded color format for Nvidia's video encoderJames Dong2010-10-131-4/+0
| | | | | | | | | | | | | | | | | | | | | o camera would query the color format if camera source is used o if camera source is not used, a MetaData can be passed to do the same. Change-Id: Iff1f802cc4974b286085473e5384bd88e04fa05d
* | | am 5b0d0630: am 1010da2e: Merge "Just in case we\'re behind a NAT ↵Andreas Huber2010-10-121-0/+153
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread Merge commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5' * commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5': Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
| * | am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, ↵Andreas Huber2010-10-111-0/+153
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread Merge commit '1010da2e02216b2f94fbe763a82d53201b340217' into gingerbread-plus-aosp * commit '1010da2e02216b2f94fbe763a82d53201b340217': Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
| | * Just in case we're behind a NAT router/firewall, attempt to poke holes into ↵Andreas Huber2010-10-111-0/+153
| | | | | | | | | | | | | | | | | | | | | it for future incoming RTP/RTCP packets to pass through. Change-Id: Idd47968d4027f357222f19f15eecfd70fdec3282 related-to-bug: 3073813
* | | MTP: Include size of 12 byte header in packet size for GetObject data packetMike Lockwood2010-10-111-1/+3
| | | | | | | | | | | | | | | | | | | | | Fixes file transfer from device to host with libmtp. Change-Id: Ifb304c1f106e94b2710ee5c11816b83cf5f25478 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | am cac43e8a: am beffefa2: Merge "RTSP seeking is now asynchronous, ↵Andreas Huber2010-10-105-11/+87
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread Merge commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22' * commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22': RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
| * | am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not ↵Andreas Huber2010-10-085-11/+87
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread Merge commit 'beffefa24f398b610d58dd583d9f5613dc529c28' into gingerbread-plus-aosp * commit 'beffefa24f398b610d58dd583d9f5613dc529c28': RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
| | * RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek ↵Andreas Huber2010-10-085-11/+87
| | | | | | | | | | | | | | | | | | | | | is complete until it actually is. Ignore seek requests on live streams. Change-Id: Ie61230cd60dd6c682baf72529100369ad6291189 related-to-bug: 3073955
* | | am e0c8545a: am 0fd4e216: Merge "Refactor some more h.264 utility code out ↵Andreas Huber2010-10-106-153/+207
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread Merge commit 'e0c8545a2369881fe09582337a9de3db2db1a951' * commit 'e0c8545a2369881fe09582337a9de3db2db1a951': Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
| * | am 0fd4e216: Merge "Refactor some more h.264 utility code out into ↵Andreas Huber2010-10-086-153/+207
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread Merge commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10' into gingerbread-plus-aosp * commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10': Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
| | * Refactor some more h.264 utility code out into avc_utils. Work around a ↵Andreas Huber2010-10-086-153/+207
| | | | | | | | | | | | | | | | | | hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR. Change-Id: I61936601e55df7e4c23a8c13087579a4f85bd6e6
* | | am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for ↵Andreas Huber2010-10-104-4/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7' * commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7': Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
| * | am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek ↵Andreas Huber2010-10-084-4/+14
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp * commit 'f72dd0190ee64914161d361be1213eda8cab7b90': Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
| | * Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very ↵Andreas Huber2010-10-084-4/+14
| | |\ | | | | | | | | | | | | expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
| | | * Disable 10secs forward/backward seeking for rtsp as seek is a very expensive ↵Andreas Huber2010-10-084-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality. Change-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2 related-to-bug: 3073955
* | | | am 5dcf588a: am b9bf5457: Merge "Respect the cropping rectangle when ↵Andreas Huber2010-10-101-1/+38
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread Merge commit '5dcf588a81a59142985736d8bb0430586f68ec08' * commit '5dcf588a81a59142985736d8bb0430586f68ec08': Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
| * | | am b9bf5457: Merge "Respect the cropping rectangle when extracting the video ↵Andreas Huber2010-10-081-1/+38
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | dimensions from the sequence parameter set of H.264 streams." into gingerbread Merge commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c' into gingerbread-plus-aosp * commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c': Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
| | * | Merge "Respect the cropping rectangle when extracting the video dimensions ↵Andreas Huber2010-10-081-1/+38
| | |\ \ | | | | | | | | | | | | | | | from the sequence parameter set of H.264 streams." into gingerbread
| | | * | Respect the cropping rectangle when extracting the video dimensions from the ↵Andreas Huber2010-10-081-1/+38
| | | |/ | | | | | | | | | | | | | | | | | | | | sequence parameter set of H.264 streams. Change-Id: Id7f21d5ab8533b4e17ceaa8619a39c27f0306150
* | | | am d31fc239: am 6dcdfdb4: Merge "Name the writer threads" into gingerbreadJames Dong2010-10-102-2/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'd31fc2397a494fc54679ac8fdb52983b60287183' * commit 'd31fc2397a494fc54679ac8fdb52983b60287183': Name the writer threads
| * | | am 6dcdfdb4: Merge "Name the writer threads" into gingerbreadJames Dong2010-10-082-2/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f' into gingerbread-plus-aosp * commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f': Name the writer threads
| | * | Merge "Name the writer threads" into gingerbreadJames Dong2010-10-082-2/+11
| | |\ \
| | | * | Name the writer threadsJames Dong2010-10-072-2/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I51461c3800ac5850e21ff398e80eb20b562264b3
* | | | | am 14ea1048: am c5912acc: Merge "Disable the access unit timeout temporarily ↵Andreas Huber2010-10-101-6/+29
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while a seek operation is in progress." into gingerbread Merge commit '14ea1048e7e8a4b40836b5601bc86b91663525cb' * commit '14ea1048e7e8a4b40836b5601bc86b91663525cb': Disable the access unit timeout temporarily while a seek operation is in progress.
| * | | | am c5912acc: Merge "Disable the access unit timeout temporarily while a seek ↵Andreas Huber2010-10-081-6/+29
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operation is in progress." into gingerbread Merge commit 'c5912acc04226a8f9377d1aad50de8d3f883854c' into gingerbread-plus-aosp * commit 'c5912acc04226a8f9377d1aad50de8d3f883854c': Disable the access unit timeout temporarily while a seek operation is in progress.
| | * | | Merge "Disable the access unit timeout temporarily while a seek operation is ↵Andreas Huber2010-10-081-6/+29
| | |\ \ \ | | | | | | | | | | | | | | | | | | in progress." into gingerbread
| | | * | | Disable the access unit timeout temporarily while a seek operation is in ↵Andreas Huber2010-10-081-6/+29
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | progress. Change-Id: I116cb76342aae4168f34ebae49ecb2301702a0ea related-to-bug: 3073955
generated by cgit v1.1 at 2024-09-09 07:45:49 +0000