History

Restore unix newlines after "Merge pull request #2991 from xiaotianshi2/master"

Some newlines were fixed in "Merge pull request #2997 from GuangweiWang/fix-issue-external", but lots were still left behind.

Martin Storsjö committed 8 years ago

Commit 1fb2f7d1 parent d43bfc114 files · +9238 −9238Browse files

Showing the changes to test/BaseDecoderTest.h (1 of 14 files). Show all

Unified · Split

test/BaseDecoderTest.h+53−53
@@ -1,53 +1,53 @@
1#ifndef __BASEDECODERTEST_H__1#ifndef __BASEDECODERTEST_H__
2#define __BASEDECODERTEST_H__2#define __BASEDECODERTEST_H__
3 3
4#include "test_stdint.h"4#include "test_stdint.h"
5#include <limits.h>5#include <limits.h>
6#include <fstream>6#include <fstream>
7#include "codec_api.h"7#include "codec_api.h"
8 8
9#include "utils/BufferedData.h"9#include "utils/BufferedData.h"
10 10
11class BaseDecoderTest {11class BaseDecoderTest {
12 public:12 public:
13 struct Plane {13 struct Plane {
14 const uint8_t* data;14 const uint8_t* data;
15 int width;15 int width;
16 int height;16 int height;
17 int stride;17 int stride;
18 };18 };
19 19
20 struct Frame {20 struct Frame {
21 Plane y;21 Plane y;
22 Plane u;22 Plane u;
23 Plane v;23 Plane v;
24 };24 };
25 25
26 struct Callback {26 struct Callback {
27 virtual void onDecodeFrame (const Frame& frame) = 0;27 virtual void onDecodeFrame (const Frame& frame) = 0;
28 };28 };
29 29
30 BaseDecoderTest();30 BaseDecoderTest();
31 int32_t SetUp();31 int32_t SetUp();
32 void TearDown();32 void TearDown();
33 void DecodeFile (const char* fileName, Callback* cbk);33 void DecodeFile (const char* fileName, Callback* cbk);
34 34
35 bool Open (const char* fileName);35 bool Open (const char* fileName);
36 bool DecodeNextFrame (Callback* cbk);36 bool DecodeNextFrame (Callback* cbk);
37 ISVCDecoder* decoder_;37 ISVCDecoder* decoder_;
38 38
39 private:39 private:
40 void DecodeFrame (const uint8_t* src, size_t sliceSize, Callback* cbk);40 void DecodeFrame (const uint8_t* src, size_t sliceSize, Callback* cbk);
41 void FlushFrame (Callback* cbk);41 void FlushFrame (Callback* cbk);
42 42
43 std::ifstream file_;43 std::ifstream file_;
44 BufferedData buf_;44 BufferedData buf_;
45 enum {45 enum {
46 OpenFile,46 OpenFile,
47 Decoding,47 Decoding,
48 EndOfStream,48 EndOfStream,
49 End49 End
50 } decodeStatus_;50 } decodeStatus_;
51};51};
52 52
53#endif //__BASEDECODERTEST_H__53#endif //__BASEDECODERTEST_H__

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t