mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-29 22:40:23 +00:00
5e7d21c7ad
Partially undoes commit 2c4e08d893:
riff: always generate a proper WAVEFORMATEX structure in
ff_put_wav_header
A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the
use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs.
This flag is used in the Matroska muxer (the cause of the original
change) and in the ASF muxer, because the specifications for
these formats indicate explicitly that WAVEFORMATEX should be used.
Muxers for other formats will return to the original behavior of writing
PCMWAVEFORMAT when writing a header for raw PCM.
In particular, this causes raw PCM in WAV to generate the canonical
44-byte header expected by some tools.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
115 lines
3.5 KiB
C
115 lines
3.5 KiB
C
/*
|
|
* RIFF common functions and data
|
|
* copyright (c) 2000 Fabrice Bellard
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* internal header for RIFF based (de)muxers
|
|
* do NOT include this in end user applications
|
|
*/
|
|
|
|
#ifndef AVFORMAT_RIFF_H
|
|
#define AVFORMAT_RIFF_H
|
|
|
|
#include "libavcodec/avcodec.h"
|
|
#include "avio.h"
|
|
#include "internal.h"
|
|
#include "metadata.h"
|
|
|
|
extern const AVMetadataConv ff_riff_info_conv[];
|
|
|
|
int64_t ff_start_tag(AVIOContext *pb, const char *tag);
|
|
void ff_end_tag(AVIOContext *pb, int64_t start);
|
|
|
|
/**
|
|
* Read BITMAPINFOHEADER structure and set AVStream codec width, height and
|
|
* bits_per_encoded_sample fields. Does not read extradata.
|
|
* @return codec tag
|
|
*/
|
|
int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize);
|
|
|
|
void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf, int ignore_extradata);
|
|
|
|
/**
|
|
* Tell ff_put_wav_header() to use WAVEFORMATEX even for PCM codecs.
|
|
*/
|
|
#define FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX 0x00000001
|
|
|
|
/**
|
|
* Write WAVEFORMAT header structure.
|
|
*
|
|
* @param flags a combination of FF_PUT_WAV_HEADER_* constants
|
|
*
|
|
* @return the size or -1 on error
|
|
*/
|
|
int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc, int flags);
|
|
|
|
enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps);
|
|
int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size);
|
|
|
|
extern const AVCodecTag ff_codec_bmp_tags[]; // exposed through avformat_get_riff_video_tags()
|
|
extern const AVCodecTag ff_codec_wav_tags[];
|
|
|
|
void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
|
|
|
|
int ff_read_riff_info(AVFormatContext *s, int64_t size);
|
|
|
|
/**
|
|
* Write all recognized RIFF tags from s->metadata
|
|
*/
|
|
void ff_riff_write_info(AVFormatContext *s);
|
|
|
|
/**
|
|
* Write a single RIFF info tag
|
|
*/
|
|
void ff_riff_write_info_tag(AVIOContext *pb, const char *tag, const char *str);
|
|
|
|
typedef uint8_t ff_asf_guid[16];
|
|
|
|
typedef struct AVCodecGuid {
|
|
enum AVCodecID id;
|
|
ff_asf_guid guid;
|
|
} AVCodecGuid;
|
|
|
|
extern const AVCodecGuid ff_codec_wav_guids[];
|
|
|
|
#define FF_PRI_GUID \
|
|
"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
|
|
|
|
#define FF_ARG_GUID(g) \
|
|
g[0], g[1], g[2], g[3], g[4], g[5], g[6], g[7], \
|
|
g[8], g[9], g[10], g[11], g[12], g[13], g[14], g[15]
|
|
|
|
#define FF_MEDIASUBTYPE_BASE_GUID \
|
|
0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71
|
|
|
|
static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
|
|
{
|
|
return memcmp(g1, g2, sizeof(ff_asf_guid));
|
|
}
|
|
|
|
int ff_get_guid(AVIOContext *s, ff_asf_guid *g);
|
|
void ff_put_guid(AVIOContext *s, const ff_asf_guid *g);
|
|
const ff_asf_guid *get_codec_guid(enum AVCodecID id, const AVCodecGuid *av_guid);
|
|
|
|
enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid);
|
|
|
|
#endif /* AVFORMAT_RIFF_H */
|