generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add Track number to AddCuePoint function.

Browse Source 
Change-Id: I67fd8db3d436f8931f5d50deeb1f1d41cfdc0836
This commit is contained in:
Frank Galligan
2012-09-21 15:42:57 -07:00
parent e6e2b6b387
commit 9ec562f72d
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mkvmuxer.cpp
View File

@@ -1670,7 +1670,7 @@ bool Segment::AddFrame(const uint8* frame,
return false; return false;
if (new_cuepoint_ && cues_track_ == track_number) { if (new_cuepoint_ && cues_track_ == track_number) {
if (!AddCuePoint(timestamp)) if (!AddCuePoint(timestamp, cues_track_))
return false; return false;
} }
@@ -2046,7 +2046,7 @@ bool Segment::CheckHeaderInfo() {
return true; return true;
} }
bool Segment::AddCuePoint(uint64 timestamp) { bool Segment::AddCuePoint(uint64 timestamp, uint64 track) {
if (cluster_list_size_ < 1) if (cluster_list_size_ < 1)
return false; return false;
@@ -2061,7 +2061,7 @@ bool Segment::AddCuePoint(uint64 timestamp) {
cue->set_time(timestamp / segment_info_.timecode_scale()); cue->set_time(timestamp / segment_info_.timecode_scale());
cue->set_block_number(cluster->blocks_added() + 1); cue->set_block_number(cluster->blocks_added() + 1);
cue->set_cluster_pos(cluster->position_for_cues()); cue->set_cluster_pos(cluster->position_for_cues());
cue->set_track(cues_track_); cue->set_track(track);
if (!cues_.AddCue(cue)) if (!cues_.AddCue(cue))
return false; return false;
@@ -2173,7 +2173,7 @@ int Segment::WriteFramesAll() {
return -1; return -1;
if (new_cuepoint_ && cues_track_ == frame->track_number()) { if (new_cuepoint_ && cues_track_ == frame->track_number()) {
if (!AddCuePoint(frame_timestamp)) if (!AddCuePoint(frame_timestamp, cues_track_))
return -1; return -1;
} }
@@ -2225,7 +2225,7 @@ bool Segment::WriteFramesLessThan(uint64 timestamp) {
return false; return false;
if (new_cuepoint_ && cues_track_ == frame_prev->track_number()) { if (new_cuepoint_ && cues_track_ == frame_prev->track_number()) {
if (!AddCuePoint(frame_timestamp)) if (!AddCuePoint(frame_timestamp, cues_track_))
return false; return false;
} }

5
mkvmuxer.hpp
View File

@@ -745,8 +745,9 @@ class Segment {
private: private:
// Adds a cue point to the Cues element. |timestamp| is the time in // Adds a cue point to the Cues element. |timestamp| is the time in
// nanoseconds of the cue's time. Returns true on success. // nanoseconds of the cue's time. |track| is the Track of the Cue. Returns
bool AddCuePoint(uint64 timestamp); // true on success.
bool AddCuePoint(uint64 timestamp, uint64 track);
// Checks if header information has been output and initialized. If not it // Checks if header information has been output and initialized. If not it
// will output the Segment element and initialize the SeekHead elment and // will output the Segment element and initialize the SeekHead elment and