Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
云duo
FFmpeg
提交
7df9e693
F
FFmpeg
项目概览
云duo
/
FFmpeg
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
FFmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7df9e693
编写于
9月 02, 2013
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cosmetics: Fix ATRAC codec name spelling
上级
488b2984
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
26 addition
and
26 deletion
+26
-26
Changelog
Changelog
+2
-2
doc/general.texi
doc/general.texi
+2
-2
libavcodec/atrac.c
libavcodec/atrac.c
+1
-1
libavcodec/atrac.h
libavcodec/atrac.h
+2
-2
libavcodec/atrac1.c
libavcodec/atrac1.c
+3
-3
libavcodec/atrac1data.h
libavcodec/atrac1data.h
+2
-2
libavcodec/atrac3.c
libavcodec/atrac3.c
+4
-4
libavcodec/atrac3data.h
libavcodec/atrac3data.h
+2
-2
libavcodec/codec_desc.c
libavcodec/codec_desc.c
+3
-3
libavformat/omadec.c
libavformat/omadec.c
+1
-1
libavformat/rmdec.c
libavformat/rmdec.c
+1
-1
libavformat/spdif.h
libavformat/spdif.h
+3
-3
未找到文件。
Changelog
浏览文件 @
7df9e693
...
...
@@ -387,7 +387,7 @@ version 0.6:
- LPCM support in MPEG-TS (HDMV RID as found on Blu-ray disks)
- WMA Pro decoder
- Core Audio Format demuxer
- A
trac
1 decoder
- A
TRAC
1 decoder
- MD STUDIO audio demuxer
- RF64 support in WAV demuxer
- MPEG-4 Audio Lossless Coding (ALS) decoder
...
...
@@ -515,7 +515,7 @@ version 0.5:
- Interplay C93 demuxer and video decoder
- Bethsoft VID demuxer and video decoder
- CRYO APC demuxer
- A
trac
3 decoder
- A
TRAC
3 decoder
- V.Flash PTX decoder
- RoQ muxer, RoQ audio encoder
- Renderware TXD demuxer and decoder
...
...
doc/general.texi
浏览文件 @
7df9e693
...
...
@@ -721,8 +721,8 @@ following image formats are supported:
@tab encoding supported through external library libvo-amrwbenc
@item Apple lossless audio @tab X @tab X
@tab QuickTime fourcc 'alac'
@item A
trac 1
@tab @tab X
@item A
trac 3
@tab @tab X
@item A
TRAC1
@tab @tab X
@item A
TRAC3
@tab @tab X
@item Bink Audio @tab @tab X
@tab Used in Bink and Smacker files in many games.
@item Delphine Software International CIN audio @tab @tab X
...
...
libavcodec/atrac.c
浏览文件 @
7df9e693
/*
* A
trac
common functions
* A
TRAC
common functions
* Copyright (c) 2006-2008 Maxim Poliakovski
* Copyright (c) 2006-2008 Benjamin Larsson
*
...
...
libavcodec/atrac.h
浏览文件 @
7df9e693
/*
* A
trac
common data
* A
TRAC
common data
* Copyright (c) 2009 Maxim Poliakovski
* Copyright (c) 2009 Benjamin Larsson
*
...
...
@@ -22,7 +22,7 @@
/**
* @file
* A
trac
common header
* A
TRAC
common header
*/
#ifndef AVCODEC_ATRAC_H
...
...
libavcodec/atrac1.c
浏览文件 @
7df9e693
/*
* A
trac
1 compatible decoder
* A
TRAC
1 compatible decoder
* Copyright (c) 2009 Maxim Poliakovski
* Copyright (c) 2009 Benjamin Larsson
*
...
...
@@ -22,7 +22,7 @@
/**
* @file
* A
trac
1 compatible decoder.
* A
TRAC
1 compatible decoder.
* 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
=
{
.
name
=
"atrac1"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ATRAC1 (Adaptive TRansform Acoustic Coding)"
),
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
id
=
AV_CODEC_ID_ATRAC1
,
.
priv_data_size
=
sizeof
(
AT1Ctx
),
...
...
@@ -381,7 +382,6 @@ AVCodec ff_atrac1_decoder = {
.
close
=
atrac1_decode_end
,
.
decode
=
atrac1_decode_frame
,
.
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
,
AV_SAMPLE_FMT_NONE
},
};
libavcodec/atrac1data.h
浏览文件 @
7df9e693
/*
* A
trac
1 compatible decoder data
* A
TRAC
1 compatible decoder data
* Copyright (c) 2009 Maxim Poliakovski
* Copyright (c) 2009 Benjamin Larsson
*
...
...
@@ -22,7 +22,7 @@
/**
* @file
* A
trac
1 compatible decoder data
* A
TRAC
1 compatible decoder data
*/
#ifndef AVCODEC_ATRAC1DATA_H
...
...
libavcodec/atrac3.c
浏览文件 @
7df9e693
/*
* A
trac
3 compatible decoder
* A
TRAC
3 compatible decoder
* Copyright (c) 2006-2008 Maxim Poliakovski
* Copyright (c) 2006-2008 Benjamin Larsson
*
...
...
@@ -22,10 +22,10 @@
/**
* @file
* A
trac
3 compatible decoder.
* A
TRAC
3 compatible decoder.
* This decoder handles Sony's ATRAC3 data.
*
* Container formats used to store
atrac
3 data:
* Container formats used to store
ATRAC
3 data:
* RealMedia (.rm), RIFF WAV (.wav, .at3), Sony OpenMG (.oma, .aa3).
*
* 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
=
{
.
name
=
"atrac3"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ATRAC3 (Adaptive TRansform Acoustic Coding 3)"
),
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
id
=
AV_CODEC_ID_ATRAC3
,
.
priv_data_size
=
sizeof
(
ATRAC3Context
),
...
...
@@ -1004,7 +1005,6 @@ AVCodec ff_atrac3_decoder = {
.
close
=
atrac3_decode_close
,
.
decode
=
atrac3_decode_frame
,
.
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
,
AV_SAMPLE_FMT_NONE
},
};
libavcodec/atrac3data.h
浏览文件 @
7df9e693
/*
* A
trac
3 compatible decoder data
* A
TRAC
3 compatible decoder data
* Copyright (c) 2006-2007 Maxim Poliakovski
* Copyright (c) 2006-2007 Benjamin Larsson
*
...
...
@@ -22,7 +22,7 @@
/**
* @file
* A
trac
3 AKA RealAudio 8 compatible decoder data
* A
TRAC
3 AKA RealAudio 8 compatible decoder data
*/
#ifndef AVCODEC_ATRAC3DATA_H
...
...
libavcodec/codec_desc.c
浏览文件 @
7df9e693
...
...
@@ -1920,7 +1920,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
id
=
AV_CODEC_ID_ATRAC3
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
name
=
"atrac3"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"A
trac
3 (Adaptive TRansform Acoustic Coding 3)"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"A
TRAC
3 (Adaptive TRansform Acoustic Coding 3)"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
#if FF_API_VOXWARE
...
...
@@ -1985,7 +1985,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
id
=
AV_CODEC_ID_ATRAC3P
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
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
,
},
{
...
...
@@ -2034,7 +2034,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
id
=
AV_CODEC_ID_ATRAC1
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
name
=
"atrac1"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"A
trac
1 (Adaptive TRansform Acoustic Coding)"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"A
TRAC
1 (Adaptive TRansform Acoustic Coding)"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
{
...
...
libavformat/omadec.c
浏览文件 @
7df9e693
...
...
@@ -342,7 +342,7 @@ static int oma_read_header(AVFormatContext *s)
st
->
codec
->
sample_rate
=
samplerate
;
st
->
codec
->
bit_rate
=
st
->
codec
->
sample_rate
*
framesize
*
8
/
1024
;
/* fake the
atrac
3 extradata
/* fake the
ATRAC
3 extradata
* (wav format, makes stream copy to wav work) */
st
->
codec
->
extradata_size
=
14
;
edata
=
av_mallocz
(
14
+
FF_INPUT_BUFFER_PADDING_SIZE
);
...
...
libavformat/rmdec.c
浏览文件 @
7df9e693
...
...
@@ -29,7 +29,7 @@
#include "rmsipr.h"
#include "rm.h"
#define DEINT_ID_GENR MKTAG('g', 'e', 'n', 'r') ///< interleaving for Cooker/A
trac
#define DEINT_ID_GENR MKTAG('g', 'e', 'n', 'r') ///< interleaving for Cooker/A
TRAC
#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_SIPR MKTAG('s', 'i', 'p', 'r') ///< interleaving for Sipro
...
...
libavformat/spdif.h
浏览文件 @
7df9e693
...
...
@@ -40,9 +40,9 @@ enum IEC61937DataType {
IEC61937_DTS1
=
0x0B
,
///< DTS type I (512 samples)
IEC61937_DTS2
=
0x0C
,
///< DTS type II (1024 samples)
IEC61937_DTS3
=
0x0D
,
///< DTS type III (2048 samples)
IEC61937_ATRAC
=
0x0E
,
///< A
trac
data
IEC61937_ATRAC3
=
0x0F
,
///< A
trac
3 data
IEC61937_ATRACX
=
0x10
,
///< A
trac 3 plus
data
IEC61937_ATRAC
=
0x0E
,
///< A
TRAC
data
IEC61937_ATRAC3
=
0x0F
,
///< A
TRAC
3 data
IEC61937_ATRACX
=
0x10
,
///< A
TRAC3+
data
IEC61937_DTSHD
=
0x11
,
///< DTS HD data
IEC61937_WMAPRO
=
0x12
,
///< WMA 9 Professional data
IEC61937_MPEG2_AAC_LSF_2048
=
0x13
,
///< MPEG-2 AAC ADTS half-rate low sampling frequency
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录