Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
6f57375d
Commit
6f57375d
authored
May 22, 2015
by
Anton Khirnov
Committed by
Vittorio Giovara
May 28, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rl: Rename ff_*_rl() to ff_rl_*()
parent
fa1923f1
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
20 additions
and
20 deletions
+20
-20
h261.c
libavcodec/h261.c
+1
-1
ituh263dec.c
libavcodec/ituh263dec.c
+2
-2
ituh263enc.c
libavcodec/ituh263enc.c
+2
-2
mpeg12.c
libavcodec/mpeg12.c
+2
-2
mpeg12enc.c
libavcodec/mpeg12enc.c
+2
-2
mpeg4videodec.c
libavcodec/mpeg4videodec.c
+3
-3
mpeg4videoenc.c
libavcodec/mpeg4videoenc.c
+1
-1
msmpeg4dec.c
libavcodec/msmpeg4dec.c
+1
-1
msmpeg4enc.c
libavcodec/msmpeg4enc.c
+1
-1
rl.c
libavcodec/rl.c
+2
-2
rl.h
libavcodec/rl.h
+3
-3
No files found.
libavcodec/h261.c
View file @
6f57375d
...
@@ -87,6 +87,6 @@ av_cold void ff_h261_common_init(void)
...
@@ -87,6 +87,6 @@ av_cold void ff_h261_common_init(void)
if
(
done
)
if
(
done
)
return
;
return
;
ff_
init_rl
(
&
ff_h261_rl_tcoeff
,
ff_h261_rl_table_store
);
ff_
rl_init
(
&
ff_h261_rl_tcoeff
,
ff_h261_rl_table_store
);
done
=
1
;
done
=
1
;
}
}
libavcodec/ituh263dec.c
View file @
6f57375d
...
@@ -119,8 +119,8 @@ av_cold void ff_h263_decode_init_vlc(void)
...
@@ -119,8 +119,8 @@ av_cold void ff_h263_decode_init_vlc(void)
INIT_VLC_STATIC
(
&
mv_vlc
,
MV_VLC_BITS
,
33
,
INIT_VLC_STATIC
(
&
mv_vlc
,
MV_VLC_BITS
,
33
,
&
ff_mvtab
[
0
][
1
],
2
,
1
,
&
ff_mvtab
[
0
][
1
],
2
,
1
,
&
ff_mvtab
[
0
][
0
],
2
,
1
,
538
);
&
ff_mvtab
[
0
][
0
],
2
,
1
,
538
);
ff_
init_rl
(
&
ff_h263_rl_inter
,
ff_h263_static_rl_table_store
[
0
]);
ff_
rl_init
(
&
ff_h263_rl_inter
,
ff_h263_static_rl_table_store
[
0
]);
ff_
init_rl
(
&
ff_rl_intra_aic
,
ff_h263_static_rl_table_store
[
1
]);
ff_
rl_init
(
&
ff_rl_intra_aic
,
ff_h263_static_rl_table_store
[
1
]);
INIT_VLC_RL
(
ff_h263_rl_inter
,
554
);
INIT_VLC_RL
(
ff_h263_rl_inter
,
554
);
INIT_VLC_RL
(
ff_rl_intra_aic
,
554
);
INIT_VLC_RL
(
ff_rl_intra_aic
,
554
);
INIT_VLC_STATIC
(
&
h263_mbtype_b_vlc
,
H263_MBTYPE_B_VLC_BITS
,
15
,
INIT_VLC_STATIC
(
&
h263_mbtype_b_vlc
,
H263_MBTYPE_B_VLC_BITS
,
15
,
...
...
libavcodec/ituh263enc.c
View file @
6f57375d
...
@@ -772,8 +772,8 @@ av_cold void ff_h263_encode_init(MpegEncContext *s)
...
@@ -772,8 +772,8 @@ av_cold void ff_h263_encode_init(MpegEncContext *s)
if
(
!
done
)
{
if
(
!
done
)
{
done
=
1
;
done
=
1
;
ff_
init_rl
(
&
ff_h263_rl_inter
,
ff_h263_static_rl_table_store
[
0
]);
ff_
rl_init
(
&
ff_h263_rl_inter
,
ff_h263_static_rl_table_store
[
0
]);
ff_
init_rl
(
&
ff_rl_intra_aic
,
ff_h263_static_rl_table_store
[
1
]);
ff_
rl_init
(
&
ff_rl_intra_aic
,
ff_h263_static_rl_table_store
[
1
]);
init_uni_h263_rl_tab
(
&
ff_rl_intra_aic
,
NULL
,
uni_h263_intra_aic_rl_len
);
init_uni_h263_rl_tab
(
&
ff_rl_intra_aic
,
NULL
,
uni_h263_intra_aic_rl_len
);
init_uni_h263_rl_tab
(
&
ff_h263_rl_inter
,
NULL
,
uni_h263_inter_rl_len
);
init_uni_h263_rl_tab
(
&
ff_h263_rl_inter
,
NULL
,
uni_h263_inter_rl_len
);
...
...
libavcodec/mpeg12.c
View file @
6f57375d
...
@@ -164,8 +164,8 @@ av_cold void ff_mpeg12_init_vlcs(void)
...
@@ -164,8 +164,8 @@ av_cold void ff_mpeg12_init_vlcs(void)
INIT_VLC_STATIC
(
&
ff_mb_btype_vlc
,
MB_BTYPE_VLC_BITS
,
11
,
INIT_VLC_STATIC
(
&
ff_mb_btype_vlc
,
MB_BTYPE_VLC_BITS
,
11
,
&
table_mb_btype
[
0
][
1
],
2
,
1
,
&
table_mb_btype
[
0
][
1
],
2
,
1
,
&
table_mb_btype
[
0
][
0
],
2
,
1
,
64
);
&
table_mb_btype
[
0
][
0
],
2
,
1
,
64
);
ff_
init_rl
(
&
ff_rl_mpeg1
,
ff_mpeg12_static_rl_table_store
[
0
]);
ff_
rl_init
(
&
ff_rl_mpeg1
,
ff_mpeg12_static_rl_table_store
[
0
]);
ff_
init_rl
(
&
ff_rl_mpeg2
,
ff_mpeg12_static_rl_table_store
[
1
]);
ff_
rl_init
(
&
ff_rl_mpeg2
,
ff_mpeg12_static_rl_table_store
[
1
]);
INIT_2D_VLC_RL
(
ff_rl_mpeg1
,
680
);
INIT_2D_VLC_RL
(
ff_rl_mpeg1
,
680
);
INIT_2D_VLC_RL
(
ff_rl_mpeg2
,
674
);
INIT_2D_VLC_RL
(
ff_rl_mpeg2
,
674
);
...
...
libavcodec/mpeg12enc.c
View file @
6f57375d
...
@@ -956,8 +956,8 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s)
...
@@ -956,8 +956,8 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s)
int
i
;
int
i
;
done
=
1
;
done
=
1
;
ff_
init_rl
(
&
ff_rl_mpeg1
,
ff_mpeg12_static_rl_table_store
[
0
]);
ff_
rl_init
(
&
ff_rl_mpeg1
,
ff_mpeg12_static_rl_table_store
[
0
]);
ff_
init_rl
(
&
ff_rl_mpeg2
,
ff_mpeg12_static_rl_table_store
[
1
]);
ff_
rl_init
(
&
ff_rl_mpeg2
,
ff_mpeg12_static_rl_table_store
[
1
]);
for
(
i
=
0
;
i
<
64
;
i
++
)
{
for
(
i
=
0
;
i
<
64
;
i
++
)
{
mpeg1_max_level
[
0
][
i
]
=
ff_rl_mpeg1
.
max_level
[
0
][
i
];
mpeg1_max_level
[
0
][
i
]
=
ff_rl_mpeg1
.
max_level
[
0
][
i
];
...
...
libavcodec/mpeg4videodec.c
View file @
6f57375d
...
@@ -2567,9 +2567,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
...
@@ -2567,9 +2567,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
if
(
!
done
)
{
if
(
!
done
)
{
done
=
1
;
done
=
1
;
ff_
init_rl
(
&
ff_mpeg4_rl_intra
,
ff_mpeg4_static_rl_table_store
[
0
]);
ff_
rl_init
(
&
ff_mpeg4_rl_intra
,
ff_mpeg4_static_rl_table_store
[
0
]);
ff_
init_rl
(
&
ff_rvlc_rl_inter
,
ff_mpeg4_static_rl_table_store
[
1
]);
ff_
rl_init
(
&
ff_rvlc_rl_inter
,
ff_mpeg4_static_rl_table_store
[
1
]);
ff_
init_rl
(
&
ff_rvlc_rl_intra
,
ff_mpeg4_static_rl_table_store
[
2
]);
ff_
rl_init
(
&
ff_rvlc_rl_intra
,
ff_mpeg4_static_rl_table_store
[
2
]);
INIT_VLC_RL
(
ff_mpeg4_rl_intra
,
554
);
INIT_VLC_RL
(
ff_mpeg4_rl_intra
,
554
);
INIT_VLC_RL
(
ff_rvlc_rl_inter
,
1072
);
INIT_VLC_RL
(
ff_rvlc_rl_inter
,
1072
);
INIT_VLC_RL
(
ff_rvlc_rl_intra
,
1072
);
INIT_VLC_RL
(
ff_rvlc_rl_intra
,
1072
);
...
...
libavcodec/mpeg4videoenc.c
View file @
6f57375d
...
@@ -1295,7 +1295,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
...
@@ -1295,7 +1295,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
init_uni_dc_tab
();
init_uni_dc_tab
();
ff_
init_rl
(
&
ff_mpeg4_rl_intra
,
ff_mpeg4_static_rl_table_store
[
0
]);
ff_
rl_init
(
&
ff_mpeg4_rl_intra
,
ff_mpeg4_static_rl_table_store
[
0
]);
init_uni_mpeg4_rl_tab
(
&
ff_mpeg4_rl_intra
,
uni_mpeg4_intra_rl_bits
,
uni_mpeg4_intra_rl_len
);
init_uni_mpeg4_rl_tab
(
&
ff_mpeg4_rl_intra
,
uni_mpeg4_intra_rl_bits
,
uni_mpeg4_intra_rl_len
);
init_uni_mpeg4_rl_tab
(
&
ff_h263_rl_inter
,
uni_mpeg4_inter_rl_bits
,
uni_mpeg4_inter_rl_len
);
init_uni_mpeg4_rl_tab
(
&
ff_h263_rl_inter
,
uni_mpeg4_inter_rl_bits
,
uni_mpeg4_inter_rl_len
);
...
...
libavcodec/msmpeg4dec.c
View file @
6f57375d
...
@@ -295,7 +295,7 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)
...
@@ -295,7 +295,7 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)
done
=
1
;
done
=
1
;
for
(
i
=
0
;
i
<
NB_RL_TABLES
;
i
++
)
{
for
(
i
=
0
;
i
<
NB_RL_TABLES
;
i
++
)
{
ff_
init_rl
(
&
ff_rl_table
[
i
],
ff_static_rl_table_store
[
i
]);
ff_
rl_init
(
&
ff_rl_table
[
i
],
ff_static_rl_table_store
[
i
]);
}
}
INIT_VLC_RL
(
ff_rl_table
[
0
],
642
);
INIT_VLC_RL
(
ff_rl_table
[
0
],
642
);
INIT_VLC_RL
(
ff_rl_table
[
1
],
1104
);
INIT_VLC_RL
(
ff_rl_table
[
1
],
1104
);
...
...
libavcodec/msmpeg4enc.c
View file @
6f57375d
...
@@ -138,7 +138,7 @@ av_cold int ff_msmpeg4_encode_init(MpegEncContext *s)
...
@@ -138,7 +138,7 @@ av_cold int ff_msmpeg4_encode_init(MpegEncContext *s)
if
((
ret
=
init_mv_table
(
&
ff_mv_tables
[
1
]))
<
0
)
if
((
ret
=
init_mv_table
(
&
ff_mv_tables
[
1
]))
<
0
)
return
ret
;
return
ret
;
for
(
i
=
0
;
i
<
NB_RL_TABLES
;
i
++
)
for
(
i
=
0
;
i
<
NB_RL_TABLES
;
i
++
)
ff_
init_rl
(
&
ff_rl_table
[
i
],
ff_static_rl_table_store
[
i
]);
ff_
rl_init
(
&
ff_rl_table
[
i
],
ff_static_rl_table_store
[
i
]);
for
(
i
=
0
;
i
<
NB_RL_TABLES
;
i
++
){
for
(
i
=
0
;
i
<
NB_RL_TABLES
;
i
++
){
int
level
;
int
level
;
...
...
libavcodec/rl.c
View file @
6f57375d
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#include "rl.h"
#include "rl.h"
av_cold
void
ff_
init_rl
(
RLTable
*
rl
,
av_cold
void
ff_
rl_init
(
RLTable
*
rl
,
uint8_t
static_store
[
2
][
2
*
MAX_RUN
+
MAX_LEVEL
+
3
])
uint8_t
static_store
[
2
][
2
*
MAX_RUN
+
MAX_LEVEL
+
3
])
{
{
int8_t
max_level
[
MAX_RUN
+
1
],
max_run
[
MAX_LEVEL
+
1
];
int8_t
max_level
[
MAX_RUN
+
1
],
max_run
[
MAX_LEVEL
+
1
];
...
@@ -74,7 +74,7 @@ av_cold void ff_init_rl(RLTable *rl,
...
@@ -74,7 +74,7 @@ av_cold void ff_init_rl(RLTable *rl,
}
}
}
}
av_cold
void
ff_
init_vlc_rl
(
RLTable
*
rl
)
av_cold
void
ff_
rl_init_vlc
(
RLTable
*
rl
)
{
{
int
i
,
q
;
int
i
,
q
;
...
...
libavcodec/rl.h
View file @
6f57375d
...
@@ -53,8 +53,8 @@ typedef struct RLTable {
...
@@ -53,8 +53,8 @@ typedef struct RLTable {
* @param static_store static uint8_t array[2][2*MAX_RUN + MAX_LEVEL + 3] which will hold
* @param static_store static uint8_t array[2][2*MAX_RUN + MAX_LEVEL + 3] which will hold
* the level and run tables, if this is NULL av_malloc() will be used
* the level and run tables, if this is NULL av_malloc() will be used
*/
*/
void
ff_
init_rl
(
RLTable
*
rl
,
uint8_t
static_store
[
2
][
2
*
MAX_RUN
+
MAX_LEVEL
+
3
]);
void
ff_
rl_init
(
RLTable
*
rl
,
uint8_t
static_store
[
2
][
2
*
MAX_RUN
+
MAX_LEVEL
+
3
]);
void
ff_
init_vlc_rl
(
RLTable
*
rl
);
void
ff_
rl_init_vlc
(
RLTable
*
rl
);
#define INIT_VLC_RL(rl, static_size)\
#define INIT_VLC_RL(rl, static_size)\
{\
{\
...
@@ -68,7 +68,7 @@ void ff_init_vlc_rl(RLTable *rl);
...
@@ -68,7 +68,7 @@ void ff_init_vlc_rl(RLTable *rl);
for(q=0; q<32; q++)\
for(q=0; q<32; q++)\
rl.rl_vlc[q]= rl_vlc_table[q];\
rl.rl_vlc[q]= rl_vlc_table[q];\
\
\
ff_
init_vlc_rl
(&rl);\
ff_
rl_init_vlc
(&rl);\
}\
}\
}
}
...
...
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