early-access version 2864
This commit is contained in:
@@ -59,7 +59,7 @@ CONV_FUNC(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi -
|
||||
CONV_FUNC(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7)))
|
||||
CONV_FUNC(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S16, (*(const int16_t*)pi>>8) + 0x80)
|
||||
CONV_FUNC(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi)
|
||||
CONV_FUNC(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi * (1 << 16))
|
||||
CONV_FUNC(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi<<16)
|
||||
CONV_FUNC(AV_SAMPLE_FMT_S64, int64_t, AV_SAMPLE_FMT_S16, (uint64_t)(*(const int16_t*)pi)<<48)
|
||||
CONV_FUNC(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0f/ (1<<15)))
|
||||
CONV_FUNC(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15)))
|
||||
@@ -237,10 +237,10 @@ int swri_audio_convert(AudioConvert *ctx, AudioData *out, AudioData *in, int len
|
||||
const int ich= ctx->ch_map ? ctx->ch_map[ch] : ch;
|
||||
const int is= ich < 0 ? 0 : (in->planar ? 1 : in->ch_count) * in->bps;
|
||||
const uint8_t *pi= ich < 0 ? ctx->silence : in->ch[ich];
|
||||
uint8_t *end, *po = out->ch[ch];
|
||||
uint8_t *po= out->ch[ch];
|
||||
uint8_t *end= po + os*len;
|
||||
if(!po)
|
||||
continue;
|
||||
end = po + os * len;
|
||||
ctx->conv_f(po+off*os, pi+off*is, is, os, end);
|
||||
}
|
||||
return 0;
|
||||
|
12
externals/ffmpeg/ffmpeg/libswresample/rematrix.c
vendored
12
externals/ffmpeg/ffmpeg/libswresample/rematrix.c
vendored
@@ -88,7 +88,7 @@ static int even(int64_t layout){
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int64_t clean_layout(void *s, int64_t layout){
|
||||
static int clean_layout(void *s, int64_t layout){
|
||||
if(layout && layout != AV_CH_FRONT_CENTER && !(layout&(layout-1))) {
|
||||
char buf[128];
|
||||
av_get_channel_layout_string(buf, sizeof(buf), -1, layout);
|
||||
@@ -141,16 +141,6 @@ av_cold int swr_build_matrix(uint64_t in_ch_layout_param, uint64_t out_ch_layout
|
||||
)
|
||||
in_ch_layout = AV_CH_LAYOUT_STEREO;
|
||||
|
||||
if (in_ch_layout == AV_CH_LAYOUT_22POINT2 &&
|
||||
out_ch_layout != AV_CH_LAYOUT_22POINT2) {
|
||||
in_ch_layout = (AV_CH_LAYOUT_7POINT1_WIDE_BACK|AV_CH_BACK_CENTER);
|
||||
av_get_channel_layout_string(buf, sizeof(buf), -1, in_ch_layout);
|
||||
av_log(log_context, AV_LOG_WARNING,
|
||||
"Full-on remixing from 22.2 has not yet been implemented! "
|
||||
"Processing the input as '%s'\n",
|
||||
buf);
|
||||
}
|
||||
|
||||
if(!sane_layout(in_ch_layout)){
|
||||
av_get_channel_layout_string(buf, sizeof(buf), -1, in_ch_layout_param);
|
||||
av_log(log_context, AV_LOG_ERROR, "Input channel layout '%s' is not supported\n", buf);
|
||||
|
@@ -29,7 +29,7 @@
|
||||
#include "libavutil/avutil.h"
|
||||
|
||||
#define LIBSWRESAMPLE_VERSION_MAJOR 3
|
||||
#define LIBSWRESAMPLE_VERSION_MINOR 9
|
||||
#define LIBSWRESAMPLE_VERSION_MINOR 7
|
||||
#define LIBSWRESAMPLE_VERSION_MICRO 100
|
||||
|
||||
#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
|
||||
|
Reference in New Issue
Block a user