mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio-channel-mix: move channel mixer to audio libs

Browse source 
Move the channel mixer code to the audio library
This commit is contained in:
Wim Taymans 2015-11-06 17:39:33 +01:00
parent b8bea9d8be
commit dfa25a40fc
9 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst-libs/gst/audio/Makefile.am
View file

@ -6,6 +6,7 @@ glib_enum_headers= \
audio.h \ audio.h \
audio-format.h \ audio-format.h \
audio-channels.h \ audio-channels.h \
audio-channel-mix.h \
audio-info.h \ audio-info.h \
audio-quantize.h \ audio-quantize.h \
gstaudioringbuffer.h gstaudioringbuffer.h
@ -27,6 +28,7 @@ libgstaudio_@GST_API_VERSION@_la_SOURCES = \
audio.c \ audio.c \
audio-format.c \ audio-format.c \
audio-channels.c \ audio-channels.c \
audio-channel-mix.c \
audio-info.c \ audio-info.c \
audio-quantize.c \ audio-quantize.c \
gstaudioringbuffer.c \ gstaudioringbuffer.c \
@ -51,6 +53,7 @@ libgstaudio_@GST_API_VERSION@include_HEADERS = \
audio.h \ audio.h \
audio-format.h \ audio-format.h \
audio-channels.h \ audio-channels.h \
audio-channel-mix.h \
audio-info.h \ audio-info.h \
audio-quantize.h \ audio-quantize.h \
gstaudioringbuffer.h \ gstaudioringbuffer.h \

4
gst/audioconvert/gstchannelmix.c → gst-libs/gst/audio/audio-channel-mix.c
View file

@ -2,7 +2,7 @@
* Copyright (C) 2004 Ronald Bultje <rbultje@ronald.bitfreak.net> * Copyright (C) 2004 Ronald Bultje <rbultje@ronald.bitfreak.net>
* Copyright (C) 2008 Sebastian Dröge <slomo@circular-chaos.org> * Copyright (C) 2008 Sebastian Dröge <slomo@circular-chaos.org>
* *
* gstchannelmix.c: setup of channel conversion matrices * audio-channel-mix.c: setup of channel conversion matrices
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -27,7 +27,7 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include "gstchannelmix.h" #include "audio-channel-mix.h"
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
#define GST_CAT_DEFAULT ensure_debug_category() #define GST_CAT_DEFAULT ensure_debug_category()

2
gst/audioconvert/gstchannelmix.h → gst-libs/gst/audio/audio-channel-mix.h
View file

@ -2,7 +2,7 @@
* Copyright (C) 2004 Ronald Bultje <rbultje@ronald.bitfreak.net> * Copyright (C) 2004 Ronald Bultje <rbultje@ronald.bitfreak.net>
* (C) 2015 Wim Taymans <wim.taymans@gmail.com> * (C) 2015 Wim Taymans <wim.taymans@gmail.com>
* *
* audiochannelmix.h: setup of channel conversion matrices * audio-channel-mix.h: setup of channel conversion matrices
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

1
gst-libs/gst/audio/audio.h
View file

@ -26,6 +26,7 @@
#include <gst/audio/audio-enumtypes.h> #include <gst/audio/audio-enumtypes.h>
#include <gst/audio/audio-format.h> #include <gst/audio/audio-format.h>
#include <gst/audio/audio-channels.h> #include <gst/audio/audio-channels.h>
#include <gst/audio/audio-channel-mix.h>
#include <gst/audio/audio-info.h> #include <gst/audio/audio-info.h>
#include <gst/audio/audio-quantize.h> #include <gst/audio/audio-quantize.h>

2
gst/audioconvert/Makefile.am
View file

@ -6,7 +6,6 @@ include $(top_srcdir)/common/orc.mak
libgstaudioconvert_la_SOURCES = \ libgstaudioconvert_la_SOURCES = \
gstaudioconvert.c \ gstaudioconvert.c \
audioconvert.c \ audioconvert.c \
gstchannelmix.c \
plugin.c plugin.c
nodist_libgstaudioconvert_la_SOURCES = $(ORC_NODIST_SOURCES) nodist_libgstaudioconvert_la_SOURCES = $(ORC_NODIST_SOURCES)
@ -20,5 +19,4 @@ libgstaudioconvert_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = \ noinst_HEADERS = \
gstaudioconvert.h \ gstaudioconvert.h \
audioconvert.h \ audioconvert.h \
gstchannelmix.h \
plugin.h plugin.h

1
gst/audioconvert/audioconvert.c
View file

@ -27,7 +27,6 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include "gstchannelmix.h"
#include "audioconvert.h" #include "audioconvert.h"
#include "gstaudioconvertorc.h" #include "gstaudioconvertorc.h"

2
gst/audioconvert/audioconvert.h
View file

@ -26,8 +26,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include "gstchannelmix.h"
typedef struct _GstAudioConverter GstAudioConverter; typedef struct _GstAudioConverter GstAudioConverter;
/** /**

1
gst/audioconvert/gstaudioconvert.c
View file

@ -63,7 +63,6 @@
#include <string.h> #include <string.h>
#include "gstaudioconvert.h" #include "gstaudioconvert.h"
#include "gstchannelmix.h"
#include "plugin.h" #include "plugin.h"
GST_DEBUG_CATEGORY (audio_convert_debug); GST_DEBUG_CATEGORY (audio_convert_debug);

5
win32/common/libgstaudio.def
View file

@ -28,6 +28,11 @@ EXPORTS
gst_audio_cd_src_get_type gst_audio_cd_src_get_type
gst_audio_cd_src_mode_get_type gst_audio_cd_src_mode_get_type
gst_audio_channel_get_fallback_mask gst_audio_channel_get_fallback_mask
gst_audio_channel_mix_flags_get_type
gst_audio_channel_mix_free
gst_audio_channel_mix_is_passthrough
gst_audio_channel_mix_new
gst_audio_channel_mix_samples
gst_audio_channel_position_get_type gst_audio_channel_position_get_type
gst_audio_channel_positions_from_mask gst_audio_channel_positions_from_mask
gst_audio_channel_positions_to_mask gst_audio_channel_positions_to_mask