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

mkvmuxer: s/frame/data in all AddFrame* functions.

Browse Source 
Rename variable "frame" to "data" in all the AddFrame* functions.
This is in prepararation for a follow-up CL.

Change-Id: Ifd0d96cfbeca85c12be23d854bc87e085436984d
This commit is contained in:
Vignesh Venkatasubramanian
2015-05-12 15:09:22 -07:00
parent 4baaa2c9a3
commit 16c8e78265
2 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
mkvmuxer.cpp
View File

@@ -1485,35 +1485,34 @@ bool Cluster::Init(IMkvWriter* ptr_writer) {
return true; return true;
} }
bool Cluster::AddFrame(const uint8* frame, uint64 length, uint64 track_number, bool Cluster::AddFrame(const uint8* data, uint64 length, uint64 track_number,
uint64 abs_timecode, bool is_key) { uint64 abs_timecode, bool is_key) {
return DoWriteBlock(frame, length, track_number, abs_timecode, is_key ? 1 : 0, return DoWriteBlock(data, length, track_number, abs_timecode, is_key ? 1 : 0,
&WriteSimpleBlock); &WriteSimpleBlock);
} }
bool Cluster::AddFrameWithAdditional(const uint8* frame, uint64 length, bool Cluster::AddFrameWithAdditional(const uint8* data, uint64 length,
const uint8* additional, const uint8* additional,
uint64 additional_length, uint64 add_id, uint64 additional_length, uint64 add_id,
uint64 track_number, uint64 abs_timecode, uint64 track_number, uint64 abs_timecode,
bool is_key) { bool is_key) {
return DoWriteBlockWithAdditional( return DoWriteBlockWithAdditional(
frame, length, additional, additional_length, add_id, track_number, data, length, additional, additional_length, add_id, track_number,
abs_timecode, is_key ? 1 : 0, &WriteBlockWithAdditional); abs_timecode, is_key ? 1 : 0, &WriteBlockWithAdditional);
} }
bool Cluster::AddFrameWithDiscardPadding(const uint8* frame, uint64 length, bool Cluster::AddFrameWithDiscardPadding(const uint8* data, uint64 length,
int64 discard_padding, int64 discard_padding,
uint64 track_number, uint64 track_number,
uint64 abs_timecode, bool is_key) { uint64 abs_timecode, bool is_key) {
return DoWriteBlockWithDiscardPadding( return DoWriteBlockWithDiscardPadding(
frame, length, discard_padding, track_number, abs_timecode, data, length, discard_padding, track_number, abs_timecode,
is_key ? 1 : 0, &WriteBlockWithDiscardPadding); is_key ? 1 : 0, &WriteBlockWithDiscardPadding);
} }
bool Cluster::AddMetadata(const uint8* frame, uint64 length, bool Cluster::AddMetadata(const uint8* data, uint64 length, uint64 track_number,
uint64 track_number, uint64 abs_timecode, uint64 abs_timecode, uint64 duration_timecode) {
uint64 duration_timecode) { return DoWriteBlock(data, length, track_number, abs_timecode,
return DoWriteBlock(frame, length, track_number, abs_timecode,
duration_timecode, &WriteMetadataBlock); duration_timecode, &WriteMetadataBlock);
} }
@@ -2321,9 +2320,9 @@ uint64 Segment::AddAudioTrack(int32 sample_rate, int32 channels, int32 number) {
return track->number(); return track->number();
} }
bool Segment::AddFrame(const uint8* frame, uint64 length, uint64 track_number, bool Segment::AddFrame(const uint8* data, uint64 length, uint64 track_number,
uint64 timestamp, bool is_key) { uint64 timestamp, bool is_key) {
if (!frame) if (!data)
return false; return false;
if (!CheckHeaderInfo()) if (!CheckHeaderInfo())
@@ -2342,7 +2341,7 @@ bool Segment::AddFrame(const uint8* frame, uint64 length, uint64 track_number,
// muxed into the same cluster. // muxed into the same cluster.
if (has_video_ && tracks_.TrackIsAudio(track_number) && !force_new_cluster_) { if (has_video_ && tracks_.TrackIsAudio(track_number) && !force_new_cluster_) {
Frame* const new_frame = new (std::nothrow) Frame(); Frame* const new_frame = new (std::nothrow) Frame();
if (new_frame == NULL || !new_frame->Init(frame, length)) if (new_frame == NULL || !new_frame->Init(data, length))
return false; return false;
new_frame->set_track_number(track_number); new_frame->set_track_number(track_number);
new_frame->set_timestamp(timestamp); new_frame->set_timestamp(timestamp);
@@ -2367,7 +2366,7 @@ bool Segment::AddFrame(const uint8* frame, uint64 length, uint64 track_number,
const uint64 timecode_scale = segment_info_.timecode_scale(); const uint64 timecode_scale = segment_info_.timecode_scale();
const uint64 abs_timecode = timestamp / timecode_scale; const uint64 abs_timecode = timestamp / timecode_scale;
if (!cluster->AddFrame(frame, length, track_number, abs_timecode, is_key)) if (!cluster->AddFrame(data, length, track_number, abs_timecode, is_key))
return false; return false;
if (new_cuepoint_ && cues_track_ == track_number) { if (new_cuepoint_ && cues_track_ == track_number) {
@@ -2381,12 +2380,12 @@ bool Segment::AddFrame(const uint8* frame, uint64 length, uint64 track_number,
return true; return true;
} }
bool Segment::AddFrameWithAdditional(const uint8* frame, uint64 length, bool Segment::AddFrameWithAdditional(const uint8* data, uint64 length,
const uint8* additional, const uint8* additional,
uint64 additional_length, uint64 add_id, uint64 additional_length, uint64 add_id,
uint64 track_number, uint64 timestamp, uint64 track_number, uint64 timestamp,
bool is_key) { bool is_key) {
if (frame == NULL || additional == NULL) if (data == NULL || additional == NULL)
return false; return false;
if (!CheckHeaderInfo()) if (!CheckHeaderInfo())
@@ -2405,7 +2404,7 @@ bool Segment::AddFrameWithAdditional(const uint8* frame, uint64 length,
// muxed into the same cluster. // muxed into the same cluster.
if (has_video_ && tracks_.TrackIsAudio(track_number) && !force_new_cluster_) { if (has_video_ && tracks_.TrackIsAudio(track_number) && !force_new_cluster_) {
Frame* const new_frame = new (std::nothrow) Frame(); Frame* const new_frame = new (std::nothrow) Frame();
if (new_frame == NULL || !new_frame->Init(frame, length)) if (new_frame == NULL || !new_frame->Init(data, length))
return false; return false;
new_frame->set_track_number(track_number); new_frame->set_track_number(track_number);
new_frame->set_timestamp(timestamp); new_frame->set_timestamp(timestamp);
@@ -2430,7 +2429,7 @@ bool Segment::AddFrameWithAdditional(const uint8* frame, uint64 length,
const uint64 timecode_scale = segment_info_.timecode_scale(); const uint64 timecode_scale = segment_info_.timecode_scale();
const uint64 abs_timecode = timestamp / timecode_scale; const uint64 abs_timecode = timestamp / timecode_scale;
if (!cluster->AddFrameWithAdditional(frame, length, additional, if (!cluster->AddFrameWithAdditional(data, length, additional,
additional_length, add_id, track_number, additional_length, add_id, track_number,
abs_timecode, is_key)) abs_timecode, is_key))
return false; return false;
@@ -2446,11 +2445,11 @@ bool Segment::AddFrameWithAdditional(const uint8* frame, uint64 length,
return true; return true;
} }
bool Segment::AddFrameWithDiscardPadding(const uint8* frame, uint64 length, bool Segment::AddFrameWithDiscardPadding(const uint8* data, uint64 length,
int64 discard_padding, int64 discard_padding,
uint64 track_number, uint64 timestamp, uint64 track_number, uint64 timestamp,
bool is_key) { bool is_key) {
if (frame == NULL) if (data == NULL)
return false; return false;
if (!CheckHeaderInfo()) if (!CheckHeaderInfo())
@@ -2472,7 +2471,7 @@ bool Segment::AddFrameWithDiscardPadding(const uint8* frame, uint64 length,
// muxed into the same cluster. // muxed into the same cluster.
if (has_video_ && tracks_.TrackIsAudio(track_number) && !force_new_cluster_) { if (has_video_ && tracks_.TrackIsAudio(track_number) && !force_new_cluster_) {
Frame* const new_frame = new (std::nothrow) Frame(); Frame* const new_frame = new (std::nothrow) Frame();
if (new_frame == NULL || !new_frame->Init(frame, length)) if (new_frame == NULL || !new_frame->Init(data, length))
return false; return false;
new_frame->set_track_number(track_number); new_frame->set_track_number(track_number);
new_frame->set_timestamp(timestamp); new_frame->set_timestamp(timestamp);
@@ -2499,7 +2498,7 @@ bool Segment::AddFrameWithDiscardPadding(const uint8* frame, uint64 length,
const uint64 abs_timecode = timestamp / timecode_scale; const uint64 abs_timecode = timestamp / timecode_scale;
if (!cluster->AddFrameWithDiscardPadding( if (!cluster->AddFrameWithDiscardPadding(
frame, length, discard_padding, track_number, abs_timecode, is_key)) { data, length, discard_padding, track_number, abs_timecode, is_key)) {
return false; return false;
} }
@@ -2514,10 +2513,10 @@ bool Segment::AddFrameWithDiscardPadding(const uint8* frame, uint64 length,
return true; return true;
} }
bool Segment::AddMetadata(const uint8* frame, uint64 length, bool Segment::AddMetadata(const uint8* data, uint64 length,
uint64 track_number, uint64 timestamp_ns, uint64 track_number, uint64 timestamp_ns,
uint64 duration_ns) { uint64 duration_ns) {
if (!frame) if (!data)
return false; return false;
if (!CheckHeaderInfo()) if (!CheckHeaderInfo())
@@ -2546,7 +2545,7 @@ bool Segment::AddMetadata(const uint8* frame, uint64 length,
const uint64 abs_timecode = timestamp_ns / timecode_scale; const uint64 abs_timecode = timestamp_ns / timecode_scale;
const uint64 duration_timecode = duration_ns / timecode_scale; const uint64 duration_timecode = duration_ns / timecode_scale;
if (!cluster->AddMetadata(frame, length, track_number, abs_timecode, if (!cluster->AddMetadata(data, length, track_number, abs_timecode,
duration_timecode)) duration_timecode))
return false; return false;

32
mkvmuxer.hpp
View File

@@ -728,21 +728,21 @@ class Cluster {
// Adds a frame to be output in the file. The frame is written out through // Adds a frame to be output in the file. The frame is written out through
// |writer_| if successful. Returns true on success. // |writer_| if successful. Returns true on success.
// Inputs: // Inputs:
// frame: Pointer to the data // data: Pointer to the data
// length: Length of the data // length: Length of the data
// track_number: Track to add the data to. Value returned by Add track // track_number: Track to add the data to. Value returned by Add track
// functions. The range of allowed values is [1, 126]. // functions. The range of allowed values is [1, 126].
// timecode: Absolute (not relative to cluster) timestamp of the // timecode: Absolute (not relative to cluster) timestamp of the
// frame, expressed in timecode units. // frame, expressed in timecode units.
// is_key: Flag telling whether or not this frame is a key frame. // is_key: Flag telling whether or not this frame is a key frame.
bool AddFrame(const uint8* frame, uint64 length, uint64 track_number, bool AddFrame(const uint8* data, uint64 length, uint64 track_number,
uint64 timecode, // timecode units (absolute) uint64 timecode, // timecode units (absolute)
bool is_key); bool is_key);
// Adds a frame to be output in the file. The frame is written out through // Adds a frame to be output in the file. The frame is written out through
// |writer_| if successful. Returns true on success. // |writer_| if successful. Returns true on success.
// Inputs: // Inputs:
// frame: Pointer to the data // data: Pointer to the data
// length: Length of the data // length: Length of the data
// additional: Pointer to the additional data // additional: Pointer to the additional data
// additional_length: Length of the additional data // additional_length: Length of the additional data
@@ -752,7 +752,7 @@ class Cluster {
// abs_timecode: Absolute (not relative to cluster) timestamp of the // abs_timecode: Absolute (not relative to cluster) timestamp of the
// frame, expressed in timecode units. // frame, expressed in timecode units.
// is_key: Flag telling whether or not this frame is a key frame. // is_key: Flag telling whether or not this frame is a key frame.
bool AddFrameWithAdditional(const uint8* frame, uint64 length, bool AddFrameWithAdditional(const uint8* data, uint64 length,
const uint8* additional, uint64 additional_length, const uint8* additional, uint64 additional_length,
uint64 add_id, uint64 track_number, uint64 add_id, uint64 track_number,
uint64 abs_timecode, bool is_key); uint64 abs_timecode, bool is_key);
@@ -760,7 +760,7 @@ class Cluster {
// Adds a frame to be output in the file. The frame is written out through // Adds a frame to be output in the file. The frame is written out through
// |writer_| if successful. Returns true on success. // |writer_| if successful. Returns true on success.
// Inputs: // Inputs:
// frame: Pointer to the data. // data: Pointer to the data.
// length: Length of the data. // length: Length of the data.
// discard_padding: DiscardPadding element value. // discard_padding: DiscardPadding element value.
// track_number: Track to add the data to. Value returned by Add track // track_number: Track to add the data to. Value returned by Add track
@@ -768,14 +768,14 @@ class Cluster {
// abs_timecode: Absolute (not relative to cluster) timestamp of the // abs_timecode: Absolute (not relative to cluster) timestamp of the
// frame, expressed in timecode units. // frame, expressed in timecode units.
// is_key: Flag telling whether or not this frame is a key frame. // is_key: Flag telling whether or not this frame is a key frame.
bool AddFrameWithDiscardPadding(const uint8* frame, uint64 length, bool AddFrameWithDiscardPadding(const uint8* data, uint64 length,
int64 discard_padding, uint64 track_number, int64 discard_padding, uint64 track_number,
uint64 abs_timecode, bool is_key); uint64 abs_timecode, bool is_key);
// Writes a frame of metadata to the output medium; returns true on // Writes a frame of metadata to the output medium; returns true on
// success. // success.
// Inputs: // Inputs:
// frame: Pointer to the data // data: Pointer to the data
// length: Length of the data // length: Length of the data
// track_number: Track to add the data to. Value returned by Add track // track_number: Track to add the data to. Value returned by Add track
// functions. The range of allowed values is [1, 126]. // functions. The range of allowed values is [1, 126].
@@ -786,7 +786,7 @@ class Cluster {
// The metadata frame is written as a block group, with a duration // The metadata frame is written as a block group, with a duration
// sub-element but no reference time sub-elements (indicating that // sub-element but no reference time sub-elements (indicating that
// it is considered a keyframe, per Matroska semantics). // it is considered a keyframe, per Matroska semantics).
bool AddMetadata(const uint8* frame, uint64 length, uint64 track_number, bool AddMetadata(const uint8* data, uint64 length, uint64 track_number,
uint64 timecode, uint64 duration); uint64 timecode, uint64 duration);
// Increments the size of the cluster's data in bytes. // Increments the size of the cluster's data in bytes.
@@ -1050,19 +1050,19 @@ class Segment {
// Adds a frame to be output in the file. Returns true on success. // Adds a frame to be output in the file. Returns true on success.
// Inputs: // Inputs:
// frame: Pointer to the data // data: Pointer to the data
// length: Length of the data // length: Length of the data
// track_number: Track to add the data to. Value returned by Add track // track_number: Track to add the data to. Value returned by Add track
// functions. // functions.
// timestamp: Timestamp of the frame in nanoseconds from 0. // timestamp: Timestamp of the frame in nanoseconds from 0.
// is_key: Flag telling whether or not this frame is a key frame. // is_key: Flag telling whether or not this frame is a key frame.
bool AddFrame(const uint8* frame, uint64 length, uint64 track_number, bool AddFrame(const uint8* data, uint64 length, uint64 track_number,
uint64 timestamp_ns, bool is_key); uint64 timestamp_ns, bool is_key);
// Writes a frame of metadata to the output medium; returns true on // Writes a frame of metadata to the output medium; returns true on
// success. // success.
// Inputs: // Inputs:
// frame: Pointer to the data // data: Pointer to the data
// length: Length of the data // length: Length of the data
// track_number: Track to add the data to. Value returned by Add track // track_number: Track to add the data to. Value returned by Add track
// functions. // functions.
@@ -1073,13 +1073,13 @@ class Segment {
// The metadata frame is written as a block group, with a duration // The metadata frame is written as a block group, with a duration
// sub-element but no reference time sub-elements (indicating that // sub-element but no reference time sub-elements (indicating that
// it is considered a keyframe, per Matroska semantics). // it is considered a keyframe, per Matroska semantics).
bool AddMetadata(const uint8* frame, uint64 length, uint64 track_number, bool AddMetadata(const uint8* data, uint64 length, uint64 track_number,
uint64 timestamp_ns, uint64 duration_ns); uint64 timestamp_ns, uint64 duration_ns);
// Writes a frame with additional data to the output medium; returns true on // Writes a frame with additional data to the output medium; returns true on
// success. // success.
// Inputs: // Inputs:
// frame: Pointer to the data. // data: Pointer to the data.
// length: Length of the data. // length: Length of the data.
// additional: Pointer to additional data. // additional: Pointer to additional data.
// additional_length: Length of additional data. // additional_length: Length of additional data.
@@ -1089,7 +1089,7 @@ class Segment {
// timestamp: Absolute timestamp of the frame, expressed in nanosecond // timestamp: Absolute timestamp of the frame, expressed in nanosecond
// units. // units.
// is_key: Flag telling whether or not this frame is a key frame. // is_key: Flag telling whether or not this frame is a key frame.
bool AddFrameWithAdditional(const uint8* frame, uint64 length, bool AddFrameWithAdditional(const uint8* data, uint64 length,
const uint8* additional, uint64 additional_length, const uint8* additional, uint64 additional_length,
uint64 add_id, uint64 track_number, uint64 add_id, uint64 track_number,
uint64 timestamp, bool is_key); uint64 timestamp, bool is_key);
@@ -1097,7 +1097,7 @@ class Segment {
// Writes a frame with DiscardPadding to the output medium; returns true on // Writes a frame with DiscardPadding to the output medium; returns true on
// success. // success.
// Inputs: // Inputs:
// frame: Pointer to the data. // data: Pointer to the data.
// length: Length of the data. // length: Length of the data.
// discard_padding: DiscardPadding element value. // discard_padding: DiscardPadding element value.
// track_number: Track to add the data to. Value returned by Add track // track_number: Track to add the data to. Value returned by Add track
@@ -1105,7 +1105,7 @@ class Segment {
// timestamp: Absolute timestamp of the frame, expressed in nanosecond // timestamp: Absolute timestamp of the frame, expressed in nanosecond
// units. // units.
// is_key: Flag telling whether or not this frame is a key frame. // is_key: Flag telling whether or not this frame is a key frame.
bool AddFrameWithDiscardPadding(const uint8* frame, uint64 length, bool AddFrameWithDiscardPadding(const uint8* data, uint64 length,
int64 discard_padding, uint64 track_number, int64 discard_padding, uint64 track_number,
uint64 timestamp, bool is_key); uint64 timestamp, bool is_key);