moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-06-16 22:01:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to support HEVC with VDPAU and software decoding

Browse Source
This commit is contained in:
Iwan Timmer
2016-03-15 18:21:01 +01:00
parent 58da4da6c3
commit feb174478c
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/video/ffmpeg.c
+20 -3
View File
@@ -23,6 +23,8 @@
#include "ffmpeg_vdpau.h" #include "ffmpeg_vdpau.h"
#endif #endif
#include "limelight-common/Limelight.h"
#include <stdlib.h> #include <stdlib.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#include <pthread.h> #include <pthread.h>
@@ -42,7 +44,7 @@ enum decoders decoder_system;
// This function must be called before // This function must be called before
// any other decoding functions // any other decoding functions
int ffmpeg_init(int width, int height, int perf_lvl, int thread_count) { int ffmpeg_init(int videoFormat, int width, int height, int perf_lvl, int thread_count) {
// Initialize the avcodec library and register codecs // Initialize the avcodec library and register codecs
av_log_set_level(AV_LOG_QUIET); av_log_set_level(AV_LOG_QUIET);
avcodec_register_all(); avcodec_register_all();
@@ -51,7 +53,15 @@ int ffmpeg_init(int width, int height, int perf_lvl, int thread_count) {
#ifdef HAVE_VDPAU #ifdef HAVE_VDPAU
if (perf_lvl & HARDWARE_ACCELERATION) { if (perf_lvl & HARDWARE_ACCELERATION) {
decoder = avcodec_find_decoder_by_name("h264_vdpau"); switch (videoFormat) {
case VIDEO_FORMAT_H264:
decoder = avcodec_find_decoder_by_name("h264_vdpau");
break;
case VIDEO_FORMAT_H265:
decoder = avcodec_find_decoder_by_name("hevc_vdpau");
break;
}
if (decoder != NULL) if (decoder != NULL)
decoder_system = VDPAU; decoder_system = VDPAU;
} }
@@ -59,7 +69,14 @@ int ffmpeg_init(int width, int height, int perf_lvl, int thread_count) {
if (decoder == NULL) { if (decoder == NULL) {
decoder_system = SOFTWARE; decoder_system = SOFTWARE;
decoder = avcodec_find_decoder_by_name("h264"); switch (videoFormat) {
case VIDEO_FORMAT_H264:
decoder = avcodec_find_decoder_by_name("h264");
break;
case VIDEO_FORMAT_H265:
decoder = avcodec_find_decoder_by_name("hevc");
break;
}
if (decoder == NULL) { if (decoder == NULL) {
printf("Couldn't find decoder\n"); printf("Couldn't find decoder\n");
return -1; return -1;
src/video/sdl.c
-5
View File
@@ -33,11 +33,6 @@
static char* ffmpeg_buffer; static char* ffmpeg_buffer;
static void sdl_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) { static void sdl_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
if (videoFormat != VIDEO_FORMAT_H264) {
fprintf(stderr, "Video format not supported\n");
exit(1);
}
int avc_flags = SLICE_THREADING; int avc_flags = SLICE_THREADING;
if (drFlags && FORCE_HARDWARE_ACCELERATION) if (drFlags && FORCE_HARDWARE_ACCELERATION)
avc_flags |= HARDWARE_ACCELERATION; avc_flags |= HARDWARE_ACCELERATION;