har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cosmetics: Fix ATRAC codec name spelling

Browse Source
This commit is contained in:
Diego Biurrun 2013-09-02 20:21:49 +02:00
parent 488b2984fe
commit 7df9e693a3
12 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog
View File

@ -387,7 +387,7 @@ version 0.6:
- LPCM support in MPEG-TS (HDMV RID as found on Blu-ray disks) - LPCM support in MPEG-TS (HDMV RID as found on Blu-ray disks)
- WMA Pro decoder - WMA Pro decoder
- Core Audio Format demuxer - Core Audio Format demuxer
- Atrac1 decoder - ATRAC1 decoder
- MD STUDIO audio demuxer - MD STUDIO audio demuxer
- RF64 support in WAV demuxer - RF64 support in WAV demuxer
- MPEG-4 Audio Lossless Coding (ALS) decoder - MPEG-4 Audio Lossless Coding (ALS) decoder
@ -515,7 +515,7 @@ version 0.5:
- Interplay C93 demuxer and video decoder - Interplay C93 demuxer and video decoder
- Bethsoft VID demuxer and video decoder - Bethsoft VID demuxer and video decoder
- CRYO APC demuxer - CRYO APC demuxer
- Atrac3 decoder - ATRAC3 decoder
- V.Flash PTX decoder - V.Flash PTX decoder
- RoQ muxer, RoQ audio encoder - RoQ muxer, RoQ audio encoder
- Renderware TXD demuxer and decoder - Renderware TXD demuxer and decoder

4
doc/general.texi
View File

@ -721,8 +721,8 @@ following image formats are supported:
@tab encoding supported through external library libvo-amrwbenc @tab encoding supported through external library libvo-amrwbenc
@item Apple lossless audio @tab X @tab X @item Apple lossless audio @tab X @tab X
@tab QuickTime fourcc 'alac' @tab QuickTime fourcc 'alac'
@item Atrac 1 @tab @tab X @item ATRAC1 @tab @tab X
@item Atrac 3 @tab @tab X @item ATRAC3 @tab @tab X
@item Bink Audio @tab @tab X @item Bink Audio @tab @tab X
@tab Used in Bink and Smacker files in many games. @tab Used in Bink and Smacker files in many games.
@item Delphine Software International CIN audio @tab @tab X @item Delphine Software International CIN audio @tab @tab X

2
libavcodec/atrac.c
View File

@ -1,5 +1,5 @@
/* /*
* Atrac common functions * ATRAC common functions
* Copyright (c) 2006-2008 Maxim Poliakovski * Copyright (c) 2006-2008 Maxim Poliakovski
* Copyright (c) 2006-2008 Benjamin Larsson * Copyright (c) 2006-2008 Benjamin Larsson
* *

4
libavcodec/atrac.h
View File

@ -1,5 +1,5 @@
/* /*
* Atrac common data * ATRAC common data
* Copyright (c) 2009 Maxim Poliakovski * Copyright (c) 2009 Maxim Poliakovski
* Copyright (c) 2009 Benjamin Larsson * Copyright (c) 2009 Benjamin Larsson
* *
@ -22,7 +22,7 @@
/** /**
* @file * @file
* Atrac common header * ATRAC common header
*/ */
#ifndef AVCODEC_ATRAC_H #ifndef AVCODEC_ATRAC_H

6
libavcodec/atrac1.c
View File

