Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
511cf612
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
511cf612
编写于
12月 19, 2012
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
miscellaneous typo fixes
上级
6906b193
变更
51
隐藏空白更改
内联
并排
Showing
51 changed file
with
61 addition
and
60 deletion
+61
-60
configure
configure
+1
-1
doc/Doxyfile
doc/Doxyfile
+1
-1
doc/developer.texi
doc/developer.texi
+1
-1
doc/indevs.texi
doc/indevs.texi
+1
-1
doc/rate_distortion.txt
doc/rate_distortion.txt
+1
-1
doc/viterbi.txt
doc/viterbi.txt
+2
-2
libavcodec/4xm.c
libavcodec/4xm.c
+1
-1
libavcodec/aacpsy.c
libavcodec/aacpsy.c
+2
-2
libavcodec/ac3dec.c
libavcodec/ac3dec.c
+1
-1
libavcodec/ac3enc.c
libavcodec/ac3enc.c
+1
-1
libavcodec/acelp_filters.h
libavcodec/acelp_filters.h
+1
-1
libavcodec/avcodec.h
libavcodec/avcodec.h
+1
-1
libavcodec/bitstream.c
libavcodec/bitstream.c
+1
-1
libavcodec/eac3dec.c
libavcodec/eac3dec.c
+1
-1
libavcodec/ffv1dec.c
libavcodec/ffv1dec.c
+1
-1
libavcodec/flicvideo.c
libavcodec/flicvideo.c
+1
-1
libavcodec/g726.c
libavcodec/g726.c
+1
-1
libavcodec/h264_direct.c
libavcodec/h264_direct.c
+1
-1
libavcodec/indeo3data.h
libavcodec/indeo3data.h
+2
-2
libavcodec/lagarith.c
libavcodec/lagarith.c
+2
-2
libavcodec/libfdk-aacenc.c
libavcodec/libfdk-aacenc.c
+1
-1
libavcodec/libtheoraenc.c
libavcodec/libtheoraenc.c
+1
-1
libavcodec/mpeg4videoenc.c
libavcodec/mpeg4videoenc.c
+2
-2
libavcodec/parser.c
libavcodec/parser.c
+1
-1
libavcodec/pngenc.c
libavcodec/pngenc.c
+1
-1
libavcodec/ratecontrol.c
libavcodec/ratecontrol.c
+1
-1
libavcodec/resample.c
libavcodec/resample.c
+1
-1
libavcodec/rv10.c
libavcodec/rv10.c
+1
-1
libavcodec/shorten.c
libavcodec/shorten.c
+2
-1
libavcodec/thread.h
libavcodec/thread.h
+1
-1
libavcodec/vda_h264.c
libavcodec/vda_h264.c
+1
-1
libavcodec/vorbisdec.c
libavcodec/vorbisdec.c
+1
-1
libavcodec/vp8dsp.h
libavcodec/vp8dsp.h
+1
-1
libavcodec/wmaprodec.c
libavcodec/wmaprodec.c
+2
-2
libavdevice/dv1394.h
libavdevice/dv1394.h
+1
-1
libavformat/avformat.h
libavformat/avformat.h
+1
-1
libavformat/aviobuf.c
libavformat/aviobuf.c
+1
-1
libavformat/dvenc.c
libavformat/dvenc.c
+3
-3
libavformat/hls.c
libavformat/hls.c
+1
-1
libavformat/hlsproto.c
libavformat/hlsproto.c
+1
-1
libavformat/http.h
libavformat/http.h
+1
-1
libavformat/rtpdec_jpeg.c
libavformat/rtpdec_jpeg.c
+1
-1
libavformat/smoothstreamingenc.c
libavformat/smoothstreamingenc.c
+1
-1
libavformat/spdifenc.c
libavformat/spdifenc.c
+1
-1
libavformat/wtv.c
libavformat/wtv.c
+1
-1
libavformat/xmv.c
libavformat/xmv.c
+1
-1
libavresample/avresample-test.c
libavresample/avresample-test.c
+1
-1
libswscale/ppc/yuv2yuv_altivec.c
libswscale/ppc/yuv2yuv_altivec.c
+1
-1
libswscale/swscale.c
libswscale/swscale.c
+1
-1
tests/audiogen.c
tests/audiogen.c
+1
-1
tools/patcheck
tools/patcheck
+2
-2
未找到文件。
configure
浏览文件 @
511cf612
...
...
@@ -1305,7 +1305,7 @@ HAVE_LIST="
xmm_clobbers
"
# options emitted with CONFIG_ prefix but not available on command line
# options emitted with CONFIG_ prefix but not available on
the
command line
CONFIG_EXTRA
=
"
aandcttables
ac3dsp
...
...
doc/Doxyfile
浏览文件 @
511cf612
...
...
@@ -288,7 +288,7 @@ TYPEDEF_HIDES_STRUCT = NO
# causing a significant performance penality.
# If the system has enough physical memory increasing the cache will improve the
# performance by keeping more symbols in memory. Note that the value works on
# a logarithmic scale so increasing the size by one will rougly double the
# a logarithmic scale so increasing the size by one will roug
h
ly double the
# memory usage. The cache size is given by this formula:
# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
# corresponding to a cache size of 2^16 = 65536 symbols
...
...
doc/developer.texi
浏览文件 @
511cf612
...
...
@@ -201,7 +201,7 @@ For exported names, each library has its own prefixes. Just check the existing
code and name accordingly.
@end itemize
@subsection Miscellanous conventions
@subsection Miscellan
e
ous conventions
@itemize @bullet
@item
fprintf and printf are forbidden in libavformat and libavcodec,
...
...
doc/indevs.texi
浏览文件 @
511cf612
...
...
@@ -300,7 +300,7 @@ The filename passed as input has the syntax:
@var{hostname}:@var{display_number}.@var{screen_number} specifies the
X11 display name of the screen to grab from. @var{hostname} can be
om
m
itted, and defaults to "localhost". The environment variable
omitted, and defaults to "localhost". The environment variable
@env{DISPLAY} contains the default display name.
@var{x_offset} and @var{y_offset} specify the offsets of the grabbed
...
...
doc/rate_distortion.txt
浏览文件 @
511cf612
...
...
@@ -23,7 +23,7 @@ Let's consider the problem of minimizing:
rate is the filesize
distortion is the quality
lambda is a fixed value cho
o
sen as a tradeoff between quality and filesize
lambda is a fixed value chosen as a tradeoff between quality and filesize
Is this equivalent to finding the best quality for a given max
filesize? The answer is yes. For each filesize limit there is some lambda
factor for which minimizing above will get you the best quality (using your
...
...
doc/viterbi.txt
浏览文件 @
511cf612
...
...
@@ -85,8 +85,8 @@ here are some edges we could choose from:
/ \
O-----2--4--O
Finding the new best path
e
s and scores for each point of our new column is
trivial given we know the previous column best path
e
s and scores:
Finding the new best paths and scores for each point of our new column is
trivial given we know the previous column best paths and scores:
O-----0-----8
\
...
...
libavcodec/4xm.c
浏览文件 @
511cf612
...
...
@@ -796,7 +796,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
cfrm
->
size
+
data_size
+
FF_INPUT_BUFFER_PADDING_SIZE
);
// explicit check needed as memcpy below might not catch a NULL
if
(
!
cfrm
->
data
)
{
av_log
(
f
->
avctx
,
AV_LOG_ERROR
,
"realloc falure"
);
av_log
(
f
->
avctx
,
AV_LOG_ERROR
,
"realloc fa
i
lure"
);
return
-
1
;
}
...
...
libavcodec/aacpsy.c
浏览文件 @
511cf612
...
...
@@ -592,7 +592,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel,
for
(
w
=
0
;
w
<
wi
->
num_windows
*
16
;
w
+=
16
)
{
AacPsyBand
*
bands
=
&
pch
->
band
[
w
];
/
/5.4.2.3 "Spreading" & 5.4.3 "Spreaded Energy Calculation"
/
* 5.4.2.3 "Spreading" & 5.4.3 "Spread Energy Calculation" */
spread_en
[
0
]
=
bands
[
0
].
energy
;
for
(
g
=
1
;
g
<
num_bands
;
g
++
)
{
bands
[
g
].
thr
=
FFMAX
(
bands
[
g
].
thr
,
bands
[
g
-
1
].
thr
*
coeffs
[
g
].
spread_hi
[
0
]);
...
...
@@ -612,7 +612,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel,
band
->
thr
=
FFMAX
(
PSY_3GPP_RPEMIN
*
band
->
thr
,
FFMIN
(
band
->
thr
,
PSY_3GPP_RPELEV
*
pch
->
prev_band
[
w
+
g
].
thr_quiet
));
/* 5.6.1.3.1 "Prepatory steps of the perceptual entropy calculation" */
/* 5.6.1.3.1 "Prepa
ra
tory steps of the perceptual entropy calculation" */
pe
+=
calc_pe_3gpp
(
band
);
a
+=
band
->
pe_const
;
active_lines
+=
band
->
active_lines
;
...
...
libavcodec/ac3dec.c
浏览文件 @
511cf612
...
...
@@ -546,7 +546,7 @@ static void decode_transform_coeffs(AC3DecodeContext *s, int blk)
for
(
ch
=
1
;
ch
<=
s
->
channels
;
ch
++
)
{
/* transform coefficients for full-bandwidth channel */
decode_transform_coeffs_ch
(
s
,
blk
,
ch
,
&
m
);
/* tranform coefficients for coupling channel come right after the
/* tran
s
form coefficients for coupling channel come right after the
coefficients for the first coupled channel*/
if
(
s
->
channel_in_cpl
[
ch
])
{
if
(
!
got_cplchan
)
{
...
...
libavcodec/ac3enc.c
浏览文件 @
511cf612
...
...
@@ -659,7 +659,7 @@ static void count_frame_bits_fixed(AC3EncodeContext *s)
* bit allocation parameters do not change between blocks
* no delta bit allocation
* no skipped data
* no auxil
l
iary data
* no auxiliary data
* no E-AC-3 metadata
*/
...
...
libavcodec/acelp_filters.h
浏览文件 @
511cf612
...
...
@@ -32,7 +32,7 @@
* the coefficients are scaled by 2^15.
* This array only contains the right half of the filter.
* This filter is likely identical to the one used in G.729, though this
* could not be determined from the original comments with certain
i
ty.
* could not be determined from the original comments with certainty.
*/
extern
const
int16_t
ff_acelp_interp_filter
[
61
];
...
...
libavcodec/avcodec.h
浏览文件 @
511cf612
...
...
@@ -2292,7 +2292,7 @@ typedef struct AVCodecContext {
/**
* ratecontrol qmin qmax limiting method
* 0-> clipping, 1-> use a nice continous function to limit qscale wthin qmin/qmax.
* 0-> clipping, 1-> use a nice contin
u
ous function to limit qscale wthin qmin/qmax.
* - encoding: Set by user.
* - decoding: unused
*/
...
...
libavcodec/bitstream.c
浏览文件 @
511cf612
...
...
@@ -169,7 +169,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
table
[
i
][
0
]
=
-
1
;
//codes
}
/* first pass: map codes and compute auxil
l
ary table sizes */
/* first pass: map codes and compute auxil
i
ary table sizes */
for
(
i
=
0
;
i
<
nb_codes
;
i
++
)
{
n
=
codes
[
i
].
bits
;
code
=
codes
[
i
].
code
;
...
...
libavcodec/eac3dec.c
浏览文件 @
511cf612
...
...
@@ -491,7 +491,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
s
->
skip_syntax
=
get_bits1
(
gbc
);
parse_spx_atten_data
=
get_bits1
(
gbc
);
/* coupling strategy occur
a
nce and coupling use per block */
/* coupling strategy occur
re
nce and coupling use per block */
num_cpl_blocks
=
0
;
if
(
s
->
channel_mode
>
1
)
{
for
(
blk
=
0
;
blk
<
s
->
num_blocks
;
blk
++
)
{
...
...
libavcodec/ffv1dec.c
浏览文件 @
511cf612
...
...
@@ -824,7 +824,7 @@ static int ffv1_decode_frame(AVCodecContext *avctx, void *data,
}
else
{
if
(
!
f
->
key_frame_ok
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Can
t decode non
keyframe without valid keyframe
\n
"
);
"Can
not decode non-
keyframe without valid keyframe
\n
"
);
return
AVERROR_INVALIDDATA
;
}
p
->
key_frame
=
0
;
...
...
libavcodec/flicvideo.c
浏览文件 @
511cf612
...
...
@@ -581,7 +581,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
}
/* Now FLX is strange, in that it is "byte" as opposed to "pixel" run length compressed.
* This does not give us any good oportunity to perform word endian conversion
* This does not give us any good op
p
ortunity to perform word endian conversion
* during decompression. So if it is required (i.e., this is not a LE target, we do
* a second pass over the line here, swapping the bytes.
*/
...
...
libavcodec/g726.c
浏览文件 @
511cf612
...
...
@@ -34,7 +34,7 @@
/**
* G.726 11bit float.
* G.726 Standard uses rather odd 11bit floating point arithmentic for
* numerous occasions. It's a m
i
stery to me why they did it this way
* numerous occasions. It's a m
y
stery to me why they did it this way
* instead of simply using 32bit integer arithmetic.
*/
typedef
struct
Float11
{
...
...
libavcodec/h264_direct.c
浏览文件 @
511cf612
...
...
@@ -86,7 +86,7 @@ static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field,
if
(
!
interl
)
poc
|=
3
;
else
if
(
interl
&&
(
poc
&
3
)
==
3
)
//
FIXME store all MBAFF references so this isn
t needed
else
if
(
interl
&&
(
poc
&
3
)
==
3
)
//
FIXME: store all MBAFF references so this is no
t needed
poc
=
(
poc
&~
3
)
+
rfield
+
1
;
for
(
j
=
start
;
j
<
end
;
j
++
){
...
...
libavcodec/indeo3data.h
浏览文件 @
511cf612
...
...
@@ -235,7 +235,7 @@
/**
* Pack two delta values (a,b) into one 16bit word
* according with endianess of the host machine.
* according with endian
n
ess of the host machine.
*/
#if HAVE_BIGENDIAN
#define PD(a,b) (((a) << 8) + (b))
...
...
@@ -282,7 +282,7 @@ static const int16_t delta_tab_3_5[79] = { TAB_3_5 };
/**
* Pack four delta values (a,a,b,b) into one 32bit word
* according with endianess of the host machine.
* according with endian
n
ess of the host machine.
*/
#if HAVE_BIGENDIAN
#define PD(a,b) (((a) << 24) + ((a) << 16) + ((b) << 8) + (b))
...
...
libavcodec/lagarith.c
浏览文件 @
511cf612
...
...
@@ -198,8 +198,8 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb)
}
/* Comment from reference source:
* if (b & 0x80 == 0) { // order of operations is 'wrong'; it has been left this way
* // since the compression change is neglig
a
ble and fixing it
* // breaks backwards compatibilty
* // since the compression change is neglig
i
ble and fixing it
* // breaks backwards compatibil
i
ty
* b =- (signed int)b;
* b &= 0xFF;
* } else {
...
...
libavcodec/libfdk-aacenc.c
浏览文件 @
511cf612
...
...
@@ -257,7 +257,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
}
if
((
err
=
aacEncoder_SetParam
(
s
->
handle
,
AACENC_BANDWIDTH
,
avctx
->
cutoff
))
!=
AACENC_OK
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unable to set the encoder bandwith to %d: %s
\n
"
,
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unable to set the encoder bandwi
d
th to %d: %s
\n
"
,
avctx
->
cutoff
,
aac_get_error
(
err
));
goto
error
;
}
...
...
libavcodec/libtheoraenc.c
浏览文件 @
511cf612
...
...
@@ -338,7 +338,7 @@ static int encode_frame(AVCodecContext* avc_context, AVPacket *pkt,
memcpy
(
pkt
->
data
,
o_packet
.
packet
,
o_packet
.
bytes
);
// HACK: assumes no encoder delay, this is true until libtheora becomes
// multithreaded (which will be disabled unless explictly requested)
// multithreaded (which will be disabled unless explic
i
tly requested)
pkt
->
pts
=
pkt
->
dts
=
frame
->
pts
;
avc_context
->
coded_frame
->
key_frame
=
!
(
o_packet
.
granulepos
&
h
->
keyframe_mask
);
if
(
avc_context
->
coded_frame
->
key_frame
)
...
...
libavcodec/mpeg4videoenc.c
浏览文件 @
511cf612
...
...
@@ -89,7 +89,7 @@ static inline int get_block_rate(MpegEncContext * s, DCTELEM block[64], int bloc
* @param[in,out] block MB coefficients, these will be restored
* @param[in] dir ac prediction direction for each 8x8 block
* @param[out] st scantable for each 8x8 block
* @param[in] zigzag_last_index index refering to the last non zero coefficient in zigzag order
* @param[in] zigzag_last_index index refer
r
ing to the last non zero coefficient in zigzag order
*/
static
inline
void
restore_ac_coeffs
(
MpegEncContext
*
s
,
DCTELEM
block
[
6
][
64
],
const
int
dir
[
6
],
uint8_t
*
st
[
6
],
const
int
zigzag_last_index
[
6
])
{
...
...
@@ -120,7 +120,7 @@ static inline void restore_ac_coeffs(MpegEncContext * s, DCTELEM block[6][64], c
* @param[in,out] block MB coefficients, these will be updated if 1 is returned
* @param[in] dir ac prediction direction for each 8x8 block
* @param[out] st scantable for each 8x8 block
* @param[out] zigzag_last_index index refering to the last non zero coefficient in zigzag order
* @param[out] zigzag_last_index index refer
r
ing to the last non zero coefficient in zigzag order
*/
static
inline
int
decide_ac_pred
(
MpegEncContext
*
s
,
DCTELEM
block
[
6
][
64
],
const
int
dir
[
6
],
uint8_t
*
st
[
6
],
int
zigzag_last_index
[
6
])
{
...
...
libavcodec/parser.c
浏览文件 @
511cf612
...
...
@@ -96,7 +96,7 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
if
(
s
->
cur_offset
+
off
>=
s
->
cur_frame_offset
[
i
]
&&
(
s
->
frame_offset
<
s
->
cur_frame_offset
[
i
]
||
(
!
s
->
frame_offset
&&
!
s
->
next_frame_offset
))
// first field/frame
//
check is disabled because mpeg-ts doesn
t send complete PES packets
//
check disabled since MPEG-TS does no
t send complete PES packets
&&
/*s->next_frame_offset + off <*/
s
->
cur_frame_end
[
i
]){
s
->
dts
=
s
->
cur_frame_dts
[
i
];
s
->
pts
=
s
->
cur_frame_pts
[
i
];
...
...
libavcodec/pngenc.c
浏览文件 @
511cf612
...
...
@@ -367,7 +367,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
int
pass
;
for
(
pass
=
0
;
pass
<
NB_PASSES
;
pass
++
)
{
/* NOTE: a pass is completely omited if no pixels would be
/* NOTE: a pass is completely omit
t
ed if no pixels would be
output */
pass_row_size
=
ff_png_pass_row_size
(
pass
,
bits_per_pixel
,
avctx
->
width
);
if
(
pass_row_size
>
0
)
{
...
...
libavcodec/ratecontrol.c
浏览文件 @
511cf612
...
...
@@ -799,7 +799,7 @@ static int init_pass2(MpegEncContext *s)
AVCodecContext
*
a
=
s
->
avctx
;
int
i
,
toobig
;
double
fps
=
1
/
av_q2d
(
s
->
avctx
->
time_base
);
double
complexity
[
5
]
=
{
0
,
0
,
0
,
0
,
0
};
// aproximate bits at quant=1
double
complexity
[
5
]
=
{
0
,
0
,
0
,
0
,
0
};
// ap
p
roximate bits at quant=1
uint64_t
const_bits
[
5
]
=
{
0
,
0
,
0
,
0
,
0
};
// quantizer independent bits
uint64_t
all_const_bits
;
uint64_t
all_available_bits
=
(
uint64_t
)(
s
->
bit_rate
*
(
double
)
rcc
->
num_entries
/
fps
);
...
...
libavcodec/resample.c
浏览文件 @
511cf612
...
...
@@ -350,7 +350,7 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl
if
(
av_audio_convert
(
s
->
convert_ctx
[
1
],
obuf
,
ostride
,
ibuf
,
istride
,
nb_samples1
*
s
->
output_channels
)
<
0
)
{
av_log
(
s
->
resample_context
,
AV_LOG_ERROR
,
"Audio sample format conver
t
ion failed
\n
"
);
"Audio sample format conver
s
ion failed
\n
"
);
return
0
;
}
}
...
...
libavcodec/rv10.c
浏览文件 @
511cf612
...
...
@@ -706,7 +706,7 @@ static int rv10_decode_frame(AVCodecContext *avctx,
*
got_frame
=
1
;
ff_print_debug_info
(
s
,
pict
);
}
s
->
current_picture_ptr
=
NULL
;
//
so we can detect if frame_end wasn
t called (find some nicer solution...)
s
->
current_picture_ptr
=
NULL
;
//
so we can detect if frame_end was no
t called (find some nicer solution...)
}
return
avpkt
->
size
;
...
...
libavcodec/shorten.c
浏览文件 @
511cf612
...
...
@@ -528,7 +528,8 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
/* get Rice code for residual decoding */
if
(
cmd
!=
FN_ZERO
)
{
residual_size
=
get_ur_golomb_shorten
(
&
s
->
gb
,
ENERGYSIZE
);
/* this is a hack as version 0 differed in defintion of get_sr_golomb_shorten */
/* This is a hack as version 0 differed in the definition
* of get_sr_golomb_shorten(). */
if
(
s
->
version
==
0
)
residual_size
--
;
}
...
...
libavcodec/thread.h
浏览文件 @
511cf612
...
...
@@ -43,7 +43,7 @@ void ff_thread_flush(AVCodecContext *avctx);
* Returns the next available frame in picture. *got_picture_ptr
* will be 0 if none is available.
* The return value on success is the size of the consumed packet for
* compatiblity with avcodec_decode_video2(). This means the decoder
* compatib
i
lity with avcodec_decode_video2(). This means the decoder
* has to consume the full packet.
*
* Parameters are the same as avcodec_decode_video2().
...
...
libavcodec/vda_h264.c
浏览文件 @
511cf612
...
...
@@ -281,7 +281,7 @@ int ff_vda_create_decoder(struct vda_context *vda_ctx,
#endif
/* Each VCL NAL in the bistream sent to the decoder
* is prece
e
ded by a 4 bytes length header.
* is preceded by a 4 bytes length header.
* Change the avcC atom header if needed, to signal headers of 4 bytes. */
if
(
extradata_size
>=
4
&&
(
extradata
[
4
]
&
0x03
)
!=
0x03
)
{
uint8_t
*
rw_extradata
;
...
...
libavcodec/vorbisdec.c
浏览文件 @
511cf612
...
...
@@ -1233,7 +1233,7 @@ static int vorbis_floor1_decode(vorbis_context *vc,
if
(
highroom
<
lowroom
)
{
room
=
highroom
*
2
;
}
else
{
room
=
lowroom
*
2
;
// SPEC mispelling
room
=
lowroom
*
2
;
// SPEC mis
s
pelling
}
if
(
val
)
{
floor1_flag
[
low_neigh_offs
]
=
1
;
...
...
libavcodec/vp8dsp.h
浏览文件 @
511cf612
...
...
@@ -73,7 +73,7 @@ typedef struct VP8DSPContext {
* second dimension: 0 if no vertical interpolation is needed;
* 1 4-tap vertical interpolation filter (my & 1)
* 2 6-tap vertical interpolation filter (!(my & 1))
* third dimension: same as second dimen
t
ion, for horizontal interpolation
* third dimension: same as second dimen
s
ion, for horizontal interpolation
* so something like put_vp8_epel_pixels_tab[width>>3][2*!!my-(my&1)][2*!!mx-(mx&1)](..., mx, my)
*/
vp8_mc_func
put_vp8_epel_pixels_tab
[
3
][
3
][
3
];
...
...
libavcodec/wmaprodec.c
浏览文件 @
511cf612
...
...
@@ -533,7 +533,7 @@ static int decode_tilehdr(WMAProDecodeCtx *s)
int
c
;
/* Should never consume more than 3073 bits (256 iterations for the
* while loop when always the minimum amount of 128 samples is sub
s
tracted
* while loop when always the minimum amount of 128 samples is subtracted
* from missing samples in the 8 channel case).
* 1 + BLOCK_MAX_SIZE * MAX_CHANNELS / BLOCK_MIN_SIZE * (MAX_CHANNELS + 4)
*/
...
...
@@ -1089,7 +1089,7 @@ static int decode_subframe(WMAProDecodeCtx *s)
s
->
channels_for_cur_subframe
=
0
;
for
(
i
=
0
;
i
<
s
->
avctx
->
channels
;
i
++
)
{
const
int
cur_subframe
=
s
->
channel
[
i
].
cur_subframe
;
/** sub
s
tract already processed samples */
/** subtract already processed samples */
total_samples
-=
s
->
channel
[
i
].
decoded_samples
;
/** and count if there are multiple subframes that match our profile */
...
...
libavdevice/dv1394.h
浏览文件 @
511cf612
...
...
@@ -186,7 +186,7 @@
where copy_DV_frame() reads or writes on the dv1394 file descriptor
(read/write mode) or copies data to/from the mmap ringbuffer and
then calls ioctl(DV1394_SUBMIT_FRAMES) to notify dv1394 that new
frames are availble (mmap mode).
frames are avail
a
ble (mmap mode).
reset_dv1394() is called in the event of a buffer
underflow/overflow or a halt in the DV stream (e.g. due to a 1394
...
...
libavformat/avformat.h
浏览文件 @
511cf612
...
...
@@ -1532,7 +1532,7 @@ enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
* @ingroup libavf
* @{
*
* Miscelaneous utility functions related to both muxing and demuxing
* Miscel
l
aneous utility functions related to both muxing and demuxing
* (or neither).
*/
...
...
libavformat/aviobuf.c
浏览文件 @
511cf612
...
...
@@ -368,7 +368,7 @@ static void fill_buffer(AVIOContext *s)
int
max_buffer_size
=
s
->
max_packet_size
?
s
->
max_packet_size
:
IO_BUFFER_SIZE
;
/* can't fill the buffer without read_packet, just set EOF if appropiate */
/* can't fill the buffer without read_packet, just set EOF if approp
r
iate */
if
(
!
s
->
read_packet
&&
s
->
buf_ptr
>=
s
->
buf_end
)
s
->
eof_reached
=
1
;
...
...
libavformat/dvenc.c
浏览文件 @
511cf612
...
...
@@ -47,9 +47,9 @@ struct DVMuxContext {
AVFifoBuffer
*
audio_data
[
2
];
/* FIFO for storing excessive amounts of PCM */
int
frames
;
/* current frame number */
int64_t
start_time
;
/* recording start time */
int
has_audio
;
/* frame under contruction has audio */
int
has_video
;
/* frame under contruction has video */
uint8_t
frame_buf
[
DV_MAX_FRAME_SIZE
];
/* frame under contruction */
int
has_audio
;
/* frame under con
s
truction has audio */
int
has_video
;
/* frame under con
s
truction has video */
uint8_t
frame_buf
[
DV_MAX_FRAME_SIZE
];
/* frame under con
s
truction */
};
static
const
int
dv_aaux_packs_dist
[
12
][
9
]
=
{
...
...
libavformat/hls.c
浏览文件 @
511cf612
...
...
@@ -42,7 +42,7 @@
* An apple http stream consists of a playlist with media segment files,
* played sequentially. There may be several playlists with the same
* video content, in different bandwidth variants, that are played in
* parallel (prefer
r
ably only one bandwidth variant at a time). In this case,
* parallel (preferably only one bandwidth variant at a time). In this case,
* the user supplied the url to a main playlist that only lists the variant
* playlists.
*
...
...
libavformat/hlsproto.c
浏览文件 @
511cf612
...
...
@@ -36,7 +36,7 @@
* An apple http stream consists of a playlist with media segment files,
* played sequentially. There may be several playlists with the same
* video content, in different bandwidth variants, that are played in
* parallel (prefer
r
ably only one bandwidth variant at a time). In this case,
* parallel (preferably only one bandwidth variant at a time). In this case,
* the user supplied the url to a main playlist that only lists the variant
* playlists.
*
...
...
libavformat/http.h
浏览文件 @
511cf612
...
...
@@ -40,7 +40,7 @@ void ff_http_init_auth_state(URLContext *dest, const URLContext *src);
*
* @param h pointer to the ressource
* @param uri uri used to perform the request
* @return a negative value if an error condition occured, 0
* @return a negative value if an error condition occur
r
ed, 0
* otherwise
*/
int
ff_http_do_new_request
(
URLContext
*
h
,
const
char
*
uri
);
...
...
libavformat/rtpdec_jpeg.c
浏览文件 @
511cf612
...
...
@@ -370,7 +370,7 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg,
/* Prepare the JPEG packet. */
if
((
ret
=
ff_rtp_finalize_packet
(
pkt
,
&
jpeg
->
frame
,
st
->
index
))
<
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Error occured when getting frame buffer.
\n
"
);
"Error occur
r
ed when getting frame buffer.
\n
"
);
return
ret
;
}
...
...
libavformat/smoothstreamingenc.c
浏览文件 @
511cf612
...
...
@@ -51,7 +51,7 @@ typedef struct {
char
dirname
[
1024
];
uint8_t
iobuf
[
32768
];
URLContext
*
out
;
// Current output stream where all output is written
URLContext
*
out2
;
// Auxil
lary output stream where all output also is
written
URLContext
*
out2
;
// Auxil
iary output stream where all output is also
written
URLContext
*
tail_out
;
// The actual main output stream, if we're currently seeked back to write elsewhere
int64_t
tail_pos
,
cur_pos
,
cur_start_pos
;
int
packets_written
;
...
...
libavformat/spdifenc.c
浏览文件 @
511cf612
...
...
@@ -339,7 +339,7 @@ static int spdif_header_mpeg(AVFormatContext *s, AVPacket *pkt)
ctx
->
data_type
=
mpeg_data_type
[
version
&
1
][
layer
];
ctx
->
pkt_offset
=
spdif_mpeg_pkt_offset
[
version
&
1
][
layer
];
}
// TODO Data type depend
a
nt info (normal/karaoke, dynamic range control)
// TODO Data type depend
e
nt info (normal/karaoke, dynamic range control)
return
0
;
}
...
...
libavformat/wtv.c
浏览文件 @
511cf612
...
...
@@ -221,7 +221,7 @@ static AVIOContext * wtvfile_open_sector(int first_sector, uint64_t length, int
}
wf
->
length
=
length
;
/* seek to intial sector */
/* seek to in
i
tial sector */
wf
->
position
=
0
;
if
(
avio_seek
(
s
->
pb
,
(
int64_t
)
wf
->
sectors
[
0
]
<<
WTV_SECTOR_BITS
,
SEEK_SET
)
<
0
)
{
av_free
(
wf
->
sectors
);
...
...
libavformat/xmv.c
浏览文件 @
511cf612
...
...
@@ -298,7 +298,7 @@ static int xmv_process_packet_header(AVFormatContext *s)
* short for every audio track. But as playing around with XMV files with
* ADPCM audio showed, taking the extra 4 bytes from the audio data gives
* you either completely distorted audio or click (when skipping the
* remaining 68 bytes of the ADPCM block). Sub
s
tracting 4 bytes for every
* remaining 68 bytes of the ADPCM block). Subtracting 4 bytes for every
* audio track from the video data works at least for the audio. Probably
* some alignment thing?
* The video data has (always?) lots of padding, so it should work out...
...
...
libavresample/avresample-test.c
浏览文件 @
511cf612
...
...
@@ -100,7 +100,7 @@ static void audiogen(AVLFG *rnd, void **data, enum AVSampleFormat sample_fmt,
a
+=
M_PI
*
1000
.
0
*
2
.
0
/
sample_rate
;
}
/* 1 second of varing frequency between 100 and 10000 Hz */
/* 1 second of var
y
ing frequency between 100 and 10000 Hz */
a
=
0
;
for
(
i
=
0
;
i
<
1
*
sample_rate
&&
k
<
nb_samples
;
i
++
,
k
++
)
{
v
=
sin
(
a
)
*
0
.
30
;
...
...
libswscale/ppc/yuv2yuv_altivec.c
浏览文件 @
511cf612
/*
* AltiVec-enhanced yuv-to-yuv conver
t
ion routines.
* AltiVec-enhanced yuv-to-yuv conver
s
ion routines.
*
* Copyright (C) 2004 Romain Dolbeau <romain@dolbeau.org>
* based on the equivalent C code in swscale.c
...
...
libswscale/swscale.c
浏览文件 @
511cf612
...
...
@@ -163,7 +163,7 @@ static void hScale8To19_c(SwsContext *c, int16_t *_dst, int dstW,
}
}
// FIXME all pal and rgb srcFormats could do this conver
t
ion as well
// FIXME all pal and rgb srcFormats could do this conver
s
ion as well
// FIXME all scalers more complex than bilinear could do half of this transform
static
void
chrRangeToJpeg_c
(
int16_t
*
dstU
,
int16_t
*
dstV
,
int
width
)
{
...
...
tests/audiogen.c
浏览文件 @
511cf612
...
...
@@ -189,7 +189,7 @@ int main(int argc, char **argv)
a
+=
(
1000
*
FRAC_ONE
)
/
sample_rate
;
}
/* 1 second of varing frequency between 100 and 10000 Hz */
/* 1 second of var
y
ing frequency between 100 and 10000 Hz */
a
=
0
;
for
(
i
=
0
;
i
<
1
*
sample_rate
;
i
++
)
{
v
=
(
int_cos
(
a
)
*
10000
)
>>
FRAC_BITS
;
...
...
tools/patcheck
浏览文件 @
511cf612
...
...
@@ -19,7 +19,7 @@ echo This tool is intended to help a human check/review patches it is very far f
echo
being free of
false
positives and negatives, its output are just hints of what
echo
may or may not be bad. When you use it and it misses something or detects
echo
something wrong, fix it and send a patch to the libav-devel mailing list.
echo
License:GPL Autor: Michael Niedermayer
echo
License:GPL Aut
h
or: Michael Niedermayer
ERE_PRITYP
=
'(unsigned *|)(char|short|long|int|long *int|short *int|void|float|double|(u|)int(8|16|32|64)_t)'
ERE_TYPES
=
'(const|static|av_cold|inline| *)*('
$ERE_PRITYP
'|[a-zA-Z][a-zA-Z0-9_]*)[* ]{1,}[a-zA-Z][a-zA-Z0-9_]*'
...
...
@@ -158,7 +158,7 @@ cat $* | tr '\n' '@' | $EGREP --color=always -o '[^a-zA-Z0-9_]([a-zA-Z0-9_]*) *=
cat
$TMP
|
tr
'@'
'\n'
# does
n
t work
# does
no
t work
#cat $* | tr '\n' '@' | $EGREP -o '[^a-zA-Z_0-9]([a-zA-Z][a-zA-Z_0-9]*) *=[^=].*\1' | $EGREP -o '[^a-zA-Z_0-9]([a-zA-Z][a-zA-Z_0-9]*) *=[^=].*\1 *=[^=]' >$TMP && printf "\nPossibly written 2x before read\n"
#cat $TMP | tr '@' '\n'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录