560 Commits

Author SHA1 Message Date
Oliver Woodman
3661726401 Allow multiple chunk loads to prepare a HLS stream.
Issue: #530
2015-06-10 18:30:00 +01:00
Oliver Woodman
87dfaff74b Fix SRT test 2015-06-10 18:19:05 +01:00
Oliver Woodman
1b1769bb6d Further simplify SRT support 2015-06-10 18:03:34 +01:00
Oliver Woodman
fbbf3f27fd Simplify Subrip support 2015-06-10 17:48:01 +01:00
ojw28
71252784e9 Merge pull request #498 from ened/subtitle/srt
Subrip (SRT) support
2015-06-10 17:46:53 +01:00
Sebastian Roth
2fb2e5a509 Subrip (SRT) support. 2015-06-09 09:49:20 +08:00
Oliver Woodman
24e897d39f Further H264/H265 code deduping + fix NAL unescaping. 2015-06-05 20:05:28 +01:00
Oliver Woodman
218d02fc59 Allow Webm extractor to extract Matroska files 2015-06-05 18:30:19 +01:00
Oliver Woodman
362ccea310 Clean up permissions 2015-06-05 18:29:37 +01:00
Oliver Woodman
926bc805f5 Add some useful Systrace 2015-06-05 18:28:42 +01:00
Oliver Woodman
96c1e670c4 De-duplicate code for H264/H265 in MPEG-TS. 2015-06-05 18:27:20 +01:00
Oliver Woodman
10efe7904d Cleanup 2015-06-05 18:26:20 +01:00
Oliver Woodman
955c7b25a4 Doc fix 2015-06-05 18:24:42 +01:00
Oliver Woodman
1732aa761c Set MediaFormat for VTT chunks + cleanup.
ChunkSampleSource had a null check solely for the VTT case,
where DashChunkSource wasn't setting a MediaFormat on VTT
chunks. It's trivial to do so, and is more consistent, so I've
done that and removed the null check. Also done some small
tidying.
2015-06-05 18:24:22 +01:00
Oliver Woodman
01affbb93e Simplify tx3g support. 2015-06-04 15:47:57 +01:00
ojw28
254bc5a8cc Merge pull request #509 from Ood-Tsen/tx3g
parse mp4 tx3g
2015-06-04 15:07:29 +01:00
ood_tsen
b95b0aad5c clean the list while forward seek. 2015-06-03 20:28:30 +08:00
ood_tsen
fd2ebc767c keep maximum number of subtitles to four. 2015-06-03 20:02:42 +08:00
ood_tsen
106ebbf7df clean up unused code. 2015-06-02 21:00:22 +08:00
Andrew Lewis
5b186a2aa4 Add support for reading H.265 in MPEG TS. 2015-06-01 17:42:43 +01:00
ood_tsen
39607551aa add title. 2015-06-01 20:47:55 +08:00
ood_tsen
f42ed89202 parse mp4 tx3g 2015-06-01 19:47:46 +08:00
Andrew Lewis
02d5cb8109 Use Build.DEVICE not Build.PRODUCT.
On HTC Butterfly these match, but Build.DEVICE is actually the right value to
use.

Issue: #377
2015-05-29 12:52:05 +01:00
Oliver Woodman
cb1e6ad418 Tweak project configuration 2015-05-28 17:19:30 +01:00
Oliver Woodman
a85a169604 Simplify the demo app. 2015-05-28 17:18:26 +01:00
Oliver Woodman
b806109cfd Make HlsSampleSource use LoadControl.
This will be needed for keeping WebVTT subtitle and separate
audio tracks is sync whilst loading.

Issue: #151
2015-05-28 17:14:52 +01:00
Oliver Woodman
ea29c71d94 Temporarily revert bounded live seeking. It's causing issues in its current form. 2015-05-28 17:11:28 +01:00
Oliver Woodman
aa249e9f7f Fixed issue in which the segment/chunk shift value could become incorrect. 2015-05-28 17:08:39 +01:00
Oliver Woodman
99edc6a4b4 Avoid using OMX.qcom.audio.decoder.mp3 on HTC Butterfly.
This OMX component is listed but can't be instantiated on this device.

