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

mkvmuxer_sample: Add support for Projection element.

Browse Source 
Part of the Spherical Video V2 draft specification:
https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md

Change-Id: If8cc7a102933ca7fe81990919dbabe7db97812f8
This commit is contained in:
Tom Finegan 2016-08-26 21:07:27 -07:00
parent 9a3f2b5762
commit 65fee06599
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mkvmuxer/mkvmuxer.cc
View File

@ -1530,7 +1530,6 @@ uint64_t VideoTrack::VideoPayloadSize() const {
static_cast<float>(frame_rate_)); static_cast<float>(frame_rate_));
if (colour_) if (colour_)
size += colour_->ColourSize(); size += colour_->ColourSize();
if (projection_) if (projection_)
size += projection_->ProjectionSize(); size += projection_->ProjectionSize();

30
mkvmuxer_sample.cc
View File

@ -404,6 +404,36 @@ int main(int argc, char* argv[]) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (pVideoTrack->GetProjection()) {
mkvmuxer::Projection muxer_projection;
const mkvparser::Projection* const parser_projection =
pVideoTrack->GetProjection();
typedef mkvmuxer::Projection::ProjectionType MuxerProjType;
const int kTypeNotPresent = mkvparser::Projection::kTypeNotPresent;
if (parser_projection->type != kTypeNotPresent) {
muxer_projection.set_type(
static_cast<MuxerProjType>(parser_projection->type));
}
if (parser_projection->private_data &&
parser_projection->private_data_length > 0) {
if (!muxer_projection.SetProjectionPrivate(
parser_projection->private_data,
parser_projection->private_data_length)) {
return EXIT_FAILURE;
}
}
const float kValueNotPresent = mkvparser::Projection::kValueNotPresent;
if (parser_projection->pose_yaw != kValueNotPresent)
muxer_projection.set_pose_yaw(parser_projection->pose_yaw);
if (parser_projection->pose_pitch != kValueNotPresent)
muxer_projection.set_pose_pitch(parser_projection->pose_pitch);
if (parser_projection->pose_roll != kValueNotPresent)
muxer_projection.set_pose_roll(parser_projection->pose_roll);
if (!video->SetProjection(muxer_projection))
return EXIT_FAILURE;
}
if (track_name) if (track_name)
video->set_name(track_name); video->set_name(track_name);