Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-08 11:11:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fourcc_c: ctor{}, operator bool, reset(), equiv(), fix str()

Browse Source
This commit is contained in:
Moritz Bunkus 2012-12-28 19:51:52 +01:00
parent f300732b1e
commit cc1c3ade47
3 changed files with 82 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/common/fourcc.cpp
View File

@ -23,8 +23,13 @@ val(uint32_t value,
return fourcc_c::big_endian == byte_order ? value : bswap_32(value);
}
fourcc_c::fourcc_c()
: m_value{}
{
}
fourcc_c::fourcc_c(uint32_t value,
fourcc_c::byte_order_t byte_order)
fourcc_c::byte_order_t byte_order)
: m_value{val(value, byte_order)}
{
}
@ -51,6 +56,12 @@ fourcc_c::fourcc_c(unsigned char const *mem,
{
}
fourcc_c::fourcc_c(uint32_t const *mem,
fourcc_c::byte_order_t byte_order)
: m_value{read(mem, byte_order)}
{
}
fourcc_c::fourcc_c(mm_io_cptr const &io,
fourcc_c::byte_order_t byte_order)
: m_value{read(*io, byte_order)}
@ -58,13 +69,13 @@ fourcc_c::fourcc_c(mm_io_cptr const &io,
}
fourcc_c::fourcc_c(mm_io_c &io,
fourcc_c::byte_order_t byte_order)
fourcc_c::byte_order_t byte_order)
: m_value{read(io, byte_order)}
{
}
fourcc_c::fourcc_c(mm_io_c *io,
fourcc_c::byte_order_t byte_order)
fourcc_c::byte_order_t byte_order)
: m_value{read(*io, byte_order)}
{
}
@ -100,7 +111,6 @@ fourcc_c::write(mm_io_c *io,
return write(*io, byte_order);
}
uint32_t
fourcc_c::value(fourcc_c::byte_order_t byte_order)
const {
@ -112,10 +122,21 @@ fourcc_c::str()
const {
char buffer[4];
put_uint32_be(buffer, m_value);
for (auto idx = 0; 4 > idx; ++idx)
buffer[idx] = 32 <= buffer[idx] ? buffer[idx] : '?';
auto format = [&buffer](int idx) { return 32 <= buffer[idx] ? buffer[idx] : '?'; };
return std::string{buffer, 4};
}
return (boost::format("%1%%2%%3%%4%") % format(0) % format(1) % format(2) % format(3)).str();
fourcc_c::operator bool()
const {
return !!m_value;
}
fourcc_c &
fourcc_c::reset() {
m_value = 0;
return *this;
}
bool
@ -130,6 +151,12 @@ fourcc_c::operator !=(fourcc_c const &cmp)
return m_value != cmp.m_value;
}
bool
fourcc_c::equiv(char const *cmp)
const {
return balg::to_lower_copy(str()) == balg::to_lower_copy(std::string{cmp});
}
uint32_t
fourcc_c::read(void const *mem,
fourcc_c::byte_order_t byte_order) {

8
src/common/fourcc.h
View File

@ -28,6 +28,8 @@ private:
uint32_t m_value;
public:
fourcc_c();
// From an integer value:
fourcc_c(uint32_t value, byte_order_t byte_order = big_endian);
@ -38,6 +40,7 @@ public:
// From memory:
fourcc_c(memory_cptr const &mem, byte_order_t byte_order = big_endian);
fourcc_c(unsigned char const *mem, byte_order_t byte_order = big_endian);
fourcc_c(uint32_t const *mem, byte_order_t byte_order = big_endian);
// From mm_io_c instances:
fourcc_c(mm_io_cptr const &io, byte_order_t byte_order = big_endian);
@ -50,9 +53,14 @@ public:
size_t write(mm_io_c &io, byte_order_t byte_order = big_endian);
size_t write(mm_io_c *io, byte_order_t byte_order = big_endian);
fourcc_c &reset();
uint32_t value(byte_order_t byte_order = big_endian) const;
std::string str() const;
bool equiv(char const *cmp) const;
explicit operator bool() const;
bool operator ==(fourcc_c const &cmp) const;
bool operator !=(fourcc_c const &cmp) const;

51
tests/unit/common/fourcc.cpp
View File

@ -17,6 +17,13 @@ TEST(FourCC, CreationFromBigUInt32) {
EXPECT_EQ(big, fourcc_c(big, fourcc_c::big_endian).value());
EXPECT_EQ(big, fourcc_c(big) .value(fourcc_c::big_endian));
EXPECT_EQ(big, fourcc_c(big, fourcc_c::big_endian).value(fourcc_c::big_endian));
unsigned char buffer[4];
put_uint32_be(buffer, big);
EXPECT_EQ(big, fourcc_c(reinterpret_cast<uint32_t *>(buffer)) .value());
EXPECT_EQ(big, fourcc_c(reinterpret_cast<uint32_t *>(buffer), fourcc_c::big_endian).value());
EXPECT_EQ(big, fourcc_c(reinterpret_cast<uint32_t *>(buffer)) .value(fourcc_c::big_endian));
EXPECT_EQ(big, fourcc_c(reinterpret_cast<uint32_t *>(buffer), fourcc_c::big_endian).value(fourcc_c::big_endian));
}
TEST(FourCC, CreationFromLittleUInt32) {
@ -113,8 +120,8 @@ TEST(FourCC, Equality) {
fourcc_c big_bad_f{big + 1};
fourcc_c little_bad_f{little + 1, fourcc_c::little_endian};
EXPECT_TRUE(big_f == big);
EXPECT_TRUE(little_f == big);
// EXPECT_TRUE(big_f == big);
// EXPECT_TRUE(little_f == big);
EXPECT_TRUE(big_f == "1234");
EXPECT_TRUE(little_f == "1234");
@ -146,6 +153,9 @@ TEST(FourCC, Stringification) {
std::stringstream sstr;
EXPECT_NO_THROW(sstr << big_f);
EXPECT_EQ(sstr.str(), "1234");
EXPECT_EQ(fourcc_c{}.str(), "????");
EXPECT_EQ(fourcc_c{0x31003200}.str(), "1?2?");
}
TEST(FourCC, WritingToMemory) {
@ -203,14 +213,6 @@ TEST(FourCC, WritingToMemory) {
EXPECT_EQ(little, get_uint32_be(buf));
}
TEST(FourCC, WritingToMmIo) {
fourcc_c big_f{big}, little_f{little, fourcc_c::little_endian};
@ -269,4 +271,33 @@ TEST(FourCC, WritingToMmIo) {
EXPECT_EQ(little, m3_3->read_uint32_be());
}
TEST(FourCC, Resetting) {
EXPECT_EQ(0u, fourcc_c{}.value());
EXPECT_EQ(big, fourcc_c{big}.value());
EXPECT_EQ(0u, fourcc_c{big}.reset().value());
fourcc_c big_f{big};
ASSERT_EQ(big, big_f.value());
big_f.reset();
EXPECT_EQ(0u, big_f.value());
}
TEST(FourCC, OperatorBool) {
EXPECT_TRUE(bool(fourcc_c{big}));
EXPECT_TRUE(!fourcc_c{});
EXPECT_FALSE(!fourcc_c{big});
EXPECT_FALSE(bool(fourcc_c{}));
}
TEST(FourCC, Equivalence) {
EXPECT_TRUE(fourcc_c{"ABCD"}.equiv("abcd"));
EXPECT_TRUE(fourcc_c{"ABcd"}.equiv("abCD"));
EXPECT_TRUE(fourcc_c{"abcd"}.equiv("ABCD"));
EXPECT_TRUE(fourcc_c{"ABCD"}.equiv("ABCD"));
EXPECT_FALSE(fourcc_c{"ABCD"}.equiv("qwer"));
EXPECT_FALSE(fourcc_c{"abcd"}.equiv("qwer"));
}
}