frodovdr/vdr-plugin-softhdcuvid
1
0
Fork 0
mirror of https://github.com/jojo61/vdr-plugin-softhdcuvid.git synced 2023-10-10 13:37:41 +02:00
Code Issues Releases Wiki Activity

Automatic Colorspace and HDR10 HLG corrections

Browse Source
This commit is contained in:
jojo61 2018-09-01 12:01:32 +02:00
parent 9994396cfb
commit 8f10f799ba
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
video.c
View File

@ -1551,6 +1551,9 @@ typedef struct _cuvid_decoder_
int OutputHeight; ///< real video output height int OutputHeight; ///< real video output height
enum AVPixelFormat PixFmt; ///< ffmpeg frame pixfmt enum AVPixelFormat PixFmt; ///< ffmpeg frame pixfmt
enum AVColorSpace ColorSpace; /// ffmpeg ColorSpace
enum AVColorTransferCharacteristic trc; //
enum AVColorPrimaries color_primaries;
int WrongInterlacedWarned; ///< warning about interlace flag issued int WrongInterlacedWarned; ///< warning about interlace flag issued
int Interlaced; ///< ffmpeg interlaced flag int Interlaced; ///< ffmpeg interlaced flag
int TopFieldFirst; ///< ffmpeg top field displayed first int TopFieldFirst; ///< ffmpeg top field displayed first
@ -2833,6 +2836,10 @@ Debug(3,"fmt %02d:%02d width %d:%d hight %d:%d\n,",decoder->PixFmt,video_ctx->p
int w = decoder->InputWidth; int w = decoder->InputWidth;
int h = decoder->InputHeight; int h = decoder->InputHeight;
decoder->ColorSpace = frame->colorspace; // save colorspace
decoder->trc = frame->color_trc;
decoder->color_primaries = frame->color_primaries;
surface = CuvidGetVideoSurface0(decoder); surface = CuvidGetVideoSurface0(decoder);
// copy to texture // copy to texture
@ -2960,7 +2967,7 @@ static void CuvidMixVideo(CuvidDecoder * decoder, int level)
glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0); glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0);
if (gl_prog == 0) if (gl_prog == 0)
gl_prog = sc_generate(gl_prog,vertex,fragment, decoder->InputHeight); // generate shader programm gl_prog = sc_generate(gl_prog, decoder->ColorSpace); // generate shader programm
glUseProgram(gl_prog); glUseProgram(gl_prog);
texLoc = glGetUniformLocation(gl_prog, "texture0"); texLoc = glGetUniformLocation(gl_prog, "texture0");