Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 12:27:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prefixed member variables with m_

Browse Source
This commit is contained in:
Moritz Bunkus 2010-02-26 20:30:51 +01:00
parent 8bcb87ce67
commit 19ec8220c4
2 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/merge/cluster_helper.cpp
View File

@ -214,30 +214,30 @@ cluster_helper_c::set_output(mm_io_c *out) {
void void
cluster_helper_c::set_duration(render_groups_c *rg) { cluster_helper_c::set_duration(render_groups_c *rg) {
if (rg->durations.empty()) if (rg->m_durations.empty())
return; return;
kax_block_blob_c *group = rg->groups.back().get_object(); kax_block_blob_c *group = rg->m_groups.back().get_object();
int64_t def_duration = rg->source->get_track_default_duration(); int64_t def_duration = rg->m_source->get_track_default_duration();
int64_t block_duration = 0; int64_t block_duration = 0;
int i; int i;
for (i = 0; rg->durations.size() > i; ++i) for (i = 0; rg->m_durations.size() > i; ++i)
block_duration += rg->durations[i]; block_duration += rg->m_durations[i];
mxverb(3, mxverb(3,
boost::format("cluster_helper::set_duration: block_duration %1% rounded duration %2% def_duration %3% use_durations %4% rg->duration_mandatory %5%\n") boost::format("cluster_helper::set_duration: block_duration %1% rounded duration %2% def_duration %3% use_durations %4% rg->m_duration_mandatory %5%\n")
% block_duration % RND_TIMECODE_SCALE(block_duration) % def_duration % (g_use_durations ? 1 : 0) % (rg->duration_mandatory ? 1 : 0)); % block_duration % RND_TIMECODE_SCALE(block_duration) % def_duration % (g_use_durations ? 1 : 0) % (rg->m_duration_mandatory ? 1 : 0));
if (rg->duration_mandatory) { if (rg->m_duration_mandatory) {
if ( (0 == block_duration) if ( (0 == block_duration)
|| ( (0 < block_duration) || ( (0 < block_duration)
&& (block_duration != (rg->durations.size() * def_duration)))) && (block_duration != (rg->m_durations.size() * def_duration))))
group->set_block_duration(RND_TIMECODE_SCALE(block_duration)); group->set_block_duration(RND_TIMECODE_SCALE(block_duration));
} else if ( ( g_use_durations } else if ( ( g_use_durations
|| (0 < def_duration)) || (0 < def_duration))
&& (0 < block_duration) && (0 < block_duration)
&& (RND_TIMECODE_SCALE(block_duration) != RND_TIMECODE_SCALE(rg->durations.size() * def_duration))) && (RND_TIMECODE_SCALE(block_duration) != RND_TIMECODE_SCALE(rg->m_durations.size() * def_duration)))
group->set_block_duration(RND_TIMECODE_SCALE(block_duration)); group->set_block_duration(RND_TIMECODE_SCALE(block_duration));
} }
@ -246,22 +246,22 @@ cluster_helper_c::must_duration_be_set(render_groups_c *rg,
packet_cptr &new_packet) { packet_cptr &new_packet) {
int i; int i;
int64_t block_duration = 0; int64_t block_duration = 0;
int64_t def_duration = rg->source->get_track_default_duration(); int64_t def_duration = rg->m_source->get_track_default_duration();
for (i = 0; rg->durations.size() > i; ++i) for (i = 0; rg->m_durations.size() > i; ++i)
block_duration += rg->durations[i]; block_duration += rg->m_durations[i];
block_duration += new_packet->duration; block_duration += new_packet->duration;
if (rg->duration_mandatory || new_packet->duration_mandatory) { if (rg->m_duration_mandatory || new_packet->duration_mandatory) {
if ( (0 == block_duration) if ( (0 == block_duration)
|| ( (0 < block_duration) || ( (0 < block_duration)
&& (block_duration != ((rg->durations.size() + 1) * def_duration)))) && (block_duration != ((rg->m_durations.size() + 1) * def_duration))))
return true; return true;
} else if ( ( g_use_durations } else if ( ( g_use_durations
|| (0 < def_duration)) || (0 < def_duration))
&& (0 < block_duration) && (0 < block_duration)
&& (RND_TIMECODE_SCALE(block_duration) != RND_TIMECODE_SCALE((rg->durations.size() + 1) * def_duration))) && (RND_TIMECODE_SCALE(block_duration) != RND_TIMECODE_SCALE((rg->m_durations.size() + 1) * def_duration)))
return true; return true;
return false; return false;
@ -277,7 +277,6 @@ cluster_helper_c::must_duration_be_set(render_groups_c *rg,
int int
cluster_helper_c::render() { cluster_helper_c::render() {
std::vector<render_groups_cptr> render_groups; std::vector<render_groups_cptr> render_groups;
std::vector<render_groups_cptr>::iterator rg_it;
bool use_simpleblock = !hack_engaged(ENGAGE_NO_SIMPLE_BLOCKS); bool use_simpleblock = !hack_engaged(ENGAGE_NO_SIMPLE_BLOCKS);
@ -310,9 +309,9 @@ cluster_helper_c::render() {
m_cluster->SetSilentTrackUsed(); m_cluster->SetSilentTrackUsed();
render_groups_c *render_group = NULL; render_groups_c *render_group = NULL;
mxforeach(rg_it, render_groups) foreach(render_groups_cptr &rg, render_groups)
if ((*rg_it)->source == source) { if (rg->m_source == source) {
render_group = (*rg_it).get_object(); render_group = rg.get_object();
break; break;
} }
@ -328,16 +327,16 @@ cluster_helper_c::render() {
KaxTrackEntry &track_entry = static_cast<KaxTrackEntry &>(*source->get_track_entry()); KaxTrackEntry &track_entry = static_cast<KaxTrackEntry &>(*source->get_track_entry());
kax_block_blob_c *previous_block_group = !render_group->groups.empty() ? render_group->groups.back().get_object() : NULL; kax_block_blob_c *previous_block_group = !render_group->m_groups.empty() ? render_group->m_groups.back().get_object() : NULL;
kax_block_blob_c *new_block_group = previous_block_group; kax_block_blob_c *new_block_group = previous_block_group;
if ((-1 != pack->bref) || has_codec_state) if ((-1 != pack->bref) || has_codec_state)
render_group->more_data = false; render_group->m_more_data = false;
if (!render_group->more_data) { if (!render_group->m_more_data) {
set_duration(render_group); set_duration(render_group);
render_group->durations.clear(); render_group->m_durations.clear();
render_group->duration_mandatory = false; render_group->m_duration_mandatory = false;
BlockBlobType this_block_blob_type BlockBlobType this_block_blob_type
= !use_simpleblock ? std_block_blob_type = !use_simpleblock ? std_block_blob_type
@ -347,8 +346,8 @@ cluster_helper_c::render() {
if (has_codec_state) if (has_codec_state)
this_block_blob_type = BLOCK_BLOB_NO_SIMPLE; this_block_blob_type = BLOCK_BLOB_NO_SIMPLE;
render_group->groups.push_back(kax_block_blob_cptr(new kax_block_blob_c(this_block_blob_type))); render_group->m_groups.push_back(kax_block_blob_cptr(new kax_block_blob_c(this_block_blob_type)));
new_block_group = render_group->groups.back().get_object(); new_block_group = render_group->m_groups.back().get_object();
m_cluster->AddBlockBlob(new_block_group); m_cluster->AddBlockBlob(new_block_group);
new_block_group->SetParent(*m_cluster); new_block_group->SetParent(*m_cluster);
@ -356,9 +355,9 @@ cluster_helper_c::render() {
} }
// Now put the packet into the cluster. // Now put the packet into the cluster.
render_group->more_data = new_block_group->add_frame_auto(track_entry, pack->assigned_timecode - m_timecode_offset, *data_buffer, lacing_type, render_group->m_more_data = new_block_group->add_frame_auto(track_entry, pack->assigned_timecode - m_timecode_offset, *data_buffer, lacing_type,
(-1 == pack->bref) ? -1 : pack->bref - m_timecode_offset, (-1 == pack->bref) ? -1 : pack->bref - m_timecode_offset,
(-1 == pack->fref) ? -1 : pack->fref - m_timecode_offset); (-1 == pack->fref) ? -1 : pack->fref - m_timecode_offset);
if (has_codec_state) { if (has_codec_state) {
KaxBlockGroup &bgroup = (KaxBlockGroup &)*new_block_group; KaxBlockGroup &bgroup = (KaxBlockGroup &)*new_block_group;
@ -374,10 +373,10 @@ cluster_helper_c::render() {
m_max_timecode_and_duration = pack->assigned_timecode + pack->duration; m_max_timecode_and_duration = pack->assigned_timecode + pack->duration;
if ((-1 != pack->bref) || (-1 != pack->fref) || !track_entry.LacingEnabled()) if ((-1 != pack->bref) || (-1 != pack->fref) || !track_entry.LacingEnabled())
render_group->more_data = false; render_group->m_more_data = false;
render_group->durations.push_back(pack->unmodified_duration); render_group->m_durations.push_back(pack->unmodified_duration);
render_group->duration_mandatory |= pack->duration_mandatory; render_group->m_duration_mandatory |= pack->duration_mandatory;
if (NULL != new_block_group) { if (NULL != new_block_group) {
// Set the reference priority if it was wanted. // Set the reference priority if it was wanted.
@ -437,8 +436,8 @@ cluster_helper_c::render() {
} }
if (0 < elements_in_cluster) { if (0 < elements_in_cluster) {
mxforeach(rg_it, render_groups) foreach(render_groups_cptr &rg, render_groups)
set_duration((*rg_it).get_object()); set_duration(rg.get_object());
m_cluster->SetPreviousTimecode(min_cl_timecode - m_timecode_offset - 1, (int64_t)g_timecode_scale); m_cluster->SetPreviousTimecode(min_cl_timecode - m_timecode_offset - 1, (int64_t)g_timecode_scale);
m_cluster->set_min_timecode(min_cl_timecode - m_timecode_offset); m_cluster->set_min_timecode(min_cl_timecode - m_timecode_offset);

16
src/merge/cluster_helper.h
View File

@ -31,15 +31,15 @@
class render_groups_c { class render_groups_c {
public: public:
std::vector<kax_block_blob_cptr> groups; std::vector<kax_block_blob_cptr> m_groups;
std::vector<int64_t> durations; std::vector<int64_t> m_durations;
generic_packetizer_c *source; generic_packetizer_c *m_source;
bool more_data, duration_mandatory; bool m_more_data, m_duration_mandatory;
render_groups_c(generic_packetizer_c *n_source) render_groups_c(generic_packetizer_c *source)
: source(n_source) : m_source(source)
, more_data(false) , m_more_data(false)
, duration_mandatory(false) , m_duration_mandatory(false)
{ {
} }
}; };