highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swr: use native planar sample formats.

Browse Source
This commit is contained in:
Clément Bœsch 2011-11-24 04:30:32 +01:00
parent 573ffbb3b5
commit 58205edcc6
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libswresample/swresample.c
View File

@ -143,10 +143,10 @@ int swr_init(struct SwrContext *s){
swri_audio_convert_free(&s->out_convert); swri_audio_convert_free(&s->out_convert);
swri_audio_convert_free(&s->full_convert); swri_audio_convert_free(&s->full_convert);
s-> in.planar= s-> in_sample_fmt >= 0x100; s-> in.planar= av_sample_fmt_is_planar(s-> in_sample_fmt);
s->out.planar= s->out_sample_fmt >= 0x100; s->out.planar= av_sample_fmt_is_planar(s->out_sample_fmt);
s-> in_sample_fmt &= 0xFF; s-> in_sample_fmt= av_get_alt_sample_fmt(s-> in_sample_fmt, 0);
s->out_sample_fmt &= 0xFF; s->out_sample_fmt= av_get_alt_sample_fmt(s->out_sample_fmt, 0);
if(s-> in_sample_fmt >= AV_SAMPLE_FMT_NB){ if(s-> in_sample_fmt >= AV_SAMPLE_FMT_NB){
av_log(s, AV_LOG_ERROR, "Requested sample format %s is invalid\n", av_get_sample_fmt_name(s->in_sample_fmt)); av_log(s, AV_LOG_ERROR, "Requested sample format %s is invalid\n", av_get_sample_fmt_name(s->in_sample_fmt));

6
libswresample/swresample.h
View File

@ -30,7 +30,7 @@
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
#define LIBSWRESAMPLE_VERSION_MAJOR 0 #define LIBSWRESAMPLE_VERSION_MAJOR 0
#define LIBSWRESAMPLE_VERSION_MINOR 4 #define LIBSWRESAMPLE_VERSION_MINOR 5
#define LIBSWRESAMPLE_VERSION_MICRO 0 #define LIBSWRESAMPLE_VERSION_MICRO 0
#define SWR_CH_MAX 16 ///< Maximum number of channels #define SWR_CH_MAX 16 ///< Maximum number of channels
@ -69,10 +69,10 @@ int swr_init(struct SwrContext *s);
* *
* @param s Swr context, can be NULL * @param s Swr context, can be NULL
* @param out_ch_layout output channel layout (AV_CH_LAYOUT_*) * @param out_ch_layout output channel layout (AV_CH_LAYOUT_*)
* @param out_sample_fmt output sample format (AV_SAMPLE_FMT_*). Use +0x100 for planar audio * @param out_sample_fmt output sample format (AV_SAMPLE_FMT_*).
* @param out_sample_rate output sample rate (frequency in Hz) * @param out_sample_rate output sample rate (frequency in Hz)
* @param in_ch_layout input channel layout (AV_CH_LAYOUT_*) * @param in_ch_layout input channel layout (AV_CH_LAYOUT_*)
* @param in_sample_fmt input sample format (AV_SAMPLE_FMT_*). Use +0x100 for planar audio * @param in_sample_fmt input sample format (AV_SAMPLE_FMT_*).
* @param in_sample_rate input sample rate (frequency in Hz) * @param in_sample_rate input sample rate (frequency in Hz)
* @param log_offset logging level offset * @param log_offset logging level offset
* @param log_ctx parent logging context, can be NULL * @param log_ctx parent logging context, can be NULL

27
libswresample/swresample_test.c
View File

@ -30,8 +30,8 @@
static double get(const uint8_t *a[], int ch, int index, int ch_count, enum AVSampleFormat f){ static double get(const uint8_t *a[], int ch, int index, int ch_count, enum AVSampleFormat f){
const uint8_t *p; const uint8_t *p;
if(f>=0x100){ if(av_sample_fmt_is_planar(f)){
f&=0xFF; f= av_get_alt_sample_fmt(f, 0);
p= a[ch]; p= a[ch];
}else{ }else{
p= a[0]; p= a[0];
@ -50,8 +50,8 @@ static double get(const uint8_t *a[], int ch, int index, int ch_count, enum AVSa
static void set(uint8_t *a[], int ch, int index, int ch_count, enum AVSampleFormat f, double v){ static void set(uint8_t *a[], int ch, int index, int ch_count, enum AVSampleFormat f, double v){
uint8_t *p; uint8_t *p;
if(f>=0x100){ if(av_sample_fmt_is_planar(f)){
f&=0xFF; f= av_get_alt_sample_fmt(f, 0);
p= a[ch]; p= a[ch];
}else{ }else{
p= a[0]; p= a[0];
@ -86,7 +86,7 @@ AV_CH_LAYOUT_7POINT1_WIDE ,
}; };
static void setup_array(uint8_t *out[SWR_CH_MAX], uint8_t *in, enum AVSampleFormat format, int samples){ static void setup_array(uint8_t *out[SWR_CH_MAX], uint8_t *in, enum AVSampleFormat format, int samples){
if(format >= 0x100){ if(av_sample_fmt_is_planar(format)){
int i; int i;
int plane_size= av_get_bytes_per_sample(format&0xFF)*samples; int plane_size= av_get_bytes_per_sample(format&0xFF)*samples;
format&=0xFF; format&=0xFF;
@ -109,7 +109,6 @@ int main(int argc, char **argv){
uint8_t *ain[SWR_CH_MAX]; uint8_t *ain[SWR_CH_MAX];
uint8_t *aout[SWR_CH_MAX]; uint8_t *aout[SWR_CH_MAX];
uint8_t *amid[SWR_CH_MAX]; uint8_t *amid[SWR_CH_MAX];
int planar_in=256, planar_out=256;
struct SwrContext * forw_ctx= NULL; struct SwrContext * forw_ctx= NULL;
struct SwrContext *backw_ctx= NULL; struct SwrContext *backw_ctx= NULL;
@ -130,11 +129,11 @@ 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_alloc_set_opts(forw_ctx, out_ch_layout, out_sample_fmt+planar_out, out_sample_rate, forw_ctx = swr_alloc_set_opts(forw_ctx, out_ch_layout, av_get_alt_sample_fmt(out_sample_fmt, 1), out_sample_rate,
in_ch_layout, in_sample_fmt+planar_in , in_sample_rate, in_ch_layout, av_get_alt_sample_fmt( in_sample_fmt, 1), in_sample_rate,
0, 0); 0, 0);
backw_ctx = swr_alloc_set_opts(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, av_get_alt_sample_fmt(out_sample_fmt, 1), out_sample_rate,
0, 0); 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");
@ -145,12 +144,12 @@ int main(int argc, char **argv){
if(!backw_ctx) if(!backw_ctx)
fprintf(stderr, "Failed to init backw_ctx\n"); fprintf(stderr, "Failed to init backw_ctx\n");
//FIXME test planar //FIXME test planar
setup_array(ain , array_in , in_sample_fmt+planar_in , SAMPLES); setup_array(ain , array_in , av_get_alt_sample_fmt( in_sample_fmt, 1), SAMPLES);
setup_array(amid, array_mid, out_sample_fmt+planar_out, 3*SAMPLES); setup_array(amid, array_mid, av_get_alt_sample_fmt(out_sample_fmt, 1), 3*SAMPLES);
setup_array(aout, array_out, in_sample_fmt , SAMPLES); setup_array(aout, array_out, in_sample_fmt , SAMPLES);
for(ch=0; ch<in_ch_count; ch++){ for(ch=0; ch<in_ch_count; ch++){
for(i=0; i<SAMPLES; i++) for(i=0; i<SAMPLES; i++)
set(ain, ch, i, in_ch_count, in_sample_fmt+planar_in, sin(i*i*3/SAMPLES)); set(ain, ch, i, in_ch_count, av_get_alt_sample_fmt(in_sample_fmt, 1), sin(i*i*3/SAMPLES));
} }
mid_count= swr_convert(forw_ctx, amid, 3*SAMPLES, ain, SAMPLES); mid_count= swr_convert(forw_ctx, amid, 3*SAMPLES, ain, SAMPLES);
out_count= swr_convert(backw_ctx,aout, SAMPLES, amid, mid_count); out_count= swr_convert(backw_ctx,aout, SAMPLES, amid, mid_count);
@ -163,7 +162,7 @@ int main(int argc, char **argv){
double sum_bb= 0; double sum_bb= 0;
double sum_ab= 0; double sum_ab= 0;
for(i=0; i<out_count; i++){ for(i=0; i<out_count; i++){
double a= get(ain , ch, i, in_ch_count, in_sample_fmt+planar_in); double a= get(ain , ch, i, in_ch_count, av_get_alt_sample_fmt(in_sample_fmt, 1));
double b= get(aout, ch, i, in_ch_count, in_sample_fmt); double b= get(aout, ch, i, in_ch_count, in_sample_fmt);
sum_a += a; sum_a += a;
sum_b += b; sum_b += b;
@ -188,7 +187,7 @@ int main(int argc, char **argv){
double sum_bb= 0; double sum_bb= 0;
double sum_ab= 0; double sum_ab= 0;
for(i=0; i<flush_count; i++){ for(i=0; i<flush_count; i++){
double a= get(ain , ch, i+out_count, in_ch_count, in_sample_fmt+planar_in); double a= get(ain , ch, i+out_count, in_ch_count, av_get_alt_sample_fmt(in_sample_fmt, 1));
double b= get(aout, ch, i, in_ch_count, in_sample_fmt); double b= get(aout, ch, i, in_ch_count, in_sample_fmt);
sum_a += a; sum_a += a;
sum_b += b; sum_b += b;