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

obs-ffmpeg: Normalize video frame method arguments

Browse Source
This commit is contained in:
John Bradley 2015-08-03 15:26:27 -05:00 committed by kc5nra
parent 34cc2438c1
commit 59482ec29b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/obs-ffmpeg/obs-ffmpeg-source.c
View File

@ -229,7 +229,7 @@ static bool video_frame_scale(struct ff_frame *frame,
} }
static bool video_frame_hwaccel(struct ff_frame *frame, static bool video_frame_hwaccel(struct ff_frame *frame,
obs_source_t *source, struct obs_source_frame *obs_frame) struct ffmpeg_source *s, struct obs_source_frame *obs_frame)
{ {
// 4th plane is pixelbuf reference for mac // 4th plane is pixelbuf reference for mac
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
@ -240,7 +240,7 @@ static bool video_frame_hwaccel(struct ff_frame *frame,
if (!set_obs_frame_colorprops(frame, obs_frame)) if (!set_obs_frame_colorprops(frame, obs_frame))
return false; return false;
obs_source_output_video(source, obs_frame); obs_source_output_video(s->source, obs_frame);
return true; return true;
} }
@ -286,7 +286,7 @@ static bool video_frame(struct ff_frame *frame, void *opaque)
if (s->is_forcing_scale || format == VIDEO_FORMAT_NONE) if (s->is_forcing_scale || format == VIDEO_FORMAT_NONE)
return video_frame_scale(frame, s, &obs_frame); return video_frame_scale(frame, s, &obs_frame);
else if (s->is_hw_decoding) else if (s->is_hw_decoding)
return video_frame_hwaccel(frame, s->source, &obs_frame); return video_frame_hwaccel(frame, s, &obs_frame);
else else
return video_frame_direct(frame, s, &obs_frame); return video_frame_direct(frame, s, &obs_frame);
} }