@ -1,5 +1,5 @@
/* /*
* Atrac 1 compatible decoder * ATRAC1 compatible decoder
* Copyright (c) 2009 Maxim Poliakovski * Copyright (c) 2009 Maxim Poliakovski
* Copyright (c) 2009 Benjamin Larsson * Copyright (c) 2009 Benjamin Larsson
* *
@ -22,7 +22,7 @@
/** /**
* @file * @file
* Atrac 1 compatible decoder. * ATRAC1 compatible decoder.
* This decoder handles raw ATRAC1 data and probably SDDS data. * This decoder handles raw ATRAC1 data and probably SDDS data.
*/ */
@ -374,6 +374,7 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx)
AVCodec ff_atrac1_decoder = { AVCodec ff_atrac1_decoder = {
.name = "atrac1", .name = "atrac1",
.long_name = NULL_IF_CONFIG_SMALL("ATRAC1 (Adaptive TRansform Acoustic Coding)"),
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_ATRAC1, .id = AV_CODEC_ID_ATRAC1,
.priv_data_size = sizeof(AT1Ctx), .priv_data_size = sizeof(AT1Ctx),
@ -381,7 +382,6 @@ AVCodec ff_atrac1_decoder = {
.close = atrac1_decode_end, .close = atrac1_decode_end,
.decode = atrac1_decode_frame, .decode = atrac1_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Atrac 1 (Adaptive TRansform Acoustic Coding)"),
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
}; };

4
libavcodec/atrac1data.h
View File

@ -1,5 +1,5 @@
/* /*
* Atrac 1 compatible decoder data * ATRAC 1 compatible decoder data
* Copyright (c) 2009 Maxim Poliakovski * Copyright (c) 2009 Maxim Poliakovski
* Copyright (c) 2009 Benjamin Larsson * Copyright (c) 2009 Benjamin Larsson
* *
@ -22,7 +22,7 @@
/** /**
* @file * @file
* Atrac 1 compatible decoder data * ATRAC1 compatible decoder data
*/ */
#ifndef AVCODEC_ATRAC1DATA_H #ifndef AVCODEC_ATRAC1DATA_H

8
libavcodec/atrac3.c
View File

@ -1,5 +1,5 @@
/* /*
* Atrac 3 compatible decoder * ATRAC3 compatible decoder
* Copyright (c) 2006-2008 Maxim Poliakovski * Copyright (c) 2006-2008 Maxim Poliakovski
* Copyright (c) 2006-2008 Benjamin Larsson * Copyright (c) 2006-2008 Benjamin Larsson
* *
@ -22,10 +22,10 @@
/** /**
* @file * @file
* Atrac 3 compatible decoder. * ATRAC3 compatible decoder.
* This decoder handles Sony's ATRAC3 data. * This decoder handles Sony's ATRAC3 data.
* *
* Container formats used to store atrac 3 data: * Container formats used to store ATRAC3 data:
* RealMedia (.rm), RIFF WAV (.wav, .at3), Sony OpenMG (.oma, .aa3). * RealMedia (.rm), RIFF WAV (.wav, .at3), Sony OpenMG (.oma, .aa3).
* *
* To use this decoder, a calling application must supply the extradata * To use this decoder, a calling application must supply the extradata
@ -996,6 +996,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
AVCodec ff_atrac3_decoder = { AVCodec ff_atrac3_decoder = {
.name = "atrac3", .name = "atrac3",
.long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"),
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_ATRAC3, .id = AV_CODEC_ID_ATRAC3,
.priv_data_size = sizeof(ATRAC3Context), .priv_data_size = sizeof(ATRAC3Context),
@ -1004,7 +1005,6 @@ AVCodec ff_atrac3_decoder = {
.close = atrac3_decode_close, .close = atrac3_decode_close,
.decode = atrac3_decode_frame, .decode = atrac3_decode_frame,
.capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"),
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
}; };

4
libavcodec/atrac3data.h
View File

@ -1,5 +1,5 @@
/* /*
* Atrac 3 compatible decoder data * ATRAC3 compatible decoder data
* Copyright (c) 2006-2007 Maxim Poliakovski * Copyright (c) 2006-2007 Maxim Poliakovski
* Copyright (c) 2006-2007 Benjamin Larsson * Copyright (c) 2006-2007 Benjamin Larsson
* *
@ -22,7 +22,7 @@
/** /**
* @file * @file
* Atrac 3 AKA RealAudio 8 compatible decoder data * ATRAC3 AKA RealAudio 8 compatible decoder data
*/ */
#ifndef AVCODEC_ATRAC3DATA_H #ifndef AVCODEC_ATRAC3DATA_H

6
libavcodec/codec_desc.c
View File

@ -1920,7 +1920,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.id = AV_CODEC_ID_ATRAC3, .id = AV_CODEC_ID_ATRAC3,
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.name = "atrac3", .name = "atrac3",
.long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"), .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY,
}, },
#if FF_API_VOXWARE #if FF_API_VOXWARE
@ -1985,7 +1985,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.id = AV_CODEC_ID_ATRAC3P, .id = AV_CODEC_ID_ATRAC3P,
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.name = "atrac3p", .name = "atrac3p",
.long_name = NULL_IF_CONFIG_SMALL("Sony ATRAC3+"), .long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY,
}, },
{ {
@ -2034,7 +2034,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.id = AV_CODEC_ID_ATRAC1, .id = AV_CODEC_ID_ATRAC1,
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.name = "atrac1", .name = "atrac1",
.long_name = NULL_IF_CONFIG_SMALL("Atrac 1 (Adaptive TRansform Acoustic Coding)"), .long_name = NULL_IF_CONFIG_SMALL("ATRAC1 (Adaptive TRansform Acoustic Coding)"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY,
}, },
{ {

2
libavformat/omadec.c
View File

@ -342,7 +342,7 @@ static int oma_read_header(AVFormatContext *s)
st->codec->sample_rate = samplerate; st->codec->sample_rate = samplerate;
st->codec->bit_rate = st->codec->sample_rate * framesize * 8 / 1024; st->codec->bit_rate = st->codec->sample_rate * framesize * 8 / 1024;
/* fake the atrac3 extradata /* fake the ATRAC3 extradata
* (wav format, makes stream copy to wav work) */ * (wav format, makes stream copy to wav work) */
st->codec->extradata_size = 14; st->codec->extradata_size = 14;
edata = av_mallocz(14 + FF_INPUT_BUFFER_PADDING_SIZE); edata = av_mallocz(14 + FF_INPUT_BUFFER_PADDING_SIZE);

2
libavformat/rmdec.c
View File

@ -29,7 +29,7 @@
#include "rmsipr.h" #include "rmsipr.h"
#include "rm.h" #include "rm.h"
#define DEINT_ID_GENR MKTAG('g', 'e', 'n', 'r') ///< interleaving for Cooker/Atrac #define DEINT_ID_GENR MKTAG('g', 'e', 'n', 'r') ///< interleaving for Cooker/ATRAC
#define DEINT_ID_INT0 MKTAG('I', 'n', 't', '0') ///< no interleaving needed #define DEINT_ID_INT0 MKTAG('I', 'n', 't', '0') ///< no interleaving needed
#define DEINT_ID_INT4 MKTAG('I', 'n', 't', '4') ///< interleaving for 28.8 #define DEINT_ID_INT4 MKTAG('I', 'n', 't', '4') ///< interleaving for 28.8
#define DEINT_ID_SIPR MKTAG('s', 'i', 'p', 'r') ///< interleaving for Sipro #define DEINT_ID_SIPR MKTAG('s', 'i', 'p', 'r') ///< interleaving for Sipro

6
libavformat/spdif.h
View File

@ -40,9 +40,9 @@ enum IEC61937DataType {
IEC61937_DTS1 = 0x0B, ///< DTS type I (512 samples) IEC61937_DTS1 = 0x0B, ///< DTS type I (512 samples)
IEC61937_DTS2 = 0x0C, ///< DTS type II (1024 samples) IEC61937_DTS2 = 0x0C, ///< DTS type II (1024 samples)
IEC61937_DTS3 = 0x0D, ///< DTS type III (2048 samples) IEC61937_DTS3 = 0x0D, ///< DTS type III (2048 samples)
IEC61937_ATRAC = 0x0E, ///< Atrac data IEC61937_ATRAC = 0x0E, ///< ATRAC data
IEC61937_ATRAC3 = 0x0F, ///< Atrac 3 data IEC61937_ATRAC3 = 0x0F, ///< ATRAC3 data
IEC61937_ATRACX = 0x10, ///< Atrac 3 plus data IEC61937_ATRACX = 0x10, ///< ATRAC3+ data
IEC61937_DTSHD = 0x11, ///< DTS HD data IEC61937_DTSHD = 0x11, ///< DTS HD data
IEC61937_WMAPRO = 0x12, ///< WMA 9 Professional data IEC61937_WMAPRO = 0x12, ///< WMA 9 Professional data
IEC61937_MPEG2_AAC_LSF_2048 = 0x13, ///< MPEG-2 AAC ADTS half-rate low sampling frequency IEC61937_MPEG2_AAC_LSF_2048 = 0x13, ///< MPEG-2 AAC ADTS half-rate low sampling frequency