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

mkvmuxer: Add DiscardPadding support.

Browse Source 
Also a bit of refactoring to remove some duplicate code.

Change-Id: Ia3d17461ae5f6275534e06c31f348bdfc4bba169
This commit is contained in:
Tom Finegan
2014-01-22 23:26:26 -08:00
parent 327e8ab617
commit cd6f7bff4b
6 changed files with 406 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sample_muxer.cpp
View File

@@ -23,6 +23,7 @@
#include "sample_muxer_metadata.h"
using mkvmuxer::int64;
using mkvmuxer::uint64;
#ifdef _MSC_VER
@@ -475,6 +476,7 @@ int main(int argc, char* argv[]) {
(track_type == Track::kVideo && output_video)) {
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) {
const mkvparser::Block::Frame& frame = block->GetFrame(i);
@@ -494,11 +496,21 @@ int main(int argc, char* argv[]) {
if (track_type == Track::kAudio)
track_num = aud_track;
if (!muxer_segment.AddFrame(data,
frame.len,
track_num,
time_ns,
is_key)) {
bool frame_added = false;
if (discard_padding) {
frame_added =
muxer_segment.AddFrameWithDiscardPadding(data, frame.len,
discard_padding,
track_num,
time_ns,
is_key);
} else {
frame_added = muxer_segment.AddFrame(data, frame.len,
track_num,
time_ns,
is_key);
}
if (!frame_added) {
printf("\n Could not add frame.\n");
return EXIT_FAILURE;
}