jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deps-libff: Fix if hw accel fails to load codec

Browse Source 
Fixes a bug where get_format was overloaded by our own version
when forcing the codec to load with a HW decoder and not
reset to the original get_format if it failed to load.
This commit is contained in:
kc5nra 2015-03-22 18:07:50 -05:00
parent 23bb999470
commit 798f38cf72
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deps/libff/libff/ff-demuxer.c vendored
View File

@ -237,6 +237,9 @@ static bool initialize_decoder(struct ff_demuxer *demuxer,
} }
} }
typedef enum AVPixelFormat (*AVGetFormatCb)(
struct AVCodecContext *s, const enum AVPixelFormat * fmt);
static bool find_decoder(struct ff_demuxer *demuxer, AVStream *stream) static bool find_decoder(struct ff_demuxer *demuxer, AVStream *stream)
{ {
AVCodecContext *codec_context = NULL; AVCodecContext *codec_context = NULL;
@ -262,12 +265,16 @@ static bool find_decoder(struct ff_demuxer *demuxer, AVStream *stream)
AVHWAccel *hwaccel = find_hwaccel_codec(codec_context); AVHWAccel *hwaccel = find_hwaccel_codec(codec_context);
if (hwaccel) { if (hwaccel) {
codec_context->opaque = hwaccel;
codec_context->get_format = get_hwaccel_format;
AVCodec *codec_vda = AVCodec *codec_vda =
avcodec_find_decoder_by_name(hwaccel->name); avcodec_find_decoder_by_name(hwaccel->name);
if (codec_vda != NULL) { if (codec_vda != NULL) {
AVGetFormatCb original_get_format =
codec_context->get_format;
codec_context->get_format = get_hwaccel_format;
codec_context->opaque = hwaccel;
ret = avcodec_open2(codec_context, codec_vda, ret = avcodec_open2(codec_context, codec_vda,
&options_dict); &options_dict);
if (ret < 0) { if (ret < 0) {
@ -275,6 +282,9 @@ static bool find_decoder(struct ff_demuxer *demuxer, AVStream *stream)
"no hardware decoder found for" "no hardware decoder found for"
" codec with id %d", " codec with id %d",
codec_context->codec_id); codec_context->codec_id);
codec_context->get_format =
original_get_format;
codec_context->opaque = NULL;
} else { } else {
codec = codec_vda; codec = codec_vda;
hwaccel_decoder = true; hwaccel_decoder = true;