Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
ee41963f
Commit
ee41963f
authored
Dec 07, 2011
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cosmetics: drop some completely pointless parentheses
parent
fc9489f6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
13 deletions
+17
-13
atrac3.c
libavcodec/atrac3.c
+7
-4
mpegvideo.c
libavcodec/mpegvideo.c
+4
-3
mpegvideo_common.h
libavcodec/mpegvideo_common.h
+1
-1
msrledec.c
libavcodec/msrledec.c
+2
-2
vc1dec.c
libavcodec/vc1dec.c
+1
-1
libdc1394.c
libavdevice/libdc1394.c
+2
-2
No files found.
libavcodec/atrac3.c
View file @
ee41963f
...
@@ -708,9 +708,10 @@ static int decodeChannelSoundUnit (ATRAC3Context *q, GetBitContext *gb, channel_
...
@@ -708,9 +708,10 @@ static int decodeChannelSoundUnit (ATRAC3Context *q, GetBitContext *gb, channel_
memset
(
pSnd
->
IMDCT_buf
,
0
,
512
*
sizeof
(
float
));
memset
(
pSnd
->
IMDCT_buf
,
0
,
512
*
sizeof
(
float
));
/* gain compensation and overlapping */
/* gain compensation and overlapping */
gainCompensateAndOverlap
(
pSnd
->
IMDCT_buf
,
&
(
pSnd
->
prevFrame
[
band
*
256
]),
&
(
pOut
[
band
*
256
]),
gainCompensateAndOverlap
(
pSnd
->
IMDCT_buf
,
&
pSnd
->
prevFrame
[
band
*
256
],
&
((
pSnd
->
gainBlock
[
1
-
(
pSnd
->
gcBlkSwitch
)]).
gBlock
[
band
]),
&
pOut
[
band
*
256
],
&
((
pSnd
->
gainBlock
[
pSnd
->
gcBlkSwitch
]).
gBlock
[
band
]));
&
pSnd
->
gainBlock
[
1
-
pSnd
->
gcBlkSwitch
].
gBlock
[
band
],
&
pSnd
->
gainBlock
[
pSnd
->
gcBlkSwitch
].
gBlock
[
band
]);
}
}
/* Swap the gain control buffers for the next frame. */
/* Swap the gain control buffers for the next frame. */
...
@@ -795,7 +796,9 @@ static int decodeFrame(ATRAC3Context *q, const uint8_t* databuf,
...
@@ -795,7 +796,9 @@ static int decodeFrame(ATRAC3Context *q, const uint8_t* databuf,
for
(
i
=
0
;
i
<
q
->
channels
;
i
++
)
{
for
(
i
=
0
;
i
<
q
->
channels
;
i
++
)
{
/* Set the bitstream reader at the start of a channel sound unit. */
/* Set the bitstream reader at the start of a channel sound unit. */
init_get_bits
(
&
q
->
gb
,
databuf
+
((
i
*
q
->
bytes_per_frame
)
/
q
->
channels
),
(
q
->
bits_per_frame
)
/
q
->
channels
);
init_get_bits
(
&
q
->
gb
,
databuf
+
i
*
q
->
bytes_per_frame
/
q
->
channels
,
q
->
bits_per_frame
/
q
->
channels
);
result
=
decodeChannelSoundUnit
(
q
,
&
q
->
gb
,
&
q
->
pUnits
[
i
],
out_samples
[
i
],
i
,
q
->
codingMode
);
result
=
decodeChannelSoundUnit
(
q
,
&
q
->
gb
,
&
q
->
pUnits
[
i
],
out_samples
[
i
],
i
,
q
->
codingMode
);
if
(
result
!=
0
)
if
(
result
!=
0
)
...
...
libavcodec/mpegvideo.c
View file @
ee41963f
...
@@ -885,7 +885,7 @@ av_cold int MPV_common_init(MpegEncContext *s)
...
@@ -885,7 +885,7 @@ av_cold int MPV_common_init(MpegEncContext *s)
s
->
parse_context
.
state
=
-
1
;
s
->
parse_context
.
state
=
-
1
;
if
((
s
->
avctx
->
debug
&
(
FF_DEBUG_VIS_QP
|
FF_DEBUG_VIS_MB_TYPE
))
||
if
((
s
->
avctx
->
debug
&
(
FF_DEBUG_VIS_QP
|
FF_DEBUG_VIS_MB_TYPE
))
||
(
s
->
avctx
->
debug_mv
)
)
{
s
->
avctx
->
debug_mv
)
{
s
->
visualization_buffer
[
0
]
=
av_malloc
((
s
->
mb_width
*
16
+
s
->
visualization_buffer
[
0
]
=
av_malloc
((
s
->
mb_width
*
16
+
2
*
EDGE_WIDTH
)
*
s
->
mb_height
*
16
+
2
*
EDGE_WIDTH
);
2
*
EDGE_WIDTH
)
*
s
->
mb_height
*
16
+
2
*
EDGE_WIDTH
);
s
->
visualization_buffer
[
1
]
=
av_malloc
((
s
->
mb_width
*
16
+
s
->
visualization_buffer
[
1
]
=
av_malloc
((
s
->
mb_width
*
16
+
...
@@ -1564,7 +1564,8 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){
...
@@ -1564,7 +1564,8 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){
}
}
}
}
if
((
s
->
avctx
->
debug
&
(
FF_DEBUG_VIS_QP
|
FF_DEBUG_VIS_MB_TYPE
))
||
(
s
->
avctx
->
debug_mv
)){
if
((
s
->
avctx
->
debug
&
(
FF_DEBUG_VIS_QP
|
FF_DEBUG_VIS_MB_TYPE
))
||
s
->
avctx
->
debug_mv
)
{
const
int
shift
=
1
+
s
->
quarter_sample
;
const
int
shift
=
1
+
s
->
quarter_sample
;
int
mb_y
;
int
mb_y
;
uint8_t
*
ptr
;
uint8_t
*
ptr
;
...
@@ -1589,7 +1590,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){
...
@@ -1589,7 +1590,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){
int
mb_x
;
int
mb_x
;
for
(
mb_x
=
0
;
mb_x
<
s
->
mb_width
;
mb_x
++
){
for
(
mb_x
=
0
;
mb_x
<
s
->
mb_width
;
mb_x
++
){
const
int
mb_index
=
mb_x
+
mb_y
*
s
->
mb_stride
;
const
int
mb_index
=
mb_x
+
mb_y
*
s
->
mb_stride
;
if
((
s
->
avctx
->
debug_mv
)
&&
pict
->
motion_val
)
{
if
(
s
->
avctx
->
debug_mv
&&
pict
->
motion_val
)
{
int
type
;
int
type
;
for
(
type
=
0
;
type
<
3
;
type
++
){
for
(
type
=
0
;
type
<
3
;
type
++
){
int
direction
=
0
;
int
direction
=
0
;
...
...
libavcodec/mpegvideo_common.h
View file @
ee41963f
...
@@ -585,7 +585,7 @@ static inline void chroma_4mv_motion(MpegEncContext *s,
...
@@ -585,7 +585,7 @@ static inline void chroma_4mv_motion(MpegEncContext *s,
if
(
src_y
==
(
s
->
height
>>
1
))
if
(
src_y
==
(
s
->
height
>>
1
))
dxy
&=
~
2
;
dxy
&=
~
2
;
offset
=
(
src_y
*
(
s
->
uvlinesize
))
+
src_x
;
offset
=
src_y
*
s
->
uvlinesize
+
src_x
;
ptr
=
ref_picture
[
1
]
+
offset
;
ptr
=
ref_picture
[
1
]
+
offset
;
if
(
s
->
flags
&
CODEC_FLAG_EMU_EDGE
){
if
(
s
->
flags
&
CODEC_FLAG_EMU_EDGE
){
if
(
(
unsigned
)
src_x
>
(
s
->
h_edge_pos
>>
1
)
-
(
dxy
&
1
)
-
8
if
(
(
unsigned
)
src_x
>
(
s
->
h_edge_pos
>>
1
)
-
(
dxy
&
1
)
-
8
...
...
libavcodec/msrledec.c
View file @
ee41963f
...
@@ -139,7 +139,7 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
...
@@ -139,7 +139,7 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
unsigned
int
width
=
FFABS
(
pic
->
linesize
[
0
])
/
(
depth
>>
3
);
unsigned
int
width
=
FFABS
(
pic
->
linesize
[
0
])
/
(
depth
>>
3
);
output
=
pic
->
data
[
0
]
+
(
avctx
->
height
-
1
)
*
pic
->
linesize
[
0
];
output
=
pic
->
data
[
0
]
+
(
avctx
->
height
-
1
)
*
pic
->
linesize
[
0
];
output_end
=
pic
->
data
[
0
]
+
(
avctx
->
height
)
*
pic
->
linesize
[
0
];
output_end
=
pic
->
data
[
0
]
+
avctx
->
height
*
pic
->
linesize
[
0
];
while
(
src
<
data
+
srcsize
)
{
while
(
src
<
data
+
srcsize
)
{
p1
=
*
src
++
;
p1
=
*
src
++
;
if
(
p1
==
0
)
{
//Escape code
if
(
p1
==
0
)
{
//Escape code
...
...
libavcodec/vc1dec.c
View file @
ee41963f
...
@@ -236,7 +236,7 @@ static void vc1_put_signed_blocks_clamped(VC1Context *v)
...
@@ -236,7 +236,7 @@ static void vc1_put_signed_blocks_clamped(VC1Context *v)
if
(
s
->
mb_x
)
{
if
(
s
->
mb_x
)
{
topleft_mb_pos
=
(
s
->
mb_y
-
1
)
*
s
->
mb_stride
+
s
->
mb_x
-
1
;
topleft_mb_pos
=
(
s
->
mb_y
-
1
)
*
s
->
mb_stride
+
s
->
mb_x
-
1
;
fieldtx
=
v
->
fieldtx_plane
[
topleft_mb_pos
];
fieldtx
=
v
->
fieldtx_plane
[
topleft_mb_pos
];
stride_y
=
(
s
->
linesize
)
<<
fieldtx
;
stride_y
=
s
->
linesize
<<
fieldtx
;
v_dist
=
(
16
-
fieldtx
)
>>
(
fieldtx
==
0
);
v_dist
=
(
16
-
fieldtx
)
>>
(
fieldtx
==
0
);
s
->
dsp
.
put_signed_pixels_clamped
(
v
->
block
[
v
->
topleft_blk_idx
][
0
],
s
->
dsp
.
put_signed_pixels_clamped
(
v
->
block
[
v
->
topleft_blk_idx
][
0
],
s
->
dest
[
0
]
-
16
*
s
->
linesize
-
16
,
s
->
dest
[
0
]
-
16
*
s
->
linesize
-
16
,
...
...
libavdevice/libdc1394.c
View file @
ee41963f
...
@@ -371,8 +371,8 @@ static int dc1394_v2_read_packet(AVFormatContext *c, AVPacket *pkt)
...
@@ -371,8 +371,8 @@ static int dc1394_v2_read_packet(AVFormatContext *c, AVPacket *pkt)
res
=
dc1394_capture_dequeue
(
dc1394
->
camera
,
DC1394_CAPTURE_POLICY_WAIT
,
&
dc1394
->
frame
);
res
=
dc1394_capture_dequeue
(
dc1394
->
camera
,
DC1394_CAPTURE_POLICY_WAIT
,
&
dc1394
->
frame
);
if
(
res
==
DC1394_SUCCESS
)
{
if
(
res
==
DC1394_SUCCESS
)
{
dc1394
->
packet
.
data
=
(
uint8_t
*
)
(
dc1394
->
frame
->
image
)
;
dc1394
->
packet
.
data
=
(
uint8_t
*
)
dc1394
->
frame
->
image
;
dc1394
->
packet
.
pts
=
(
dc1394
->
current_frame
*
1000000
)
/
(
dc1394
->
frame_rate
)
;
dc1394
->
packet
.
pts
=
dc1394
->
current_frame
*
1000000
/
dc1394
->
frame_rate
;
res
=
dc1394
->
frame
->
image_bytes
;
res
=
dc1394
->
frame
->
image_bytes
;
}
else
{
}
else
{
av_log
(
c
,
AV_LOG_ERROR
,
"DMA capture failed
\n
"
);
av_log
(
c
,
AV_LOG_ERROR
,
"DMA capture failed
\n
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment