mirror of
https://github.com/jojo61/vdr-plugin-softhdcuvid.git
synced 2023-10-10 13:37:41 +02:00
- Reindent all sources to common coding style again.
- Fix compile bug occurred with gcc10 (-fno-common is now default)
This commit is contained in:
Dirk Nehring
parent
5875e10479
commit
36c208967e
4
Makefile
4
Makefile
@ -385,9 +385,7 @@ HDRS= $(wildcard *.h)
|
||||
|
||||
indent:
|
||||
for i in $(SRCS) $(HDRS); do \
|
||||
indent $$i; \
|
||||
unexpand -a $$i | sed -e s/constconst/const/ > $$i.up; \
|
||||
mv $$i.up $$i; \
|
||||
VERSION_CONTROL=none indent $$i; \
|
||||
done
|
||||
|
||||
video_test: video.c Makefile
|
||||
|
||||
9
audio.c
9
audio.c
@ -146,7 +146,6 @@ static volatile char AudioRunning; ///< thread running / stopped
|
||||
static volatile char AudioPaused; ///< audio paused
|
||||
static volatile char AudioVideoIsReady; ///< video ready start early
|
||||
static int AudioSkip; ///< skip audio to sync to video
|
||||
int AudioDelay; /// delay audio to sync to video
|
||||
|
||||
static const int AudioBytesProSample = 2; ///< number of bytes per sample
|
||||
|
||||
@ -2024,7 +2023,8 @@ static void *AudioPlayHandlerThread(void *dummy)
|
||||
|
||||
Debug(3, "audio: ----> %dms %d start\n", (AudioUsedBytes() * 1000)
|
||||
/ (!AudioRing[AudioRingWrite].HwSampleRate + !AudioRing[AudioRingWrite].HwChannels +
|
||||
AudioRing[AudioRingWrite].HwSampleRate * AudioRing[AudioRingWrite].HwChannels * AudioBytesProSample),AudioUsedBytes());
|
||||
AudioRing[AudioRingWrite].HwSampleRate * AudioRing[AudioRingWrite].HwChannels * AudioBytesProSample),
|
||||
AudioUsedBytes());
|
||||
|
||||
do {
|
||||
int filled;
|
||||
@ -2291,7 +2291,7 @@ void AudioEnqueue(const void *samples, int count)
|
||||
// no lock needed, can wakeup next time
|
||||
AudioRunning = 1;
|
||||
pthread_cond_signal(&AudioStartCond);
|
||||
Debug(3, "Start on AudioEnque Threshold %d n %d\n",AudioStartThreshold,n);
|
||||
Debug(3, "Start on AudioEnque Threshold %d n %d\n", AudioStartThreshold, n);
|
||||
}
|
||||
}
|
||||
// Update audio clock (stupid gcc developers thinks INT64_C is unsigned)
|
||||
@ -2337,6 +2337,7 @@ void AudioVideoReady(int64_t pts)
|
||||
|
||||
if (!AudioRunning) {
|
||||
int skip;
|
||||
|
||||
// buffer ~15 video frames
|
||||
// FIXME: HDTV can use smaller video buffer
|
||||
skip = pts - 0 * 20 * 90 - AudioBufferTime * 90 - audio_pts + VideoAudioDelay;
|
||||
@ -2479,7 +2480,7 @@ int64_t AudioGetDelay(void)
|
||||
pts += ((int64_t) RingBufferUsedBytes(AudioRing[AudioRingRead].RingBuffer)
|
||||
* 90 * 1000) / (AudioRing[AudioRingRead].HwSampleRate * AudioRing[AudioRingRead].HwChannels *
|
||||
AudioBytesProSample);
|
||||
Debug(4,"audio: hw+sw delay %zd %" PRId64 "ms\n", RingBufferUsedBytes(AudioRing[AudioRingRead].RingBuffer),
|
||||
Debug(4, "audio: hw+sw delay %zd %" PRId64 "ms\n", RingBufferUsedBytes(AudioRing[AudioRingRead].RingBuffer),
|
||||
pts / 90);
|
||||
|
||||
return pts;
|
||||
|
||||
8
codec.c
8
codec.c
@ -96,6 +96,7 @@ static pthread_mutex_t CodecLockMutex;
|
||||
/// Flag prefer fast channel switch
|
||||
char CodecUsePossibleDefectFrames;
|
||||
AVBufferRef *hw_device_ctx;
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Video
|
||||
//----------------------------------------------------------------------------
|
||||
@ -288,8 +289,8 @@ void CodecVideoOpen(VideoDecoder * decoder, int codec_id)
|
||||
}
|
||||
decoder->VideoCtx->hw_device_ctx = av_buffer_ref(HwDeviceContext);
|
||||
#else
|
||||
decoder->VideoCtx->pix_fmt = AV_PIX_FMT_DRM_PRIME; /* request a DRM frame
|
||||
// decoder->VideoCtx->pix_fmt = AV_PIX_FMT_MMAL; /* request a DRM frame */
|
||||
decoder->VideoCtx->pix_fmt = AV_PIX_FMT_DRM_PRIME; /* request a DRM frame */
|
||||
// decoder->VideoCtx->pix_fmt = AV_PIX_FMT_MMAL; /* request a DRM frame */
|
||||
#endif
|
||||
|
||||
// FIXME: for software decoder use all cpus, otherwise 1
|
||||
@ -1111,8 +1112,6 @@ static int CodecAudioPassthroughHelper(AudioDecoder * audio_decoder, const AVPac
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#if defined(USE_SWRESAMPLE) || defined(USE_AVRESAMPLE)
|
||||
|
||||
/**
|
||||
@ -1346,6 +1345,7 @@ void CodecAudioDecode(AudioDecoder * audio_decoder, const AVPacket * avpkt)
|
||||
if (audio_decoder->Resample) {
|
||||
uint8_t outbuf[8192 * 2 * 8];
|
||||
uint8_t *out[1];
|
||||
|
||||
out[0] = outbuf;
|
||||
ret =
|
||||
swr_convert(audio_decoder->Resample, out, sizeof(outbuf) / (2 * audio_decoder->HwChannels),
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
/*
|
||||
* Copyright 1993-2013 NVIDIA Corporation. All rights reserved.
|
||||
*
|
||||
|
||||
1
hdr.c
1
hdr.c
@ -490,4 +490,3 @@ static void set_hdr_metadata(int color,int trc, AVFrameSideData *sd1, AVFrameSid
|
||||
Debug(3,"DRM: HDR metadata: prop set\n");
|
||||
|
||||
}
|
||||
|
||||
|
||||
807
openglosd.cpp
807
openglosd.cpp
File diff suppressed because it is too large
Load Diff
51
shaders.h
51
shaders.h
@ -11,7 +11,6 @@ const char *gl_version = "#version 300 es ";
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
/* Color conversion matrix: RGB = m * YUV + c
|
||||
* m is in row-major matrix, with m[row][col], e.g.:
|
||||
* [ a11 a12 a13 ] float m[3][3] = { { a11, a12, a13 },
|
||||
@ -71,16 +70,11 @@ float cms_matrix[3][3] = { {1.660497, -0.124547, -0.018154},
|
||||
};
|
||||
|
||||
// Common constants for SMPTE ST.2084 (PQ)
|
||||
static const float PQ_M1 = 2610./4096 * 1./4,
|
||||
PQ_M2 = 2523./4096 * 128,
|
||||
PQ_C1 = 3424./4096,
|
||||
PQ_C2 = 2413./4096 * 32,
|
||||
PQ_C3 = 2392./4096 * 32;
|
||||
static const float PQ_M1 = 2610. / 4096 * 1. / 4, PQ_M2 = 2523. / 4096 * 128, PQ_C1 = 3424. / 4096, PQ_C2 =
|
||||
2413. / 4096 * 32, PQ_C3 = 2392. / 4096 * 32;
|
||||
|
||||
// Common constants for ARIB STD-B67 (HLG)
|
||||
static const float HLG_A = 0.17883277,
|
||||
HLG_B = 0.28466892,
|
||||
HLG_C = 0.55991073;
|
||||
static const float HLG_A = 0.17883277, HLG_B = 0.28466892, HLG_C = 0.55991073;
|
||||
|
||||
struct gl_vao_entry
|
||||
{
|
||||
@ -124,43 +118,50 @@ static const struct gl_vao_entry vertex_vao[] = {
|
||||
char sh[SHADER_LENGTH];
|
||||
char shv[SHADER_LENGTH];
|
||||
|
||||
GL_init() {
|
||||
GL_init()
|
||||
{
|
||||
sh[0] = 0;
|
||||
}
|
||||
GLV_init() {
|
||||
|
||||
GLV_init()
|
||||
{
|
||||
shv[0] = 0;
|
||||
}
|
||||
pl_shader_append(const char *fmt, ...) {
|
||||
|
||||
pl_shader_append(const char *fmt, ...)
|
||||
{
|
||||
char temp[1000];
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, fmt);
|
||||
vsprintf(temp,fmt,ap);
|
||||
vsprintf(temp, fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
if (strlen(sh) + strlen(temp) > SHADER_LENGTH)
|
||||
Fatal(_("Shaderlenght fault\n"));
|
||||
strcat(sh,temp);
|
||||
strcat(sh, temp);
|
||||
|
||||
}
|
||||
|
||||
pl_shader_append_v(const char *fmt, ...) {
|
||||
pl_shader_append_v(const char *fmt, ...)
|
||||
{
|
||||
char temp[1000];
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, fmt);
|
||||
vsprintf(temp,fmt,ap);
|
||||
vsprintf(temp, fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
if (strlen(shv) + strlen(temp) > SHADER_LENGTH)
|
||||
Fatal(_("Shaderlenght fault\n"));
|
||||
strcat(shv,temp);
|
||||
strcat(shv, temp);
|
||||
|
||||
}
|
||||
|
||||
static void compile_attach_shader(GLuint program, GLenum type, const char *source)
|
||||
{
|
||||
GLuint shader;
|
||||
GLint status=1234, log_length;
|
||||
GLint status = 1234, log_length;
|
||||
char log[4000];
|
||||
GLsizei len;
|
||||
|
||||
@ -199,7 +200,7 @@ static GLuint sc_generate_osd(GLuint gl_prog)
|
||||
gl_prog = glCreateProgram();
|
||||
|
||||
GL_init();
|
||||
GLSL("%s\n",gl_version);
|
||||
GLSL("%s\n", gl_version);
|
||||
GLSL("in vec2 vertex_position;\n");
|
||||
GLSL("in vec2 vertex_texcoord0;\n");
|
||||
GLSL("out vec2 texcoord0;\n");
|
||||
@ -211,7 +212,7 @@ static GLuint sc_generate_osd(GLuint gl_prog)
|
||||
Debug(3, "vor compile vertex osd\n");
|
||||
compile_attach_shader(gl_prog, GL_VERTEX_SHADER, sh); // vertex_osd);
|
||||
GL_init();
|
||||
GLSL("%s\n",gl_version);
|
||||
GLSL("%s\n", gl_version);
|
||||
GLSL("#define texture1D texture\n");
|
||||
GLSL("precision mediump float; \n");
|
||||
GLSL("layout(location = 0) out vec4 out_color;\n");
|
||||
@ -247,7 +248,7 @@ static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
|
||||
char *frag;
|
||||
|
||||
GL_init();
|
||||
GLSL("%s\n",gl_version);
|
||||
GLSL("%s\n", gl_version);
|
||||
GLSL("in vec2 vertex_position; \n");
|
||||
GLSL("in vec2 vertex_texcoord0; \n");
|
||||
GLSL("out vec2 texcoord0; \n");
|
||||
@ -270,8 +271,7 @@ static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
|
||||
gl_prog = glCreateProgram();
|
||||
Debug(3, "vor compile vertex\n");
|
||||
// printf("%s",sh);
|
||||
compile_attach_shader(gl_prog, GL_VERTEX_SHADER, sh );
|
||||
|
||||
compile_attach_shader(gl_prog, GL_VERTEX_SHADER, sh);
|
||||
|
||||
switch (colorspace) {
|
||||
case AVCOL_SPC_RGB:
|
||||
@ -300,7 +300,7 @@ static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
|
||||
|
||||
GL_init();
|
||||
|
||||
GLSL("%s\n",gl_version);
|
||||
GLSL("%s\n", gl_version);
|
||||
GLSL("precision mediump float; \n");
|
||||
GLSL("layout(location = 0) out vec4 out_color;\n");
|
||||
GLSL("in vec2 texcoord0; \n");
|
||||
@ -348,8 +348,7 @@ static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
|
||||
#endif
|
||||
GLSL("out_color = color; \n");
|
||||
GLSL("} \n");
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
|
||||
GLSL("color.r = 1.000000 * vec4(texture(texture0, texcoord0)).r; \n");
|
||||
if (Planes == 3) {
|
||||
|
||||
@ -1133,7 +1133,7 @@ void cMenuSetupSoft::Create(void)
|
||||
static char *scalingtest[100];
|
||||
|
||||
if (scalers == 0) {
|
||||
scalingtest[0] = (char *) "Off";
|
||||
scalingtest[0] = (char *)"Off";
|
||||
for (scalers = 0; pl_named_filters[scalers].filter != NULL; scalers++) {
|
||||
scaling[scalers] = (char *)pl_named_filters[scalers].name;
|
||||
scalingtest[scalers + 1] = (char *)pl_named_filters[scalers].name;
|
||||
@ -2153,7 +2153,7 @@ void cSoftHdMenu::Create(void)
|
||||
int dropped;
|
||||
int counter;
|
||||
float frametime;
|
||||
int width,height;
|
||||
int width, height;
|
||||
int color;
|
||||
int eotf;
|
||||
char *colorstr, *eotfstr;
|
||||
@ -2191,7 +2191,7 @@ void cSoftHdMenu::Create(void)
|
||||
#endif
|
||||
Add(new cOsdItem(NULL, osUnknown, false));
|
||||
Add(new cOsdItem(NULL, osUnknown, false));
|
||||
GetStats(&missed, &duped, &dropped, &counter, &frametime, &width, &height, &color,&eotf);
|
||||
GetStats(&missed, &duped, &dropped, &counter, &frametime, &width, &height, &color, &eotf);
|
||||
switch (color) {
|
||||
case AVCOL_SPC_RGB:
|
||||
colorstr = strdup("BT 601");
|
||||
@ -2213,7 +2213,8 @@ void cSoftHdMenu::Create(void)
|
||||
}
|
||||
Add(new cOsdItem(cString::sprintf(tr(" Frames missed(%d) duped(%d) dropped(%d) total(%d)"), missed, duped, dropped,
|
||||
counter), osUnknown, false));
|
||||
Add(new cOsdItem(cString::sprintf(tr(" Video %dx%d Color: %s Gamma: %s"), width, height, colorstr, eotfstr), osUnknown, false));
|
||||
Add(new cOsdItem(cString::sprintf(tr(" Video %dx%d Color: %s Gamma: %s"), width, height, colorstr, eotfstr),
|
||||
osUnknown, false));
|
||||
// Add(new cOsdItem(cString::sprintf(tr(" Frame Process time %2.2fms"), frametime), osUnknown, false));
|
||||
SetCurrent(Get(current)); // restore selected menu entry
|
||||
Display(); // display build menu
|
||||
|
||||
15
softhddev.c
15
softhddev.c
@ -645,7 +645,7 @@ static void PesParse(PesDemux * pesdx, const uint8_t * data, int size, int is_st
|
||||
q = pesdx->Buffer + pesdx->Skip;
|
||||
n = pesdx->Index - pesdx->Skip;
|
||||
while (n >= 5) {
|
||||
int r=0;
|
||||
int r = 0;
|
||||
unsigned codec_id = AV_CODEC_ID_NONE;
|
||||
|
||||
// 4 bytes 0xFFExxxxx Mpeg audio
|
||||
@ -2871,11 +2871,10 @@ const char *CommandLineHelp(void)
|
||||
" -p device\taudio device for pass-through (hw:0,1 or /dev/dsp1)\n"
|
||||
" -c channel\taudio mixer channel name (fe. PCM)\n" " -d display\tdisplay of x11 server (fe. :0.0)\n"
|
||||
" -f\t\tstart with fullscreen window (only with window manager)\n"
|
||||
" -g geometry\tx11 window geometry wxh+x+y\n"
|
||||
" -r Refresh\tRefreshrate for DRM (default is 50 Hz)\n"
|
||||
" -g geometry\tx11 window geometry wxh+x+y\n" " -r Refresh\tRefreshrate for DRM (default is 50 Hz)\n"
|
||||
" -C Connector\tConnector for DRM (default is current Connector)\n"
|
||||
" -v device\tvideo driver device (cuvid)\n"
|
||||
" -s\t\tstart in suspended mode\n" " -x\t\tstart x11 server, with -xx try to connect, if this fails\n"
|
||||
" -v device\tvideo driver device (cuvid)\n" " -s\t\tstart in suspended mode\n"
|
||||
" -x\t\tstart x11 server, with -xx try to connect, if this fails\n"
|
||||
" -X args\tX11 server arguments (f.e. -nocursor)\n" " -w workaround\tenable/disable workarounds\n"
|
||||
"\tno-hw-decoder\t\tdisable hw decoder, use software decoder only\n"
|
||||
"\tno-mpeg-hw-decoder\tdisable hw decoder for mpeg only\n"
|
||||
@ -3369,7 +3368,8 @@ void Resume(void)
|
||||
** @param[out] dropped dropped frames
|
||||
** @param[out] count number of decoded frames
|
||||
*/
|
||||
void GetStats(int *missed, int *duped, int *dropped, int *counter, float *frametime, int *width, int *height, int *color, int *eotf)
|
||||
void GetStats(int *missed, int *duped, int *dropped, int *counter, float *frametime, int *width, int *height,
|
||||
int *color, int *eotf)
|
||||
{
|
||||
*missed = 0;
|
||||
*duped = 0;
|
||||
@ -3381,7 +3381,8 @@ void GetStats(int *missed, int *duped, int *dropped, int *counter, float *framet
|
||||
*color = NULL;
|
||||
*eotf = NULL;
|
||||
if (MyVideoStream->HwDecoder) {
|
||||
VideoGetStats(MyVideoStream->HwDecoder, missed, duped, dropped, counter, frametime, width, height, color, eotf);
|
||||
VideoGetStats(MyVideoStream->HwDecoder, missed, duped, dropped, counter, frametime, width, height, color,
|
||||
eotf);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
291
video.c
291
video.c
@ -495,7 +495,6 @@ static int GlxVSyncEnabled = 1; ///< enable/disable v-sync
|
||||
static GLXContext glxSharedContext; ///< shared gl context
|
||||
static GLXContext glxContext; ///< our gl context
|
||||
|
||||
|
||||
static GLXContext glxThreadContext; ///< our gl context for the thread
|
||||
|
||||
static XVisualInfo *GlxVisualInfo; ///< our gl visual
|
||||
@ -543,7 +542,6 @@ static void X11DPMSReenable(xcb_connection_t *);
|
||||
static void X11DPMSDisable(xcb_connection_t *);
|
||||
#endif
|
||||
|
||||
|
||||
char *eglErrorString(EGLint error)
|
||||
{
|
||||
switch (error) {
|
||||
@ -697,10 +695,10 @@ static void VideoUpdateOutput(AVRational input_aspect_ratio, int input_width, in
|
||||
input_aspect_ratio.den = 1;
|
||||
}
|
||||
#ifdef USE_DRM
|
||||
get_drm_aspect(&display_aspect_ratio.num,&display_aspect_ratio.den);
|
||||
get_drm_aspect(&display_aspect_ratio.num, &display_aspect_ratio.den);
|
||||
#else
|
||||
Debug(3,"mmHeight %d mm Width %d VideoHeight %d VideoWidth %d\n",VideoScreen->height_in_millimeters,VideoScreen->width_in_millimeters,
|
||||
VideoScreen->height_in_pixels,VideoScreen->width_in_pixels);
|
||||
Debug(3, "mmHeight %d mm Width %d VideoHeight %d VideoWidth %d\n", VideoScreen->height_in_millimeters,
|
||||
VideoScreen->width_in_millimeters, VideoScreen->height_in_pixels, VideoScreen->width_in_pixels);
|
||||
display_aspect_ratio.num = VideoScreen->width_in_pixels * VideoScreen->height_in_millimeters;
|
||||
display_aspect_ratio.den = VideoScreen->height_in_pixels * VideoScreen->width_in_millimeters;
|
||||
#endif
|
||||
@ -873,9 +871,6 @@ static PFNGLXSWAPINTERVALSGIPROC GlxSwapIntervalSGI;
|
||||
}\
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
///
|
||||
/// GLX check if a GLX extension is supported.
|
||||
///
|
||||
@ -974,7 +969,6 @@ static void EglInit(void)
|
||||
|
||||
XVisualInfo *vi = NULL;
|
||||
|
||||
|
||||
#ifdef PLACEBO
|
||||
return;
|
||||
#endif
|
||||
@ -1013,7 +1007,7 @@ static void EglInit(void)
|
||||
if (!glXQueryVersion(XlibDisplay, &major, &minor)) {
|
||||
Fatal(_("video/glx: no GLX support\n"));
|
||||
}
|
||||
Debug(3,"video/glx: glx version %d.%d\n", major, minor);
|
||||
Debug(3, "video/glx: glx version %d.%d\n", major, minor);
|
||||
|
||||
//
|
||||
// check which extension are supported
|
||||
@ -1159,12 +1153,13 @@ static void EglInit(void)
|
||||
EGLContext context;
|
||||
|
||||
// create egl context
|
||||
setenv("MESA_GL_VERSION_OVERRIDE","3.3",0);
|
||||
setenv("V3D_DOUBLE_BUFFER","1",0);
|
||||
setenv("MESA_GL_VERSION_OVERRIDE", "3.3", 0);
|
||||
setenv("V3D_DOUBLE_BUFFER", "1", 0);
|
||||
make_egl();
|
||||
|
||||
if (!glewdone) {
|
||||
GLenum err = glewInit();
|
||||
|
||||
glewdone = 1;
|
||||
if (err != GLEW_OK) {
|
||||
Debug(3, "Error: %s\n", glewGetErrorString(err));
|
||||
@ -1509,7 +1504,8 @@ int CuvidMessage(int level, const char *format, ...)
|
||||
static inline void __checkCudaErrors(CUresult err, const char *file, const int line)
|
||||
{
|
||||
if (CUDA_SUCCESS != err) {
|
||||
CuvidMessage(2, "checkCudaErrors() Driver API error = %04d >%s< from file <%s>, line %i.\n", err, getCudaDrvErrorString(err), file, line);
|
||||
CuvidMessage(2, "checkCudaErrors() Driver API error = %04d >%s< from file <%s>, line %i.\n", err,
|
||||
getCudaDrvErrorString(err), file, line);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
@ -1589,13 +1585,13 @@ static void CuvidDestroySurfaces(CuvidDecoder * decoder)
|
||||
checkCudaErrors(cu->cuGraphicsUnregisterResource(decoder->cu_res[i][j]));
|
||||
#endif
|
||||
#ifdef VAAPI
|
||||
if (decoder->images[i*Planes+j]) {
|
||||
DestroyImageKHR(eglGetCurrentDisplay(), decoder->images[i*Planes+j]);
|
||||
if (decoder->fds[i*Planes+j])
|
||||
close(decoder->fds[i*Planes+j]);
|
||||
if (decoder->images[i * Planes + j]) {
|
||||
DestroyImageKHR(eglGetCurrentDisplay(), decoder->images[i * Planes + j]);
|
||||
if (decoder->fds[i * Planes + j])
|
||||
close(decoder->fds[i * Planes + j]);
|
||||
}
|
||||
decoder->fds[i*Planes+j] = 0;
|
||||
decoder->images[i*Planes+j] = 0;
|
||||
decoder->fds[i * Planes + j] = 0;
|
||||
decoder->images[i * Planes + j] = 0;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
@ -1604,7 +1600,7 @@ static void CuvidDestroySurfaces(CuvidDecoder * decoder)
|
||||
pl_renderer_destroy(&p->renderer);
|
||||
p->renderer = pl_renderer_create(p->ctx, p->gpu);
|
||||
#else
|
||||
glDeleteTextures(CODEC_SURFACES_MAX * 2, (GLuint *) &decoder->gl_textures);
|
||||
glDeleteTextures(CODEC_SURFACES_MAX * 2, (GLuint *) & decoder->gl_textures);
|
||||
GlxCheck();
|
||||
|
||||
if (CuvidDecoderN == 1) { // only wenn last decoder closes
|
||||
@ -1688,24 +1684,24 @@ static void CuvidReleaseSurface(CuvidDecoder * decoder, int surface)
|
||||
}
|
||||
#else
|
||||
#ifdef VAAPI
|
||||
if (decoder->images[surface*Planes]) {
|
||||
DestroyImageKHR(eglGetCurrentDisplay(), decoder->images[surface*Planes]);
|
||||
DestroyImageKHR(eglGetCurrentDisplay(), decoder->images[surface*Planes+1]);
|
||||
if (decoder->images[surface * Planes]) {
|
||||
DestroyImageKHR(eglGetCurrentDisplay(), decoder->images[surface * Planes]);
|
||||
DestroyImageKHR(eglGetCurrentDisplay(), decoder->images[surface * Planes + 1]);
|
||||
#ifdef RASPI
|
||||
DestroyImageKHR(eglGetCurrentDisplay(), decoder->images[surface*Planes+2]);
|
||||
DestroyImageKHR(eglGetCurrentDisplay(), decoder->images[surface * Planes + 2]);
|
||||
#endif
|
||||
if (decoder->fds[surface*Planes]) {
|
||||
close(decoder->fds[surface*Planes]);
|
||||
if (decoder->fds[surface * Planes]) {
|
||||
close(decoder->fds[surface * Planes]);
|
||||
// close(decoder->fds[surface*Planes+1]);
|
||||
#ifdef RASPI
|
||||
close(decoder->fds[surface*Planes+2]);
|
||||
close(decoder->fds[surface * Planes + 2]);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
decoder->fds[surface*Planes] = 0;
|
||||
decoder->fds[surface*Planes+1] = 0;
|
||||
decoder->images[surface*Planes] = 0;
|
||||
decoder->images[surface*Planes+1] = 0;
|
||||
decoder->fds[surface * Planes] = 0;
|
||||
decoder->fds[surface * Planes + 1] = 0;
|
||||
decoder->images[surface * Planes] = 0;
|
||||
decoder->images[surface * Planes + 1] = 0;
|
||||
#endif
|
||||
#endif
|
||||
for (i = 0; i < decoder->SurfaceUsedN; ++i) {
|
||||
@ -1735,9 +1731,10 @@ static void CuvidPrintFrames(const CuvidDecoder * decoder)
|
||||
|
||||
int CuvidTestSurfaces()
|
||||
{
|
||||
int i=0;
|
||||
int i = 0;
|
||||
|
||||
if (CuvidDecoders[0] != NULL) {
|
||||
if (i = atomic_read(&CuvidDecoders[0]->SurfacesFilled) < VIDEO_SURFACES_MAX-1)
|
||||
if (i = atomic_read(&CuvidDecoders[0]->SurfacesFilled) < VIDEO_SURFACES_MAX - 1)
|
||||
return i;
|
||||
return 0;
|
||||
} else
|
||||
@ -1779,14 +1776,14 @@ const int mpgl_preferred_gl_versions[] = {
|
||||
0
|
||||
};
|
||||
|
||||
static bool create_context_cb(EGLDisplay display, int es_version, EGLContext * out_context, EGLConfig * out_config, int *bpp)
|
||||
static bool create_context_cb(EGLDisplay display, int es_version, EGLContext * out_context, EGLConfig * out_config,
|
||||
int *bpp)
|
||||
{
|
||||
|
||||
EGLenum api;
|
||||
EGLint rend, *attribs;
|
||||
const char *name;
|
||||
|
||||
|
||||
switch (es_version) {
|
||||
case 0:
|
||||
api = EGL_OPENGL_API;
|
||||
@ -1831,7 +1828,8 @@ static bool create_context_cb(EGLDisplay display, int es_version, EGLContext * o
|
||||
EGL_RENDERABLE_TYPE, rend,
|
||||
EGL_NONE
|
||||
};
|
||||
EGLint num_configs=0;
|
||||
EGLint num_configs = 0;
|
||||
|
||||
#ifndef RASPI
|
||||
attribs = attributes10;
|
||||
*bpp = 10;
|
||||
@ -1909,6 +1907,7 @@ static bool create_context_cb(EGLDisplay display, int es_version, EGLContext * o
|
||||
make_egl()
|
||||
{
|
||||
int bpp;
|
||||
|
||||
CreateImageKHR = (void *)eglGetProcAddress("eglCreateImageKHR");
|
||||
DestroyImageKHR = (void *)eglGetProcAddress("eglDestroyImageKHR");
|
||||
EGLImageTargetTexture2DOES = (void *)eglGetProcAddress("glEGLImageTargetTexture2DOES");
|
||||
@ -1933,7 +1932,7 @@ make_egl()
|
||||
int vID, n;
|
||||
|
||||
eglGetConfigAttrib(eglDisplay, eglConfig, EGL_NATIVE_VISUAL_ID, &vID);
|
||||
Debug(3, "chose visual 0x%x bpp %d\n", vID,bpp);
|
||||
Debug(3, "chose visual 0x%x bpp %d\n", vID, bpp);
|
||||
#ifdef USE_DRM
|
||||
InitBo(bpp);
|
||||
#else
|
||||
@ -2439,14 +2438,18 @@ void createTextureDst(CuvidDecoder * decoder, int anz, unsigned int size_x, unsi
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
#ifdef RASPI
|
||||
if (PixFmt == AV_PIX_FMT_NV12)
|
||||
glTexImage2D(GL_TEXTURE_2D, 0,GL_R8 ,n==0?size_x:size_x/2, n==0?size_y:size_y/2, 0, GL_RED , GL_UNSIGNED_BYTE , NULL);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, n == 0 ? size_x : size_x / 2, n == 0 ? size_y : size_y / 2, 0,
|
||||
GL_RED, GL_UNSIGNED_BYTE, NULL);
|
||||
else
|
||||
glTexImage2D(GL_TEXTURE_2D, 0,GL_R16,n==0?size_x:size_x/2, n==0?size_y:size_y/2, 0, GL_RED , GL_UNSIGNED_SHORT, NULL);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_R16, n == 0 ? size_x : size_x / 2, n == 0 ? size_y : size_y / 2, 0,
|
||||
GL_RED, GL_UNSIGNED_SHORT, NULL);
|
||||
#else
|
||||
if (PixFmt == AV_PIX_FMT_NV12)
|
||||
glTexImage2D(GL_TEXTURE_2D, 0,n==0?GL_R8 :GL_RG8 ,n==0?size_x:size_x/2, n==0?size_y:size_y/2, 0, n==0?GL_RED:GL_RG , GL_UNSIGNED_BYTE , NULL);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, n == 0 ? GL_R8 : GL_RG8, n == 0 ? size_x : size_x / 2,
|
||||
n == 0 ? size_y : size_y / 2, 0, n == 0 ? GL_RED : GL_RG, GL_UNSIGNED_BYTE, NULL);
|
||||
else
|
||||
glTexImage2D(GL_TEXTURE_2D, 0,n==0?GL_R16:GL_RG16 ,n==0?size_x:size_x/2, n==0?size_y:size_y/2, 0, n==0?GL_RED:GL_RG , GL_UNSIGNED_SHORT, NULL);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, n == 0 ? GL_R16 : GL_RG16, n == 0 ? size_x : size_x / 2,
|
||||
n == 0 ? size_y : size_y / 2, 0, n == 0 ? GL_RED : GL_RG, GL_UNSIGNED_SHORT, NULL);
|
||||
#endif
|
||||
SDK_CHECK_ERROR_GL();
|
||||
// register this texture with CUDA
|
||||
@ -2489,27 +2492,31 @@ void createTextureDst(CuvidDecoder * decoder, int anz, unsigned int size_x, unsi
|
||||
desc.layers[n].pitch[plane]); \
|
||||
} while (0)
|
||||
|
||||
void generateVAAPIImage(CuvidDecoder * decoder, VASurfaceID index, const AVFrame * frame, int image_width, int image_height)
|
||||
void generateVAAPIImage(CuvidDecoder * decoder, VASurfaceID index, const AVFrame * frame, int image_width,
|
||||
int image_height)
|
||||
{
|
||||
VAStatus status;
|
||||
|
||||
uint64_t first_time;
|
||||
|
||||
#if defined (VAAPI) && !defined (RASPI)
|
||||
VADRMPRIMESurfaceDescriptor desc;
|
||||
|
||||
status =
|
||||
vaExportSurfaceHandle(decoder->VaDisplay, (VASurfaceID)(uintptr_t)frame->data[3], VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2,
|
||||
VA_EXPORT_SURFACE_READ_ONLY | VA_EXPORT_SURFACE_SEPARATE_LAYERS, &desc);
|
||||
vaExportSurfaceHandle(decoder->VaDisplay, (VASurfaceID) (uintptr_t) frame->data[3],
|
||||
VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2, VA_EXPORT_SURFACE_READ_ONLY | VA_EXPORT_SURFACE_SEPARATE_LAYERS,
|
||||
&desc);
|
||||
|
||||
if (status != VA_STATUS_SUCCESS) {
|
||||
printf("Fehler beim export VAAPI Handle\n");
|
||||
return;
|
||||
}
|
||||
vaSyncSurface(decoder->VaDisplay, (VASurfaceID)(uintptr_t)frame->data[3]);
|
||||
vaSyncSurface(decoder->VaDisplay, (VASurfaceID) (uintptr_t) frame->data[3]);
|
||||
#endif
|
||||
#ifdef RASPI
|
||||
AVDRMFrameDescriptor desc;
|
||||
memcpy(&desc,frame->data[0],sizeof(desc));
|
||||
|
||||
memcpy(&desc, frame->data[0], sizeof(desc));
|
||||
|
||||
#endif
|
||||
|
||||
@ -2520,26 +2527,27 @@ void generateVAAPIImage(CuvidDecoder * decoder, VASurfaceID index, const AVFrame
|
||||
int attribs[20] = { EGL_NONE };
|
||||
uint num_attribs = 0;
|
||||
int fd;
|
||||
|
||||
#if defined (VAAPI) && !defined (RASPI)
|
||||
ADD_ATTRIB(EGL_LINUX_DRM_FOURCC_EXT, desc.layers[n].drm_format);
|
||||
ADD_ATTRIB(EGL_WIDTH, n==0?image_width:image_width/2);
|
||||
ADD_ATTRIB(EGL_HEIGHT, n==0?image_height:image_height/2);
|
||||
ADD_ATTRIB(EGL_WIDTH, n == 0 ? image_width : image_width / 2);
|
||||
ADD_ATTRIB(EGL_HEIGHT, n == 0 ? image_height : image_height / 2);
|
||||
ADD_PLANE_ATTRIBS(0);
|
||||
#endif
|
||||
#ifdef RASPI
|
||||
ADD_ATTRIB(EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_R8);
|
||||
ADD_ATTRIB(EGL_WIDTH, n==0?image_width:image_width/2);
|
||||
ADD_ATTRIB(EGL_HEIGHT, n==0?image_height:image_height/2);
|
||||
if (n==0) {
|
||||
ADD_ATTRIB(EGL_WIDTH, n == 0 ? image_width : image_width / 2);
|
||||
ADD_ATTRIB(EGL_HEIGHT, n == 0 ? image_height : image_height / 2);
|
||||
if (n == 0) {
|
||||
fd = dup(desc.objects[0].fd);
|
||||
ADD_ATTRIB( EGL_DMA_BUF_PLANE0_FD_EXT,fd);
|
||||
ADD_ATTRIB( EGL_DMA_BUF_PLANE0_OFFSET_EXT,desc.layers[0].planes[n].offset);
|
||||
ADD_ATTRIB( EGL_DMA_BUF_PLANE0_PITCH_EXT,desc.layers[0].planes[n].pitch);
|
||||
ADD_ATTRIB(EGL_DMA_BUF_PLANE0_FD_EXT, fd);
|
||||
ADD_ATTRIB(EGL_DMA_BUF_PLANE0_OFFSET_EXT, desc.layers[0].planes[n].offset);
|
||||
ADD_ATTRIB(EGL_DMA_BUF_PLANE0_PITCH_EXT, desc.layers[0].planes[n].pitch);
|
||||
} else {
|
||||
fd = dup(desc.objects[0].fd);
|
||||
ADD_ATTRIB( EGL_DMA_BUF_PLANE0_FD_EXT,fd);
|
||||
ADD_ATTRIB( EGL_DMA_BUF_PLANE0_OFFSET_EXT,desc.layers[0].planes[n].offset);
|
||||
ADD_ATTRIB( EGL_DMA_BUF_PLANE0_PITCH_EXT,desc.layers[0].planes[n].pitch);
|
||||
ADD_ATTRIB(EGL_DMA_BUF_PLANE0_FD_EXT, fd);
|
||||
ADD_ATTRIB(EGL_DMA_BUF_PLANE0_OFFSET_EXT, desc.layers[0].planes[n].offset);
|
||||
ADD_ATTRIB(EGL_DMA_BUF_PLANE0_PITCH_EXT, desc.layers[0].planes[n].pitch);
|
||||
}
|
||||
// Debug(3,"n %d fd %d nb_planes %d nb_layers %d plane %d offeset %d offset2 %d pitch %d \n",n, fd,
|
||||
// desc.layers[0].nb_planes,desc.nb_layers,n,desc.layers[0].planes[n].offset,desc.layers[0].planes[n+1].offset,desc.layers[0].planes[n].pitch);
|
||||
@ -2554,10 +2562,10 @@ void generateVAAPIImage(CuvidDecoder * decoder, VASurfaceID index, const AVFrame
|
||||
glBindTexture(GL_TEXTURE_2D, decoder->gl_textures[index * Planes + n]);
|
||||
EGLImageTargetTexture2DOES(GL_TEXTURE_2D, decoder->images[index * Planes + n]);
|
||||
#ifdef RASPI
|
||||
decoder->fds[index*Planes+n] = fd;
|
||||
decoder->fds[index * Planes + n] = fd;
|
||||
#endif
|
||||
}
|
||||
decoder->fds[index*Planes] = desc.objects[0].fd;
|
||||
decoder->fds[index * Planes] = desc.objects[0].fd;
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
eglMakeCurrent(eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
|
||||
EglCheck();
|
||||
@ -2610,7 +2618,6 @@ static unsigned CuvidGetVideoSurface(CuvidDecoder * decoder, const AVCodecContex
|
||||
#if defined (VAAPI) || defined (YADIF)
|
||||
static void CuvidSyncRenderFrame(CuvidDecoder * decoder, const AVCodecContext * video_ctx, AVFrame * frame);
|
||||
|
||||
|
||||
int push_filters(AVCodecContext * dec_ctx, CuvidDecoder * decoder, AVFrame * frame)
|
||||
{
|
||||
|
||||
@ -2622,9 +2629,9 @@ int push_filters(AVCodecContext * dec_ctx, CuvidDecoder * decoder, AVFrame * fra
|
||||
av_log(NULL, AV_LOG_ERROR, "Error while feeding the filtergraph\n");
|
||||
}
|
||||
|
||||
// printf("Interlaced %d tff %d\n",frame->interlaced_frame,frame->top_field_first);
|
||||
// printf("Interlaced %d tff %d\n",frame->interlaced_frame,frame->top_field_first);
|
||||
/* pull filtered frames from the filtergraph */
|
||||
while ((ret = av_buffersink_get_frame(decoder->buffersink_ctx, filt_frame)) >= 0 ) {
|
||||
while ((ret = av_buffersink_get_frame(decoder->buffersink_ctx, filt_frame)) >= 0) {
|
||||
filt_frame->pts /= 2;
|
||||
decoder->Interlaced = 0;
|
||||
// printf("vaapideint video:new %#012" PRIx64 " old %#012" PRIx64 "\n",filt_frame->pts,frame->pts);
|
||||
@ -2751,7 +2758,7 @@ int init_filters(AVCodecContext * dec_ctx, CuvidDecoder * decoder, AVFrame * fra
|
||||
#endif
|
||||
|
||||
#ifdef VAAPI
|
||||
static int init_generic_hwaccel(CuvidDecoder * decoder, enum AVPixelFormat hw_fmt,AVCodecContext * video_ctx)
|
||||
static int init_generic_hwaccel(CuvidDecoder * decoder, enum AVPixelFormat hw_fmt, AVCodecContext * video_ctx)
|
||||
{
|
||||
|
||||
AVBufferRef *new_frames_ctx = NULL;
|
||||
@ -2761,9 +2768,7 @@ static int init_generic_hwaccel(CuvidDecoder * decoder, enum AVPixelFormat hw_fm
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (avcodec_get_hw_frames_parameters(video_ctx,
|
||||
hw_device_ctx, hw_fmt, &new_frames_ctx) < 0)
|
||||
{
|
||||
if (avcodec_get_hw_frames_parameters(video_ctx, hw_device_ctx, hw_fmt, &new_frames_ctx) < 0) {
|
||||
Debug(3, "Hardware decoding of this stream is unsupported?\n");
|
||||
goto error;
|
||||
}
|
||||
@ -2773,17 +2778,14 @@ static int init_generic_hwaccel(CuvidDecoder * decoder, enum AVPixelFormat hw_fm
|
||||
// We might be able to reuse a previously allocated frame pool.
|
||||
if (decoder->cached_hw_frames_ctx) {
|
||||
AVHWFramesContext *old_fctx = (void *)decoder->cached_hw_frames_ctx->data;
|
||||
Debug(3,"CMP %d:%d %d:%d %d:%d %d:%d %d:%d\,",new_fctx->format, old_fctx->format,
|
||||
new_fctx->sw_format,old_fctx->sw_format ,
|
||||
new_fctx->width, old_fctx->width ,
|
||||
new_fctx->height, old_fctx->height ,
|
||||
|
||||
Debug(3, "CMP %d:%d %d:%d %d:%d %d:%d %d:%d\,", new_fctx->format, old_fctx->format, new_fctx->sw_format,
|
||||
old_fctx->sw_format, new_fctx->width, old_fctx->width, new_fctx->height, old_fctx->height,
|
||||
new_fctx->initial_pool_size, old_fctx->initial_pool_size);
|
||||
if (new_fctx->format != old_fctx->format ||
|
||||
new_fctx->sw_format != old_fctx->sw_format ||
|
||||
new_fctx->width != old_fctx->width ||
|
||||
new_fctx->height != old_fctx->height ||
|
||||
new_fctx->initial_pool_size != old_fctx->initial_pool_size) {
|
||||
Debug(3,"delete old cache");
|
||||
if (new_fctx->format != old_fctx->format || new_fctx->sw_format != old_fctx->sw_format
|
||||
|| new_fctx->width != old_fctx->width || new_fctx->height != old_fctx->height
|
||||
|| new_fctx->initial_pool_size != old_fctx->initial_pool_size) {
|
||||
Debug(3, "delete old cache");
|
||||
if (decoder->filter_graph)
|
||||
avfilter_graph_free(&decoder->filter_graph);
|
||||
av_buffer_unref(&decoder->cached_hw_frames_ctx);
|
||||
@ -2808,8 +2810,8 @@ static int init_generic_hwaccel(CuvidDecoder * decoder, enum AVPixelFormat hw_fm
|
||||
av_buffer_unref(&new_frames_ctx);
|
||||
return 0;
|
||||
|
||||
error:
|
||||
Debug(3,"Error with hwframes\n");
|
||||
error:
|
||||
Debug(3, "Error with hwframes\n");
|
||||
av_buffer_unref(&new_frames_ctx);
|
||||
av_buffer_unref(&decoder->cached_hw_frames_ctx);
|
||||
return -1;
|
||||
@ -2867,9 +2869,9 @@ static enum AVPixelFormat Cuvid_get_format(CuvidDecoder * decoder, AVCodecContex
|
||||
Fatal(_("video: no valid profile found\n"));
|
||||
}
|
||||
|
||||
// decoder->newchannel = 1;
|
||||
// decoder->newchannel = 1;
|
||||
#ifdef VAAPI
|
||||
init_generic_hwaccel(decoder, PIXEL_FORMAT,video_ctx);
|
||||
init_generic_hwaccel(decoder, PIXEL_FORMAT, video_ctx);
|
||||
#endif
|
||||
if (ist->GetFormatDone) {
|
||||
return PIXEL_FORMAT;
|
||||
@ -2892,8 +2894,8 @@ static enum AVPixelFormat Cuvid_get_format(CuvidDecoder * decoder, AVCodecContex
|
||||
ist->hwaccel_output_format = AV_PIX_FMT_NV12;
|
||||
}
|
||||
|
||||
if ((video_ctx->width != decoder->InputWidth
|
||||
|| video_ctx->height != decoder->InputHeight) && decoder->TrickSpeed == 0) {
|
||||
if ((video_ctx->width != decoder->InputWidth || video_ctx->height != decoder->InputHeight)
|
||||
&& decoder->TrickSpeed == 0) {
|
||||
|
||||
// if (decoder->TrickSpeed == 0) {
|
||||
#ifdef PLACEBO
|
||||
@ -3383,7 +3385,8 @@ static void CuvidRenderFrame(CuvidDecoder * decoder, const AVCodecContext * vide
|
||||
video_ctx->width != decoder->InputWidth
|
||||
// || decoder->ColorSpace != color
|
||||
|| video_ctx->height != decoder->InputHeight) {
|
||||
Debug(3,"fmt %02d:%02d width %d:%d hight %d:%d\n",decoder->ColorSpace,frame->colorspace ,video_ctx->width, decoder->InputWidth,video_ctx->height, decoder->InputHeight);
|
||||
Debug(3, "fmt %02d:%02d width %d:%d hight %d:%d\n", decoder->ColorSpace, frame->colorspace, video_ctx->width,
|
||||
decoder->InputWidth, video_ctx->height, decoder->InputHeight);
|
||||
decoder->PixFmt = AV_PIX_FMT_NV12;
|
||||
decoder->InputWidth = video_ctx->width;
|
||||
decoder->InputHeight = video_ctx->height;
|
||||
@ -3465,7 +3468,7 @@ Debug(3,"fmt %02d:%02d width %d:%d hight %d:%d\n",decoder->ColorSpace,frame->co
|
||||
|
||||
}
|
||||
|
||||
// Debug(3,"video/cuvid: pixel format %d not supported\n", video_ctx->pix_fmt);
|
||||
// Debug(3,"video/cuvid: pixel format %d not supported\n", video_ctx->pix_fmt);
|
||||
av_frame_free(&frame);
|
||||
return;
|
||||
}
|
||||
@ -3477,7 +3480,7 @@ Debug(3,"fmt %02d:%02d width %d:%d hight %d:%d\n",decoder->ColorSpace,frame->co
|
||||
///
|
||||
static void *CuvidGetHwAccelContext(CuvidDecoder * decoder)
|
||||
{
|
||||
unsigned int version,ret;
|
||||
unsigned int version, ret;
|
||||
|
||||
Debug(3, "Initializing cuvid hwaccel thread ID:%ld\n", (long int)syscall(186));
|
||||
// turn NULL;
|
||||
@ -3629,13 +3632,13 @@ static void CuvidMixVideo(CuvidDecoder * decoder, __attribute__((unused))
|
||||
#ifdef USE_DRM
|
||||
if (!decoder->Closing) {
|
||||
frame = decoder->frames[current];
|
||||
AVFrameSideData *sd1 = av_frame_get_side_data (frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
|
||||
AVFrameSideData *sd2 = av_frame_get_side_data (frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
|
||||
set_hdr_metadata(frame->color_primaries,frame->color_trc,sd1,sd2);
|
||||
AVFrameSideData *sd1 = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
|
||||
AVFrameSideData *sd2 = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
|
||||
|
||||
set_hdr_metadata(frame->color_primaries, frame->color_trc, sd1, sd2);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// Render Progressive frame
|
||||
#ifndef PLACEBO
|
||||
y = VideoWindowHeight - decoder->OutputY - decoder->OutputHeight;
|
||||
@ -3809,7 +3812,6 @@ static void CuvidMixVideo(CuvidDecoder * decoder, __attribute__((unused))
|
||||
|
||||
decoder->newchannel = 0;
|
||||
|
||||
|
||||
if (!pl_render_image(p->renderer, &decoder->pl_images[current], target, &render_params)) {
|
||||
Debug(3, "Failed rendering frame!\n");
|
||||
}
|
||||
@ -3849,7 +3851,6 @@ void make_osd_overlay(int x, int y, int width, int height)
|
||||
const struct pl_fmt *fmt;
|
||||
struct pl_overlay *pl;
|
||||
|
||||
|
||||
int offset = VideoWindowHeight - (VideoWindowHeight - height - y) - (VideoWindowHeight - y);
|
||||
|
||||
fmt = pl_find_named_fmt(p->gpu, "rgba8"); // 8 Bit RGB
|
||||
@ -4275,7 +4276,8 @@ static void CuvidSetTrickSpeed(CuvidDecoder * decoder, int speed)
|
||||
/// @param[out] dropped dropped frames
|
||||
/// @param[out] count number of decoded frames
|
||||
///
|
||||
void CuvidGetStats(CuvidDecoder * decoder, int *missed, int *duped, int *dropped, int *counter, float *frametime, int *width, int *height, int *color, int * eotf)
|
||||
void CuvidGetStats(CuvidDecoder * decoder, int *missed, int *duped, int *dropped, int *counter, float *frametime,
|
||||
int *width, int *height, int *color, int *eotf)
|
||||
{
|
||||
*missed = decoder->FramesMissed;
|
||||
*duped = decoder->FramesDuped;
|
||||
@ -4307,13 +4309,12 @@ static void CuvidSyncDecoder(CuvidDecoder * decoder)
|
||||
int64_t audio_clock;
|
||||
int64_t video_clock;
|
||||
int err = 0;
|
||||
static int speedup=3;
|
||||
static int speedup = 3;
|
||||
|
||||
#ifdef GAMMA
|
||||
Get_Gamma();
|
||||
#endif
|
||||
|
||||
|
||||
video_clock = CuvidGetClock(decoder);
|
||||
|
||||
filled = atomic_read(&decoder->SurfacesFilled);
|
||||
@ -4373,7 +4374,7 @@ static void CuvidSyncDecoder(CuvidDecoder * decoder)
|
||||
}
|
||||
#endif
|
||||
if (abs(diff) > 5000 * 90) { // more than 5s
|
||||
err = CuvidMessage(2, "video: audio/video difference too big %d\n",diff/90);
|
||||
err = CuvidMessage(2, "video: audio/video difference too big %d\n", diff / 90);
|
||||
// decoder->SyncCounter = 1;
|
||||
// usleep(10);
|
||||
goto skip_sync;
|
||||
@ -4403,8 +4404,7 @@ static void CuvidSyncDecoder(CuvidDecoder * decoder)
|
||||
AudioDelayms(abs(diff / 90));
|
||||
}
|
||||
decoder->SyncCounter = 1;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
speedup = 2;
|
||||
}
|
||||
#if defined(DEBUG) || defined(AV_INFO)
|
||||
@ -4575,7 +4575,6 @@ static void CuvidDisplayHandlerThread(void)
|
||||
allfull = 1;
|
||||
decoded = 0;
|
||||
|
||||
|
||||
for (i = 0; i < CuvidDecoderN; ++i) {
|
||||
|
||||
decoder = CuvidDecoders[i];
|
||||
@ -4669,14 +4668,14 @@ static const VideoModule CuvidModule = {
|
||||
.RenderFrame = (void (*const) (VideoHwDecoder *,
|
||||
const AVCodecContext *, const AVFrame *))CuvidSyncRenderFrame,
|
||||
.GetHwAccelContext = (void *(*const)(VideoHwDecoder *))CuvidGetHwAccelContext,
|
||||
.SetClock = (void (*const)(VideoHwDecoder *, int64_t))CuvidSetClock,
|
||||
.GetClock = (int64_t(*const)(const VideoHwDecoder *))CuvidGetClock,
|
||||
.SetClosing = (void (*const)(const VideoHwDecoder *))CuvidSetClosing,
|
||||
.ResetStart = (void (*const)(const VideoHwDecoder *))CuvidResetStart,
|
||||
.SetTrickSpeed = (void (*const)(const VideoHwDecoder *, int))CuvidSetTrickSpeed,
|
||||
.SetClock =(void(*const)(VideoHwDecoder *, int64_t))CuvidSetClock,
|
||||
.GetClock =(int64_t(*const)(const VideoHwDecoder *))CuvidGetClock,
|
||||
.SetClosing =(void(*const)(const VideoHwDecoder *))CuvidSetClosing,
|
||||
.ResetStart =(void(*const)(const VideoHwDecoder *))CuvidResetStart,
|
||||
.SetTrickSpeed =(void(*const)(const VideoHwDecoder *, int))CuvidSetTrickSpeed,
|
||||
.GrabOutput = CuvidGrabOutputSurface,
|
||||
.GetStats = (void (*const)(VideoHwDecoder *, int *, int *, int *,
|
||||
int *, float *, int *, int *, int * , int *))CuvidGetStats,
|
||||
.GetStats =(void(*const)(VideoHwDecoder *, int *, int *, int *,
|
||||
int *, float *, int *, int *, int *, int *))CuvidGetStats,
|
||||
.SetBackground = CuvidSetBackground,
|
||||
.SetVideoMode = CuvidSetVideoMode,
|
||||
|
||||
@ -4837,14 +4836,14 @@ static const VideoModule NoopModule = {
|
||||
const AVCodecContext *, const AVFrame *))NoopSyncRenderFrame,
|
||||
.GetHwAccelContext = (void *(*const)(VideoHwDecoder *))
|
||||
DummyGetHwAccelContext,
|
||||
.SetClock = (void (*const)(VideoHwDecoder *, int64_t))NoopSetClock,
|
||||
.GetClock = (int64_t(*const)(const VideoHwDecoder *))NoopGetClock,
|
||||
.SetClosing = (void (*const)(const VideoHwDecoder *))NoopSetClosing,
|
||||
.ResetStart = (void (*const)(const VideoHwDecoder *))NoopResetStart,
|
||||
.SetTrickSpeed =(void (*const)(const VideoHwDecoder *, int))NoopSetTrickSpeed,
|
||||
.SetClock =(void(*const)(VideoHwDecoder *, int64_t))NoopSetClock,
|
||||
.GetClock =(int64_t(*const)(const VideoHwDecoder *))NoopGetClock,
|
||||
.SetClosing =(void(*const)(const VideoHwDecoder *))NoopSetClosing,
|
||||
.ResetStart =(void(*const)(const VideoHwDecoder *))NoopResetStart,
|
||||
.SetTrickSpeed = (void(*const)(const VideoHwDecoder *, int))NoopSetTrickSpeed,
|
||||
.GrabOutput = NoopGrabOutputSurface,
|
||||
.GetStats = (void (*const)(VideoHwDecoder *, int *, int *, int *,
|
||||
int *, float *, int *, int *, int * , int *))NoopGetStats,
|
||||
.GetStats =(void(*const)(VideoHwDecoder *, int *, int *, int *,
|
||||
int *, float *, int *, int *, int *, int *))NoopGetStats,
|
||||
#endif
|
||||
.SetBackground = NoopSetBackground,
|
||||
.SetVideoMode = NoopVoid,
|
||||
@ -4999,7 +4998,7 @@ void VideoOsdInit(void)
|
||||
|
||||
if (posd)
|
||||
free(posd);
|
||||
posd = (unsigned char *)calloc( (OsdWidth+1) * (OsdHeight+1) * 4, 1 );
|
||||
posd = (unsigned char *)calloc((OsdWidth + 1) * (OsdHeight + 1) * 4, 1);
|
||||
VideoOsdClear();
|
||||
}
|
||||
|
||||
@ -5199,8 +5198,6 @@ void pl_log_intern(void *stream, enum pl_log_level level, const char *msg)
|
||||
printf("%5s: %s\n", prefix[level], msg);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void InitPlacebo()
|
||||
{
|
||||
|
||||
@ -5211,7 +5208,7 @@ void InitPlacebo()
|
||||
char xcbext[] = { "VK_KHR_xcb_surface" };
|
||||
char surfext[] = { "VK_KHR_surface" };
|
||||
|
||||
Debug(3, "Init Placebo mit API %d\n",PL_API_VER);
|
||||
Debug(3, "Init Placebo mit API %d\n", PL_API_VER);
|
||||
|
||||
p = calloc(1, sizeof(struct priv));
|
||||
if (!p)
|
||||
@ -5300,8 +5297,9 @@ void InitPlacebo()
|
||||
/// Video render thread.
|
||||
///
|
||||
|
||||
void delete_decode() {
|
||||
Debug(3,"decoder thread exit\n");
|
||||
void delete_decode()
|
||||
{
|
||||
Debug(3, "decoder thread exit\n");
|
||||
}
|
||||
|
||||
static void *VideoDisplayHandlerThread(void *dummy)
|
||||
@ -5364,7 +5362,7 @@ void exit_display()
|
||||
eglThreadContext = NULL;
|
||||
}
|
||||
#endif
|
||||
Debug(3,"display thread exit\n");
|
||||
Debug(3, "display thread exit\n");
|
||||
|
||||
}
|
||||
|
||||
@ -5379,7 +5377,7 @@ static void *VideoHandlerThread(void *dummy)
|
||||
|
||||
#ifdef GAMMA
|
||||
Init_Gamma();
|
||||
Set_Gamma(0.0,6500);
|
||||
Set_Gamma(0.0, 6500);
|
||||
#endif
|
||||
|
||||
#ifdef PLACEBO
|
||||
@ -5455,20 +5453,20 @@ static void VideoThreadExit(void)
|
||||
|
||||
// FIXME: can't cancel locked
|
||||
if (pthread_cancel(VideoThread)) {
|
||||
Debug(3,"video: can't queue cancel video display thread\n");
|
||||
Debug(3, "video: can't queue cancel video display thread\n");
|
||||
}
|
||||
usleep(200000); // 200ms
|
||||
if (pthread_join(VideoThread, &retval) || retval != PTHREAD_CANCELED) {
|
||||
Debug(3,"video: can't cancel video decoder thread\n");
|
||||
Debug(3, "video: can't cancel video decoder thread\n");
|
||||
}
|
||||
|
||||
if (VideoDisplayThread) {
|
||||
if (pthread_cancel(VideoDisplayThread)) {
|
||||
Debug(3,"video: can't queue cancel video display thread\n");
|
||||
Debug(3, "video: can't queue cancel video display thread\n");
|
||||
}
|
||||
usleep(200000); // 200ms
|
||||
if (pthread_join(VideoDisplayThread, &retval) || retval != PTHREAD_CANCELED) {
|
||||
Debug(3,"video: can't cancel video display thread\n");
|
||||
Debug(3, "video: can't cancel video display thread\n");
|
||||
}
|
||||
VideoDisplayThread = 0;
|
||||
}
|
||||
@ -5885,9 +5883,10 @@ uint8_t *VideoGrabService(int *size, int *width, int *height)
|
||||
/// @param[out] dropped dropped frames
|
||||
/// @param[out] count number of decoded frames
|
||||
///
|
||||
void VideoGetStats(VideoHwDecoder * hw_decoder, int *missed, int *duped, int *dropped, int *counter, float *frametime, int *width, int *height, int *color, int *eotf)
|
||||
void VideoGetStats(VideoHwDecoder * hw_decoder, int *missed, int *duped, int *dropped, int *counter, float *frametime,
|
||||
int *width, int *height, int *color, int *eotf)
|
||||
{
|
||||
VideoUsedModule->GetStats(hw_decoder, missed, duped, dropped, counter, frametime, width, height , color, eotf);
|
||||
VideoUsedModule->GetStats(hw_decoder, missed, duped, dropped, counter, frametime, width, height, color, eotf);
|
||||
}
|
||||
|
||||
///
|
||||
@ -6163,8 +6162,7 @@ void VideoSetDevice(const char *device)
|
||||
VideoDriverName = device;
|
||||
}
|
||||
|
||||
|
||||
void VideoSetConnector( char *c)
|
||||
void VideoSetConnector(char *c)
|
||||
{
|
||||
DRMConnector = c;
|
||||
}
|
||||
@ -6634,7 +6632,7 @@ void VideoSetStudioLevels(int onoff)
|
||||
{
|
||||
VideoStudioLevels = onoff;
|
||||
#ifdef GAMMA
|
||||
Set_Gamma(2.4,6500);
|
||||
Set_Gamma(2.4, 6500);
|
||||
#endif
|
||||
|
||||
}
|
||||
@ -6865,7 +6863,7 @@ void VideoInit(const char *display_name)
|
||||
///
|
||||
void VideoExit(void)
|
||||
{
|
||||
Debug(3,"Video Exit\n");
|
||||
Debug(3, "Video Exit\n");
|
||||
#ifndef USE_DRM
|
||||
if (!XlibDisplay) { // no init or failed
|
||||
return;
|
||||
@ -6927,7 +6925,8 @@ void VideoExit(void)
|
||||
}
|
||||
|
||||
#ifdef USE_DRM
|
||||
int GlxInitopengl () {
|
||||
int GlxInitopengl()
|
||||
{
|
||||
EGLint contextAttrs[] = {
|
||||
EGL_CONTEXT_CLIENT_VERSION, 3,
|
||||
EGL_NONE
|
||||
@ -6947,13 +6946,15 @@ int GlxInitopengl () {
|
||||
return;
|
||||
}
|
||||
|
||||
int GlxDrawopengl () {
|
||||
int GlxDrawopengl()
|
||||
{
|
||||
eglMakeCurrent(eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, eglSharedContext);
|
||||
return;
|
||||
}
|
||||
|
||||
void GlxDestroy() {
|
||||
eglDestroyContext (eglDisplay, eglOSDContext);
|
||||
void GlxDestroy()
|
||||
{
|
||||
eglDestroyContext(eglDisplay, eglOSDContext);
|
||||
eglOSDContext = NULL;
|
||||
}
|
||||
|
||||
@ -6963,24 +6964,25 @@ void GlxDestroy() {
|
||||
#include <sys/stat.h>
|
||||
extern uint8_t *CreateJpeg(uint8_t *, int *, int, int, int);
|
||||
|
||||
void makejpg(uint8_t *data, int width, int height) {
|
||||
static int count=0;
|
||||
int i,n=0,gpu=0;;
|
||||
char buf[32],FileName[32];
|
||||
void makejpg(uint8_t * data, int width, int height)
|
||||
{
|
||||
static int count = 0;
|
||||
int i, n = 0, gpu = 0;;
|
||||
char buf[32], FileName[32];
|
||||
uint8_t *rgb;
|
||||
uint8_t *jpg_image;
|
||||
int size,size1;
|
||||
int size, size1;
|
||||
|
||||
if (data == NULL) {
|
||||
data = malloc(width*height*4);
|
||||
gpu=1;
|
||||
data = malloc(width * height * 4);
|
||||
gpu = 1;
|
||||
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
|
||||
glPixelStorei(GL_PACK_ALIGNMENT, 1);
|
||||
glReadPixels(0, 0, width, height, GL_BGRA, GL_UNSIGNED_BYTE, data);
|
||||
}
|
||||
|
||||
// n = snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", width, height);
|
||||
sprintf(FileName,"/tmp/test%d.jpg",count++);
|
||||
// n = snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", width, height);
|
||||
sprintf(FileName, "/tmp/test%d.jpg", count++);
|
||||
|
||||
rgb = malloc(width * height * 3 + n);
|
||||
if (!rgb) {
|
||||
@ -7001,7 +7003,8 @@ void makejpg(uint8_t *data, int width, int height) {
|
||||
|
||||
jpg_image = CreateJpeg(rgb, &size1, 90, width, height);
|
||||
int fd = open(FileName, O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC, DEFFILEMODE);
|
||||
write(fd,jpg_image,size1);
|
||||
|
||||
write(fd, jpg_image, size1);
|
||||
close(fd);
|
||||
free(rgb);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user