MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swr: rename swr_alloc2() to swr_alloc_set_opts().

Browse Source
This commit is contained in:
Clément Bœsch 2011-11-16 19:43:58 +01:00
parent c4deb90cfa
commit 645c61fb2b
5 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@ -891,7 +891,7 @@ need_realloc:
//ost->swr = NULL;
ost->audio_resample = 0;
} else {
ost->swr = swr_alloc2(ost->swr,
ost->swr = swr_alloc_set_opts(ost->swr,
enc->channel_layout, enc->sample_fmt, enc->sample_rate,
dec->channel_layout, dec->sample_fmt, dec->sample_rate,
ost->audio_channels_mapped ? ost->audio_channels_map : NULL,

3
ffplay.c
View File

@ -2076,7 +2076,8 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
if (dec->sample_fmt != is->audio_src_fmt || dec_channel_layout != is->audio_src_channel_layout || dec->sample_rate != is->audio_src_freq) {
if (is->swr_ctx)
swr_free(&is->swr_ctx);
is->swr_ctx = swr_alloc2(NULL, is->audio_tgt_channel_layout, is->audio_tgt_fmt, is->audio_tgt_freq,
is->swr_ctx = swr_alloc_set_opts(NULL,
is->audio_tgt_channel_layout, is->audio_tgt_fmt, is->audio_tgt_freq,
dec_channel_layout, dec->sample_fmt, dec->sample_rate,
NULL, 0, NULL);
if (!is->swr_ctx || swr_init(is->swr_ctx) < 0) {

3
libswresample/swresample.c
View File

@ -82,7 +82,8 @@ SwrContext *swr_alloc(void){
return s;
}
SwrContext *swr_alloc2(struct SwrContext *s, int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
SwrContext *swr_alloc_set_opts(struct SwrContext *s,
int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
int64_t in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate,
const int *channel_map, int log_offset, void *log_ctx){
if(!s) s= swr_alloc();

3
libswresample/swresample.h
View File

@ -55,7 +55,8 @@ int swr_init(struct SwrContext *s);
* @see swr_init(),swr_free()
* @return NULL on error
*/
struct SwrContext *swr_alloc2(struct SwrContext *s, int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
struct SwrContext *swr_alloc_set_opts(struct SwrContext *s,
int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
int64_t in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate,
const int *channel_map, int log_offset, void *log_ctx);

4
libswresample/swresample_test.c
View File

@ -130,10 +130,10 @@ int main(int argc, char **argv){
in_ch_count, out_ch_count,
in_sample_rate, out_sample_rate,
av_get_sample_fmt_name(in_sample_fmt), av_get_sample_fmt_name(out_sample_fmt));
forw_ctx = swr_alloc2(forw_ctx, out_ch_layout, out_sample_fmt+planar_out, out_sample_rate,
forw_ctx = swr_alloc_set_opts(forw_ctx, out_ch_layout, out_sample_fmt+planar_out, out_sample_rate,
in_ch_layout, in_sample_fmt+planar_in , in_sample_rate,
NULL, 0, 0);
backw_ctx = swr_alloc2(backw_ctx,in_ch_layout, in_sample_fmt, in_sample_rate,
backw_ctx = swr_alloc_set_opts(backw_ctx, in_ch_layout, in_sample_fmt, in_sample_rate,
out_ch_layout, out_sample_fmt+planar_out, out_sample_rate,
NULL, 0, 0);
if(swr_init( forw_ctx) < 0)