Fix clang errors in non-GYP_DEFINES=clang=1 build
BUG=1623 R=stefan@webrtc.org, tina.legrand@webrtc.org, tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1368004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3968 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@ -17,31 +17,30 @@ using webrtc::ReferencePictureSelection;
|
||||
|
||||
// The minimum time between reference frame updates. Should match the values
|
||||
// set in reference_picture_selection.h
|
||||
enum { kMinUpdateInterval = 10 };
|
||||
static const uint32_t kMinUpdateInterval = 10;
|
||||
// The minimum time between decoder refreshes through restricted prediction.
|
||||
// Should match the values set in reference_picture_selection.h
|
||||
enum { kRtt = 10 };
|
||||
static const int kRtt = 10;
|
||||
|
||||
static const int kNoPropagationGolden = VP8_EFLAG_NO_REF_ARF |
|
||||
VP8_EFLAG_NO_UPD_GF |
|
||||
VP8_EFLAG_NO_UPD_ARF;
|
||||
static const int kNoPropagationAltRef = VP8_EFLAG_NO_REF_GF |
|
||||
VP8_EFLAG_NO_UPD_GF |
|
||||
VP8_EFLAG_NO_UPD_ARF;
|
||||
static const int kPropagateGolden = VP8_EFLAG_FORCE_GF |
|
||||
VP8_EFLAG_NO_UPD_ARF |
|
||||
VP8_EFLAG_NO_REF_GF |
|
||||
VP8_EFLAG_NO_REF_LAST;
|
||||
static const int kPropagateAltRef = VP8_EFLAG_FORCE_ARF |
|
||||
VP8_EFLAG_NO_UPD_GF |
|
||||
VP8_EFLAG_NO_REF_ARF |
|
||||
VP8_EFLAG_NO_REF_LAST;
|
||||
static const int kRefreshFromGolden = VP8_EFLAG_NO_REF_LAST |
|
||||
VP8_EFLAG_NO_REF_ARF;
|
||||
static const int kRefreshFromAltRef = VP8_EFLAG_NO_REF_LAST |
|
||||
VP8_EFLAG_NO_REF_GF;
|
||||
|
||||
enum {
|
||||
kNoPropagationGolden = VP8_EFLAG_NO_REF_ARF |
|
||||
VP8_EFLAG_NO_UPD_GF |
|
||||
VP8_EFLAG_NO_UPD_ARF,
|
||||
kNoPropagationAltRef = VP8_EFLAG_NO_REF_GF |
|
||||
VP8_EFLAG_NO_UPD_GF |
|
||||
VP8_EFLAG_NO_UPD_ARF,
|
||||
kPropagateGolden = VP8_EFLAG_FORCE_GF |
|
||||
VP8_EFLAG_NO_UPD_ARF |
|
||||
VP8_EFLAG_NO_REF_GF |
|
||||
VP8_EFLAG_NO_REF_LAST,
|
||||
kPropagateAltRef = VP8_EFLAG_FORCE_ARF |
|
||||
VP8_EFLAG_NO_UPD_GF |
|
||||
VP8_EFLAG_NO_REF_ARF |
|
||||
VP8_EFLAG_NO_REF_LAST,
|
||||
kRefreshFromGolden = VP8_EFLAG_NO_REF_LAST |
|
||||
VP8_EFLAG_NO_REF_ARF,
|
||||
kRefreshFromAltRef = VP8_EFLAG_NO_REF_LAST |
|
||||
VP8_EFLAG_NO_REF_GF
|
||||
};
|
||||
|
||||
class TestRPS : public ::testing::Test {
|
||||
protected:
|
||||
|
||||
Reference in New Issue
Block a user