Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
eb9054e5
Commit
eb9054e5
authored
4 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
rational: use constexpr
Change-Id: I1dadee13a2baed2c6011e8885482c6356aa3a600
parent
f28350e7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/media/video/filter_transpose.cpp
+1
-1
1 addition, 1 deletion
src/media/video/filter_transpose.cpp
src/rational.h
+25
-24
25 additions, 24 deletions
src/rational.h
with
26 additions
and
25 deletions
src/media/video/filter_transpose.cpp
+
1
−
1
View file @
eb9054e5
...
...
@@ -69,7 +69,7 @@ getTransposeFilter(
return
{};
}
const
auto
one
=
rational
<
int
>
(
1
);
const
expr
auto
one
=
rational
<
int
>
(
1
);
std
::
vector
<
MediaStream
>
msv
;
msv
.
emplace_back
(
inputName
,
format
,
one
,
width
,
height
,
0
,
one
);
...
...
This diff is collapsed.
Click to expand it.
src/rational.h
+
25
−
24
View file @
eb9054e5
...
...
@@ -42,21 +42,21 @@ class rational
{
public:
// Constructors
rational
()
{}
;
// Zero
rational
(
I
n
)
:
num_
(
n
)
{}
;
// Equal to n/1
rational
(
I
n
,
I
d
)
constexpr
rational
()
{}
// Zero
constexpr
rational
(
I
n
)
:
num_
(
n
)
{}
// Equal to n/1
constexpr
rational
(
I
n
,
I
d
)
:
num_
(
n
)
,
den_
(
d
)
{
reduce
();
}
;
// General case (n/d)
}
// General case (n/d)
// Define conversions to and from AVRational (equivalent)
rational
(
AVRational
r
)
constexpr
rational
(
AVRational
r
)
:
num_
(
r
.
num
)
,
den_
(
r
.
den
)
{};
operator
AVRational
()
const
{
return
AVRational
{(
int
)
num_
,
(
int
)
den_
};
}
constexpr
operator
AVRational
()
const
{
return
AVRational
{(
int
)
num_
,
(
int
)
den_
};
}
// Normal copy constructors and assignment operators
...
...
@@ -78,10 +78,11 @@ public:
}
// Representation
I
numerator
()
const
{
return
num_
;
};
I
denominator
()
const
{
return
den_
;
};
constexpr
I
numerator
()
const
{
return
num_
;
};
constexpr
I
denominator
()
const
{
return
den_
;
};
template
<
typename
R
=
double
>
R
real
()
const
constexpr
R
real
()
const
{
return
num_
/
(
R
)
den_
;
}
...
...
@@ -90,16 +91,16 @@ public:
// operators are available - see operators.hpp
// Arithmetic operators
rational
operator
+
(
const
rational
&
r
)
const
constexpr
rational
operator
+
(
const
rational
&
r
)
const
{
return
{
num_
*
r
.
den_
+
r
.
num_
*
den_
,
den_
*
r
.
den_
};
}
rational
operator
-
(
const
rational
&
r
)
const
constexpr
rational
operator
-
(
const
rational
&
r
)
const
{
return
{
num_
*
r
.
den_
-
r
.
num_
*
den_
,
den_
*
r
.
den_
};
}
rational
operator
*
(
const
rational
&
r
)
const
{
return
{
num_
*
r
.
num_
,
den_
*
r
.
den_
};
}
rational
operator
/
(
const
rational
&
r
)
const
{
return
{
num_
*
r
.
den_
,
den_
*
r
.
num_
};
}
constexpr
rational
operator
*
(
const
rational
&
r
)
const
{
return
{
num_
*
r
.
num_
,
den_
*
r
.
den_
};
}
constexpr
rational
operator
/
(
const
rational
&
r
)
const
{
return
{
num_
*
r
.
den_
,
den_
*
r
.
num_
};
}
rational
&
operator
+=
(
const
rational
&
r
)
{
...
...
@@ -163,30 +164,30 @@ public:
}
// Operator not
bool
operator
!
()
const
{
return
!
num_
;
};
constexpr
bool
operator
!
()
const
{
return
!
num_
;
};
// Boolean conversion
explicit
operator
bool
()
const
{
return
num_
;
}
explicit
constexpr
operator
bool
()
const
{
return
num_
;
}
// Comparison operators
bool
operator
<
(
const
rational
&
r
)
const
constexpr
bool
operator
<
(
const
rational
&
r
)
const
{
bool
inv
=
(
den_
>
0
)
!=
(
r
.
den_
>
0
);
return
inv
!=
(
num_
*
r
.
den_
<
den_
*
r
.
num_
);
}
bool
operator
>
(
const
rational
&
r
)
const
constexpr
bool
operator
>
(
const
rational
&
r
)
const
{
bool
inv
=
(
den_
>
0
)
!=
(
r
.
den_
>
0
);
return
inv
!=
(
num_
*
r
.
den_
>
den_
*
r
.
num_
);
}
bool
operator
==
(
const
rational
&
r
)
const
{
return
num_
*
r
.
den_
==
den_
*
r
.
num_
;
}
bool
operator
!=
(
const
rational
&
r
)
const
{
return
num_
*
r
.
den_
!=
den_
*
r
.
num_
;
}
constexpr
bool
operator
==
(
const
rational
&
r
)
const
{
return
num_
*
r
.
den_
==
den_
*
r
.
num_
;
}
constexpr
bool
operator
!=
(
const
rational
&
r
)
const
{
return
num_
*
r
.
den_
!=
den_
*
r
.
num_
;
}
// Comparison with integers
bool
operator
<
(
I
i
)
const
{
return
den_
<
0
?
(
num_
>
i
*
den_
)
:
(
num_
<
i
*
den_
);
}
bool
operator
>
(
I
i
)
const
{
return
den_
<
0
?
(
num_
<
i
*
den_
)
:
(
num_
>
i
*
den_
);
}
bool
operator
==
(
I
i
)
const
{
return
num_
==
i
*
den_
;
}
bool
operator
!=
(
I
i
)
const
{
return
num_
!=
i
*
den_
;
}
constexpr
bool
operator
<
(
I
i
)
const
{
return
den_
<
0
?
(
num_
>
i
*
den_
)
:
(
num_
<
i
*
den_
);
}
constexpr
bool
operator
>
(
I
i
)
const
{
return
den_
<
0
?
(
num_
<
i
*
den_
)
:
(
num_
>
i
*
den_
);
}
constexpr
bool
operator
==
(
I
i
)
const
{
return
num_
==
i
*
den_
;
}
constexpr
bool
operator
!=
(
I
i
)
const
{
return
num_
!=
i
*
den_
;
}
private
:
I
num_
{
0
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment