diff options
| author | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 22:49:31 +0000 |
|---|---|---|
| committer | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 22:49:31 +0000 |
| commit | a4dcf06e3e0d6fd5be7376d191e6a5291fe4a416 (patch) | |
| tree | abe2ef62e756a4065c57d8f90111a71f25cf94c2 /media/webm | |
| parent | 7c5b9b43fac48a72a8481658a3adbcbd1d2b87f6 (diff) | |
| download | chromium_src-a4dcf06e3e0d6fd5be7376d191e6a5291fe4a416.zip chromium_src-a4dcf06e3e0d6fd5be7376d191e6a5291fe4a416.tar.gz chromium_src-a4dcf06e3e0d6fd5be7376d191e6a5291fe4a416.tar.bz2 | |
This patch integrates SourceBufferStreams into SourceBuffer, removes all buffering functionality from ChunkDemuxerStream so that it now refers to SourceBufferStream (through ChunkDemuxer/SourceBuffer) for buffer data.
A few notes about this patch:
* We are still assuming only 1 source ID (and 1 SourceBuffer)
* SourceBuffer still has only 1 audio and 1 video streams
* ChunkDemuxerStream now has a handle to its ChunkDemuxer so that it can ask for data from ChunkDemuxer's SourceBuffer.
BUG=125208
TEST=source_buffer_unittest.cc (coming soon)
Review URL: https://chromiumcodereview.appspot.com/10388099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm')
| -rw-r--r-- | media/webm/webm_cluster_parser.cc | 3 | ||||
| -rw-r--r-- | media/webm/webm_cluster_parser_unittest.cc | 10 | ||||
| -rw-r--r-- | media/webm/webm_constants.h | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/media/webm/webm_cluster_parser.cc b/media/webm/webm_cluster_parser.cc index 8271899..67ae9a7 100644 --- a/media/webm/webm_cluster_parser.cc +++ b/media/webm/webm_cluster_parser.cc @@ -234,9 +234,6 @@ bool WebMClusterParser::Track::AddBuffer( return false; } - if (buffer->GetDuration() == kNoTimestamp()) - buffer->SetDuration(default_duration_); - if (delayed_buffer_) { // Update the duration of the delayed buffer and place it into the queue. base::TimeDelta new_duration = diff --git a/media/webm/webm_cluster_parser_unittest.cc b/media/webm/webm_cluster_parser_unittest.cc index cbf3150..96586d1 100644 --- a/media/webm/webm_cluster_parser_unittest.cc +++ b/media/webm/webm_cluster_parser_unittest.cc @@ -40,11 +40,11 @@ struct BlockInfo { const BlockInfo kDefaultBlockInfo[] = { { kAudioTrackNum, 0, 23, true }, { kAudioTrackNum, 23, 23, true }, - { kVideoTrackNum, kVideoDefaultDurationInMs, kVideoDefaultDurationInMs, - true }, - { kAudioTrackNum, 46, 23, false }, - { kVideoTrackNum, 2 * kVideoDefaultDurationInMs, kVideoDefaultDurationInMs, - true }, + { kVideoTrackNum, 33, 34, true }, + { kAudioTrackNum, 46, 23, true }, + { kVideoTrackNum, 67, 33, false }, + { kAudioTrackNum, 69, 23, false }, + { kVideoTrackNum, 100, 33, false }, }; static scoped_ptr<Cluster> CreateCluster(int timecode, diff --git a/media/webm/webm_constants.h b/media/webm/webm_constants.h index f6afef4..b6ba0a2 100644 --- a/media/webm/webm_constants.h +++ b/media/webm/webm_constants.h @@ -195,6 +195,8 @@ const int kWebMIdWritingApp = 0x5741; const int64 kWebMReservedId = 0x1FFFFFFF; const int64 kWebMUnknownSize = GG_LONGLONG(0x00FFFFFFFFFFFFFF); +const uint8 kWebMFlagKeyframe = 0x80; + } // namespace media #endif // MEDIA_WEBM_WEBM_CONSTANTS_H_ |