Compare commits
2 Commits
macos_open
...
window_dis
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dd5dc9c3c2 | ||
|
|
f93a5a68c6 |
@@ -23,22 +23,6 @@ sc_display_init(struct sc_display *display, SDL_Window *window, bool mipmaps) {
|
|||||||
// starts with "opengl"
|
// starts with "opengl"
|
||||||
bool use_opengl = renderer_name && !strncmp(renderer_name, "opengl", 6);
|
bool use_opengl = renderer_name && !strncmp(renderer_name, "opengl", 6);
|
||||||
if (use_opengl) {
|
if (use_opengl) {
|
||||||
|
|
||||||
#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
|
|
||||||
// Persuade macOS to give us something better than OpenGL 2.1.
|
|
||||||
// If we create a Core Profile context, we get the best OpenGL version.
|
|
||||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK,
|
|
||||||
SDL_GL_CONTEXT_PROFILE_CORE);
|
|
||||||
|
|
||||||
LOGD("Creating OpenGL Core Profile Context");
|
|
||||||
display->gl_context = SDL_GL_CreateContext(window);
|
|
||||||
if (!display->gl_context) {
|
|
||||||
LOGE("Could not create OpenGL context: %s", SDL_GetError());
|
|
||||||
SDL_DestroyRenderer(display->renderer);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct sc_opengl *gl = &display->gl;
|
struct sc_opengl *gl = &display->gl;
|
||||||
sc_opengl_init(gl);
|
sc_opengl_init(gl);
|
||||||
|
|
||||||
@@ -67,9 +51,6 @@ sc_display_init(struct sc_display *display, SDL_Window *window, bool mipmaps) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
sc_display_destroy(struct sc_display *display) {
|
sc_display_destroy(struct sc_display *display) {
|
||||||
#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
|
|
||||||
SDL_GL_DeleteContext(display->gl_context);
|
|
||||||
#endif
|
|
||||||
if (display->texture) {
|
if (display->texture) {
|
||||||
SDL_DestroyTexture(display->texture);
|
SDL_DestroyTexture(display->texture);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,19 +10,11 @@
|
|||||||
#include "coords.h"
|
#include "coords.h"
|
||||||
#include "opengl.h"
|
#include "opengl.h"
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
# define SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct sc_display {
|
struct sc_display {
|
||||||
SDL_Renderer *renderer;
|
SDL_Renderer *renderer;
|
||||||
SDL_Texture *texture;
|
SDL_Texture *texture;
|
||||||
|
|
||||||
struct sc_opengl gl;
|
struct sc_opengl gl;
|
||||||
#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
|
|
||||||
SDL_GLContext *gl_context;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bool mipmaps;
|
bool mipmaps;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package com.genymobile.scrcpy;
|
package com.genymobile.scrcpy;
|
||||||
|
|
||||||
import android.media.MediaCodec;
|
import android.media.MediaCodec;
|
||||||
import android.os.Build;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
@@ -20,12 +19,6 @@ public final class AudioRawRecorder implements AsyncProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void record() throws IOException, AudioCaptureForegroundException {
|
private void record() throws IOException, AudioCaptureForegroundException {
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
|
|
||||||
Ln.w("Audio disabled: it is not supported before Android 11");
|
|
||||||
streamer.writeDisableStream(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final ByteBuffer buffer = ByteBuffer.allocateDirect(READ_SIZE);
|
final ByteBuffer buffer = ByteBuffer.allocateDirect(READ_SIZE);
|
||||||
final MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
|
final MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user