According to the GitHub issue, some other devices are also affected, so these
will have to be added too.

Issue: #377
2015-05-28 17:07:12 +01:00
Oliver Woodman
5c9c15ae6e Add support for extracting H.265/HEVC data in MP4 files. 2015-05-28 17:06:26 +01:00
Oliver Woodman
ac54b4f696 Cleanup/Sync with internal tree 2015-05-22 21:45:13 +01:00
Oliver Woodman
67d0154960 Use Java7 <> syntax 2015-05-22 21:40:22 +01:00
Oliver Woodman
91bcec82f5 Support an up-front block allocation in DefaultAllocator. 2015-05-22 21:37:21 +01:00
Oliver Woodman
79d557dd80 Move WEBVTT custom header constants.
They're current location is annoying, because it creates a dependency
from the dash package to the webvtt package. For apps like Play Movies
where WEBVTT isn't used, it's nice just to delete the whole package at
import time, which requires that this dependency be removed.
2015-05-22 21:36:35 +01:00
Oliver Woodman
efd0b1e3cf Updated all ExoPlayer Eclipse projects to use Java 1.7. 2015-05-22 21:34:51 +01:00
Oliver Woodman
54e2c2833c Bump to 1.3.3 2015-05-22 20:57:24 +01:00
Oliver Woodman
4e1c4f00ac Resolution is INTxINT 2015-05-22 20:43:38 +01:00
Oliver Woodman
a60dc5803e Merge branch 'dev' of https://github.com/google/ExoPlayer into dev 2015-05-22 20:40:36 +01:00
Oliver Woodman
250cab2dac Fix AudioTrack typos.
Issue: #479
2015-05-22 20:39:28 +01:00
Oliver Woodman
30011285bb Add TRICK_PLAY constant to core Exo.
Seems generally useful to have.
2015-05-22 20:38:23 +01:00
Oliver Woodman
3e62b63eb2 Try and use httpDataSource if scheme isn't recognised.
Issue: #473
2015-05-22 20:37:52 +01:00
Kelly Schrock
08d337365e HLS AAC fix
Fixes issue where an NPE occurs when RollingSampleBuffer is created
with a null Allocator.
2015-05-21 20:35:09 -05:00
Oliver Woodman
253a0105f7 Cleanup 2015-05-19 15:24:18 +01:00
Oliver Woodman
658a7ffba5 Step towards enhanced Webvtt parser to support HTML-rich captions and positioning. 2015-05-19 15:19:59 +01:00
Oliver Woodman
709fc7735b First steps toward implementing bounded live seek. 2015-05-19 15:16:29 +01:00
Oliver Woodman
763d68f26c Bump to 1.3.2 2015-05-19 14:37:29 +01:00
Oliver Woodman
6ae97ced3a Support content:// URIs, and some cleanup/consistency tweaks.
- There's definitely potential for more code sharing in these
classes, but deferring for now.
- Also made no-scheme default to file://, and allowed smoothstreaming
URLs to be specified with or without the /Manifest suffix.
2015-05-19 14:14:53 +01:00
Oliver Woodman
a9c977a79e Fix Mp3Extractor synchronization when loading retries.
Before preparation, and when seeking, Mp3Extractor did not handle retrying:
- synchronizedHeader was set before the header was known to be valid, which
  means that after seeing one valid frame header and then failing to read, the
  synchronization would be treated as complete.
- The input buffer would keep data loaded during synchronization but on the next
  call to synchronize when retrying it was not returned to the mark position to
  re-parse the data.

This change fixes these issues.
2015-05-19 14:13:31 +01:00
Oliver Woodman
675c7738c1 Let DefaultUriDataSource load assets. 2015-05-19 14:12:59 +01:00
Oliver Woodman
f474afbf5e Fix handling of widths/heights when choosing formats.
- Make HlsPlaylistParser treat non-positive dimensions as unknown.
- Make HlsPlaylistParser parse floating point resolutions, because
  technically that's how they're spec'd.
- Make VideoFormatSelectorUtil treat non-position dimensions as unknown.

Issue: #461
2015-05-19 14:06:48 +01:00