har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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

10
ffmpeg.c
View File

@ -891,11 +891,11 @@ need_realloc:
//ost->swr = NULL; //ost->swr = NULL;
ost->audio_resample = 0; ost->audio_resample = 0;
} else { } else {
ost->swr = swr_alloc2(ost->swr, ost->swr = swr_alloc_set_opts(ost->swr,
enc->channel_layout, enc->sample_fmt, enc->sample_rate, enc->channel_layout, enc->sample_fmt, enc->sample_rate,
dec->channel_layout, dec->sample_fmt, dec->sample_rate, dec->channel_layout, dec->sample_fmt, dec->sample_rate,
ost->audio_channels_mapped ? ost->audio_channels_map : NULL, ost->audio_channels_mapped ? ost->audio_channels_map : NULL,
0, NULL); 0, NULL);
av_opt_set_double(ost->swr, "rmvol", ost->rematrix_volume, 0); av_opt_set_double(ost->swr, "rmvol", ost->rematrix_volume, 0);
if (ost->audio_channels_mapped) { if (ost->audio_channels_mapped) {
av_opt_set_int(ost->swr, "icl", av_get_default_channel_layout(ost->audio_channels_mapped), 0); av_opt_set_int(ost->swr, "icl", av_get_default_channel_layout(ost->audio_channels_mapped), 0);

7
ffplay.c
View File

@ -2076,9 +2076,10 @@ 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 (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) if (is->swr_ctx)
swr_free(&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,
dec_channel_layout, dec->sample_fmt, dec->sample_rate, is->audio_tgt_channel_layout, is->audio_tgt_fmt, is->audio_tgt_freq,
NULL, 0, NULL); dec_channel_layout, dec->sample_fmt, dec->sample_rate,
NULL, 0, NULL);
if (!is->swr_ctx || swr_init(is->swr_ctx) < 0) { if (!is->swr_ctx || swr_init(is->swr_ctx) < 0) {
fprintf(stderr, "Cannot create sample rate converter for conversion of %d Hz %s %d channels to %d Hz %s %d channels!\n", fprintf(stderr, "Cannot create sample rate converter for conversion of %d Hz %s %d channels to %d Hz %s %d channels!\n",
dec->sample_rate, dec->sample_rate,

7
libswresample/swresample.c
View File

@ -82,9 +82,10 @@ SwrContext *swr_alloc(void){
return s; 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 in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate, int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
const int *channel_map, int log_offset, void *log_ctx){ 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(); if(!s) s= swr_alloc();
if(!s) return NULL; if(!s) return NULL;

7
libswresample/swresample.h
View File

@ -55,9 +55,10 @@ int swr_init(struct SwrContext *s);
* @see swr_init(),swr_free() * @see swr_init(),swr_free()
* @return NULL on error * @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 in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate, int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
const int *channel_map, int log_offset, void *log_ctx); int64_t in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate,
const int *channel_map, int log_offset, void *log_ctx);
/** /**
* Free the given SwrContext. * Free the given SwrContext.

12
libswresample/swresample_test.c
View File

@ -130,12 +130,12 @@ int main(int argc, char **argv){
in_ch_count, out_ch_count, in_ch_count, out_ch_count,
in_sample_rate, out_sample_rate, in_sample_rate, out_sample_rate,
av_get_sample_fmt_name(in_sample_fmt), av_get_sample_fmt_name(out_sample_fmt)); 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, in_ch_layout, in_sample_fmt+planar_in , in_sample_rate,
NULL, 0, 0); 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, out_ch_layout, out_sample_fmt+planar_out, out_sample_rate,
NULL, 0, 0); NULL, 0, 0);
if(swr_init( forw_ctx) < 0) if(swr_init( forw_ctx) < 0)
fprintf(stderr, "swr_init(->) failed\n"); fprintf(stderr, "swr_init(->) failed\n");
if(swr_init(backw_ctx) < 0) if(swr_init(backw_ctx) < 0)