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
a0e1c351
Commit
a0e1c351
authored
Jun 25, 2014
by
Gildas Cocherel
Committed by
Anton Khirnov
Jun 26, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hevc: remove unused array min_cb_addr_zs
Signed-off-by:
Anton Khirnov
<
anton@khirnov.net
>
parent
9b60d919
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
19 deletions
+1
-19
hevc.h
libavcodec/hevc.h
+0
-1
hevc_ps.c
libavcodec/hevc_ps.c
+1
-18
No files found.
libavcodec/hevc.h
View file @
a0e1c351
...
@@ -523,7 +523,6 @@ typedef struct HEVCPPS {
...
@@ -523,7 +523,6 @@ typedef struct HEVCPPS {
int
*
ctb_addr_ts_to_rs
;
///< CtbAddrTSToRS
int
*
ctb_addr_ts_to_rs
;
///< CtbAddrTSToRS
int
*
tile_id
;
///< TileId
int
*
tile_id
;
///< TileId
int
*
tile_pos_rs
;
///< TilePosRS
int
*
tile_pos_rs
;
///< TilePosRS
int
*
min_cb_addr_zs
;
///< MinCbAddrZS
int
*
min_tb_addr_zs
;
///< MinTbAddrZS
int
*
min_tb_addr_zs
;
///< MinTbAddrZS
}
HEVCPPS
;
}
HEVCPPS
;
...
...
libavcodec/hevc_ps.c
View file @
a0e1c351
...
@@ -980,7 +980,6 @@ static void hevc_pps_free(void *opaque, uint8_t *data)
...
@@ -980,7 +980,6 @@ static void hevc_pps_free(void *opaque, uint8_t *data)
av_freep
(
&
pps
->
ctb_addr_ts_to_rs
);
av_freep
(
&
pps
->
ctb_addr_ts_to_rs
);
av_freep
(
&
pps
->
tile_pos_rs
);
av_freep
(
&
pps
->
tile_pos_rs
);
av_freep
(
&
pps
->
tile_id
);
av_freep
(
&
pps
->
tile_id
);
av_freep
(
&
pps
->
min_cb_addr_zs
);
av_freep
(
&
pps
->
min_tb_addr_zs
);
av_freep
(
&
pps
->
min_tb_addr_zs
);
av_freep
(
&
pps
);
av_freep
(
&
pps
);
...
@@ -1235,10 +1234,9 @@ int ff_hevc_decode_nal_pps(HEVCContext *s)
...
@@ -1235,10 +1234,9 @@ int ff_hevc_decode_nal_pps(HEVCContext *s)
pps
->
ctb_addr_rs_to_ts
=
av_malloc_array
(
pic_area_in_ctbs
,
sizeof
(
*
pps
->
ctb_addr_rs_to_ts
));
pps
->
ctb_addr_rs_to_ts
=
av_malloc_array
(
pic_area_in_ctbs
,
sizeof
(
*
pps
->
ctb_addr_rs_to_ts
));
pps
->
ctb_addr_ts_to_rs
=
av_malloc_array
(
pic_area_in_ctbs
,
sizeof
(
*
pps
->
ctb_addr_ts_to_rs
));
pps
->
ctb_addr_ts_to_rs
=
av_malloc_array
(
pic_area_in_ctbs
,
sizeof
(
*
pps
->
ctb_addr_ts_to_rs
));
pps
->
tile_id
=
av_malloc_array
(
pic_area_in_ctbs
,
sizeof
(
*
pps
->
tile_id
));
pps
->
tile_id
=
av_malloc_array
(
pic_area_in_ctbs
,
sizeof
(
*
pps
->
tile_id
));
pps
->
min_cb_addr_zs
=
av_malloc_array
(
pic_area_in_min_cbs
,
sizeof
(
*
pps
->
min_cb_addr_zs
));
pps
->
min_tb_addr_zs
=
av_malloc_array
(
pic_area_in_min_tbs
,
sizeof
(
*
pps
->
min_tb_addr_zs
));
pps
->
min_tb_addr_zs
=
av_malloc_array
(
pic_area_in_min_tbs
,
sizeof
(
*
pps
->
min_tb_addr_zs
));
if
(
!
pps
->
ctb_addr_rs_to_ts
||
!
pps
->
ctb_addr_ts_to_rs
||
if
(
!
pps
->
ctb_addr_rs_to_ts
||
!
pps
->
ctb_addr_ts_to_rs
||
!
pps
->
tile_id
||
!
pps
->
min_
cb_addr_zs
||
!
pps
->
min_
tb_addr_zs
)
{
!
pps
->
tile_id
||
!
pps
->
min_tb_addr_zs
)
{
ret
=
AVERROR
(
ENOMEM
);
ret
=
AVERROR
(
ENOMEM
);
goto
err
;
goto
err
;
}
}
...
@@ -1292,21 +1290,6 @@ int ff_hevc_decode_nal_pps(HEVCContext *s)
...
@@ -1292,21 +1290,6 @@ int ff_hevc_decode_nal_pps(HEVCContext *s)
for
(
i
=
0
;
i
<
pps
->
num_tile_columns
;
i
++
)
for
(
i
=
0
;
i
<
pps
->
num_tile_columns
;
i
++
)
pps
->
tile_pos_rs
[
j
*
pps
->
num_tile_columns
+
i
]
=
pps
->
row_bd
[
j
]
*
sps
->
ctb_width
+
pps
->
col_bd
[
i
];
pps
->
tile_pos_rs
[
j
*
pps
->
num_tile_columns
+
i
]
=
pps
->
row_bd
[
j
]
*
sps
->
ctb_width
+
pps
->
col_bd
[
i
];
for
(
y
=
0
;
y
<
sps
->
min_cb_height
;
y
++
)
{
for
(
x
=
0
;
x
<
sps
->
min_cb_width
;
x
++
)
{
int
tb_x
=
x
>>
sps
->
log2_diff_max_min_coding_block_size
;
int
tb_y
=
y
>>
sps
->
log2_diff_max_min_coding_block_size
;
int
ctb_addr_rs
=
sps
->
ctb_width
*
tb_y
+
tb_x
;
int
val
=
pps
->
ctb_addr_rs_to_ts
[
ctb_addr_rs
]
<<
(
sps
->
log2_diff_max_min_coding_block_size
*
2
);
for
(
i
=
0
;
i
<
sps
->
log2_diff_max_min_coding_block_size
;
i
++
)
{
int
m
=
1
<<
i
;
val
+=
(
m
&
x
?
m
*
m
:
0
)
+
(
m
&
y
?
2
*
m
*
m
:
0
);
}
pps
->
min_cb_addr_zs
[
y
*
sps
->
min_cb_width
+
x
]
=
val
;
}
}
log2_diff_ctb_min_tb_size
=
sps
->
log2_ctb_size
-
sps
->
log2_min_tb_size
;
log2_diff_ctb_min_tb_size
=
sps
->
log2_ctb_size
-
sps
->
log2_min_tb_size
;
for
(
y
=
0
;
y
<
sps
->
min_tb_height
;
y
++
)
{
for
(
y
=
0
;
y
<
sps
->
min_tb_height
;
y
++
)
{
for
(
x
=
0
;
x
<
sps
->
min_tb_width
;
x
++
)
{
for
(
x
=
0
;
x
<
sps
->
min_tb_width
;
x
++
)
{
...
...
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