configure.ac: Check for wavpack version and define WAVPACK_OLD_API if necessary.
Original commit message from CVS:
Patch by: Sebastian Dröge <slomo at circular-chaos.org>
* configure.ac:
Check for wavpack version and define WAVPACK_OLD_API if
necessary.
* ext/wavpack/Makefile.am:
* ext/wavpack/gstwavpackcommon.c: (gst_wavpack_read_header),
(gst_wavpack_read_metadata):
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_base_init),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_init),
(gst_wavpack_dec_finalize), (gst_wavpack_dec_format_samples),
(gst_wavpack_dec_clip_outgoing_buffer), (gst_wavpack_dec_chain),
(gst_wavpack_dec_sink_event), (gst_wavpack_dec_change_state),
(gst_wavpack_dec_request_new_pad), (gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_class_init),
(gst_wavpack_enc_init), (gst_wavpack_enc_finalize),
(gst_wavpack_enc_set_wp_config):
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_base_init),
(gst_wavpack_parse_finalize), (gst_wavpack_parse_class_init),
(gst_wavpack_parse_index_get_entry_from_sample),
(gst_wavpack_parse_scan_to_find_sample),
(gst_wavpack_parse_handle_seek_event),
(gst_wavpack_parse_create_src_pad):
* ext/wavpack/gstwavpackstreamreader.c:
* ext/wavpack/gstwavpackstreamreader.h:
Port to new/official wavpack API, don't use API that was exported
in wavpack header files and in the lib but meant to be private, at
least not for recent wavpack versions; misc. 'cleanups' (#347443).
2006-07-18 14:08:06 +00:00
|
|
|
/* GStreamer Wavpack plugin
|
|
|
|
* Copyright (c) 2005 Arwed v. Merkatz <v.merkatz@gmx.net>
|
|
|
|
* Copyright (c) 1998 - 2005 Conifer Software
|
|
|
|
* Copyright (c) 2006 Sebastian Dröge <slomo@circular-chaos.org>
|
|
|
|
*
|
|
|
|
* gstwavpackcommon.c: common helper functions
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
ext/wavpack/: put back wavpack - still needs porting
Original commit message from CVS:
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_link),
(gst_wavpack_dec_wvclink), (gst_wavpack_dec_get_type),
(gst_wavpack_dec_base_init), (gst_wavpack_dec_dispose),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_src_query),
(gst_wavpack_dec_init), (gst_wavpack_dec_setup_context),
(gst_wavpack_dec_format_samples), (gst_wavpack_dec_loop),
(gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_get_type),
(gst_wavpack_parse_base_init), (gst_wavpack_parse_dispose),
(gst_wavpack_parse_class_init), (gst_wavpack_parse_src_query),
(gst_wavpack_parse_src_event), (find_header), (find_sample),
(gst_wavpack_parse_seek), (gst_wavpack_parse_init),
(gst_wavpack_parse_handle_event), (gst_wavpack_parse_loop),
(gst_wavpack_parse_change_state), (gst_wavpack_parse_plugin_init):
* ext/wavpack/gstwavpackparse.h:
put back wavpack - still needs porting
2005-11-25 18:15:51 +00:00
|
|
|
#include "gstwavpackcommon.h"
|
|
|
|
#include <string.h>
|
|
|
|
|
ext/wavpack/: Add support for encoding, parsing and decoding multichannel files with up to 8 channels. This also impr...
Original commit message from CVS:
* ext/wavpack/gstwavpackcommon.c:
(gst_wavpack_get_default_channel_mask),
(gst_wavpack_set_channel_layout),
(gst_wavpack_get_default_channel_positions),
(gst_wavpack_get_channel_mask_from_positions),
(gst_wavpack_set_channel_mapping):
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_reset),
(gst_wavpack_dec_sink_set_caps), (gst_wavpack_dec_chain):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_reset),
(gst_wavpack_enc_init), (gst_wavpack_enc_sink_set_caps),
(gst_wavpack_enc_set_wp_config), (gst_wavpack_enc_push_block),
(gst_wavpack_enc_fix_channel_order), (gst_wavpack_enc_chain),
(gst_wavpack_enc_rewrite_first_block),
(gst_wavpack_enc_sink_event):
* ext/wavpack/gstwavpackenc.h:
* ext/wavpack/gstwavpackparse.c:
(gst_wavpack_parse_index_append_entry), (gst_wavpack_parse_reset),
(gst_wavpack_parse_scan_to_find_sample),
(gst_wavpack_parse_sink_event), (gst_wavpack_parse_create_src_pad),
(gst_wavpack_parse_push_buffer), (gst_wavpack_parse_loop):
* ext/wavpack/gstwavpackparse.h:
Add support for encoding, parsing and decoding multichannel
files with up to 8 channels. This also improves the robustness
of parsing quite a bit.
* ext/wavpack/gstwavpackstreamreader.c:
(gst_wavpack_stream_reader_read_bytes),
(gst_wavpack_stream_reader_get_pos),
(gst_wavpack_stream_reader_set_pos_abs),
(gst_wavpack_stream_reader_set_pos_rel),
(gst_wavpack_stream_reader_push_back_byte),
(gst_wavpack_stream_reader_get_length),
(gst_wavpack_stream_reader_can_seek),
(gst_wavpack_stream_reader_write_bytes):
Improve debugging.
2007-11-20 13:08:45 +00:00
|
|
|
#include <gst/gst.h>
|
|
|
|
#include <gst/audio/multichannel.h>
|
|
|
|
|
2007-03-07 12:07:07 +00:00
|
|
|
GST_DEBUG_CATEGORY_EXTERN (wavpack_debug);
|
|
|
|
#define GST_CAT_DEFAULT wavpack_debug
|
|
|
|
|
ext/wavpack/: put back wavpack - still needs porting
Original commit message from CVS:
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_link),
(gst_wavpack_dec_wvclink), (gst_wavpack_dec_get_type),
(gst_wavpack_dec_base_init), (gst_wavpack_dec_dispose),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_src_query),
(gst_wavpack_dec_init), (gst_wavpack_dec_setup_context),
(gst_wavpack_dec_format_samples), (gst_wavpack_dec_loop),
(gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_get_type),
(gst_wavpack_parse_base_init), (gst_wavpack_parse_dispose),
(gst_wavpack_parse_class_init), (gst_wavpack_parse_src_query),
(gst_wavpack_parse_src_event), (find_header), (find_sample),
(gst_wavpack_parse_seek), (gst_wavpack_parse_init),
(gst_wavpack_parse_handle_event), (gst_wavpack_parse_loop),
(gst_wavpack_parse_change_state), (gst_wavpack_parse_plugin_init):
* ext/wavpack/gstwavpackparse.h:
put back wavpack - still needs porting
2005-11-25 18:15:51 +00:00
|
|
|
gboolean
|
|
|
|
gst_wavpack_read_header (WavpackHeader * header, guint8 * buf)
|
|
|
|
{
|
|
|
|
g_memmove (header, buf, sizeof (WavpackHeader));
|
configure.ac: Check for wavpack version and define WAVPACK_OLD_API if necessary.
Original commit message from CVS:
Patch by: Sebastian Dröge <slomo at circular-chaos.org>
* configure.ac:
Check for wavpack version and define WAVPACK_OLD_API if
necessary.
* ext/wavpack/Makefile.am:
* ext/wavpack/gstwavpackcommon.c: (gst_wavpack_read_header),
(gst_wavpack_read_metadata):
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_base_init),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_init),
(gst_wavpack_dec_finalize), (gst_wavpack_dec_format_samples),
(gst_wavpack_dec_clip_outgoing_buffer), (gst_wavpack_dec_chain),
(gst_wavpack_dec_sink_event), (gst_wavpack_dec_change_state),
(gst_wavpack_dec_request_new_pad), (gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_class_init),
(gst_wavpack_enc_init), (gst_wavpack_enc_finalize),
(gst_wavpack_enc_set_wp_config):
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_base_init),
(gst_wavpack_parse_finalize), (gst_wavpack_parse_class_init),
(gst_wavpack_parse_index_get_entry_from_sample),
(gst_wavpack_parse_scan_to_find_sample),
(gst_wavpack_parse_handle_seek_event),
(gst_wavpack_parse_create_src_pad):
* ext/wavpack/gstwavpackstreamreader.c:
* ext/wavpack/gstwavpackstreamreader.h:
Port to new/official wavpack API, don't use API that was exported
in wavpack header files and in the lib but meant to be private, at
least not for recent wavpack versions; misc. 'cleanups' (#347443).
2006-07-18 14:08:06 +00:00
|
|
|
|
|
|
|
#ifndef WAVPACK_OLD_API
|
2010-03-19 23:54:14 +00:00
|
|
|
WavpackLittleEndianToNative (header, (char *) WavpackHeaderFormat);
|
configure.ac: Check for wavpack version and define WAVPACK_OLD_API if necessary.
Original commit message from CVS:
Patch by: Sebastian Dröge <slomo at circular-chaos.org>
* configure.ac:
Check for wavpack version and define WAVPACK_OLD_API if
necessary.
* ext/wavpack/Makefile.am:
* ext/wavpack/gstwavpackcommon.c: (gst_wavpack_read_header),
(gst_wavpack_read_metadata):
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_base_init),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_init),
(gst_wavpack_dec_finalize), (gst_wavpack_dec_format_samples),
(gst_wavpack_dec_clip_outgoing_buffer), (gst_wavpack_dec_chain),
(gst_wavpack_dec_sink_event), (gst_wavpack_dec_change_state),
(gst_wavpack_dec_request_new_pad), (gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_class_init),
(gst_wavpack_enc_init), (gst_wavpack_enc_finalize),
(gst_wavpack_enc_set_wp_config):
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_base_init),
(gst_wavpack_parse_finalize), (gst_wavpack_parse_class_init),
(gst_wavpack_parse_index_get_entry_from_sample),
(gst_wavpack_parse_scan_to_find_sample),
(gst_wavpack_parse_handle_seek_event),
(gst_wavpack_parse_create_src_pad):
* ext/wavpack/gstwavpackstreamreader.c:
* ext/wavpack/gstwavpackstreamreader.h:
Port to new/official wavpack API, don't use API that was exported
in wavpack header files and in the lib but meant to be private, at
least not for recent wavpack versions; misc. 'cleanups' (#347443).
2006-07-18 14:08:06 +00:00
|
|
|
#else
|
ext/wavpack/: put back wavpack - still needs porting
Original commit message from CVS:
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_link),
(gst_wavpack_dec_wvclink), (gst_wavpack_dec_get_type),
(gst_wavpack_dec_base_init), (gst_wavpack_dec_dispose),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_src_query),
(gst_wavpack_dec_init), (gst_wavpack_dec_setup_context),
(gst_wavpack_dec_format_samples), (gst_wavpack_dec_loop),
(gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_get_type),
(gst_wavpack_parse_base_init), (gst_wavpack_parse_dispose),
(gst_wavpack_parse_class_init), (gst_wavpack_parse_src_query),
(gst_wavpack_parse_src_event), (find_header), (find_sample),
(gst_wavpack_parse_seek), (gst_wavpack_parse_init),
(gst_wavpack_parse_handle_event), (gst_wavpack_parse_loop),
(gst_wavpack_parse_change_state), (gst_wavpack_parse_plugin_init):
* ext/wavpack/gstwavpackparse.h:
put back wavpack - still needs porting
2005-11-25 18:15:51 +00:00
|
|
|
little_endian_to_native (header, WavpackHeaderFormat);
|
configure.ac: Check for wavpack version and define WAVPACK_OLD_API if necessary.
Original commit message from CVS:
Patch by: Sebastian Dröge <slomo at circular-chaos.org>
* configure.ac:
Check for wavpack version and define WAVPACK_OLD_API if
necessary.
* ext/wavpack/Makefile.am:
* ext/wavpack/gstwavpackcommon.c: (gst_wavpack_read_header),
(gst_wavpack_read_metadata):
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_base_init),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_init),
(gst_wavpack_dec_finalize), (gst_wavpack_dec_format_samples),
(gst_wavpack_dec_clip_outgoing_buffer), (gst_wavpack_dec_chain),
(gst_wavpack_dec_sink_event), (gst_wavpack_dec_change_state),
(gst_wavpack_dec_request_new_pad), (gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_class_init),
(gst_wavpack_enc_init), (gst_wavpack_enc_finalize),
(gst_wavpack_enc_set_wp_config):
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_base_init),
(gst_wavpack_parse_finalize), (gst_wavpack_parse_class_init),
(gst_wavpack_parse_index_get_entry_from_sample),
(gst_wavpack_parse_scan_to_find_sample),
(gst_wavpack_parse_handle_seek_event),
(gst_wavpack_parse_create_src_pad):
* ext/wavpack/gstwavpackstreamreader.c:
* ext/wavpack/gstwavpackstreamreader.h:
Port to new/official wavpack API, don't use API that was exported
in wavpack header files and in the lib but meant to be private, at
least not for recent wavpack versions; misc. 'cleanups' (#347443).
2006-07-18 14:08:06 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
return (memcmp (header->ckID, "wvpk", 4) == 0);
|
|
|
|
}
|
ext/wavpack/: put back wavpack - still needs porting
Original commit message from CVS:
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_link),
(gst_wavpack_dec_wvclink), (gst_wavpack_dec_get_type),
(gst_wavpack_dec_base_init), (gst_wavpack_dec_dispose),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_src_query),
(gst_wavpack_dec_init), (gst_wavpack_dec_setup_context),
(gst_wavpack_dec_format_samples), (gst_wavpack_dec_loop),
(gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_get_type),
(gst_wavpack_parse_base_init), (gst_wavpack_parse_dispose),
(gst_wavpack_parse_class_init), (gst_wavpack_parse_src_query),
(gst_wavpack_parse_src_event), (find_header), (find_sample),
(gst_wavpack_parse_seek), (gst_wavpack_parse_init),
(gst_wavpack_parse_handle_event), (gst_wavpack_parse_loop),
(gst_wavpack_parse_change_state), (gst_wavpack_parse_plugin_init):
* ext/wavpack/gstwavpackparse.h:
put back wavpack - still needs porting
2005-11-25 18:15:51 +00:00
|
|
|
|
configure.ac: Check for wavpack version and define WAVPACK_OLD_API if necessary.
Original commit message from CVS:
Patch by: Sebastian Dröge <slomo at circular-chaos.org>
* configure.ac:
Check for wavpack version and define WAVPACK_OLD_API if
necessary.
* ext/wavpack/Makefile.am:
* ext/wavpack/gstwavpackcommon.c: (gst_wavpack_read_header),
(gst_wavpack_read_metadata):
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_base_init),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_init),
(gst_wavpack_dec_finalize), (gst_wavpack_dec_format_samples),
(gst_wavpack_dec_clip_outgoing_buffer), (gst_wavpack_dec_chain),
(gst_wavpack_dec_sink_event), (gst_wavpack_dec_change_state),
(gst_wavpack_dec_request_new_pad), (gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_class_init),
(gst_wavpack_enc_init), (gst_wavpack_enc_finalize),
(gst_wavpack_enc_set_wp_config):
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_base_init),
(gst_wavpack_parse_finalize), (gst_wavpack_parse_class_init),
(gst_wavpack_parse_index_get_entry_from_sample),
(gst_wavpack_parse_scan_to_find_sample),
(gst_wavpack_parse_handle_seek_event),
(gst_wavpack_parse_create_src_pad):
* ext/wavpack/gstwavpackstreamreader.c:
* ext/wavpack/gstwavpackstreamreader.h:
Port to new/official wavpack API, don't use API that was exported
in wavpack header files and in the lib but meant to be private, at
least not for recent wavpack versions; misc. 'cleanups' (#347443).
2006-07-18 14:08:06 +00:00
|
|
|
/* inspired by the original one in wavpack */
|
|
|
|
gboolean
|
|
|
|
gst_wavpack_read_metadata (GstWavpackMetadata * wpmd, guint8 * header_data,
|
|
|
|
guint8 ** p_data)
|
|
|
|
{
|
|
|
|
WavpackHeader hdr;
|
|
|
|
guint8 *end;
|
|
|
|
|
|
|
|
gst_wavpack_read_header (&hdr, header_data);
|
|
|
|
end = header_data + hdr.ckSize + 8;
|
|
|
|
|
|
|
|
if (end - *p_data < 2)
|
ext/wavpack/: put back wavpack - still needs porting
Original commit message from CVS:
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_link),
(gst_wavpack_dec_wvclink), (gst_wavpack_dec_get_type),
(gst_wavpack_dec_base_init), (gst_wavpack_dec_dispose),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_src_query),
(gst_wavpack_dec_init), (gst_wavpack_dec_setup_context),
(gst_wavpack_dec_format_samples), (gst_wavpack_dec_loop),
(gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_get_type),
(gst_wavpack_parse_base_init), (gst_wavpack_parse_dispose),
(gst_wavpack_parse_class_init), (gst_wavpack_parse_src_query),
(gst_wavpack_parse_src_event), (find_header), (find_sample),
(gst_wavpack_parse_seek), (gst_wavpack_parse_init),
(gst_wavpack_parse_handle_event), (gst_wavpack_parse_loop),
(gst_wavpack_parse_change_state), (gst_wavpack_parse_plugin_init):
* ext/wavpack/gstwavpackparse.h:
put back wavpack - still needs porting
2005-11-25 18:15:51 +00:00
|
|
|
return FALSE;
|
configure.ac: Check for wavpack version and define WAVPACK_OLD_API if necessary.
Original commit message from CVS:
Patch by: Sebastian Dröge <slomo at circular-chaos.org>
* configure.ac:
Check for wavpack version and define WAVPACK_OLD_API if
necessary.
* ext/wavpack/Makefile.am:
* ext/wavpack/gstwavpackcommon.c: (gst_wavpack_read_header),
(gst_wavpack_read_metadata):
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_base_init),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_init),
(gst_wavpack_dec_finalize), (gst_wavpack_dec_format_samples),
(gst_wavpack_dec_clip_outgoing_buffer), (gst_wavpack_dec_chain),
(gst_wavpack_dec_sink_event), (gst_wavpack_dec_change_state),
(gst_wavpack_dec_request_new_pad), (gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_class_init),
(gst_wavpack_enc_init), (gst_wavpack_enc_finalize),
(gst_wavpack_enc_set_wp_config):
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_base_init),
(gst_wavpack_parse_finalize), (gst_wavpack_parse_class_init),
(gst_wavpack_parse_index_get_entry_from_sample),
(gst_wavpack_parse_scan_to_find_sample),
(gst_wavpack_parse_handle_seek_event),
(gst_wavpack_parse_create_src_pad):
* ext/wavpack/gstwavpackstreamreader.c:
* ext/wavpack/gstwavpackstreamreader.h:
Port to new/official wavpack API, don't use API that was exported
in wavpack header files and in the lib but meant to be private, at
least not for recent wavpack versions; misc. 'cleanups' (#347443).
2006-07-18 14:08:06 +00:00
|
|
|
|
|
|
|
wpmd->id = GST_READ_UINT8 (*p_data);
|
|
|
|
wpmd->byte_length = 2 * (guint) GST_READ_UINT8 (*p_data + 1);
|
|
|
|
|
|
|
|
*p_data += 2;
|
|
|
|
|
|
|
|
if ((wpmd->id & ID_LARGE) == ID_LARGE) {
|
|
|
|
guint extra;
|
|
|
|
|
|
|
|
wpmd->id &= ~ID_LARGE;
|
|
|
|
|
|
|
|
if (end - *p_data < 2)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
extra = GST_READ_UINT16_LE (*p_data);
|
|
|
|
wpmd->byte_length += (extra << 9);
|
|
|
|
*p_data += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((wpmd->id & ID_ODD_SIZE) == ID_ODD_SIZE) {
|
|
|
|
wpmd->id &= ~ID_ODD_SIZE;
|
|
|
|
--wpmd->byte_length;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpmd->byte_length > 0) {
|
|
|
|
if (end - *p_data < wpmd->byte_length + (wpmd->byte_length & 1)) {
|
|
|
|
wpmd->data = NULL;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpmd->data = *p_data;
|
|
|
|
*p_data += wpmd->byte_length + (wpmd->byte_length & 1);
|
|
|
|
} else {
|
|
|
|
wpmd->data = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
ext/wavpack/: put back wavpack - still needs porting
Original commit message from CVS:
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_link),
(gst_wavpack_dec_wvclink), (gst_wavpack_dec_get_type),
(gst_wavpack_dec_base_init), (gst_wavpack_dec_dispose),
(gst_wavpack_dec_class_init), (gst_wavpack_dec_src_query),
(gst_wavpack_dec_init), (gst_wavpack_dec_setup_context),
(gst_wavpack_dec_format_samples), (gst_wavpack_dec_loop),
(gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_get_type),
(gst_wavpack_parse_base_init), (gst_wavpack_parse_dispose),
(gst_wavpack_parse_class_init), (gst_wavpack_parse_src_query),
(gst_wavpack_parse_src_event), (find_header), (find_sample),
(gst_wavpack_parse_seek), (gst_wavpack_parse_init),
(gst_wavpack_parse_handle_event), (gst_wavpack_parse_loop),
(gst_wavpack_parse_change_state), (gst_wavpack_parse_plugin_init):
* ext/wavpack/gstwavpackparse.h:
put back wavpack - still needs porting
2005-11-25 18:15:51 +00:00
|
|
|
}
|
ext/wavpack/: Add support for encoding, parsing and decoding multichannel files with up to 8 channels. This also impr...
Original commit message from CVS:
* ext/wavpack/gstwavpackcommon.c:
(gst_wavpack_get_default_channel_mask),
(gst_wavpack_set_channel_layout),
(gst_wavpack_get_default_channel_positions),
(gst_wavpack_get_channel_mask_from_positions),
(gst_wavpack_set_channel_mapping):
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_reset),
(gst_wavpack_dec_sink_set_caps), (gst_wavpack_dec_chain):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_reset),
(gst_wavpack_enc_init), (gst_wavpack_enc_sink_set_caps),
(gst_wavpack_enc_set_wp_config), (gst_wavpack_enc_push_block),
(gst_wavpack_enc_fix_channel_order), (gst_wavpack_enc_chain),
(gst_wavpack_enc_rewrite_first_block),
(gst_wavpack_enc_sink_event):
* ext/wavpack/gstwavpackenc.h:
* ext/wavpack/gstwavpackparse.c:
(gst_wavpack_parse_index_append_entry), (gst_wavpack_parse_reset),
(gst_wavpack_parse_scan_to_find_sample),
(gst_wavpack_parse_sink_event), (gst_wavpack_parse_create_src_pad),
(gst_wavpack_parse_push_buffer), (gst_wavpack_parse_loop):
* ext/wavpack/gstwavpackparse.h:
Add support for encoding, parsing and decoding multichannel
files with up to 8 channels. This also improves the robustness
of parsing quite a bit.
* ext/wavpack/gstwavpackstreamreader.c:
(gst_wavpack_stream_reader_read_bytes),
(gst_wavpack_stream_reader_get_pos),
(gst_wavpack_stream_reader_set_pos_abs),
(gst_wavpack_stream_reader_set_pos_rel),
(gst_wavpack_stream_reader_push_back_byte),
(gst_wavpack_stream_reader_get_length),
(gst_wavpack_stream_reader_can_seek),
(gst_wavpack_stream_reader_write_bytes):
Improve debugging.
2007-11-20 13:08:45 +00:00
|
|
|
|
|
|
|
gint
|
|
|
|
gst_wavpack_get_default_channel_mask (gint nchannels)
|
|
|
|
{
|
|
|
|
gint channel_mask = 0;
|
|
|
|
|
|
|
|
/* Set the default channel mask for the given number of channels.
|
|
|
|
* It's the same as for WAVE_FORMAT_EXTENDED:
|
|
|
|
* http://www.microsoft.com/whdc/device/audio/multichaud.mspx
|
|
|
|
*/
|
|
|
|
switch (nchannels) {
|
|
|
|
case 11:
|
|
|
|
channel_mask |= 0x00400;
|
|
|
|
channel_mask |= 0x00200;
|
|
|
|
case 9:
|
|
|
|
channel_mask |= 0x00100;
|
|
|
|
case 8:
|
|
|
|
channel_mask |= 0x00080;
|
|
|
|
channel_mask |= 0x00040;
|
|
|
|
case 6:
|
|
|
|
channel_mask |= 0x00020;
|
|
|
|
channel_mask |= 0x00010;
|
|
|
|
case 4:
|
|
|
|
channel_mask |= 0x00008;
|
|
|
|
case 3:
|
|
|
|
channel_mask |= 0x00004;
|
|
|
|
case 2:
|
|
|
|
channel_mask |= 0x00002;
|
|
|
|
channel_mask |= 0x00001;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
/* For mono use front center */
|
|
|
|
channel_mask |= 0x00004;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return channel_mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct
|
|
|
|
{
|
|
|
|
const guint32 ms_mask;
|
|
|
|
const GstAudioChannelPosition gst_pos;
|
|
|
|
} layout_mapping[] = {
|
|
|
|
{
|
|
|
|
0x00001, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT}, {
|
|
|
|
0x00002, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, {
|
|
|
|
0x00004, GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}, {
|
|
|
|
0x00008, GST_AUDIO_CHANNEL_POSITION_LFE}, {
|
|
|
|
0x00010, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT}, {
|
|
|
|
0x00020, GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, {
|
|
|
|
0x00040, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER}, {
|
|
|
|
0x00080, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, {
|
|
|
|
0x00100, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}, {
|
|
|
|
0x00200, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT}, {
|
|
|
|
0x00400, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}, {
|
|
|
|
0x00800, GST_AUDIO_CHANNEL_POSITION_INVALID}, /* TOP_CENTER */
|
|
|
|
{
|
|
|
|
0x01000, GST_AUDIO_CHANNEL_POSITION_INVALID}, /* TOP_FRONT_LEFT */
|
|
|
|
{
|
|
|
|
0x02000, GST_AUDIO_CHANNEL_POSITION_INVALID}, /* TOP_FRONT_CENTER */
|
|
|
|
{
|
|
|
|
0x04000, GST_AUDIO_CHANNEL_POSITION_INVALID}, /* TOP_FRONT_RIGHT */
|
|
|
|
{
|
|
|
|
0x08000, GST_AUDIO_CHANNEL_POSITION_INVALID}, /* TOP_BACK_LEFT */
|
|
|
|
{
|
|
|
|
0x10000, GST_AUDIO_CHANNEL_POSITION_INVALID}, /* TOP_BACK_CENTER */
|
|
|
|
{
|
|
|
|
0x20000, GST_AUDIO_CHANNEL_POSITION_INVALID} /* TOP_BACK_RIGHT */
|
|
|
|
};
|
|
|
|
|
|
|
|
#define MAX_CHANNEL_POSITIONS G_N_ELEMENTS (layout_mapping)
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
gst_wavpack_set_channel_layout (GstCaps * caps, gint layout)
|
|
|
|
{
|
|
|
|
GstAudioChannelPosition pos[MAX_CHANNEL_POSITIONS];
|
|
|
|
GstStructure *s;
|
|
|
|
gint num_channels, i, p;
|
|
|
|
|
|
|
|
s = gst_caps_get_structure (caps, 0);
|
|
|
|
if (!gst_structure_get_int (s, "channels", &num_channels))
|
|
|
|
g_return_val_if_reached (FALSE);
|
|
|
|
|
|
|
|
if (num_channels == 1 && layout == 0x00004) {
|
|
|
|
pos[0] = GST_AUDIO_CHANNEL_POSITION_FRONT_MONO;
|
2007-11-20 13:14:40 +00:00
|
|
|
gst_audio_set_channel_positions (s, pos);
|
ext/wavpack/: Add support for encoding, parsing and decoding multichannel files with up to 8 channels. This also impr...
Original commit message from CVS:
* ext/wavpack/gstwavpackcommon.c:
(gst_wavpack_get_default_channel_mask),
(gst_wavpack_set_channel_layout),
(gst_wavpack_get_default_channel_positions),
(gst_wavpack_get_channel_mask_from_positions),
(gst_wavpack_set_channel_mapping):
* ext/wavpack/gstwavpackcommon.h:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_reset),
(gst_wavpack_dec_sink_set_caps), (gst_wavpack_dec_chain):
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_reset),
(gst_wavpack_enc_init), (gst_wavpack_enc_sink_set_caps),
(gst_wavpack_enc_set_wp_config), (gst_wavpack_enc_push_block),
(gst_wavpack_enc_fix_channel_order), (gst_wavpack_enc_chain),
(gst_wavpack_enc_rewrite_first_block),
(gst_wavpack_enc_sink_event):
* ext/wavpack/gstwavpackenc.h:
* ext/wavpack/gstwavpackparse.c:
(gst_wavpack_parse_index_append_entry), (gst_wavpack_parse_reset),
(gst_wavpack_parse_scan_to_find_sample),
(gst_wavpack_parse_sink_event), (gst_wavpack_parse_create_src_pad),
(gst_wavpack_parse_push_buffer), (gst_wavpack_parse_loop):
* ext/wavpack/gstwavpackparse.h:
Add support for encoding, parsing and decoding multichannel
files with up to 8 channels. This also improves the robustness
of parsing quite a bit.
* ext/wavpack/gstwavpackstreamreader.c:
(gst_wavpack_stream_reader_read_bytes),
(gst_wavpack_stream_reader_get_pos),
(gst_wavpack_stream_reader_set_pos_abs),
(gst_wavpack_stream_reader_set_pos_rel),
(gst_wavpack_stream_reader_push_back_byte),
(gst_wavpack_stream_reader_get_length),
(gst_wavpack_stream_reader_can_seek),
(gst_wavpack_stream_reader_write_bytes):
Improve debugging.
2007-11-20 13:08:45 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = 0;
|
|
|
|
for (i = 0; i < MAX_CHANNEL_POSITIONS; ++i) {
|
|
|
|
if ((layout & layout_mapping[i].ms_mask) != 0) {
|
|
|
|
if (p >= num_channels) {
|
|
|
|
GST_WARNING ("More bits set in the channel layout map than there "
|
|
|
|
"are channels! Broken file");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
if (layout_mapping[i].gst_pos == GST_AUDIO_CHANNEL_POSITION_INVALID) {
|
|
|
|
GST_WARNING ("Unsupported channel position (mask 0x%08x) in channel "
|
|
|
|
"layout map - ignoring those channels", layout_mapping[i].ms_mask);
|
|
|
|
/* what to do? just ignore it and let downstream deal with a channel
|
|
|
|
* layout that has INVALID positions in it for now ... */
|
|
|
|
}
|
|
|
|
pos[p] = layout_mapping[i].gst_pos;
|
|
|
|
++p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p != num_channels) {
|
|
|
|
GST_WARNING ("Only %d bits set in the channel layout map, but there are "
|
|
|
|
"supposed to be %d channels! Broken file", p, num_channels);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
gst_audio_set_channel_positions (s, pos);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
GstAudioChannelPosition *
|
|
|
|
gst_wavpack_get_default_channel_positions (gint nchannels)
|
|
|
|
{
|
|
|
|
GstAudioChannelPosition *pos = g_new (GstAudioChannelPosition, nchannels);
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
if (nchannels == 1) {
|
|
|
|
pos[0] = GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER;
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < nchannels; i++)
|
|
|
|
pos[i] = layout_mapping[i].gst_pos;
|
|
|
|
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
gint
|
|
|
|
gst_wavpack_get_channel_mask_from_positions (GstAudioChannelPosition * pos,
|
|
|
|
gint nchannels)
|
|
|
|
{
|
|
|
|
gint channel_mask = 0;
|
|
|
|
gint i, j;
|
|
|
|
|
|
|
|
if (nchannels == 1 && pos[0] == GST_AUDIO_CHANNEL_POSITION_FRONT_MONO) {
|
|
|
|
channel_mask = 0x00000004;
|
|
|
|
return channel_mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: not exactly efficient but otherwise we need an inverse
|
|
|
|
* mapping table too */
|
|
|
|
for (i = 0; i < nchannels; i++) {
|
|
|
|
for (j = 0; j < MAX_CHANNEL_POSITIONS; j++) {
|
|
|
|
if (pos[i] == layout_mapping[j].gst_pos) {
|
|
|
|
channel_mask |= layout_mapping[j].ms_mask;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return channel_mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
gst_wavpack_set_channel_mapping (GstAudioChannelPosition * pos, gint nchannels,
|
|
|
|
gint8 * channel_mapping)
|
|
|
|
{
|
|
|
|
gint i, j;
|
|
|
|
gboolean ret = TRUE;
|
|
|
|
|
|
|
|
for (i = 0; i < nchannels; i++) {
|
|
|
|
for (j = 0; j < MAX_CHANNEL_POSITIONS; j++) {
|
|
|
|
if (pos[i] == layout_mapping[j].gst_pos) {
|
|
|
|
channel_mapping[i] = j;
|
|
|
|
ret &= (i == j);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return !ret;
|
|
|
|
}
|