f749905d0a
git log --no-merges --oneline 9732ae9..a97c484 9096786 mkvparser: fix float conversion warning 84e8257 disable -Wdeprecated-declarations in legacy code a98f495 AddGenericFrame: fix memory leak on failure da131dd AddCuePoint: fix memory leak on failure b0cea9c Add(Audio|Video)Track: fix memory leak on failure 5261a67 webm_info: check vp9 ParseUncompressedHeader return 85f7e2e webm_info,PrintVP9Info: validate alt ref sizes 9b97ca1 vp9_header_parser_tests: check parser return 300d6d8 CuePoint::Find: check Track pointer 50c44bb webm_info,OutputCues: fix indexing of tracks a0d27f0 mkvparser,Block::Parse: remove incorrect assert 784fc1b vttdemux,CloseFiles: check file pointer before closing b4522c1 .gitattributes: force mkv/webm to be treated as binary a118f3d Add test for projection parse failures. d398479 Add test for primary chromaticity parse failures. 9bbec4c Fix permissions on test file. 2cef4d5 mkvparser:Parse: s/FLT_MIN/-FLT_MAX/ 35a3c88 mkvmuxer: Turn off estimate_file_duration_ by default 5a41830 mkvparser: Avoid double free when Chromaticity parse fails. 67e3ffa mkvparser: Avoid casts of values too large for float in Projection elements. 87bcddf vttdemux::ChapterAtomParser: check for NULL display string a534a24 Update .gitignore a0d67d0 mkvmuxer: Fix hard-coded data size in EbmlElementSize c36112c mkvparser: #include sys/type.h 686664e Fix cmake generation warnings on Windows. 2b2c196 cmake: Fix required flag check. 166e40f Cmake refactor. 9fb774a Add missing include in webm2pes.cc. 4956b2d mkvmuxer: Force new clusters when audio queue gets too long. 54f1559 cmake: Cache results of CXX flag tests. 81c73fc mkvparser: Avoid alloc failures in SeekHead::Parse. Change-Id: Ib81b1772ec81e7af3852dcfef2d312416f6db53d
80 lines
2.5 KiB
C++
80 lines
2.5 KiB
C++
// Copyright (c) 2016 The WebM project authors. All Rights Reserved.
|
|
//
|
|
// Use of this source code is governed by a BSD-style license
|
|
// that can be found in the LICENSE file in the root of the source
|
|
// tree. An additional intellectual property rights grant can be found
|
|
// in the file PATENTS. All contributing project authors may
|
|
// be found in the AUTHORS file in the root of the source tree.
|
|
#ifndef LIBWEBM_COMMON_HDR_UTIL_H_
|
|
#define LIBWEBM_COMMON_HDR_UTIL_H_
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <memory>
|
|
|
|
#include "mkvmuxer/mkvmuxer.h"
|
|
|
|
namespace mkvparser {
|
|
struct Colour;
|
|
struct MasteringMetadata;
|
|
struct PrimaryChromaticity;
|
|
} // namespace mkvparser
|
|
|
|
namespace libwebm {
|
|
// Utility types and functions for working with the Colour element and its
|
|
// children. Copiers return true upon success. Presence functions return true
|
|
// when the specified element is present.
|
|
|
|
// TODO(tomfinegan): These should be moved to libwebm_utils once c++11 is
|
|
// required by libwebm.
|
|
|
|
// Features of the VP9 codec that may be set in the CodecPrivate of a VP9 video
|
|
// stream. A value of kValueNotPresent represents that the value was not set in
|
|
// the CodecPrivate.
|
|
struct Vp9CodecFeatures {
|
|
static const int kValueNotPresent;
|
|
|
|
Vp9CodecFeatures()
|
|
: profile(kValueNotPresent),
|
|
level(kValueNotPresent),
|
|
bit_depth(kValueNotPresent),
|
|
chroma_subsampling(kValueNotPresent) {}
|
|
~Vp9CodecFeatures() {}
|
|
|
|
int profile;
|
|
int level;
|
|
int bit_depth;
|
|
int chroma_subsampling;
|
|
};
|
|
|
|
// disable deprecation warnings for auto_ptr
|
|
#if defined(__GNUC__) && __GNUC__ >= 5
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
#endif
|
|
typedef std::auto_ptr<mkvmuxer::PrimaryChromaticity> PrimaryChromaticityPtr;
|
|
#if defined(__GNUC__) && __GNUC__ >= 5
|
|
#pragma GCC diagnostic pop
|
|
#endif
|
|
|
|
bool CopyPrimaryChromaticity(const mkvparser::PrimaryChromaticity& parser_pc,
|
|
PrimaryChromaticityPtr* muxer_pc);
|
|
|
|
bool MasteringMetadataValuePresent(double value);
|
|
|
|
bool CopyMasteringMetadata(const mkvparser::MasteringMetadata& parser_mm,
|
|
mkvmuxer::MasteringMetadata* muxer_mm);
|
|
|
|
bool ColourValuePresent(long long value);
|
|
|
|
bool CopyColour(const mkvparser::Colour& parser_colour,
|
|
mkvmuxer::Colour* muxer_colour);
|
|
|
|
// Returns true if |features| is set to one or more valid values.
|
|
bool ParseVpxCodecPrivate(const uint8_t* private_data, int32_t length,
|
|
Vp9CodecFeatures* features);
|
|
|
|
} // namespace libwebm
|
|
|
|
#endif // LIBWEBM_COMMON_HDR_UTIL_H_
|