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

sample_muxer: Use AddGenericFrame to add frames.

Browse Source 
Use Segment::AddGenericFrame to add frames to the output file. The
other AddFrame* functions will soon be deprecated and this will be
the preferred way of adding frames.

Change-Id: I3ed862543a1e0199617dc613a1760ff5f233ce7d
This commit is contained in:
Vignesh Venkatasubramanian 2015-05-07 16:25:18 -07:00
parent b6311dc16f
commit a9e4819e9f
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sample_muxer.cpp
View File

@ -476,8 +476,6 @@ int main(int argc, char* argv[]) {
if ((track_type == Track::kAudio && output_audio) || if ((track_type == Track::kAudio && output_audio) ||
(track_type == Track::kVideo && output_video)) { (track_type == Track::kVideo && output_video)) {
const int frame_count = block->GetFrameCount(); const int frame_count = block->GetFrameCount();
const bool is_key = block->IsKey();
const int64 discard_padding = block->GetDiscardPadding();
for (int i = 0; i < frame_count; ++i) { for (int i = 0; i < frame_count; ++i) {
const mkvparser::Block::Frame& frame = block->GetFrame(i); const mkvparser::Block::Frame& frame = block->GetFrame(i);
@ -493,19 +491,16 @@ int main(int argc, char* argv[]) {
if (frame.Read(&reader, data)) if (frame.Read(&reader, data))
return EXIT_FAILURE; return EXIT_FAILURE;
uint64 track_num = vid_track; mkvmuxer::Frame muxer_frame;
if (track_type == Track::kAudio) if (!muxer_frame.Init(data, data_len))
track_num = aud_track; return EXIT_FAILURE;
muxer_frame.set_track_number(
bool frame_added = false; track_type == Track::kAudio ? aud_track : vid_track);
if (discard_padding) { if (block->GetDiscardPadding())
frame_added = muxer_segment.AddFrameWithDiscardPadding( muxer_frame.set_discard_padding(block->GetDiscardPadding());
data, frame.len, discard_padding, track_num, time_ns, is_key); muxer_frame.set_timestamp(time_ns);
} else { muxer_frame.set_is_key(block->IsKey());
frame_added = muxer_segment.AddFrame(data, frame.len, track_num, if (!muxer_segment.AddGenericFrame(&muxer_frame)) {
time_ns, is_key);
}
if (!frame_added) {
printf("\n Could not add frame.\n"); printf("\n Could not add frame.\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }

9
sample_muxer_metadata.cc
View File

@ -376,5 +376,12 @@ bool SampleMuxerMetadata::SortableCue::Write(mkvmuxer::Segment* segment) const {
const data_t buf = reinterpret_cast<data_t>(frame.data()); const data_t buf = reinterpret_cast<data_t>(frame.data());
const mkvmuxer::uint64 len = frame.length(); const mkvmuxer::uint64 len = frame.length();
return segment->AddMetadata(buf, len, track_num, start_ns, duration_ns); mkvmuxer::Frame muxer_frame;
if (!muxer_frame.Init(buf, len))
return 0;
muxer_frame.set_track_number(track_num);
muxer_frame.set_timestamp(start_ns);
muxer_frame.set_duration(duration_ns);
muxer_frame.set_is_key(true); // All metadata frames are keyframes.
return segment->AddGenericFrame(&muxer_frame);
} }