General codebase clean-ups (no code changes)

* Remove trailing spaces
* Replace TABs with spaces
* Add missing indentation
This commit is contained in:
Hugo Hromic
2019-09-29 13:04:36 +01:00
parent c8e090a5e1
commit 434dba31de
19 changed files with 72 additions and 72 deletions

View File

@@ -139,7 +139,7 @@ void egl_init(EGLNativeDisplayType native_display, NativeWindowType native_windo
glGenBuffers(1, &ebo);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(elements), elements, GL_STATIC_DRAW);
GLuint vertex_shader = glCreateShader(GL_VERTEX_SHADER);
glShaderSource(vertex_shader, 1, &vertex_source, NULL);
glCompileShader(vertex_shader);

View File

@@ -170,6 +170,6 @@ int ffmpeg_decode(unsigned char* indata, int inlen) {
av_strerror(err, errorstring, sizeof(errorstring));
fprintf(stderr, "Decode failed - %s\n", errorstring);
}
return err < 0 ? err : 0;
}

View File

@@ -1,6 +1,6 @@
/*
* This file is part of Moonlight Embedded.
*
*
* Based on Moonlight Pc implementation
*
* Moonlight is free software; you can redistribute it and/or modify

View File

@@ -46,7 +46,7 @@ static enum AVPixelFormat va_get_format(AVCodecContext* context, const enum AVPi
fprintf(stderr, "Failed to initialize VAAPI frame context");
return AV_PIX_FMT_NONE;
}
context->pix_fmt = AV_PIX_FMT_VAAPI;
context->hw_device_ctx = device_ref;
context->hw_frames_ctx = hw_ctx;

View File

@@ -139,11 +139,11 @@ static int decoder_renderer_setup(int videoFormat, int width, int height, int re
}
close(fd_fb);
int regfbcount = MIN_FRAME_BUFFER_COUNT + 2;
int picWidth = ((width + 15) & ~15);
int picHeight = ((height + 15) & ~15);
char v4l_device[16];
sprintf(v4l_device, "/dev/video%d", 17);
fd = open(v4l_device, O_RDWR, 0);
@@ -192,7 +192,7 @@ static int decoder_renderer_setup(int videoFormat, int width, int height, int re
fprintf(stderr, "Not enough video buffers\n");
return -2;
}
for (int i = 0; i < regfbcount; i++) {
struct v4l2_buffer buffer = {0};
struct vpu_buf *buf;
@@ -233,7 +233,7 @@ static int decoder_renderer_setup(int videoFormat, int width, int height, int re
return -2;
}
}
vpu_setup(buffers, regfbcount, width, height);
if (pipe(pipefd) == -1 || pipe(clearpipefd) == -1) {

View File

@@ -143,7 +143,7 @@ void vpu_setup(struct vpu_buf* buffers[], int bufferCount, int width, int height
}
fb[i].bufMvCol = mvcol_md[i].phy_addr;
}
bufinfo.avcSliceBufInfo.bufferBase = slice_mem_desc.phy_addr;
bufinfo.avcSliceBufInfo.bufferSize = phy_slicebuf_size;
@@ -237,7 +237,7 @@ bool vpu_decode(PDECODE_UNIT decodeUnit) {
fprintf(stderr, "Failed to decode frame\n");
exit(EXIT_FAILURE);
}
currentFrame = outinfo.indexFrameDisplay;
return true;
}
@@ -249,7 +249,7 @@ void vpu_clear(int disp_clr_index) {
void vpu_cleanup() {
IOFreePhyMem(&ps_mem_desc);
IOFreePhyMem(&slice_mem_desc);
IOFreeVirtMem(&mem_desc);
IOFreePhyMem(&mem_desc);
vpu_UnInit();

View File

@@ -39,7 +39,7 @@ static int sdl_setup(int videoFormat, int width, int height, int redrawRate, voi
fprintf(stderr, "Couldn't initialize video decoding\n");
return -1;
}
ffmpeg_buffer = malloc(DECODER_BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE);
if (ffmpeg_buffer == NULL) {
fprintf(stderr, "Not enough memory\n");

View File

@@ -57,7 +57,7 @@ static int frame_handle(int pipefd) {
if (frame) {
if (ffmpeg_decoder == SOFTWARE)
egl_draw(frame->data);
#ifdef HAVE_VAAPI
#ifdef HAVE_VAAPI
else if (ffmpeg_decoder == VAAPI)
vaapi_queue(frame, window, display_width, display_height);
#endif