Skip to content

Commit e20f63e

Browse files
committed
linux compatibility fixes, removed /Gy (pch)
1 parent d00f84e commit e20f63e

File tree

16 files changed

+55
-2064
lines changed

16 files changed

+55
-2064
lines changed
112 KB
Binary file not shown.
-1 KB
Binary file not shown.

H264SharpNative/ConverterLocal.cpp

Lines changed: 0 additions & 972 deletions
This file was deleted.

H264SharpNative/ConverterLocal.h

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
#pragma once
2-
#include "pch.h"
1+
#ifndef CONVERTER_LOCAL
2+
#define CONVERTER_LOCAL
3+
#include <cmath>
4+
#include<stdint.h>
5+
#ifndef __arm__
6+
#include <emmintrin.h>
7+
#endif
8+
#include "ConverterLocal.h"
9+
#ifdef _WIN32
10+
#include <ppl.h>
11+
#endif
312

413

514
void Yuv420P2RGB(unsigned char* dst_ptr,
@@ -796,4 +805,6 @@ const unsigned int yuv2rgb565_table1[256 * 3] =
796805
0xE6B64000U,
797806
0xE6764800U,
798807
0xE6365800U
799-
};
808+
};
809+
810+
#endif

H264SharpNative/Decoder.cpp

Lines changed: 0 additions & 276 deletions
This file was deleted.

H264SharpNative/Decoder.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
#pragma once
1+
#ifndef DECODER
2+
#define DECODER
23
#include "pch.h"
3-
#include <string>
4+
#include <chrono>
5+
#include "Decoder.h"
6+
#include <stdexcept>
7+
#include <string.h>
8+
#include <stdlib.h>
9+
#include "ImageTypes.h"
10+
#include "ConverterLocal.h"
411

512

613

@@ -76,3 +83,4 @@ namespace H264Sharp
7683

7784
};
7885
}
86+
#endif

H264SharpNative/EncodedFrame.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
#pragma once
1+
#ifndef ENCODED_FRAME
2+
#define ENCODED_FRAME
23
#include "pch.h"
34
namespace H264Sharp {
4-
5+
enum class FrameType { Invalid, IDR, I, P, Skip, IPMixed };
56
struct EncodedFrame
67
{
78
unsigned char* Data;
@@ -31,5 +32,6 @@ namespace H264Sharp {
3132
};
3233

3334
}
35+
#endif
3436

3537

0 commit comments

Comments
 (0)