virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avcodec/vorbis_data: Move encoder-related table to its only user

Browse Source 
Said table was unused in case libvorbis was disabled.

Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-01-29 00:14:09 +01:00
parent b91b04473a
commit bfdf03207b
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/libvorbisenc.c
View File

@ -70,6 +70,17 @@ static const AVClass vorbis_class = {
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
static const uint8_t vorbis_encoding_channel_layout_offsets[8][8] = {
{ 0 },
{ 0, 1 },
{ 0, 2, 1 },
{ 0, 1, 2, 3 },
{ 0, 2, 1, 3, 4 },
{ 0, 2, 1, 4, 5, 3 },
{ 0, 2, 1, 5, 6, 4, 3 },
{ 0, 2, 1, 6, 7, 4, 5, 3 },
};
static int vorbis_error_to_averror(int ov_err) static int vorbis_error_to_averror(int ov_err)
{ {
switch (ov_err) { switch (ov_err) {
@ -287,7 +298,7 @@ static int libvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
buffer = vorbis_analysis_buffer(&s->vd, samples); buffer = vorbis_analysis_buffer(&s->vd, samples);
for (c = 0; c < channels; c++) { for (c = 0; c < channels; c++) {
int co = (channels > 8) ? c : int co = (channels > 8) ? c :
ff_vorbis_encoding_channel_layout_offsets[channels - 1][c]; vorbis_encoding_channel_layout_offsets[channels - 1][c];
memcpy(buffer[c], frame->extended_data[co], memcpy(buffer[c], frame->extended_data[co],
samples * sizeof(*buffer[c])); samples * sizeof(*buffer[c]));
} }

1
libavcodec/vorbis.h
View File

@ -26,7 +26,6 @@
extern const float ff_vorbis_floor1_inverse_db_table[256]; extern const float ff_vorbis_floor1_inverse_db_table[256];
extern const float * const ff_vorbis_vwin[8]; extern const float * const ff_vorbis_vwin[8];
extern const uint8_t ff_vorbis_channel_layout_offsets[8][8]; extern const uint8_t ff_vorbis_channel_layout_offsets[8][8];
extern const uint8_t ff_vorbis_encoding_channel_layout_offsets[8][8];
extern const uint64_t ff_vorbis_channel_layouts[9]; extern const uint64_t ff_vorbis_channel_layouts[9];
typedef struct vorbis_floor1_entry { typedef struct vorbis_floor1_entry {

11
libavcodec/vorbis_data.c
View File

@ -34,17 +34,6 @@ const uint8_t ff_vorbis_channel_layout_offsets[8][8] = {
{ 0, 2, 1, 7, 5, 6, 3, 4 }, { 0, 2, 1, 7, 5, 6, 3, 4 },
}; };
const uint8_t ff_vorbis_encoding_channel_layout_offsets[8][8] = {
{ 0 },
{ 0, 1 },
{ 0, 2, 1 },
{ 0, 1, 2, 3 },
{ 0, 2, 1, 3, 4 },
{ 0, 2, 1, 4, 5, 3 },
{ 0, 2, 1, 5, 6, 4, 3 },
{ 0, 2, 1, 6, 7, 4, 5, 3 },
};
const uint64_t ff_vorbis_channel_layouts[9] = { const uint64_t ff_vorbis_channel_layouts[9] = {
AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_MONO,
AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_STEREO,