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

(API Change) media-io: Improve naming consistency

Browse Source 
Renamed:                        To:
-----------------------------------------------------------
audio_output_blocksize          audio_output_get_block_size
audio_output_planes             audio_output_get_planes
audio_output_channels           audio_output_get_channels
audio_output_samplerate         audio_output_get_sample_rate
audio_output_getinfo            audio_output_get_info
audio_output_createline         audio_output_create_line
video_output_getinfo            video_output_get_info
video_gettime                   video_output_get_time
video_getframetime              video_output_get_frame_time
video_output_width              video_output_get_width
video_output_height             video_output_get_height
video_output_framerate          video_output_get_frame_rate
video_output_num_skipped_frames video_output_get_skipped_frames
video_output_total_frames       video_output_get_total_frames
This commit is contained in:
jp9000
2014-08-05 15:07:54 -07:00
parent 9d300685ca
commit 42a0925ce1
12 changed files with 62 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,7 @@ static void init_sizes(struct aac_encoder *enc, audio_t audio)
const struct audio_output_info *aoi;
enum audio_format format;
aoi = audio_output_getinfo(audio);
aoi = audio_output_get_info(audio);
format = convert_ffmpeg_sample_format(enc->context->sample_fmt);
enc->audio_planes = get_audio_planes(format, aoi->speakers);
@@ -151,8 +151,8 @@ static void *aac_create(obs_data_t settings, obs_encoder_t encoder)
}
enc->context->bit_rate = bitrate * 1000;
enc->context->channels = (int)audio_output_channels(audio);
enc->context->sample_rate = audio_output_samplerate(audio);
enc->context->channels = (int)audio_output_get_channels(audio);
enc->context->sample_rate = audio_output_get_sample_rate(audio);
enc->context->sample_fmt = enc->aac->sample_fmts ?
enc->aac->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;